修改串并研判样式

src/components/bshChildrenQuery.vue

@@ -414,6 +414,11 @@
                 {{ scope.row[columnTitle.prop] }}
               </div>
               <div
+                  v-else-if="columnTitle.prop == 'ryXm(rySfhm)'"
+              >
+                {{ scope.row.ryXm }}({{scope.row.rySfhm}})
+              </div>
+              <div
                   v-else-if="columnTitle.prop == 'xszmc'"
                   style="
                   cursor: pointer;
@@ -651,7 +656,7 @@
             xszajbh: row.xszajbh,
             djsj: row.djsj,
             bshlx: row.bshlx,
-            cbxgfwbzh: row.cbxgfwbzh,
+            cbxgfwbzh: self.pageBs == "bshcb" ? row.cbxgfwbzh:row.rySfzh,
             cbxsypCbajs: row.cbxsypCbajs,
             type: pageBs,
           }

src/components/zdryGl/ptCxForm_components.vue

@@ -1175,20 +1175,7 @@
             <div v-else-if="columnTitle.prop == 'bgzt'">
               {{ scope.row[columnTitle.prop] == "1" ? "已生效" : "未生效" }}
             </div>
-            <div
-              v-else-if="
-                columnTitle.prop == 'zjclmc' || columnTitle.prop == 'zjwzmc'
-              "
-            >
-              <el-tag
-                style="cursor: pointer"
-                v-for="(s, k) in getSplit(scope.row[columnTitle.prop])"
-                :key="k"
-                effect="dark"
-              >
-                {{ s }}
-              </el-tag>
-            </div>
+            
             <div v-else-if="columnTitle.multi == true">
               电话号码：{{ scope.row.mobile }} 银行卡号：{{
                 scope.row.yhkh
@@ -1663,39 +1650,6 @@
               style="margin: 0 5px"
               ><img src="./../../assets/img/sheng.png"
             /></span>
-            <span
-              @click="examine(scope)"
-              class="edit"
-              style="margin-right: 16px"
-              v-if="pageBs == 'xywspdzczl' || pageBs == 'xywspdfkxx'"
-              >审批</span
-            >
-            <span
-              @click="examine(scope)"
-              class="edit"
-              style="margin-right: 16px"
-              v-if="
-                (pageBs == 'wsqfbdzczl' || pageBs == 'wfqdzczl') &&
-                (scope.row.spsftg == '未通过' || scope.row.spsftg == '草稿')
-              "
-              >提请审批</span
-            >
-
-            <span
-              v-if="pageBs == 'rwbdjs' && scope.row.rwztdm == '01'"
-              @click="signFor(scope)"
-              class="edit"
-              style="margin-right: 16px"
-              >签收</span
-            >
-            <span
-              v-if="pageBs == 'rwbdjs'"
-              @click="addFeedBack(scope)"
-              class="edit"
-              style="margin-right: 16px"
-              >新增反馈信息</span
-            >
-            
           </template>
         </el-table-column>
         <el-table-column
@@ -2050,14 +2004,7 @@
             <div>{{ item[subitem.prop] }}</div>
           </div>
         </div>
-        <div v-if="pageBs == 'queryXxtkZdry'" style="float: right">
-          <el-button
-            @click="xxtkRybqdjth(item.xxzjbh)"
-            type="primary"
-            size="mini"
-            >登记为团伙
-          </el-button>
-        </div>
+        
       </div>
       <div
         v-if="bqShuju.length == 0"
@@ -3066,9 +3013,6 @@ export default {
     showDialogDangerIndex(row) {
       this.$emit("showDialogDangerIndex", row);
     },
-    getSplit(dt) {
-      return dt.split(",");
-    },
     rowExpand(row, expandedRows) {
       // debugger;
       // this.$emit("rowExpand", row);
@@ -3178,15 +3122,6 @@ export default {
         self.$message.error("请选择");
       }
     },
-    toXxdkInsert(scope, route) {
-      this.$router.pushToTab({
-        path: `/${route}`,
-        query: {
-          glxxXxzjbh: scope.row.xzgzrybh,
-        },
-      });
-      console.log(scope.row.xzgzrybh, route);
-    },
     handleSwitch(value, item) {
       this.$emit("handleSwitch", { value, item });
     },
@@ -3205,66 +3140,11 @@ export default {
     sendMessageTo(scope) {
       this.$emit("sendMessageTo", scope.row);
     },
-    xxtkRybqdjth(xxzjbh) {
-      // this.$confirm("此操作将登记为团伙, 是否继续?", "提示", {
-      //   confirmButtonText: "确定",
-      //   cancelButtonText: "取消",
-      //   type: "warning",
-      // })
-      //     .then(() => {
-      //       console.log("sfz---"+zjhm);
-      //       // deleteGzry({
-      //       //   xzgzrybh: scope.row.xzgzrybh,
-      //       // }).then((res) => {
-      //       //   if (res.success && res.code == 200) {
-      //       //     this.$message({
-      //       //       type: "success",
-      //       //       message: "删除成功",
-      //       //     });
-      //       //     this.$refs.rightContent.doQuery("yes");
-      //       //   }
-      //       // });
-      //     })
-      //     .catch(() => {
-      //       this.$message({
-      //         type: "info",
-      //         message: "已取消删除",
-      //       });
-      //     });
-      this.$router.pushToTab({
-        path: "/addShseth",
-        query: {
-          thbh: xxzjbh,
-        },
-      });
-    },
+    
     returnBtn() {
       this.$emit("returnBtn");
     },
-    examine(scope) {
-      this.$emit("examine", scope);
-    },
-    signFor(scope) {
-      this.$emit("signFor", scope.row.xxzjbh);
-    },
-    addFeedBack(scope) {
-      this.$emit("addFeedBack", scope.row.xxzjbh);
-    },
-    newlyLK(scope) {
-      this.$emit("newlyLK", scope.row.xzgzrybh);
-    },
-    revokeLK(scope) {
-      this.$emit("revokeLK", scope.row.xzgzrybh);
-    },
-    newlyLKG(scope) {
-      this.$emit("newlyLKG", scope.row.xxzjbh);
-    },
-    revokeLKG(scope) {
-      this.$emit("revokeLKG", scope.row.xxzjbh);
-    },
-    stydyJudge(scope) {
-      this.$emit("stydyJudge", scope.row);
-    },
+    
     guoDetail(scope, type) {
       if (type == "guo") {
         this.$router.pushToTab({

src/views/cbyp/dnabzcbxs.vue

@@ -172,6 +172,11 @@ export default {
           label: "已破案数",
           prop: "paCount",
         },
+        {
+          label: "DNA人员",
+          prop: "ryXm(rySfhm)",
+          width: "250",
+        },
         // {
         //   label: "嫌疑人数",
         //   prop: "xyrCount",
@@ -191,7 +196,7 @@ export default {
       ],
       cxUrl: "/api/cbxsz/toQueryXszxx",
       // updateCbxszUrl: "/api/cbxsz/updateCbxsz",
-      // childrenUrl: "/api/cbxsz/listCbxszGlAsjxx",
+      childrenUrl: "/api/cbxsz/listCbxszGlAsjxx",
     };
   },
   methods: {},