Browse Source

撤销上报条件修改(commandStatus=0可以撤销)

duy 2 months ago
parent
commit
d95cd9b222
1 changed files with 3 additions and 3 deletions
  1. 3 3
      src/views/alter/admin/order.vue

+ 3 - 3
src/views/alter/admin/order.vue

@@ -20,7 +20,7 @@
                 <span>上报</span>
             </el-button>
             <el-button hc-btn color="#FF7D43" :loading="undoLoading" class="text-white" :disabled="tableCheckKeys.length <= 0" @click="undoReportClick">
-                <span>撤销上报11</span>
+                <span>撤销上报</span>
             </el-button>
         </template>
         <div class="relative h-full flex">
@@ -399,8 +399,8 @@ const undoReportClick = async () => {
         window.$message?.warning('每次只能撤销一条数据')
         return
     }
-    const { id, approveStatus } = rows[0]
-    if (approveStatus !== 1) {
+    const { id, approveStatus, commandStatus } = rows[0]
+    if (approveStatus !== 1 && commandStatus !== 0) {
         window.$message?.warning('只能撤销待审批的数据')
         return
     }