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

src/api/yzzfzxsyp/thxs.js

@@ -21,6 +21,11 @@ export const getThxsByZjbh = params =>
 export const updateThxs = params =>
 postform(`${base.alyIP}/thajxs/updateThxs`, params);
 
+//团伙线索信息详情
+export const delThxs = params =>
+    post(`${base.alyIP}/thajxs/delThxs`, params);
+
+    
 
 
 

src/api/yzzfzxsyp/xlglaj.js

@@ -21,6 +21,9 @@ export const getXsglasjByZjbh = params =>
 export const updateXsglasj = params =>
     postform(`${base.alyIP}/xsglasj/updateXsglasj`, params);
 
+//案件删除
+export const delXsglasj = params =>
+post(`${base.alyIP}/xsglasj/delXsglasj`, params);
    
 
 

src/api/yzzfzxsyp/xlglxyr.js

 import { get, post, postform } from "@/utils/http.js";
 import base from "@/api/base";
 
-//系列案件列表
+//系列嫌疑人列表
 export const getXsglxyrList = params =>
     post(`${base.alyIP}/xsglxyr/getXsglxyrList`, params);
 
-//关注重点人员
-export const insertUserRybz = params =>
-    post(`${base.alyIP}/zdGzry/insertUserRybz`, params);
+//新增嫌疑人
+export const addXsglxyr = params =>
+    postform(`${base.alyIP}/xsglxyr/addXsglxyr`, params);
 
-//取消关注重点人员
-export const updateUserRybz = params =>
-    post(`${base.alyIP}/zdGzry/updateUserRybz`, params);
+//嫌疑人删除
+export const delXsglxyr = params =>
+    post(`${base.alyIP}/xsglxyr/delXsglxyr`, params);
 
 
 

src/components/form.vue

@@ -1436,6 +1436,9 @@ export default {
             });
           });
         } else if (val2.type == "code" || val2.type == "codeTree") {
+          if (val2.isLazy) {
+            
+          } else {
             if (val2.codeOptions.length == 0) {
               axios
                 .get(`JsonData/${val2.codeTree}.json`)
@@ -1447,6 +1450,7 @@ export default {
                 });
             }
           }
+        }
       });
     });
   },

src/components/form_compontent.vue

@@ -302,6 +302,7 @@
                       :sendId="item.id"
                       :formData="formLabelAlign"
                       :currentItem="item"
+                      @getDialogSeleted='getDialogSeleted'
                     />
                   </div>
                   <!--文件上传-->
