From 4564b016928457ea9bc621bfa6310c3e79409857 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Sun, 5 Dec 2021 14:32:13 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=90=88=E5=B9=B6type=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue
index b3503075a..413010df3 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue
@@ -431,6 +431,9 @@ export default {
     },
     //流程提交
     handleSubmit() {
+      if(this.$refs["childForm"].qbfsForm.type === undefined){
+        this.$refs["childForm"].qbfsForm.type = '1'
+      }
       this.repeatName()
       if(this.comFlag   === '0'){
           this.$message.warning('请更改企标名称')

From 9d505caf60257d0a31166fd5a32dda268d2c3788 Mon Sep 17 00:00:00 2001
From: shenyanpei <shenyanpei>
Date: Sun, 5 Dec 2021 14:39:10 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=8B=86=E5=88=86?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/localTool/standAutoSplit/index.vue | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/pages/localTool/standAutoSplit/index.vue b/src/pages/localTool/standAutoSplit/index.vue
index 8ebea20ce..86d86d981 100644
--- a/src/pages/localTool/standAutoSplit/index.vue
+++ b/src/pages/localTool/standAutoSplit/index.vue
@@ -50,6 +50,7 @@
             <el-table-column
                 prop="showNumber"
                 label="标准号/政策号"
+                width="150"
                 align="center">
               <template slot-scope="scope">
                 <a class="table-jump"
@@ -59,6 +60,7 @@
             <el-table-column
                 prop="standName"
                 label="标准名称/政策名称"
+                width="300"
                 show-overflow-tooltip
                 align="center">
               <template slot-scope="scope">
@@ -69,6 +71,7 @@
             <el-table-column
                 prop="fileTypeShow"
                 label="文本状态"
+                width="110"
                 align="center">
             </el-table-column>
             <el-table-column
@@ -80,6 +83,7 @@
             <el-table-column
                 prop="splitStatus"
                 label="拆分状态"
+                width="120"
                 align="center">
               <template slot-scope="scope">
                 <span v-if="scope.row.splitStatus == '0'">编辑中</span>
@@ -92,6 +96,7 @@
             <el-table-column
                 prop="creationTime"
                 label="拆分时间"
+                width="120"
                 sortable
                 align="center">
               <template slot-scope="scope">
@@ -108,15 +113,21 @@
                 <el-tag type="danger" size="small" v-else>失败</el-tag>
               </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" width="50">
+            <el-table-column label="操作" align="center" width="80">
               <template slot-scope="scope">
-                <el-dropdown trigger="click" @command="handleCommand">
+                <el-button
+                  v-btn-permission="'17ba4598eb411d6feed468a2e446a301'"
+                  type="primary"
+                  size="mini"
+                  @click="showUser(scope.row)"
+                >查看</el-button>
+<!--                <el-dropdown trigger="click" @command="handleCommand">
                   <i class="iconfont">&#xe61e;</i>
                   <el-dropdown-menu slot="dropdown">
                     <el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'17ba4598eb411d6feed468a2e446a301'">查看</el-dropdown-item>
                     <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="'10ba28487876990927f653a66e1eeb98'">删除</el-dropdown-item>
                   </el-dropdown-menu>
-                </el-dropdown>
+                </el-dropdown>-->
               </template>
             </el-table-column>
           </el-table>

From 6b1bde788b27e410126846842ad1a8e240090b85 Mon Sep 17 00:00:00 2001
From: "wangxiahui@91isoft.com" <140316hui>
Date: Sun, 5 Dec 2021 14:50:57 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=8F=82=E4=BC=9A=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E7=AC=AC=E4=BA=94=E6=AD=A5=EF=BC=8C=E5=AE=A1=E6=89=B9=E6=84=8F?=
 =?UTF-8?q?=E8=A7=81=E6=94=B9=E6=88=90=E5=9B=9E=E6=89=A7=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../processCenter/pages/creatProcess/bzhHy-ch/step5.vue  | 2 +-
 .../accessStandardsAndRegulations/pages/addEdit.vue      | 7 +++++--
 .../domesticStandardsAndRegulations/index.vue            | 9 ++++-----
 .../foreignRegulationsDatabase/index.vue                 | 9 ++++-----
 .../foreignStandardsAndRegulations/index.vue             | 8 ++++----
 .../regulatoryRepository/standardForComments/index.vue   | 4 +++-
 6 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue
index 5b596f8d6..7d8a47e04 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue
@@ -127,7 +127,7 @@
         </div>
       </div>
       <el-collapse accordion>
-        <el-collapse-item title="审批意见">
+        <el-collapse-item title="回执说明">
           <div style="margin: 10px 0;">
             <el-input
               type="textarea"
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
index d676a1cca..70fc8aaae 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
@@ -185,7 +185,7 @@
               show-overflow-tooltip
               fixed="left"
               align="center"
-              width="180px"
+              width="150px"
               label="标准号">
             <template slot-scope="scope">
               <span @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber || scope.row.lawsNumber || scope.row.standCode }}</span>
@@ -204,6 +204,7 @@
               prop="issueTime"
               sortable
               align="center"
+              width="110"
               label="发布日期">
             <template slot-scope="scope">
               <span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format('YYYY-MM-DD') : '' }}</span>
