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

src/pages/details/otherLawsDetails/index.vue

@@ -337,7 +337,6 @@
             type="primary"
             class="common-button-primary"
             @click="openRelatedTermsDrawer"
-            v-btn-permission="'8PXLAB2CMQG5QNAGKKNB'"
         >关联条款</el-button>
         <!--<el-button class="common-button-default delete-button" icon="delete" @click="batchDeleteItems(2)" v-btn-permission="'VVETPP4CFK'">删除</el-button>-->
       </div>

src/pages/details/otherStandardDetails/index.vue

@@ -789,7 +789,7 @@
           type="primary"
           class="common-button-primary"
           @click="openRelatedTermsDrawer"
-          v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'"
+          v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'bd291146ac1e42c48968c5142ae55375' : '960a97045a6e47b0b8e33ebc347e5fd9'"
         >关联条款
         </el-button>
         <el-button

src/pages/details/otherStandardExternalDetails/index.vue

@@ -823,7 +823,7 @@
           type="primary"
           class="common-button-primary"
           @click="openRelatedTermsDrawer"
-          v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'"
+          v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'bd291146ac1e42c48968c5142ae55375' : '960a97045a6e47b0b8e33ebc347e5fd9'"
         >关联条款
         </el-button>
         <el-button

src/pages/details/process/ruku/index.vue

@@ -357,7 +357,7 @@
             type="primary"
             class="common-button-primary"
             @click="openRelatedTermsDrawer"
-            v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '28CUM4KPUXDMCCMTFUQA' : 'R62HAB3QEMD27BZ7XHCM'"
+            v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'bd291146ac1e42c48968c5142ae55375' : '960a97045a6e47b0b8e33ebc347e5fd9'"
         >关联条款</el-button>
       </div>
       <div class="content">

src/pages/localTool/standAutoSplit/index.vue

@@ -191,12 +191,14 @@
             height="100%"
             border
             :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
-            @selection-change="selectStandChange"
+            @selection-change="standSelectChangeByStandTab"
         >
-          <el-table-column
+          <el-table-column label="" width="55">
-              type="selection"
+            <template slot-scope="scope">
-              width="55"
+              <el-radio :label="scope.$index+1" v-model="radio" @change.native="standSelectChangeByStandTab(scope.row)">
-              align="center">
+                &nbsp;
+              </el-radio>
+            </template>
           </el-table-column>
           <el-table-column
               prop="sarType"
@@ -683,6 +685,7 @@ export default {
       speedModal: false,
       percent: 0,
       ifUp: true,
+      radio: null,
       standCommonlySearch: {},
       dataLoading: false,
       loading: false,
@@ -1136,6 +1139,19 @@ export default {
         this.selectedSplitStandList.push(data[i])
       }
     },
+    standSelectChangeByStandTab (data) {
+      this.selectedSplitStandList = []
+      let checkId = data.standId+"_"+data.attId
+      for (let i = 0; i < this.addSpiltStandList.length; i++) {
+        let dataId = this.addSpiltStandList[i].standId+"_"+this.addSpiltStandList[i].attId
+        if (checkId === dataId) {
+          this.addSpiltStandList[i].checkBox = true
+          this.selectedSplitStandList.push(this.addSpiltStandList[i])
+        }
+      }
+    },
+
+
     searchStandList () {
       this.splitInfoPage = 1
       this.getSarFileSplitInfoEOPage()

src/pages/phone/domesticDetails.vue

@@ -533,7 +533,7 @@
       type="primary"
       class="common-button-primary"
       @click="openRelatedTermsDrawer"
-      v-btn-permission="$route.query.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'"
+      v-btn-permission="$route.query.pageType === 'INLAND_STAND' ? 'bd291146ac1e42c48968c5142ae55375' : '960a97045a6e47b0b8e33ebc347e5fd9'"
     >关联条款
     </el-button>
     <el-button