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 1/6] =?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 2/6] =?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 3/6] =?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">

From dda6d8c0849b1f8ec7b6a71c4ac63cae8bdb3a80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Thu, 23 Sep 2021 09:48:50 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=8E=BB=E6=8E=89=E5=AE=8C=E6=88=90=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/processList/tabComponents/processCenter/index.vue   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
index 3d2d0dde1..6c76b6aad 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
@@ -117,7 +117,7 @@
               <span>{{ scope.row.creatTime ? $moment(scope.row.creatTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
             </template>
           </el-table-column>
-          <el-table-column
+          <!-- <el-table-column
             prop="overTime"
             label="完成日期"
             align="center"
@@ -126,7 +126,7 @@
             <template slot-scope="scope">
               <span>{{ scope.row.overTime ? $moment(scope.row.overTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column :label="$t('m.operation')" align="center" width="50">
             <template slot-scope="scope">
               <div @click.stop style="display: inline-block">

From 16c470132a2e9f6495bac97ddfba74c6c959aad1 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Thu, 23 Sep 2021 09:49:34 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E6=A0=87=E5=87=86=E8=AF=A6=E6=83=85=20?=
 =?UTF-8?q?=E4=B8=AD=E8=8B=B1=E6=96=87=E5=90=8D=E7=A7=B0=20=E4=BC=81?=
 =?UTF-8?q?=E6=A0=87=E8=AF=A6=E6=83=85border?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../otherBussStandardDetails/index.vue        |  2 +-
 .../details/otherStandardDetails/index.vue    | 20 +++++++++++++------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue
index 8bf10a74d..6657f427d 100644
--- a/src/pages/details/otherBussStandardDetails/index.vue
+++ b/src/pages/details/otherBussStandardDetails/index.vue
@@ -41,7 +41,7 @@
                 >文本状态</label><span style="color: #409EFF;">{{ sarStandardsInfoEO.standStatusShow || '-' }}</span>
               </p>
               <p><label style=" margin-right: 157px;">发布日期</label><span>{{ sarStandardsInfoEO.issueTime || '-' }}</span></p>
-              <p><label style=" margin-right: 122px;">标准实施日期</label><span>{{ sarStandardsInfoEO.putTime || '-' }}</span></p>
+              <p style="border: none;"><label style=" margin-right: 122px;">标准实施日期</label><span>{{ sarStandardsInfoEO.putTime || '-' }}</span></p>
             </div>
             </div>
           </template>
diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index c870fa228..3f01fc084 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -51,15 +51,15 @@
                   <span v-else>{{ sarStandardsInfoEO.standSort + ' ' + sarStandardsInfoEO.standNumber }}</span>
                 </p>
                 <!--                <p><label style=" margin-right: 150px;">标准年份</label><span>{{ sarStandardsInfoEO.standYear || '-' }}</span></p>-->
-                <p class="half"><label style=" margin-right: 150px;">中文名称</label><span>{{
-                    sarStandardsInfoEO.standName || '-'
-                  }}</span></p>
-                <p class="half"><label style=" margin-right: 150px;">英文名称</label><span>{{
-                    sarStandardsInfoEO.standEnName || '-'
-                  }}</span></p>
                 <p class="half"><label style=" margin-right: 150px;">标准性质</label><span>{{
                     standMap[sarStandardsInfoEO.standNature] || '-'
                   }}</span></p>
+                <p><label style=" margin-right: 150px;">中文名称</label><span>{{
+                    sarStandardsInfoEO.standName || '-'
+                  }}</span></p>
+                <p><label style=" margin-right: 150px;">英文名称</label><span>{{
+                    sarStandardsInfoEO.standEnName || '-'
+                  }}</span></p>
                 <p class="half">
                   <label style=" margin-right: 150px;"
                          title="“计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。"
@@ -3419,6 +3419,14 @@ export default {
     overflow-y: auto;
   }
 }
+.over{
+  word-break: break-all;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-line-clamp: 2;
+  -webkit-box-orient: vertical;
+}
 
 ::v-deep .el-drawer__header {
   & > span:first-child {

From 7af5a1ea113c678caa2f14a8d9ad2fd2319847e8 Mon Sep 17 00:00:00 2001
From: shenyanpei <shenyanpei>
Date: Thu, 23 Sep 2021 09:53:40 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E4=B8=AD=E5=88=97=E8=A1=A8=E7=9A=84=E9=AB=98=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../localProductsOrProjectLibrary/index.vue                    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
index 04e9ca393..e1738e66c 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
@@ -87,9 +87,8 @@
         ref="multipleTable"
         :data="localProTableList"
         tooltip-effect="dark"
-        style="width: 100%"
+        style="width: 100%;height: calc(100% - 150px)"
         border
-        :height="400"
         :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '15px',
              fontWeight: 'normal', height: '48px'}"
         @selection-change="handleSelectionChange">