From b27d767fe8423ec03e19c9196f5b98578131a023 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=89=93=E8=B1=86=E8=B1=86?= <3346088772@qq.comcd>
Date: Fri, 26 Jan 2024 17:44:10 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=85=A5=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mes/md/pallet.js             |  10 +
 src/api/mes/wm/itemrecpt.js          |   7 +-
 src/views/mes/md/pallet/index.vue    |  22 +-
 src/views/mes/wm/itemrecpt/index.vue | 576 +++++++++++++++++++--------
 4 files changed, 437 insertions(+), 178 deletions(-)

diff --git a/src/api/mes/md/pallet.js b/src/api/mes/md/pallet.js
index 78f66bd..9baa8dd 100644
--- a/src/api/mes/md/pallet.js
+++ b/src/api/mes/md/pallet.js
@@ -52,3 +52,13 @@ export function findPalletCode(query) {
     params: query,
   });
 }
+
+// 托盘设置导出
+export function exportProPallet(query) {
+  return request({
+    url: "/propallet/exportProPallet",
+    method: "get",
+    params: query,
+  });
+}
+
diff --git a/src/api/mes/wm/itemrecpt.js b/src/api/mes/wm/itemrecpt.js
index 4e0bf92..19700ca 100644
--- a/src/api/mes/wm/itemrecpt.js
+++ b/src/api/mes/wm/itemrecpt.js
@@ -45,10 +45,11 @@ export function confirmItemrecpt(data) {
 }
 
 //执行入库
-export function execute(recptId) {
+export function storage(data) {
   return request({
-    url: '/mes/wm/itemrecpt/' + recptId,
-    method: 'put'
+    url: '/wmMatter/storage',
+    method: 'post',
+    data: data
   })
 }
 
diff --git a/src/views/mes/md/pallet/index.vue b/src/views/mes/md/pallet/index.vue
index 7d291aa..a94728f 100644
--- a/src/views/mes/md/pallet/index.vue
+++ b/src/views/mes/md/pallet/index.vue
@@ -375,6 +375,7 @@ import {
   updateMdItem,
   findPalletCode,
   batchDeleteProPallet,
+  exportProPallet,
 } from "@/api/mes/md/pallet";
 
 import { genCode } from "@/api/system/autocode/rule";
@@ -431,13 +432,14 @@ export default {
         // 上传的地址
         url: process.env.VUE_APP_BASE_API + "/mes/md/mditem/importData",
       },
+      // 设置上传的请求头部
+      headers: { Authorization: "Bearer " + getToken() },
       // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 10,
         palletCode: undefined,
         itemName: undefined,
-        itemTypeId: 0,
       },
       // 表单校验
       rules: {
@@ -455,9 +457,6 @@ export default {
         unitOfMeasure: [
           { required: true, message: "单位不能为空", trigger: "blur" },
         ],
-        itemTypeId: [
-          { required: true, message: "物料分类不能为空", trigger: "blur" },
-        ],
       },
     };
   },
@@ -521,7 +520,6 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      console.log(row);
       this.reset();
       this.form = row;
       this.open = true;
