Merge branch 'dev' of http://222.71.165.188:3000/yunxi/mes-majoys into dev

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" />
@@ -158,8 +158,9 @@ const open = async (whId: number, type: string) => {
   formType.value = type
   // 修改时，设置数据
   queryReqVo.whId = whId
-  queryReqVo.matCode = ''
+  queryReqVo.name = ''
-  queryReqVo.matSpec = ''
+  queryReqVo.code = ''
+  queryReqVo.spec = ''
 
   getList()
   chkboxEnable.value = true

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 }}

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 }}