领料确认；库存盘点

src/api/Inventory/PartOut.js

@@ -1,14 +1,14 @@
 import request from '@/utils/request'
 
 // 领料单查询
-export function searchList(listNumber_check, listNumber, pageCurrent, pageSize) {
+export function searchList(listNumber_check, listNumber, pageCurrent, pageSize, isCheck) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '车间装配管理_领料单_领料单查询',
-      param: '领料单编号_check=' + listNumber_check + '&领料单编号=' + listNumber,
+      param: '领料单编号_check=' + listNumber_check + '&领料单编号=' + listNumber + '&是否确认=0',
       Pagination: pageCurrent + '&' + pageSize
     }
   })

src/views/Inventory/PickingList/index.vue

@@ -20,14 +20,21 @@
             {{ scope.row.领料时间.split(' ')[0] }}
           </template>
         </el-table-column>
-        <el-table-column label="领料人" align="center" min-width="130">
+        <el-table-column label="创建人" align="center" min-width="130">
           <template slot-scope="scope">
             {{ scope.row.姓名 }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="100px">
+        <el-table-column label="领回确认" align="center" min-width="80">
+          <template slot-scope="scope">
+            <el-tag v-if="Number(scope.row.是否启用)===1" type="warning">未确认</el-tag>
+            <el-tag v-else type="success">已确认</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="200px">
           <template slot-scope="scope" align="center">
-            <el-button size="mini" type="danger" icon="el-icon-delete" style="margin: 0 0 0 10px" @click="dropListinfor(scope.row)">删除</el-button>
+            <el-button :disabled="Number(scope.row.是否启用)===0" size="mini" type="primary" icon="el-icon-check" @click="checkListinfor(scope.row)">确认</el-button>
+            <el-button :disabled="Number(scope.row.是否启用)===0" size="mini" type="danger" icon="el-icon-delete" @click="dropListinfor(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -451,7 +458,7 @@
           <el-input-number v-model="form1.outNumber" :min="0" :max="enableOut" controls-position="right" style="width: 200px"/>
         </el-form-item>
         <el-form-item label="出库备注" prop="outNote" label-width="100px">
-          <el-input v-model="form1.outNote" size="small" placeholder="请输入备注" style="width: 200px"/>
+          <el-input v-model="form1.outNote" size="small" placeholder="注明领料人姓名" style="width: 200px"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -469,7 +476,7 @@
           <el-input-number v-model="form2.outNumber" :min="0" :max="enableOut" controls-position="right" style="width: 200px"/>
         </el-form-item>
         <el-form-item label="出库备注" prop="outNote" label-width="100px">
-          <el-input v-model="form2.outNote" size="small" placeholder="请输入备注" style="width: 200px"/>
+          <el-input v-model="form2.outNote" size="small" placeholder="注明领料人姓名" style="width: 200px"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -487,7 +494,7 @@
           <el-input-number v-model="form3.outNumber" :min="0" :max="enableOut" controls-position="right" style="width: 200px"/>
         </el-form-item>
         <el-form-item label="出库备注" prop="outNote" label-width="100px">
-          <el-input v-model="form3.outNote" size="small" placeholder="请输入备注" style="width: 200px"/>
+          <el-input v-model="form3.outNote" size="small" placeholder="注明领料人姓名" style="width: 200px"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -505,7 +512,7 @@
           <el-input-number v-model="form4.outNumber" :min="0" :max="enableOut" controls-position="right" style="width: 200px"/>
         </el-form-item>
         <el-form-item label="出库备注" prop="outNote" label-width="100px">
-          <el-input v-model="form4.outNote" size="small" placeholder="请输入备注" style="width: 200px"/>
+          <el-input v-model="form4.outNote" size="small" placeholder="注明领料人姓名" style="width: 200px"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -519,6 +526,7 @@
 <script>
 import { initProject, searchmachine, searchTeam, searchPurchasePart, searchBasicPart, searchList, addList, dropList,
   addListDetail, searchListDetail, dropListDetail, searchHoursePart, searchBacklogPart, submitAddBacklogList, dropListDetailBasic } from '@/api/Inventory/PickingList'
+import request from '@/utils/request'
 import { mapGetters } from 'vuex'
 export default {
   data() {
@@ -672,6 +680,37 @@ export default {
         this.$message('已取消操作')
       })
     },
+    // 确认领料单
+    checkListinfor(row) {
+      this.$confirm('是否确认领回?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        const param = {
+          url: '',
+          method: 'post',
+          data: {
+            type: '4',
+            name: `update 车间装配管理_领料单_领料单 set 是否启用 = 0 where 领料单流水号 = ${row.领料单流水号}`
+          }
+        }
+        request(param).then(res => {
+          if (res.data[0].result === '1') {
+            this.$message.success('操作成功')
+            this.pickingListNumber = ''
+            this.searchListinfor()
+          } else {
+            this.$message.error('操作失败')
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消操作'
+        })
+      })
+    },
     // 删除领料单
     dropListinfor(row) {
       this.$confirm('此操作将永久删除该行, 是否继续?', '提示', {
@@ -1106,4 +1145,7 @@ export default {
   span{
     margin: 10px 0 10px 10px;
   }
+  .el-tag{
+    margin: 0
+  }
 </style>