优化单据的排版，调整列的宽度

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: {

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.width = realScreenWidth<1500?'1200px':'1550px'
-    this.minWidth = realScreenWidth<1500?1250:1500
+    this.minWidth = realScreenWidth<1500?1150:1500
   },
   computed: {
     readOnly: function() {

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 },

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 },

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 },

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 },

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 },

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: 'taxLastMoney', width: '7%', type: FormTypes.inputNumber, statistics: true },
-            { title: '备注', key: 'remark', width: '5%', type: FormTypes.input },
+            { title: '备注', key: 'remark', width: '6%', type: FormTypes.input },
             { title: '关联id', key: 'linkId', width: '5%', type: FormTypes.hidden },
           ]
         },

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: 'taxLastMoney', width: '7%', type: FormTypes.inputNumber, statistics: true },
-            { title: '备注', key: 'remark', width: '5%', type: FormTypes.input },
+            { title: '备注', key: 'remark', width: '6%', type: FormTypes.input },
             { title: '关联id', key: 'linkId', width: '5%', type: FormTypes.hidden },
           ]
         },

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: 'taxLastMoney', width: '7%', type: FormTypes.inputNumber, statistics: true },
-            { title: '备注', key: 'remark', width: '5%', type: FormTypes.input},
+            { title: '备注', key: 'remark', width: '6%', type: FormTypes.input},
             { title: '关联id', key: 'linkId', width: '5%', type: FormTypes.hidden },
           ]
         },

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()方法之后会自动调用此方法

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()方法之后会自动调用此方法

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: 'taxLastMoney', width: '7%', type: FormTypes.inputNumber, statistics: true },
-            { title: '备注', key: 'remark', width: '5%', type: FormTypes.input },
+            { title: '备注', key: 'remark', width: '6%', type: FormTypes.input },
             { title: '关联id', key: 'linkId', width: '5%', type: FormTypes.hidden },
           ]
         },

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: 'taxLastMoney', width: '7%', type: FormTypes.inputNumber, statistics: true },
-            { title: '备注', key: 'remark', width: '5%', type: FormTypes.input }
+            { title: '备注', key: 'remark', width: '6%', type: FormTypes.input }
           ]
         },
         confirmLoading: false,

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: 'taxLastMoney', width: '7%', type: FormTypes.inputNumber, statistics: true },
-            { title: '备注', key: 'remark', width: '5%', type: FormTypes.input },
+            { title: '备注', key: 'remark', width: '6%', type: FormTypes.input },
             { title: '关联id', key: 'linkId', width: '5%', type: FormTypes.hidden },
           ]
         },

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) {

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() {

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;