fix: DTF生产排版状态修改

src/views/dtf-batch-detail/components/detailHead.vue

@@ -285,13 +285,14 @@ export default {
         ></el-form-item>
         <el-form-item label="操作单排版状态">
           <el-select
-            v-model="searchForm.layout"
+            v-model="searchForm.operationLayoutStatus"
             placeholder="请选择"
             clearable
             style="width: 120px;"
           >
-            <el-option label="排版成功" :value="true"></el-option>
-            <el-option label="排版失败" :value="false"> </el-option> </el-select
+            <el-option label="未排版" :value="0"></el-option>
+            <el-option label="可生产" :value="1"> </el-option>
+            <el-option label="无法生产" :value="2"> </el-option> </el-select
         ></el-form-item>
 
         <el-form-item>

src/views/dtf-batch-detail/detail.vue

@@ -49,12 +49,17 @@ export default {
         status: { label: "操作单状态", value: "" }
       },
       platformJson: platformJson,
-      layoutStatus: {
+      layoutStatusList: {
         1: { label: "待排版", type: "warning" },
         2: { label: "排版中", type: "info" },
-        3: { label: "排版成功", type: "success" },
-        4: { label: "排版失败", type: "danger" },
-        5: { label: "部分成功", type: "success" }
+        3: { label: "处理完成", type: "success" },
+        4: { label: "部分排版完成", type: "warning" },
+        5: { label: "有异常", type: "danger" }
+      },
+      operationLayoutStatusMap: {
+        0: { label: "未排版", type: "warning" },
+        1: { label: "可生产", type: "success" },
+        2: { label: "无法生产", type: "danger" }
       }
     };
   },
