From d1f26c20376faee88b7e9df09b531b6514da5cd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Mon, 26 Sep 2022 21:46:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E9=BB=98=E8=AE=A4=E4=B8=8D=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=87=87=E8=B4=AD=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/views/bill/SaleOrderList.vue   | 21 ++++++++++++-------
 .../views/bill/modules/PurchaseOrderModal.vue |  2 +-
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/jshERP-web/src/views/bill/SaleOrderList.vue b/jshERP-web/src/views/bill/SaleOrderList.vue
index 8c6e87c6..f6706ca4 100644
--- a/jshERP-web/src/views/bill/SaleOrderList.vue
+++ b/jshERP-web/src/views/bill/SaleOrderList.vue
@@ -242,17 +242,18 @@
     },
     methods: {
       getSystemConfig() {
+        let statusIndex = 0
+        for(let i=0; i<this.columns.length; i++){
+          if(this.columns[i].dataIndex === 'purchaseStatus') {
+            statusIndex = i
+          }
+        }
         getCurrentSystemConfig().then((res) => {
           if(res.code === 200 && res.data){
             let purchaseBySaleFlag = res.data.purchaseBySaleFlag
-            let statusIndex = 0
-            for(let i=0; i<this.columns.length; i++){
-              if(this.columns[i].dataIndex === 'purchaseStatus') {
-                statusIndex = i
-              }
-            }
             if(purchaseBySaleFlag === "0") {
               if(statusIndex>0) {
+                //移除采购进度列
                 this.columns.splice(statusIndex, 1)
               }
             } else {
@@ -260,9 +261,15 @@
                 let purchaseStatusObj = { title: '采购进度', dataIndex: 'purchaseStatus', width: 70, align: "center",
                   scopedSlots: { customRender: 'customRenderPurchaseStatus' }
                 }
-                this.columns.splice(8, 0, purchaseStatusObj)
+                //添加采购进度列
+                this.columns.splice(statusIndex-1, 0, purchaseStatusObj)
               }
             }
+          } else {
+            if(statusIndex>0) {
+              //移除采购进度列
+              this.columns.splice(statusIndex, 1)
+            }
           }
         })
       },
diff --git a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
index 68f8d387..b5a00aa6 100644
--- a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
+++ b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
@@ -211,7 +211,7 @@
         prefixNo: 'CGDD',
         fileList:[],
         rowCanEdit: true,
-        purchaseBySaleFlag: true,
+        purchaseBySaleFlag: false,
         model: {},
         labelCol: {
           xs: { span: 24 },