标注字段、详情修改

src/components/ptCxForm_components.vue

@@ -553,7 +553,7 @@ export default {
       let self = this,
         json = {};
       for (let i in self.formData) {
-        if (i == "asjbz_ajfl") {
+        if (i == "ajlbdm") {
           if (self.formData[i].length > 0) {
             var str = "";
             self.formData[i].forEach((item) => {

src/components/ptCxForm_components_tjaj.vue

@@ -896,7 +896,8 @@ export default {
       let self = this,
         json = {};
       for (let i in self.formData) {
-        if (i == "asjbz_ajfl") {
+        debugger
+        if (i == "ajlbdm") {
           if (self.formData[i].length > 0) {
             var str = "";
             self.formData[i].forEach((item) => {

src/utils/params.js

@@ -14,7 +14,7 @@ let jccxFormData = {
   asjlydm: '',
   xsjqlbdm: '',
   zcjddm: [],
-  ajlbdm: '',
+  ajlbdm: [],
   zatzJyqk: '',
   ajmc: '',
   asjfssjAsjfskssj: '',
@@ -185,16 +185,6 @@ let jccxAjxxDefaultFormField = {
       multiple: true
     },
     {
-      name: '案件类别',
-      id: 'ajlbdm',
-      type: 'codeTreeDialog', //字典弹框
-      props: [], //字典弹框需要的字段
-      codeOptions: [],
-      codeTree: 'CODE_AJLB',
-      value: '',
-      col: '3'
-    },
-    {
       name: '小案类别',
       id: 'zatzJyqk',
       type: 'code',
@@ -212,6 +202,21 @@ let jccxAjxxDefaultFormField = {
       col: '3'
     },
     {
+      name: '案件分类',
+      id: 'ajlbdm',
+      type: 'checkboxs',
+      value: '',
+      placeholder: '',
+      col: '1',
+      checkList: [
+        { label: '盗窃', val: '05000200' },
+        { label: '诈骗案', val: '05000300' },
+        { label: '抢劫案', val: '05000100' },
+        { label: '抢夺案', val: '05000400' },
+        { label: '招摇撞骗案', val: '06010300' }
+      ]
+    },
+    {
       name: '案发时间',
       id: 'asjfssjAsjfskssj',
       type: 'daterange',
@@ -710,16 +715,6 @@ let jccxAjxxFormField = {
       multiple: true
     },
     {
-      name: '案件类别',
-      id: 'ajlbdm',
-      type: 'codeTreeDialog', //字典弹框
-      props: [], //字典弹框需要的字段
-      codeOptions: [],
-      codeTree: 'CODE_AJLB',
-      value: '',
-      col: '3'
-    },
-    {
       name: '小案类别',
       id: 'zatzJyqk',
       type: 'code',
@@ -4152,7 +4147,7 @@ let dwcxFormData = {
   asjbh: '',
   xckybh: '',
   zcjddm: '',
-  ajlbdm: '',
+  ajlbdm:[],
   zatzJyqk: '',
   ajmc: '',
   asjfssjAsjfskssj: '',
@@ -4224,16 +4219,6 @@ let dwcxAjxxDefaultFormField = {
       col: '3'
     },
     {
-      name: '案件类别',
-      id: 'ajlbdm',
-      type: 'codeTreeDialog', //字典弹框
-      props: [], //字典弹框需要的字段
-      codeOptions: [],
-      codeTree: 'CODE_AJLB',
-      value: '',
-      col: '3'
-    },
-    {
       name: '案件性质',
       id: 'zatzJyqk',
       type: 'code',
@@ -5000,16 +4985,6 @@ let dwcxAjxxFormField = {
       col: '3'
     },
     {
-      name: '案件类别',
-      id: 'ajlbdm',
-      type: 'codeTreeDialog', //字典弹框
-      props: [], //字典弹框需要的字段
-      codeOptions: [],
-      codeTree: 'CODE_AJLB',
-      value: '',
-      col: '3'
-    },
-    {
       name: '案件性质',
       id: 'zatzJyqk',
       type: 'code',

src/views/ajbzDetail.vue

@@ -421,8 +421,14 @@
               <el-card v-if="!bzFlag" class="box-card">
                 <div class="incidentTitle incidentTitle1">
                   <span>案事件标注</span>
+                  <div
+                    class="btn"
+                    @click="hanldTableBar()"
+                  >
+                    取消
+                  </div>
                 </div>
-                <div class="incidentBtn">
+                <!-- <div class="incidentBtn">
                   <div
                     class="btn"
                     v-for="(data, index) in tableBar"
@@ -433,7 +439,7 @@
                   >
                     {{ data.name }}
                   </div>
-                </div>
+                </div> -->
                 <div class="incidentCon">
                   <div class="incidentConLeft">
                     <div class="search">
@@ -1179,35 +1185,37 @@ export default {
         });
       }
     },
-    hanldTableBar(val) {
-      if (this.selectIndex1 == val) {
-        this.selectIndex1 = 0;
-        debugger;
-        this.data1 = this.sxdata1;
-      } else {
-        this.selectIndex1 = val;
-        if (val == 1) {
-          this.data1 = this.sxdata1.filter((val) => {
-            return val.parentId == "01";
-          });
-        } else if (val == 2) {
-          this.data1 = this.sxdata1.filter((val) => {
-            return val.parentId == "02";
-          });
-        } else if (val == 3) {
-          this.data1 = this.sxdata1.filter((val) => {
-            return val.parentId == "03";
-          });
-        } else if (val == 4) {
-          this.data1 = this.sxdata1.filter((val) => {
-            return val.parentId == "04";
-          });
-        } else if (val == 5) {
-          this.data1 = this.sxdata1.filter((val) => {
-            return val.parentId == "05";
-          });
-        }
-      }
+    hanldTableBar() {
+      this.getQuery()
+      this.getQuerys()
+      // if (this.selectIndex1 == val) {
+      //   this.selectIndex1 = 0;
+      //   debugger;
+      //   this.data1 = this.sxdata1;
+      // } else {
+      //   this.selectIndex1 = val;
+      //   if (val == 1) {
+      //     this.data1 = this.sxdata1.filter((val) => {
+      //       return val.parentId == "01";
+      //     });
+      //   } else if (val == 2) {
+      //     this.data1 = this.sxdata1.filter((val) => {
+      //       return val.parentId == "02";
+      //     });
+      //   } else if (val == 3) {
+      //     this.data1 = this.sxdata1.filter((val) => {
+      //       return val.parentId == "03";
+      //     });
+      //   } else if (val == 4) {
+      //     this.data1 = this.sxdata1.filter((val) => {
+      //       return val.parentId == "04";
+      //     });
+      //   } else if (val == 5) {
+      //     this.data1 = this.sxdata1.filter((val) => {
+      //       return val.parentId == "05";
+      //     });
+      //   }
+      // }
     },
 
     zaHandleNodeClick(res) {
@@ -1598,6 +1606,7 @@ export default {
 .incidentTitle1 {
   display: flex;
   justify-content: space-between;
+  align-items: center;
 }
 .incidentTitle span {
   font-size: 18px;
@@ -1615,6 +1624,7 @@ export default {
   border-bottom: 1px solid #c2c2c2;
   display: flex;
   align-items: center;
+ 
 }
 .btn {
   margin-left: 8px;
@@ -1629,6 +1639,7 @@ export default {
   text-align: center;
   line-height: 32px;
   cursor: pointer;
+   margin-right: 20px;
 }
 /deep/ .el-avatar > img {
   width: 100%;
@@ -1640,7 +1651,7 @@ export default {
   width: 100%;
 
   position: absolute;
-  top: 118px;
+  top: 52px;
   display: flex;
 }
 .incidentConLeft,
@@ -1668,7 +1679,7 @@ export default {
 }
 .tree {
   width: 98%;
-  height: 550px;
+  height: 628px;
   overflow: hidden;
   overflow-y: auto;
 }

src/views/dwcx/index.vue

@@ -79,7 +79,7 @@
 <script>
 import listForm from "@c/form_components.vue";
 import Loading from "@c/Loading.vue";
-import ajTable from "@/views/dwcx/ajTable.vue";
+import ajTable from "@/views/dwcx/ajTable.vue"; 
 import listTable from "@c/table_components.vue";
 import listHeader from "@c/header_components.vue";
 import listSelect from "@/views/dwcx/selectedConditions.vue";
@@ -652,7 +652,15 @@ debugger
       /*处理时间的字段名*/
       let handleForm = JSON.parse(JSON.stringify(self.formData));
       for (let z in handleForm) {
-        if (
+      if (z == "ajlbdm") {
+          if (self.formData[z].length > 0) {
+            var str = "";
+            self.formData[z].forEach((item) => {
+              str = str ? `${str},${item.val}` : `${item.val}`;
+            });
+          }
+          handleForm[z] = str;
+        } else  if (
           z == "asjfssjAsjfskssj" ||
           z == "slsj" ||
           z == "larq" ||

src/views/index/home.vue

@@ -115,7 +115,7 @@ export default {
     },
   },
   created(){
-    let arr = ['34222419830726005X','350628197501115019','33020197911103615']
+    let arr = ['34222419830726005X','350628197501115019','33020197911103615','32038219900701789X']
     debugger
     this.isInclude = arr.some(item=>item == this.identitycard)
   },

src/views/queryAj.vue

@@ -22,7 +22,6 @@ export default {
         rows: 10,
         asjbh: '',
         Ladw_gajgjgdms: '',
-        ajlbdm: '',
         lasjRqsjKssj: '',
         lasjRqsjJssj: '',
         asjfssjKssj: '',
@@ -32,7 +31,7 @@ export default {
         xsclalxdm: '',
         bzzt: '',
         asjfsdd_xzqhdm: '',
-        asjbz_ajfl: [],
+        ajlbdm: [],
         jyaq: '',
         asjfsddDzmc: ''
       },
@@ -46,16 +45,16 @@ export default {
           placeholder: '请输入',
           col: '3'
         },
-        {
-          name: '案(事)件类别',
-          id: 'ajlbdm',
-          type: 'codeTreeDialog',
-          props: [], //字典弹框需要的字段
-          value: '',
-          col: '3',
-          codeOptions: [],
-          codeTree: 'CODE_AJLB'
-        },
+        // {
+        //   name: '案(事)件类别',
+        //   id: 'ajlbdm',
+        //   type: 'codeTreeDialog',
+        //   props: [], //字典弹框需要的字段
+        //   value: '',
+        //   col: '3',
+        //   codeOptions: [],
+        //   codeTree: 'CODE_AJLB'
+        // },
         {
           name: '立案单位',
           id: 'Ladw_gajgjgdms',
@@ -104,17 +103,17 @@ export default {
         },
         {
           name: '案件分类',
-          id: 'asjbz_ajfl',
+          id: 'ajlbdm',
           type: 'checkbox',
-          value: '01',
+          value: '05000200',
           placeholder: '',
           col: '15',
           checkList: [
-            { label: '盗窃', val: '01' },
-            { label: '诈骗案', val: '02' },
-            { label: '抢劫案', val: '03' },
-            { label: '抢夺案', val: '04' },
-            { label: '招摇撞骗案', val: '05' }
+            { label: '盗窃', val: '05000200' },
+            { label: '诈骗案', val: '05000300' },
+            { label: '抢劫案', val: '05000100' },
+            { label: '抢夺案', val: '05000400' },
+            { label: '招摇撞骗案', val: '06010300' }
           ]
         },
         {