feat(qc/task): 重构钢卷号选择逻辑并优化表单显示

- 使用CoilSelector组件替换原有的钢卷号输入框
- 调整表单字段显示顺序和布局
- 优化钢卷相关数据的获取和显示方式
- 移除部分注释掉的表单字段

klp-ui/src/views/mes/qc/task/pages/raw.vue

@@ -39,16 +39,16 @@
       <KLPTable ref="checkTaskTable" height="300px" highlight-current-row v-loading="loading" :data="checkTaskList"
         @row-click="handleRowClick">
         <el-table-column label="任务名称" align="center" prop="taskName" />
-        <el-table-column label="钢卷号" align="center" prop="verifyTarget.coilId" />
+        <el-table-column label="钢卷号" align="center" prop="currentCoilNo" />
         <el-table-column label="工段" align="center" prop="workshopSection" />
         <el-table-column label="工序" align="center" prop="process" />
         <el-table-column label="机组" align="center" prop="unitGroup" />
-        <el-table-column label="钢卷号" align="center" prop="verifyTarget.coilId" />
+        <!-- <el-table-column label="钢卷号" align="center" prop="verifyTarget.coilId" /> -->
-        <el-table-column label="原料卷号" align="center" prop="verifyTarget.rawCoilId" />
+        <el-table-column label="原料卷号" align="center" prop="entryCoilNo" />
         <el-table-column label="厂家" align="center" prop="verifyTarget.vendor" />
         <el-table-column label="宽度" align="center" prop="verifyTarget.width" />
         <el-table-column label="厚度" align="center" prop="verifyTarget.thickness" />
-        <el-table-column label="重量" align="center" prop="verifyTarget.weight" />
+        <el-table-column label="重量" align="center" prop="weight" />
         <el-table-column label="检验结果" align="center">
           <template slot-scope="scope">
             <span>
@@ -136,13 +136,11 @@
         <el-form-item label="检查项" prop="itemId" v-if="!form.taskId">
           <CheckItemSelect v-model="form.itemId" />
         </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
-        </el-form-item>
         <el-form-item label="钢卷号">
-          <el-input v-model="form.verifyTarget.coilId" placeholder="请输入钢卷号" />
+          <coil-selector v-model="form.coilIds" @select="handleCoilChange" :filters="{ selectType: 'raw_material', itemType: 'raw_material' }"></coil-selector>
+          <!-- <el-input v-model="form.verifyTarget.coilId" placeholder="请输入钢卷号" /> -->
         </el-form-item>
-        <el-form-item label="原料卷号">
+        <!-- <el-form-item label="原料卷号">
           <el-input v-model="form.verifyTarget.rawCoilId" placeholder="请输入原料卷号" />
         </el-form-item>
         <el-form-item label="厂家">
@@ -156,7 +154,7 @@
         </el-form-item>
         <el-form-item label="重量">
           <el-input v-model="form.verifyTarget.weight" placeholder="请输入重量" />
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="工段" prop="workshopSection">
           <el-input v-model="form.workshopSection" placeholder="请输入工段" />
         </el-form-item>
@@ -166,13 +164,16 @@
         <el-form-item label="机组" prop="unitGroup">
           <el-input v-model="form.unitGroup" placeholder="请输入机组" />
         </el-form-item>
-        <el-form-item label="检验结果" prop="inspectionResult">
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </el-form-item>
+        <!-- <el-form-item label="检验结果" prop="inspectionResult">
           <el-select v-model="form.inspectionResult" placeholder="请选择检验结果">
             <el-option label="未检验" :value="0" />
             <el-option label="合格" :value="1" />
             <el-option label="不合格" :value="2" />
           </el-select>
-        </el-form-item>
+        </el-form-item> -->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
@@ -187,6 +188,7 @@
 import { listCheckTask, getCheckTask, delCheckTask, addCheckTask, updateCheckTask } from '@/api/mes/qc/checkTask'
 import { updateCheckTaskItemStatus, updateCheckTaskItem } from '@/api/mes/qc/checkTaskItem'
 import CheckItemSelect from '@/components/KLPService/CheckItemSelect/index'
