Merge branch 'master' of http://192.168.0.149:10010/r/高精2.0

src/api/Inventory/CreatePickingList.js

@@ -48,27 +48,27 @@ export function searchTable(...params) {
   })
 }
 // 领料单查询
-export function searchList(pageCurrent, pageSize, listNumber_check, listNumber) {
+export function searchList(pageCurrent, pageSize, listNumber_check, listNumber, isElectrical) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '车间装配管理_领料单_查询数据',
-      param: '领料单编号_check=' + listNumber_check + '&领料单编号=' + listNumber,
+      param: '领料单编号_check=' + listNumber_check + '&领料单编号=' + listNumber + '&是否电气=' + isElectrical,
       Pagination: pageCurrent + '&' + pageSize
     }
   })
 }
 // 创建领料单
-export function createList(num, remark) {
+export function createList(num, remark, isElectrical) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
       name: '车间装配管理_领料单_增加数据',
-      param: '领料人流水号=' + num + '&领料单备注=' + remark
+      param: '领料人流水号=' + num + '&领料单备注=' + remark + '&是否电气=' + isElectrical
     }
   })
 }

src/views/Inventory/CreatePickingList/index.vue

@@ -224,8 +224,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" type="warning">未审批</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" size="mini" type="primary" plain icon="el-icon-check" @click="approvalPass(scope.row)">审批</el-button>
+            <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>
           </template>
         </el-table-column>
         <el-table-column label="领回确认" align="center" min-width="80">
@@ -236,7 +236,7 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="230px">
           <template slot-scope="scope" align="center">
-            <el-button v-if="Number(token)===21" :disabled="Number(scope.row.是否审批)===0 || Number(scope.row.是否启用)===0" size="mini" type="primary" @click="checkList(scope.row)">确认领回</el-button>
+            <el-button v-if="Number(token)===21 || Number(token)===36" :disabled="Number(scope.row.是否审批)===0 || Number(scope.row.是否启用)===0" size="mini" type="primary" @click="checkList(scope.row)">确认领回</el-button>
             <el-button :disabled="Number(scope.row.是否启用)===0" size="mini" type="danger" icon="el-icon-delete" @click="dropList(scope.row)">删除</el-button>
           </template>
         </el-table-column>
@@ -516,9 +516,10 @@ export default {
     },
     // 查询领料单列表
     searchList() {
-      let check
+      let check, isElectrical
       this.pickingListNumber ? check = 1 : check = 0
-      searchList(this.pageCurrent3, this.pageSize3, check, this.pickingListNumber).then(response => {
+      Number(this.token) === 36 || Number(this.token) === 35 ? isElectrical = 1 : isElectrical = 0 // 35电工 36电气部长
+      searchList(this.pageCurrent3, this.pageSize3, check, this.pickingListNumber, isElectrical).then(response => {
         this.pickListTable1 = response.data.rows
         this.total3 = response.data.total
       })
@@ -543,7 +544,9 @@ export default {
     },
     // 提交创建领料单
     submitCreateList() {
-      createList(this.form1.领料人流水号, this.form1.领料单备注).then(response => {
+      let isElectrical
+      this.token === 36 || this.token === 35 ? isElectrical = 1 : isElectrical = 0 // 35电工 36电气部长
+      createList(this.form1.领料人流水号, this.form1.领料单备注, isElectrical).then(response => {
         if (response.data[0].result === '1') {
           this.$message.success('创建成功')
           this.dialogFormVisible1 = false