From d5d0a0b41fd47e2e6d16244d7432f293d11e7194 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Mon, 12 Dec 2022 21:59:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8D=95=E6=8D=AE=E7=9A=84?=
 =?UTF-8?q?=E6=8E=92=E7=89=88=EF=BC=8C=E8=B0=83=E6=95=B4=E5=88=97=E7=9A=84?=
 =?UTF-8?q?=E5=AE=BD=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/views/bill/dialog/BillDetail.vue       |  6 +++---
 jshERP-web/src/views/bill/mixins/BillModalMixin.js    |  4 ++--
 .../src/views/bill/modules/AllocationOutModal.vue     |  2 +-
 jshERP-web/src/views/bill/modules/AssembleModal.vue   |  2 +-
 .../src/views/bill/modules/DisassembleModal.vue       |  2 +-
 jshERP-web/src/views/bill/modules/OtherInModal.vue    |  2 +-
 jshERP-web/src/views/bill/modules/OtherOutModal.vue   |  2 +-
 .../src/views/bill/modules/PurchaseBackModal.vue      |  6 +++---
 jshERP-web/src/views/bill/modules/PurchaseInModal.vue |  6 +++---
 .../src/views/bill/modules/PurchaseOrderModal.vue     |  6 +++---
 jshERP-web/src/views/bill/modules/RetailBackModal.vue |  4 ++--
 jshERP-web/src/views/bill/modules/RetailOutModal.vue  |  4 ++--
 jshERP-web/src/views/bill/modules/SaleBackModal.vue   |  6 +++---
 jshERP-web/src/views/bill/modules/SaleOrderModal.vue  |  6 +++---
 jshERP-web/src/views/bill/modules/SaleOutModal.vue    |  6 +++---
 .../src/views/financial/dialog/FinancialDetail.vue    |  2 +-
 .../src/views/financial/mixins/FinancialModalMixin.js |  2 +-
 .../src/views/material/modules/MaterialModal.vue      | 11 +++++++----
 18 files changed, 41 insertions(+), 38 deletions(-)

diff --git a/jshERP-web/src/views/bill/dialog/BillDetail.vue b/jshERP-web/src/views/bill/dialog/BillDetail.vue
index e54ca253..ae84aefd 100644
--- a/jshERP-web/src/views/bill/dialog/BillDetail.vue
+++ b/jshERP-web/src/views/bill/dialog/BillDetail.vue
@@ -1325,12 +1325,12 @@
     },
     created () {
       let realScreenWidth = window.screen.width
-      this.width = realScreenWidth<1500?'1300px':'1550px'
+      this.width = realScreenWidth<1500?'1200px':'1550px'
       this.tableWidth = {
-        'width': realScreenWidth<1500?'1250px':'1500px'
+        'width': realScreenWidth<1500?'1150px':'1500px'
       }
       this.tableWidthRetail = {
-        'width': realScreenWidth<1500?'900px':'1100px'
+        'width': realScreenWidth<1500?'800px':'1100px'
       }
     },
     methods: {
diff --git a/jshERP-web/src/views/bill/mixins/BillModalMixin.js b/jshERP-web/src/views/bill/mixins/BillModalMixin.js
index 2b7716e3..257f6edb 100644
--- a/jshERP-web/src/views/bill/mixins/BillModalMixin.js
+++ b/jshERP-web/src/views/bill/mixins/BillModalMixin.js
@@ -55,8 +55,8 @@ export const BillModalMixin = {
     let userInfo = Vue.ls.get(USER_INFO)
     this.isTenant = userInfo.id === userInfo.tenantId? true:false
     let realScreenWidth = window.screen.width
-    this.width = realScreenWidth<1500?'1300px':'1550px'
-    this.minWidth = realScreenWidth<1500?1250:1500
+    this.width = realScreenWidth<1500?'1200px':'1550px'
+    this.minWidth = realScreenWidth<1500?1150:1500
   },
   computed: {
     readOnly: function() {
diff --git a/jshERP-web/src/views/bill/modules/AllocationOutModal.vue b/jshERP-web/src/views/bill/modules/AllocationOutModal.vue
index 6d7221a7..dbc6d658 100644
--- a/jshERP-web/src/views/bill/modules/AllocationOutModal.vue
+++ b/jshERP-web/src/views/bill/modules/AllocationOutModal.vue
@@ -145,7 +145,7 @@
             },
             { title: '名称', key: 'name', width: '8%', type: FormTypes.normal },
             { title: '规格', key: 'standard', width: '7%', type: FormTypes.normal },
-            { title: '型号', key: 'model', width: '6%', type: FormTypes.normal },
+            { title: '型号', key: 'model', width: '7%', type: FormTypes.normal },
             { title: '颜色', key: 'color', width: '5%', type: FormTypes.normal },
             { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.normal },
             { title: '库存', key: 'stock', width: '5%', type: FormTypes.normal },
diff --git a/jshERP-web/src/views/bill/modules/AssembleModal.vue b/jshERP-web/src/views/bill/modules/AssembleModal.vue
index 13b0b4ed..11c3dcd7 100644
--- a/jshERP-web/src/views/bill/modules/AssembleModal.vue
+++ b/jshERP-web/src/views/bill/modules/AssembleModal.vue
@@ -146,7 +146,7 @@
             },
             { title: '名称', key: 'name', width: '8%', type: FormTypes.normal },
             { title: '规格', key: 'standard', width: '7%', type: FormTypes.normal },
-            { title: '型号', key: 'model', width: '6%', type: FormTypes.normal },
+            { title: '型号', key: 'model', width: '7%', type: FormTypes.normal },
             { title: '颜色', key: 'color', width: '5%', type: FormTypes.normal },
             { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.normal },
             { title: '库存', key: 'stock', width: '5%', type: FormTypes.normal },
diff --git a/jshERP-web/src/views/bill/modules/DisassembleModal.vue b/jshERP-web/src/views/bill/modules/DisassembleModal.vue
index 0158ad4e..e12fb636 100644
--- a/jshERP-web/src/views/bill/modules/DisassembleModal.vue
+++ b/jshERP-web/src/views/bill/modules/DisassembleModal.vue
@@ -146,7 +146,7 @@
             },
             { title: '名称', key: 'name', width: '8%', type: FormTypes.normal },
             { title: '规格', key: 'standard', width: '7%', type: FormTypes.normal },
