From 4bd7040202805ff25b1b699a23b97f52b88ab4a7 Mon Sep 17 00:00:00 2001
From: qiuhongwu <Qhw0227@163.com>
Date: Fri, 7 Jun 2024 15:18:04 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=B8=8A=E6=B8=B8=E5=8D=95=E5=8F=B7?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=94=B9=E6=88=90=E6=B4=BE=E5=B7=A5=E5=8D=95?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mes-ui/mes-ui-admin-vue3/src/views/biz/storage/outdex.vue   | 6 +++---
 .../mes-ui-admin-vue3/src/views/biz/storage/outdexAudit.vue | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/outdex.vue b/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/outdex.vue
index 9e358287..e584a8f0 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/outdex.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/outdex.vue
@@ -21,10 +21,10 @@
             class="!w-240px"
           />
         </el-form-item>
-        <el-form-item label="上游单号" prop="headerNo">
+        <el-form-item label="派工单号" prop="headerNo">
           <el-input
             v-model="queryParams.headerNo"
-            placeholder="上游单号"
+            placeholder="派工单号"
             clearable
             @keyup.enter="handleQuery"
             class="!w-240px"
@@ -121,7 +121,7 @@
             <dict-tag :type="DICT_TYPE.BIZ_STORAGE_OUT_TYPE" :value="scope.row.stockInType" />
           </template>
         </el-table-column>
-        <el-table-column label="上游单号" align="center" prop="headerNo" min-width="180" />
+        <el-table-column label="派工单号" align="center" prop="headerNo" min-width="180" />
         <el-table-column label="出库仓库" align="center" prop="whId" min-width="140">
           <template #default="scope">
             {{ warehouseList.find((tag) => tag.id === scope.row.whId)?.whName }}
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/outdexAudit.vue b/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/outdexAudit.vue
index 316df586..94fb658f 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/outdexAudit.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/outdexAudit.vue
@@ -21,10 +21,10 @@
             class="!w-240px"
           />
         </el-form-item>
-        <el-form-item label="上游单号" prop="headerNo">
+        <el-form-item label="派工单号" prop="headerNo">
           <el-input
             v-model="queryParams.headerNo"
-            placeholder="上游单号"
+            placeholder="派工单号"
             clearable
             @keyup.enter="handleQuery"
             class="!w-240px"
@@ -121,7 +121,7 @@
             <dict-tag :type="DICT_TYPE.BIZ_STORAGE_OUT_TYPE" :value="scope.row.stockInType" />
           </template>
         </el-table-column>
-        <el-table-column label="上游单号" align="center" prop="headerNo" min-width="180" />
+        <el-table-column label="派工单号" align="center" prop="headerNo" min-width="180" />
         <el-table-column label="出库仓库" align="center" prop="whId" min-width="140">
           <template #default="scope">
             {{ warehouseList.find((tag) => tag.id === scope.row.whId)?.whName }}

From 4a6571f89c23e85dbc49222da1a02c302413ebf8 Mon Sep 17 00:00:00 2001
From: qiuhongwu <Qhw0227@163.com>
Date: Fri, 7 Jun 2024 15:18:53 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=9A=97=E6=8F=90=E7=A4=BA=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mes-ui/mes-ui-admin-vue3/src/views/biz/storage/materials.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/materials.vue b/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/materials.vue
index 62e6c561..205c1050 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/materials.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/materials.vue
@@ -3,10 +3,10 @@
     <ContentWrap class="borderxx">
       <el-form class="-mb-15px" :model="queryReqVo" :inline="true" label-width="108px">
         <el-form-item label=" 物料编码：">
-          <el-input v-model="queryReqVo.code" placeholder="物料名称/编码" class="!w-240px" :disabled="!chkboxEnable" @keyup.enter="handleQuery"/>
+          <el-input v-model="queryReqVo.code" placeholder="物料编码" class="!w-240px" :disabled="!chkboxEnable" @keyup.enter="handleQuery"/>
         </el-form-item>
         <el-form-item label=" 物料名称：">
-          <el-input v-model="queryReqVo.name" placeholder="物料名称/编码" class="!w-240px" :disabled="!chkboxEnable" @keyup.enter="handleQuery"/>
+          <el-input v-model="queryReqVo.name" placeholder="物料名称" class="!w-240px" :disabled="!chkboxEnable" @keyup.enter="handleQuery"/>
         </el-form-item>
         <el-form-item label="规格/型号" @keyup.enter="handleQuery">
           <el-input v-model="queryReqVo.spec" placeholder="规格/型号" class="!w-240px" :disabled="!chkboxEnable" />

From 5f0fe51ce9234487638a25b691b2f153d3124af7 Mon Sep 17 00:00:00 2001
From: qiuhongwu <Qhw0227@163.com>
Date: Fri, 7 Jun 2024 15:34:18 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=B8=85=E7=A9=BA=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mes-ui/mes-ui-admin-vue3/src/views/biz/storage/materials.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/materials.vue b/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/materials.vue
index 205c1050..8032aa04 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/materials.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/materials.vue
@@ -158,8 +158,9 @@ const open = async (whId: number, type: string) => {
   formType.value = type
   // 修改时，设置数据
   queryReqVo.whId = whId
-  queryReqVo.matCode = ''
-  queryReqVo.matSpec = ''
+  queryReqVo.name = ''
+  queryReqVo.code = ''
+  queryReqVo.spec = ''
 
   getList()
   chkboxEnable.value = true