From e0c79a6464e048690d9645d56313758c669fd38a Mon Sep 17 00:00:00 2001
From: "JinLu.Yin" <411641505@qq.com>
Date: Mon, 30 May 2022 23:21:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=A0=B8=E5=BF=83=E5=8F=8A?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mes/wm/itemrecpt.js          |  9 +++++++++
 src/views/mes/wm/itemrecpt/index.vue | 16 +++++++++++++---
 src/views/mes/wm/itemrecpt/line.vue  |  3 ++-
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/api/mes/wm/itemrecpt.js b/src/api/mes/wm/itemrecpt.js
index 84befcd..4e0bf92 100644
--- a/src/api/mes/wm/itemrecpt.js
+++ b/src/api/mes/wm/itemrecpt.js
@@ -35,6 +35,15 @@ export function updateItemrecpt(data) {
   })
 }
 
+// 确认物料入库单
+export function confirmItemrecpt(data) {
+  return request({
+    url: '/mes/wm/itemrecpt/confirm',
+    method: 'put',
+    data: data
+  })
+}
+
 //执行入库
 export function execute(recptId) {
   return request({
diff --git a/src/views/mes/wm/itemrecpt/index.vue b/src/views/mes/wm/itemrecpt/index.vue
index 19ec046..28eccdf 100644
--- a/src/views/mes/wm/itemrecpt/index.vue
+++ b/src/views/mes/wm/itemrecpt/index.vue
@@ -124,7 +124,7 @@
             size="mini"
             type="text"
             icon="el-icon-delete"
-            v-if="scope.row.status =='PREPARE'"
+            v-if="scope.row.status =='CONFIRMED'"
             @click="handleExecute(scope.row)"
             v-hasPermi="['mes:wm:itemrecpt:edit']"
           >执行入库</el-button>
@@ -251,7 +251,8 @@
         </el-card>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="cancel" v-if="optType =='view' || form.status !='PREPARE' ">返回</el-button>
-        <el-button type="primary" @click="submitForm" v-else>确 定</el-button>
+        <el-button type="primary" @click="submitForm" v-if="form.status =='PREPARE' && optType !='view' ">确 定</el-button>
+        <el-button type="success" @click="doconfirm" v-if="form.status =='PREPARE' && optType !='view' && form.recptId !=null">完成</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -259,7 +260,7 @@
 </template>
 
 <script>
-import { listItemrecpt, getItemrecpt, delItemrecpt, addItemrecpt, updateItemrecpt,execute } from "@/api/mes/wm/itemrecpt";
+import { listItemrecpt, getItemrecpt, delItemrecpt, addItemrecpt, updateItemrecpt, confirmItemrecpt,execute } from "@/api/mes/wm/itemrecpt";
 import {getTreeList} from "@/api/mes/wm/warehouse"
 import {genCode} from "@/api/system/autocode/rule"
 import VendorSelect from "@/components/vendorSelect/single.vue";
@@ -462,6 +463,7 @@ export default {
         this.optType = "edit";
       });
     },
+    
     //执行入库
     handleExecute(row){
       const recptIds = row.recptId || this.ids;
@@ -492,6 +494,14 @@ export default {
         }
       });
     },
+    doconfirm(){
+      let that = this;
+      this.$modal.confirm('是否完成入库单编制？【完成后将不能更改】').then(function(){
+        that.form.status = 'CONFIRMED';
+        that.submitForm();
+      });
+    },
+
     /** 删除按钮操作 */
     handleDelete(row) {
       const recptIds = row.recptId || this.ids;
diff --git a/src/views/mes/wm/itemrecpt/line.vue b/src/views/mes/wm/itemrecpt/line.vue
index 4a9a12d..1e63639 100644
--- a/src/views/mes/wm/itemrecpt/line.vue
+++ b/src/views/mes/wm/itemrecpt/line.vue
@@ -250,13 +250,14 @@ export default {
           w.children =  JSON.parse(wstr); 
 
         });
-        debugger;
         let ostr=JSON.stringify(this.warehouseOptions).replace(/warehouseId/g,'pId').replace(/warehouseName/g, 'pName');
         this.warehouseOptions = JSON.parse(ostr);
+        debugger;
       });
     },
     //选择仓库、库区、库位
     handleWarehouseChanged(obj){
+      debugger;
       if(obj !=null){
         this.form.warehouseId = obj[0];
         this.form.locationId = obj[1];