-            { title: '型号', key: 'model', width: '6%', type: FormTypes.normal },
+            { title: '型号', key: 'model', width: '7%', type: FormTypes.normal },
             { title: '颜色', key: 'color', width: '5%', type: FormTypes.normal },
             { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.normal },
             { title: '库存', key: 'stock', width: '5%', type: FormTypes.normal },
diff --git a/jshERP-web/src/views/bill/modules/OtherInModal.vue b/jshERP-web/src/views/bill/modules/OtherInModal.vue
index 02dd47d3..c3dd8243 100644
--- a/jshERP-web/src/views/bill/modules/OtherInModal.vue
+++ b/jshERP-web/src/views/bill/modules/OtherInModal.vue
@@ -167,7 +167,7 @@
             },
             { title: '名称', key: 'name', width: '8%', type: FormTypes.normal },
             { title: '规格', key: 'standard', width: '7%', type: FormTypes.normal },
-            { title: '型号', key: 'model', width: '6%', type: FormTypes.normal },
+            { title: '型号', key: 'model', width: '7%', type: FormTypes.normal },
             { title: '颜色', key: 'color', width: '5%', type: FormTypes.normal },
             { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.normal },
             { title: '库存', key: 'stock', width: '5%', type: FormTypes.normal },
diff --git a/jshERP-web/src/views/bill/modules/OtherOutModal.vue b/jshERP-web/src/views/bill/modules/OtherOutModal.vue
index 46a939fa..2798dc3c 100644
--- a/jshERP-web/src/views/bill/modules/OtherOutModal.vue
+++ b/jshERP-web/src/views/bill/modules/OtherOutModal.vue
@@ -167,7 +167,7 @@
             },
             { title: '名称', key: 'name', width: '8%', type: FormTypes.normal },
             { title: '规格', key: 'standard', width: '7%', type: FormTypes.normal },
-            { title: '型号', key: 'model', width: '6%', type: FormTypes.normal },
+            { title: '型号', key: 'model', width: '7%', type: FormTypes.normal },
             { title: '颜色', key: 'color', width: '5%', type: FormTypes.normal },
             { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.normal },
             { title: '库存', key: 'stock', width: '5%', type: FormTypes.normal },
