Merge remote-tracking branch 'origin/develop' into develop

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

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;">

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;">

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;">

src/pages/searchCenter/pages/standardSearch.vue

@@ -987,9 +987,13 @@
                         resultdata['NYLXCLASS'] = NYLXCLASS
                         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++) {
@@ -1007,19 +1011,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)
+
                                 }
                             }
                         }