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

src/views/Inventory/CreatePickingList/index.vue

@@ -221,10 +221,11 @@
             {{ scope.row.领料单备注 }}
           </template>
         </el-table-column>
-        <el-table-column v-if="Number(token)===21" label="审批" align="center" min-width="90">
+        <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-button v-else 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" 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>
           </template>
         </el-table-column>
         <el-table-column label="领回确认" align="center" min-width="80">
@@ -233,9 +234,9 @@
             <el-tag v-else type="success">已确认</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="220px">
+        <el-table-column label="操作" align="center" width="230px">
           <template slot-scope="scope" align="center">
-            <el-button :disabled="Number(scope.row.是否启用)===0" size="mini" type="primary" icon="el-icon-check" @click="checkList(scope.row)">确认</el-button>
+            <el-button :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>
@@ -642,6 +643,7 @@ export default {
     },
     // 查看领料单明细
     clickList(row) {
+      console.log(row)
       row ? this.pickingListNum = row.领料单流水号 : this.pickingListNum
       row ? this.pickingListNumberShow = row.领料单编号 : this.pickingListNumberShow
       searchListDetail(this.pickingListNum).then(res => {