Merge branch 'dev_xzeq' of http://47.92.108.28/changchao/founder_vue into dev_xzeq

src/components/ptCxForm_components.vue

@@ -1364,6 +1364,7 @@
               pageBs == 'pageBs' ||
               pageBs == 'zbfzxyrlist' ||
               pageBs == 'lkyj' ||
+              pageBs == 'hmdrylist' ||
               pageBs == 'qyeryrlqbxsGl'
             )
           "

src/views/jcyjzxt/hmd/add.vue

@@ -88,6 +88,7 @@
                 value: "",
                 placeholder: "请输入",
                 col: "2",
+                prop: "emptyAbleIdentityBT",
               },
               {
                 name: "出生日期_日期估值下限:",

src/views/jcyjzxt/hmdrylist.vue

@@ -2,6 +2,7 @@
     <div class="Content">
         <right-content
                 :tableOperationWidth="tableOperationWidth"
+                :tableOperation="true"
                 :pageBs="pageBs"
                 :header="header"
                 :cxFormData="cxFormData"
@@ -13,10 +14,11 @@
                 @add="add"
                 ref="rightContent"
         >
-           <!-- <template #btnGroup="scope">
+            <template #btnGroup="scope">
                 <el-button @click="dele(scope.scope)" type="text" >删除</el-button>
                 <el-button @click="edit(scope.scope)" type="text" >修改</el-button>
-            </template>-->
+                <el-button @click="setYJ(scope.scope)" type="text" >列控预警</el-button>
+            </template>
         </right-content>
 
     </div>
@@ -25,7 +27,7 @@
 <script>
   import rightContent from "@c/ptCxForm_components.vue";
   import {deleteTbStHmdry} from "@/api/jcyjzxt/hmd.js";
-
+  import {insertLkyj} from "@/api/jcyjzxt/hmd.js";
   export default {
     name: "rlqbxsxx",
     components: {
@@ -35,7 +37,7 @@
       return {
         tableOperationWidth: 200,
         header: "黑名单列表",
-        pageBs: "kyfwbshlist",
+        pageBs: "hmdrylist",
         cxFormData: {
           limit: 10,
           page: 1,
@@ -93,6 +95,34 @@
       this.$store.commit("user/SET_Menu", this.Menu);
     },
     methods: {
+      setYJ(scope) {
+
+        let row  = scope.row;
+        let params = new FormData();
+        params.append('xxzjbh',row.xxzjbh);
+        params.append('sjly','03');
+        params.append('yjxx',row.cyzjZjhm);
+
+        this.$confirm("是否确认添加为列控预警对象？", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        }) .then(() => {
+          insertLkyj(params).then(res=>{
+            if(res.code===200){
+              this.$message.success('提交成功')
+            }else {
+              this.$message.warning(res.message)
+            }
+          })
+        })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "已取消",
+            });
+          });
+      },
       add(){
         this.$router.push({
           path:'/hmdrylistAdd'

src/views/jcyjzxt/kyfwbshlist.vue

 <template>
     <div class="Content">
         <right-content
-
-                pageBs="pageBs"
+                :tableOperation="true"
+                pageBs="zbfzxyrlist"
                 :header="header"
                 :cxFormData="cxFormData"
                 :cxQueryField="cxQueryField"
@@ -12,6 +12,9 @@
                 @dele="dele"
                 ref="rightContent"
         >
+            <template #btnGroup="scope">
+                <el-button @click="setYJ(scope.scope)" type="text" >列控预警</el-button>
+            </template>
         </right-content>
 
     </div>
@@ -20,7 +23,7 @@
 <script>
   import rightContent from "@c/ptCxForm_components.vue";
   import {zlToDelete} from "@/api/zczl/zczl.js";
-
+  import {insertLkyj} from "@/api/jcyjzxt/hmd.js";
   export default {
     name: "rlqbxsxx",
     components: {
@@ -28,7 +31,6 @@
     },
     data() {
       return {
-
         tableOperationWidth: 200,
         header: "抓捕犯罪嫌疑人列表",
         pageBs: "kyfwbshlist",
@@ -86,7 +88,34 @@
       this.$store.commit("user/SET_Menu", this.Menu);
     },
     methods: {
+      setYJ(scope) {
+
+        let row  = scope.row;
+        let params = new FormData();
+        params.append('xxzjbh',row.xxzjbh);
+        params.append('sjly','02');
+        params.append('yjxx',row.kyfwbzhFwbzh);
+        this.$confirm("是否确认添加为列控预警对象？", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        }) .then(() => {
+          insertLkyj(params).then(res=>{
+            if(res.code===200){
+              this.$message.success('提交成功')
+            }else {
+              this.$message.warning(res.message)
+            }
+          })
+        })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "已取消",
+            });
+          });
 
+      },
       edit(scope) {
         this.$router.push({
           path: "addsqfbzl",

src/views/jcyjzxt/lkyj.vue

@@ -15,6 +15,9 @@
         >
             <template #btnGroup="scope">
                 <el-button @click="dele(scope.scope)" type="text" >删除</el-button>
+                <el-button @click="dele(scope.scope)" type="text" >案件案发</el-button>
+                <el-button @click="dele(scope.scope)" type="text" >高危群体</el-button>
+                <el-button @click="dele(scope.scope)" type="text" >案件案发</el-button>
             </template>
         </right-content>
 

src/views/jcyjzxt/zbfzxyrlist.vue

@@ -118,7 +118,7 @@
             className: "iconfont icongongnengfuwu",
             hasChildren: false,
           },
-          {
+       /*   {
             id: "jcyjmxgl",
             label: "监测预警模型管理",
             newAuth: "M01",
@@ -151,7 +151,7 @@
                 disabled: false,
               },
             ]
-          },
+          },*/
         ],
         Menu: [
           {
@@ -221,29 +221,33 @@
         });
       },
       setYJ(scope) {
-        let loading = this.$loading({
-          lock: true,
-          text: "列控预警中...",
-          spinner: "el-icon-loading",
-          background: "rgba(255, 255, 255, 0.7)",
-        });
         let row  = scope.row;
         let params = new FormData();
         params.append('xxzjbh',row.xxzjbh);
         params.append('sjly','01');
         params.append('yjxx',row.zhfzxyrCyzjZjhm);
-
-        insertLkyj(params).then(res=>{
-           if(res.code===200){
-             this.$message.success('提交成功')
-           }else {
-             this.$message.warning(res.message)
-           }
-          loading.close()
+        this.$confirm("是否确认添加为列控预警对象？", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        }) .then(() => {
+          insertLkyj(params).then(res=>{
+            if(res.code===200){
+              this.$message.success('提交成功')
+            }else {
+              this.$message.warning(res.message)
+            }
+          })
         })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "已取消",
+            });
+          });
+
       },
       dele(scope) {
-        console.log(scope);
         this.$confirm("此操作将永久删除该文件, 是否继续?", "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",