diff --git a/jshERP-web/src/components/jeecgbiz/modal/JSelectMaterialModal.vue b/jshERP-web/src/components/jeecgbiz/modal/JSelectMaterialModal.vue index 9add71bf..fb5829bf 100644 --- a/jshERP-web/src/components/jeecgbiz/modal/JSelectMaterialModal.vue +++ b/jshERP-web/src/components/jeecgbiz/modal/JSelectMaterialModal.vue @@ -100,7 +100,8 @@ {dataIndex: 'model', title: '型号', width: 80}, {dataIndex: 'unit', title: '单位', width: 60}, {dataIndex: 'sku', title: '多属性', width: 100}, - {dataIndex: 'stock', title: '库存', width: 50}, + {dataIndex: 'skuStock', title: '多属性库存', width: 100}, + {dataIndex: 'stock', title: '商品库存', width: 100}, {dataIndex: 'expand', title: '扩展信息', width: 80} ], scrollTrigger: {}, diff --git a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue index 6a4f2d92..f699bd0b 100644 --- a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue +++ b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue @@ -190,7 +190,7 @@ { title: '单价', key: 'unitPrice', width: '5%', type: FormTypes.inputNumber}, { title: '含税单价', key: 'taxUnitPrice', width: '5%', type: FormTypes.inputNumber, readonly: true}, { title: '金额', key: 'allPrice', width: '5%', type: FormTypes.inputNumber, statistics: true }, - { title: '税率', key: 'taxRate', width: '3%', type: FormTypes.inputNumber,placeholder: '%'}, + { title: '税率', key: 'taxRate', width: '4%', type: FormTypes.inputNumber,placeholder: '%'}, { title: '税额', key: 'taxMoney', width: '4%', type: FormTypes.inputNumber, statistics: true, readonly: true}, { title: '价税合计', key: 'taxLastMoney', width: '5%', type: FormTypes.inputNumber, statistics: true }, { title: '备注', key: 'remark', width: '5%', type: FormTypes.input } diff --git a/jshERP-web/src/views/bill/modules/SaleBackModal.vue b/jshERP-web/src/views/bill/modules/SaleBackModal.vue index 285ff4de..01ede890 100644 --- a/jshERP-web/src/views/bill/modules/SaleBackModal.vue +++ b/jshERP-web/src/views/bill/modules/SaleBackModal.vue @@ -193,9 +193,9 @@ 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: '3%', type: FormTypes.inputNumber,placeholder: '%'}, + { title: '税率', key: 'taxRate', width: '4%', type: FormTypes.inputNumber,placeholder: '%'}, { title: '税额', key: 'taxMoney', width: '4%', type: FormTypes.inputNumber, statistics: true, readonly: true}, { title: '价税合计', key: 'taxLastMoney', width: '5%', type: FormTypes.inputNumber, statistics: true }, { title: '备注', key: 'remark', width: '5%', type: FormTypes.input } diff --git a/jshERP-web/src/views/bill/modules/SaleOutModal.vue b/jshERP-web/src/views/bill/modules/SaleOutModal.vue index 9d7881c2..c13bcf3d 100644 --- a/jshERP-web/src/views/bill/modules/SaleOutModal.vue +++ b/jshERP-web/src/views/bill/modules/SaleOutModal.vue @@ -193,9 +193,9 @@ 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: '3%', type: FormTypes.inputNumber,placeholder: '%'}, + { title: '税率', key: 'taxRate', width: '4%', type: FormTypes.inputNumber,placeholder: '%'}, { title: '税额', key: 'taxMoney', width: '4%', type: FormTypes.inputNumber, statistics: true, readonly: true}, { title: '价税合计', key: 'taxLastMoney', width: '5%', type: FormTypes.inputNumber, statistics: true }, { title: '备注', key: 'remark', width: '5%', type: FormTypes.input }