✨ feat(mes): 添加退料单质检标识及相关字段校验

src/views/mes/wm/returnissue/ReturnIssueForm.vue

@@ -49,6 +49,17 @@
             </el-select>
           </el-form-item>
         </el-col>
+        <el-col :span="8">
+          <el-form-item label="生产工单" prop="workOrderId">
+            <ProWorkOrderSelect v-model="formData.workOrderId" :disabled="isHeaderReadonly" />
+          </el-form-item>
+        </el-col>
+        <!-- TODO @芋艿：貌似前端不用选择；关注下； -->
+        <el-col :span="8">
+          <el-form-item label="工作站" prop="workstationId">
+            <MdWorkstationSelect v-model="formData.workstationId" :disabled="isHeaderReadonly" />
+          </el-form-item>
+        </el-col>
         <el-col :span="8">
           <el-form-item label="退料日期" prop="returnDate">
             <el-date-picker
@@ -61,17 +72,6 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="8">
-          <el-form-item label="生产工单" prop="workOrderId">
-            <ProWorkOrderSelect v-model="formData.workOrderId" :disabled="isHeaderReadonly" />
-          </el-form-item>
-        </el-col>
-        <!-- TODO @芋艿：貌似前端不用选择；关注下； -->
-        <el-col :span="8">
-          <el-form-item label="工作站" prop="workstationId">
-            <MdWorkstationSelect v-model="formData.workstationId" :disabled="isHeaderReadonly" />
-          </el-form-item>
-        </el-col>
         <el-col :span="24">
           <el-form-item label="备注" prop="remark">
             <el-input

src/views/mes/wm/returnissue/ReturnIssueLineList.vue

@@ -32,8 +32,12 @@
       <el-table-column label="规格型号" align="center" prop="specification" min-width="120" />
       <el-table-column label="单位" align="center" prop="unitMeasureName" width="80" />
       <el-table-column label="退料数量" align="center" prop="quantity" width="100" />
-      <!-- TODO @AI：批次号；增加下； -->
+      <el-table-column label="批次号" align="center" prop="batchNo" min-width="120" />
-      <!-- TODO @AI：是否检测，增加下； -->
+      <el-table-column label="是否检测" align="center" prop="qcFlag" width="100">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.qcFlag" />
+        </template>
+      </el-table-column>
       <el-table-column label="质量状态" align="center" prop="qualityStatus" width="100">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.MES_WM_QUALITY_STATUS" :value="scope.row.qualityStatus" />
@@ -78,6 +82,7 @@
     >
       <el-row>
         <el-col :span="8">
+          <!-- TODO @芋艿：【StockSelect】需要使用库存选择器； -->
           <el-form-item label="产品物料" prop="itemId">
             <MdItemSelect
               v-model="formData.itemId"
@@ -194,7 +199,8 @@ const formData = ref({
 })
 const formRules = reactive({
   itemId: [{ required: true, message: '物料不能为空', trigger: 'change' }],
-  quantity: [{ required: true, message: '退料数量不能为空', trigger: 'blur' }]
+  quantity: [{ required: true, message: '退料数量不能为空', trigger: 'blur' }],
+  qcFlag: [{ required: true, message: '需要质检不能为空', trigger: 'change' }]
 })
 const formRef = ref() // 表单 Ref
 

src/views/mes/wm/returnissue/index.vue

@@ -26,11 +26,7 @@
         />
       </el-form-item>
       <el-form-item label="生产工单" prop="workOrderId">
-        <ProWorkOrderSelect
+        <ProWorkOrderSelect v-model="queryParams.workOrderId" clearable class="!w-240px" />
-          v-model="queryParams.workOrderId"
-          clearable
-          class="!w-240px"
-        />
       </el-form-item>
       <el-form-item label="退料类型" prop="type">
         <el-select
@@ -47,32 +43,6 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="退料日期" prop="returnDate">
-        <el-date-picker
-          v-model="queryParams.returnDate"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="单据状态" prop="status">
-        <el-select
-          v-model="queryParams.status"
-          placeholder="请选择单据状态"
-          clearable
-          class="!w-240px"
-        >
-          <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.MES_WM_RETURN_ISSUE_STATUS)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
       <el-form-item>
         <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
         <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
@@ -107,13 +77,13 @@
         </template>
       </el-table-column>
       <el-table-column label="退料单名称" align="center" prop="name" min-width="150" />
-      <el-table-column label="生产工单" align="center" prop="workOrderCode" min-width="140" />
-      <el-table-column label="工作站" align="center" prop="workstationName" min-width="120" />
       <el-table-column label="退料类型" align="center" prop="type" min-width="110">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.MES_WM_RETURN_ISSUE_TYPE" :value="scope.row.type" />
         </template>
       </el-table-column>
+      <el-table-column label="生产工单" align="center" prop="workOrderCode" min-width="140" />
+      <el-table-column label="工作站" align="center" prop="workstationName" min-width="120" />
       <el-table-column
         label="退料日期"
         align="center"
@@ -156,9 +126,7 @@
           >
             删除
           </el-button>
-          <!-- TODO @芋艿：UNEXECUTE、UNSTOCK； -->
           <!-- 待入库：执行上架 -->
-          <!-- DONE @AI：名字改成：“执行上架” -->
           <el-button
             link
             type="success"
@@ -169,7 +137,6 @@
             执行上架
           </el-button>
           <!-- 已入库：执行退料 -->
-          <!-- DONE @AI：名字换成：“执行退料” -->
           <el-button
             link
             type="success"
@@ -231,9 +198,7 @@ const queryParams = reactive({
   code: undefined,
   name: undefined,
   workOrderId: undefined,
-  type: undefined,
+  type: undefined
-  status: undefined,
-  returnDate: undefined
 })
 const queryFormRef = ref() // 搜索的表单
 const formRef = ref() // 表单弹窗