Merge branch 'develop' into 'test'

Develop

See merge request LAWS/laws-system-front-FOTON!158

src/pages/details/otherStandardDetails/components/RelatedTermsSelect.vue

@@ -190,9 +190,9 @@ export default {
         page: this.pageNo,
         pageSize: this.$store.getters.userInfo.configContent,
         standId: this.standId,
-        fileType: this.fileType,
+        fileType: this.fileType
-        splitStatus: '2'
       }
+      // splitStatus: '2'
       this.$http.get('lawss/sarFileSplitInfo/getSarFileSplitInfoEOPage',
         formData,
         {

src/pages/details/otherStandardDetails/index.vue

@@ -515,7 +515,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' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'"
         >关联条款
         </el-button>
       </div>
@@ -2382,6 +2382,7 @@ export default {
         }
       }, e => {
       })
+      console.log(this.standItemSearch);
     },
     downloadFile(attId) {
       if (attId != null && attId !== '') {

src/pages/searchCenter/pages/standardSearch.vue

@@ -114,8 +114,8 @@
                                                 :label="$t('m.putTime')"
                                                 width="130">
                                             <template slot-scope="scope">
-                                                <div v-if="selectIndex === 'stand' ? (scope.row.SSRQ !== null && scope.row.SSRQ !== undefined && scope.row.SSRQ !== '') : (scope.row.putTime !== null && scope.row.putTime !== undefined && scope.row.putTime !== '')">
+                                                <div v-if="selectIndex === 'stand' || selectIndex === 'bussstand' ? (scope.row.SSRQ !== null && scope.row.SSRQ !== undefined && scope.row.SSRQ !== '') : (scope.row.putTime !== null && scope.row.putTime !== undefined && scope.row.putTime !== '')">
-                                                    {{ $dateFormat(new Date((selectIndex === 'stand') ? scope.row.SSRQ : scope.row.putTime), "yyyy-MM-dd") }}
+                                                    {{ $dateFormat(new Date((selectIndex === 'stand' || (selectIndex === 'bussstand' && scope.row.standType === 'FOREIGN')) ? scope.row.SSRQ : scope.row.putTime), "yyyy-MM-dd") }}
                                                 </div>
                                                 <div v-else></div>
                                             </template>
@@ -129,7 +129,7 @@
                                                 <span v-if="selectIndex === 'laws'">{{ getLawsState(scope.row.statecode) }}</span>
                                                 <div v-else  :class="selectIndex === 'enterprise' ? (scope.row.textStatusBussName === '参考' ? 'yellowClass' :
                                                 (scope.row.textStatusBussName === '作废' || scope.row.textStatusBussName === '被代替' ? 'redClass' : '')) : ''">
-                                                {{ selectIndex === 'stand' ? scope.row.textStatusName : (selectIndex === 'laws' ? scope.row.textStatusLawsName : scope.row.textStatusBussName) }}</div>
+                                                {{ selectIndex === 'stand'|| (selectIndex === 'bussstand' && scope.row.standType === 'FOREIGN') ? scope.row.textStatusName : (selectIndex === 'laws' ? scope.row.textStatusLawsName : scope.row.textStatusBussName) }}</div>
                                             </template>
                                         </el-table-column>
                                         <el-table-column
@@ -1277,6 +1277,7 @@
                 }
                 if(condition.selectIndex === 'enterprise'){
                     condition.selectIndex='bussstand'
+                    condition.standType = 'bussstand'
                     condition.textStatusBuss = condition.BUSSSTATE
                     condition.QCDW = condition.ORGLIST
                 }