Merge branch 'dev'

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2024-01-18 13:22:31
+ * @LastEditTime: 2024-01-18 13:35:52
 -->
 <template>
   <div class="tableBox">
@@ -256,21 +256,28 @@
       handleSelectYwh (row, ywh) {
         let sjlx = row.sjlx,
           bsmQlxx = row.bsmQlxx
-        if (sjlx == '系统数据') {
-          getXtParamsByYwh(ywh).then(res => {
-            let data = res.result
-            const { href } = Router.resolve('/workFrameView?bsmSlsq=' + data.bsmSlsq + '&bsmBusiness=' + data.bsmBusiness)
-            window.open(href, `urlname${new Date().getTime()}`)
+        getBlParamsByYwh(ywh, bsmQlxx).then(res => {
+          let data = res.result
+          this.$popup('材料信息', 'registerBook/components/clxx/index', {
+            width: '60%',
+            formData: data
           })
-        } else {
-          getBlParamsByYwh(ywh, bsmQlxx).then(res => {
-            let data = res.result
-            this.$popup('材料信息', 'registerBook/components/clxx/index', {
-              width: '60%',
-              formData: data
-            })
-          })
-        }
+        })
+        // if (sjlx == '系统数据') {
+        //   getXtParamsByYwh(ywh).then(res => {
+        //     let data = res.result
+        //     const { href } = Router.resolve('/workFrameView?bsmSlsq=' + data.bsmSlsq + '&bsmBusiness=' + data.bsmBusiness)
+        //     window.open(href, `urlname${new Date().getTime()}`)
+        //   })
+        // } else {
+        //   getBlParamsByYwh(ywh, bsmQlxx).then(res => {
+        //     let data = res.result
+        //     this.$popup('材料信息', 'registerBook/components/clxx/index', {
+        //       width: '60%',
+        //       formData: data
+        //     })
+        //   })
+        // }
       }
     }
   }

 <!--
  * @Description:
  * @Autor: miaofang
- * @LastEditTime: 2023-11-02 13:39:22
+ * @LastEditTime: 2024-01-18 13:36:24
 -->
 <template>
   <div class="djxxTable">
@@ -303,21 +303,28 @@
       handleSelectYwh (row, ywh) {
         let sjlx = row.sjlx,
           bsmQlxx = row.bsmQlxx
-        if (sjlx == '系统数据') {
-          getXtParamsByYwh(ywh).then(res => {
-            let data = res.result
-            const { href } = Router.resolve('/workFrameView?bsmSlsq=' + data.bsmSlsq + '&bsmBusiness=' + data.bsmBusiness)
-            window.open(href, `urlname${new Date().getTime()}`)
+        getBlParamsByYwh(ywh, bsmQlxx).then(res => {
+          let data = res.result
+          this.$popup('材料信息', 'registerBook/components/clxx/index', {
+            width: '60%',
+            formData: data
           })
-        } else {
-          getBlParamsByYwh(ywh, bsmQlxx).then(res => {
-            let data = res.result
-            this.$popup('材料信息', 'registerBook/components/clxx/index', {
-              width: '60%',
-              formData: data
-            })
-          })
-        }
+        })
+        // if (sjlx == '系统数据') {
+        //   getXtParamsByYwh(ywh).then(res => {
+        //     let data = res.result
+        //     const { href } = Router.resolve('/workFrameView?bsmSlsq=' + data.bsmSlsq + '&bsmBusiness=' + data.bsmBusiness)
+        //     window.open(href, `urlname${new Date().getTime()}`)
+        //   })
+        // } else {
+        //   getBlParamsByYwh(ywh, bsmQlxx).then(res => {
+        //     let data = res.result
+        //     this.$popup('材料信息', 'registerBook/components/clxx/index', {
+        //       width: '60%',
+        //       formData: data
+        //     })
+        //   })
+        // }
       }
     }
   };