From 94018e99ab4b0a6f70a4acc840c0cd4700514039 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Wed, 22 Sep 2021 16:54:38 +0800
Subject: [PATCH 1/4] feat: There is no way the

---
 src/pages/searchCenter/pages/standardSearch.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/pages/searchCenter/pages/standardSearch.vue b/src/pages/searchCenter/pages/standardSearch.vue
index 0e4553666..aa04172ab 100644
--- a/src/pages/searchCenter/pages/standardSearch.vue
+++ b/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 !== '')">
-                                                    {{ $dateFormat(new Date((selectIndex === 'stand') ? scope.row.SSRQ : scope.row.putTime), "yyyy-MM-dd") }}
+                                                <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' || (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
                 }

From 7326ea519a18a7b0bb9a7400899106e0bc9bb1a4 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Wed, 22 Sep 2021 17:18:09 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=85=B3=E8=81=94=E6=9D=A1=E6=AC=BE?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/details/otherStandardDetails/index.vue | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index 5e8784304..7f1ac43b1 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -501,9 +501,21 @@
                   size="mini">
               </el-button>
             </el-form-item>
+
+            <el-form-item class="search-item btn-box">
+            <el-button
+                class="common-button-default"
+                @click="clearAllSearch"
+                size="mini">
+              关联条款
+            </el-button>
+            </el-form-item>
           </el-form>
+
+
         </div>
       </div>
+
       <div class="action-bar">
         <el-button class="common-button-default export-button" icon="export" size="mini"
                    @click="exportStandardItem"

From 1e8df2a950a6b312886a47ebf3a7bb7853fef444 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Thu, 23 Sep 2021 08:39:00 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=85=B3=E8=81=94=E6=9D=A1=E6=AC=BE->?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/RelatedTermsSelect.vue             |  4 ++--
 src/pages/details/otherStandardDetails/index.vue  | 15 ++-------------
 2 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/src/pages/details/otherStandardDetails/components/RelatedTermsSelect.vue b/src/pages/details/otherStandardDetails/components/RelatedTermsSelect.vue
index b41540883..d5267b384 100644
--- a/src/pages/details/otherStandardDetails/components/RelatedTermsSelect.vue
+++ b/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,
-        splitStatus: '2'
+        fileType: this.fileType
       }
+      // splitStatus: '2'
       this.$http.get('lawss/sarFileSplitInfo/getSarFileSplitInfoEOPage',
         formData,
         {
diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index 7f1ac43b1..c870fa228 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -501,21 +501,9 @@
                   size="mini">
               </el-button>
             </el-form-item>
-
-            <el-form-item class="search-item btn-box">
-            <el-button
-                class="common-button-default"
-                @click="clearAllSearch"
-                size="mini">
-              关联条款
-            </el-button>
-            </el-form-item>
           </el-form>
-
-
         </div>
       </div>
-
       <div class="action-bar">
         <el-button class="common-button-default export-button" icon="export" size="mini"
                    @click="exportStandardItem"
@@ -527,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>
@@ -2394,6 +2382,7 @@ export default {
         }
       }, e => {
       })
+      console.log(this.standItemSearch);
     },
     downloadFile(attId) {
       if (attId != null && attId !== '') {

From 6b6e441cf25f312d558487e1412b5ab636d94f10 Mon Sep 17 00:00:00 2001
From: "wangxiahui@91isoft.com" <140316hui>
Date: Thu, 23 Sep 2021 09:43:47 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=9B=BD=E5=86=85=E5=A4=96=E6=A0=87?=
 =?UTF-8?q?=E5=87=86=E8=A1=A8=E5=A4=B4=E8=87=AA=E9=80=82=E5=BA=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domesticStandardsAndRegulations/index.vue                   | 2 +-
 .../foreignStandardsAndRegulations/index.vue                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 62aa53e56..e7402b426 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -267,7 +267,7 @@
                 <span v-else>{{ textStatusMap[scope.row.textStatus] }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" width="50" fixed="right">
+            <el-table-column label="操作" align="center" width="50">
               <template slot-scope="scope">
                 <div @click.stop style="display: inline-block">
                   <el-dropdown trigger="click" @command="handleCommand">
diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index 2b58ae97c..007f3d3bf 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -275,7 +275,7 @@
                 <span v-else style="color: #333333">{{ textStatusMap[scope.row.textStatus] }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" width="50" fixed="right">
+            <el-table-column label="操作" align="center" width="50" >
               <template slot-scope="scope">
                 <div @click.stop style="display: inline-block">
                   <el-dropdown trigger="click" @command="handleCommand">