Merge remote-tracking branch 'origin/0.8.X' into 0.8.X

klp-ui/src/views/wms/coil/panels/base.vue

@@ -396,6 +396,12 @@
           <el-input-number :controls="false" v-model="form.actualWidth" placeholder="请输入实测宽度" type="number"
             :step="0.01" />
         </el-form-item>
+        <el-form-item label="业务目的" prop="businessPurpose">
+          <el-select v-model="form.businessPurpose" placeholder="业务目的" filterable>
+            <el-option v-for="item in dict.type.coil_business_purpose" :key="item.value" :value="item.value"
+              :label="item.label" />
+          </el-select>
+        </el-form-item>
         <el-form-item label="调制度" prop="temperGrade">
           <el-input v-model="form.temperGrade" placeholder="请输入调制度" />
         </el-form-item>
@@ -1110,7 +1116,7 @@ export default {
     handlePreviewLabel(row) {
       this.labelRender.visible = true;
       const itemName = row.itemName || '';
-      
+
       this.labelRender.type = row.itemType === 'product' ? '3' : '2';
       this.labelRender.data = {
         ...row,

klp-ui/src/views/wms/coil/panels/stepSplit.vue

@@ -173,6 +173,12 @@
                 <el-input-number :controls="false" v-model="splitForm.actualWidth" placeholder="请输入实测宽度" type="number"
                   :step="0.01" />
               </el-form-item>
+              <el-form-item label="业务目的" prop="businessPurpose">
+                <el-select v-model="splitForm.businessPurpose" placeholder="业务目的" filterable>
+                  <el-option v-for="item in dict.type.coil_business_purpose" :key="item.value" :value="item.value"
+                    :label="item.label" />
+                </el-select>
+              </el-form-item>
               <el-form-item label="调制度" prop="temperGrade">
                 <el-input v-model="splitForm.temperGrade" placeholder="请输入调制度" />
               </el-form-item>
@@ -340,7 +346,7 @@ export default {
     ProductInfo,
     RawMaterialInfo,
   },
-  dicts: ['coil_quality_status', 'coil_abnormal_position', 'coil_abnormal_code', 'coil_abnormal_degree'],
+  dicts: ['coil_quality_status', 'coil_abnormal_position', 'coil_abnormal_code', 'coil_abnormal_degree', 'coil_business_purpose'],
   data() {
     const currentCoilNoPrefix = generateCoilNoPrefix()
     return {
@@ -610,8 +616,15 @@ export default {
 
     // 材料类型变更处理
     handleMaterialTypeChange(val) {
-      // 根据材料类型设置itemType
-      this.splitForm.itemType = val === '成品' ? 'product' : val === '原料' ? 'raw_material' : ''
+       // 清空物品选择
+      this.splitForm.itemId = null;
+
+      // 根据材料类型设置物品类型
+      if (val === '成品') {
+        this.splitForm.itemType = 'product';
+      } else if (val === '原料') {
+        this.splitForm.itemType = 'raw_material';
+      }
     },
 
     // 选中分条列表项（显示详情）
@@ -640,8 +653,6 @@ export default {
       this.selectedSplitItem = null
       // 赋值表单数据
       this.splitForm = { ...row }
-      // 同步材料类型和长度显示状态
-      this.handleMaterialTypeChange(row.materialType)
     },
 
     // 新增/编辑分条
@@ -883,11 +894,6 @@ export default {
         ...copiedFields
       };
 
-      // 同步材料类型和长度显示状态
-      if (this.splitForm.materialType) {
-        this.handleMaterialTypeChange(this.splitForm.materialType);
-      }
-
       this.$message.success('已复制源卷信息，请根据需要修改');
     }
   },