diff --git a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
index c62aa6f2..81654828 100644
--- a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
+++ b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
@@ -238,7 +238,7 @@
             },
             { title: '名称', key: 'name', width: '8%', type: FormTypes.normal },
             { title: '规格', key: 'standard', width: '7%', type: FormTypes.normal },
-            { title: '型号', key: 'model', width: '6%', type: FormTypes.normal },
+            { title: '型号', key: 'model', width: '7%', type: FormTypes.normal },
             { title: '颜色', key: 'color', width: '5%', type: FormTypes.normal },
             { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.normal },
             { title: '库存', key: 'stock', width: '5%', type: FormTypes.normal },
@@ -256,8 +256,8 @@
             { title: '金额', key: 'allPrice', width: '5%', type: FormTypes.inputNumber, statistics: true },
             { title: '税率', key: 'taxRate', width: '4%', type: FormTypes.inputNumber,placeholder: '%'},
             { title: '税额', key: 'taxMoney', width: '5%', type: FormTypes.inputNumber, readonly: true, statistics: true },
-            { title: '价税合计', key: 'taxLastMoney', width: '6%', type: FormTypes.inputNumber, statistics: true },
-            { title: '备注', key: 'remark', width: '5%', type: FormTypes.input },
+            { title: '价税合计', key: 'taxLastMoney', width: '7%', type: FormTypes.inputNumber, statistics: true },
+            { title: '备注', key: 'remark', width: '6%', type: FormTypes.input },
             { title: '关联id', key: 'linkId', width: '5%', type: FormTypes.hidden },
           ]
         },
diff --git a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue
index 810f92a8..384d3716 100644
--- a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue
+++ b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue
@@ -264,7 +264,7 @@
             },
             { title: '名称', key: 'name', width: '8%', type: FormTypes.normal },
             { title: '规格', key: 'standard', width: '7%', type: FormTypes.normal },
-            { title: '型号', key: 'model', width: '6%', type: FormTypes.normal },
+            { title: '型号', key: 'model', width: '7%', type: FormTypes.normal },
             { title: '颜色', key: 'color', width: '5%', type: FormTypes.normal },
             { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.normal },
             { title: '库存', key: 'stock', width: '5%', type: FormTypes.normal },
@@ -282,8 +282,8 @@
             { title: '金额', key: 'allPrice', width: '5%', type: FormTypes.inputNumber, statistics: true },
             { title: '税率', key: 'taxRate', width: '4%', type: FormTypes.inputNumber,placeholder: '%'},
             { title: '税额', key: 'taxMoney', width: '5%', type: FormTypes.inputNumber, readonly: true, statistics: true },
-            { title: '价税合计', key: 'taxLastMoney', width: '6%', type: FormTypes.inputNumber, statistics: true },
-            { title: '备注', key: 'remark', width: '5%', type: FormTypes.input },
+            { title: '价税合计', key: 'taxLastMoney', width: '7%', type: FormTypes.inputNumber, statistics: true },
+            { title: '备注', key: 'remark', width: '6%', type: FormTypes.input },
             { title: '关联id', key: 'linkId', width: '5%', type: FormTypes.hidden },
           ]
         },
diff --git a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
index 74aa0652..03ae72ad 100644
--- a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
+++ b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
@@ -234,7 +234,7 @@
             },
             { title: '名称', key: 'name', width: '8%', type: FormTypes.normal },
             { title: '规格', key: 'standard', width: '7%', type: FormTypes.normal },
-            { title: '型号', key: 'model', width: '6%', type: FormTypes.normal },
+            { title: '型号', key: 'model', width: '7%', type: FormTypes.normal },
             { title: '颜色', key: 'color', width: '5%', type: FormTypes.normal },
             { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.normal },
             { title: '库存', key: 'stock', width: '5%', type: FormTypes.normal },
@@ -249,8 +249,8 @@
             { title: '金额', key: 'allPrice', width: '5%', type: FormTypes.inputNumber, statistics: true },
             { title: '税率', key: 'taxRate', width: '4%', type: FormTypes.inputNumber,placeholder: '%'},
             { title: '税额', key: 'taxMoney', width: '5%', type: FormTypes.inputNumber, readonly: true, statistics: true },
