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

src/components/ajbz/bshChildrenQuery.vue

@@ -628,6 +628,7 @@ export default {
       );
       post(this.childrenUrl, formData).then((response) => {
         if (response.code == 200) {
+          debugger
           self.tableData[index].children = response.data.data;
           self.closeLoading();
         } else {

src/components/ptCxForm_components.vue

@@ -489,9 +489,8 @@
                   pageBs != 'dswtzxxlbxx' &&
                   pageBs != 'gzzkyxs' &&
                   pageBs != 'rwgl' &&
-                  pageBs != 'querySdtdyp' && 
+                  pageBs != 'querySdtdyp' &&
                   pageBs != 'queryXshbZd'
-                  
                 "
               >
                 <i class="el-icon-plus"></i> 新增
@@ -754,7 +753,7 @@
           <template slot-scope="props">
             <el-table
               v-loading="loadingZxzjlList"
-              :data="tableData1"
+              :data="props.row.children"
               stripe
               style="width: 100%"
             >
@@ -769,7 +768,7 @@
                   <!-- <el-button type="success" @click="sprops(scope)">
                     可视化分析
                   </el-button> -->
-                   <el-button type="success" @click="sprops(scope)">
+                  <el-button type="success" @click="sprops(scope)">
                     跳转脑图
                   </el-button>
                 </template>
@@ -1379,7 +1378,6 @@
               pageBs == 'queryCheckBj' ||
               pageBs == 'queryWl' ||
               pageBs == 'queryDna' ||
-              pageBs == 'queryZj' ||
               pageBs == 'queryZw' ||
               pageBs == 'wfqdzczl' ||
               pageBs == 'xywspdzczl' ||
@@ -1518,6 +1516,7 @@
                   pageBs == 'queryZdssww' ||
                   pageBs == 'queryZdsszj' ||
                   pageBs == 'querySdtdyp' ||
+                  pageBs == 'queryZj' ||
                   pageBs == 'queryZdssydtxsb' ||
                   pageBs == 'qyeryrlqbxsGl'
                 )
@@ -1724,6 +1723,7 @@
                 pageBs != 'querySdtdyp' &&
                 pageBs != 'queryThxs' &&
                 pageBs != 'queryZdssydtxsb' &&
+                pageBs != 'queryZj' &&
                 pageBs != 'qyeryrlqbxsGl'
               "
               >删除</span
@@ -2189,6 +2189,7 @@ import SelectTreeDialog from "@c/treeCode_components.vue";
 import LazySelectTreeDialog from "@c/lazy_treeCode_components.vue";
 import Http from "@/utils/http.js";
 import axios from "axios";
+import { post } from "@/utils/http.js";
 import url from "@/api/base";
 import qs from "qs";
 import {
@@ -2247,6 +2248,7 @@ export default {
       type: Array,
       default: () => [],
     }, //信息列表图片
+    childrenUrl: String,
     tableData1: {
       type: Array,
       default: () => [],
@@ -2355,7 +2357,24 @@ export default {
       return dt.split(",");
     },
     rowExpand(row, expandedRows) {
-      this.$emit("rowExpand", row);
+      // this.$emit("rowExpand", row);
+      var self = this;
+      self.showLoading();
+      let formData = {};
+      formData.ssrwbh = row.xxzjbh;
+      var index = self.tableData.findIndex((item) => item.xxzjbh == row.xxzjbh);
+      post(this.childrenUrl, formData).then((response) => {
+        if (response.code == 200) {
+          self.tableData[index].children = response.data.rows;
+          self.closeLoading();
+        } else {
+          /*self.$message({
+              type: "error",
+              message: response.data.message
+            });*/
+          self.closeLoading();
+        }
+      });
     },
     switchingConditions() {
       this.toggleZd = !this.toggleZd;
@@ -3118,6 +3137,10 @@ export default {
             postform(`${url.alyIP}${this.cxUrl}`, formDatas).then(
               (response) => {
                 if (response.success === true) {
+                  let result = response.data.data || response.data.rows;
+                  result.forEach((item) => {
+                    item.children = [];
+                  });
                   self.tableData = response.data.rows;
                   self.tableDataLength = response.data.total;
                   self.tPage = Math.ceil(response.data.total / self.page_size);
@@ -3142,6 +3165,10 @@ export default {
             form.append("jsonStr", JSON.stringify(jsonStr));
             postform(`${url.alyIP2}${this.cxUrl}`, form).then((response) => {
               if (response.success === true) {
+                let result = response.data.data || response.data.rows;
+                result.forEach((item) => {
+                  item.children = [];
+                });
                 self.tableData = response.data.rows;
                 self.tableDataLength = response.data.total;
                 self.tPage = Math.ceil(response.data.total / self.page_size);
@@ -3256,6 +3283,10 @@ export default {
                   //   }
                   // }
                 });
+                let result = response.data.data || response.data.rows;
+                result.forEach((item) => {
+                  item.children = [];
+                });
                 self.yqyhz = response.data.yh;
                 self.sfkjs = response.data.sfkjs;
                 self.tableData = response.data.rows;

src/router/index.js

@@ -79,13 +79,13 @@ const mainRouters = [
   ...xxtkRoutes,
   hxgcRoutes,
   kyxsRoutes,
-  bbkwtxxRoutes,
+  ...bbkwtxxRoutes,
   gnxnpgRoutes,
   zdxsxxRoutes,
   zdryRoutes,
   ...rlqbxsRoutes,
   xsjsdbRoutes,
-  zjclRoutes,
+  ...zjclRoutes,
   userAuthRoutes,
   grxnpgRoutes,
   dwxnpgRoutes,

src/router/modules/bbkwtxx.js

@@ -16,28 +16,31 @@ const menuLayouts = [
     },
     component: () => import("@/views/zdxx/bbkwpxx/queryBbkwpxx.vue")
   },
-  {
-    path: "/adjustBbkwpxx",
-    name: "adjustBbkwpxx",
-    meta: {
-      isAdd: true,
-      title: '被布控物品信息'
-    },
-    component: () => import("@/views/zdxx/bbkwpxx/adjustBbkwpxx.vue")
-  },
-  {
-    path: "/bbkwpxxDetail",
-    name: "bbkwpxxDetail",
-    meta: {
-      title: '被布控物品信息详情'
-    },
-    component: () => import("@/views/zdxx/bbkwpxx/bbkwpxxDetail.vue")
-  },
+
+
 
 ];
 
-export default {
+export default [{
   path: "/right",
   component: menuLayout,
   children: [...menuLayouts]
-};
\ No newline at end of file
+},
+{
+  path: "/adjustBbkwpxx",
+  name: "adjustBbkwpxx",
+  meta: {
+    isAdd: true,
+    title: '被布控物品信息'
+  },
+  component: () => import("@/views/zdxx/bbkwpxx/adjustBbkwpxx.vue")
+},
+{
+  path: "/bbkwpxxDetail",
+  name: "bbkwpxxDetail",
+  meta: {
+    title: '被布控物品信息详情'
+  },
+  component: () => import("@/views/zdxx/bbkwpxx/bbkwpxxDetail.vue")
+},
+];
\ No newline at end of file

src/router/modules/rlqbxs.js

@@ -49,14 +49,7 @@ const menuLayouts = [
     },
     component: () => import("@/views/rlqbxsxx/shrzList.vue")
   },
-  {
-    path: "/detailRlqbxs",
-    name: "detailRlqbxs",
-    meta: {
-      title: '人力情报线索信息详情'
-    },
-    component: () => import("@/views/rlqbxsxx/detailRlqbxs.vue")
-  },
+
   {
     path: "/rlqbtj",
     name: "rlqbtj",
@@ -81,5 +74,12 @@ export default [{
   },
   component: () => import("@/views/rlqbxsxx/adjustRlqbxs.vue")
 },
-
+{
+  path: "/detailRlqbxs",
+  name: "detailRlqbxs",
+  meta: {
+    title: '人力情报线索信息详情'
+  },
+  component: () => import("@/views/rlqbxsxx/detailRlqbxs.vue")
+},
 ];
\ No newline at end of file

src/router/modules/zjcl.js

@@ -84,18 +84,20 @@ const menuLayouts = [
     },
     component: () => import("@/views/zjcl/jcgz/detailJcgz.vue")
   },
-  {
-    path: "/zjclcj",
-    name: "zjclcj",
-    meta: {
-      title: '证物材料上传',
-    },
-    component: () => import("@/views/zjcl/zjclcj.vue")
-  },
+ 
 ];
 
-export default {
+export default [{
   path: "/right",
   component: menuLayout,
   children: [...menuLayouts]
-};
+},
+{
+  path: "/zjclcj",
+  name: "zjclcj",
+  meta: {
+    title: '证物材料上传',
+  },
+  component: () => import("@/views/zjcl/zjclcj.vue")
+},
+];

src/utils/params.js

@@ -12420,15 +12420,6 @@ const zbfzxyr_flws = [
 //损失枪支基本信息
 const zdssqzxx_jbxx = [
   {
-    name: "物品编号:",
-    id: "ssqzSawpbh",
-    type: "text",
-    value: "",
-    placeholder: "请输入",
-    col: "2",
-    prop: "wpNumbers",
-  },
-  {
     name: "枪支型号:",
     id: "ssqzQzxhdm",
     type: "codeTree",
@@ -12558,15 +12549,6 @@ const zdssqzxx_syrxx = [
 
 //损失机动车信息基本信息
 const zdssjdc_jbxx = [
-  {
-    name: "物品编号:",
-    id: "ssjdcSawpbh",
-    type: "text",
-    value: "",
-    placeholder: "请输入",
-    col: "2",
-    prop: "wpNumbers",
-  },
 ]
 //损失机动车损失车辆
 const zdssjdc_sscl = [
@@ -12791,15 +12773,7 @@ const zdssjdc_syr = [
 ]
 //损失弹药基本信息
 const zdssdy_jbxx = [
-  {
-    name: "物品编号:",
-    id: "ssdySawpbh",
-    type: "text",
-    value: "",
-    placeholder: "请输入",
-    col: "2",
-    prop: "wpNumbers",
-  },
+  
 ]
 //损失弹药弹药信息
 const zdssdy_dyxx = [
@@ -12886,15 +12860,7 @@ const zdssdy_syrxx = [
 ]
 //损失文物基本信息
 const zdssww_jbxx = [
-  {
-    name: "物品编号:",
-    id: "sswwSawpbh",
-    type: "text",
-    value: "",
-    placeholder: "请输入",
-    col: "2",
-    prop: "wpNumbers",
-  },
+  
   {
     name: "文物名称:",
     id: "sswwWpmc",
@@ -13100,15 +13066,7 @@ const zdssww_syrxx = [
 ]
 //损失卡类基本信息
 const zdsskl_jbxx = [
-  {
-    name: "物品编号:",
-    id: "ssklSawpbh",
-    type: "text",
-    value: "",
-    placeholder: "请输入",
-    col: "2",
-    prop: "wpNumbers",
-  },
+  
   {
     name: "物品类型:",
     id: "ssklSawpSawpdm",
@@ -13229,15 +13187,7 @@ const zdsskl_jbxx = [
 ]
 //损失证件基本信息
 const zdsszj_jbxx = [
-  {
-    name: "物品编号:",
-    id: "sszjSawpbh",
-    type: "text",
-    value: "",
-    placeholder: "请输入",
-    col: "2",
-    prop: "wpNumbers",
-  },
+  
   {
     name: "常用证件:",
     id: "sszjCyzjCyzjdm",
@@ -13331,15 +13281,7 @@ const zdsszj_jbxx = [
 ]
 //损失非机动车基本信息
 const zdssfjdc_jbxx = [
-  {
-    name: "物品编号:",
-    id: "ssddfjdcSawpbh",
-    type: "text",
-    value: "",
-    placeholder: "请输入",
-    col: "2",
-    prop: "wpNumbers",
-  },
+  
 ]
 //损失非机动车信息
 const zdssfjdc_fjdcxx = [
@@ -13483,15 +13425,7 @@ const zdssfjdc_syrxx = [
 ]
 //损失移动通讯设备基本信息
 const zdssydtxsb_jbxx = [
-  {
-    name: "涉案物品编号:",
-    id: "ssydtxsbSawpbh",
-    type: "text",
-    // disabled: true,
-    value: "",
-    placeholder: "请输入",
-    col: "2",
-  },
+  
   {
     name: "手机使用状态:",
     id: "sjsyzt",
@@ -13642,15 +13576,7 @@ const zdssydtxsb_syrxx = [
 ]
 //损失其他物品基本信息
 const zdssqtwp_jbxx = [
-  {
-    name: "物品编号:",
-    id: "sswpSawpbh",
-    type: "text",
-    value: "",
-    placeholder: "请输入",
-    col: "2",
-    prop: "wpNumbers",
-  },
+  
 ]
 //损失其他物品信息
 const zdssqtwp_wpxx = [

src/views/ajzcgzxnpg/ajzcgzxnpg.vue

@@ -545,14 +545,14 @@ export default {
               className: "iconfont icongongnengfuwu",
               disabled: false,
             },
-            {
-              id: "zdfxcdtj",
-              label: "阵地风险程度统计",
-              index: "zdfxcdtj",
-              auth: "M0102",
-              className: "iconfont icongongnengfuwu",
-              disabled: false,
-            },
+            // {
+            //   id: "zdfxcdtj",
+            //   label: "阵地风险程度统计",
+            //   index: "zdfxcdtj",
+            //   auth: "M0102",
+            //   className: "iconfont icongongnengfuwu",
+            //   disabled: false,
+            // },
             {
               id: "zdjywptjt",
               label: "阵地交易物品统计",

src/views/ajzcgzxnpg/hjwzgzgl.vue

@@ -147,7 +147,7 @@
           });
       },
       edit(obj) {
-        this.$router.push({
+        this.$router.pushToTab({
           path: "/insertHjwzgzgl",
           query: {
             ruleid: obj.row.ruleid,

src/views/ajzcgzxnpg/queryZjcljcqk.vue

@@ -344,7 +344,7 @@ export default {
         });
     },
     toInfor(obj) {
-      this.$router.push({
+      this.$router.pushToTab({
         path: "/zjclcj",
         query: {
           asjbh: obj.asjbh,
@@ -352,7 +352,7 @@ export default {
       });
     },
     edit(obj) {
-      this.$router.push({
+      this.$router.pushToTab({
         path: "/zjclcj",
         query: {
           asjbh: obj.row.asjbh,

src/views/zdxx/bbkwpxx/queryBbkwpxx.vue

@@ -8,6 +8,7 @@
       :cxQueryField="cxQueryField"
       :cxDefaultFormThead="cxDefaultFormThead"
       :cxUrl="cxUrl"
+      @toInfor='toInfor'
     >
       <template #btnGroup="scope">
         <span class="hbyp" @click="edit(scope.scope)">修改</span>

src/views/zdxx/zdjyhd/addZdjyhd.vue

@@ -816,7 +816,7 @@ export default {
         cxFormData: {
           limit: 10,
           page: 1,
-          glzdxxzjbh: this.xxzjbh,
+          glzdxxzjbh: this.glzdxxzjbh,
         },
         cxDefaultFormThead: [
           {
@@ -849,7 +849,7 @@ export default {
         cxFormData: {
           limit: 10,
           page: 1,
-          glzdxxzjbh: this.xxzjbh,
+          glzdxxzjbh: this.glzdxxzjbh,
         },
         cxDefaultFormThead: [
           {
@@ -886,7 +886,7 @@ export default {
         cxFormData: {
           limit: 10,
           page: 1,
-          glzdxxzjbh: this.xxzjbh,
+          glzdxxzjbh: this.glzdxxzjbh,
         },
         cxDefaultFormThead: [
           {
@@ -927,7 +927,7 @@ export default {
         cxFormData: {
           limit: 10,
           page: 1,
-          glzdxxzjbh: this.xxzjbh,
+          glzdxxzjbh: this.glzdxxzjbh,
         },
         cxDefaultFormThead: [
           {
@@ -968,7 +968,7 @@ export default {
         cxFormData: {
           limit: 10,
           page: 1,
-          glzdxxzjbh: this.xxzjbh,
+          glzdxxzjbh: this.glzdxxzjbh,
         },
         cxDefaultFormThead: [
           {
@@ -1009,7 +1009,7 @@ export default {
         cxFormData: {
           limit: 10,
           page: 1,
-          glzdxxzjbh: this.xxzjbh,
+          glzdxxzjbh: this.glzdxxzjbh,
         },
         cxDefaultFormThead: [
           {
@@ -1046,7 +1046,7 @@ export default {
         cxFormData: {
           limit: 10,
           page: 1,
-          glzdxxzjbh: this.xxzjbh,
+          glzdxxzjbh: this.glzdxxzjbh,
         },
         cxDefaultFormThead: [
           {
@@ -1083,7 +1083,7 @@ export default {
         cxFormData: {
           limit: 10,
           page: 1,
-          glzdxxzjbh: this.xxzjbh,
+          glzdxxzjbh: this.glzdxxzjbh,
         },
         cxDefaultFormThead: [
           {
@@ -1124,7 +1124,7 @@ export default {
         cxFormData: {
           limit: 10,
           page: 1,
-          glzdxxzjbh: this.xxzjbh,
+          glzdxxzjbh: this.glzdxxzjbh,
         },
         cxDefaultFormThead: [
           {
@@ -2024,8 +2024,10 @@ export default {
   },
   created() {
     this.$store.commit("user/SET_Breadcrumb", this.Menu);
+    console.log(this.$route.query);
     if (this.$route.query.glzdxxzjbh) {
       this.glzdxxzjbh = this.$route.query.glzdxxzjbh;
+      console.log(this.glzdxxzjbh);
     }
     if (this.$route.query.xxzjbh) {
       // this.$set(this.propFormField[0], "title", "修改阵地交易活动信息");

src/views/zdxx/zdxxgl/sswp/ssdy/addZdssdy.vue

@@ -26,13 +26,6 @@ export default {
       propFormField: [
         //基本信息
         {
-          title: "基本信息",
-          id: 1,
-          objStr: "",
-          index: 0,
-          data: zdssdy_jbxx,
-        },
-        {
           title: "弹药信息",
           id: 2,
           objStr: "",

src/views/zdxx/zdxxgl/sswp/ssdy/detailZdssdy.vue

@@ -31,18 +31,6 @@ export default {
     return {
       cxQueryField: [
         {
-          title: "基本信息", //如果不分小模块就删除title
-          id: 1,
-          objStr: "",
-          data: [
-            {
-              label: "物品编号:",
-              prop: "ssdySawpbh",
-              col: "3",
-            },
-          ],
-        },
-        {
           title: "弹药信息", //如果不分小模块就删除title
           id: 2,
           objStr: "",

src/views/zdxx/zdxxgl/sswp/ssfjdc/addZdssfjdc.vue

@@ -34,13 +34,6 @@ export default {
       propFormField: [
         //基本信息
         {
-          title: "基本信息",
-          id: 1,
-          objStr: "",
-          index: 0,
-          data: zdssfjdc_jbxx,
-        },
-        {
           title: "损失非机动车信息",
           id: 2,
           objStr: "",

src/views/zdxx/zdxxgl/sswp/ssfjdc/detailZdssfjdc.vue

@@ -31,18 +31,6 @@ export default {
     return {
       cxQueryField: [
         {
-          title: "基本信息", //如果不分小模块就删除title
-          id: 1,
-          objStr: "",
-          data: [
-            {
-              label: "物品编号:",
-              prop: "ssddfjdcSawpbh",
-              col: "3",
-            },
-          ],
-        },
-        {
           title: "损失非机动车信息", //如果不分小模块就删除title
           id: 2,
           objStr: "",

src/views/zdxx/zdxxgl/sswp/ssjdc/addZdssjdc.vue

@@ -34,13 +34,6 @@ export default {
       propFormField: [
         //基本信息
         {
-          title: "基本信息",
-          id: 1,
-          objStr: "",
-          index: 0,
-          data: zdssjdc_jbxx,
-        },
-        {
           title: "损失车辆信息",
           id: 21,
           objStr: "",

src/views/zdxx/zdxxgl/sswp/ssjdc/detailZdssjdc.vue

@@ -31,33 +31,11 @@ export default {
     return {
       cxQueryField: [
         {
-          title: "基本信息", //如果不分小模块就删除title
-          id: 1,
-          objStr: "",
-          data: [
-            {
-              label: "物品编号:",
-              prop: "ssjdcSawpbh",
-              col: "3",
-            },
-            {
-              label: "信息主键编号:",
-              prop: "xxzjbh",
-              col: "3",
-            },
-          ],
-        },
-        {
           title: "损失车辆", //如果不分小模块就删除title
           id: 2,
           objStr: "",
           data: [
             {
-              label: "物品编号:",
-              prop: "ssjdcSawpbh",
-              col: "3",
-            },
-            {
               label: "号牌号码:",
               prop: "ssjdcJdchphm",
               col: "3",

src/views/zdxx/zdxxgl/sswp/sskl/detailZdsskl.vue

@@ -33,11 +33,6 @@ export default {
               col: "3",
             },
             {
-              label: "物品编号:",
-              prop: "ssklSawpbh",
-              col: "3",
-            },
-            {
               label: "卡号:",
               prop: "ssklKhWpbzh",
               col: "3",

src/views/zdxx/zdxxgl/sswp/ssqtwp/addZdssqtwp.vue

@@ -26,13 +26,6 @@ export default {
       propFormField: [
         //基本信息
         {
-          title: "基本信息",
-          id: 1,
-          objStr: "",
-          index: 0,
-          data: zdssqtwp_jbxx,
-        },
-        {
           title: "物品信息",
           id: 2,
           objStr: "",

src/views/zdxx/zdxxgl/sswp/ssqtwp/detailZdssqtwp.vue

@@ -36,11 +36,6 @@ export default {
           objStr: "",
           data: [
             {
-              label: "物品编号:",
-              prop: "sswpSawpbh",
-              col: "3",
-            },
-            {
               label: "信息主键编号:",
               prop: "xxzjbh",
               col: "3",

src/views/zdxx/zdxxgl/sswp/ssqz/detailZdssqz.vue

@@ -36,20 +36,10 @@ export default {
           objStr: "",
           data: [
             {
-              label: "物品编号:",
-              prop: "ssqzSawpbh",
-              col: "3",
-            },
-            {
               label: "信息主键编号:",
               prop: "xxzjbh",
               col: "3",
             },
-            // {
-            //   label: "物品编号:",
-            //   prop: "ssqzSawpbh",
-            //   col: "3",
-            // },
             {
               label: "枪支型号:",
               prop: "ssqzQzxhdmStr",

src/views/zdxx/zdxxgl/sswp/ssww/detailZdssww.vue

@@ -36,11 +36,6 @@ export default {
           objStr: "",
           data: [
             {
-              label: "物品编号:",
-              prop: "sswwSawpbh",
-              col: "3",
-            },
-            {
               label: "信息主键编号:",
               prop: "xxzjbh",
               col: "3",

src/views/zdxx/zdxxgl/sswp/sszj/detailZdsszj.vue

@@ -41,11 +41,6 @@ export default {
               col: "3",
             },
             {
-              label: "物品编号:",
-              prop: "sszjSawpbh",
-              col: "3",
-            },
-            {
               label: "常用证件:",
               prop: "sszjCyzjCyzjdm",
               col: "3",

src/views/zjcl/zjclcj.vue

@@ -320,6 +320,8 @@
 
 <style scoped lang="scss">
     .Content{
+      width: 1200px;
+      margin: 0 auto;
         .info{
             background: white;
             border-radius: 8px;

src/views/ztyp/queryZj.vue

@@ -10,9 +10,9 @@
       :tableData1="tableData1"
       ref="rightContent"
       :pageASs="pageASs"
+      :childrenUrl="childrenUrl"
       @rowExpand="rowExpand"
       @adds="adds"
-      @sprops="sprops"
       :loadingZxzjlList="loadingZxzjlList"
     >
       <template #btnGroup="scope">
@@ -77,6 +77,7 @@ import {
   uploadFile,
   selectZxzjbList,
 } from "@/api/yzzfzxsyp/thxs.js";
+import base from "@/api/base";
 export default {
   name: "queryZj",
   components: {
@@ -135,6 +136,7 @@ export default {
         },
       ],
       cxUrl: "/ztypxx/selectJtrwList",
+      childrenUrl: `${base.alyIP}/ztypxx/selectZxzjbList`,
       Menu: [
         {
           id: "queryZj",