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

src/api/cbyp.js

@@ -6,46 +6,47 @@
  * @Description: In User Settings Edit
  * @FilePath: \founder_vue\src\api\cbyp.js
  */
-import { get, post , postJson} from "@/utils/http.js";
+import { get, post, postJson } from '@/utils/http.js'
 
-export const toQueryXszxx = params =>
-  post("/api/cbxsz/toQueryXszxx", params);
+export const toQueryXszxx = params => post('/api/cbxsz/toQueryXszxx', params)
 
 export const queryTreeDataByType = params =>
-  get("/api/queryTreeDataByType", params);
+  get('/api/queryTreeDataByType', params)
 
-export const updateCbxsz = params =>
-  post("/api/cbxsz/updateCbxsz", params);
+export const updateCbxsz = params => post('/api/cbxsz/updateCbxsz', params)
 
 //合并线索组列表(其他线索组)
-export const toHbxsz = params =>
-  post("/api/cbxsz/toHbxsz", params);
+export const toHbxsz = params => post('/api/cbxsz/toHbxsz', params)
 
 //合并线索
-export const insertHbXszxx = params =>
-  post("/api/xlaj/insertHbXszxx", params); 
+export const insertHbXszxx = params => post('/api/xlaj/insertHbXszxx', params)
 
 //合并线索
-export const tjajHttp = params =>
-  post("/api/dwcx/EsAsjQuery", params); 
-  
+export const tjajHttp = params => post('/api/dwcx/EsAsjQuery', params)
 
 export const getQgAsjxxByXszajbh = params =>
-  post("/api/cbxsz/getQgAsjxxByXszajbh", params);
+  post('/api/cbxsz/getQgAsjxxByXszajbh', params)
 
 export const queryCbzAsjGlxx = params =>
-  post("/api/xlaj/queryCbzAsjGlxx", params);
+  post('/api/xlaj/queryCbzAsjGlxx', params)
 
-export const getCbzXyry = params =>
-  post("/api/xlaj/getCbzXyry", params);
+export const getCbzXyry = params => post('/api/xlaj/getCbzXyry', params)
 
-export const getCbzBhry = params =>
-  post("/api/xlaj/getCbzBhry", params);
+export const getCbzBhry = params => post('/api/xlaj/getCbzBhry', params)
 
 // 白名单删除接口
 export const removeBshWhiteList = params =>
   post('/api/bshgl/removeBshWhiteList', params)
 
 // 我的系列案件列表删除
-export const updateCbz = params =>
-  post('/api/xlaj/updateCbz', params)
+export const updateCbz = params => post('/api/xlaj/updateCbz', params)
+// 获取列表信息
+export const queryxszglasj = params =>
+  post('/api/cbxsz/listCbxszGlAsjxx', params)
+// 串并名称添加
+export const addxszglasj = params => post('/api/cbxsz/insertCbzxx', params)
+// 删除案件
+export const delxszglasj = params => post('/api/cbxsz/delCbxsglaj', params)
+
+export const toBjcba = params =>
+post("/api/xlaj/toBjcba", params)

src/components/ajflQuery.vue

@@ -225,9 +225,9 @@
               <span> {{ tableDataLength }} </span>
             </div>
             <span class="export-btn">
-              <el-button type="success" @click="newXsz()">新增线索组</el-button>
-              <el-button type="success" @click="jrXsz()">加入线索组</el-button>
-              <el-button type="success" @click="tjDwdsc()"
+              <el-button @click="newXsz()">新增线索组</el-button>
+              <el-button @click="jrXsz()">加入线索组</el-button>
+              <el-button @click="tjDwdsc()"
                 >添加到我的收藏</el-button
               >
             </span>