+import CoilSelector from '@/components/CoilSelector/index.vue'
 
 export default {
   name: 'CheckTask',
@@ -245,7 +247,8 @@ export default {
     this.getList();
   },
   components: {
-    CheckItemSelect
+    CheckItemSelect,
+    CoilSelector
   },
   methods: {
     /** 查询检查任务列表 */
@@ -254,12 +257,27 @@ export default {
       listCheckTask(this.queryParams).then(response => {
         this.checkTaskList = response.rows.map(item => ({
           ...item,
-          verifyTarget: JSON.parse(item.verifyTarget)
+          verifyTarget: JSON.parse(item.verifyTarget),
+          entryCoilNo: item.coilList?.[0]?.entryCoilNo || '',
+          currentCoilNo: item.coilList?.[0]?.currentCoilNo || '',
+          weight: item.coilList?.[0]?.netWeight || 0,
         }));
         this.total = response.total;
         this.loading = false;
       });
     },
+    handleCoilChange(coil) {
+      const [thickness, width] = coil.specification.split('*')
+      console.log(thickness, width, coil.netWeight)
+      this.form.verifyTarget = {
+        coilId: coil.coilId,
+        rawCoilId: coil.rawCoilId,
+        factory: coil.manufacturer,
+        thickness: thickness,
+        width: width,
+        weight: coil.netWeight,
+      }
+    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -383,6 +401,7 @@ export default {
           // 对象转json
           const payload = {
             ...this.form,
+            itemId: this.form.itemId.split(','),
             verifyTarget: JSON.stringify(this.form.verifyTarget)
           }
           if (this.form.taskId != null) {

klp-ui/src/views/mes/qc/task/pages/section.vue

@@ -39,7 +39,7 @@
       <KLPTable ref="checkTaskTable" height="300px" highlight-current-row v-loading="loading" :data="checkTaskList"
         @row-click="handleRowClick">
         <el-table-column label="任务名称" align="center" prop="taskName" />
-        <el-table-column label="钢卷号" align="center" prop="verifyTarget.coilId" />
+        <el-table-column label="钢卷号" align="center" prop="coilList[0].currentCoilNo" />
         <el-table-column label="工段" align="center" prop="workshopSection" />
         <el-table-column label="工序" align="center" prop="process" />
         <el-table-column label="机组" align="center" prop="unitGroup" />
@@ -127,15 +127,13 @@
         <el-form-item label="任务名称" prop="taskName">
           <el-input v-model="form.taskName" placeholder="请输入任务名称" />
         </el-form-item>
+        <el-form-item label="钢卷号">
+          <!-- <el-input v-model="form.verifyTarget.coilId" placeholder="请输入钢卷号" /> -->
+          <coil-selector v-model="form.coilIds" @select="handleCoilChange"></coil-selector>
+        </el-form-item>
         <el-form-item label="检查项" prop="itemId" v-if="!form.taskId">
           <CheckItemSelect v-model="form.itemId" />
         </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
-        </el-form-item>
-        <el-form-item label="钢卷号">
-          <el-input v-model="form.verifyTarget.coilId" placeholder="请输入钢卷号" />
-        </el-form-item>
         <el-form-item label="工段" prop="workshopSection">
           <el-input v-model="form.workshopSection" placeholder="请输入工段" />
         </el-form-item>
@@ -145,13 +143,16 @@
         <el-form-item label="机组" prop="unitGroup">
           <el-input v-model="form.unitGroup" placeholder="请输入机组" />
         </el-form-item>
-        <el-form-item label="检验结果" prop="inspectionResult">
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </el-form-item>
+        <!-- <el-form-item label="检验结果" prop="inspectionResult">
           <el-select v-model="form.inspectionResult" placeholder="请选择检验结果">
             <el-option label="未检验" :value="0" />
             <el-option label="合格" :value="1" />
             <el-option label="不合格" :value="2" />
           </el-select>
-        </el-form-item>
+        </el-form-item> -->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
@@ -166,6 +167,8 @@
 import { listCheckTask, getCheckTask, delCheckTask, addCheckTask, updateCheckTask } from '@/api/mes/qc/checkTask'
 import { updateCheckTaskItemStatus, updateCheckTaskItem } from '@/api/mes/qc/checkTaskItem'
 import CheckItemSelect from '@/components/KLPService/CheckItemSelect/index'
+import CoilSelector from '@/components/CoilSelector/index.vue'
+
 
 export default {
   name: 'CheckTask',
@@ -219,7 +222,8 @@ export default {
     this.getList();
   },
   components: {
-    CheckItemSelect
+    CheckItemSelect,
+    CoilSelector
   },
   methods: {
     /** 查询检查任务列表 */
@@ -234,13 +238,16 @@ export default {
         this.loading = false;
       });
     },
+    handleCoilChange(coil) {
+      this.form.verifyTarget.coilId = coil.coilId
+    },
     // 取消按钮
     cancel() {
       this.open = false;
       this.reset();
     },
-     handleBlur(row) {
+    handleBlur(row) {
-      updateCheckTaskItem({...row, itemId: row.checkTaskItemId}).then(response => {
+      updateCheckTaskItem({ ...row, itemId: row.checkTaskItemId }).then(response => {
         this.$message({
           message: '更新成功',
           type: 'success'
@@ -352,6 +359,7 @@ export default {
           // 对象转json
           const payload = {
             ...this.form,
+            itemId: this.form.itemId.split(','),
             verifyTarget: JSON.stringify(this.form.verifyTarget)
           }
           if (this.form.taskId != null) {