Merge branch 'develop' into release-test

@@ -192,15 +192,13 @@ const getTableBtns = (row, includeDetail = true) => {
     btnsArr.push({ label: "详情", value: "detail" })
     btnsArr.push({ label: "详情", value: "detail" })
     if (flowState === 2) {
     if (flowState === 2) {
       btnsArr.push(...[{ label: "通过", value: "pass" }, { label: "驳回", value: "reject" }])
       btnsArr.push(...[{ label: "通过", value: "pass" }, { label: "驳回", value: "reject" }])
-      if (isShowCancel) {
-        btnsArr.push({ label: "撤销", value: "revoke" })
-      }
     } else if (flowState === 3) {
     } else if (flowState === 3) {
       if (bizApproveState != 'D') {
       if (bizApproveState != 'D') {
         btnsArr.push({ label: "重新提交", value: "edit" })
         btnsArr.push({ label: "重新提交", value: "edit" })
       }
       }
-      btnsArr.push({ label: "删除", value: "delete" })
     }
     }
+    isShowCancel && btnsArr.push({ label: "撤销", value: "revoke" })
+    flowState === 3 && btnsArr.push({ label: "删除", value: "delete" })
   }
   }
   return btnsArr
   return btnsArr
 }
 }
@@ -541,8 +539,7 @@ const rejectDialogBtnClick = (btn, info) => {
             :class="{ active: exchangGuid == item.exchangeGuid, mr16: i < carousel.length - 1 && (i + 1) % 4 !== 0 }"
             :class="{ active: exchangGuid == item.exchangeGuid, mr16: i < carousel.length - 1 && (i + 1) % 4 !== 0 }"
             @click="btnClick({ value: 'search', ...item })" v-preReClick>
             @click="btnClick({ value: 'search', ...item })" v-preReClick>
             <div class="title" :class="{ active: exchangGuid == item.exchangeGuid }">
             <div class="title" :class="{ active: exchangGuid == item.exchangeGuid }">
-              <img class="left-img"
-                :src="item.exchangeName.indexOf('门户') > -1 ? sjsLogo : defaultItemLogo" alt="" />
+              <img class="left-img" :src="item.exchangeName.indexOf('门户') > -1 ? sjsLogo : defaultItemLogo" alt="" />
               <span>{{ item.exchangeName ?? '--' }}</span>
               <span>{{ item.exchangeName ?? '--' }}</span>
             </div>
             </div>
             <div class="count-group">
             <div class="count-group">