From 9d05422fc783e27d11e607ee77e27f20dd14201c Mon Sep 17 00:00:00 2001
From: chenjianan <chenjianan@meswork.com>
Date: Mon, 5 Aug 2019 15:29:28 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=B5=E6=B0=94=E5=89=AF=E9=83=A8=E9=95=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Inventory/CreatePickingList/index.vue   | 4 ++--
 src/views/Inventory/PickingListApproval/index.vue | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/views/Inventory/CreatePickingList/index.vue b/src/views/Inventory/CreatePickingList/index.vue
index 70b1cbe6..af1c7b22 100644
--- a/src/views/Inventory/CreatePickingList/index.vue
+++ b/src/views/Inventory/CreatePickingList/index.vue
@@ -529,7 +529,7 @@ export default {
     searchList() {
       let check, isElectrical
       this.pickingListNumber ? check = 1 : check = 0
-      Number(this.token) === 36 || Number(this.token) === 35 ? isElectrical = 1 : isElectrical = 0 // 35电工 36电气部长
+      Number(this.token) === 37 || Number(this.token) === 36 || Number(this.token) === 35 ? isElectrical = 1 : isElectrical = 0 // 35电工 36电气部长 37电气副部长
       searchList(this.pageCurrent3, this.pageSize3, check, this.pickingListNumber, isElectrical).then(response => {
         this.pickListTable1 = response.data.rows
         this.total3 = response.data.total
@@ -556,7 +556,7 @@ export default {
     // 提交创建领料单
     submitCreateList() {
       let isElectrical
-      this.token === 36 || this.token === 35 ? isElectrical = 1 : isElectrical = 0 // 35电工 36电气部长
+      Number(this.token) === 37 || Number(this.token) === 36 || Number(this.token) === 35 ? isElectrical = 1 : isElectrical = 0 // 35电工 36电气部长 37电气副部长
       createList(this.form1.领料人流水号, this.form1.领料单备注, isElectrical).then(response => {
         if (response.data[0].result === '1') {
           this.$message.success('创建成功')
diff --git a/src/views/Inventory/PickingListApproval/index.vue b/src/views/Inventory/PickingListApproval/index.vue
index 27584599..c851bc39 100644
--- a/src/views/Inventory/PickingListApproval/index.vue
+++ b/src/views/Inventory/PickingListApproval/index.vue
@@ -32,8 +32,8 @@
         <el-table-column label="审批" align="center" min-width="90">
           <template slot-scope="scope">
             <el-tag v-if="Number(scope.row.是否审批)===1" type="success">已审批</el-tag>
-            <el-tag v-if="Number(scope.row.是否审批)===0 && Number(token)!==21 && Number(token)!==36" type="warning">未审批</el-tag>
-            <el-button v-if="Number(scope.row.是否审批)===0 && (Number(token)===21 || Number(token)===36)" size="mini" type="primary" plain icon="el-icon-check" @click="approvalPass(scope.row)">审批</el-button>
+            <el-tag v-if="Number(scope.row.是否审批)===0 && Number(token)!==21 && Number(token)!==36 && Number(token)!==37" type="warning">未审批</el-tag>
+            <el-button v-if="Number(scope.row.是否审批)===0 && (Number(token)===21 || Number(token)===36 || Number(token)===37)" size="mini" type="primary" plain icon="el-icon-check" @click="approvalPass(scope.row)">审批</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -300,7 +300,7 @@ export default {
     searchList() {
       let check, isElectrical
       this.pickingListNumber ? check = 1 : check = 0
-      Number(this.token) === 36 || Number(this.token) === 35 ? isElectrical = 1 : isElectrical = 0 // 35电工 36电气部长
+      Number(this.token) === 37 || Number(this.token) === 36 || Number(this.token) === 35 ? isElectrical = 1 : isElectrical = 0 // 35电工 36电气部长 37电气副部长
       searchList(this.pageCurrent3, this.pageSize3, check, this.pickingListNumber, isElectrical).then(response => {
         this.pickListTable1 = response.data.rows
         this.total3 = response.data.total
@@ -327,7 +327,7 @@ export default {
     // 提交创建领料单
     submitCreateList() {
       let isElectrical
-      this.token === 36 || this.token === 35 ? isElectrical = 1 : isElectrical = 0 // 35电工 36电气部长
+      Number(this.token) === 37 || Number(this.token) === 36 || Number(this.token) === 35 ? isElectrical = 1 : isElectrical = 0 // 35电工 36电气部长 37电气副部长
       createList(this.form1.领料人流水号, this.form1.领料单备注, isElectrical).then(response => {
         if (response.data[0].result === '1') {
           this.$message.success('创建成功')