@@ -770,7 +770,7 @@ export default {
 
 <style scoped lang="scss">
 @import '@/assets/styles/rightContent.scss';
-/deep/button.el-button.el-button--success {
+/deep/button.el-button.el-button--default {
   line-height: 5px;
 }
 </style>

src/components/bshChildrenQuery.vue

@@ -202,6 +202,7 @@
 
         <!--按钮-->
         <div class="btm-btns">
+     
           <el-button
             type="primary"
             size="small"
@@ -209,17 +210,18 @@
             @click="doQueryBtn(true)"
             >查询
           </el-button>
-          <el-button size="small" @click="clearData" style="width: 100px"
-            >清空
-          </el-button>
+      
           <el-button
             v-if="pageBszfc == 'rgcb'"
-            type="success"
+            type="primary"
             size="small"
             @click="goNew"
             style="width: 100px"
             >新增
           </el-button>
+                   <el-button size="small" @click="clearData" style="width: 100px"
+            >清空
+          </el-button>
         </div>
       </div>
     </div>
@@ -590,10 +592,9 @@ export default {
       } else if (type == 'add') {
         debugger
         this.$router.pushToTab({
-          path: 'cbaAdd',
+          path: 'djwzba',
           query: {
-            xszajbh: row.xszajbh,
-            cbxgfwbzh: row.xszajbh
+            xszajbh: val.xszajbh,
           }
         })
       }

src/components/bshQuery.vue

@@ -202,6 +202,7 @@
 
         <!--按钮-->
         <div class="btm-btns">
+      
           <el-button
             type="primary"
             size="small"
@@ -209,12 +210,13 @@
             @click="doQueryBtn(true)"
             >查询
           </el-button>
+         
+               <el-button v-if="pageBszfc == 'wdxlaj'" type="primary" size="small" @click="goNew" style="width: 100px"
+            >新增
+          </el-button>
                <el-button size="small" @click="clearData" style="width: 100px"
             >清空
           </el-button>
-               <el-button v-if="pageBszfc == 'wdxlaj'" type="success" size="small" @click="goNew" style="width: 100px"
-            >新增
-          </el-button>
         </div>
       </div>
     </div>

src/components/tjajForm.vue

@@ -260,11 +260,13 @@ export default {
     },
     initCode() {
       let self = this;
+      debugger
       self.ajxxDefaultField.data.forEach((val,index) => {
         if (val.type == "code"||val.type == "codeTreeDialog") {
           if (val.codeOptions.length == 0) {
             axios.get(`JsonData/${val.codeTree}.json`).then(response => {
               if (response.success === true) {
+                debugger
                 self.$set(val, "codeOptions", response.data.rows);
               }
             });
@@ -278,7 +280,7 @@ export default {
         if (val.type == "code"||val.type == "codeTreeDialog") {
           if (val.codeOptions.length == 0) {
             axios.get(`JsonData/${val.codeTree}.json`).then(response => {
-              if (response.success === true) {
+              if (response.success) {
                 self.$set(val, "codeOptions", response.data.rows);
               }
             });

src/components/treeCode_components.vue

@@ -205,6 +205,19 @@ export default {
 
     },
     newValue(val) {
+      // if (val != '') {
+      //   let value = this.queryTree(this.curItem.codeOptions, val)[0];
+      //   this.codeTreeConfig.fieldItem = [];
+      //   this.$set(
+      //     this.curFormData,
+      //     this.curItem.id,
+      //     value == undefined ? '' : val
+      //   );
+      //   this.codeTreeConfig.fieldItem.push({
+      //     id: val,
+      //     label: value == undefined ? '' : value
+      //   })
+      // }
       if (val != '') {
         let value = this.queryTree(this.curItem.codeOptions, val)[0];
         this.codeTreeConfig.fieldItem = [];
@@ -218,7 +231,6 @@ export default {
           label: value == undefined ? '' : value
         })
       }
-
     }
     /*curFormData(val){
         if(val[this.id]!=''){

src/router/modules/index.js

@@ -168,6 +168,36 @@ export default [
         auth: 5
     },
     component: () => import("@/views/cbyp/tobjcba.vue")
+},
+{
+  path: "/djwzba",
+  name: "djwzba",
+  redirect: '/djwzba/xgaj',
+  meta: {
+    title: "登记为串并案",
+    auth: 5
+  },
+  component: () => import("@/views/cbyp/cba/djwzba.vue"),
+  children: [
+    {
+      path: "xgaj",
+      name: "xgaj",
+      meta: {
+        title: "相关案件",
+        auth: 5
+      },
+      component: () => import("@/views/cbyp/cba/xgaj.vue"),
+    },
+    {
+      path: "tjaj",
+      name: "tjaj",
+      meta: {
+        title: "相关案件",
+        auth: 5
+      },
+      component: () => import("@/views/cbyp/cba/tjaj.vue"),
+    }
+  ]
 }
   
 ]
\ No newline at end of file