-            { title: '价税合计', key: 'taxLastMoney', width: '6%', type: FormTypes.inputNumber, statistics: true },
-            { title: '备注', key: 'remark', width: '5%', type: FormTypes.input},
+            { title: '价税合计', key: 'taxLastMoney', width: '7%', type: FormTypes.inputNumber, statistics: true },
+            { title: '备注', key: 'remark', width: '6%', type: FormTypes.input},
             { title: '关联id', key: 'linkId', width: '5%', type: FormTypes.hidden },
           ]
         },
diff --git a/jshERP-web/src/views/bill/modules/RetailBackModal.vue b/jshERP-web/src/views/bill/modules/RetailBackModal.vue
index e50f4efe..3c3e9cb1 100644
--- a/jshERP-web/src/views/bill/modules/RetailBackModal.vue
+++ b/jshERP-web/src/views/bill/modules/RetailBackModal.vue
@@ -226,7 +226,7 @@
             },
             { title: '名称', key: 'name', width: '10%', type: FormTypes.normal },
             { title: '规格', key: 'standard', width: '8%', type: FormTypes.normal },
-            { title: '型号', key: 'model', width: '7%', type: FormTypes.normal },
+            { title: '型号', key: 'model', width: '8%', type: FormTypes.normal },
             { title: '颜色', key: 'color', width: '5%', type: FormTypes.normal },
             { title: '扩展信息', key: 'materialOther', width: '7%', type: FormTypes.normal },
             { title: '库存', key: 'stock', width: '5%', type: FormTypes.normal },
@@ -268,7 +268,7 @@
     },
     created () {
       let realScreenWidth = window.screen.width
-      this.minWidth = realScreenWidth<1500?900:1100
+      this.minWidth = realScreenWidth<1500?800:1100
     },
     methods: {
       //调用完edit()方法之后会自动调用此方法
diff --git a/jshERP-web/src/views/bill/modules/RetailOutModal.vue b/jshERP-web/src/views/bill/modules/RetailOutModal.vue
index 8129a36a..9b6c414f 100644
--- a/jshERP-web/src/views/bill/modules/RetailOutModal.vue
+++ b/jshERP-web/src/views/bill/modules/RetailOutModal.vue
@@ -238,7 +238,7 @@
             },
             { title: '名称', key: 'name', width: '10%', type: FormTypes.normal },
             { title: '规格', key: 'standard', width: '8%', type: FormTypes.normal },
-            { title: '型号', key: 'model', width: '7%', type: FormTypes.normal },
+            { title: '型号', key: 'model', width: '8%', type: FormTypes.normal },
             { title: '颜色', key: 'color', width: '5%', type: FormTypes.normal },
             { title: '扩展信息', key: 'materialOther', width: '7%', type: FormTypes.normal },
             { title: '库存', key: 'stock', width: '5%', type: FormTypes.normal },
@@ -278,7 +278,7 @@
     created () {
       this.initPayTypeList()
       let realScreenWidth = window.screen.width
-      this.minWidth = realScreenWidth<1500?900:1100
+      this.minWidth = realScreenWidth<1500?800:1100
     },
     methods: {
       //调用完edit()方法之后会自动调用此方法
diff --git a/jshERP-web/src/views/bill/modules/SaleBackModal.vue b/jshERP-web/src/views/bill/modules/SaleBackModal.vue
index 7de26051..02e490b0 100644
--- a/jshERP-web/src/views/bill/modules/SaleBackModal.vue
+++ b/jshERP-web/src/views/bill/modules/SaleBackModal.vue
@@ -243,7 +243,7 @@
             },
             { title: '名称', key: 'name', width: '8%', type: FormTypes.normal },
             { title: '规格', key: 'standard', width: '7%', type: FormTypes.normal },
-            { title: '型号', key: 'model', width: '6%', type: FormTypes.normal },
+            { title: '型号', key: 'model', width: '7%', type: FormTypes.normal },
             { title: '颜色', key: 'color', width: '5%', type: FormTypes.normal },
             { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.normal },
             { title: '库存', key: 'stock', width: '5%', type: FormTypes.normal },
