From adab6469e8df4aa95cdc873646757fd93d954da7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Sun, 5 Sep 2021 21:09:30 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E6=89=80=E6=9C=89=E5=8D=95=E6=8D=AE?=
 =?UTF-8?q?=E9=83=BD=E5=A2=9E=E5=8A=A0=E5=AE=A1=E6=A0=B8=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/views/bill/PurchaseOrderList.vue |  1 -
 jshERP-web/src/views/bill/SaleOrderList.vue     |  1 -
 .../src/views/bill/mixins/BillListMixin.js      | 13 +++++++++++--
 .../financial/mixins/FinancialListMixin.js      | 17 ++++++++++++++++-
 4 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/jshERP-web/src/views/bill/PurchaseOrderList.vue b/jshERP-web/src/views/bill/PurchaseOrderList.vue
index ac15d6d9..17b34169 100644
--- a/jshERP-web/src/views/bill/PurchaseOrderList.vue
+++ b/jshERP-web/src/views/bill/PurchaseOrderList.vue
@@ -206,7 +206,6 @@
       this.initSupplier()
       this.getDepotData()
       this.initUser()
-      this.removeStatusColumn()
     },
     computed: {
     },
diff --git a/jshERP-web/src/views/bill/SaleOrderList.vue b/jshERP-web/src/views/bill/SaleOrderList.vue
index b2b96941..ecc64fe9 100644
--- a/jshERP-web/src/views/bill/SaleOrderList.vue
+++ b/jshERP-web/src/views/bill/SaleOrderList.vue
@@ -206,7 +206,6 @@
       this.initCustomer()
       this.getDepotData()
       this.initUser()
-      this.removeStatusColumn()
     },
     computed: {
     },
diff --git a/jshERP-web/src/views/bill/mixins/BillListMixin.js b/jshERP-web/src/views/bill/mixins/BillListMixin.js
index 31e4056e..6e28f062 100644
--- a/jshERP-web/src/views/bill/mixins/BillListMixin.js
+++ b/jshERP-web/src/views/bill/mixins/BillListMixin.js
@@ -25,7 +25,9 @@ export const BillListMixin = {
       return true;
     }
   },
-
+  created() {
+    this.removeStatusColumn()
+  },
   methods: {
     myHandleAdd() {
       this.$refs.modalForm.action = "add";
@@ -71,7 +73,14 @@ export const BillListMixin = {
     removeStatusColumn() {
       //没有审核反审核权限的时候直接移除状态列
       if(this.btnEnableList.indexOf(2)===-1 && this.btnEnableList.indexOf(7)===-1) {
-        this.columns.splice(7,1)
+        let statusIndex = 0
+        for(let i=0; i<this.columns.length; i++){
+          if(this.columns[i].dataIndex === 'status') {
+            statusIndex = i
+          }
+        }
+        //移除状态列
+        this.columns.splice(statusIndex,1)
       }
     },
     initSupplier() {
diff --git a/jshERP-web/src/views/financial/mixins/FinancialListMixin.js b/jshERP-web/src/views/financial/mixins/FinancialListMixin.js
index 4de91a31..9411ea7c 100644
--- a/jshERP-web/src/views/financial/mixins/FinancialListMixin.js
+++ b/jshERP-web/src/views/financial/mixins/FinancialListMixin.js
@@ -24,7 +24,9 @@ export const FinancialListMixin = {
       return true;
     }
   },
-
+  created() {
+    this.removeStatusColumn()
+  },
   methods: {
     myHandleAdd() {
       this.$refs.modalForm.action = "add";
@@ -104,6 +106,19 @@ export const FinancialListMixin = {
     },
     onDateOk(value) {
       console.log(value);
+    },
+    removeStatusColumn() {
+      //没有审核反审核权限的时候直接移除状态列
+      if(this.btnEnableList.indexOf(2)===-1 && this.btnEnableList.indexOf(7)===-1) {
+        let statusIndex = 0
+        for(let i=0; i<this.columns.length; i++){
+          if(this.columns[i].dataIndex === 'status') {
+            statusIndex = i
+          }
+        }
+        //移除状态列
+        this.columns.splice(statusIndex,1)
+      }
     }
   }
 }
\ No newline at end of file