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

src/api/xshb/xsbk.js

@@ -37,3 +37,8 @@ export const bkxxSp = params =>
 // 1.2.4.7 线索布控结果查询
 export const getTaskResult = params =>
   post(`${base.alyIP}/xsbk/getTaskResult`, params);
+
+
+// 1.2.4.7  线索布控删除
+export const deleteBkxx = params =>
+  post(`${base.alyIP}/xsbk/deleteBkxx`, params);
\ No newline at end of file

src/views/xshb/xsbk/adjustXsbks.vue

@@ -20,11 +20,7 @@
 
 <script>
 import formCompontent from "@c/form.vue";
-import {
-  addBkxx,
-  updateBkxx,
-  getBkxxByXxzjbh,
-} from "@/api/xshb/xsbk.js";
+import { addBkxx, updateBkxx, getBkxxByXxzjbh } from "@/api/xshb/xsbk.js";
 export default {
   name: "adjustXsbks",
   components: {
@@ -41,15 +37,15 @@ export default {
           objStr: "",
           index: 0,
           data: [
-            {
-              name: "线索编号:",
-              id: "xsbh",
-              type: "text",
-              value: "",
-              prop: "checkEmpty",
-              placeholder: "请输入",
-              col: "2",
-            },
+            // {
+            //   name: "线索编号:",
+            //   id: "xsbh",
+            //   type: "text",
+            //   value: "",
+            //   prop: "checkEmpty",
+            //   placeholder: "请输入",
+            //   col: "2",
+            // },
             {
               name: "布控对象类型:",
               id: "bkdxLxdm",
@@ -156,7 +152,7 @@ export default {
           disabled: false,
         },
       ],
-      xxzjbh:'',//信息主键编号
+      xxzjbh: "", //信息主键编号
     };
   },
   methods: {
@@ -177,8 +173,53 @@ export default {
     },
     //新增保存
     addSubmit(params, loading) {
+      params.append(
+        "glxxlx",
+        this.$route.query.glxxlx ? this.$route.query.glxxlx : "0001"
+      );
+      params.append(
+        "glxxXxzjbh",
+        this.$route.query.glxxXxzjbh ? this.$route.query.glxxXxzjbh : ""
+      );
       addBkxx(params).then((res) => {
         if (res.success && res.code == 200) {
+          if (res.data.flag == 1) {
+            this.$confirm(`${res.data.result}`, "提示", {
+              confirmButtonText: "确定",
+              cancelButtonText: "取消",
+              type: "warning",
+            })
+              .then(() => {
+                params.append("saveFlag", "true");
+                addBkxx(params).then((res) => {
+                  this.$alert("保存成功!", "提示", {
+                    confirmButtonText: "确定",
+                    type: "success",
+                    callback: () => {
+                      loading.close();
+                      this.$router.push("/xsbk");
+                      sessionStorage.setItem("routerPath", "xsbk");
+                      setTimeout(() => {
+                        this.$bus.$emit("routerPath");
+                      }, 20);
+                    },
+                  });
+                });
+              })
+              .catch(() => {
+                loading.close();
+                this.$message({
+                  type: "info",
+                  message: "已取消重新布控",
+                });
+              });
+          } else if (res.data.flag == 2) {
+            this.$message({
+              type: "error",
+              message: `${res.data.result}`,
+            });
+            loading.close();
+          } else if (res.data.flag == 0) {
             this.$alert("保存成功!", "提示", {
               confirmButtonText: "确定",
               type: "success",
@@ -191,6 +232,7 @@ export default {
                 }, 20);
               },
             });
+          }
         } else {
           loading.close();
         }
@@ -282,21 +324,17 @@ export default {
       this.title = "修改线索布控信息";
       this.xxzjbh = this.$route.query.xxzjbh;
       this.getshuju();
-    }else{
+    } else {
       //新增时，需要回显登录人的信息
       let userInfo = JSON.parse(sessionStorage.getItem("userInfo"));
-        this.propFormField[0].data.forEach(el=>{
-            let value = '';
-            if(el.id == 'sqrLxdh') value = userInfo.phone
-            if(el.id == 'sqrJh') value = userInfo.account
-            if(el.id == 'sqrZjhm') value = userInfo.identitycard
-            if(el.id == 'sqrXm') value = userInfo.realname
-            this.$set(
-                  this.formLabelAlign,
-                  el.id,
-                  value
-            );
-        })
+      this.propFormField[0].data.forEach((el) => {
+        let value = "";
+        if (el.id == "sqrLxdh") value = userInfo.phone;
+        if (el.id == "sqrJh") value = userInfo.account;
+        if (el.id == "sqrZjhm") value = userInfo.identitycard;
+        if (el.id == "sqrXm") value = userInfo.realname;
+        this.$set(this.formLabelAlign, el.id, value);
+      });
     }
   },
 };

src/views/xshb/xsbk/detailXsbks.vue

@@ -37,14 +37,14 @@ export default {
           id: 1,
           objStr: "", //对象中的对应字段
           data: [
-            {
-              label: "线索编号:",
-              prop: "xsbh",
-              col: "3",
-            },
+            // {
+            //   label: "线索编号:",
+            //   prop: "xsbh",
+            //   col: "3",
+            // },
             {
               label: "布控对象类型:",
-              prop: "bkdxLxdm",
+              prop: "bkdxLxdmStr",
               col: "3",
             },
             {

src/views/xshb/xsbk/xsbk.vue

@@ -22,6 +22,7 @@
           @click="edit(scope.scope)"
           >修改</span
         >
+        <span class="hbyp" @click="dele(scope.scope)">删除</span>
         <span
           v-if="scope.scope.row.bkzt == '01'"
           class="hbyp"
@@ -47,7 +48,12 @@
 
 <script>
 import rightContent from "@c/ptCxForm_components.vue";
-import { backBkxx, bkxxSp, getTaskResult } from "@/api/xshb/xsbk.js";
+import {
+  backBkxx,
+  bkxxSp,
+  getTaskResult,
+  deleteBkxx,
+} from "@/api/xshb/xsbk.js";
 export default {
   name: "xsbk",
   components: {
@@ -124,8 +130,8 @@ export default {
       ],
       cxDefaultFormThead: [
         {
-          label: "线索编号",
-          prop: "xsbh",
+          label: "信息主键编号",
+          prop: "xxzjbh",
           toInfor: true,
           width: "250",
         },
@@ -244,10 +250,12 @@ export default {
      * @description 结果查询
      */
     toJGCX(scope) {
+      debugger;
       this.$router.pushToTab({
         path: "/queryXsbkResult",
         query: {
           xxzjbh: scope.row.xxzjbh,
+          type: scope.row.bkdxLxdm,
         },
       });
     },
@@ -278,6 +286,33 @@ export default {
         }
       });
     },
+    // 删除
+    dele(scope) {
+      this.$confirm("此操作将永久删除该文件, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          deleteBkxx({
+            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: "已取消删除",
+          });
+        });
+    },
   },
   watch: {},
 };