Merge remote-tracking branch 'origin/dev_xzeq' into dev_xzeq

src/api/xshb/xsbk.js

@@ -41,4 +41,14 @@ export const getTaskResult = params =>
 
 // 1.2.4.7  线索布控删除
 export const deleteBkxx = params =>
-  post(`${base.alyIP}/xsbk/deleteBkxx`, params);
\ No newline at end of file
+  post(`${base.alyIP}/xsbk/deleteBkxx`, params);
+
+
+// 1.2.4.7 提请审批
+export const bkxxTqsp = params =>
+  post(`${base.alyIP}/xsbk/bkxxTqsp`, params);
+
+
+// 1.2.4.7  撤回审批
+export const bkxxChsp = params =>
+  post(`${base.alyIP}/xsbk/bkxxChsp`, params);
\ No newline at end of file

src/views/xshb/xsbk/xsbk.vue

@@ -17,30 +17,59 @@
       </template>
       <template #btnGroup="scope">
         <span
-          v-if="scope.scope.row.bkzt == '01' || scope.scope.row.bkzt == '03'"
+          v-if="
+            scope.scope.row.bkzt == '0' &&
+            (scope.scope.row.spjgPdbz == '3' || scope.scope.row.spjgPdbz == '2')
+          "
           class="hbyp"
           @click="edit(scope.scope)"
           >修改</span
         >
-        <span class="hbyp" @click="dele(scope.scope)">删除</span>
         <span
-          v-if="scope.scope.row.bkzt == '01'"
+          v-if="
+            scope.scope.row.bkzt == '0' &&
+            (scope.scope.row.spjgPdbz == '3' || scope.scope.row.spjgPdbz == '2')
+          "
+          class="hbyp"
+          @click="dele(scope.scope)"
+          >删除</span
+        >
+        <span
+          v-if="scope.scope.row.bkzt == '1'"
           class="hbyp"
           @click="toCk(scope.scope)"
           >撤控</span
         >
         <span
-          v-if="scope.scope.row.bkzt == '01'"
+          v-if="scope.scope.row.bkzt == '0' && scope.scope.row.spjgPdbz == '0'"
           class="hbyp"
           @click="toXXSP(scope.scope)"
           >审批</span
         >
         <span
-          v-if="scope.scope.row.bkzt == '02'"
+          v-if="
+            (scope.scope.row.bkzt == '1' || scope.scope.row.bkzt == '2') &&
+            scope.scope.row.sfybkjg == '1'
+          "
           class="hbyp"
           @click="toJGCX(scope.scope)"
           >结果查询</span
         >
+        <span
+          v-if="
+            scope.scope.row.bkzt == '0' &&
+            (scope.scope.row.spjgPdbz != '0' || scope.scope.row.spjgPdbz != '1')
+          "
+          class="hbyp"
+          @click="tqsp(scope.scope)"
+          >提请审批</span
+        >
+        <span
+          v-if="scope.scope.row.bkzt == '0' && scope.scope.row.spjgPdbz == '0'"
+          class="hbyp"
+          @click="chsp(scope.scope)"
+          >撤回审批</span
+        >
       </template>
     </right-content>
   </div>
@@ -53,6 +82,8 @@ import {
   bkxxSp,
   getTaskResult,
   deleteBkxx,
+  bkxxTqsp,
+  bkxxChsp,
 } from "@/api/xshb/xsbk.js";
 export default {
   name: "xsbk",
@@ -189,6 +220,60 @@ export default {
     this.$store.commit("user/SET_Menu", this.Menu);
   },
   methods: {
+    // 提请审批
+    tqsp(scope) {
+      this.$confirm("是否提请审批, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          bkxxTqsp({
+            xxzjbh: scope.row.xxzjbh,
+          }).then((res) => {
+            if (res.success && res.code == 200) {
+              this.$message({
+                type: "success",
+                message: "提请审批成功",
+              });
+              this.$refs.rightContent.doQuery("yes");
+            }
+          });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消提请审批",
+          });
+        });
+    },
+    // 撤回审批
+    chsp(scope) {
+      this.$confirm("是否撤回审批, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          bkxxChsp({
+            xxzjbh: scope.row.xxzjbh,
+          }).then((res) => {
+            if (res.success && res.code == 200) {
+              this.$message({
+                type: "success",
+                message: "撤回审批成功",
+              });
+              this.$refs.rightContent.doQuery("yes");
+            }
+          });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消撤回审批",
+          });
+        });
+    },
     /**
      * @description 新增
      */