From fb31d5b20c8bac99b2e3e9cc1e69be30734fdf00 Mon Sep 17 00:00:00 2001
From: zhangjun <879913833@qq.com>
Date: Thu, 29 Sep 2022 20:43:24 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E6=B5=B7=E5=A4=96=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=EF=BC=8C=E6=89=8B=E5=8A=A8=E6=9F=A5=E6=89=BE=EF=BC=8C=E8=B6=85?=
 =?UTF-8?q?=E9=93=BE=E6=8E=A5=E6=89=93=E4=B8=8D=E5=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../InputForStandardsForForeign.vue           | 29 +++++++++++-----
 .../searchCenter/pages/standardSearch.vue     | 33 ++++++++++++++-----
 2 files changed, 46 insertions(+), 16 deletions(-)

diff --git a/src/components/CustomFormComponents/InputForStandardsForForeign.vue b/src/components/CustomFormComponents/InputForStandardsForForeign.vue
index 23b43b317..189e44729 100644
--- a/src/components/CustomFormComponents/InputForStandardsForForeign.vue
+++ b/src/components/CustomFormComponents/InputForStandardsForForeign.vue
@@ -335,14 +335,27 @@ export default {
     },
     // 点击查看
     handlePreview (item) {
-      let routeUrl = this.$router.resolve({
-        name: 'OtherBussStandardDetails',
-        params: {
-          id: item.id,
-          pageType: 'BUSINESS_STAND'
-        }
-      })
-      window.open(routeUrl.href, '_blank')
+      console.log(item)
+      if (item.standType !== 'FOREIGN') {
+        let routeUrl = this.$router.resolve({
+          name: 'OtherBussStandardDetails',
+          params: {
+            id: item.id,
+            pageType: 'BUSINESS_STAND'
+          }
+        })
+        window.open(routeUrl.href, '_blank')
+      }else {
+
+        let routeUrl = this.$router.resolve({
+          name: 'OtherStandardDetails',
+          params: {
+            id: item.id,
+            pageType: 'FOREIGN_STAND'
+          }
+        })
+        window.open(routeUrl.href, '_blank')
+      }
     },
     getResetLawsNumRow() {
       this.replacePage = 1
diff --git a/src/pages/searchCenter/pages/standardSearch.vue b/src/pages/searchCenter/pages/standardSearch.vue
index 4d9b9d378..948da550b 100644
--- a/src/pages/searchCenter/pages/standardSearch.vue
+++ b/src/pages/searchCenter/pages/standardSearch.vue
@@ -981,9 +981,13 @@
                         let resultdata = data.list[0]['groupdata']
                         for (let i = 0; i < seniortype.length; i++) {
                             let nowdata = [{}]
+
                             if (typeof this.searchOptions[seniortype[i]] !== 'undefined') {
                                 nowdata = this.searchOptions[seniortype[i]].options
                             }
+                            if (typeof this.searchOptions['NYLXCLASS'] !== 'undefined' && seniortype[i] === 'NYLX') {
+                                nowdata = this.searchOptions['NYLXCLASS'].options
+                            }
                             let renameType
                             if (seniortype[i] === 'selectIndex') {
                                 for (let j = 0; j < nowdata.length; j++) {
@@ -1001,19 +1005,32 @@
                                     renameType = seniortype[i]
                                 }
                                 let resultsubdata = resultdata[renameType] || {}
-                                console.log(resultsubdata)
+                                console.log('sssss',resultsubdata)
                                 let countAll = 0
                                 if (nowdata) {
-                                    console.log(nowdata)
-                                    for (let ji = 0; ji < nowdata.length; ji++) {
-                                        if (resultsubdata[nowdata[ji].value] === undefined) {
-                                            nowdata[ji].number = 0
-                                        } else {
-                                            nowdata[ji].number = resultsubdata[nowdata[ji].value]
-                                            countAll += Number(resultsubdata[nowdata[ji].value])
+                                    if (renameType === 'NYLX'){
+                                        for (let ji = 0; ji < nowdata.length; ji++) {
+                                            if (resultsubdata[nowdata[ji].label] === undefined) {
+                                                nowdata[ji].number = 0
+                                            } else {
+                                                nowdata[ji].number = resultsubdata[nowdata[ji].label]
+                                                countAll += Number(resultsubdata[nowdata[ji].label])
+                                            }
+                                            console.log('alllllllllllllllllllllllll' + countAll)
+                                        }
+                                    }else {
+                                        for (let ji = 0; ji < nowdata.length; ji++) {
+                                            if (resultsubdata[nowdata[ji].label] === undefined) {
+                                                nowdata[ji].number = 0
+                                            } else {
+                                                nowdata[ji].number = resultsubdata[nowdata[ji].value]
+                                                countAll += Number(resultsubdata[nowdata[ji].value])
+                                            }
                                         }
                                     }
                                     nowdata[0].number = countAll
+                                    console.log('aaaaa',nowdata)
+
                                 }
                             }
                         }

From 977d9aa7d29a41b9e5421b562f45815e1f5469a5 Mon Sep 17 00:00:00 2001
From: zhuangxinwei <1152856986@qq.com>
Date: Fri, 30 Sep 2022 10:53:59 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E8=83=BD=E6=BA=90=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B8=BA=E7=A9=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/searchCenter/pages/standardSearch.vue | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/pages/searchCenter/pages/standardSearch.vue b/src/pages/searchCenter/pages/standardSearch.vue
index 4d9b9d378..b51b56f92 100644
--- a/src/pages/searchCenter/pages/standardSearch.vue
+++ b/src/pages/searchCenter/pages/standardSearch.vue
@@ -979,6 +979,12 @@
                     if (data.list && data.list.length > 0) {
                         // 获取数值
                         let resultdata = data.list[0]['groupdata']
+                        let NYLXCLASS = resultdata['NYLXCLASS'] || {}
+                        let NYLX = resultdata['NYLX'] || {}
+                        if (NYLX && NYLXCLASS !== {}) {
+                          NYLXCLASS = NYLX
+                        }
+                        resultdata['NYLXCLASS'] = NYLXCLASS
                         for (let i = 0; i < seniortype.length; i++) {
                             let nowdata = [{}]
                             if (typeof this.searchOptions[seniortype[i]] !== 'undefined') {

From 08bc80ecef1d2fb17a7024ff1a24a041d6b54285 Mon Sep 17 00:00:00 2001
From: zhuangxinwei <1152856986@qq.com>
Date: Fri, 30 Sep 2022 11:06:43 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E8=83=BD=E6=BA=90=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B8=BA=E7=A9=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/searchCenter/pages/standardSearch.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/searchCenter/pages/standardSearch.vue b/src/pages/searchCenter/pages/standardSearch.vue
index b51b56f92..02b75580f 100644
--- a/src/pages/searchCenter/pages/standardSearch.vue
+++ b/src/pages/searchCenter/pages/standardSearch.vue
@@ -981,7 +981,7 @@
                         let resultdata = data.list[0]['groupdata']
                         let NYLXCLASS = resultdata['NYLXCLASS'] || {}
                         let NYLX = resultdata['NYLX'] || {}
-                        if (NYLX && NYLXCLASS !== {}) {
+                        if (Object.keys(NYLX).length > 0 && Object.keys(NYLXCLASS).length === 0) {
                           NYLXCLASS = NYLX
                         }
                         resultdata['NYLXCLASS'] = NYLXCLASS

From ff7e9905d97e5ad7b84c7b27614d597b3c66dcbd Mon Sep 17 00:00:00 2001
From: zhuangxinwei <1152856986@qq.com>
Date: Fri, 30 Sep 2022 13:23:45 +0800
Subject: [PATCH 4/5] =?UTF-8?q?tabs=E5=8A=A0tooltip?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/processCenter/pages/phone/bzpg/step7.vue | 3 +++
 src/pages/processCenter/pages/phone/bzpg/step8.vue | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/src/pages/processCenter/pages/phone/bzpg/step7.vue b/src/pages/processCenter/pages/phone/bzpg/step7.vue
index f55215802..a9c2e1d93 100644
--- a/src/pages/processCenter/pages/phone/bzpg/step7.vue
+++ b/src/pages/processCenter/pages/phone/bzpg/step7.vue
@@ -54,6 +54,9 @@
           :label="item"
           :value="item"
           :name="item">
+          <el-tooltip slot="label" effect="dark" :content="item" placement="bottom-start">
+            <span>{{ item }}</span>
+          </el-tooltip>
         </el-tab-pane>
       </el-tabs>
       <el-table
diff --git a/src/pages/processCenter/pages/phone/bzpg/step8.vue b/src/pages/processCenter/pages/phone/bzpg/step8.vue
index e41d4d7f5..d97a3104a 100644
--- a/src/pages/processCenter/pages/phone/bzpg/step8.vue
+++ b/src/pages/processCenter/pages/phone/bzpg/step8.vue
@@ -54,6 +54,9 @@
           :label="item"
           :value="item"
           :name="item">
+          <el-tooltip slot="label" effect="dark" :content="item" placement="bottom-start">
+            <span>{{ item }}</span>
+          </el-tooltip>
         </el-tab-pane>
       </el-tabs>
       <el-table

From fa85419f8452a9060eb0fca174f14fca9369941b Mon Sep 17 00:00:00 2001
From: zhangjun <879913833@qq.com>
Date: Fri, 30 Sep 2022 13:25:32 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E3=80=90=E7=A7=BB=E5=8A=A8=E7=AB=AF?=
 =?UTF-8?q?=E3=80=91=E6=A0=87=E5=87=86=E8=A7=A3=E8=AF=BB=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=EF=BC=8C=E5=AE=A1=E6=A0=B8=E6=AD=A5=E9=AA=A4/=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=91=98=E6=AD=A5=E9=AA=A4/=E6=89=B9=E5=87=86?=
 =?UTF-8?q?=E6=AD=A5=E9=AA=A4=EF=BC=8C=E6=9F=A5=E7=9C=8B=E6=AF=94=E5=AF=B9?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=E7=9A=84ui=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/processCenter/pages/phone/bzjd/step4.vue | 3 ++-
 src/pages/processCenter/pages/phone/bzjd/step5.vue | 3 ++-
 src/pages/processCenter/pages/phone/bzjd/step6.vue | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/pages/processCenter/pages/phone/bzjd/step4.vue b/src/pages/processCenter/pages/phone/bzjd/step4.vue
index f368802c2..562cc145e 100644
--- a/src/pages/processCenter/pages/phone/bzjd/step4.vue
+++ b/src/pages/processCenter/pages/phone/bzjd/step4.vue
@@ -245,7 +245,8 @@
       <el-dialog
         title="查看比对内容"
         :visible.sync="BDmodel"
-        size="1100px">
+        size="1100px"
+        width="100%">
         <div>比对条款: {{ itemsNum }}</div>
         <div>相似度:{{ similarityDegree }}</div>
         <div style="height: 600px;overflow: auto;display: flex;">
diff --git a/src/pages/processCenter/pages/phone/bzjd/step5.vue b/src/pages/processCenter/pages/phone/bzjd/step5.vue
index 0cadf86ad..7bcf00a5c 100644
--- a/src/pages/processCenter/pages/phone/bzjd/step5.vue
+++ b/src/pages/processCenter/pages/phone/bzjd/step5.vue
@@ -223,7 +223,8 @@
       <el-dialog
         title="查看比对内容"
         :visible.sync="BDmodel"
-        size="1100px">
+        size="1100px"
+        width="100%">
         <div>比对条款: {{ itemsNum }}</div>
         <div>相似度:{{ similarityDegree }}</div>
         <div style="height: 600px;overflow: auto;display: flex;">
diff --git a/src/pages/processCenter/pages/phone/bzjd/step6.vue b/src/pages/processCenter/pages/phone/bzjd/step6.vue
index 95821e259..f47fb27f4 100644
--- a/src/pages/processCenter/pages/phone/bzjd/step6.vue
+++ b/src/pages/processCenter/pages/phone/bzjd/step6.vue
@@ -241,7 +241,8 @@
       <el-dialog
         title="查看比对内容"
         :visible.sync="BDmodel"
-        size="1100px">
+        size="1100px"
+        width="100%">
         <div>比对条款: {{ itemsNum }}</div>
         <div>相似度:{{ similarityDegree }}</div>
         <div style="height: 600px;overflow: auto;display: flex;">