diff --git a/jshERP-web/src/views/bill/modules/PurchaseApplyModal.vue b/jshERP-web/src/views/bill/modules/PurchaseApplyModal.vue index 708c91c8..47cac5d5 100644 --- a/jshERP-web/src/views/bill/modules/PurchaseApplyModal.vue +++ b/jshERP-web/src/views/bill/modules/PurchaseApplyModal.vue @@ -153,6 +153,7 @@ loading: false, dataSource: [], columns: [ + { title: '', key: 'hiddenKey', width: '1%', type: FormTypes.hidden }, { title: '条码', key: 'barCode', width: '12%', type: FormTypes.popupJsh, kind: 'material', multi: true, validateRules: [{ required: true, message: '${title}不能为空' }] }, @@ -163,8 +164,6 @@ { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.normal }, { title: '单位', key: 'unit', width: '4%', type: FormTypes.normal }, { title: '多属性', key: 'sku', width: '4%', type: FormTypes.normal }, - { title: '原数量', key: 'preNumber', width: '4%', type: FormTypes.normal }, - { title: '已采购', key: 'finishNumber', width: '4%', type: FormTypes.normal }, { title: '数量', key: 'operNumber', width: '5%', type: FormTypes.inputNumber, statistics: true, validateRules: [{ required: true, message: '${title}不能为空' }] }, @@ -200,10 +199,7 @@ this.billStatus = '0' this.currentSelectDepotId = '' this.rowCanEdit = true - this.materialTable.columns[0].type = FormTypes.popupJsh this.changeColumnHide() - this.changeFormTypes(this.materialTable.columns, 'preNumber', 0) - this.changeFormTypes(this.materialTable.columns, 'finishNumber', 0) if (this.action === 'add') { this.addInit(this.prefixNo) this.fileList = [] @@ -211,10 +207,6 @@ handleIntroJs(this.prefixNo, 1) }) } else { - if(this.model.linkNumber) { - this.rowCanEdit = false - this.materialTable.columns[0].type = FormTypes.normal - } this.model.operTime = this.model.operTimeStr if(this.model.accountId == null && this.model.accountIdList) { this.model.accountId = 0 diff --git a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue index bf00b91b..5e3b421c 100644 --- a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue +++ b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue @@ -239,6 +239,7 @@ loading: false, dataSource: [], columns: [ + { title: '', key: 'hiddenKey', width: '1%', type: FormTypes.hidden }, { title: '条码', key: 'barCode', width: '12%', type: FormTypes.popupJsh, kind: 'material', multi: true, validateRules: [{ required: true, message: '${title}不能为空' }] }, @@ -293,7 +294,7 @@ this.billStatus = '0' this.currentSelectDepotId = '' this.rowCanEdit = true - this.materialTable.columns[0].type = FormTypes.popupJsh + this.materialTable.columns[1].type = FormTypes.popupJsh this.changeColumnHide() this.changeFormTypes(this.materialTable.columns, 'preNumber', 0) this.changeFormTypes(this.materialTable.columns, 'finishNumber', 0) @@ -306,7 +307,7 @@ } else { if(this.model.linkNumber) { this.rowCanEdit = false - this.materialTable.columns[0].type = FormTypes.normal + this.materialTable.columns[1].type = FormTypes.normal } this.model.operTime = this.model.operTimeStr if(this.model.accountId == null && this.model.accountIdList) { @@ -386,7 +387,7 @@ }, linkBillListOk(selectBillDetailRows, linkNumber, organId) { this.rowCanEdit = false - this.materialTable.columns[0].type = FormTypes.normal + this.materialTable.columns[1].type = FormTypes.normal this.changeFormTypes(this.materialTable.columns, 'preNumber', 1) this.changeFormTypes(this.materialTable.columns, 'finishNumber', 1) if(selectBillDetailRows && selectBillDetailRows.length>0) { diff --git a/jshERP-web/src/views/bill/modules/SaleOrderModal.vue b/jshERP-web/src/views/bill/modules/SaleOrderModal.vue index 8ff64bfe..6d4f386a 100644 --- a/jshERP-web/src/views/bill/modules/SaleOrderModal.vue +++ b/jshERP-web/src/views/bill/modules/SaleOrderModal.vue @@ -231,6 +231,7 @@ loading: false, dataSource: [], columns: [ + { title: '', key: 'hiddenKey', width: '1%', type: FormTypes.hidden }, { title: '条码', key: 'barCode', width: '12%', type: FormTypes.popupJsh, kind: 'material', multi: true, validateRules: [{ required: true, message: '${title}不能为空' }] },