@@ -213,6 +214,7 @@
               prop="xcxssrqgj"
               sortable
               align="center"
+              width="150"
               label="新车型实施日期">
             <template slot-scope="scope">
               <span v-if="scope.row.xcxssrqgj">{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}</span>
@@ -224,6 +226,7 @@
               prop="zccssrqgj"
               sortable
               align="center"
+              width="150"
               label="在产车实施日期">
             <template slot-scope="scope">
               <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format('YYYY-MM-DD') : '' }}</span>
@@ -232,7 +235,7 @@
           <el-table-column
               show-overflow-tooltip
               prop="textStatus"
-              width="120px"
+              width="100px"
               align="center"
               label="文本状态">
             <template slot-scope="scope">
diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index e6c26d318..19be77998 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -1060,7 +1060,6 @@
                 @selection-change="selectConfigStandChange">
               <el-table-column
                   type="selection"
-                  width="55"
                   align="center">
               </el-table-column>
               <el-table-column
@@ -1075,14 +1074,14 @@
               <el-table-column
                   prop="standName"
                   label="标准名称"
-                  width="200"
+                  width="500"
                   align="center">
               </el-table-column>
               <el-table-column
                   prop="issueTime"
                   label="发布日期"
                   sortable="custom"
-                  width="200"
+                  width="120"
                   align="center">
                 <template slot-scope="scope">
                   {{ formatIssueDate(scope.row.issueTime) }}
@@ -1092,7 +1091,7 @@
                   prop="XCXSSRQ"
                   label="实施日期"
                   sortable="custom"
-                  width="200"
+                  width="120"
                   align="center">
                 <template slot-scope="scope">
                   <span>{{ formatText(scope.row.XCXSSRQ) }}</span>
@@ -1101,7 +1100,7 @@
               <el-table-column
                   prop="textStatus"
                   label="文本状态"
-                  width="200"
+                  width="100"
                   align="center">
                 <template slot-scope="scope">
                   <span>{{ textStatusMap[scope.row.textStatus] }}</span>
diff --git a/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue b/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue
index 36545c4c5..05f834799 100644
--- a/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue
+++ b/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue
@@ -777,32 +777,31 @@
                       show-overflow-tooltip
                       prop="lawsNumber"
                       label="政策编号"
+                      width="150"
                       align="center"
               >
               </el-table-column>
               <el-table-column
                       prop="lawsName"
                       label="中文名称"
-                      width="200"
                       align="center">
               </el-table-column>
                 <el-table-column
                         prop="lawsEnName"
                         label="英文名称"
-                        width="200"
                         align="center">
                 </el-table-column>
               <el-table-column
                       prop="issueTime"
                       label="发文日期"
-                      width="180"
+                      width="120"
                       sortable
                       align="center">
               </el-table-column>
               <el-table-column
                       prop="XCXSSRQLAWS"
                       label="实施日期"
-                      width="180"
+                      width="120"
                       sortable
                       align="center">
                   <template slot-scope="scope">
@@ -814,7 +813,7 @@
               <el-table-column
                       prop="standStatusShow"
                       label="标准状态"
-                      width="200"
+                      width="100"
                       align="center">
               </el-table-column>
             </el-table>
diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index 262b8c84e..819882e44 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -1374,14 +1374,14 @@
               <el-table-column
                 prop="standName"
                 label="标准名称"
-                width="200"
+                width="500"
                 align="center">
               </el-table-column>
               <el-table-column
                 prop="issueTime"
                 label="发布日期"
                 sortable
-                width="200"
+                width="120"
                 align="center">
                 <template slot-scope="scope">
                   {{ scope.row.issueTime || '' }}
@@ -1391,7 +1391,7 @@
                 prop="XCXSSRQ"
                 label="实施日期"
                 sortable
-                width="200"
+                width="120"
                 align="center">
                 <template slot-scope="scope">
                   <span>{{ formatText(scope.row.XCXSSRQ) }}</span>
@@ -1400,7 +1400,7 @@
               <el-table-column
                 prop="textStatus"
                 label="文本状态"
-                width="200"
+                width="100"
                 align="center">
                 <template slot-scope="scope">
                   <span>{{ textStatusMap[scope.row.textStatus] }}</span>
diff --git a/src/pages/regulatoryRepository/standardForComments/index.vue b/src/pages/regulatoryRepository/standardForComments/index.vue
index 3d2404d61..128f670dc 100644
--- a/src/pages/regulatoryRepository/standardForComments/index.vue
+++ b/src/pages/regulatoryRepository/standardForComments/index.vue
@@ -69,7 +69,7 @@
             <el-table-column
               prop="category"
               label="标准/政策"
-              width="180"
+              width="150"
               align="center">
               <template slot-scope="scope">
                 <a class="table-jump" @click.stop="handlePreview(scope.row)">{{ scope.row.category }}</a>
@@ -86,6 +86,7 @@
             <el-table-column
               prop="endTime"
               label="征求意见周期"
+              width="200"
               align="center">
               <template slot-scope="scope">
                 {{ scope.row.startTime + ' ~ ' + scope.row.endTime }}
@@ -94,6 +95,7 @@
             <el-table-column
               prop="startTime"
               label="上传时间"
+              width="200"
               align="center">
             </el-table-column>
           </el-table>