@@ -584,13 +582,13 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      // this.download(
-      //   "mes/md/mditem/export",
-      //   {
-      //     ...this.queryParams,
-      //   },
-      //   `user_${new Date().getTime()}.xlsx`
-      // );
+      this.download(
+        "/propallet/exportProPallet",
+        {
+          ...this.queryParams,
+        },
+        `calplan_${new Date().getTime()}.xlsx`
+      );
     },
     /** 导入按钮操作 */
     handleImport() {
diff --git a/src/views/mes/wm/itemrecpt/index.vue b/src/views/mes/wm/itemrecpt/index.vue
index ab8fe83..9cb98f4 100644
--- a/src/views/mes/wm/itemrecpt/index.vue
+++ b/src/views/mes/wm/itemrecpt/index.vue
@@ -1,6 +1,13 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="100px"
+    >
       <el-form-item label="入库单编号" prop="recptCode">
         <el-input
           v-model="queryParams.recptCode"
@@ -34,16 +41,26 @@
         />
       </el-form-item>
       <el-form-item label="入库日期" prop="recptDate">
-        <el-date-picker clearable
+        <el-date-picker
+          clearable
           v-model="queryParams.recptDate"
           type="date"
           value-format="yyyy-MM-dd"
-          placeholder="请选择入库日期">
+          placeholder="请选择入库日期"
+        >
         </el-date-picker>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
       </el-form-item>
     </el-form>
 
@@ -56,7 +73,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['mes:wm:itemrecpt:add']"
-        >新增</el-button>
+          >新增</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -67,7 +85,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['mes:wm:itemrecpt:edit']"
-        >修改</el-button>
+          >修改</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -78,7 +97,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['mes:wm:itemrecpt:remove']"
-        >删除</el-button>
+          >删除</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -88,67 +108,112 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['mes:wm:itemrecpt:export']"
-        >导出</el-button>
+          >导出</el-button
+        >
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="itemrecptList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />      
-      <el-table-column label="入库单编号" align="center" width="180px" prop="recptCode" >
+    <el-table
+      v-loading="loading"
+      :data="itemrecptList"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column
+        label="入库单编号"
+        align="center"
+        width="180px"
+        prop="recptCode"
+      >
         <template slot-scope="scope">
           <el-button
             type="text"
             @click="handleView(scope.row)"
             v-hasPermi="['mes:wm:itemrecpt:query']"
-          >{{scope.row.recptCode}}</el-button>
+            >{{ scope.row.recptCode }}</el-button
+          >
         </template>
       </el-table-column>
-      <el-table-column label="入库单名称" align="center" prop="recptName" :show-overflow-tooltip="true"/>
-      <el-table-column label="供应商名称" align="center" prop="vendorName" :show-overflow-tooltip="true"/>      
-      <el-table-column label="入库日期" align="center" prop="recptDate" width="180">
+      <el-table-column
+        label="入库单名称"
+        align="center"
+        prop="recptName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="供应商名称"
+        align="center"
+        prop="vendorName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="入库日期"
+        align="center"
+        prop="recptDate"
+        width="180"
+      >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.recptDate, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.recptDate, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
       <el-table-column label="采购订单号" align="center" prop="poCode" />
-      <el-table-column label="单据状态" align="center" prop="status" >
+      <el-table-column label="单据状态" align="center" prop="status">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.mes_order_status" :value="scope.row.status"/>
+          <dict-tag
+            :options="dict.type.mes_order_status"
+            :value="scope.row.status"
+          />
         </template>
-      </el-table-column>      
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      </el-table-column>
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
             icon="el-icon-video-play"
-            v-if="scope.row.status =='PREPARE'"
+            v-if="
+              scope.row.status == 'PREPARE' || scope.row.status == 'WAREHOUSING'
+            "
             @click="handleExecute(scope.row)"
             v-hasPermi="['mes:wm:itemrecpt:edit']"
-          >执行入库</el-button>
+            >执行入库</el-button
+          >
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
-            v-if="scope.row.status =='PREPARE'"
+            v-if="
+              scope.row.status == 'PREPARE' || scope.row.status == 'WAREHOUSING'
+            "
             @click="handleUpdate(scope.row)"
             v-hasPermi="['mes:wm:itemrecpt:edit']"
-          >修改</el-button>
+            >修改</el-button
+          >
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
-            v-if="scope.row.status =='PREPARE'"
+            v-if="
+              scope.row.status == 'PREPARE' || scope.row.status == 'WAREHOUSING'
+            "
             @click="handleDelete(scope.row)"
             v-hasPermi="['mes:wm:itemrecpt:remove']"
-          >删除</el-button>
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
@@ -156,37 +221,53 @@
     />
 
     <!-- 添加或修改物料入库单对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="1000px"
+      append-to-body
+    >
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-row>
           <el-col :span="8">
             <el-form-item label="入库单编号" prop="recptCode">
-              <el-input v-model="form.recptCode" placeholder="请输入入库单编号" />
+              <el-input
+                v-model="form.recptCode"
+                placeholder="请输入入库单编号"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="4">
-            <el-form-item  label-width="80">
-              <el-switch v-model="autoGenFlag"
-                  active-color="#13ce66"
-                  active-text="自动生成"
-                  @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view' && form.status =='PREPARE'">               
+            <el-form-item label-width="80">
+              <el-switch
+                v-model="autoGenFlag"
+                active-color="#13ce66"
+                active-text="自动生成"
+                @change="handleAutoGenChange(autoGenFlag)"
+                v-if="optType != 'view' && form.status == 'PREPARE'"
+              >
               </el-switch>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="入库单名称" prop="recptName">
-              <el-input v-model="form.recptName" placeholder="请输入入库单名称" />
+              <el-input
+                v-model="form.recptName"
+                placeholder="请输入入库单名称"
+              />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="8">            
+          <el-col :span="8">
             <el-form-item label="入库日期" prop="recptDate">
-              <el-date-picker clearable
+              <el-date-picker
+                clearable
                 v-model="form.recptDate"
                 type="date"
                 value-format="yyyy-MM-dd"
-                placeholder="请选择入库日期">
+                placeholder="请选择入库日期"
+              >
               </el-date-picker>
             </el-form-item>
           </el-col>
@@ -197,7 +278,11 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="单据状态" prop="status">
-              <el-select v-model="form.status" disabled placeholder="请选择单据状态">
+              <el-select
+                v-model="form.status"
+                disabled
+                placeholder="请选择单据状态"
+              >
                 <el-option
                   v-for="dict in dict.type.mes_order_status"
                   :key="dict.value"
@@ -211,69 +296,182 @@
         <el-row>
           <el-col :span="8">
             <el-form-item label="供应商" prop="vendorName">
-              <el-input v-model="form.vendorName" readonly="readonly" placeholder="请选择供应商" >
-                <el-button slot="append" @click="handleSelectVendor" icon="el-icon-search"></el-button>
+              <el-input
+                v-model="form.vendorName"
+                readonly="readonly"
+                placeholder="请选择供应商"
+              >
+                <el-button
+                  slot="append"
+                  @click="handleSelectVendor"
+                  icon="el-icon-search"
+                ></el-button>
               </el-input>
               <VendorSelect ref="vendorSelect" @onSelected="onVendorSelected" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="入库仓库">
-              <el-cascader v-model="warehouseInfo"
+              <el-cascader
+                v-model="warehouseInfo"
                 :options="warehouseOptions"
                 :props="warehouseProps"
                 @change="handleWarehouseChanged"
-              >                  
+              >
               </el-cascader>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-
-          </el-col>
-        </el-row>               
+          <el-col :span="8"> </el-col>
+        </el-row>
         <el-row>
           <el-col :span="24">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+              <el-input
+                v-model="form.remark"
+                type="textarea"
+                placeholder="请输入内容"
+              />
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
-      <el-divider v-if="form.recptId !=null" content-position="center">物料信息</el-divider> 
-        <el-card shadow="always" v-if="form.recptId !=null" class="box-card">
-          <Itemrecptline ref=line :recptId="form.recptId" :warehouseId="form.warehouseId" :locationId="form.locationId" :areaId="form.areaId" :optType="optType"></Itemrecptline>
-        </el-card>
+      <el-divider v-if="form.recptId != null" content-position="center"
+        >物料信息</el-divider
+      >
+      <el-card shadow="always" v-if="form.recptId != null" class="box-card">
+        <Itemrecptline
+          ref="line"
+          :recptId="form.recptId"
+          :warehouseId="form.warehouseId"
+          :locationId="form.locationId"
+          :areaId="form.areaId"
+          :optType="optType"
+        ></Itemrecptline>
+      </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-if="form.status =='PREPARE' && optType !='view' ">保 存</el-button>        
+        <el-button
+          type="primary"
+          @click="cancel"
+          v-if="optType == 'view' || form.status != 'PREPARE'"
+          >返回</el-button
+        >
+        <el-button
+          type="primary"
+          @click="submitForm"
+          v-if="form.status == 'PREPARE' && optType != 'view'"
+          >保 存</el-button
+        >
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
+    <!-- 执行入库对话框 -->
+    <el-dialog
+      title="执行入库"
+      :visible.sync="warehousing"
+      width="500px"
+      append-to-body
+    >
+      <el-form
+        ref="perform"
+        :model="perform"
+        :rules="rules"
+        label-width="120px"
+      >
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="物料编码" prop="itemId">
+              <el-select
+                style="width: 80%"
+                v-model="perform.itemCode"
+                placeholder="请选择物料编码"
+                @change="selectEncoding"
+              >
+                <el-option
+                  v-for="dict in itemrecptlineList"
+                  :key="dict.lineId"
+                  :label="dict.itemCode"
+                  :value="dict"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="选择托盘" prop="palletId">
+              <el-select
+                style="width: 80%"
+                v-model="perform.palletCode"
+                placeholder="请选择选择托盘"
+                @change="selectTray"
+              >
+                <el-option
+                  v-for="dict in itemList"
+                  :key="dict.proPalletId"
+                  :label="dict.palletCode"
+                  :value="dict"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="剩余数量" prop=""
+              >{{ this.remainingquantity }}
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFileForm">确 定</el-button>
+        <el-button @click="warehousing = false">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-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 {
+  listItemrecpt,
+  getItemrecpt,
+  delItemrecpt,
+  addItemrecpt,
+  updateItemrecpt,
+  confirmItemrecpt,
+  storage,
+} from "@/api/mes/wm/itemrecpt";
+import { listItemrecptline } from "@/api/mes/wm/itemrecptline";
+import { listMdItem } from "@/api/mes/md/pallet";
+
+import { getTreeList } from "@/api/mes/wm/warehouse";
+import { genCode } from "@/api/system/autocode/rule";
 import VendorSelect from "@/components/vendorSelect/single.vue";
 import IqcSelect from "@/components/iqcSelect/single.vue";
 import Itemrecptline from "./line.vue";
 export default {
   name: "Itemrecpt",
-  dicts:['mes_order_status'],
-  components :{VendorSelect,IqcSelect,Itemrecptline},
+  dicts: ["mes_order_status"],
+  components: {
+    VendorSelect,
+    IqcSelect,
+    Itemrecptline,
+    listItemrecptline,
+    listMdItem,
+  },
   data() {
     return {
       //自动生成编码
-      autoGenFlag:true,
+      autoGenFlag: true,
       optType: undefined,
-      warehouseInfo:[],
-      warehouseOptions:[],
-      warehouseProps:{
+      warehouseInfo: [],
+      warehouseOptions: [],
+      warehouseProps: {
         multiple: false,
-        value: 'pId',
-        label: 'pName',
+        value: "pId",
+        label: "pName",
       },
       // 遮罩层
       loading: true,
@@ -293,6 +491,14 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      // 是否显示弹出层
+      warehousing: false,
+      itemrecptlineList: [],
+      itemList: [],
+      perform: {},
+      remainingquantity: "",
+      recptIdsData: "",
+      itemData: "",
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -323,18 +529,22 @@ export default {
       // 表单校验
       rules: {
         recptCode: [
-          { required: true, message: "入库单编号不能为空", trigger: "blur" }
+          { required: true, message: "入库单编号不能为空", trigger: "blur" },
         ],
         recptName: [
-          { required: true, message: "入库单名称不能为空", trigger: "blur" }
+          { required: true, message: "入库单名称不能为空", trigger: "blur" },
         ],
         recptDate: [
-          { required: true, message: "入库时间不能为空", trigger: "blur"}
+          { required: true, message: "入库时间不能为空", trigger: "blur" },
         ],
         vendorName: [
-          { required: true, message: "请选择对应的供应商", trigger: "blur"}
-        ]
-      }
+          { required: true, message: "请选择对应的供应商", trigger: "blur" },
+        ],
+        itemId: [
+          { required: true, message: "请选择物料编码", trigger: "blur" },
+        ],
+        palletId: [{ required: true, message: "请选择托盘", trigger: "blur" }],
+      },
     };
   },
   created() {
@@ -345,30 +555,37 @@ export default {
     /** 查询物料入库单列表 */
     getList() {
       this.loading = true;
-      listItemrecpt(this.queryParams).then(response => {
+      listItemrecpt(this.queryParams).then((response) => {
         this.itemrecptList = response.rows;
         this.total = response.total;
         this.loading = false;
       });
     },
-    getWarehouseList(){
-      getTreeList().then( response =>{        
-        if(response.data){
-          this.warehouseOptions = response.data.filter((el) =>{
-              return el.warehouseCode.indexOf('VIR') == -1;
-          });;
-        }
-        this.warehouseOptions.map(w =>{
-          w.children.map(l =>{
-                  let lstr =JSON.stringify(l.children).replace(/locationId/g,'lId').replace(/areaId/g, 'pId').replace(/areaName/g,'pName');                  
-                  l.children = JSON.parse(lstr);
+    getWarehouseList() {
+      getTreeList().then((response) => {
+        if (response.data) {
+          this.warehouseOptions = response.data.filter((el) => {
+            return el.warehouseCode.indexOf("VIR") == -1;
+          });
+        }
+        this.warehouseOptions.map((w) => {
+          w.children.map((l) => {
+            let lstr = JSON.stringify(l.children)
+              .replace(/locationId/g, "lId")
+              .replace(/areaId/g, "pId")
+              .replace(/areaName/g, "pName");
+            l.children = JSON.parse(lstr);
           });
-            
-          let wstr = JSON.stringify(w.children).replace(/warehouseId/g,'wId').replace(/locationId/g, 'pId').replace(/locationName/g,'pName');  
-          w.children =  JSON.parse(wstr); 
 
+          let wstr = JSON.stringify(w.children)
+            .replace(/warehouseId/g, "wId")
+            .replace(/locationId/g, "pId")
+            .replace(/locationName/g, "pName");
+          w.children = JSON.parse(wstr);
         });
-        let ostr=JSON.stringify(this.warehouseOptions).replace(/warehouseId/g,'pId').replace(/warehouseName/g, 'pName');
+        let ostr = JSON.stringify(this.warehouseOptions)
+          .replace(/warehouseId/g, "pId")
+          .replace(/warehouseName/g, "pName");
         this.warehouseOptions = JSON.parse(ostr);
       });
     },
@@ -405,9 +622,9 @@ export default {
         createBy: null,
         createTime: null,
         updateBy: null,
-        updateTime: null
+        updateTime: null,
       };
-      this.autoGenFlag = true;      
+      this.autoGenFlag = true;
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
@@ -422,9 +639,9 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.recptId)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
+      this.ids = selection.map((item) => item.recptId);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
     },
     /** 新增按钮操作 */
     handleAdd() {
@@ -433,19 +650,19 @@ export default {
       this.open = true;
       this.title = "添加物料入库单";
       this.optType = "add";
-        genCode('ITEMRECPT_CODE').then(response =>{
-          this.form.recptCode = response;
-        });
+      genCode("ITEMRECPT_CODE").then((response) => {
+        this.form.recptCode = response;
+      });
     },
     // 查询明细按钮操作
-    handleView(row){
+    handleView(row) {
       this.reset();
-      const recptIds = row.recptId
-      getItemrecpt(recptIds).then(response => {
+      const recptIds = row.recptId;
+      getItemrecpt(recptIds).then((response) => {
         this.form = response.data;
-        this.warehouseInfo[0] = response.data.warehouseId;    
-        this.warehouseInfo[1] = response.data.locationId;    
-        this.warehouseInfo[2] = response.data.areaId; 
+        this.warehouseInfo[0] = response.data.warehouseId;
+        this.warehouseInfo[1] = response.data.locationId;
+        this.warehouseInfo[2] = response.data.areaId;
         this.open = true;
         this.title = "查看入库单信息";
         this.optType = "view";
@@ -454,40 +671,63 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const recptId = row.recptId || this.ids
-      getItemrecpt(recptId).then(response => {
-        this.form = response.data;   
-        this.warehouseInfo[0] = response.data.warehouseId;    
-        this.warehouseInfo[1] = response.data.locationId;    
-        this.warehouseInfo[2] = response.data.areaId;    
+      const recptId = row.recptId || this.ids;
+      getItemrecpt(recptId).then((response) => {
+        this.form = response.data;
+        this.warehouseInfo[0] = response.data.warehouseId;
+        this.warehouseInfo[1] = response.data.locationId;
+        this.warehouseInfo[2] = response.data.areaId;
         this.open = true;
         this.title = "修改物料入库单";
         this.optType = "edit";
       });
     },
-    
+
     //执行入库
-    handleExecute(row){
-      const recptIds = row.recptId || this.ids;
-      this.$modal.confirm('确认执行入库？').then(function() {
-        return execute(recptIds)//执行入库
-      }).then(() => {
-        this.getList();
+    handleExecute(row) {
+      console.log(row);
+      this.recptIdsData = row.recptId;
+      this.perform.recptId = row.recptId;
+      this.warehousing = true;
+      // 物料查询
+      listItemrecptline({ recptId: row.recptId }).then((response) => {
+        this.itemrecptlineList = response.rows;
+      });
+      // 托盘查询
+      listMdItem(this.queryParams).then((response) => {
+        this.itemList = response.rows;
+      });
+    },
+    selectEncoding(data) {
+      this.remainingquantity = data.quantityRecived;
+      this.perform.itemCode = data.itemCode;
+      this.perform.lineId = data.lineId;
+      this.perform.itemId = data.itemId;
+    },
+    selectTray(data) {
+      this.perform.palletId = data.proPalletId;
+      this.perform.palletCode = data.palletCode;
+    },
+    submitFileForm() {
+      storage(this.perform).then((response) => {
         this.$modal.msgSuccess("入库成功");
-      }).catch(() => {});
+        this.warehousing = false;
+        this.getList();
+        this.selectEncoding();
+      });
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.recptId != null) {
-            updateItemrecpt(this.form).then(response => {
+            updateItemrecpt(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addItemrecpt(this.form).then(response => {
+            addItemrecpt(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -496,79 +736,89 @@ export default {
         }
       });
     },
-    doconfirm(){
+    doconfirm() {
       let that = this;
-      this.$modal.confirm('是否完成入库单编制？【完成后将不能更改】').then(function(){
-        that.form.status = 'CONFIRMED';
-        that.submitForm();
-      });
+      this.$modal
+        .confirm("是否完成入库单编制？【完成后将不能更改】")
+        .then(function () {
+          that.form.status = "CONFIRMED";
+          that.submitForm();
+        });
     },
 
     /** 删除按钮操作 */
     handleDelete(row) {
       const recptIds = row.recptId || this.ids;
-      this.$modal.confirm('是否确认删除物料入库单？').then(function() {
-        return delItemrecpt(recptIds);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      this.$modal
+        .confirm("是否确认删除物料入库单？")
+        .then(function () {
+          return delItemrecpt(recptIds);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('mes/wm/itemrecpt/export', {
-        ...this.queryParams
-      }, `itemrecpt_${new Date().getTime()}.xlsx`)
+      this.download(
+        "mes/wm/itemrecpt/export",
+        {
+          ...this.queryParams,
+        },
+        `itemrecpt_${new Date().getTime()}.xlsx`
+      );
     },
     //选择默认的仓库、库区、库位
-    handleWarehouseChanged(obj){
+    handleWarehouseChanged(obj) {
       debugger;
-      if(obj !=null){
+      if (obj != null) {
         this.form.warehouseId = obj[0];
         this.form.locationId = obj[1];
         this.form.areaId = obj[2];
       }
     },
     //IQC检验单选择
-    handleSelectIqc(){
+    handleSelectIqc() {
       this.$refs.iqcSelect.showFlag = true;
     },
     //IQC检验单选择弹出框
-    onIqcSelected(obj){
-        if(obj != undefined && obj != null){
-          this.form.iqcId = obj.iqcId;
-          this.form.iqcCode = obj.iqcCode;
-          this.form.recptName = obj.iqcName;
-          this.form.vendorId = obj.vendorId;
-          this.form.vendorCode = obj.vendorCode;
-          this.form.vendorName = obj.vendorName;
-          this.form.vendorNick = obj.vendorNick;
-        }
+    onIqcSelected(obj) {
+      if (obj != undefined && obj != null) {
+        this.form.iqcId = obj.iqcId;
+        this.form.iqcCode = obj.iqcCode;
+        this.form.recptName = obj.iqcName;
+        this.form.vendorId = obj.vendorId;
+        this.form.vendorCode = obj.vendorCode;
+        this.form.vendorName = obj.vendorName;
+        this.form.vendorNick = obj.vendorNick;
+      }
     },
     //供应商选择
-    handleSelectVendor(){
+    handleSelectVendor() {
       this.$refs.vendorSelect.showFlag = true;
     },
     //供应商选择弹出框
-    onVendorSelected(obj){
-        if(obj != undefined && obj != null){
-          this.form.vendorId = obj.vendorId;
-          this.form.vendorCode = obj.vendorCode;
-          this.form.vendorName = obj.vendorName;
-          this.form.vendorNick = obj.vendorNick;
-        }
+    onVendorSelected(obj) {
+      if (obj != undefined && obj != null) {
+        this.form.vendorId = obj.vendorId;
+        this.form.vendorCode = obj.vendorCode;
+        this.form.vendorName = obj.vendorName;
+        this.form.vendorNick = obj.vendorNick;
+      }
     },
     //自动生成编码
-    handleAutoGenChange(autoGenFlag){
-      if(autoGenFlag){
-        genCode('ITEMRECPT_CODE').then(response =>{
+    handleAutoGenChange(autoGenFlag) {
+      if (autoGenFlag) {
+        genCode("ITEMRECPT_CODE").then((response) => {
           this.form.recptCode = response;
         });
-      }else{
+      } else {
         this.form.recptCode = null;
       }
-    }
-  }
+    },
+  },
 };
 </script>
 <style scoped>
@@ -576,4 +826,4 @@ export default {
   flex: 0 1 54%;
   order: 1;
 }
-</style>
\ No newline at end of file
+</style>