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

klp-ui/src/api/wms/coil.js

@@ -281,6 +281,7 @@ export function completeSpecialSplit(pendingActionId) {
   return request({
     url: '/wms/materialCoil/specialSplit/complete',
     method: 'post',
+    timeout: 100000,
     params: {
       pendingActionId
     }

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

@@ -197,12 +197,14 @@
                   </div>
                 </div>
 
-                <el-button style="position: absolute; bottom: 10px; right: 10px;" type="success" icon="el-icon-scissors"
+                <!-- <el-button style="position: absolute; bottom: 10px; right: 10px;" type="success" icon="el-icon-scissors"
-                  size="mini" @click="handleStartSplit(item)" :loading="buttonLoading" class="action-btn">分条</el-button>
+                  size="mini" @click="handleStartSplit(item)" :loading="buttonLoading" class="action-btn">分条</el-button> -->
               </div>
 
               <div class="card-footer">
-                <el-button type="primary" icon="el-icon-check" size="mini" @click="handlePickMaterial(item)"
+                <el-button v-if="useSpecialSplit" type="success" icon="el-icon-scissors"
+                  size="mini" @click="handleStartSplit(item)" :loading="buttonLoading" class="action-btn">分条</el-button>
+                <el-button v-else type="primary" icon="el-icon-check" size="mini" @click="handlePickMaterial(item)"
                   :loading="buttonLoading" class="action-btn">领料</el-button>
                 <el-button type="danger" icon="el-icon-alarm-clock" :plain="item.abnormalCount == 0" size="mini"
                   @click="handleAddAbnormal(item)" :loading="buttonLoading" class="action-btn">

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

@@ -49,7 +49,7 @@
                 <div v-else-if="scope.row.dataType == 0">
                   <el-tag type="warning">历史卷</el-tag>
                 </div>
-                 <div v-else>
+                <div v-else>
                   <el-tag type="danger">未知状态</el-tag>
                 </div>
               </template>
@@ -79,22 +79,10 @@
               <el-form-item label="当前钢卷号" prop="currentCoilNo">
                 <el-input v-model="splitForm.currentCoilNo" placeholder="请输入当前钢卷号" />
               </el-form-item>
-              <el-form-item label="厂家原料卷号" prop="supplierCoilNo">
-                <el-input v-model="splitForm.supplierCoilNo" placeholder="请输入厂家原料卷号" />
-              </el-form-item>
               <el-form-item label="所在库位" prop="warehouseId">
                 <warehouse-select v-model="splitForm.warehouseId" placeholder="请选择仓库/库区/库位" style="width: 100%;"
                   clearable />
               </el-form-item>
-              <!-- <el-form-item label="实际库区" prop="actualWarehouseId">
-                <actual-warehouse-select
-                  v-model="splitForm.actualWarehouseId"
-                  :clearInput="splitForm.coilId != null"
-                  placeholder="请选择实际库区"
-                  style="width: 100%;"
-                  clearable
-                />
-              </el-form-item> -->
               <el-form-item label="班组" prop="team">
                 <el-select v-model="splitForm.team" placeholder="请选择班组" style="width: 100%">
                   <el-option key="甲" label="甲" value="甲" />
@@ -458,12 +446,13 @@ export default {
 
     // 新增/编辑分条
     async addSplit() {
+      // 表单验证
+      const valid = await this.$refs.splitFormRef.validate()
+      console.log('valid', valid)
+      if (!valid) {
+        return
+      }
       try {
-        // 表单验证
-        const valid = await this.$refs.splitFormRef.validate()
-        if (!valid) {
-          return
-        }
         // 区分新增/编辑：有coilId则为编辑，否则为新增
         let res
         this.buttonLoading = true
@@ -483,6 +472,7 @@ export default {
         this.getSplitList()
       } catch (error) {
         // 表单验证失败时的提示
+        console.log('error', error)
         if (error.name !== 'ValidationError') {
           this.$message.error((this.splitForm.coilId ? '编辑' : '新增') + '分条异常：' + error.message)
         }
@@ -498,9 +488,13 @@ export default {
         cancelButtonText: '取消',
         type: 'warning',
       }).then(async () => {
+        const loading = this.$loading({
+          lock: true,
+          text: '正在记录分条操作...',
+          background: 'rgba(0, 0, 0, 0.7)',
+        })
         try {
           this.buttonLoading = true
-
           // 1. 完成分条主流程
           const splitRes = await completeSpecialSplit(this.actionId)
           if (splitRes.code !== 200) {
@@ -523,6 +517,8 @@ export default {
           if (error.message !== 'cancel') { // 排除取消确认的情况
             this.$message.error('完成分条异常：' + error.message)
           }
+        } finally {
+          loading.close()
         }
       })
     },