Merge branch 'dev'

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-10-12 09:59:39
+ * @LastEditTime: 2023-10-19 16:28:06
 -->
 <template>
   <div class="clxx">

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-12 13:26:13
+ * @LastEditTime: 2023-10-19 16:23:02
 -->
 <template>
   <div class="from-clues">
@@ -56,19 +56,15 @@
         shyj: "",
       };
     },
-
-    watch: {
-      yjsqOptions: {
-        handler (val) {
-          this.add(val.opinion);
-        },
-        deep: true,
-        immediate: true,
-      },
-    },
-    mounted () {
-      //  this.queryForm= this.queryForm.obj
-    },
+    // watch: {
+    //   yjsqOptions: {
+    //     handler (val) {
+    //       this.add(val.opinion);
+    //     },
+    //     deep: true,
+    //     immediate: true,
+    //   },
+    // },
     methods: {
       /**
        * @description: submitForm
@@ -114,16 +110,11 @@
           }
         });
       },
-      /**
-       * @description: add
-       * @param {*} val
-       * @author: renchao
-       */
-      add (val) {
-        if (val != "") {
-          this.shyj;
-        }
-      },
+      // add (val) {
+      //   if (val != "") {
+      //     this.shyj;
+      //   }
+      // },
 
       /**
        * @description: closeDialog

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-22 09:47:08
+ * @LastEditTime: 2023-10-19 16:12:50
 -->
 <template>
   <div class="tableBox">
@@ -72,7 +72,7 @@
                 {{ getQsztName(row[item.prop]) }}
               </span>
               <el-link v-if="['zxywh', 'ywh'].includes(item.prop)"
-                @click="handleSelectYwh(tableData, row[item.prop])"
+                @click="handleSelectYwh(row)"
                 type="primary">{{ row[item.prop] }}</el-link>
               <span v-if="!['qszt','ywh', 'zxywh' ].includes(item.prop)">{{ row[item.prop] }}</span>
             </p>
@@ -217,24 +217,19 @@
           })
       },
       // 选择业务号
-      handleSelectYwh (data, ywh) {
-        let sjlx = '',
-          bsmQlxx = ''
-        data.forEach(item => {
-          if (item.ywh == ywh) {
-            sjlx = item.sjlx
-            bsmQlxx = item.bsmQlxx
-          }
-        })
+      handleSelectYwh (row) {
+        let sjlx = row.sjlx,
+          bsmQlxx = row.bsmQlxx
         if (sjlx == '系统数据') {
-          getXtParamsByYwh(ywh).then(res => {
+          getXtParamsByYwh(row.ywh).then(res => {
             let data = res.result
             const { href } = Router.resolve('/workFrameView?bsmSlsq=' + data.bsmSlsq + '&bsmBusiness=' + data.bsmBusiness)
             window.open(href, `urlname${data.bsmSlsq}`)
           })
         } else {
-          getBlParamsByYwh(ywh, bsmQlxx).then(res => {
+          getBlParamsByYwh(row.ywh, bsmQlxx).then(res => {
             let data = res.result
+            console.log(data, 'datadatadatadata');
             this.$popup('材料信息', 'registerBook/components/clxx/index', {
               width: '60%',
               formData: data

 <!--
  * @Description:
  * @Autor: miaofang
- * @LastEditTime: 2023-10-09 10:35:56
+ * @LastEditTime: 2023-10-19 16:13:55
 -->
 <template>
   <div class="djxxTable">
@@ -73,7 +73,7 @@
                 {{ getQsztName(row[item.prop]) }}
               </span>
               <el-link v-if=" ['zxywh', 'ywh'].includes(item.prop)"
-                @click="handleSelectYwh(tableData, row[item.prop])"
+                @click="handleSelectYwh(row)"
                 type="primary">{{ row[item.prop] }}</el-link>
               <el-tooltip
                 v-if="['djyy', 'fj'].includes(item.prop)"
@@ -280,23 +280,17 @@
           });
       },
       // 选择业务号
-      handleSelectYwh (data, ywh) {
-        let sjlx = '',
-          bsmQlxx = ''
-        data.forEach(item => {
-          if (item.ywh == ywh) {
-            sjlx = item.sjlx
-            bsmQlxx = item.bsmQlxx
-          }
-        })
+      handleSelectYwh (row) {
+        let sjlx = row.sjlx,
+          bsmQlxx = row.bsmQlxx
         if (sjlx == '系统数据') {
-          getXtParamsByYwh(ywh).then(res => {
+          getXtParamsByYwh(row.ywh).then(res => {
             let data = res.result
-            const { href } = Router.resolve('/workFrameView?bsmSlsq=' + data.bsmSlsq + '&bsmBusiness=' + data.bsmBusiness + '&type=jdcx')
+            const { href } = Router.resolve('/workFrameView?bsmSlsq=' + data.bsmSlsq + '&bsmBusiness=' + data.bsmBusiness)
             window.open(href, `urlname${data.bsmSlsq}`)
           })
         } else {
-          getBlParamsByYwh(ywh, bsmQlxx).then(res => {
+          getBlParamsByYwh(row.ywh, bsmQlxx).then(res => {
             let data = res.result
             this.$popup('材料信息', 'registerBook/components/clxx/index', {
               width: '60%',