From b56400ec0e24b1571bcca1078b2da2bb53d5a410 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?yinjinlu-pc=5C=E5=B0=B9=E9=87=91=E8=B7=AF?=
 <411641505@qq.com>
Date: Mon, 30 Oct 2023 22:50:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=A7=E8=A1=8C=E6=8C=89=E9=92=AE=E5=9B=BE?=
 =?UTF-8?q?=E6=A0=87=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/workorderSelect/single.vue | 4 ++++
 src/views/mes/wm/issue/index.vue          | 2 +-
 src/views/mes/wm/itemrecpt/index.vue      | 3 +--
 src/views/mes/wm/productrecpt/index.vue   | 2 +-
 src/views/mes/wm/rtissue/index.vue        | 2 +-
 src/views/mes/wm/rtvendor/index.vue       | 2 +-
 6 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/components/workorderSelect/single.vue b/src/components/workorderSelect/single.vue
index 583a055..03d5697 100644
--- a/src/components/workorderSelect/single.vue
+++ b/src/components/workorderSelect/single.vue
@@ -103,6 +103,9 @@
         name: 'WorkOrderSelectSingle',
         components: {},
         dicts: ['mes_order_status','mes_workorder_sourcetype'],
+        props:{
+          workorder: undefined //外部传入的工单过滤信息
+        },
         data() {
             return {
                 showFlag: false,
@@ -129,6 +132,7 @@
                 queryParams: {
                     workorderCode: null,
                     workorderName: null,
+                    workorderType: this.workorder.workorderType,
                     orderSource: null,
                     sourceCode: null,
                     productId: null,
diff --git a/src/views/mes/wm/issue/index.vue b/src/views/mes/wm/issue/index.vue
index d1748fb..9c4e229 100644
--- a/src/views/mes/wm/issue/index.vue
+++ b/src/views/mes/wm/issue/index.vue
@@ -125,7 +125,7 @@
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-delete"
+            icon="el-icon-video-play"
             v-if="scope.row.status =='PREPARE'"
             @click="handleExecute(scope.row)"
             v-hasPermi="['mes:wm:issueheader:edit']"
diff --git a/src/views/mes/wm/itemrecpt/index.vue b/src/views/mes/wm/itemrecpt/index.vue
index 4bcdc27..2a9663c 100644
--- a/src/views/mes/wm/itemrecpt/index.vue
+++ b/src/views/mes/wm/itemrecpt/index.vue
@@ -122,7 +122,7 @@
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-delete"
+            icon="el-icon-video-play"
             v-if="scope.row.status =='PREPARE'"
             @click="handleExecute(scope.row)"
             v-hasPermi="['mes:wm:itemrecpt:edit']"
@@ -439,7 +439,6 @@ export default {
       this.reset();
       const recptIds = row.recptId
       getItemrecpt(recptIds).then(response => {
-        debugger;
         this.form = response.data;
         this.warehouseInfo[0] = response.data.warehouseId;    
         this.warehouseInfo[1] = response.data.locationId;    
diff --git a/src/views/mes/wm/productrecpt/index.vue b/src/views/mes/wm/productrecpt/index.vue
index 04eb9f3..1a6030c 100644
--- a/src/views/mes/wm/productrecpt/index.vue
+++ b/src/views/mes/wm/productrecpt/index.vue
@@ -107,7 +107,7 @@
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-delete"
+            icon="el-icon-video-play"
             v-if="scope.row.status =='PREPARE'"
             @click="handleExecute(scope.row)"
             v-hasPermi="['mes:wm:productrecpt:edit']"
diff --git a/src/views/mes/wm/rtissue/index.vue b/src/views/mes/wm/rtissue/index.vue
index b790be7..2b0ca16 100644
--- a/src/views/mes/wm/rtissue/index.vue
+++ b/src/views/mes/wm/rtissue/index.vue
@@ -98,7 +98,7 @@
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-delete"
+            icon="el-icon-video-play"
             v-if="scope.row.status =='PREPARE'"
             @click="handleExecute(scope.row)"
             v-hasPermi="['mes:wm:rtissue:edit']"
diff --git a/src/views/mes/wm/rtvendor/index.vue b/src/views/mes/wm/rtvendor/index.vue
index 1e97fba..94a0734 100644
--- a/src/views/mes/wm/rtvendor/index.vue
+++ b/src/views/mes/wm/rtvendor/index.vue
@@ -115,7 +115,7 @@
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-delete"
+            icon="el-icon-video-play"
             v-if="scope.row.status =='PREPARE'"
             @click="handleExecute(scope.row)"
             v-hasPermi="['mes:wm:rtvendor:edit']"