diff --git a/jshERP-web/src/views/bill/dialog/LinkBillList.vue b/jshERP-web/src/views/bill/dialog/LinkBillList.vue index e786661b..5eafc0ed 100644 --- a/jshERP-web/src/views/bill/dialog/LinkBillList.vue +++ b/jshERP-web/src/views/bill/dialog/LinkBillList.vue @@ -195,14 +195,13 @@ this.visible = true; this.loadData(1) }, - purchaseShow(type, subType, organType, status, purchaseStatus) { + purchaseShow(type, subType, organType, status) { this.selectType = 'list' this.showType = 'purchase' this.queryParam.type = type this.queryParam.subType = subType this.queryParam.roleType = '全部数据' this.queryParam.status = status - this.queryParam.purchaseStatus = purchaseStatus this.columns[0].title = organType this.model = Object.assign({}, {}); this.visible = true; @@ -250,7 +249,8 @@ let record = this.selectBillRows[0] let param = { headerId: record.id, - mpList : '' + mpList : '', + linkType: this.showType } this.loading = true; getAction('/depotItem/getDetailList', param).then((res) => { diff --git a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue index e1373eb2..2ab90fc3 100644 --- a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue +++ b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue @@ -321,6 +321,10 @@ handleIntroJs(this.prefixNo, 1) }) } else { + if(this.model.linkNumber) { + this.rowCanEdit = false + this.materialTable.columns[1].type = FormTypes.normal + } this.model.operTime = this.model.operTimeStr this.model.debt = (this.model.discountLastMoney + this.model.otherMoney - this.model.changeAmount).toFixed(2) if(this.model.accountId == null) { diff --git a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue index b2439b7c..5cb8fe26 100644 --- a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue +++ b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue @@ -242,6 +242,10 @@ handleIntroJs(this.prefixNo, 1) }) } else { + if(this.model.linkNumber) { + this.rowCanEdit = false + this.materialTable.columns[1].type = FormTypes.normal + } this.model.operTime = this.model.operTimeStr this.fileList = this.model.fileName this.$nextTick(() => { diff --git a/jshERP-web/src/views/bill/modules/SaleOutModal.vue b/jshERP-web/src/views/bill/modules/SaleOutModal.vue index f403b6ca..7c1747bb 100644 --- a/jshERP-web/src/views/bill/modules/SaleOutModal.vue +++ b/jshERP-web/src/views/bill/modules/SaleOutModal.vue @@ -326,6 +326,10 @@ handleIntroJs(this.prefixNo, 1) }) } else { + if(this.model.linkNumber) { + this.rowCanEdit = false + this.materialTable.columns[1].type = FormTypes.normal + } this.model.operTime = this.model.operTimeStr this.model.debt = (this.model.discountLastMoney + this.model.otherMoney - this.model.changeAmount).toFixed(2) if(this.model.accountId == null) {