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

src/components/ptCxForm_components.vue

@@ -857,16 +857,29 @@
             <div v-else-if="columnTitle.isShowDialog">
               <span
                 v-if="
-                  (pageBs == 'queryRlqbxs' || pageBs == 'queryXshb' || pageBs == 'queryZdcyryxx' || pageBs == 'adjustZdxxgl'
-                  ) && ( !scope.row.sfyqgaj || scope.row.sfyqgaj == '' || scope.row.sfyqgaj == '否')
+                  (pageBs == 'queryRlqbxs' ||
+                    pageBs == 'queryXshbs' ||
+                    pageBs == 'queryRlqbxs' ||
+                    pageBs == 'queryXshb' ||
+                    pageBs == 'queryZdcyryxx' ||
+                    pageBs == 'adjustZdxxgl') &&
+                  (!scope.row.sfyqgaj ||
+                    scope.row.sfyqgaj == '' ||
+                    scope.row.sfyqgaj == '否')
                 "
                 class="dele"
                 ><img src="../assets/img/guohuise.png"
               /></span>
               <span
                 v-if="
-                  (pageBs == 'queryRlqbxs' || pageBs == 'queryXshb' || pageBs == 'queryZdcyryxx' || pageBs == 'adjustZdxxgl') &&
-                  ( !scope.row.sfysaj || scope.row.sfyqgaj == '' || scope.row.sfysaj == '否')
+                  (pageBs == 'queryRlqbxs' ||
+                    pageBs == 'queryXshbs' ||
+                    pageBs == 'queryXshb' ||
+                    pageBs == 'queryZdcyryxx' ||
+                    pageBs == 'adjustZdxxgl') &&
+                  (!scope.row.sfysaj ||
+                    scope.row.sfyqgaj == '' ||
+                    scope.row.sfysaj == '否')
                 "
                 ><img src="../assets/img/shenghuise.png"
               /></span>
@@ -875,7 +888,11 @@
                 @click="showDialog(scope, 'guo')"
                 class="dele"
                 v-if="
-                  (pageBs == 'queryRlqbxs' || pageBs == 'queryXshb' || pageBs == 'queryZdcyryxx' || pageBs == 'adjustZdxxgl') &&
+                  (pageBs == 'queryRlqbxs' ||
+                    pageBs == 'queryXshbs' ||
+                    pageBs == 'queryXshb' ||
+                    pageBs == 'queryZdcyryxx' ||
+                    pageBs == 'adjustZdxxgl') &&
                   scope.row.sfyqgaj == '是'
                 "
                 ><img src="../assets/img/guo.png"
@@ -883,7 +900,11 @@
               <span
                 @click="showDialog(scope, 'sheng')"
                 v-if="
-                  (pageBs == 'queryRlqbxs' || pageBs == 'queryXshb' || pageBs == 'queryZdcyryxx' || pageBs == 'adjustZdxxgl') &&
+                  (pageBs == 'queryRlqbxs' ||
+                    pageBs == 'queryXshbs' ||
+                    pageBs == 'queryXshb' ||
+                    pageBs == 'queryZdcyryxx' ||
+                    pageBs == 'adjustZdxxgl') &&
                   scope.row.sfysaj == '是'
                 "
                 ><img src="../assets/img/sheng.png"
@@ -899,9 +920,8 @@
                     pageBs == 'queryZdssqz' ||
                     pageBs == 'queryZdssww' ||
                     pageBs == 'queryZdssydtxsb' ||
-                    pageBs == 'queryZdsszj'
-                    ) &&
-                  ( !scope.row.sfzdwp || scope.row.sfzdwp == '否')
+                    pageBs == 'queryZdsszj') &&
+                  (!scope.row.sfzdwp || scope.row.sfzdwp == '否')
                 "
                 ><img src="../assets/img/anhuise.png"
               /></span>
