给单据增加sku字段

jshERP-web/src/components/jeecg/JEditableTable.vue

@@ -743,7 +743,7 @@
               >
                 <span
                   v-show="col.type === formTypes.inputNumber"
-                  style="padding: 0 10px;"
+                  style="padding: 0 2px;"
                 >{{statisticsColumns[col.key]}}</span>
               </div>
             </template>
@@ -770,7 +770,7 @@
   import JSelectMaterial from '@/components/jeecgbiz/JSelectMaterial'
 
   // 行高，需要在实例加载完成前用到
-  let rowHeight = 61
+  let rowHeight = 42
 
   export default {
     name: 'JEditableTable',
@@ -2754,7 +2754,7 @@
   @borderColor: #e8e8e8;
   @border: 1px solid @borderColor;
   /* tr & td 之间的间距 */
-  @spacing: 8px;
+  @spacing: 2px;
 
   .input-table {
     max-width: 100%;
@@ -2894,7 +2894,7 @@
 
       .td {
         /*flex: 1;*/
-        padding: 14px @spacing 14px 0;
+        padding: 6px @spacing 6px 0;
         justify-content: center;
 
         &:last-child {
@@ -2908,7 +2908,7 @@
           list-style: none;
           position: relative;
           display: inline-block;
-          padding: 4px 11px;
+          padding: 2px 2px;
           width: 100%;
           height: 32px;
           font-size: 14px;

jshERP-web/src/components/jeecgbiz/JSelectMaterial.vue

@@ -19,7 +19,7 @@
     props: {
       modalWidth: {
         type: Number,
-        default: 1100,
+        default: 1200,
         required: false
       },
       value: {

jshERP-web/src/components/jeecgbiz/modal/JSelectMaterialModal.vue

@@ -99,6 +99,7 @@
           {dataIndex: 'standard', title: '规格', width: 80},
           {dataIndex: 'model', title: '型号', width: 80},
           {dataIndex: 'unit', title: '单位', width: 60},
+          {dataIndex: 'sku', title: '多属性', width: 100},
           {dataIndex: 'stock', title: '库存', width: 50},
           {dataIndex: 'expand', title: '扩展信息', width: 80}
         ],

jshERP-web/src/views/bill/AllocationOutList.vue

@@ -145,16 +145,6 @@
         },
         // 表头
         columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:40,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
-            }
-          },
           { title: '单据编号', dataIndex: 'number',width:160,
             customRender:function (text,record,index) {
               if(record.linkNumber) {

jshERP-web/src/views/bill/AssembleList.vue

@@ -145,16 +145,6 @@
         },
         // 表头
         columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:40,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
-            }
-          },
           { title: '单据编号', dataIndex: 'number',width:160,
             customRender:function (text,record,index) {
               if(record.linkNumber) {

jshERP-web/src/views/bill/DisassembleList.vue

@@ -145,16 +145,6 @@
         },
         // 表头
         columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:40,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
-            }
-          },
           { title: '单据编号', dataIndex: 'number',width:160,
             customRender:function (text,record,index) {
               if(record.linkNumber) {

jshERP-web/src/views/bill/OtherInList.vue

@@ -155,16 +155,6 @@
         },
         // 表头
         columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:40,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
-            }
-          },
           { title: '供应商', dataIndex: 'organName',width:120},
           { title: '单据编号', dataIndex: 'number',width:160,
             customRender:function (text,record,index) {

jshERP-web/src/views/bill/OtherOutList.vue

@@ -155,16 +155,6 @@
         },
         // 表头
         columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:40,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
-            }
-          },
           { title: '客户', dataIndex: 'organName',width:120},
           { title: '单据编号', dataIndex: 'number',width:160,
             customRender:function (text,record,index) {

jshERP-web/src/views/bill/PurchaseBackList.vue

@@ -155,16 +155,6 @@
         },
         // 表头
         columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:40,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
-            }
-          },
           { title: '供应商', dataIndex: 'organName',width:120},
           { title: '单据编号', dataIndex: 'number',width:160,
             customRender:function (text,record,index) {

jshERP-web/src/views/bill/PurchaseInList.vue

@@ -156,16 +156,6 @@
         },
         // 表头
         columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:40,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
-            }
-          },
           { title: '供应商', dataIndex: 'organName',width:120},
           { title: '单据编号', dataIndex: 'number',width:160,
             customRender:function (text,record,index) {

jshERP-web/src/views/bill/PurchaseOrderList.vue

@@ -163,16 +163,6 @@
         },
         // 表头
         columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:40,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
-            }
-          },
           { title: '供应商', dataIndex: 'organName',width:120},
           { title: '单据编号', dataIndex: 'number',width:160,
             customRender:function (text,record,index) {

jshERP-web/src/views/bill/RetailBackList.vue

@@ -155,16 +155,6 @@
         },
         // 表头
         columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:40,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
-            }
-          },
           { title: '会员', dataIndex: 'organName',width:120},
           { title: '单据编号', dataIndex: 'number',width:160,
             customRender:function (text,record,index) {

jshERP-web/src/views/bill/RetailOutList.vue

@@ -155,16 +155,6 @@
         },
         // 表头
         columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:40,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
-            }
-          },
           { title: '会员', dataIndex: 'organName',width:120},
           { title: '单据编号', dataIndex: 'number',width:160,
             customRender:function (text,record,index) {

jshERP-web/src/views/bill/SaleBackList.vue

@@ -155,16 +155,6 @@
         },
         // 表头
         columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:40,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
-            }
-          },
           { title: '客户', dataIndex: 'organName',width:120},
           { title: '单据编号', dataIndex: 'number',width:160,
             customRender:function (text,record,index) {

jshERP-web/src/views/bill/SaleOrderList.vue

@@ -163,16 +163,6 @@
         },
         // 表头
         columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:40,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
-            }
-          },
           { title: '客户', dataIndex: 'organName',width:120},
           { title: '单据编号', dataIndex: 'number',width:160,
             customRender:function (text,record,index) {

jshERP-web/src/views/bill/SaleOutList.vue

@@ -156,16 +156,6 @@
         },
         // 表头
         columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:40,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
-            }
-          },
           { title: '客户', dataIndex: 'organName',width:120},
           { title: '单据编号', dataIndex: 'number',width:160,
             customRender:function (text,record,index) {

jshERP-web/src/views/bill/dialog/BillDetail.vue

@@ -854,6 +854,7 @@
           { title: '库存', dataIndex: 'stock', width: '5%'},
           { title: '调入仓库', dataIndex: 'anotherDepotName', width: '8%'},
           { title: '单位', dataIndex: 'unit', width: '4%'},
+          { title: '多属性', dataIndex: 'sku', width: '4%'},
           { title: '数量', dataIndex: 'operNumber', width: '5%'},
           { title: '单价', dataIndex: 'unitPrice', width: '5%'},
           { title: '金额', dataIndex: 'allPrice', width: '5%'},
@@ -869,6 +870,7 @@
           { title: '扩展信息', dataIndex: 'materialOther', width: '6%'},
           { title: '库存', dataIndex: 'stock', width: '5%'},
           { title: '单位', dataIndex: 'unit', width: '4%'},
+          { title: '多属性', dataIndex: 'sku', width: '4%'},
           { title: '数量', dataIndex: 'operNumber', width: '5%'},
           { title: '单价', dataIndex: 'unitPrice', width: '5%'},
           { title: '金额', dataIndex: 'allPrice', width: '5%'},
@@ -884,6 +886,7 @@
           { title: '扩展信息', dataIndex: 'materialOther', width: '6%'},
           { title: '库存', dataIndex: 'stock', width: '5%'},
           { title: '单位', dataIndex: 'unit', width: '4%'},
+          { title: '多属性', dataIndex: 'sku', width: '4%'},
           { title: '数量', dataIndex: 'operNumber', width: '5%'},
           { title: '单价', dataIndex: 'unitPrice', width: '5%'},
           { title: '金额', dataIndex: 'allPrice', width: '5%'},
@@ -898,6 +901,7 @@
           { title: '扩展信息', dataIndex: 'materialOther', width: '6%'},
           { title: '库存', dataIndex: 'stock', width: '5%'},
           { title: '单位', dataIndex: 'unit', width: '4%'},
+          { title: '多属性', dataIndex: 'sku', width: '4%'},
           { title: '数量', dataIndex: 'operNumber', width: '5%'},
           { title: '单价', dataIndex: 'unitPrice', width: '5%'},
           { title: '金额', dataIndex: 'allPrice', width: '5%'},
@@ -912,13 +916,14 @@
           { title: '扩展信息', dataIndex: 'materialOther', width: '6%'},
           { title: '库存', dataIndex: 'stock', width: '5%'},
           { title: '单位', dataIndex: 'unit', width: '4%'},
+          { title: '多属性', dataIndex: 'sku', width: '4%'},
           { title: '数量', dataIndex: 'operNumber', width: '5%'},
           { title: '单价', dataIndex: 'unitPrice', width: '5%'},
           { title: '金额', dataIndex: 'allPrice', width: '5%'},
           { title: '备注', dataIndex: 'remark', width: '5%'}
         ],
         purchaseBackColumns: [
-          { title: '仓库名称', dataIndex: 'depotName', width: '8%'},
+          { title: '仓库名称', dataIndex: 'depotName', width: '7%'},
           { title: '条码', dataIndex: 'barCode', width: '10%'},
           { title: '名称', dataIndex: 'name', width: '8%'},
           { title: '规格', dataIndex: 'standard', width: '5%'},
@@ -926,17 +931,18 @@
           { title: '扩展信息', dataIndex: 'materialOther', width: '6%'},
           { title: '库存', dataIndex: 'stock', width: '5%'},
           { title: '单位', dataIndex: 'unit', width: '4%'},
+          { title: '多属性', dataIndex: 'sku', width: '4%'},
           { title: '数量', dataIndex: 'operNumber', width: '5%'},
           { title: '单价', dataIndex: 'unitPrice', width: '5%'},
-          { title: '含税单价', dataIndex: 'taxUnitPrice', width: '6%'},
+          { title: '含税单价', dataIndex: 'taxUnitPrice', width: '5%'},
           { title: '金额', dataIndex: 'allPrice', width: '5%'},
-          { title: '税率(%)', dataIndex: 'taxRate', width: '6%'},
+          { title: '税率(%)', dataIndex: 'taxRate', width: '5%'},
           { title: '税额', dataIndex: 'taxMoney', width: '5%'},
-          { title: '价税合计', dataIndex: 'taxLastMoney', width: '6%'},
+          { title: '价税合计', dataIndex: 'taxLastMoney', width: '5%'},
           { title: '备注', dataIndex: 'remark', width: '5%'}
         ],
         purchaseInColumns: [
-          { title: '仓库名称', dataIndex: 'depotName', width: '8%'},
+          { title: '仓库名称', dataIndex: 'depotName', width: '7%'},
           { title: '条码', dataIndex: 'barCode', width: '10%'},
           { title: '名称', dataIndex: 'name', width: '8%'},
           { title: '规格', dataIndex: 'standard', width: '5%'},
@@ -944,13 +950,14 @@
           { title: '扩展信息', dataIndex: 'materialOther', width: '6%'},
           { title: '库存', dataIndex: 'stock', width: '5%'},
           { title: '单位', dataIndex: 'unit', width: '4%'},
+          { title: '多属性', dataIndex: 'sku', width: '4%'},
           { title: '数量', dataIndex: 'operNumber', width: '5%'},
           { title: '单价', dataIndex: 'unitPrice', width: '5%'},
-          { title: '含税单价', dataIndex: 'taxUnitPrice', width: '6%'},
+          { title: '含税单价', dataIndex: 'taxUnitPrice', width: '5%'},
           { title: '金额', dataIndex: 'allPrice', width: '5%'},
-          { title: '税率(%)', dataIndex: 'taxRate', width: '6%'},
+          { title: '税率(%)', dataIndex: 'taxRate', width: '5%'},
           { title: '税额', dataIndex: 'taxMoney', width: '5%'},
-          { title: '价税合计', dataIndex: 'taxLastMoney', width: '6%'},
+          { title: '价税合计', dataIndex: 'taxLastMoney', width: '5%'},
           { title: '备注', dataIndex: 'remark', width: '5%'}
         ],
         purchaseOrderColumns: [
@@ -962,6 +969,7 @@
           { title: '扩展信息', dataIndex: 'materialOther', width: '6%'},
           { title: '库存', dataIndex: 'stock', width: '5%'},
           { title: '单位', dataIndex: 'unit', width: '4%'},
+          { title: '多属性', dataIndex: 'sku', width: '4%'},
           { title: '数量', dataIndex: 'operNumber', width: '5%'},
           { title: '单价', dataIndex: 'unitPrice', width: '5%'},
           { title: '金额', dataIndex: 'allPrice', width: '5%'},
@@ -976,6 +984,7 @@
           { title: '扩展信息', dataIndex: 'materialOther', width: '6%'},
           { title: '库存', dataIndex: 'stock', width: '5%'},
           { title: '单位', dataIndex: 'unit', width: '4%'},
+          { title: '多属性', dataIndex: 'sku', width: '4%'},
           { title: '数量', dataIndex: 'operNumber', width: '5%'},
           { title: '单价', dataIndex: 'unitPrice', width: '5%'},
           { title: '金额', dataIndex: 'allPrice', width: '5%'},
@@ -990,13 +999,14 @@
           { title: '扩展信息', dataIndex: 'materialOther', width: '6%'},
           { title: '库存', dataIndex: 'stock', width: '5%'},
           { title: '单位', dataIndex: 'unit', width: '4%'},
+          { title: '多属性', dataIndex: 'sku', width: '4%'},
           { title: '数量', dataIndex: 'operNumber', width: '5%'},
           { title: '单价', dataIndex: 'unitPrice', width: '5%'},
           { title: '金额', dataIndex: 'allPrice', width: '5%'},
           { title: '备注', dataIndex: 'remark', width: '5%'}
         ],
         saleBackColumns: [
-          { title: '仓库名称', dataIndex: 'depotName', width: '8%'},
+          { title: '仓库名称', dataIndex: 'depotName', width: '7%'},
           { title: '条码', dataIndex: 'barCode', width: '10%'},
           { title: '名称', dataIndex: 'name', width: '8%'},
           { title: '规格', dataIndex: 'standard', width: '5%'},
@@ -1004,13 +1014,14 @@
           { title: '扩展信息', dataIndex: 'materialOther', width: '6%'},
           { title: '库存', dataIndex: 'stock', width: '5%'},
           { title: '单位', dataIndex: 'unit', width: '4%'},
+          { title: '多属性', dataIndex: 'sku', width: '4%'},
           { title: '数量', dataIndex: 'operNumber', width: '5%'},
           { title: '单价', dataIndex: 'unitPrice', width: '5%'},
-          { title: '含税单价', dataIndex: 'taxUnitPrice', width: '6%'},
+          { title: '含税单价', dataIndex: 'taxUnitPrice', width: '5%'},
           { title: '金额', dataIndex: 'allPrice', width: '5%'},
-          { title: '税率(%)', dataIndex: 'taxRate', width: '6%'},
+          { title: '税率(%)', dataIndex: 'taxRate', width: '5%'},
           { title: '税额', dataIndex: 'taxMoney', width: '5%'},
-          { title: '价税合计', dataIndex: 'taxLastMoney', width: '6%'},
+          { title: '价税合计', dataIndex: 'taxLastMoney', width: '5%'},
           { title: '备注', dataIndex: 'remark', width: '5%'}
         ],
         saleOrderColumns: [
@@ -1022,13 +1033,14 @@
           { title: '扩展信息', dataIndex: 'materialOther', width: '6%'},
           { title: '库存', dataIndex: 'stock', width: '5%'},
           { title: '单位', dataIndex: 'unit', width: '4%'},
+          { title: '多属性', dataIndex: 'sku', width: '4%'},
           { title: '数量', dataIndex: 'operNumber', width: '5%'},
           { title: '单价', dataIndex: 'unitPrice', width: '5%'},
           { title: '金额', dataIndex: 'allPrice', width: '5%'},
           { title: '备注', dataIndex: 'remark', width: '5%'}
         ],
         saleOutColumns: [
-          { title: '仓库名称', dataIndex: 'depotName', width: '8%'},
+          { title: '仓库名称', dataIndex: 'depotName', width: '7%'},
           { title: '条码', dataIndex: 'barCode', width: '10%'},
           { title: '名称', dataIndex: 'name', width: '8%'},
           { title: '规格', dataIndex: 'standard', width: '5%'},
@@ -1036,13 +1048,14 @@
           { title: '扩展信息', dataIndex: 'materialOther', width: '6%'},
           { title: '库存', dataIndex: 'stock', width: '5%'},
           { title: '单位', dataIndex: 'unit', width: '4%'},
+          { title: '多属性', dataIndex: 'sku', width: '4%'},
           { title: '数量', dataIndex: 'operNumber', width: '5%'},
           { title: '单价', dataIndex: 'unitPrice', width: '5%'},
-          { title: '含税单价', dataIndex: 'taxUnitPrice', width: '6%'},
+          { title: '含税单价', dataIndex: 'taxUnitPrice', width: '5%'},
           { title: '金额', dataIndex: 'allPrice', width: '5%'},
-          { title: '税率(%)', dataIndex: 'taxRate', width: '6%'},
+          { title: '税率(%)', dataIndex: 'taxRate', width: '5%'},
           { title: '税额', dataIndex: 'taxMoney', width: '5%'},
-          { title: '价税合计', dataIndex: 'taxLastMoney', width: '6%'},
+          { title: '价税合计', dataIndex: 'taxLastMoney', width: '5%'},
           { title: '备注', dataIndex: 'remark', width: '5%'}
         ]
       }

