diff --git a/jshERP-web/src/components/jeecgbiz/JSelectList.vue b/jshERP-web/src/components/jeecgbiz/JSelectList.vue index 314d2a72..021d6de8 100644 --- a/jshERP-web/src/components/jeecgbiz/JSelectList.vue +++ b/jshERP-web/src/components/jeecgbiz/JSelectList.vue @@ -23,7 +23,7 @@ props: { modalWidth: { type: Number, - default: 1200, + default: 1300, required: false }, value: { diff --git a/jshERP-web/src/components/jeecgbiz/JSelectMaterial.vue b/jshERP-web/src/components/jeecgbiz/JSelectMaterial.vue index 1b4bca85..f618d33f 100644 --- a/jshERP-web/src/components/jeecgbiz/JSelectMaterial.vue +++ b/jshERP-web/src/components/jeecgbiz/JSelectMaterial.vue @@ -19,7 +19,7 @@ props: { modalWidth: { type: Number, - default: 1200, + default: 1300, required: false }, value: { diff --git a/jshERP-web/src/components/jeecgbiz/modal/JSelectMaterialModal.vue b/jshERP-web/src/components/jeecgbiz/modal/JSelectMaterialModal.vue index fed1495b..0c1e53c7 100644 --- a/jshERP-web/src/components/jeecgbiz/modal/JSelectMaterialModal.vue +++ b/jshERP-web/src/components/jeecgbiz/modal/JSelectMaterialModal.vue @@ -106,6 +106,7 @@ {dataIndex: 'categoryName', title: '类别', width: 80}, {dataIndex: 'standard', title: '规格', width: 80}, {dataIndex: 'model', title: '型号', width: 80}, + {dataIndex: 'color', title: '颜色', width: 80}, {dataIndex: 'unit', title: '单位', width: 60}, {dataIndex: 'sku', title: '多属性', width: 80}, {dataIndex: 'stock', title: '库存', width: 60}, diff --git a/jshERP-web/src/views/bill/dialog/BillDetail.vue b/jshERP-web/src/views/bill/dialog/BillDetail.vue index 2ba7fb05..e6480973 100644 --- a/jshERP-web/src/views/bill/dialog/BillDetail.vue +++ b/jshERP-web/src/views/bill/dialog/BillDetail.vue @@ -889,6 +889,7 @@ { title: '名称', dataIndex: 'name'}, { title: '规格', dataIndex: 'standard'}, { title: '型号', dataIndex: 'model'}, + { title: '颜色', dataIndex: 'color'}, { title: '扩展信息', dataIndex: 'materialOther'}, { title: '库存', dataIndex: 'stock'}, { title: '单位', dataIndex: 'unit'}, @@ -904,6 +905,7 @@ { title: '名称', dataIndex: 'name'}, { title: '规格', dataIndex: 'standard'}, { title: '型号', dataIndex: 'model'}, + { title: '颜色', dataIndex: 'color'}, { title: '扩展信息', dataIndex: 'materialOther'}, { title: '库存', dataIndex: 'stock'}, { title: '单位', dataIndex: 'unit'}, @@ -918,6 +920,7 @@ { title: '名称', dataIndex: 'name'}, { title: '规格', dataIndex: 'standard'}, { title: '型号', dataIndex: 'model'}, + { title: '颜色', dataIndex: 'color'}, { title: '扩展信息', dataIndex: 'materialOther'}, { title: '库存', dataIndex: 'stock'}, { title: '单位', dataIndex: 'unit'}, @@ -934,6 +937,7 @@ { title: '名称', dataIndex: 'name'}, { title: '规格', dataIndex: 'standard'}, { title: '型号', dataIndex: 'model'}, + { title: '颜色', dataIndex: 'color'}, { title: '扩展信息', dataIndex: 'materialOther'}, { title: '库存', dataIndex: 'stock'}, { title: '单位', dataIndex: 'unit'}, @@ -956,6 +960,7 @@ { title: '名称', dataIndex: 'name'}, { title: '规格', dataIndex: 'standard'}, { title: '型号', dataIndex: 'model'}, + { title: '颜色', dataIndex: 'color'}, { title: '扩展信息', dataIndex: 'materialOther'}, { title: '库存', dataIndex: 'stock'}, { title: '单位', dataIndex: 'unit'}, @@ -977,6 +982,7 @@ { title: '名称', dataIndex: 'name'}, { title: '规格', dataIndex: 'standard'}, { title: '型号', dataIndex: 'model'}, + { title: '颜色', dataIndex: 'color'}, { title: '扩展信息', dataIndex: 'materialOther'}, { title: '库存', dataIndex: 'stock'}, { title: '单位', dataIndex: 'unit'}, @@ -993,6 +999,7 @@ { title: '名称', dataIndex: 'name'}, { title: '规格', dataIndex: 'standard'}, { title: '型号', dataIndex: 'model'}, + { title: '颜色', dataIndex: 'color'}, { title: '扩展信息', dataIndex: 'materialOther'}, { title: '库存', dataIndex: 'stock'}, { title: '单位', dataIndex: 'unit'}, @@ -1015,6 +1022,7 @@ { title: '名称', dataIndex: 'name'}, { title: '规格', dataIndex: 'standard'}, { title: '型号', dataIndex: 'model'}, + { title: '颜色', dataIndex: 'color'}, { title: '扩展信息', dataIndex: 'materialOther'}, { title: '库存', dataIndex: 'stock'}, { title: '单位', dataIndex: 'unit'}, @@ -1037,6 +1045,7 @@ { title: '名称', dataIndex: 'name'}, { title: '规格', dataIndex: 'standard'}, { title: '型号', dataIndex: 'model'}, + { title: '颜色', dataIndex: 'color'}, { title: '扩展信息', dataIndex: 'materialOther'}, { title: '库存', dataIndex: 'stock'}, { title: '单位', dataIndex: 'unit'}, @@ -1052,6 +1061,7 @@ { title: '名称', dataIndex: 'name'}, { title: '规格', dataIndex: 'standard'}, { title: '型号', dataIndex: 'model'}, + { title: '颜色', dataIndex: 'color'}, { title: '扩展信息', dataIndex: 'materialOther'}, { title: '库存', dataIndex: 'stock'}, { title: '单位', dataIndex: 'unit'}, @@ -1067,6 +1077,7 @@ { title: '名称', dataIndex: 'name'}, { title: '规格', dataIndex: 'standard'}, { title: '型号', dataIndex: 'model'}, + { title: '颜色', dataIndex: 'color'}, { title: '扩展信息', dataIndex: 'materialOther'}, { title: '库存', dataIndex: 'stock'}, { title: '调入仓库', dataIndex: 'anotherDepotName'}, @@ -1084,6 +1095,7 @@ { title: '名称', dataIndex: 'name'}, { title: '规格', dataIndex: 'standard'}, { title: '型号', dataIndex: 'model'}, + { title: '颜色', dataIndex: 'color'}, { title: '扩展信息', dataIndex: 'materialOther'}, { title: '库存', dataIndex: 'stock'}, { title: '单位', dataIndex: 'unit'}, @@ -1100,6 +1112,7 @@ { title: '名称', dataIndex: 'name'}, { title: '规格', dataIndex: 'standard'}, { title: '型号', dataIndex: 'model'}, + { title: '颜色', dataIndex: 'color'}, { title: '扩展信息', dataIndex: 'materialOther'}, { title: '库存', dataIndex: 'stock'}, { title: '单位', dataIndex: 'unit'}, diff --git a/jshERP-web/src/views/bill/mixins/BillModalMixin.js b/jshERP-web/src/views/bill/mixins/BillModalMixin.js index 96723165..78c2734a 100644 --- a/jshERP-web/src/views/bill/mixins/BillModalMixin.js +++ b/jshERP-web/src/views/bill/mixins/BillModalMixin.js @@ -89,18 +89,8 @@ export const BillModalMixin = { if(res && res.code === 200){ tab.dataSource = res.data.rows for(let i=0; i0) { let mInfo = mList[0] - if(mInfo.sku) { - this.changeFormTypes(this.materialTable.columns, 'sku', 1) - } - if(mInfo.enableSerialNumber === "1") { - this.changeFormTypes(this.materialTable.columns, 'snList', 1) - } - if(mInfo.enableBatchNumber === "1") { - this.changeFormTypes(this.materialTable.columns, 'batchNumber', 1) - this.changeFormTypes(this.materialTable.columns, 'expirationDate', 1) - } + this.changeColumnShow(mInfo) item.depotId = mInfo.depotId item.name = mInfo.name item.standard = mInfo.standard diff --git a/jshERP-web/src/views/bill/modules/AllocationOutModal.vue b/jshERP-web/src/views/bill/modules/AllocationOutModal.vue index 6224c535..9bfcbcba 100644 --- a/jshERP-web/src/views/bill/modules/AllocationOutModal.vue +++ b/jshERP-web/src/views/bill/modules/AllocationOutModal.vue @@ -123,6 +123,7 @@ { 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: 'color', width: '5%', 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: '7%', type: FormTypes.select, placeholder: '请选择${title}', options: [], allowSearch:true}, @@ -161,7 +162,7 @@ methods: { //调用完edit()方法之后会自动调用此方法 editAfter() { - this.changeFormTypes(this.materialTable.columns, 'sku', 0) + this.changeColumnHide() if (this.action === 'add') { this.addInit(this.prefixNo) this.fileList = [] diff --git a/jshERP-web/src/views/bill/modules/AssembleModal.vue b/jshERP-web/src/views/bill/modules/AssembleModal.vue index a5730bb9..3bfe9d9f 100644 --- a/jshERP-web/src/views/bill/modules/AssembleModal.vue +++ b/jshERP-web/src/views/bill/modules/AssembleModal.vue @@ -125,6 +125,7 @@ { 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: 'color', width: '5%', 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 }, @@ -162,7 +163,7 @@ methods: { //调用完edit()方法之后会自动调用此方法 editAfter() { - this.changeFormTypes(this.materialTable.columns, 'sku', 0) + this.changeColumnHide() if (this.action === 'add') { this.addInit(this.prefixNo) this.fileList = [] diff --git a/jshERP-web/src/views/bill/modules/DisassembleModal.vue b/jshERP-web/src/views/bill/modules/DisassembleModal.vue index a58d8d25..5219e899 100644 --- a/jshERP-web/src/views/bill/modules/DisassembleModal.vue +++ b/jshERP-web/src/views/bill/modules/DisassembleModal.vue @@ -125,6 +125,7 @@ { 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: 'color', width: '5%', 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 }, @@ -162,7 +163,7 @@ methods: { //调用完edit()方法之后会自动调用此方法 editAfter() { - this.changeFormTypes(this.materialTable.columns, 'sku', 0) + this.changeColumnHide() if (this.action === 'add') { this.addInit(this.prefixNo) this.fileList = [] diff --git a/jshERP-web/src/views/bill/modules/OtherInModal.vue b/jshERP-web/src/views/bill/modules/OtherInModal.vue index 158bef66..ccf2c6d1 100644 --- a/jshERP-web/src/views/bill/modules/OtherInModal.vue +++ b/jshERP-web/src/views/bill/modules/OtherInModal.vue @@ -132,6 +132,7 @@ { 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: 'color', width: '5%', 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 }, @@ -169,7 +170,7 @@ methods: { //调用完edit()方法之后会自动调用此方法 editAfter() { - this.changeFormTypes(this.materialTable.columns, 'sku', 0) + this.changeColumnHide() if (this.action === 'add') { this.addInit(this.prefixNo) this.fileList = [] diff --git a/jshERP-web/src/views/bill/modules/OtherOutModal.vue b/jshERP-web/src/views/bill/modules/OtherOutModal.vue index c8e4f801..e4adbb99 100644 --- a/jshERP-web/src/views/bill/modules/OtherOutModal.vue +++ b/jshERP-web/src/views/bill/modules/OtherOutModal.vue @@ -132,6 +132,7 @@ { 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: 'color', width: '5%', 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 }, @@ -169,7 +170,7 @@ methods: { //调用完edit()方法之后会自动调用此方法 editAfter() { - this.changeFormTypes(this.materialTable.columns, 'sku', 0) + this.changeColumnHide() if (this.action === 'add') { this.addInit(this.prefixNo) this.fileList = [] diff --git a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue index 2db36538..810fbc6e 100644 --- a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue +++ b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue @@ -192,6 +192,7 @@ { 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: 'color', width: '5%', 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 }, @@ -243,10 +244,10 @@ methods: { //调用完edit()方法之后会自动调用此方法 editAfter() { + this.changeColumnHide() this.changeFormTypes(this.materialTable.columns, 'snList', 0) this.changeFormTypes(this.materialTable.columns, 'batchNumber', 0) this.changeFormTypes(this.materialTable.columns, 'expirationDate', 0) - this.changeFormTypes(this.materialTable.columns, 'sku', 0) if (this.action === 'add') { this.addInit(this.prefixNo) this.fileList = [] @@ -348,7 +349,7 @@ info.taxMoney = 0 info.taxLastMoney = info.allPrice listEx.push(info) - this.changeColumnShowOrHide(info) + this.changeColumnShow(info) } tab.dataSource = listEx typeof success === 'function' ? success(res) : '' diff --git a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue index ad2a5559..65fba2f1 100644 --- a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue +++ b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue @@ -193,6 +193,7 @@ { 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: 'color', width: '5%', 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 }, @@ -246,10 +247,10 @@ methods: { //调用完edit()方法之后会自动调用此方法 editAfter() { + this.changeColumnHide() this.changeFormTypes(this.materialTable.columns, 'snList', 0) this.changeFormTypes(this.materialTable.columns, 'batchNumber', 0) this.changeFormTypes(this.materialTable.columns, 'expirationDate', 0) - this.changeFormTypes(this.materialTable.columns, 'sku', 0) this.changeFormTypes(this.materialTable.columns, 'preNumber', 0) this.changeFormTypes(this.materialTable.columns, 'finishNumber', 0) if (this.action === 'add') { @@ -363,7 +364,7 @@ info.taxMoney = 0 info.taxLastMoney = info.allPrice listEx.push(info) - this.changeColumnShowOrHide(info) + this.changeColumnShow(info) } tab.dataSource = listEx //给优惠后金额重新赋值 diff --git a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue index 87c72c3b..d96551ff 100644 --- a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue +++ b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue @@ -132,6 +132,7 @@ { 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: 'color', width: '5%', 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 }, @@ -169,7 +170,7 @@ methods: { //调用完edit()方法之后会自动调用此方法 editAfter() { - this.changeFormTypes(this.materialTable.columns, 'sku', 0) + this.changeColumnHide() if (this.action === 'add') { this.addInit(this.prefixNo) this.fileList = [] diff --git a/jshERP-web/src/views/bill/modules/RetailBackModal.vue b/jshERP-web/src/views/bill/modules/RetailBackModal.vue index 585f65e5..15d2ea0f 100644 --- a/jshERP-web/src/views/bill/modules/RetailBackModal.vue +++ b/jshERP-web/src/views/bill/modules/RetailBackModal.vue @@ -175,6 +175,7 @@ { title: '名称', key: 'name', width: '9%', type: FormTypes.input, readonly: true }, { title: '规格', key: 'standard', width: '6%', type: FormTypes.input, readonly: true }, { title: '型号', key: 'model', width: '6%', type: FormTypes.input, readonly: true }, + { title: '颜色', key: 'color', width: '5%', type: FormTypes.input, readonly: true }, { title: '扩展信息', key: 'materialOther', width: '7%', 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 }, @@ -212,7 +213,7 @@ methods: { //调用完edit()方法之后会自动调用此方法 editAfter() { - this.changeFormTypes(this.materialTable.columns, 'sku', 0) + this.changeColumnHide() if (this.action === 'add') { this.addInit(this.prefixNo) this.fileList = [] diff --git a/jshERP-web/src/views/bill/modules/RetailOutModal.vue b/jshERP-web/src/views/bill/modules/RetailOutModal.vue index de93ff9c..92a8a0b3 100644 --- a/jshERP-web/src/views/bill/modules/RetailOutModal.vue +++ b/jshERP-web/src/views/bill/modules/RetailOutModal.vue @@ -177,6 +177,7 @@ { title: '名称', key: 'name', width: '9%', type: FormTypes.input, readonly: true }, { title: '规格', key: 'standard', width: '6%', type: FormTypes.input, readonly: true }, { title: '型号', key: 'model', width: '5%', type: FormTypes.input, readonly: true }, + { title: '颜色', key: 'color', width: '5%', type: FormTypes.input, readonly: true }, { title: '扩展信息', key: 'materialOther', width: '7%', 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 }, @@ -215,7 +216,7 @@ methods: { //调用完edit()方法之后会自动调用此方法 editAfter() { - this.changeFormTypes(this.materialTable.columns, 'sku', 0) + this.changeColumnHide() if (this.action === 'add') { this.addInit(this.prefixNo) this.fileList = [] diff --git a/jshERP-web/src/views/bill/modules/SaleBackModal.vue b/jshERP-web/src/views/bill/modules/SaleBackModal.vue index bbe53f49..94d310e4 100644 --- a/jshERP-web/src/views/bill/modules/SaleBackModal.vue +++ b/jshERP-web/src/views/bill/modules/SaleBackModal.vue @@ -197,6 +197,7 @@ { 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: 'color', width: '5%', 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 }, @@ -248,10 +249,10 @@ methods: { //调用完edit()方法之后会自动调用此方法 editAfter() { + this.changeColumnHide() this.changeFormTypes(this.materialTable.columns, 'snList', 0) this.changeFormTypes(this.materialTable.columns, 'batchNumber', 0) this.changeFormTypes(this.materialTable.columns, 'expirationDate', 0) - this.changeFormTypes(this.materialTable.columns, 'sku', 0) if (this.action === 'add') { this.addInit(this.prefixNo) this.personList.value = '' @@ -359,7 +360,7 @@ info.taxMoney = 0 info.taxLastMoney = info.allPrice listEx.push(info) - this.changeColumnShowOrHide(info) + this.changeColumnShow(info) } tab.dataSource = listEx typeof success === 'function' ? success(res) : '' diff --git a/jshERP-web/src/views/bill/modules/SaleOrderModal.vue b/jshERP-web/src/views/bill/modules/SaleOrderModal.vue index db937113..d8ecd13a 100644 --- a/jshERP-web/src/views/bill/modules/SaleOrderModal.vue +++ b/jshERP-web/src/views/bill/modules/SaleOrderModal.vue @@ -135,6 +135,7 @@ { 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: 'color', width: '5%', 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 }, @@ -172,7 +173,7 @@ methods: { //调用完edit()方法之后会自动调用此方法 editAfter() { - this.changeFormTypes(this.materialTable.columns, 'sku', 0) + this.changeColumnHide() if (this.action === 'add') { this.addInit(this.prefixNo) this.personList.value = '' diff --git a/jshERP-web/src/views/bill/modules/SaleOutModal.vue b/jshERP-web/src/views/bill/modules/SaleOutModal.vue index 5dfc5f37..076db0be 100644 --- a/jshERP-web/src/views/bill/modules/SaleOutModal.vue +++ b/jshERP-web/src/views/bill/modules/SaleOutModal.vue @@ -197,6 +197,7 @@ { 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: 'color', width: '5%', 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 }, @@ -248,10 +249,10 @@ methods: { //调用完edit()方法之后会自动调用此方法 editAfter() { + this.changeColumnHide() this.changeFormTypes(this.materialTable.columns, 'snList', 0) this.changeFormTypes(this.materialTable.columns, 'batchNumber', 0) this.changeFormTypes(this.materialTable.columns, 'expirationDate', 0) - this.changeFormTypes(this.materialTable.columns, 'sku', 0) this.changeFormTypes(this.materialTable.columns, 'preNumber', 0) this.changeFormTypes(this.materialTable.columns, 'finishNumber', 0) if (this.action === 'add') { @@ -367,7 +368,7 @@ info.taxMoney = 0 info.taxLastMoney = info.allPrice listEx.push(info) - this.changeColumnShowOrHide(info) + this.changeColumnShow(info) } tab.dataSource = listEx //给优惠后金额重新赋值