Merge branch 'dev'

@@ -148,6 +148,7 @@
       clmlInitList (type) {
         // 1：列表初始化  2：新增材料
         return new Promise((resolve) => {
+          console.log(this.formData, 'this.formData');
           repairInitClml(this.formData).then((res) => {
             if (res.code == 200) {
               resolve(res.code);

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2024-01-18 13:35:52
+ * @LastEditTime: 2024-01-19 15:46:35
 -->
 <template>
   <div class="tableBox">
@@ -254,30 +254,28 @@
       },
       // 选择业务号
       handleSelectYwh (row, ywh) {
+        let that = this
         let sjlx = row.sjlx,
           bsmQlxx = row.bsmQlxx
-        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
+            // that.$popup('材料信息', 'registerBook/components/clxx/index', {
+            //   width: '60%',
+            //   formData: data
+            // })
+            const { href } = Router.resolve('/workFrameView?bsmSlsq=' + data.bsmSlsq + '&bsmBusiness=' + data.bsmBusiness)
+            window.open(href, `urlname${new Date().getTime()}`)
           })
-        })
-        // 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
-        //     })
-        //   })
-        // }
+        } else {
+          getBlParamsByYwh(ywh, bsmQlxx).then(res => {
+            let data = res.result
+            this.$popup('材料信息', 'registerBook/components/clxx/index', {
+              width: '60%',
+              formData: data
+            })
+          })
+        }
       }
     }
   }

 <!--
  * @Description:
  * @Autor: miaofang
- * @LastEditTime: 2024-01-18 13:36:24
+ * @LastEditTime: 2024-01-19 15:46:23
 -->
 <template>
   <div class="djxxTable">
@@ -301,30 +301,28 @@
       },
       // 选择业务号
       handleSelectYwh (row, ywh) {
+        let that = this
         let sjlx = row.sjlx,
           bsmQlxx = row.bsmQlxx
-        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
+            // that.$popup('材料信息', 'registerBook/components/clxx/index', {
+            //   width: '60%',
+            //   formData: data
+            // })
+            const { href } = Router.resolve('/workFrameView?bsmSlsq=' + data.bsmSlsq + '&bsmBusiness=' + data.bsmBusiness)
+            window.open(href, `urlname${new Date().getTime()}`)
           })
-        })
-        // 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
-        //     })
-        //   })
-        // }
+        } else {
+          getBlParamsByYwh(ywh, bsmQlxx).then(res => {
+            let data = res.result
+            this.$popup('材料信息', 'registerBook/components/clxx/index', {
+              width: '60%',
+              formData: data
+            })
+          })
+        }
       }
     }
   };