jshERP-web/src/views/bill/mixins/BillModalMixin.js

@@ -196,6 +196,7 @@ export const BillModalMixin = {
                   model: res.data.model,
                   materialOther: res.data.materialOther,
                   unit: res.data.commodityUnit,
+                  sku: res.data.sku,
                   operNumber: 1,
                   unitPrice: res.data.billPrice,
                   taxUnitPrice: res.data.billPrice,

jshERP-web/src/views/bill/modules/AllocationOutModal.vue

@@ -77,7 +77,7 @@
     data () {
       return {
         title:"操作",
-        width: '1450px',
+        width: '1600px',
         moreStatus: false,
         // 新增时子表默认添加几行空数据
         addDefaultRowNum: 1,
@@ -100,19 +100,20 @@
           loading: false,
           dataSource: [],
           columns: [
-            { title: '仓库名称', key: 'depotId', width: '8%', type: FormTypes.select, placeholder: '请选择${title}', options: [],
+            { title: '仓库名称', key: 'depotId', width: '7%', type: FormTypes.select, placeholder: '请选择${title}', options: [],
               allowSearch:true, validateRules: [{ required: true, message: '${title}不能为空' }]
             },
-            { title: '条码', key: 'barCode', width: '10%', type: FormTypes.popupJsh, multi: false,
+            { title: '条码', key: 'barCode', width: '8%', type: FormTypes.popupJsh, multi: false,
               validateRules: [{ required: true, message: '${title}不能为空' }]
             },
-            { title: '名称', key: 'name', width: '8%', type: FormTypes.input, readonly: true },
+            { title: '名称', key: 'name', width: '6%', type: FormTypes.input, readonly: true },
             { title: '规格', key: 'standard', width: '5%', type: FormTypes.input, readonly: true },
             { title: '型号', key: 'model', width: '5%', type: FormTypes.input, readonly: true },
-            { title: '扩展信息', key: 'materialOther', width: '6%', type: FormTypes.input, readonly: true },
+            { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.input, readonly: true },
             { title: '库存', key: 'stock', width: '5%', type: FormTypes.input, readonly: true },
-            { title: '调入仓库', key: 'anotherDepotId', width: '8%', type: FormTypes.select, placeholder: '请选择${title}', options: [], allowSearch:true},
+            { title: '调入仓库', key: 'anotherDepotId', width: '7%', type: FormTypes.select, placeholder: '请选择${title}', options: [], allowSearch:true},
             { title: '单位', key: 'unit', width: '4%', type: FormTypes.input, readonly: true },
+            { title: '多属性', key: 'sku', width: '4%', type: FormTypes.input, readonly: true },
             { title: '数量', key: 'operNumber', width: '5%', type: FormTypes.inputNumber, statistics: true,
               validateRules: [{ required: true, message: '${title}不能为空' }]
             },

jshERP-web/src/views/bill/modules/AssembleModal.vue

@@ -78,7 +78,7 @@
     data () {
       return {
         title:"操作",
-        width: '1450px',
+        width: '1600px',
         moreStatus: false,
         // 新增时子表默认添加几行空数据
         addDefaultRowNum: 1,
@@ -102,18 +102,19 @@
           dataSource: [],
           columns: [
             { title: '商品类型',key: 'mType',width:'7%', type: FormTypes.input, readonly: true },
-            { title: '仓库名称', key: 'depotId', width: '8%', type: FormTypes.select, placeholder: '请选择${title}', options: [],
+            { title: '仓库名称', key: 'depotId', width: '7%', type: FormTypes.select, placeholder: '请选择${title}', options: [],
               allowSearch:true, validateRules: [{ required: true, message: '${title}不能为空' }]
             },
-            { title: '条码', key: 'barCode', width: '10%', type: FormTypes.popupJsh, multi: false,
+            { title: '条码', key: 'barCode', width: '8%', type: FormTypes.popupJsh, multi: false,
               validateRules: [{ required: true, message: '${title}不能为空' }]
             },
-            { title: '名称', key: 'name', width: '8%', type: FormTypes.input, readonly: true },
+            { title: '名称', key: 'name', width: '6%', type: FormTypes.input, readonly: true },
             { title: '规格', key: 'standard', width: '5%', type: FormTypes.input, readonly: true },
             { title: '型号', key: 'model', width: '5%', type: FormTypes.input, readonly: true },
-            { title: '扩展信息', key: 'materialOther', width: '6%', type: FormTypes.input, readonly: true },
+            { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.input, readonly: true },
             { title: '库存', key: 'stock', width: '5%', type: FormTypes.input, readonly: true },
             { title: '单位', key: 'unit', width: '4%', type: FormTypes.input, readonly: true },
+            { title: '多属性', key: 'sku', width: '4%', type: FormTypes.input, readonly: true },
             { title: '数量', key: 'operNumber', width: '5%', type: FormTypes.inputNumber, statistics: true,
               validateRules: [{ required: true, message: '${title}不能为空' }]
             },

jshERP-web/src/views/bill/modules/DisassembleModal.vue

@@ -78,7 +78,7 @@
     data () {
       return {
         title:"操作",
-        width: '1450px',
+        width: '1600px',
         moreStatus: false,
         // 新增时子表默认添加几行空数据
         addDefaultRowNum: 1,
@@ -102,18 +102,19 @@
           dataSource: [],
           columns: [
             { title: '商品类型',key: 'mType',width:'7%', type: FormTypes.input, readonly: true },
-            { title: '仓库名称', key: 'depotId', width: '8%', type: FormTypes.select, placeholder: '请选择${title}', options: [],
+            { title: '仓库名称', key: 'depotId', width: '7%', type: FormTypes.select, placeholder: '请选择${title}', options: [],
               allowSearch:true, validateRules: [{ required: true, message: '${title}不能为空' }]
             },
-            { title: '条码', key: 'barCode', width: '10%', type: FormTypes.popupJsh, multi: false,
+            { title: '条码', key: 'barCode', width: '8%', type: FormTypes.popupJsh, multi: false,
               validateRules: [{ required: true, message: '${title}不能为空' }]
             },
-            { title: '名称', key: 'name', width: '8%', type: FormTypes.input, readonly: true },
+            { title: '名称', key: 'name', width: '6%', type: FormTypes.input, readonly: true },
             { title: '规格', key: 'standard', width: '5%', type: FormTypes.input, readonly: true },
             { title: '型号', key: 'model', width: '5%', type: FormTypes.input, readonly: true },
-            { title: '扩展信息', key: 'materialOther', width: '6%', type: FormTypes.input, readonly: true },
+            { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.input, readonly: true },
             { title: '库存', key: 'stock', width: '5%', type: FormTypes.input, readonly: true },
             { title: '单位', key: 'unit', width: '4%', type: FormTypes.input, readonly: true },
+            { title: '多属性', key: 'sku', width: '4%', type: FormTypes.input, readonly: true },
             { title: '数量', key: 'operNumber', width: '5%', type: FormTypes.inputNumber, statistics: true,
               validateRules: [{ required: true, message: '${title}不能为空' }]
             },

jshERP-web/src/views/bill/modules/OtherInModal.vue

@@ -86,7 +86,7 @@
     data () {
       return {
         title:"操作",
-        width: '1450px',
+        width: '1600px',
         moreStatus: false,
         // 新增时子表默认添加几行空数据
         addDefaultRowNum: 1,
@@ -109,18 +109,19 @@
           loading: false,
           dataSource: [],
           columns: [
-            { title: '仓库名称', key: 'depotId', width: '8%', type: FormTypes.select, placeholder: '请选择${title}', options: [],
+            { title: '仓库名称', key: 'depotId', width: '7%', type: FormTypes.select, placeholder: '请选择${title}', options: [],
               allowSearch:true, validateRules: [{ required: true, message: '${title}不能为空' }]
             },
-            { title: '条码', key: 'barCode', width: '10%', type: FormTypes.popupJsh, multi: false,
+            { title: '条码', key: 'barCode', width: '8%', type: FormTypes.popupJsh, multi: false,
               validateRules: [{ required: true, message: '${title}不能为空' }]
             },
-            { title: '名称', key: 'name', width: '8%', type: FormTypes.input, readonly: true },
+            { title: '名称', key: 'name', width: '6%', type: FormTypes.input, readonly: true },
             { title: '规格', key: 'standard', width: '5%', type: FormTypes.input, readonly: true },
             { title: '型号', key: 'model', width: '5%', type: FormTypes.input, readonly: true },
-            { title: '扩展信息', key: 'materialOther', width: '6%', type: FormTypes.input, readonly: true },
+            { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.input, readonly: true },
             { title: '库存', key: 'stock', width: '5%', type: FormTypes.input, readonly: true },
             { title: '单位', key: 'unit', width: '4%', type: FormTypes.input, readonly: true },
+            { title: '多属性', key: 'sku', width: '4%', type: FormTypes.input, readonly: true },
             { title: '数量', key: 'operNumber', width: '5%', type: FormTypes.inputNumber, statistics: true,
               validateRules: [{ required: true, message: '${title}不能为空' }]
             },

jshERP-web/src/views/bill/modules/OtherOutModal.vue

@@ -86,7 +86,7 @@
     data () {
       return {
         title:"操作",
-        width: '1450px',
+        width: '1600px',
         moreStatus: false,
         // 新增时子表默认添加几行空数据
         addDefaultRowNum: 1,
@@ -109,18 +109,19 @@
           loading: false,
           dataSource: [],
           columns: [
-            { title: '仓库名称', key: 'depotId', width: '8%', type: FormTypes.select, placeholder: '请选择${title}', options: [],
+            { title: '仓库名称', key: 'depotId', width: '7%', type: FormTypes.select, placeholder: '请选择${title}', options: [],
               allowSearch:true, validateRules: [{ required: true, message: '${title}不能为空' }]
             },
-            { title: '条码', key: 'barCode', width: '10%', type: FormTypes.popupJsh, multi: false,
+            { title: '条码', key: 'barCode', width: '8%', type: FormTypes.popupJsh, multi: false,
               validateRules: [{ required: true, message: '${title}不能为空' }]
             },
-            { title: '名称', key: 'name', width: '8%', type: FormTypes.input, readonly: true },
+            { title: '名称', key: 'name', width: '6%', type: FormTypes.input, readonly: true },
             { title: '规格', key: 'standard', width: '5%', type: FormTypes.input, readonly: true },
             { title: '型号', key: 'model', width: '5%', type: FormTypes.input, readonly: true },
-            { title: '扩展信息', key: 'materialOther', width: '6%', type: FormTypes.input, readonly: true },
+            { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.input, readonly: true },
             { title: '库存', key: 'stock', width: '5%', type: FormTypes.input, readonly: true },
             { title: '单位', key: 'unit', width: '4%', type: FormTypes.input, readonly: true },
+            { title: '多属性', key: 'sku', width: '4%', type: FormTypes.input, readonly: true },
             { title: '数量', key: 'operNumber', width: '5%', type: FormTypes.inputNumber, statistics: true,
               validateRules: [{ required: true, message: '${title}不能为空' }]
             },

jshERP-web/src/views/bill/modules/PurchaseBackModal.vue

@@ -148,7 +148,7 @@
     data () {
       return {
         title:"操作",
-        width: '1450px',
+        width: '1600px',
         moreStatus: false,
         // 新增时子表默认添加几行空数据
         addDefaultRowNum: 1,
@@ -171,27 +171,28 @@
           loading: false,
           dataSource: [],
           columns: [
-            { title: '仓库名称', key: 'depotId', width: '8%', type: FormTypes.select, placeholder: '请选择${title}', options: [],
+            { title: '仓库名称', key: 'depotId', width: '7%', type: FormTypes.select, placeholder: '请选择${title}', options: [],
               allowSearch:true, validateRules: [{ required: true, message: '${title}不能为空' }]
             },
-            { title: '条码', key: 'barCode', width: '10%', type: FormTypes.popupJsh, multi: false,
+            { title: '条码', key: 'barCode', width: '8%', type: FormTypes.popupJsh, multi: false,
               validateRules: [{ required: true, message: '${title}不能为空' }]
             },
-            { title: '名称', key: 'name', width: '8%', type: FormTypes.input, readonly: true },
+            { title: '名称', key: 'name', width: '6%', type: FormTypes.input, readonly: true },
             { title: '规格', key: 'standard', width: '5%', type: FormTypes.input, readonly: true },
             { title: '型号', key: 'model', width: '5%', type: FormTypes.input, readonly: true },
-            { title: '扩展信息', key: 'materialOther', width: '6%', type: FormTypes.input, readonly: true },
+            { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.input, readonly: true },
             { title: '库存', key: 'stock', width: '5%', type: FormTypes.input, readonly: true },
             { title: '单位', key: 'unit', width: '4%', type: FormTypes.input, readonly: true },
+            { title: '多属性', key: 'sku', width: '4%', type: FormTypes.input, readonly: true },
             { title: '数量', key: 'operNumber', width: '5%', type: FormTypes.inputNumber, statistics: true,
               validateRules: [{ required: true, message: '${title}不能为空' }]
             },
             { title: '单价', key: 'unitPrice', width: '5%', type: FormTypes.inputNumber},
-            { title: '含税单价', key: 'taxUnitPrice', width: '6%', type: FormTypes.inputNumber, readonly: true},
+            { title: '含税单价', key: 'taxUnitPrice', width: '5%', type: FormTypes.inputNumber, readonly: true},
             { title: '金额', key: 'allPrice', width: '5%', type: FormTypes.inputNumber, statistics: true },
-            { title: '税率(%)', key: 'taxRate', width: '6%', type: FormTypes.inputNumber},
+            { title: '税率', key: 'taxRate', width: '3%', type: FormTypes.inputNumber,placeholder: '%'},
-            { title: '税额', key: 'taxMoney', width: '5%', type: FormTypes.inputNumber, statistics: true, readonly: true},
+            { title: '税额', key: 'taxMoney', width: '4%', type: FormTypes.inputNumber, statistics: true, readonly: true},
-            { title: '价税合计', key: 'taxLastMoney', width: '6%', type: FormTypes.inputNumber, statistics: true },
+            { title: '价税合计', key: 'taxLastMoney', width: '5%', type: FormTypes.inputNumber, statistics: true },
             { title: '备注', key: 'remark', width: '5%', type: FormTypes.input }
           ]
         },

jshERP-web/src/views/bill/modules/PurchaseInModal.vue

@@ -149,7 +149,7 @@
     data () {
       return {
         title:"操作",
-        width: '1450px',
+        width: '1600px',
         moreStatus: false,
         // 新增时子表默认添加几行空数据
         addDefaultRowNum: 1,
@@ -172,27 +172,28 @@
           loading: false,
           dataSource: [],
           columns: [
-            { title: '仓库名称', key: 'depotId', width: '8%', type: FormTypes.select, placeholder: '请选择${title}', options: [],
+            { title: '仓库名称', key: 'depotId', width: '7%', type: FormTypes.select, placeholder: '请选择${title}', options: [],
               allowSearch:true, validateRules: [{ required: true, message: '${title}不能为空' }]
             },
-            { title: '条码', key: 'barCode', width: '10%', type: FormTypes.popupJsh, multi: false,
+            { title: '条码', key: 'barCode', width: '8%', type: FormTypes.popupJsh, multi: false,
               validateRules: [{ required: true, message: '${title}不能为空' }]
             },
-            { title: '名称', key: 'name', width: '8%', type: FormTypes.input, readonly: true },
+            { title: '名称', key: 'name', width: '6%', type: FormTypes.input, readonly: true },
             { title: '规格', key: 'standard', width: '5%', type: FormTypes.input, readonly: true },
             { title: '型号', key: 'model', width: '5%', type: FormTypes.input, readonly: true },
-            { title: '扩展信息', key: 'materialOther', width: '6%', type: FormTypes.input, readonly: true },
+            { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.input, readonly: true },
             { title: '库存', key: 'stock', width: '5%', type: FormTypes.input, readonly: true },
             { title: '单位', key: 'unit', width: '4%', type: FormTypes.input, readonly: true },
+            { title: '多属性', key: 'sku', width: '4%', type: FormTypes.input, readonly: true },
             { title: '数量', key: 'operNumber', width: '5%', type: FormTypes.inputNumber, statistics: true,
               validateRules: [{ required: true, message: '${title}不能为空' }]
             },
             { title: '单价', key: 'unitPrice', width: '5%', type: FormTypes.inputNumber},
-            { title: '含税单价', key: 'taxUnitPrice', width: '6%', type: FormTypes.inputNumber, readonly: true},
+            { title: '含税单价', key: 'taxUnitPrice', width: '5%', type: FormTypes.inputNumber, readonly: true},
             { title: '金额', key: 'allPrice', width: '5%', type: FormTypes.inputNumber, statistics: true },
-            { title: '税率(%)', key: 'taxRate', width: '6%', type: FormTypes.inputNumber},
+            { title: '税率', key: 'taxRate', width: '4%', type: FormTypes.inputNumber,placeholder: '%'},
-            { title: '税额', key: 'taxMoney', width: '5%', type: FormTypes.inputNumber, statistics: true , readonly: true},
+            { title: '税额', key: 'taxMoney', width: '4%', type: FormTypes.inputNumber, statistics: true , readonly: true},
-            { title: '价税合计', key: 'taxLastMoney', width: '6%', type: FormTypes.inputNumber, statistics: true },
+            { title: '价税合计', key: 'taxLastMoney', width: '5%', type: FormTypes.inputNumber, statistics: true },
             { title: '备注', key: 'remark', width: '5%', type: FormTypes.input }
           ]
         },

jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue

@@ -86,7 +86,7 @@
     data () {
       return {
         title:"操作",
-        width: '1450px',
+        width: '1600px',
         moreStatus: false,
         // 新增时子表默认添加几行空数据
         addDefaultRowNum: 1,
@@ -112,24 +112,25 @@
           loading: false,
           dataSource: [],
           columns: [
-            { title: '仓库名称', key: 'depotId', width: '8%', type: FormTypes.select, placeholder: '请选择${title}', options: [],
+            { title: '仓库名称', key: 'depotId', width: '7%', type: FormTypes.select, placeholder: '请选择${title}', options: [],
               allowSearch:true, validateRules: [{ required: true, message: '${title}不能为空' }]
             },
-            { title: '条码', key: 'barCode', width: '12%', type: FormTypes.popupJsh, multi: false,
+            { title: '条码', key: 'barCode', width: '8%', type: FormTypes.popupJsh, multi: false,
               validateRules: [{ required: true, message: '${title}不能为空' }]
             },
-            { title: '名称', key: 'name', width: '10%', type: FormTypes.input, readonly: true },
+            { title: '名称', key: 'name', width: '6%', type: FormTypes.input, readonly: true },
-            { title: '规格', key: 'standard', width: '6%', type: FormTypes.input, readonly: true },
+            { title: '规格', key: 'standard', width: '5%', type: FormTypes.input, readonly: true },
-            { title: '型号', key: 'model', width: '6%', type: FormTypes.input, readonly: true },
+            { title: '型号', key: 'model', width: '5%', type: FormTypes.input, readonly: true },
-            { title: '扩展信息', key: 'materialOther', width: '8%', type: FormTypes.input, readonly: true },
+            { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.input, readonly: true },
-            { title: '库存', key: 'stock', width: '6%', type: FormTypes.input, readonly: true },
+            { title: '库存', key: 'stock', width: '5%', type: FormTypes.input, readonly: true },
-            { title: '单位', key: 'unit', width: '6%', type: FormTypes.input, readonly: true },
+            { title: '单位', key: 'unit', width: '4%', type: FormTypes.input, readonly: true },
-            { title: '数量', key: 'operNumber', width: '6%', type: FormTypes.inputNumber, statistics: true,
+            { title: '多属性', key: 'sku', width: '4%', type: FormTypes.input, readonly: true },
+            { title: '数量', key: 'operNumber', width: '5%', type: FormTypes.inputNumber, statistics: true,
               validateRules: [{ required: true, message: '${title}不能为空' }]
             },
-            { title: '单价', key: 'unitPrice', width: '6%', type: FormTypes.inputNumber },
+            { title: '单价', key: 'unitPrice', width: '5%', type: FormTypes.inputNumber },
-            { title: '金额', key: 'allPrice', width: '6%', type: FormTypes.inputNumber, statistics: true },
+            { title: '金额', key: 'allPrice', width: '5%', type: FormTypes.inputNumber, statistics: true },
-            { title: '备注', key: 'remark', width: '8%', type: FormTypes.input}
+            { title: '备注', key: 'remark', width: '5%', type: FormTypes.input}
           ]
         },
         confirmLoading: false,

jshERP-web/src/views/bill/modules/RetailBackModal.vue

@@ -130,7 +130,7 @@
     data () {
       return {
         title:"操作",
-        width: '1450px',
+        width: '1600px',
         moreStatus: false,
         // 新增时子表默认添加几行空数据
         addDefaultRowNum: 1,
@@ -153,24 +153,25 @@
           loading: false,
           dataSource: [],
           columns: [
-            { title: '仓库名称', key: 'depotId', width: '8%', type: FormTypes.select, placeholder: '请选择${title}', options: [],
+            { title: '仓库名称', key: 'depotId', width: '7%', type: FormTypes.select, placeholder: '请选择${title}', options: [],
               allowSearch:true, validateRules: [{ required: true, message: '${title}不能为空' }]
             },
-            { title: '条码', key: 'barCode', width: '10%', type: FormTypes.popupJsh, multi: false,
+            { title: '条码', key: 'barCode', width: '12%', type: FormTypes.popupJsh, multi: false,
               validateRules: [{ required: true, message: '${title}不能为空' }]
             },
-            { title: '名称', key: 'name', width: '10%', type: FormTypes.input, readonly: true },
+            { title: '名称', key: 'name', width: '8%', type: FormTypes.input, readonly: true },
-            { title: '规格', key: 'standard', width: '6%', type: FormTypes.input, readonly: true },
+            { title: '规格', key: 'standard', width: '5%', type: FormTypes.input, readonly: true },
-            { title: '型号', key: 'model', width: '6%', type: FormTypes.input, readonly: true },
+            { title: '型号', key: 'model', width: '5%', type: FormTypes.input, readonly: true },
-            { title: '扩展信息', key: 'materialOther', width: '8%', type: FormTypes.input, readonly: true },
+            { title: '扩展信息', key: 'materialOther', width: '7%', type: FormTypes.input, readonly: true },
-            { title: '库存', key: 'stock', width: '6%', type: FormTypes.input, readonly: true },
+            { title: '库存', key: 'stock', width: '5%', type: FormTypes.input, readonly: true },
-            { title: '单位', key: 'unit', width: '6%', type: FormTypes.input, readonly: true },
+            { title: '单位', key: 'unit', width: '4%', type: FormTypes.input, readonly: true },
-            { title: '数量', key: 'operNumber', width: '6%', type: FormTypes.inputNumber, statistics: true,
+            { title: '多属性', key: 'sku', width: '5%', type: FormTypes.input, readonly: true },
+            { title: '数量', key: 'operNumber', width: '5%', type: FormTypes.inputNumber, statistics: true,
               validateRules: [{ required: true, message: '${title}不能为空' }]
             },
-            { title: '单价', key: 'unitPrice', width: '8%', type: FormTypes.inputNumber},
+            { title: '单价', key: 'unitPrice', width: '5%', type: FormTypes.inputNumber},
-            { title: '金额', key: 'allPrice', width: '8%', type: FormTypes.inputNumber, statistics: true },
+            { title: '金额', key: 'allPrice', width: '5%', type: FormTypes.inputNumber, statistics: true },
-            { title: '备注', key: 'remark', width: '9%', type: FormTypes.input }
+            { title: '备注', key: 'remark', width: '5%', type: FormTypes.input }
           ]
         },
         confirmLoading: false,

jshERP-web/src/views/bill/modules/RetailOutModal.vue

@@ -129,7 +129,7 @@
     data () {
       return {
         title:"操作",
-        width: '1450px',
+        width: '1600px',
         moreStatus: false,
         // 新增时子表默认添加几行空数据
         addDefaultRowNum: 1,
@@ -153,24 +153,25 @@
           loading: false,
           dataSource: [],
           columns: [
-            { title: '仓库名称', key: 'depotId', width: '8%', type: FormTypes.select, placeholder: '请选择${title}', options: [],
+            { title: '仓库名称', key: 'depotId', width: '7%', type: FormTypes.select, placeholder: '请选择${title}', options: [],
               allowSearch:true, validateRules: [{ required: true, message: '${title}不能为空' }]
             },
-            { title: '条码', key: 'barCode', width: '10%', type: FormTypes.popupJsh, multi: false,
+            { title: '条码', key: 'barCode', width: '12%', type: FormTypes.popupJsh, multi: false,
               validateRules: [{ required: true, message: '${title}不能为空' }]
             },
-            { title: '名称', key: 'name', width: '10%', type: FormTypes.input, readonly: true },
+            { title: '名称', key: 'name', width: '8%', type: FormTypes.input, readonly: true },
-            { title: '规格', key: 'standard', width: '6%', type: FormTypes.input, readonly: true },
+            { title: '规格', key: 'standard', width: '5%', type: FormTypes.input, readonly: true },
-            { title: '型号', key: 'model', width: '6%', type: FormTypes.input, readonly: true },
+            { title: '型号', key: 'model', width: '5%', type: FormTypes.input, readonly: true },
-            { title: '扩展信息', key: 'materialOther', width: '8%', type: FormTypes.input, readonly: true },
+            { title: '扩展信息', key: 'materialOther', width: '7%', type: FormTypes.input, readonly: true },
-            { title: '库存', key: 'stock', width: '6%', type: FormTypes.input, readonly: true },
+            { title: '库存', key: 'stock', width: '5%', type: FormTypes.input, readonly: true },
-            { title: '单位', key: 'unit', width: '6%', type: FormTypes.input, readonly: true },
+            { title: '单位', key: 'unit', width: '4%', type: FormTypes.input, readonly: true },
-            { title: '数量', key: 'operNumber', width: '6%', type: FormTypes.inputNumber, statistics: true,
+            { title: '多属性', key: 'sku', width: '5%', type: FormTypes.input, readonly: true },
+            { title: '数量', key: 'operNumber', width: '5%', type: FormTypes.inputNumber, statistics: true,
               validateRules: [{ required: true, message: '${title}不能为空' }]
             },
-            { title: '单价', key: 'unitPrice', width: '8%', type: FormTypes.inputNumber},
+            { title: '单价', key: 'unitPrice', width: '5%', type: FormTypes.inputNumber},
-            { title: '金额', key: 'allPrice', width: '8%', type: FormTypes.inputNumber, statistics: true },
+            { title: '金额', key: 'allPrice', width: '5%', type: FormTypes.inputNumber, statistics: true },
-            { title: '备注', key: 'remark', width: '9%', type: FormTypes.input }
+            { title: '备注', key: 'remark', width: '5%', type: FormTypes.input }
           ]
         },
         confirmLoading: false,

jshERP-web/src/views/bill/modules/SaleBackModal.vue

@@ -153,7 +153,7 @@
     data () {
       return {
         title:"操作",
-        width: '1450px',
+        width: '1600px',
         moreStatus: false,
         // 新增时子表默认添加几行空数据
         addDefaultRowNum: 1,
@@ -176,27 +176,28 @@
           loading: false,
           dataSource: [],
           columns: [
-            { title: '仓库名称', key: 'depotId', width: '8%', type: FormTypes.select, placeholder: '请选择${title}', options: [],
+            { title: '仓库名称', key: 'depotId', width: '7%', type: FormTypes.select, placeholder: '请选择${title}', options: [],
               allowSearch:true, validateRules: [{ required: true, message: '${title}不能为空' }]
             },
-            { title: '条码', key: 'barCode', width: '10%', type: FormTypes.popupJsh, multi: false,
+            { title: '条码', key: 'barCode', width: '8%', type: FormTypes.popupJsh, multi: false,
               validateRules: [{ required: true, message: '${title}不能为空' }]
             },
-            { title: '名称', key: 'name', width: '8%', type: FormTypes.input, readonly: true },
+            { title: '名称', key: 'name', width: '6%', type: FormTypes.input, readonly: true },
             { title: '规格', key: 'standard', width: '5%', type: FormTypes.input, readonly: true },
             { title: '型号', key: 'model', width: '5%', type: FormTypes.input, readonly: true },
-            { title: '扩展信息', key: 'materialOther', width: '6%', type: FormTypes.input, readonly: true },
+            { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.input, readonly: true },
             { title: '库存', key: 'stock', width: '5%', type: FormTypes.input, readonly: true },
             { title: '单位', key: 'unit', width: '4%', type: FormTypes.input, readonly: true },
+            { title: '多属性', key: 'sku', width: '4%', type: FormTypes.input, readonly: true },
             { title: '数量', key: 'operNumber', width: '5%', type: FormTypes.inputNumber, statistics: true,
               validateRules: [{ required: true, message: '${title}不能为空' }]
             },
             { title: '单价', key: 'unitPrice', width: '5%', type: FormTypes.inputNumber},
             { title: '含税单价', key: 'taxUnitPrice', width: '6%', type: FormTypes.inputNumber, readonly: true},
             { title: '金额', key: 'allPrice', width: '5%', type: FormTypes.inputNumber, statistics: true },
-            { title: '税率(%)', key: 'taxRate', width: '6%', type: FormTypes.inputNumber},
+            { title: '税率', key: 'taxRate', width: '3%', type: FormTypes.inputNumber,placeholder: '%'},
-            { title: '税额', key: 'taxMoney', width: '5%', type: FormTypes.inputNumber, statistics: true, readonly: true},
+            { title: '税额', key: 'taxMoney', width: '4%', type: FormTypes.inputNumber, statistics: true, readonly: true},
-            { title: '价税合计', key: 'taxLastMoney', width: '6%', type: FormTypes.inputNumber, statistics: true },
+            { title: '价税合计', key: 'taxLastMoney', width: '5%', type: FormTypes.inputNumber, statistics: true },
             { title: '备注', key: 'remark', width: '5%', type: FormTypes.input }
           ]
         },

jshERP-web/src/views/bill/modules/SaleOrderModal.vue

@@ -92,7 +92,7 @@
     data () {
       return {
         title:"操作",
-        width: '1450px',
+        width: '1600px',
         moreStatus: false,
         // 新增时子表默认添加几行空数据
         addDefaultRowNum: 1,
@@ -115,18 +115,19 @@
           loading: false,
           dataSource: [],
           columns: [
-            { title: '仓库名称', key: 'depotId', width: '8%', type: FormTypes.select, placeholder: '请选择${title}', options: [],
+            { title: '仓库名称', key: 'depotId', width: '7%', type: FormTypes.select, placeholder: '请选择${title}', options: [],
               allowSearch:true, validateRules: [{ required: true, message: '${title}不能为空' }]
             },
-            { title: '条码', key: 'barCode', width: '10%', type: FormTypes.popupJsh, multi: false,
+            { title: '条码', key: 'barCode', width: '8%', type: FormTypes.popupJsh, multi: false,
               validateRules: [{ required: true, message: '${title}不能为空' }]
             },
-            { title: '名称', key: 'name', width: '8%', type: FormTypes.input, readonly: true },
+            { title: '名称', key: 'name', width: '6%', type: FormTypes.input, readonly: true },
             { title: '规格', key: 'standard', width: '5%', type: FormTypes.input, readonly: true },
             { title: '型号', key: 'model', width: '5%', type: FormTypes.input, readonly: true },
-            { title: '扩展信息', key: 'materialOther', width: '6%', type: FormTypes.input, readonly: true },
+            { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.input, readonly: true },
             { title: '库存', key: 'stock', width: '5%', type: FormTypes.input, readonly: true },
             { title: '单位', key: 'unit', width: '4%', type: FormTypes.input, readonly: true },
+            { title: '多属性', key: 'sku', width: '4%', type: FormTypes.input, readonly: true },
             { title: '数量', key: 'operNumber', width: '5%', type: FormTypes.inputNumber, statistics: true,
               validateRules: [{ required: true, message: '${title}不能为空' }]
             },

jshERP-web/src/views/bill/modules/SaleOutModal.vue

@@ -153,7 +153,7 @@
     data () {
       return {
         title:"操作",
-        width: '1450px',
+        width: '1600px',
         moreStatus: false,
         // 新增时子表默认添加几行空数据
         addDefaultRowNum: 1,
@@ -176,27 +176,28 @@
           loading: false,
           dataSource: [],
           columns: [
-            { title: '仓库名称', key: 'depotId', width: '8%', type: FormTypes.select, placeholder: '请选择${title}', options: [],
+            { title: '仓库名称', key: 'depotId', width: '7%', type: FormTypes.select, placeholder: '请选择${title}', options: [],
               allowSearch:true, validateRules: [{ required: true, message: '${title}不能为空' }]
             },
-            { title: '条码', key: 'barCode', width: '10%', type: FormTypes.popupJsh, multi: false,
+            { title: '条码', key: 'barCode', width: '8%', type: FormTypes.popupJsh, multi: false,
               validateRules: [{ required: true, message: '${title}不能为空' }]
             },
-            { title: '名称', key: 'name', width: '8%', type: FormTypes.input, readonly: true },
+            { title: '名称', key: 'name', width: '6%', type: FormTypes.input, readonly: true },
             { title: '规格', key: 'standard', width: '5%', type: FormTypes.input, readonly: true },
             { title: '型号', key: 'model', width: '5%', type: FormTypes.input, readonly: true },
-            { title: '扩展信息', key: 'materialOther', width: '6%', type: FormTypes.input, readonly: true },
+            { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.input, readonly: true },
             { title: '库存', key: 'stock', width: '5%', type: FormTypes.input, readonly: true },
             { title: '单位', key: 'unit', width: '4%', type: FormTypes.input, readonly: true },
+            { title: '多属性', key: 'sku', width: '4%', type: FormTypes.input, readonly: true },
             { title: '数量', key: 'operNumber', width: '5%', type: FormTypes.inputNumber, statistics: true,
               validateRules: [{ required: true, message: '${title}不能为空' }]
             },
             { title: '单价', key: 'unitPrice', width: '5%', type: FormTypes.inputNumber},
             { title: '含税单价', key: 'taxUnitPrice', width: '6%', type: FormTypes.inputNumber, readonly: true},
             { title: '金额', key: 'allPrice', width: '5%', type: FormTypes.inputNumber, statistics: true },
-            { title: '税率(%)', key: 'taxRate', width: '6%', type: FormTypes.inputNumber},
+            { title: '税率', key: 'taxRate', width: '3%', type: FormTypes.inputNumber,placeholder: '%'},
-            { title: '税额', key: 'taxMoney', width: '5%', type: FormTypes.inputNumber, statistics: true, readonly: true},
+            { title: '税额', key: 'taxMoney', width: '4%', type: FormTypes.inputNumber, statistics: true, readonly: true},
-            { title: '价税合计', key: 'taxLastMoney', width: '6%', type: FormTypes.inputNumber, statistics: true },
+            { title: '价税合计', key: 'taxLastMoney', width: '5%', type: FormTypes.inputNumber, statistics: true },
             { title: '备注', key: 'remark', width: '5%', type: FormTypes.input }
           ]
         },

jshERP-web/src/views/financial/AdvanceInList.vue

@@ -147,16 +147,6 @@
         },
         // 表头
         columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:40,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
-            }
-          },
           { title: '付款会员', dataIndex: 'organName',width:140},
           { title: '财务人员', dataIndex: 'handsPersonName',width:140},
           { title: '单据编号', dataIndex: 'billNo',width:160},

jshERP-web/src/views/financial/GiroList.vue

@@ -137,16 +137,6 @@
         },
         // 表头
         columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:40,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
-            }
-          },
           { title: '财务人员', dataIndex: 'handsPersonName',width:140},
           { title: '单据编号', dataIndex: 'billNo',width:160},
           { title: '单据日期 ', dataIndex: 'billTimeStr',width:160},

jshERP-web/src/views/financial/ItemInList.vue

@@ -147,16 +147,6 @@
         },
         // 表头
         columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:40,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
-            }
-          },
           { title: '客户', dataIndex: 'organName',width:140},
           { title: '财务人员', dataIndex: 'handsPersonName',width:140},
           { title: '单据编号', dataIndex: 'billNo',width:160},

jshERP-web/src/views/financial/ItemOutList.vue

@@ -147,16 +147,6 @@
         },
         // 表头
         columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:40,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
-            }
-          },
           { title: '供应商', dataIndex: 'organName',width:140},
           { title: '财务人员', dataIndex: 'handsPersonName',width:140},
           { title: '单据编号', dataIndex: 'billNo',width:160},

jshERP-web/src/views/financial/MoneyInList.vue

@@ -148,16 +148,6 @@
         },
         // 表头
         columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:40,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
-            }
-          },
           { title: '客户', dataIndex: 'organName',width:140},
           { title: '财务人员', dataIndex: 'handsPersonName',width:140},
           { title: '单据编号', dataIndex: 'billNo',width:160},

jshERP-web/src/views/financial/MoneyOutList.vue

@@ -148,16 +148,6 @@
         },
         // 表头
         columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:40,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
-            }
-          },
           { title: '供应商', dataIndex: 'organName',width:140},
           { title: '财务人员', dataIndex: 'handsPersonName',width:140},
           { title: '单据编号', dataIndex: 'billNo',width:160},