@@ -261,8 +261,8 @@
             { title: '金额', key: 'allPrice', width: '5%', type: FormTypes.inputNumber, statistics: true },
             { title: '税率', key: 'taxRate', width: '4%', type: FormTypes.inputNumber,placeholder: '%'},
             { title: '税额', key: 'taxMoney', width: '5%', type: FormTypes.inputNumber, readonly: true, statistics: true },
-            { title: '价税合计', key: 'taxLastMoney', width: '6%', type: FormTypes.inputNumber, statistics: true },
-            { title: '备注', key: 'remark', width: '5%', type: FormTypes.input },
+            { title: '价税合计', key: 'taxLastMoney', width: '7%', type: FormTypes.inputNumber, statistics: true },
+            { title: '备注', key: 'remark', width: '6%', type: FormTypes.input },
             { title: '关联id', key: 'linkId', width: '5%', type: FormTypes.hidden },
           ]
         },
diff --git a/jshERP-web/src/views/bill/modules/SaleOrderModal.vue b/jshERP-web/src/views/bill/modules/SaleOrderModal.vue
index fd9f234d..ecc33f1a 100644
--- a/jshERP-web/src/views/bill/modules/SaleOrderModal.vue
+++ b/jshERP-web/src/views/bill/modules/SaleOrderModal.vue
@@ -227,7 +227,7 @@
             },
             { title: '名称', key: 'name', width: '8%', type: FormTypes.normal },
             { title: '规格', key: 'standard', width: '7%', type: FormTypes.normal },
-            { title: '型号', key: 'model', width: '6%', type: FormTypes.normal },
+            { title: '型号', key: 'model', width: '7%', type: FormTypes.normal },
             { title: '颜色', key: 'color', width: '5%', type: FormTypes.normal },
             { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.normal },
             { title: '库存', key: 'stock', width: '5%', type: FormTypes.normal },
@@ -240,8 +240,8 @@
             { title: '金额', key: 'allPrice', width: '5%', type: FormTypes.inputNumber, statistics: true },
             { title: '税率', key: 'taxRate', width: '4%', type: FormTypes.inputNumber,placeholder: '%'},
             { title: '税额', key: 'taxMoney', width: '5%', type: FormTypes.inputNumber, readonly: true, statistics: true },
-            { title: '价税合计', key: 'taxLastMoney', width: '6%', type: FormTypes.inputNumber, statistics: true },
-            { title: '备注', key: 'remark', width: '5%', type: FormTypes.input }
+            { title: '价税合计', key: 'taxLastMoney', width: '7%', type: FormTypes.inputNumber, statistics: true },
+            { title: '备注', key: 'remark', width: '6%', type: FormTypes.input }
           ]
         },
         confirmLoading: false,
diff --git a/jshERP-web/src/views/bill/modules/SaleOutModal.vue b/jshERP-web/src/views/bill/modules/SaleOutModal.vue
index 2464e5c4..d9ee9e34 100644
--- a/jshERP-web/src/views/bill/modules/SaleOutModal.vue
+++ b/jshERP-web/src/views/bill/modules/SaleOutModal.vue
@@ -280,7 +280,7 @@
             },
             { title: '名称', key: 'name', width: '8%', type: FormTypes.normal },
             { title: '规格', key: 'standard', width: '7%', type: FormTypes.normal },
-            { title: '型号', key: 'model', width: '6%', type: FormTypes.normal },
+            { title: '型号', key: 'model', width: '7%', type: FormTypes.normal },
             { title: '颜色', key: 'color', width: '5%', type: FormTypes.normal },
             { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.normal },
             { title: '库存', key: 'stock', width: '5%', type: FormTypes.normal },
@@ -298,8 +298,8 @@
             { title: '金额', key: 'allPrice', width: '5%', type: FormTypes.inputNumber, statistics: true },
             { title: '税率', key: 'taxRate', width: '4%', type: FormTypes.inputNumber,placeholder: '%'},
             { title: '税额', key: 'taxMoney', width: '5%', type: FormTypes.inputNumber, readonly: true, statistics: true },
-            { title: '价税合计', key: 'taxLastMoney', width: '6%', type: FormTypes.inputNumber, statistics: true },
-            { title: '备注', key: 'remark', width: '5%', type: FormTypes.input },
+            { title: '价税合计', key: 'taxLastMoney', width: '7%', type: FormTypes.inputNumber, statistics: true },
+            { title: '备注', key: 'remark', width: '6%', type: FormTypes.input },
             { title: '关联id', key: 'linkId', width: '5%', type: FormTypes.hidden },
           ]
         },
