app三级后端修改

klp-ui/src/views/wms/coil/actflow.vue

@@ -70,11 +70,9 @@
         </template>
       </el-table-column>
 
-      <el-table-column label="操作类型" align="center" prop="actionType" width="100">
+      <el-table-column label="操作类型" align="center" prop="actionType" width="120">
         <template slot-scope="scope">
-          <span v-if="scope.row.actionType === 4 || scope.row.actionType === '4'">发货操作</span>
-          <span v-else-if="scope.row.actionType === 5 || scope.row.actionType === '5'">移库操作</span>
-          <dict-tag v-else :options="dict.type.action_type" :value="scope.row.actionType"/>
+          <span>{{ getActionTypeText(scope.row.actionType) }}</span>
         </template>
       </el-table-column>
 
@@ -191,7 +189,7 @@
         <el-form-item label="操作类型" prop="actionType">
           <el-select v-model="form.actionType" placeholder="请选择操作类型">
             <el-option label="合卷" :value="1" />
-            <el-option label="分卷" :value="2" />
+            <el-option label="分条" :value="2" />
             <el-option label="更新" :value="3" />
           </el-select>
         </el-form-item>
@@ -398,27 +396,27 @@ export default {
       console.log('操作类型:', row.actionType);
       console.log('钢卷ID:', row.coilId);
 
+      const actionType = parseInt(row.actionType);
+
       // 特殊处理：发货和移库操作不需要跳转
-      if (row.actionType === 4 || row.actionType === '4') {
-        this.$message.info('发货操作已在移动端完成');
-        return;
-      }
-      if (row.actionType === 5 || row.actionType === '5') {
-        this.$message.info('移库操作已在移动端完成');
+      if (actionType === 4 || actionType === 5) {
+        this.$message.info(actionType === 4 ? '发货操作已在移动端完成' : '移库操作已在移动端完成');
         return;
       }
 
       // 根据操作类型跳转到不同页面
       let path = '';
-      // 注意：action_type字典中 1=合卷, 2=分卷, 3=更新
-      if (row.actionType === 1 || row.actionType === '1') {
-        // 合卷
-        path = '/wms/merge';
-      } else if (row.actionType === 2 || row.actionType === '2') {
-        // 分卷
+      
+      // 分条操作：100-199
+      if (actionType >= 100 && actionType <= 199) {
         path = '/wms/split';
-      } else if (row.actionType === 3 || row.actionType === '3') {
-        // 更新
+      } 
+      // 合卷操作：200-299
+      else if (actionType >= 200 && actionType <= 299) {
+        path = '/wms/merge';
+      }
+      // 其他操作类型
+      else if (actionType === 3) {
         path = '/wms/typing';
       }
 
@@ -497,6 +495,32 @@ export default {
     handleCoilSelect(coil) {
       this.form.coilId = coil.coilId;
       this.form.currentCoilNo = coil.currentCoilNo;
+    },
+    /** 获取操作类型文本 */
+    getActionTypeText(actionType) {
+      const type = parseInt(actionType);
+      if (type >= 100 && type <= 199) {
+        return '分条操作';
+      } else if (type >= 200 && type <= 299) {
+        return '合卷操作';
+      } else if (type === 3) {
+        return '更新信息';
+      } else if (type === 4) {
+        return '发货操作';
+      } else if (type === 5) {
+        return '移库操作';
+      }
+      return '未知操作';
+    },
+    /** 获取状态文本 */
+    getStatusText(status) {
+      const statusMap = {
+        0: '待处理',
+        1: '处理中',
+        2: '已完成',
+        3: '已取消'
+      };
+      return statusMap[status] || '未知';
     }
   }
 };