@@ -266,8 +271,8 @@ export default {
           >
             <div style="min-height: 22px;">{{ item.label }}</div>
             <div style="min-height: 22px;" v-if="item.label == '排版状态'">
-              <el-tag :type="layoutStatus[item.value]?.type">{{
-                layoutStatus[item.value]?.label
+              <el-tag :type="layoutStatusList[item.value]?.type">{{
+                layoutStatusList[item.value]?.label
               }}</el-tag>
             </div>
             <div v-else style="min-height: 22px;">
@@ -303,24 +308,18 @@ export default {
                 </span>
               </template>
               <template #top_right>
-                <el-tooltip
-                  v-if="item.layout"
-                  effect="light"
-                  content="排版完成"
-                  placement="bottom"
-                >
-                  <div
-                    style="
-                    background-color: #f0f9eb;
-                    color: #6fc844;
-                    border-radius: 4px;
-                    padding:5px;
-                    font-size: 20px;
-                  "
+                <div v-if="item.operationLayoutStatus">
+                  <el-tag
+                    :type="
+                      operationLayoutStatusMap[item.operationLayoutStatus]?.type
+                    "
                   >
-                    排
-                  </div>
-                </el-tooltip>
+                    {{
+                      operationLayoutStatusMap[item.operationLayoutStatus]
+                        ?.label
+                    }}
+                  </el-tag>
+                </div>
               </template>
 
               <template #images>

src/views/dtf-list/components/head.vue

@@ -4,7 +4,11 @@ const { getUser } = require("@/server/utils/store");
 export default {
   data() {
     return {
-      searchForm: { batchArrangeNumber: "", layoutStatus: "", startTime: "" },
+      searchForm: {
+        batchArrangeNumber: "",
+        batchLayoutStatus: [],
+        startTime: ""
+      },
       userData: getUser()
     };
   },
@@ -79,15 +83,16 @@ export default {
         ></el-form-item>
         <el-form-item label="排版状态">
           <el-select
-            v-model="searchForm.layoutStatus"
+            v-model="searchForm.batchLayoutStatus"
             placeholder="请选择排版状态"
             clearable
+            multiple
           >
             <el-option label="待排版" :value="1"></el-option>
             <el-option label="排版中" :value="2"> </el-option>
-            <el-option label="排版成功" :value="3"> </el-option>
-            <el-option label="排版失败" :value="4"> </el-option>
-            <el-option label="部分成功" :value="5"> </el-option>
+            <el-option label="处理完成" :value="3"> </el-option>
+            <el-option label="部分排版完成" :value="4"> </el-option>
+            <el-option label="有异常" :value="5"> </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="时间范围">

src/views/dtf-list/index.vue

@@ -93,12 +93,12 @@ export default {
         {
           label: "排版状态",
           width: 140,
-          prop: "layoutStatus",
-          slotName: "layoutStatus"
+          prop: "batchLayoutStatus",
+          slotName: "batchLayoutStatus"
         },
         {
           prop: "failReason",
-          label: "失败原因",
+          label: "处理详情",
           width: 300,
           slotName: "failReason"
         },
@@ -114,12 +114,12 @@ export default {
           prop: "operation"
         }
       ],
-      layoutStatus: {
+      batchLayoutStatusList: {
         1: { label: "待排版", type: "warning" },
         2: { label: "排版中", type: "info" },
-        3: { label: "排版成功", type: "success" },
-        4: { label: "排版失败", type: "danger" },
-        5: { label: "部分成功", type: "success" }
+        3: { label: "处理完成", type: "success" },
+        4: { label: "部分排版完成", type: "warning" },
+        5: { label: "有异常", type: "danger" }
       }
     };
   },
@@ -173,7 +173,11 @@ export default {
           params = { ...params, ...value };
         }
 
-        const res = await this.$api.post(pathMap["productionSoftware"], params);
+        const res = await this.$api.post(pathMap["productionSoftware"], {
+          ...params,
+          timeRange: undefined,
+          batchLayoutStatus: value?.batchLayoutStatus?.join(",")
+        });
 
         if (res.code === 200) {
           this.tableList = res.data.records || [];
@@ -241,7 +245,7 @@ export default {
         this.$message.warning("其他排版下载中，请等待完成后再操作");
         return;
       }
-      if (![2].includes(value.layoutStatus)) {
+      if (![2].includes(value.batchLayoutStatus)) {
         this.dialogVisible = true;
         this.radio = "";
         this.templateBatchArrangeNum = value.batchArrangeNum;
@@ -315,11 +319,11 @@ export default {
     },
 
     checkTaskStatus(task, batch) {
-      if (batch && [3, 5].includes(batch.layoutStatus)) {
+      if (batch && [3, 5].includes(batch.batchLayoutStatus)) {
         task.step = "downloading";
         task.progress = "排版完成，正在下载素材...";
         this.doComposingDownload(task.id);
-      } else if (batch && batch.layoutStatus === 4) {
+      } else if (batch && batch.batchLayoutStatus === 4) {
         task.step = "error";
         task.progress = "排版失败：" + (batch?.failReason || "未知原因");
       } else {
@@ -580,10 +584,13 @@ export default {
           scope.row.batchArrangeNum
         }}</a>
       </template>
-      <template #layoutStatus="scope">
-        <el-tag :type="layoutStatus[scope.row?.layoutStatus].type">{{
-          layoutStatus[scope.row?.layoutStatus].label
-        }}</el-tag>
+      <template #batchLayoutStatus="scope">
+        <el-tag
+          :type="batchLayoutStatusList[scope.row?.batchLayoutStatus].type"
+          >{{
+            batchLayoutStatusList[scope.row?.batchLayoutStatus].label
+          }}</el-tag
+        >
       </template>
       <template #failReason="scope">
         <div style="white-space: pre-line">
@@ -603,14 +610,14 @@ export default {
           >
           <el-button
             type="text"
-            :disabled="scope.row.layoutStatus == 2"
+            :disabled="scope.row.batchLayoutStatus == 2"
             class="btn flex btnBox"
             @click="changeTypesetting(scope.row)"
             ><img
               src="../../assets/typesetting.png"
               width="30"
               height="30"
-              :class="{ disabled: scope.row.layoutStatus == 2 }"
+              :class="{ disabled: scope.row.batchLayoutStatus == 2 }"
             />
             <div>排版</div>
           </el-button>