diff --git a/jshERP-web/src/views/financial/dialog/FinancialDetail.vue b/jshERP-web/src/views/financial/dialog/FinancialDetail.vue
index bb19c8d2..26cebbc0 100644
--- a/jshERP-web/src/views/financial/dialog/FinancialDetail.vue
+++ b/jshERP-web/src/views/financial/dialog/FinancialDetail.vue
@@ -472,7 +472,7 @@
     },
     created () {
       let realScreenWidth = window.screen.width
-      this.width = realScreenWidth<1500?'1300px':'1550px'
+      this.width = realScreenWidth<1500?'1200px':'1550px'
     },
     methods: {
       show(record, type) {
diff --git a/jshERP-web/src/views/financial/mixins/FinancialModalMixin.js b/jshERP-web/src/views/financial/mixins/FinancialModalMixin.js
index b20c7fc3..41ba81a7 100644
--- a/jshERP-web/src/views/financial/mixins/FinancialModalMixin.js
+++ b/jshERP-web/src/views/financial/mixins/FinancialModalMixin.js
@@ -37,7 +37,7 @@ export const FinancialModalMixin = {
     let userInfo = Vue.ls.get(USER_INFO)
     this.isTenant = userInfo.id === userInfo.tenantId? true:false
     let realScreenWidth = window.screen.width
-    this.width = realScreenWidth<1500?'1300px':'1550px'
+    this.width = realScreenWidth<1500?'1200px':'1550px'
   },
   computed: {
     readOnly: function() {
diff --git a/jshERP-web/src/views/material/modules/MaterialModal.vue b/jshERP-web/src/views/material/modules/MaterialModal.vue
index 8d1d54a4..df1466ae 100644
--- a/jshERP-web/src/views/material/modules/MaterialModal.vue
+++ b/jshERP-web/src/views/material/modules/MaterialModal.vue
@@ -1,7 +1,7 @@
 <template>
   <j-modal
     :title="title"
-    :width="1300"
+    :width="width"
     :visible="visible"
     :confirmLoading="confirmLoading"
     :maskClosable="false"
@@ -44,7 +44,7 @@
                   data-step="4" data-title="单位" data-intro="此处支持单个单位和多单位，勾选多单位就可以切换到多单位的下拉框，多单位需要先在【计量单位】页面进行录入。
                   比如牛奶有瓶和箱两种单位，12瓶=1箱，这就构成了多单位，多单位中有个换算比例">
                   <a-row class="form-row" :gutter="24">
-                    <a-col :lg="15" :md="15" :sm="24">
+                    <a-col :lg="14" :md="14" :sm="24">
                       <a-input placeholder="输入单位" v-if="!unitChecked" v-decorator.trim="[ 'unit', validatorRules.unit ]" @change="onlyUnitOnChange" />
                       <a-select :value="unitList" placeholder="选择多单位" v-decorator="[ 'unitId', validatorRules.unitId ]" @change="manyUnitOnChange"
                         showSearch optionFilterProp="children" v-if="unitChecked" :dropdownMatchSelectWidth="false">
@@ -60,7 +60,7 @@
                         </a-select-option>
                       </a-select>
                     </a-col>
-                    <a-col :lg="9" :md="9" :sm="24">
+                    <a-col :lg="10" :md="10" :sm="24">
                       <a-checkbox :checked="unitChecked" @change="unitOnChange">多单位</a-checkbox>
                     </a-col>
                   </a-row>
@@ -294,6 +294,7 @@
     data () {
       return {
         title:"操作",
+        width: '1300px',
         visible: false,
         modalStyle: '',
         categoryTree: [],
@@ -421,6 +422,8 @@
     },
     created () {
       this.loadParseMaterialProperty()
+      let realScreenWidth = window.screen.width
+      this.width = realScreenWidth<1500?'1200px':'1550px'
     },
     methods: {
       // 获取所有的editableTable实例
@@ -1132,7 +1135,7 @@
 <style scoped>
   .input-table {
     max-width: 100%;
-    min-width: 1550px;
+    min-width: 1200px;
   }
   .tag-info {
     font-size:14px;