串并研判

src/components/Bshxqcb_component.vue

@@ -404,7 +404,6 @@
                   @click="goDetail(scope.row), 'detail'"
                   style="
                   cursor: pointer;
-                  color: #096cc9;
                   font-size: 13px !important;
                   white-space: nowrap;
                   overflow: hidden;
@@ -826,6 +825,7 @@
             i != 'limit' &&
             i != 'typeFlag' &&
             i != 'unitcode' &&
+            i != 'xszajbh' &&
             i != 'grade' &&
             i != 'flwssfhgpdbz'
           ) {
@@ -940,11 +940,11 @@
     watch: {
       //监听器中监听表单的值，刷新下拉框的数据
       "formData.ajlbdm": {
-        handler(val,oldVal) {
+        handler(val, oldVal) {
           let self = this;
           //请求接口 4 CODE_GABAJZLB_bz
           if (val !== "") {
-            if(oldVal != '') {
+            if (oldVal != '') {
               self.$set(self.cxFormData, 'zatzJyqk', '')
             }
             axios
@@ -975,11 +975,11 @@
         deep: true,
       },
       "cxFormData.zatzJyqk": {
-        handler(val,oldVal) {
+        handler(val, oldVal) {
           let self = this;
           //请求接口 5 CODE_GABAJXZLB_bz
           if (val !== "") {
-            if(oldVal != '') {
+            if (oldVal != '') {
               self.$set(self.cxFormData, 'ajxlb', '')
             }
             axios
@@ -998,10 +998,10 @@
             axios
               .get(`JsonData/CODE_AJLB_bz.json`)
               .then((res) => {
-                let resultObj = res.data.rows.find((i)=>val.indexOf(i.id) == 0);
-                if(resultObj) {
+                let resultObj = res.data.rows.find((i) => val.indexOf(i.id) == 0);
+                if (resultObj) {
                   self.$set(self.cxFormData, 'ajlbdm', resultObj.id)
-                }else{
+                } else {
                   self.$set(self.cxFormData, 'ajlbdm', '')
                 }
               })
@@ -1029,10 +1029,10 @@
             axios
               .get(`JsonData/CODE_GABAJZLB_bz.json`)
               .then((res) => {
-                let resultObj = res.data.rows.find((i)=>val.indexOf(i.id) == 0);
-                if(resultObj) {
+                let resultObj = res.data.rows.find((i) => val.indexOf(i.id) == 0);
+                if (resultObj) {
                   self.$set(self.cxFormData, 'zatzJyqk', resultObj.id)
-                }else{
+                } else {
                   self.$set(self.cxFormData, 'zatzJyqk', '')
                 }
               })

src/components/bshChildrenQuery.vue

@@ -97,6 +97,7 @@
                   resize="none"
                   :placeholder="item.placeholder"
                   v-model="formData[item.id]"
+                  style="height: 50px"
                   v-else-if="item.type == 'textarea'"
               >
               </el-input>
@@ -892,7 +893,7 @@
               response.data.data.forEach(item => {
                 item.children = []
                 item.xszmc = `${item.cbajAjmc}`
-                item.cbajAjmc = `${item.cbajAjmc}(组号:${item.xszajbh})`
+                // item.cbajAjmc = `${item.cbajAjmc}(组号:${item.xszajbh})`
                 item.cbxsypCbaj1 = `${item.djsj}通过${item.cblx}(${item.bshlx})串并${item.cbxsypCbajs}起案件，其中已破案${item.rn}起`
                 item.cbxsypCbaj2 = `${item.djsj}通过${item.cblx},串并${item.cbxsypCbajs}起案件，其中已破案${item.rn}起`
               })
@@ -972,7 +973,9 @@
     position: relative;
     top: -4px;
   }
-
+  .el-textarea /deep/ .el-textarea__inner{
+    height: 100%!important;
+  }
   .rightContent .el-textarea__inner,
   #formCommonPage .el-textarea__inner {
     width: 100%;

src/views/cbyp/bshcb.vue

@@ -28,7 +28,6 @@ export default {
         asjbh: "",
         ladw: "",
         sldw: "",
-        xszajbh: "",
         cbajAjmc: "",
         pazt: "",
         djsjStart: "",
@@ -39,7 +38,7 @@ export default {
         fasjStart: "",
         bshlx: "",
         cbxgfwbzh: "",
-        cbxsly: "qs",
+        cbxsly: "",
         ajsStart: '',
         ajsEnd: '',
         wpaStart: '',
@@ -89,14 +88,6 @@ export default {
           codeTree: "CODE_QGUNIT",
         },
         {
-          name: "串并线索编号",
-          id: "xszajbh",
-          type: "text",
-          value: "",
-          placeholder: "请输入串并线索编号",
-          col: "3",
-        },
-        {
           name: "串并线索组名称",
           id: "cbajAjmc",
           type: "text",
@@ -168,20 +159,20 @@ export default {
           codeTree: "CODE_AJLB_bz",
         },
         {
-          name: "简要案情",
-          id: "jyaq",
+          name: "标识号",
+          id: "cbxgfwbzh",
           type: "text",
           value: "",
-          placeholder: "简要案情,多个案情之间用逗号分隔",
+          placeholder: "请输入",
           col: "3",
         },
         {
-          name: "标识号",
-          id: "cbxgfwbzh",
+          name: "简要案情",
+          id: "jyaq",
           type: "text",
           value: "",
-          placeholder: "请输入",
-          col: "3",
+          placeholder: "简要案情,多个案情之间用逗号分隔",
+          col: "15",
         },
         // {
         //   name: "是否为全国线索",
@@ -214,6 +205,7 @@ export default {
           placeholder: "",
           col: "3",
           radioData: [
+            { label: "全部", val: "" },
             { label: "本辖区", val: "bxq" },
             { label: "全省  ", val: "qs" },
           ],
@@ -313,11 +305,11 @@ export default {
           prop: "xyrCount",
         },
         {
-          label: "串并类型",
-          prop: "cblx",
+          label: "标识号类型",
+          prop: "bshlx",
         },
         {
-          label: "串并依据",
+          label: "标识号",
           prop: "cbxgfwbzh",
         },
         {

src/views/cbyp/rgcbDetail.vue

@@ -36,7 +36,6 @@
         routeQuery: this.$route.query,
         xszmc: this.$route.query.xszmc,
         cxFormData: {
-          route: this.$route.query,
           limit: 10,
           page: 1,
           xszajbh: this.$route.query.xszajbh,
@@ -45,11 +44,11 @@
           ajlbdm: '',
           zatzJyqk: '',
           ajxlb: '',
-          afksStart: '',
+          fasjStart: '',
           fasjEnd: '',
           larqStart: '',
           larqEnd: '',
-          ladwGabjgjgdm: '',
+          ladwGajgjgdm: '',
           afddxzqh: '',
           zcjddm: '',
           jyaq: '',
@@ -104,7 +103,7 @@
           },
           {
             name: "发案时间",
-            id: "afksStart",
+            id: "fasjStart",
             id2: "fasjEnd",
             type: "zdyDate",
             value: "",
@@ -120,7 +119,7 @@
           },
           {
             name: "立案单位",
-            id: "ladwGabjgjgdm",
+            id: "ladwGajgjgdm",
             type: "lazyCodeTreeDialog",
             props: [], //字典弹框需要的字段
             value: "",
@@ -154,7 +153,7 @@
             type: "text",
             value: "",
             placeholder: "简要案情,多个案情之间用逗号分隔",
-            col: "3",
+            col: "15",
           },
         ],
         cxDefaultFormThead: [

src/views/index/home.vue

 <!--
  * @Author: your name
  * @Date: 2021-07-12 17:42:38
- * @LastEditTime: 2022-03-03 15:40:23
- * @LastEditors: LYS
+ * @LastEditTime: 2022-03-19 20:16:24
+ * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: \founder_vue\src\views\index\home.vue
 -->
@@ -57,7 +57,7 @@ export default {
           lock: false,
         },
         {
-          id: "/rgcb",
+          id: "/bshcb",
           url: require("../../assets/img/nav3.png"), //串并研判
           lock: false,
         },