@@ -753,6 +754,9 @@ export default {
     self.initFields();
   },
   methods: {
+    getDialogSeleted(label){
+       this.$emit("getDialogSeleted", label);
+    },
     examine() {
       this.$emit("examine");
     },
@@ -1182,7 +1186,8 @@ export default {
           for (var fileItem in self.fileLists) {
             for (var i = 0; i < self.fileLists[fileItem].length; i++) {
               if (self.fileLists[fileItem][i].raw) {
-                params.append(fileItem, self.fileLists[fileItem][i].raw);
+                debugger
+                params.append(`${fileItem}[${i}]`, self.fileLists[fileItem][i].raw);
               }
             }
           }
@@ -1227,7 +1232,7 @@ export default {
         }
         if (isLt1M) {
           this.fileLists[item.id].push(file);
-          this.$refs[0].formLabelAlign.clearValidate();
+          // this.$refs[0].formLabelAlign.clearValidate();
         } else {
           this.$confirm("上传文件不能超过100M", "提示", {
             confirmButtonText: "确定",

src/components/lazy_treeCode_components.vue

@@ -113,7 +113,6 @@
 <script>
 import Http from "@/utils/http.js";
 import url from "@/api/base";
-import { tree } from "@/api/userAuth/role.js";
 export default {
   name: "treeCode_components",
   props: {
@@ -465,22 +464,6 @@ export default {
         parm.id = currentNode.data.id;
         parm.grade = "next";
       }
-      if (self.currentItem.codeTree == "parentId") {
-        tree().then((codeResult) => {
-          if (codeResult.success) {
-            //判断是否有下级
-            codeResult.data.rows.forEach((realCodeItem) => {
-              realCodeItem.label = realCodeItem.title
-              if (realCodeItem.hasChildren == true) {
-                realCodeItem.leaf = true;
-              } else {
-                realCodeItem.leaf = false;
-              }
-            });
-            resolve(codeResult.data.rows);
-          }
-        });
-      } else {
       self.doQueryRequest(parm, "/queryCodeByType").then((codeResult) => {
         if (codeResult.data.success) {
           //判断是否有下级
@@ -496,7 +479,6 @@ export default {
           resolve(codeResult.data.data.rows);
         }
       });
-      }
     },
     doQueryRequest(form, relurl) {
       var currentUrl = relurl ? relurl : this.cxUrl;

src/components/treeCode_components.vue

@@ -219,7 +219,6 @@ export default {
   watch: {
     newArr: {
       handler(newValue, oldValue) {
-        // debugger
         var self = this;
         if (oldValue.length == 0 && this.curFormData[this.curItem.id] != "") {
           let value = this.queryTree(

src/layout/kyxsLayout.vue

@@ -30,9 +30,7 @@
               v-for="(item, index) in leftMenus"
               :key="index"
               ><i
-                class="iconfont iconquanxianjiesuo"
-                style="float: right"
-                v-show="item.disabled"
+                :class="item.className"
               ></i
               >{{ item.label }}</el-menu-item
             >

src/utils/params.js

 /*
  * @Author: your name
  * @Date: 2021-09-07 15:09:40
- * @LastEditTime: 2021-11-02 14:16:53
+ * @LastEditTime: 2021-11-02 18:10:57
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: \founder_vue\src\utils\params.js
@@ -4289,6 +4289,7 @@ const jsasj_jbxx = [
     name: "案事件编号:",
     id: "asjbh",
     type: "text",
+    disabled: true,
     value: "",
     placeholder: "请输入",
     col: "2",
@@ -4297,6 +4298,7 @@ const jsasj_jbxx = [
     name: "接警编号:",
     id: "jjbh",
     type: "text",
+    disabled: true,
     value: "",
     placeholder: "请输入",
     col: "2",
@@ -4304,7 +4306,8 @@ const jsasj_jbxx = [
   {
     name: "受理时间:",
     id: "slsj",
-    type: "dates",
+    type: "DateVal",
+    disabled: true,
     value: "",
     placeholder: "请输入",
     col: "2",
@@ -4322,6 +4325,7 @@ const jsasj_jbxx = [
   {
     name: "受理单位名称:",
     id: "sldwGajgmc",
+    disabled: true,
     type: "text",
     value: "",
     placeholder: "请输入",
@@ -4331,6 +4335,7 @@ const jsasj_jbxx = [
     name: "受理单位代码:",
     id: "sldwGajgjgdm",
     type: "codeTree",
+    disabled: true,
     codeTree: "CODE_UNIT",
     codeOptions: [],
     value: "",
@@ -4386,7 +4391,7 @@ const jsasj_jbxx = [
   {
     name: "发现时间:",
     id: "jsasjFxasjsj",
-    type: "dates",
+    type: "DateVal",
     value: "",
     placeholder: "请输入",
     col: "2",
@@ -4427,7 +4432,7 @@ const jsasj_jbxx = [
   {
     name: "案发开始时间:",
     id: "jsasjAsjfssjAsjfskssj",
-    type: "dates",
+    type: "DateVal",
     value: "",
     placeholder: "请输入",
     col: "2",
@@ -4435,7 +4440,7 @@ const jsasj_jbxx = [
   {
     name: "案发结束时间:",
     id: "jsasjAsjfssjAsjfsjssj",
-    type: "dates",
+    type: "DateVal",
     value: "",
     placeholder: "请输入",
     col: "2",
@@ -4709,7 +4714,7 @@ const jsasj_ajfxxx = [
   {
     name: "分析案发开始时间:",
     id: "jsasjAsjfssjfxAsjfskssj",
-    type: "dates",
+    type: "DateVal",
     value: "",
     placeholder: "请输入",
     col: "2",
@@ -4717,7 +4722,7 @@ const jsasj_ajfxxx = [
   {
     name: "分析案发结束时间:",
     id: "jsasjAsjfssjfxAsjfsjssj",
-    type: "dates",
+    type: "DateVal",
     value: "",
     placeholder: "请输入",
     col: "2",
@@ -5534,7 +5539,7 @@ const lian_jbxx = [
   {
     name: "发现案事件时间:",
     id: "laFxasjsj",
-    type: "dates",
+    type: "DateVal",
     value: "",
     placeholder: "请输入",
     col: "2",
@@ -5554,7 +5559,7 @@ const lian_jbxx = [
   {
     name: "案发开始时间:",
     id: "laAsjfssjAsjfskssj",
-    type: "dates",
+    type: "DateVal",
     value: "",
     placeholder: "请输入",
     col: "2",
@@ -5563,7 +5568,7 @@ const lian_jbxx = [
   {
     name: "案发结束时间:",
     id: "laAsjfssjAsjfsjssj",
-    type: "dates",
+    type: "DateVal",
     value: "",
     placeholder: "请输入",
     col: "2",
@@ -5610,7 +5615,7 @@ const lian_jbxx = [
   {
     name: "立案日期:",
     id: "larq",
-    type: "dates",
+    type: "DateVal",
     value: "",
     placeholder: "请输入",
     col: "2",
@@ -5873,7 +5878,7 @@ const lian_ajfxxx = [
   {
     name: "分析案发开始时间:",
     id: "laAsjfssjfxAsjfskssj",
-    type: "dates",
+    type: "DateVal",
     value: "",
     placeholder: "请输入",
     col: "2",
@@ -5882,7 +5887,7 @@ const lian_ajfxxx = [
   {
     name: "分析案发结束时间:",
     id: "laAsjfssjfxAsjfsjssj",
-    type: "dates",
+    type: "DateVal",
     value: "",
     placeholder: "请输入",
     col: "2",
@@ -10218,16 +10223,6 @@ const zczj_jbxx = [
     placeholder: "请输入",
     col: "2",
   },
-  {
-    name: "案件类别:",
-    id: "zczjAjlb",
-    type: "codeTree",
-    codeTree: "CODE_AJLB",
-    codeOptions: [],
-    value: "",
-    placeholder: "请输入",
-    col: "2",
-  },
 ]
 //侦查终结案件分析信息
 const zczj_ajfx = [
@@ -10262,18 +10257,9 @@ const zczj_ajfx = [
     prop: 'checkEmpty'
   },
   {
-    name: "立案日期:",
-    id: "lasj",
-    type: "dates",
-    disabled: true,
-    value: "",
-    placeholder: "请输入",
-    col: "2",
-  },
-  {
     name: "侦查终结时间:",
     id: "zczjZxsj01",
-    type: "dates",
+    type: "DateVal",
     value: "",
     placeholder: "请输入",
     col: "2",
@@ -10619,7 +10605,7 @@ const zczj_blxx = [
   {
     name: "办理时间:",
     id: "blsj",
-    type: "dates",
+    type: "DateVal",
     value: "",
     placeholder: "请输入",
     col: "2",

src/views/kyxs/hmxs/hmxsGl.vue

@@ -54,7 +54,8 @@ export default {
         {
           label: "信息主键编号",
           prop: "xxzjbh",
-          width:300
+          width:300,
+          toInfor:true
         },
         // {
         //   label: "案事件编号",

src/views/kyxs/jdcxs/jdcxsGl.vue

@@ -54,7 +54,8 @@ export default {
          {
           label: "信息主键编号",
           prop: "xxzjbh",
-          width:300
+          width:300,
+          toInfor:true
         },
         // {
         //   label: "案事件编号",

src/views/kyxs/ryxs/ryxsGl.vue

@@ -55,6 +55,7 @@ export default {
           label: "主键编号",
           prop: "xxzjbh",
           width: "300",
+          toInfor:true,
         },
         // {
         //   label: "案事件编号",

src/views/kyxs/yhkxs/yhkxsGl.vue

@@ -52,7 +52,8 @@ export default {
          {
           label: "信息主键编号",
           prop: "xxzjbh",
-          width:300
+          width:300,
+          toInfor:true
         },
         // {
         //   label: "案事件编号",

src/views/qgncj/ajxx/addajjbxx.vue

 <!--
  * @Author: your name
  * @Date: 2021-09-08 17:35:31
- * @LastEditTime: 2021-10-29 17:02:36
+ * @LastEditTime: 2021-11-02 18:02:17
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: \founder_vue\src\views\xxtk\case\addCase.vue
@@ -36,7 +36,7 @@ export default {
   },
   data() {
     return {
-      title: "修改案件信息",
+      title: "案件信息编辑",
       propFormField: [
         //基本信息
         {

src/views/qgncj/ajxx/addasjxx.vue

 <!--
  * @Author: your name
  * @Date: 2021-09-08 17:35:31
- * @LastEditTime: 2021-11-02 14:33:17
+ * @LastEditTime: 2021-11-02 18:02:23
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: \founder_vue\src\views\xxtk\case\addCase.vue
@@ -37,7 +37,7 @@ export default {
   },
   data() {
     return {
-      title: "修改接受案件信息",
+      title: "接受案件信息编辑",
       propFormField: [
         //基本信息
         {

src/views/qgncj/ajxx/addlaxx.vue

 <!--
  * @Author: your name
  * @Date: 2021-09-08 17:35:31
- * @LastEditTime: 2021-11-02 11:36:25
+ * @LastEditTime: 2021-11-02 18:02:29
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: \founder_vue\src\views\xxtk\case\addCase.vue
@@ -36,7 +36,7 @@ export default {
   },
   data() {
     return {
-      title: "修改立案信息",
+      title: "立案信息编辑",
       propFormField: [
         //基本信息
         {

src/views/qgncj/ajxx/addzczj.vue

 <!--
  * @Author: your name
  * @Date: 2021-09-08 17:35:31
- * @LastEditTime: 2021-11-02 14:14:12
+ * @LastEditTime: 2021-11-02 18:02:36
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: \founder_vue\src\views\xxtk\case\addCase.vue
@@ -30,7 +30,7 @@ export default {
   },
   data() {
     return {
-      title: "修改侦查终结",
+      title: "侦查终结编辑",
       propFormField: [
         //基本信息
         {

src/views/userAuth/menu/menuDetail.vue

@@ -3,6 +3,7 @@
     <right-content
       :cxQueryField="cxQueryField"
       :pageObject="pageObject"
+      :pageFooterProps="pageFooterProps"
       labelWidth="110px"
       title="菜单详情"
     >
@@ -22,6 +23,11 @@ export default {
     return {
       cxQueryField: [
         {
+          title: "",
+          id: 1,
+          objStr: "", //对象中的对应字段
+          data: [
+            {
               label: "菜单名称:",
               prop: "name",
               col: "3",
@@ -45,10 +51,13 @@ export default {
               label: "菜单备注:",
               prop: "remark",
               col: "3",
-        }
+            },
+          ],
+        },
       ],
+      pageFooterProps: [],
       pageObject: {},
-      Loading:null
+      Loading: null,
     };
   },
   mounted() {},
@@ -59,8 +68,9 @@ export default {
       }).then((res) => {
         if (res.success && res.code == 200) {
           this.pageObject = res.data;
+          debugger
         }
-        this.Loading.close()
+        this.Loading.close();
       });
     },
   },

src/views/userAuth/role/addRole.vue

@@ -12,7 +12,7 @@
 
 <script>
 import formCompontent from "@c/form.vue";
-import { submit, detail } from "@/api/userAuth/role.js";
+import { submit, detail, tree } from "@/api/userAuth/role.js";
 export default {
   name: "addRole",
   components: {
@@ -48,14 +48,14 @@ export default {
               col: "2",
             },
             {
-              name: "上级角色",
+              name: "上级角色:",
               id: "parentId",
-              type: "lazyCodeTreeDialog",
-              props: [], //字典弹框需要的字段
+              type: "codeTree",
+              codeOptions: [],
               value: "",
+              placeholder: "请输入",
               col: "2",
-              codeOptions: [],
-              codeTree: "parentId",
+              isLazy: true,
             },
             {
               name: "角色排序:",
@@ -155,8 +155,17 @@ export default {
         }, 500);
       });
     },
+    getLazy() {
+      let self = this
+      tree().then((res) => {
+        if (res.success) {
+           self.$set(self.propFormField[0].data[2], "codeOptions", res.data.rows);
+        }
+      });
+    },
   },
   created() {
+    this.getLazy()
     this.$store.commit("user/SET_Breadcrumb", this.breadcrumbList);
     if (this.$route.query.xxzjbh) {
       this.Loading = this.$loading({

src/views/userAuth/role/roleDetail.vue

@@ -3,6 +3,7 @@
     <right-content
       :cxQueryField="cxQueryField"
       :pageObject="pageObject"
+      :pageFooterProps="pageFooterProps"
       labelWidth="110px"
       title="角色详情"
     >
@@ -22,6 +23,11 @@ export default {
     return {
       cxQueryField: [
         {
+          title: "",
+          id: 1,
+          objStr: "", //对象中的对应字段
+          data: [
+            {
               label: "角色名称:",
               prop: "roleName",
               col: "3",
@@ -40,10 +46,13 @@ export default {
               label: "角色排序:",
               prop: "sort",
               col: "3",
-        }
+            },
+          ],
+        },
       ],
+       pageFooterProps: [],
       pageObject: {},
-      Loading:null
+      Loading: null,
     };
   },
   mounted() {},
@@ -55,7 +64,7 @@ export default {
         if (res.success && res.code == 200) {
           this.pageObject = res.data;
         }
-        this.Loading.close()
+        this.Loading.close();
       });
     },
   },

src/views/userAuth/user/userDetail.vue

@@ -3,6 +3,7 @@
     <right-content
       :cxQueryField="cxQueryField"
       :pageObject="pageObject"
+      :pageFooterProps="pageFooterProps"
       labelWidth="110px"
       title="用户详情"
     >
@@ -22,6 +23,11 @@ export default {
     return {
       cxQueryField: [
         {
+          title: "",
+          id: 1,
+          objStr: "", //对象中的对应字段
+          data: [
+            {
               label: "用户单位:",
               prop: "unitname",
               col: "3",
@@ -60,10 +66,13 @@ export default {
               label: "是否开启:",
               prop: "openFlag",
               col: "3",
-        }
+            },
+          ],
+        },
       ],
+      pageFooterProps: [],
       pageObject: {},
-      Loading:null
+      Loading: null,
     };
   },
   mounted() {},
@@ -75,7 +84,7 @@ export default {
         if (res.success && res.code == 200) {
           this.pageObject = res.data.rows;
         }
-        this.Loading.close()
+        this.Loading.close();
       });
     },
   },

src/views/yzzfzxsyp/thxs/addAj.vue

@@ -17,12 +17,7 @@
 
 <script>
 import formCompontent from "@c/form_compontent.vue";
-import {
-  addXsglasj,
-  getAjxxByAsjbh,
-  getXsglasjByZjbh,
-  updateXsglasj,
-} from "@/api/yzzfzxsyp/xlglaj.js";
+import { addXsglasj } from "@/api/yzzfzxsyp/xlglaj.js";
 export default {
   name: "addAj",
   components: {
@@ -108,15 +103,7 @@ export default {
               type: "text",
               value: "",
               placeholder: "请输入",
-              col: "2",
-            },
-            {
-              name: "简要案情:",
-              id: "jyaq",
-              type: "text",
-              value: "",
-              placeholder: "请输入",
-              col: "2",
+              col: "3",
             },
             {
               name: "立案日期:",
@@ -136,22 +123,31 @@ export default {
               placeholder: "请输入",
               col: "2",
             },
+            {
+              name: "简要案情:",
+              id: "jyaq",
+              type: "textarea",
+              value: "",
+              placeholder: "请输入",
+              col: "18",
+            },
           ],
         },
       ],
       formLabelAlign: {},
       xxzjbh: "",
+      lable: "",
     };
   },
   methods: {
     submit(params) {
       console.log(params);
-    //   let loading = this.$loading({
-    //     lock: true,
-    //     text: "正在保存...",
-    //     spinner: "el-icon-loading",
-    //     background: "rgba(255, 255, 255, 0.7)",
-    //   });
+      let loading = this.$loading({
+        lock: true,
+        text: "正在保存...",
+        spinner: "el-icon-loading",
+        background: "rgba(255, 255, 255, 0.7)",
+      });
       if (!this.xxzjbh) {
         this.addSubmit(params);
       } else {
@@ -165,12 +161,17 @@ export default {
             confirmButtonText: "确定",
             type: "success",
             callback: () => {
-              this.$router.push("/queryThxs");
-              // loading.close();
+              this.$router.push({
+                path: "/addThxs",
+                query: {
+                  xxzjbh: this.$route.query.xsbh,
+                },
+              });
+              loading.close();
             },
           });
         } else {
-          // loading.close();
+          loading.close();
         }
       });
     },
@@ -181,7 +182,12 @@ export default {
             confirmButtonText: "确定",
             type: "success",
             callback: () => {
-              this.$router.push("/queryThxs");
+              this.$router.push({
+                path: "/addThxs",
+                query: {
+                  xxzjbh: this.$route.query.xsbh,
+                },
+              });
               loading.close();
             },
           });

src/views/yzzfzxsyp/thxs/addThxs.vue

@@ -10,6 +10,7 @@
       :formLabelAligns="formLabelAlign"
       @submit="submit"
       :propTitle="title"
+      @getDialogSeleted="getDialogSeleted"
     >
     </form-compontent>
     <div class="formWrap">
@@ -24,7 +25,9 @@
       </div>
       <el-table :data="ajList.shuju">
         <el-table-column
-          v-for="(columnTitle, coluIndex) in ajList.tableList"
+          v-for="(columnTitle, coluIndex) in ajList.tableList.filter(
+            (item, index) => index < ajList.tableList.length - 1
+          )"
           :key="columnTitle.label"
           :label="columnTitle.label"
           :width="columnTitle.width"
@@ -59,10 +62,10 @@
               @click="editAj(scope.row)"
               style="color: #1a81e1; cursor: pointer"
             >
-              <i class="iconfont iconbianjiluru"></i>编辑</span
+              编辑</span
             >
             <span
-              @click="delectAj(scope.row)"
+              @click="delect(scope.row, 'aj')"
               style="color: #f56c6c; padding-left: 32px; cursor: pointer"
               >删除</span
             >
@@ -93,7 +96,9 @@
       </div>
       <el-table :data="xyrList.shuju">
         <el-table-column
-          v-for="(columnTitle, coluIndex) in xyrList.tableList"
+          v-for="(columnTitle, coluIndex) in xyrList.tableList.filter(
+            (item, index) => index < xyrList.tableList.length - 1
+          )""
           :key="columnTitle.label"
           :label="columnTitle.label"
           :width="columnTitle.width"
@@ -128,10 +133,10 @@
               @click="editAj(scope.row)"
               style="color: #1a81e1; cursor: pointer"
             >
-              <i class="iconfont iconbianjiluru"></i>编辑</span
+              编辑</span
             >
             <span
-              @click="delectAj(scope.row)"
+              @click="delect(scope.row, 'xyr')"
               style="color: #f56c6c; padding-left: 32px; cursor: pointer"
               >删除</span
             >
@@ -155,14 +160,9 @@
 
 <script>
 import formCompontent from "@c/form_compontent.vue";
-import {
-  getXsbh,
-  addThxs,
-  getThxsByZjbh,
-  updateThxs,
-} from "@/api/yzzfzxsyp/thxs.js";
-import { getXsglasjList } from "@/api/yzzfzxsyp/xlglaj.js";
-import { getXsglxyrList } from "@/api/yzzfzxsyp/xlglxyr.js";
+import { addThxs, getThxsByZjbh, updateThxs } from "@/api/yzzfzxsyp/thxs.js";
+import { getXsglasjList, delXsglasj } from "@/api/yzzfzxsyp/xlglaj.js";
+import { getXsglxyrList, delXsglxyr } from "@/api/yzzfzxsyp/xlglxyr.js";
 export default {
   name: "addThxs",
   components: {
@@ -176,19 +176,10 @@ export default {
         {
           title: "团伙线索信息",
           id: 1,
-          objStr: "",
+          objStr: "xs",
           index: 0,
           data: [
             {
-              name: "线索编号:",
-              id: "xsbh",
-              type: "text",
-              prop: "checkEmpty",
-              value: "",
-              placeholder: "请输入",
-              col: "2",
-            },
-            {
               name: "线索名称:",
               id: "xsmc",
               type: "text",
@@ -268,28 +259,48 @@ export default {
         total: "",
         tableList: [
           {
-            label: "案件名称",
-            prop: "laAjmc",
-            width: 180,
-          },
-          {
             label: "案件编号",
             prop: "asjbh",
             width: 220,
           },
           {
+            label: "案件名称",
+            prop: "ajmc",
+            width: 180,
+          },
+          {
             label: "案件类别",
-            prop: "laAjlbdm",
+            prop: "ajlbdmStr",
             width: "230",
           },
           {
             label: "案发时间",
-            prop: "laAsjfssjAsjfsjssj",
+            prop: "asjfssjAsjfskssj",
             width: "150",
           },
           {
-            label: "案发地",
-            prop: "laAsjfsddDzmc",
+            label: "案发地详址",
+            prop: "asjfsddXzqhdmStr",
+            width: 230,
+          },
+          {
+            label: "简要案情",
+            prop: "jyaq",
+            width: 230,
+          },
+          {
+            label: "立案日期",
+            prop: "larq",
+            width: 150,
+          },
+          {
+            label: "立案单位",
+            prop: "ladwGajgjgdmStr",
+            width: 230,
+          },
+          {
+            label: "xxzjbh",
+            prop: "xxzjbh",
           },
         ],
         shuju: [],
@@ -304,28 +315,32 @@ export default {
         total: "",
         tableList: [
           {
-            label: "案件名称",
-            prop: "laAjmc",
-            width: 180,
+            label: "姓名",
+            prop: "xm",
           },
           {
-            label: "案件编号",
-            prop: "asjbh",
-            width: 220,
+            label: "性别",
+            prop: "xbdmStr",
           },
           {
-            label: "案件类别",
-            prop: "laAjlbdm",
-            width: "230",
+            label: "身份证号码",
+            prop: "gmsfzh",
           },
           {
             label: "案发时间",
-            prop: "laAsjfssjAsjfsjssj",
-            width: "150",
+            prop: "csrq",
+          },
+          {
+            label: "民族",
+            prop: "mzdm",
           },
           {
-            label: "案发地",
-            prop: "laAsjfsddDzmc",
+            label: "户籍地",
+            prop: "hjdzXzqhdmStr",
+          },
+          {
+            label: "xxzjbh",
+            prop: "xxzjbh",
           },
         ],
         shuju: [],
@@ -337,6 +352,7 @@ export default {
         },
       },
       xsbh: "",
+      lable: "",
     };
   },
   methods: {
@@ -348,19 +364,62 @@ export default {
         },
       });
     },
-    getBh() {
-      let userInfo = JSON.parse(window.sessionStorage.getItem("userInfo"));
-      getXsbh({
-        unitcode: userInfo.unitcode,
+    delect(row, type) {
+      debugger;
+      if (type == "aj") {
+        this.$confirm("此操作将永久删除该案件, 是否继续?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            delXsglasj({
+              xxzjbh: row.xxzjbh,
             }).then((res) => {
-        if (res.code == 200) {
-          this.xsbh = res.data.xsbh;
-
-          this.$set(this.formLabelAlign, "xsbh", this.xsbh);
+              if (res.success && res.code == 200) {
+                this.$message({
+                  type: "success",
+                  message: "删除成功",
+                });
                 this.getAjList();
+              }
+            });
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "已取消删除",
+            });
+          });
+      } else {
+        this.$confirm("此操作将永久删除该嫌疑人, 是否继续?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            delXsglxyr({
+              xxzjbh: row.xxzjbh,
+            }).then((res) => {
+              if (res.success && res.code == 200) {
+                this.$message({
+                  type: "success",
+                  message: "删除成功",
+                });
                 this.getXyrList();
               }
             });
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "已取消删除",
+            });
+          });
+      }
+    },
+    getDialogSeleted(lable) {
+      this.lable = lable;
     },
     //关联案件信息列表
     getAjList() {
@@ -469,7 +528,7 @@ export default {
       getThxsByZjbh({
         xsbh: this.xsbh,
       }).then((res) => {
-        var result = res.data.xs.xs;
+        var result = res.data.xsxq;
         self.propFormField.forEach((i, iIndex) => {
           if (i.data && i.data.length > 0) {
             i.data.forEach((j, jIndex) => {
@@ -490,8 +549,8 @@ export default {
               } else {
                 if (j.type == "file") {
                   self.$set(self.formLabelAlign, j.id, []);
-                  if (res.data.xs.fjList) {
-                    res.data.xs.fjList.forEach((fileItem, fileIndex) => {
+                  if (res.data.xsxq.fjList) {
+                    res.data.xsxq.fjList.forEach((fileItem, fileIndex) => {
                       const fileObj = {
                         name: fileItem.xsfjDzwjbt,
                         url: fileItem.xsfjDzwjwz,
@@ -512,7 +571,7 @@ export default {
           }
         });
         self.$forceUpdate();
-        self.$set(self.formLabelAlign, 'editing', true)
+        self.$set(self.formLabelAlign, "editing", true);
         setTimeout(() => {
           loading.close();
         }, 500);
@@ -524,11 +583,9 @@ export default {
       this.title = "修改团伙线索";
       this.xsbh = this.$route.query.xxzjbh;
       this.getshuju();
-    } else {
-      this.getBh();
+      this.getXyrList();
+      this.getAjList();
     }
-    this.getXyrList()
-    this.getAjList()
   },
 };
 </script>

src/views/yzzfzxsyp/thxs/addXyr.vue

+<template>
+  <div id="addAj">
+    <div class="headerTitle">
+      <img src="../../../assets/img/login/jinhui.png" alt="" /><span
+        >有组织犯罪线索研判</span
+      >
+    </div>
+    <form-compontent
+      :formField="propFormField"
+      :formLabelAligns="formLabelAlign"
+      @submit="submit"
+      :propTitle="title"
+    >
+    </form-compontent>
+  </div>
+</template>
+
+<script>
+import formCompontent from "@c/form_compontent.vue";
+import { addXsglxyr } from "@/api/yzzfzxsyp/xlglxyr.js";
+export default {
+  name: "addAj",
+  components: {
+    formCompontent,
+  },
+  data() {
+    return {
+      title: "新增嫌疑人信息",
+      propFormField: [
+        //基本信息
+        {
+          title: "案件信息",
+          id: 1,
+          objStr: "",
+          index: 0,
+          data: [
+            {
+              name: "线索编号:",
+              id: "xsbh",
+              type: "text",
+              prop: "checkEmpty",
+              value: "",
+              placeholder: "请输入",
+              col: "2",
+            },
+            {
+              name: "案件编号:",
+              id: "asjbh",
+              type: "text",
+              value: "",
+              placeholder: "请输入",
+              col: "2",
+            },
+            {
+              name: "姓名:",
+              id: "xm",
+              type: "text",
+              value: "",
+              placeholder: "请输入",
+              col: "2",
+            },
+            {
+              name: "性别:",
+              id: "xbdm",
+              type: "codeTree",
+              codeTree: "CODE_XB",
+              codeOptions: [],
+              value: "",
+              placeholder: "请输入",
+              col: "2",
+            },
+            {
+              name: "身份证号码:",
+              id: "gmsfzh",
+              type: "text",
+              value: "",
+              placeholder: "请输入",
+              col: "2",
+            },
+            {
+              name: "出生日期:",
+              id: "csrq",
+              type: "dates",
+              value: "",
+              placeholder: "请输入",
+              col: "2",
+            },
+            {
+              name: "国籍:",
+              id: "gjdm",
+              type: "codeTree",
+              codeTree: "CODE_GJ",
+              codeOptions: [],
+              value: "",
+              placeholder: "请输入",
+              col: "2",
+            },
+            {
+              name: "民族:",
+              id: "mzdm",
+              type: "codeTree",
+              codeTree: "CODE_MZ",
+              codeOptions: [],
+              value: "",
+              placeholder: "请输入",
+              col: "2",
+            },
+            {
+              name: "户籍地区划:",
+              id: "hjdzXzqhdm",
+              type: "codeTree",
+              codeTree: "CODE_XZQH",
+              codeOptions: [],
+              value: "",
+              placeholder: "请输入",
+              col: "2",
+            },
+            {
+              name: "户籍地详址:",
+              id: "hjdzDzmc",
+              type: "text",
+              value: "",
+              placeholder: "请输入",
+              col: "2",
+            },
+            {
+              name: "现住址区划:",
+              id: "xzzXzqhdm",
+              type: "codeTree",
+              codeTree: "CODE_XZQH",
+              codeOptions: [],
+              value: "",
+              placeholder: "请输入",
+              col: "2",
+            },
+            {
+              name: "现住址名称:",
+              id: "xzzDzmc",
+              type: "text",
+              value: "",
+              placeholder: "请输入",
+              col: "2",
+            },
+            {
+              name: "境外住址区划:",
+              id: "jwzzGjhdqdm",
+              type: "codeTree",
+              codeTree: "CODE_GJ",
+              codeOptions: [],
+              value: "",
+              placeholder: "请输入",
+              col: "2",
+            },
+            {
+              name: "境外住址详址:",
+              id: "jwzzDzmc",
+              type: "text",
+              value: "",
+              placeholder: "请输入",
+              col: "2",
+            },
+            {
+              name: "联系电话:",
+              id: "lxdh",
+              type: "text",
+              value: "",
+              placeholder: "请输入",
+              col: "2",
+            },
+            {
+              name: "政治面貌:",
+              id: "zzmmdm",
+              type: "codeTree",
+              codeTree: "CODE_ZZMM",
+              codeOptions: [],
+              value: "",
+              placeholder: "请输入",
+              col: "2",
+            },
+          ],
+        },
+      ],
+      formLabelAlign: {},
+      xxzjbh: "",
+    };
+  },
+  methods: {
+    submit(params) {
+      console.log(params);
+      //   let loading = this.$loading({
+      //     lock: true,
+      //     text: "正在保存...",
+      //     spinner: "el-icon-loading",
+      //     background: "rgba(255, 255, 255, 0.7)",
+      //   });
+      params.append("ladwGajgmc", this.lable);
+      if (!this.xxzjbh) {
+        this.addSubmit(params);
+      } else {
+        this.editSubmit(params);
+      }
+    },
+    addSubmit(params, loading) {
+      addXsglxyr(params).then((res) => {
+        if (res.success && res.code == 200) {
+          this.$alert("保存成功!", "提示", {
+            confirmButtonText: "确定",
+            type: "success",
+            callback: () => {
+              this.$router.push({
+                path: "/queryThxs",
+                xxzjbh: this.$route.query.xsbh,
+              });
+              // loading.close();
+            },
+          });
+        } else {
+          // loading.close();
+        }
+      });
+    },
+    editSubmit(params, loading) {
+      updateXsglasj(params).then((res) => {
+        if (res.success && res.code == 200) {
+          this.$alert("修改成功!", "提示", {
+            confirmButtonText: "确定",
+            type: "success",
+            callback: () => {
+              this.$router.push({
+                path: "/queryThxs",
+                xxzjbh: this.$route.query.xsbh,
+              });
+              loading.close();
+            },
+          });
+        } else {
+          loading.close();
+        }
+      });
+    },
+    getshuju() {
+      var self = this;
+      let loading = this.$loading({
+        lock: true,
+        text: "正在加载...",
+        spinner: "el-icon-loading",
+        background: "rgba(255, 255, 255, 0.7)",
+      });
+      getXsglasjByZjbh({
+        xsbh: this.xxzjbh,
+      }).then((res) => {
+        var result = res.data.xs;
+        self.propFormField.forEach((i, iIndex) => {
+          if (i.data && i.data.length > 0) {
+            i.data.forEach((j, jIndex) => {
+              if (j.childrenAsAdd) {
+                j.childrenAsAdd.forEach((m, mIndex) => {
+                  self.$set(self.formLabelAlign, m.id, result[m.id] || []);
+                  if (result[m.id].length > 0) {
+                    //如果集合有值，则让显示
+                    self.$set(
+                      self.propFormField[iIndex].data[jIndex].childrenAsAdd[
+                        mIndex
+                      ],
+                      "flag",
+                      true
+                    );
+                  }
+                });
+              } else {
+                self.$set(
+                  self.formLabelAlign,
+                  j.id,
+                  i.objStr ? result[i.objStr][j.id] : result[j.id]
+                );
+              }
+            });
+          }
+        });
+        self.$forceUpdate();
+        setTimeout(() => {
+          loading.close();
+        }, 500);
+      });
+    },
+  },
+  created() {
+    if (this.$route.query.xxzjbh) {
+      this.title = "修改案件信息";
+      this.xxzjbh = this.$route.query.xxzjbh;
+      this.getshuju();
+    }
+    this.$set(this.formLabelAlign, "xsbh", this.$route.query.xsbh);
+  },
+};
+</script>
+
+<style scoped lang="scss">
+#addAj {
+  .headerTitle {
+    height: 48px;
+    background: #0061f7;
+    font-size: 18px;
+    font-weight: bold;
+    line-height: 48px;
+    color: #ffffff;
+    padding: 0 17px;
+
+    img {
+      width: 36px;
+      margin-right: 5px;
+    }
+  }
+}
+</style>
\ No newline at end of file

src/views/yzzfzxsyp/thxs/queryThxs.vue

@@ -18,6 +18,7 @@
 
 <script>
 import rightContent from "@c/ptCxForm_components.vue";
+import { delThxs } from "@/api/yzzfzxsyp/thxs.js";
 export default {
   name: "queryThxs",
   components: {
@@ -186,14 +187,14 @@ export default {
       });
     },
     dele(scope) {
-      this.$confirm("此操作将永久删除该文件, 是否继续?", "提示", {
+      this.$confirm("此操作将永久删除该线索, 是否继续?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
       })
         .then(() => {
-          deleteZdry({
-            id: scope.row.id,
+          delThxs({
+            xsbh: scope.row.xsbh,
           }).then((res) => {
             if (res.success && res.code == 200) {
               this.$message({