@@ -2810,10 +2830,10 @@ export default {
       if (type == "guo") {
         // cxUrl = "/rlqb/getAjListByQg";
         this.$emit("showDialogG", scope);
-      } else if(type == "sheng") {
+      } else if (type == "sheng") {
         // cxUrl = "/rlqb/getAjListByS";
         this.$emit("showDialogS", scope);
-      } else  if(type == "an") {
+      } else if (type == "an") {
         // cxUrl = "/rlqb/getAjListByS";
         this.$emit("showDialogA", scope);
       }

src/views/hbyprw/hbyprw/queryHbyp.vue

@@ -17,7 +17,7 @@
       </template>
       <template #btnGroup="scope">
         <span
-          v-if="scope.scope.row.sfkfk == '1'"
+          v-if="scope.scope.row.sfkfp == '1'"
           class="hbyp"
           @click="toFp(scope.scope)"
           >分配合并研判</span

src/views/xshb/queryXshb/queryXshba.vue

@@ -8,12 +8,43 @@
       :cxDefaultFormThead="cxDefaultFormThead"
       :cxUrl="cxUrl"
       @add="add"
+      @showDialogS="showDialogS"
+      @showDialogG="showDialogG"
       ref="rightContent"
     >
       <template #btnGroup="scope">
         <span class="hbyp" @click="toInfor(scope.scope)">修改</span>
       </template>
     </right-content>
+    <el-dialog title="关联案件" :visible.sync="dialogS" width="55%">
+      <right-content
+        :pageBs="bshglajS.pageBs"
+        :cxFormData="bshglajS.cxFormData"
+        :cxQueryField="bshglajS.cxQueryField"
+        :cxDefaultFormThead="bshglajS.cxDefaultFormThead"
+        :cxUrl="bshglajS.cxUrl"
+        @toInforDa="toInforDa"
+        ref="rightContentGl"
+      ></right-content>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogS = false">关闭</el-button>
+      </span>
+    </el-dialog>
+
+    <el-dialog title="关联案件" :visible.sync="dialogG" width="55%">
+      <right-content
+        :pageBs="bshglajG.pageBs"
+        :cxFormData="bshglajG.cxFormData"
+        :cxQueryField="bshglajG.cxQueryField"
+        :cxDefaultFormThead="bshglajG.cxDefaultFormThead"
+        :cxUrl="bshglajG.cxUrl"
+        @toInforDa="toInforDa"
+        ref="rightContentGl"
+      ></right-content>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogG = false">关闭</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
@@ -26,6 +57,82 @@ export default {
   },
   data() {
     return {
+      bshglajS: {
+        pageBs: "qyeryrlqbxsGl",
+        cxFormData: {
+          page: 1,
+          limit: 5,
+          rlqbxxzjbh: "",
+        },
+        cxQueryField: [],
+        cxDefaultFormThead: [
+          {
+            label: "案事件编号",
+            prop: "asjbh",
+            toInforDa: true,
+          },
+          {
+            label: "案件名称",
+            prop: "ajmc",
+          },
+          {
+            label: "案件类别",
+            prop: "ajlbdm",
+          },
+          {
+            label: "立案日期",
+            prop: "larq",
+          },
+          {
+            label: "立案单位",
+            prop: "ladwGajgmc",
+          },
+          {
+            label: "简要案情",
+            prop: "jyaq",
+          },
+        ],
+        cxUrl: "/rlqb/getAjListByS",
+      },
+      bshglajG: {
+        pageBs: "qyeryrlqbxsGl",
+        cxFormData: {
+          page: 1,
+          limit: 5,
+          rlqbxxzjbh: "",
+        },
+        cxQueryField: [],
+        cxDefaultFormThead: [
+          {
+            label: "案事件编号",
+            prop: "asjbh",
+            toInforDa: true,
+          },
+          {
+            label: "案件名称",
+            prop: "ajmc",
+          },
+          {
+            label: "案件类别",
+            prop: "ajlbdm",
+          },
+          {
+            label: "立案日期",
+            prop: "larq",
+          },
+          {
+            label: "立案单位",
+            prop: "ladwGajgmc",
+          },
+          {
+            label: "简要案情",
+            prop: "jyaq",
+          },
+        ],
+        cxUrl: "/rlqb/getAjListByQg",
+      },
+      dialogS: false,
+      dialogG: false,
       header: "线索核办",
       pageBs: "queryXshbs",
       cxFormData: {
@@ -173,6 +280,11 @@ export default {
           prop: "xxdjdwGajgmc",
           width: "200",
         },
+        {
+          label: "关联案件",
+          prop: "sfyaj",
+          isShowDialog: true,
+        },
       ],
       cxUrl: "/xshb/getXsList",
       Menu: [
@@ -201,6 +313,31 @@ export default {
     // this.$store.commit("user/SET_Header", this.header);
   },
   methods: {
+    toInforDa(scope) {
+      debugger;
+      // http://39.99.155.173:8003/doLogin?zjhm=142302198901012417
+      // http://39.99.155.173:8003/queryAjdaxxs?asjbh=A4419615400002020086063
+      var userInfo = JSON.parse(sessionStorage.getItem("userInfo"));
+      var idcard = userInfo.identitycard;
+      let path = `${base.alyIP10}/doLogin?zjhm=${idcard}`;
+      window.open(path, "_blank");
+      let paths = `${base.alyIP10}/queryAjdaxxs?asjbh=${scope.asjbh}`;
+      window.open(paths, "_blank");
+    },
+    showDialogS(data) {
+      this.dialogS = true;
+      console.log(data);
+      this.bshglajS.cxFormData.rlqbxxzjbh = data.row.xxzjbh;
+      // this.bshglajS.cxUrl = data.cxUrl;
+      // this.$refs.rightContentGl.doQuery("yes");
+    },
+    showDialogG(data) {
+      this.dialogG = true;
+      console.log(data);
+      this.bshglajG.cxFormData.rlqbxxzjbh = data.row.xxzjbh;
+      // this.bshglajG.cxUrl = data.cxUrl;
+      // this.$refs.rightContentGl.doQuery("yes");
+    },
     add() {
       this.$router.pushToTab({
         path: "/djgzs",