From d85ccf3cd486f27025d7a29577452752363a3afc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Thu, 19 May 2022 00:14:33 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E5=B8=A6=E5=85=B3=E8=81=94=E5=8D=95?=
 =?UTF-8?q?=E5=8F=B7=E7=9A=84=E5=8D=95=E6=8D=AE=E7=9A=84=E6=98=8E=E7=BB=86?=
 =?UTF-8?q?=E4=B8=AD=E5=9C=A8=E7=BC=96=E8=BE=91=E7=9A=84=E6=97=B6=E5=80=99?=
 =?UTF-8?q?=E9=99=90=E5=88=B6=E6=96=B0=E5=A2=9E=E6=88=96=E8=80=85=E7=A7=BB?=
 =?UTF-8?q?=E9=99=A4=E5=95=86=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/views/bill/dialog/LinkBillList.vue        | 6 +++---
 jshERP-web/src/views/bill/modules/PurchaseInModal.vue    | 4 ++++
 jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue | 4 ++++
 jshERP-web/src/views/bill/modules/SaleOutModal.vue       | 4 ++++
 4 files changed, 15 insertions(+), 3 deletions(-)

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) {