From 5bee16c60b7c9c12fa01cadc453a2e45d8afe11a Mon Sep 17 00:00:00 2001
From: jishenghua <752718920@qq.com>
Date: Sun, 21 Apr 2024 23:02:32 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=AE=A2=E5=8D=95=E5=92=8C?=
 =?UTF-8?q?=E8=AF=B7=E8=B4=AD=E5=8D=95=E6=97=A0=E6=B3=95=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/bill/modules/PurchaseApplyModal.vue      | 10 +---------
 .../src/views/bill/modules/PurchaseOrderModal.vue      |  7 ++++---
 jshERP-web/src/views/bill/modules/SaleOrderModal.vue   |  1 +
 3 files changed, 6 insertions(+), 12 deletions(-)

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}不能为空' }]
             },