From 05ae32825daf3177a9ce33bc3777b4faca537f31 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Tue, 21 Dec 2021 11:00:43 +0800
Subject: [PATCH 01/26] feat: There is no way the,

---
 src/pages/processCenter/pages/creatProcess/qbrk/step1.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
index d6b350f39..cb1830288 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
@@ -977,7 +977,7 @@
                 width = "500"
                 :data="standSystemOptions"
                 :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
-                :nodeKey="nodeKey" @popoverHide="popoverHide"></tree-select-new>
+                :nodeKey="nodeKey" @popoverHide="popoverHide" @popoverHideCancel="popoverHideCancel"></tree-select-new>
         <tree-select-new
                 width = "500"
                 :lazy=true
@@ -988,7 +988,7 @@
                 :url="url"
                 :urlChild="urlChild"
                 :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1"
-                :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"></tree-select-new>
+                :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs" @popoverHideCancel="popoverHideBusVsCancel"></tree-select-new>
     </div>
 </template>
 

From c44ed3054896d2868a77129a6260c7b563634b4f Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Tue, 21 Dec 2021 14:03:35 +0800
Subject: [PATCH 02/26] feat: There is no way the,

---
 .../pages/creatProcess/zcrk/step1.vue         | 95 ++++++++++---------
 1 file changed, 48 insertions(+), 47 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/zcrk/step1.vue b/src/pages/processCenter/pages/creatProcess/zcrk/step1.vue
index 641508646..b577a8962 100644
--- a/src/pages/processCenter/pages/creatProcess/zcrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/zcrk/step1.vue
@@ -162,10 +162,10 @@
                                         ></el-option>
                                     </el-select>
                                 </el-form-item>
-                                <el-form-item v-show="verifySarStandard" label="适用车型" prop="lawsSyqy" class="add-form-item form-item-disabled">
-                                    <el-select :popper-append-to-body="false" v-model="form.lawsSyqy" multiple placeholder="请选择适用车型">
+                                <el-form-item v-show="verifySarStandard" label="适用车型" prop="lawsSycx" class="add-form-item form-item-disabled">
+                                    <el-select :popper-append-to-body="false" v-model="form.lawsSycx" multiple placeholder="请选择适用车型">
                                         <el-option
-                                                v-for="item in lawsSyqyOptions"
+                                                v-for="item in lawsSycxOptions"
                                                 placeholder="请选择适用车型"
                                                 :key="item.value"
                                                 :value="item.value"
@@ -467,36 +467,6 @@
 <!--                                            style="position:absolute;top: 10px;right: 0;"-->
 <!--                                            @click="selectLaws('dtbjh'),config.attrName = '代替标准号'"-->
 <!--                                    >{{'手动查找'}}</el-button>-->
-                                </el-form-item>
-                                <el-form-item label="引用标准&政策" prop="YYBZZCLAWS" class="add-form-item form-item-disabled">
-                                    <el-input
-                                            v-model="form.YYBZZCLAWS"
-                                            placeholder="请输入引用标准&政策"
-                                            clearable
-                                    ></el-input>
-                                </el-form-item>
-                                <!--                                <el-form-item label="相关流程" prop="xglc" class="add-form-item form-item-disabled">-->
-                                <!--                                    <el-input-->
-                                <!--                                            v-model="form.xglc"-->
-                                <!--                                            placeholder="请输入相关流程"-->
-                                <!--                                            clearable-->
-                                <!--                                    ></el-input>-->
-                                <!--                                </el-form-item>-->
-                            </el-col>
-                            <el-col :span="12">
-                                <el-form-item label="被代替文件号" prop="BDTWJHLAWS" class="add-form-item form-item-disabled">
-                                  <el-input
-                                      v-model="form.BDTWJHLAWS"
-                                      placeholder="请输入被代替文件号"
-                                      clearable
-                                  ></el-input>
-<!--                                  <el-button-->
-<!--                                      type="primary"-->
-<!--                                      class="common-button-primary"-->
-<!--                                      size="mini"-->
-<!--                                      style="position:absolute;top: 10px;right: 0;"-->
-<!--                                      @click="selectLaws('bfbdtbzh'),config.attrName = '部分代替标准号'"-->
-<!--                                  >{{'手动查找'}}</el-button>-->
                                 </el-form-item>
                                 <el-form-item label="关联文件" prop="GLWJLAWSName" class="add-form-item form-item-disabled">
                                     <el-input
@@ -528,6 +498,43 @@
                                         </el-button>
                                     </div>
                                 </el-form-item>
+                                <!--                                <el-form-item label="相关流程" prop="xglc" class="add-form-item form-item-disabled">-->
+                                <!--                                    <el-input-->
+                                <!--                                            v-model="form.xglc"-->
+                                <!--                                            placeholder="请输入相关流程"-->
+                                <!--                                            clearable-->
+                                <!--                                    ></el-input>-->
+                                <!--                                </el-form-item>-->
+                            </el-col>
+                            <el-col :span="12">
+                                <el-form-item label="引用标准&政策" prop="YYBZZCLAWS" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            v-model="form.YYBZZCLAWS"
+                                            placeholder="请输入引用标准&政策"
+                                            clearable
+                                    ></el-input>
+                                    <el-button
+                                          type="primary"
+                                          class="common-button-primary"
+                                          size="mini"
+                                          style="position:absolute;top: 10px;right: 0;"
+                                          @click="selectLaws('YYBZZCLAWS'),config.attrName = '引用标准&政策'"
+                                      >{{'手动查找'}}</el-button>
+                                </el-form-item>
+<!--                                <el-form-item label="被代替文件号" prop="BDTWJHLAWS" class="add-form-item form-item-disabled">-->
+<!--                                  <el-input-->
+<!--                                      v-model="form.BDTWJHLAWS"-->
+<!--                                      placeholder="请输入被代替文件号"-->
+<!--                                      clearable-->
+<!--                                  ></el-input>-->
+<!--&lt;!&ndash;                                  <el-button&ndash;&gt;-->
+<!--&lt;!&ndash;                                      type="primary"&ndash;&gt;-->
+<!--&lt;!&ndash;                                      class="common-button-primary"&ndash;&gt;-->
+<!--&lt;!&ndash;                                      size="mini"&ndash;&gt;-->
+<!--&lt;!&ndash;                                      style="position:absolute;top: 10px;right: 0;"&ndash;&gt;-->
+<!--&lt;!&ndash;                                      @click="selectLaws('bfbdtbzh'),config.attrName = '部分代替标准号'"&ndash;&gt;-->
+<!--&lt;!&ndash;                                  >{{'手动查找'}}</el-button>&ndash;&gt;-->
+<!--                                </el-form-item>-->
                             </el-col>
                         </el-row>
                     </div>
@@ -651,7 +658,7 @@
                         </el-form-item>
                         <el-form-item label="编号/名称" class="search-item">
                             <el-input
-                                    v-model="replaceLawsNumForm.standNumber"
+                                    v-model.trim="replaceLawsNumForm.numberName"
                                     placeholder="根据编号/名称查找"
                                     clearable
                                     :maxlength="100"></el-input>
@@ -694,12 +701,11 @@
                 <el-table-column
                         label="标准编号">
                     <template slot-scope="scope">
-                        <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSort }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
-                        <a v-else class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSort }} {{ scope.row.standNumber }}</a>
+                        <a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.lawsNumber }}</a>
                     </template>
                 </el-table-column>
                 <el-table-column
-                        prop="standName"
+                        prop="lawsName"
                         label="标准名称">
                 </el-table-column>
                 <el-table-column
@@ -1808,7 +1814,7 @@
                 }
                 this.replaceLawsNumForm.page = 1
                 this.replacePage = 1
-                this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.replaceLawsNumForm, {
+                this.$http.get('lawss/sarLawsInfo/page', this.replaceLawsNumForm, {
                     _this: this,
                     loading: 'replaceLoading'
                 }, res => {
@@ -1881,20 +1887,15 @@
                     })
                 }
                 this.selectedListRep.map((item) => {
-                    let texts = ''
-                    if (item.standYear != null && item.standYear !== '') {
-                        texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber + '-' + item.standYear : item.standNumber + '-' + item.standYear
-                    } else {
-                        texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber
-                    }
+                    let texts = item.lawsNumber
                     textArr.push(texts)
                     textArr = [...new Set(textArr)]
                     this.replaceLawsNumModel = false
                 })
                 // this.SarLawsInfoEO.replaceLawsNum = textArr.join(',')
               // 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖
-                if(this.replaceLawType === 'dtbjh'){
-                    this.form.dtbjh = this.form.dtbjh ? this.form.dtbjh + ',' + textArr.join(',') : textArr.join(',')
+                if(this.replaceLawType === 'YYBZZCLAWS'){
+                    this.form.YYBZZCLAWS = this.form.YYBZZCLAWS ? this.form.YYBZZCLAWS + ',' + textArr.join(',') : textArr.join(',')
                 }else if(this.replaceLawType === 'yybj'){
                     this.form.yybj = this.form.yybj ? this.form.yybj + ',' +textArr.join(',') : textArr.join(',')
                 }else if(this.replaceLawType === 'cbbh'){
@@ -1949,7 +1950,7 @@
                     this.replaceLawsNumForm.quoteIdList = ''
                 }
                 this.replaceLawsNumForm.standType = this.form.standInData === '1' ? 'FOREIGN' : 'INLAND'
-                this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.replaceLawsNumForm, {
+                this.$http.get('lawss/sarLawsInfo/page', this.replaceLawsNumForm, {
                     _this: this,
                     loading: 'replaceLoading'
                 }, res => {

From 73c1c23f10bda87d4bc76f6fc3280e9a1e21e1a4 Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Tue, 21 Dec 2021 14:09:52 +0800
Subject: [PATCH 03/26] =?UTF-8?q?=E5=9B=BD=E5=86=85=E5=BA=93=20-=20?=
 =?UTF-8?q?=E9=AB=98=E7=BA=A7=E6=A3=80=E7=B4=A2=20-=20=E8=A2=AB=E4=BB=A3?=
 =?UTF-8?q?=E6=9B=BF=E6=A0=87=E5=87=86=E5=8F=B7=E5=8E=BB=E6=8E=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domesticStandardsAndRegulations/index.vue      | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 3fdf0f328..8e20e6439 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -1841,17 +1841,17 @@
                     <el-input v-model="advanceSearchMapping.CBBH" clearable placeholder="根据采标编号查找"
                               @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
                   </el-form-item>
-                  <!--            引用标准-->
-                  <el-form-item label="引用标准" class="add-form-item form-item-disabled">
-                    <el-input v-model="advanceSearchMapping.YYBJ" clearable placeholder="根据引用标准查找"
-                              @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
-                  </el-form-item>
 
                 </el-col>
                 <el-col :span="12">
                   <!--            被代替标准号-->
-                  <el-form-item label="被代替标准号" class="add-form-item form-item-disabled">
-                    <el-input v-model="sarStandardsSearch.replacedStandNum" clearable placeholder="根据被代替标准号查找"
+<!--                  <el-form-item label="被代替标准号" class="add-form-item form-item-disabled">-->
+<!--                    <el-input v-model="sarStandardsSearch.replacedStandNum" clearable placeholder="根据被代替标准号查找"-->
+<!--                              @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>-->
+<!--                  </el-form-item>-->
+                  <!--            引用标准-->
+                  <el-form-item label="引用标准" class="add-form-item form-item-disabled">
+                    <el-input v-model="advanceSearchMapping.YYBJ" clearable placeholder="根据引用标准查找"
                               @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
                   </el-form-item>
                   <!--            被引用标准-->

From 92bfe58788a9ed63bf8151515e38cc1b7a661198 Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Tue, 21 Dec 2021 14:12:24 +0800
Subject: [PATCH 04/26] =?UTF-8?q?=E5=9B=BD=E5=86=85=E5=BA=93=20-=20?=
 =?UTF-8?q?=E9=AB=98=E7=BA=A7=E6=A3=80=E7=B4=A2=20-=20=E4=BD=93=E7=B3=BB?=
 =?UTF-8?q?=E7=B1=BB=E5=88=AB=E6=94=B9=E6=88=90=E6=A0=87=E5=87=86=E4=BD=93?=
 =?UTF-8?q?=E7=B3=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domesticStandardsAndRegulations/index.vue                 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 8e20e6439..acbf66a62 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -1545,8 +1545,8 @@
                     </el-select>
                   </el-form-item>
                   <!--            体系类别-->
-                  <el-form-item label="体系类别" class="add-form-item form-item-disabled">
-                    <el-select v-model="advanceSearchMapping.TXLB" placeholder="根据体系类别查找" clearable
+                  <el-form-item label="标准体系" class="add-form-item form-item-disabled">
+                    <el-select v-model="advanceSearchMapping.TXLB" placeholder="根据标准体系查找" clearable
                                @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
                       <el-option v-for="opt in txlbOptions" :value="opt.value === undefined ? '' :opt.value"
                                  :key="opt.value"

From e53f550e2f19c8b8a73e91237e2ea7681e6a5369 Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Tue, 21 Dec 2021 14:13:10 +0800
Subject: [PATCH 05/26] commit

---
 .../pags/consultationDetails.vue              | 34 ++++++++++++-------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
index def0339eb..2dc31a08e 100644
--- a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
+++ b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
@@ -475,19 +475,27 @@ export default {
     }
   },
   mounted() {
-    this.fileInfoLists = JSON.parse(this.$route.query.item.wkfiles)
-    let json = JSON.parse(this.$route.query.item.files)[0]
-    this.$http.get('SarStandItems/sar-stand-items/querySarItemAndInterpretation', {
-      standId: json.standId,
-      fileType: json.standFileClassify,
-      pageSize: 9999,
-      page: 1
-    }, {}, res => {
-      if (res.ok) {
-        this.options = res.data.list
-      }
-    }, e => {
-    })
+    if (JSON.parse(this.$route.query.item.wkfiles).length) {
+      this.fileInfoLists = JSON.parse(this.$route.query.item.wkfiles)
+    } else {
+      this.fileInfoLists = []
+    }
+    if (JSON.parse(this.$route.query.item.files).length) {
+      let json = JSON.parse(this.$route.query.item.files)[0]
+      this.$http.get('SarStandItems/sar-stand-items/querySarItemAndInterpretation', {
+        standId: json.standId,
+        fileType: json.standFileClassify,
+        pageSize: 9999,
+        page: 1
+      }, {}, res => {
+        if (res.ok) {
+          this.options = res.data.list
+        }
+      }, e => {
+      })
+    } else {
+      this.options = []
+    }
     this.getList()
     this.getIdeaKey()
     this.getFileInfo()

From cd1c6ccd24f57b5970adb78d9e0e0eb00aa435fa Mon Sep 17 00:00:00 2001
From: shenyanpei <shenyanpei>
Date: Tue, 21 Dec 2021 14:32:29 +0800
Subject: [PATCH 06/26] =?UTF-8?q?=E5=85=A5=E4=BC=9A=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../processCenter/pages/creatProcess/bzhHd-rh/step1.vue   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue
index 42041d108..c7d65f6e4 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue
@@ -348,7 +348,7 @@
             </el-timeline-item>
             <el-timeline-item timestamp="批准" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
               <el-card>
-                <el-form-item prop="totalLeader" style="margin-bottom: 0">
+                <el-form-item prop="directorUserName" style="margin-bottom: 0">
                   <h4>总院技术委员会主任</h4>
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.directorUserId" style="display: none;"></el-input>
@@ -749,8 +749,8 @@ export default {
       } else {
         this.roleForm.dockUser = idList
         this.roleForm.dockUserName = nameList
-        this.rh_pageData.comityInRole = nameList
-        this.rh_pageData.comityInRoleId = idList
+        // this.rh_pageData.comityInRole = nameList
+        // this.rh_pageData.comityInRoleId = idList
       }
       this.roleShowflag = false
     },
@@ -810,7 +810,7 @@ export default {
         roleList: this.roleForm,
         rh_pageData: this.rh_pageData,
         commentText: this.commentText,
-        directorList: this.rh_pageData.comityInRoleId,
+        directorList: this.roleForm.dockUser,
       }
       this.$refs['rh_pageData'].validate((valid) => {
         if (valid) {

From f7508177b187d4f58c3298e5d456dd8c07a4b1f7 Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Tue, 21 Dec 2021 14:32:58 +0800
Subject: [PATCH 07/26] commit

---
 src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue | 2 +-
 src/pages/processCenter/pages/creatProcess/bzjd/step1.vue   | 2 +-
 src/pages/processCenter/pages/creatProcess/bzjd/step2.vue   | 2 +-
 src/pages/processCenter/pages/creatProcess/bzjd/step3.vue   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
index c351aff6b..e32405d1f 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
@@ -84,7 +84,7 @@
                 <template slot="title">拆分信息</template>
             </ProcessTitle>
             <div class="action-bar">
-                <el-button type="primary" class="common-button-primary add-button" size="mini" @click="PLedit">
+                <el-button :disabled="!itemList.length" type="primary" class="common-button-primary add-button" size="mini" @click="PLedit">
                     批量编辑
                 </el-button>
             </div>
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
index 5efe18811..9c2a0a4c9 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
@@ -85,7 +85,7 @@
         <template slot="title">拆分信息</template>
       </ProcessTitle>
       <div class="action-bar">
-        <el-button type="primary" class="common-button-primary add-button" size="mini" @click="PLedit">
+        <el-button :disabled="!itemList.length" type="primary" class="common-button-primary add-button" size="mini" @click="PLedit">
           批量编辑
         </el-button>
       </div>
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
index 3cfe97df7..ee3227eb8 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
@@ -66,7 +66,7 @@
                 <template slot="title">拆分信息</template>
             </ProcessTitle>
             <div class="action-bar">
-                <el-button type="primary" class="common-button-primary add-button" size="mini" @click="choiceZRRS('', 2, '')">批量编辑</el-button>
+                <el-button :disabled="!itemList.length" type="primary" class="common-button-primary add-button" size="mini" @click="choiceZRRS('', 2, '')">批量编辑</el-button>
             </div>
             <el-table border
                       ref="selection"
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
index 707111fcd..6670afe1d 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
@@ -66,7 +66,7 @@
                 <template slot="title">拆分信息</template>
             </ProcessTitle>
             <div class="action-bar">
-                <el-button type="primary" :disabled="acceptShow" class="common-button-primary add-button" size="mini" @click="choiceZRR">批量编辑</el-button>
+                <el-button  type="primary" :disabled="acceptShow && !itemList.length" class="common-button-primary add-button" size="mini" @click="choiceZRR">批量编辑</el-button>
             </div>
             <el-table border
                       ref="selection"

From f3d6554f1ce802a7fae4079a2e3b8c95eac9b50c Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Tue, 21 Dec 2021 14:42:16 +0800
Subject: [PATCH 08/26] feat: There is no way the,

---
 .../pages/creatProcess/zcrk/step1.vue         | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/zcrk/step1.vue b/src/pages/processCenter/pages/creatProcess/zcrk/step1.vue
index b577a8962..a41c03860 100644
--- a/src/pages/processCenter/pages/creatProcess/zcrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/zcrk/step1.vue
@@ -827,17 +827,19 @@
                             </el-formItem>
                             <el-form-item>
                                 <el-button
-                                        icon="el-icon-search"
                                         type="primary"
                                         class="common-button-primary"
-                                        @click="handleSearchStandard"
-                                        round>
+                                        size="mini"
+                                        style="margin-left: 5px"
+                                        @click="handleSearchStandard">
+                                    查询
                                 </el-button>
                                 <el-button
                                         class="common-button-default"
-                                        icon="el-icon-refresh-left"
-                                        @click="handleResetSearch"
-                                        round></el-button>
+                                        size="mini"
+                                        @click="handleResetSearch">
+                                    清空
+                                </el-button>
                             </el-form-item>
                         </el-form>
                     </div>
@@ -1664,11 +1666,11 @@
                 this.standardCheckedList = data
             },
             handleResetSearch() {
-                this.standardSearchForm.standType = 'INLAND'
-                this.standardSearchForm.standNumber = ''
-                this.standardSearchForm.standSort = ''
-                this.standardSearchForm.standName = ''
-                this.standardSearchForm.standEnName = ''
+                // this.standardSearchForm.standType = 'INLAND'
+                this.standardSearchForm.lawsNumber = ''
+                this.standardSearchForm.lawsName = ''
+                this.standardSearchForm.lawsEnName = ''
+                this.standardSearchForm.lawsTextState = ''
                 setTimeout(() => {
                     this.handleSearchStandard()
                 }, 100)

From 8575ebaf79c4f5b768f178c548ff5c0c32332dbb Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Tue, 21 Dec 2021 14:52:17 +0800
Subject: [PATCH 09/26] =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B=20-?=
 =?UTF-8?q?=20=E6=89=8B=E5=8A=A8=E6=9F=A5=E6=89=BE=20-=20=E5=8E=BB?=
 =?UTF-8?q?=E6=8E=89=E8=8B=B1=E6=96=87=E5=90=8D=E7=A7=B0=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzrk/step1.vue            | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index ef95d81fa..0eeb55339 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -1159,19 +1159,19 @@
                                         :maxlength="100"></el-input>
                             </el-form-item>
                           </el-row>
-                            <el-form-item label="中文名称" prop="standName" class="search-item" >
+                            <el-form-item label="标准名称" prop="standName" class="search-item" >
                                 <el-input v-model="standardSearchForm.standName"
                                           placeholder="请输入标准名称"
                                           clearable
                                           :maxlength="500"></el-input>
                             </el-form-item>
-                            <el-form-item label="英文名称" prop="standEnName" class="search-item">
-                                <el-input
-                                        v-model="standardSearchForm.standEnName"
-                                        maxlength="1000"
-                                        placeholder="请输入英文名称"
-                                        clearable></el-input>
-                            </el-form-item>
+<!--                            <el-form-item label="英文名称" prop="standEnName" class="search-item">-->
+<!--                                <el-input-->
+<!--                                        v-model="standardSearchForm.standEnName"-->
+<!--                                        maxlength="1000"-->
+<!--                                        placeholder="请输入英文名称"-->
+<!--                                        clearable></el-input>-->
+<!--                            </el-form-item>-->
                             <el-form-item>
                                 <el-button
                                         type="primary"

From 9dc238b1b7be04104913a34efe3480119fc81ce4 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Tue, 21 Dec 2021 15:22:35 +0800
Subject: [PATCH 10/26] feat: There is no way the,

---
 .../pages/creatProcess/zcrk/step1.vue         | 173 +++++++++---------
 1 file changed, 87 insertions(+), 86 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/zcrk/step1.vue b/src/pages/processCenter/pages/creatProcess/zcrk/step1.vue
index a41c03860..aa845207d 100644
--- a/src/pages/processCenter/pages/creatProcess/zcrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/zcrk/step1.vue
@@ -266,28 +266,21 @@
                                             v-model="form.ZCWBLAWSName"
                                             clearable
                                     ></el-input>
-                                    <div v-if="ZCWBLAWSFileList.length>0">
-<!--                                        {{ form.fbgbjbdName }}-->
-                                        <el-button
-                                                type="primary"
-                                                class="common-button-primary"
-                                                size="mini"
-                                                style="margin-left: 10px"
-                                                @click="fileUpload('ZCWBLAWS')">
-                                          <i class="el-icon-upload el-icon--right"></i>
-                                         查看已上传的文件
-                                        </el-button>
-                                    </div>
-                                    <div v-else>
-                                        <el-button
-                                                type="primary"
-                                                class="common-button-primary"
-                                                size="mini"
-                                                @click="fileUpload('ZCWBLAWS')">
-                                          <i class="el-icon-upload el-icon--right"></i>
-                                            点击上传
-                                        </el-button>
-                                    </div>
+                                  <div style="display: flex;justify-content: space-between">
+                                      <div style="width: 80%;">
+                                          <div v-for="(item,index) in ZCWBLAWSFileList" :key="index" @click="handleFilePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
+                                      </div>
+                                      <div style="width: 20%;">
+                                          <el-button
+                                                  type="primary"
+                                                  class="common-button-primary"
+                                                  size="mini"
+                                                  @click="fileUpload('ZCWBLAWS')"
+                                                  style="margin-left: 10px; margin-top: 11px; float: right;">
+                                              <i class="el-icon-upload el-icon--right"></i>
+                                          </el-button>
+                                      </div>
+                                  </div>
                                 </el-form-item>
                               <el-form-item label="解读文件" prop="JDWJLAWSName" class="add-form-item form-item-disabled">
                                 <el-input
@@ -296,28 +289,21 @@
                                     v-model="form.JDWJLAWSName"
                                     clearable
                                 ></el-input>
-                                <div v-if="JDWJLAWSFileList.length>0">
-                                  <!--                                        {{ form.caName }}-->
-                                  <el-button
-                                      type="primary"
-                                      class="common-button-primary"
-                                      size="mini"
-                                      style="margin-left: 10px"
-                                      @click="fileUpload('JDWJLAWS')">
-                                    <i class="el-icon-upload el-icon--right"></i>
-                                    查看已上传的文件
-                                  </el-button>
-                                </div>
-                                <div v-else>
-                                  <el-button
-                                      type="primary"
-                                      class="common-button-primary"
-                                      size="mini"
-                                      @click="fileUpload('JDWJLAWS')">
-                                    <i class="el-icon-upload el-icon--right"></i>
-                                    点击上传
-                                  </el-button>
-                                </div>
+                                  <div style="display: flex;justify-content: space-between">
+                                      <div style="width: 80%;">
+                                          <div v-for="(item,index) in JDWJLAWSFileList" :key="index" @click="handleFilePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
+                                      </div>
+                                      <div style="width: 20%;">
+                                          <el-button
+                                                  type="primary"
+                                                  class="common-button-primary"
+                                                  size="mini"
+                                                  @click="fileUpload('JDWJLAWS')"
+                                                  style="margin-left: 10px; margin-top: 11px; float: right;">
+                                              <i class="el-icon-upload el-icon--right"></i>
+                                          </el-button>
+                                      </div>
+                                  </div>
                               </el-form-item>
                             </el-col>
                             <el-col :span="12">
@@ -328,27 +314,20 @@
                                             v-model="form.GCWBLAWSName"
                                             clearable
                                     ></el-input>
-                                    <div v-if="GCWBLAWSFileList.length>0">
-                                        <!--                                        {{ form.ssgName }}-->
-                                        <el-button
-                                                type="primary"
-                                                class="common-button-primary"
-                                                size="mini"
-                                                style="margin-left: 10px"
-                                                @click="fileUpload('GCWBLAWS')">
-                                            <i class="el-icon-upload el-icon--right"></i>
-                                            查看已上传的文件
-                                        </el-button>
-                                    </div>
-                                    <div v-else>
-                                        <el-button
-                                                type="primary"
-                                                class="common-button-primary"
-                                                size="mini"
-                                                @click="fileUpload('GCWBLAWS')">
-                                            <i class="el-icon-upload el-icon--right"></i>
-                                            点击上传
-                                        </el-button>
+                                    <div style="display: flex;justify-content: space-between">
+                                        <div style="width: 80%;">
+                                            <div v-for="(item,index) in GCWBLAWSFileList" :key="index" @click="handleFilePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
+                                        </div>
+                                        <div style="width: 20%;">
+                                            <el-button
+                                                    type="primary"
+                                                    class="common-button-primary"
+                                                    size="mini"
+                                                    @click="fileUpload('GCWBLAWS')"
+                                                    style="margin-left: 10px; margin-top: 11px; float: right;">
+                                                <i class="el-icon-upload el-icon--right"></i>
+                                            </el-button>
+                                        </div>
                                     </div>
                                 </el-form-item>
                             </el-col>
@@ -475,27 +454,20 @@
                                             v-model="form.GLWJLAWSName"
                                             clearable
                                     ></el-input>
-                                    <div v-if="GLWJLAWSFileList.length>0">
-
-                                        <el-button
-                                                type="primary"
-                                                class="common-button-primary"
-                                                size="mini"
-                                                @click="fileUpload('GLWJLAWS')">
-                                            <i class="el-icon-upload el-icon--right"></i>
-                                            查看已上传文件
-                                        </el-button>
-                                        <!--                                        {{ form.glwjName }}-->
-                                    </div>
-                                    <div v-else>
-                                        <el-button
-                                                type="primary"
-                                                class="common-button-primary"
-                                                size="mini"
-                                                @click="fileUpload('GLWJLAWS')">
-                                            <i class="el-icon-upload el-icon--right"></i>
-                                            点击上传
-                                        </el-button>
+                                    <div style="display: flex;justify-content: space-between">
+                                        <div style="width: 80%;">
+                                            <div v-for="(item,index) in GLWJLAWSFileList" :key="index" @click="handleFilePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
+                                        </div>
+                                        <div style="width: 20%;">
+                                            <el-button
+                                                    type="primary"
+                                                    class="common-button-primary"
+                                                    size="mini"
+                                                    @click="fileUpload('GLWJLAWS')"
+                                                    style="margin-left: 10px; margin-top: 11px; float: right;">
+                                                <i class="el-icon-upload el-icon--right"></i>
+                                            </el-button>
+                                        </div>
                                     </div>
                                 </el-form-item>
                                 <!--                                <el-form-item label="相关流程" prop="xglc" class="add-form-item form-item-disabled">-->
@@ -935,6 +907,7 @@
 </template>
 
 <script>
+    import { onlyOfficeUrl } from '@/sysConfig'
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
@@ -2024,6 +1997,34 @@
                     })
                 }
             },
+            // 文件预览及下载
+            handleFilePreview(file) {
+                const attId = file.response.data.id
+                if (this.preview) {
+                    if (attId) {
+                        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+                    } else {
+                        this.$message.warning('文件不存在,下载失败')
+                    }
+                } else {
+                    this.getBusStandFileByAttId(attId)
+                        .then(res => {
+                            if(res){
+                                const editFileInfo = res
+                                if(editFileInfo.fileSuffix === 'pdg' || editFileInfo.fileSuffix === 'PDG'){
+                                    window.open('book://ssreader/e0?url='+editFileInfo.downLoadUrl)
+                                }else {
+                                    const nowTime = new Date().getTime()
+                                    window.open(onlyOfficeUrl+'/onlyOffice?oldFileName=' + editFileInfo.oldFileName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName)
+
+                                }
+                            }
+                        }).catch(e => {
+                        console.log(e)
+                        this.$message.warning('文件不存在,预览失败')
+                    })
+                }
+            },
             fileUpload (type) {
                 this.fileType = '';
                 // this.fileMadel = true;//此句应在最后执行,否则会有先显示没变换的的文件列表,在显示变换了的文件列表

From 419fdf7ebce4ec0d7dd558ea6432a49104d98d26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Tue, 21 Dec 2021 15:24:01 +0800
Subject: [PATCH 11/26] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzqdfb/step1-4.vue     | 153 +++++++++++++++---
 .../pages/creatProcess/xmqdqr/step1-1.vue     |   7 +-
 .../pages/creatProcess/xmqdqr/step1.vue       |  13 +-
 .../pages/creatProcess/xmqdqr/step5.vue       |   2 +-
 .../pages/rectificationDatabase.vue           |  20 ++-
 5 files changed, 162 insertions(+), 33 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-4.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-4.vue
index 1ba207ed8..43d5cfd60 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-4.vue
@@ -37,18 +37,19 @@
                   clearable
                 ></el-input>
               </el-form-item>
-              <el-form-item label="附件" prop="modelName" class="add-form-item form-item-disabled">
-                <div class="file-box" v-if="listForm.model">
-                  <p> {{ listForm.modelName }}
+              <el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled">
+                <div class="file-box" v-if="fileList.length > 0">
+                  <p v-for="item in fileList"
+                     :key="item.id"> {{ item.name }}
                     <i
                       title="下载"
-                      @click="downloadFile(listForm.model)"
+                      @click="downloadFile(item.id)"
                       class="icon-download"
                       v-btn-permission="''"
                     />
                     <i
                       title="下载带水印"
-                      @click="downloadFileByWater(listForm.model,listForm.modelName)"
+                      @click="downloadFileByWater(item.id, item.name)"
                       class="icon-download2"
                       v-btn-permission="''"
                     />
@@ -204,6 +205,15 @@
         <loading :loading="loading">流程列表加载中</loading>
       </div>
     </div>
+
+    <!-- 福田全公司选人解决方案 -->
+    <Role-tree
+      check-box
+      :is-title="drawerTitle"
+      :is-visible.sync="drawerModal"
+      @checkedRole="checkedRole"
+      :nodeList="nodeList"
+    ></Role-tree>
   </div>
 </template>
 
@@ -211,7 +221,8 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
-import { inboundLiaisonDetail } from "api/process";
+import { changeAssigneeNew, inboundLiaisonDetail } from "api/process";
+
 export default {
   name: "bzqdfbStep1-4",
   components: {
@@ -221,6 +232,11 @@ export default {
   },
   data() {
     return {
+      nodeList:[],
+      isTransfer: false,
+      drawerTitle:'',
+      // 调整处理人抽屉状态
+      drawerModal: false,
       detailData: [],
       // 当前流程类型(1待办/2已办)
       processType: 1,
@@ -236,10 +252,12 @@ export default {
       selectList: [], //选择标准的选择框
       bringData: [],
       commentText: "", //填写会签意见
+      fileList:[],
       page: 1,
       total: 0,
       pageSize: this.$store.getters.userInfo.configContent,
       listForm: {
+        fileIds: '',
         listType: "", //区分是哪个清单
         listName: "", //清单名称
         descriptionList: "", //清单说明
@@ -274,6 +292,47 @@ export default {
     };
   },
   methods: {
+    //确认转办
+    checkedRole (data) {
+      this.assigneeNewLoading = true
+      changeAssigneeNew({
+        taskId: this.$route.query.taskIds, // 任务id
+        assignee: data[0].id, // 被委托人
+        userId: this.$store.getters.userInfo.userId, // 委托人
+        pId: this.$route.query.prcId // 流程实例
+      }).then(res => {
+        this.isTransfer = false
+        if (res.success) {
+          this.drawerModal = false
+          this.$message.success('调整成功')
+          this.$router.push("/processCenter");
+          this.processNum()
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
+    },
+    // 请求转换流程图
+    processNum (row) {
+      axios.request({
+        url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
+        responseType: 'blob',
+        method: 'get',
+        params: {
+          prcNum: this.$route.query.prcNum
+        }
+      }).then(res => {
+        // let blob = new Blob([res.data], {type: 'image/jpg'})
+        // let url = window.URL.createObjectURL(res.data)
+        this.processStep = window.URL.createObjectURL(res.data)
+      })
+    },
+    //转办事件
+    handleTransfer(){
+      this.drawerModal = true
+      this.drawerTitle = '转办处理人'
+      this.selectPeople = row
+    },
     processTable() {
       this.$http.get("lawss/activiti/get_list_by_instance", {
         prcNum: this.$route.query.prcNum,
@@ -337,6 +396,15 @@ export default {
         this.listForm.applyUpdUserId = item.applyUpdUserId;
         this.listForm.jlUserId = item.jlUserId;
         this.listForm.zrUserId = item.zrUserId;
+        let filesId = []
+        item.fileName.forEach(itemIds =>{
+          filesId.push(itemIds.id)
+        })
+        this.listForm.fileId = filesId.join(',')
+        item.fileName.forEach(itemId => {
+          this.fileIds = itemId.id
+          this.getFileInfo();
+        })
       });
     },
     // 请求上传的文件信息
@@ -346,11 +414,15 @@ export default {
       }, {
         _this: this
       }, res => {
-        console.log(res);
         this.$nextTick(() => {
           res.data.map(item => {
-            this.listForm.modelName = item.oldFileName;
-            this.listForm.model = item.id;
+            // 赋值要回显的上传文件内容
+            this.fileList.push({
+              name: item.oldFileName,
+              uid: item.uid,
+              status: item.status,
+              id: item.id
+            });
           });
         });
       }, e => {
@@ -378,18 +450,13 @@ export default {
         }
       }
     },
-    //驳回事件
+    // 驳回事件
     beforeBack() {
-      if (this.commentText === null || this.commentText === undefined || this.commentText === "") {
-        this.$message.warning("请填写审批意见");
-      } else {
+      if(!this.commentText){
+        this.$message.warning('请填写审批意见')
+      }else{
         this.listForm.approvalOpinion = "1";
-        this.handleSubmit();
-      }
-    },
-    //提交事件
-    handleSubmit() {
-        this.isSubmit = true
+        this.saveLoading = true
         this.listForm.commentText = this.commentText;
         const json = JSON.stringify(this.listForm);
         this.$http.post("lawss/activiti/completeTask", {
@@ -403,8 +470,29 @@ export default {
             this.$message.success(res.message);
             this.$router.push("/processCenter");
           }
-          this.isSubmit = false
+          this.saveLoading = false
         });
+      }/**/
+    },
+    //提交事件
+    handleSubmit() {
+      this.isSubmit = true;
+      this.listForm.approvalOpinion = "2";
+      this.listForm.commentText = this.commentText;
+      const json = JSON.stringify(this.listForm);
+      this.$http.post("lawss/activiti/completeTask", {
+        taskIds: this.taskIds,
+        userId: this.userId,
+        json: json
+      }, {
+        _this: this
+      }, res => {
+        if (res.success) {
+          this.$message.success(res.message);
+          this.$router.push("/processCenter");
+        }
+        this.isSubmit = false
+      });
     },
     //选择标准取消事件
     closeDrawer() {
@@ -465,6 +553,31 @@ export default {
       padding: 0 20px 0;
     }
   }
+  p {
+    & > a {
+      cursor: pointer;
+    }
+
+    & > i {
+      display: inline-block;
+      margin-left: 3px;
+      width: 18px;
+      height: 16px;
+      background-repeat: no-repeat;
+      background-size: 100% 100%;
+      background-position: center center;
+      vertical-align: sub;
+      cursor: pointer;
+    }
+
+    .icon-download {
+      background-image: url("~assets/images/shangqi/img/download.png");
+    }
+
+    .icon-download2 {
+      background-image: url("~assets/images/shangqi/img/download2.png");
+    }
+  }
 
   .choiceBtn {
     .el-button--primary {
diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue
index 6179964e5..a3a4344c8 100644
--- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue
@@ -191,7 +191,7 @@
               tooltip-effect="dark"
               style="width: 100%"
               border
-              height="100%"
+              class="table-height"
               :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
               @selection-change="selectProjectChange"
@@ -499,7 +499,6 @@ export default {
       }, res => {
         this.ProjectDatas = res.data.total.records;
         this.total = res.data.total.total;
-        this.page = 1;
       }, e => {
 
       });
@@ -840,6 +839,10 @@ export default {
       }
     }
   }
+  .table-height{
+    height: calc(~'100% - 65px');
+    overflow: auto;
+  }
 }
 </style>
 
diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue
index ab4dd630f..093914c98 100644
--- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue
@@ -59,6 +59,7 @@
                 <el-button size="mini" type="primary" style="margin-top: 1%;" @click="choiceList">选择清单</el-button>
                 <el-form-item label="截止日期" prop="endTime" class="add-form-item form-item-disabled">
                   <el-date-picker
+                         :picker-options="pickerOptions"
                           v-model="qdform.endTime"
                           type="date"
                           placeholder="请选择截止日期"
@@ -198,7 +199,7 @@
               tooltip-effect="dark"
               style="width: 100%"
               border
-              height="100%"
+              class="table-height"
               :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
               @selection-change="selectProjectChange"
@@ -398,6 +399,11 @@ export default {
   },
   data() {
     return {
+      pickerOptions: {
+        disabledDate(time) {
+          return time.getTime() < Date.now();
+        },
+      },
       multipleSelection: [],
       active: "1", //默认显示
       commentText: "",
@@ -503,7 +509,6 @@ export default {
       }, res => {
         this.ProjectDatas = res.data.total.records;
         this.total = res.data.total.total;
-        this.page = 1;
       }, e => {
 
       });
@@ -834,6 +839,10 @@ export default {
       }
     }
   }
+  .table-height{
+    height: calc(~'100% - 65px');
+    overflow: auto;
+  }
 }
 </style>
 
diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step5.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step5.vue
index 042cae413..43db410b6 100644
--- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step5.vue
@@ -137,7 +137,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/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
index 7e03d00a3..52ecd734b 100644
--- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
@@ -6,23 +6,27 @@
         <el-form :modal="nonConformitySearch" inline class="label-input-form">
           <el-form-item label="标准号/标准名称" class="search-item">
             <el-input v-model="nonConformitySearch.standSerialNumber"
-                      placeholder="请输入"
+                      placeholder="根据标准号/标准名称查询"
                       clearable
                       :maxlength="100"></el-input>
           </el-form-item>
           <el-form-item label="项目名称" class="search-item">
             <el-input v-model="nonConformitySearch.productName"
-                      placeholder="请输入"
+                      placeholder="根据项目名称查询"
                       clearable
                       :maxlength="100"></el-input>
           </el-form-item>
           <el-form-item label="责任部门" class="search-item">
-            <el-select v-model="nonConformitySearch.responsibleUnit" placeholder="根据责任部门查找" clearable>
-              <el-option v-for="opt in zrbmOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value"
-                         :label="opt.label">
-                {{ opt.label }}
-              </el-option>
-            </el-select>
+            <el-input v-model="nonConformitySearch.responsibleUnit"
+                      placeholder="根据责任部门查询"
+                      clearable
+                      :maxlength="100"></el-input>
+<!--            <el-select v-model="nonConformitySearch.responsibleUnit" placeholder="根据责任部门查找" clearable>-->
+<!--              <el-option v-for="opt in zrbmOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value"-->
+<!--                         :label="opt.label">-->
+<!--                {{ opt.label }}-->
+<!--              </el-option>-->
+<!--            </el-select>-->
           </el-form-item>
           <el-form-item class="search-item btn-box">
             <el-button

From 5b1d32a50cc047ff2f16405e3b73a9c71ef5e0dc Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Tue, 21 Dec 2021 15:27:09 +0800
Subject: [PATCH 12/26] =?UTF-8?q?=E5=9B=BD=E5=86=85=E5=A4=96=20-=20?=
 =?UTF-8?q?=E9=AB=98=E7=BA=A7=E6=A3=80=E7=B4=A2=20-=20=E5=BA=95=E4=B8=8B?=
 =?UTF-8?q?=E7=9A=84=E6=BB=9A=E5=8A=A8=E6=9D=A1?=
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 acbf66a62..be906d5ad 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -1498,7 +1498,7 @@
       <!--    高级筛选-->
       <el-drawer
           title="高级搜索"
-          size="700px"
+          size="710px"
           :wrapperClosable="false"
           :visible.sync="isAdvancedSearch">
         <div class="demo-drawer-content">
diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index 35a233385..e24b19208 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -458,7 +458,7 @@
       <!--    高级筛选-->
       <el-drawer
         title="高级搜索"
-        size="700px"
+        size="710px"
         :wrapperClosable="false"
         :visible.sync="isAdvancedSearch">
         <div class="demo-drawer-content">

From d299f8315cef4e7adb78aca29dca48f2c8f3176b Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Tue, 21 Dec 2021 16:00:51 +0800
Subject: [PATCH 13/26] =?UTF-8?q?=E5=9B=BD=E5=86=85=E5=BA=93=20-=20?=
 =?UTF-8?q?=E9=AB=98=E7=BA=A7=E6=A3=80=E7=B4=A2=20-=20=E8=B4=A3=E4=BB=BB?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8=E5=92=8C=E8=B4=A3=E4=BB=BB=E5=B7=A5=E7=A8=8B?=
 =?UTF-8?q?=E5=B8=88=E8=A6=81=E6=94=B9=E6=88=90=E5=8F=B3=E4=BE=A7=E5=BC=B9?=
 =?UTF-8?q?=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domesticStandardsAndRegulations/index.vue | 66 ++++++++++++++-----
 1 file changed, 50 insertions(+), 16 deletions(-)

diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index be906d5ad..c97c031d5 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -1712,12 +1712,24 @@
 <!--                  </el-form-item>-->
                   <!--            责任工程师-->
                   <template>
-                    <custom-select-array
-                        :key="zrgcsOptions.options"
-                        :config="zrgcsOptions"
-                        v-model="advanceSearchMapping['ZRGCS']"
-                    ></custom-select-array>
+                    <el-form-item
+                        prop="ZRGCSUser"
+                        label-width="150px"
+                        class="add-form-item"
+                    >
+                      <template slot="label">责任工程师</template>
+                      <el-input v-model="advanceSearchMapping['ZRGCS']" placeholder="查询责任工程师"
+                                @click.native="choiceZRRS('zrgcs', '查询责任工程师', advanceSearchMapping['ZRGCS'])">
+                      </el-input>
+                    </el-form-item>
                   </template>
+<!--                  <template>-->
+<!--                    <custom-select-array-->
+<!--                        :key="zrgcsOptions.options"-->
+<!--                        :config="zrgcsOptions"-->
+<!--                        v-model="advanceSearchMapping['ZRGCS']"-->
+<!--                    ></custom-select-array>-->
+<!--                  </template>-->
 <!--                  <el-form-item label="责任工程师" class="add-form-item form-item-disabled">-->
 <!--                    <el-select v-model="advanceSearchMapping.ZRGCS" placeholder="根据责任工程师查找" clearable filterable-->
 <!--                               @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
@@ -1791,12 +1803,29 @@
 <!--                  </el-form-item>-->
                   <!--            责任部门-->
                   <template>
-                    <custom-select-array
-                        :key="zrbmOptions.options"
-                        :config="zrbmOptions"
-                        v-model="advanceSearchMapping['ZRBM']"
-                    ></custom-select-array>
+                    <el-form-item
+                        prop="ZRBM"
+                        label-width="150px"
+                        class="add-form-item"
+                    >
+                      <template slot="label">责任部门</template>
+                      <el-input
+                          :key="zrbmOptions.options"
+                          :config="zrbmOptions"
+                          clearable
+                          v-model="advanceSearchMapping['ZRBM']"
+                          :disabled="formdisableflag" placeholder="查询责任部门"
+                          @click.native="choiceZRBM('ZRBMId', '查询责任部门', advanceSearchMapping['ZRBM'])">
+                      </el-input>
+                    </el-form-item>
                   </template>
+<!--                  <template>-->
+<!--                    <custom-select-array-->
+<!--                        :key="zrbmOptions.options"-->
+<!--                        :config="zrbmOptions"-->
+<!--                        v-model="advanceSearchMapping['ZRBM']"-->
+<!--                    ></custom-select-array>-->
+<!--                  </template>-->
 <!--                  <el-form-item label="责任部门" class="add-form-item form-item-disabled">-->
 <!--                    <el-select v-model="advanceSearchMapping.ZRBM" placeholder="根据责任部门查找" clearable filterable-->
 <!--                               @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
@@ -5521,7 +5550,7 @@ export default {
       })
     },
     choiceZRRS (type, title, id) {
-      console.log('2077',title)
+      console.log('2077',type, title, id)
       this.nodeList = []
       this.nodeList.push(id)
       this.userType = type
@@ -5529,7 +5558,7 @@ export default {
       this.modalShowRoleFlag = true
     },
     checkedRole2 (data) {
-      console.log('1712',this.drawerTitle)
+      console.log('1712',data)
       let idList = ''
       let nameList = ''
       data.forEach( item => {
@@ -5544,6 +5573,8 @@ export default {
         this.sarStandardsInfoEO['WSSMR'] = nameList
       }else if (this.drawerTitle === '选择责任工程师'){
         this.sarStandardsInfoEO['ZRGCS'] = nameList
+      }else if (this.drawerTitle === '查询责任工程师'){
+        this.advanceSearchMapping['ZRGCS'] = nameList
       }
 
     },
@@ -5577,7 +5608,7 @@ export default {
     },
     drawerCheckZRBM(data) {
 
-      console.log("5389", data);
+      console.log("5389", this.drawerTitle);
       let idList = ''
       let nameList = ''
       data.forEach(item => {
@@ -5590,9 +5621,12 @@ export default {
           nameList += item.name
         // }
       })
-
-      this.sarStandardsInfoEO.ZRBMId = idList;
-      this.sarStandardsInfoEO['ZRBM'] = nameList;
+      if (this.drawerTitle === '责任部门'){
+        this.sarStandardsInfoEO.ZRBMId = idList;
+        this.sarStandardsInfoEO['ZRBM'] = nameList;
+      }else if (this.drawerTitle === '查询责任部门'){
+        this.advanceSearchMapping['ZRBM'] = nameList
+      }
 
     },
   },

From 6337c4340930edf51be07e34afb18ae5dcf40721 Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Tue, 21 Dec 2021 16:16:20 +0800
Subject: [PATCH 14/26] =?UTF-8?q?=E6=B5=B7=E5=A4=96=E5=BA=93=20-=20?=
 =?UTF-8?q?=E9=AB=98=E7=BA=A7=E6=A3=80=E7=B4=A2=20-=20=E8=B4=A3=E4=BB=BB?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8=E5=92=8C=E8=B4=A3=E4=BB=BB=E5=B7=A5=E7=A8=8B?=
 =?UTF-8?q?=E5=B8=88=E8=A6=81=E6=94=B9=E6=88=90=E5=8F=B3=E4=BE=A7=E5=BC=B9?=
 =?UTF-8?q?=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../foreignStandardsAndRegulations/index.vue  | 59 +++++++++++++++----
 1 file changed, 47 insertions(+), 12 deletions(-)

diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index e24b19208..73c5d4fa5 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -659,12 +659,24 @@
                   </el-form-item>
                   <!--            责任工程师-->
                   <template>
-                    <custom-select-array
-                        :key="zrgcsOptions.options"
-                        :config="zrgcsOptions"
-                        v-model="advanceSearchMapping['ZRGCS']"
-                    ></custom-select-array>
+                    <el-form-item
+                        prop="ZRGCSUser"
+                        label-width="150px"
+                        class="add-form-item"
+                    >
+                      <template slot="label">责任工程师</template>
+                      <el-input v-model="advanceSearchMapping['ZRGCS']" placeholder="查询责任工程师"
+                                @click.native="choiceZRRS('zrgcs', '查询责任工程师', advanceSearchMapping['ZRGCS'])">
+                      </el-input>
+                    </el-form-item>
                   </template>
+<!--                  <template>-->
+<!--                    <custom-select-array-->
+<!--                        :key="zrgcsOptions.options"-->
+<!--                        :config="zrgcsOptions"-->
+<!--                        v-model="advanceSearchMapping['ZRGCS']"-->
+<!--                    ></custom-select-array>-->
+<!--                  </template>-->
 <!--                  <el-form-item label="责任工程师" class="add-form-item form-item-disabled">-->
 <!--                    <el-select v-model="advanceSearchMapping.ZRGCS" placeholder="根据责任工程师查找" clearable filterable-->
 <!--                               @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
@@ -722,12 +734,29 @@
 <!--                  </el-form-item>-->
                   <!--            责任部门-->
                   <template>
-                    <custom-select-array
-                        :key="zrbmOptions.options"
-                        :config="zrbmOptions"
-                        v-model="advanceSearchMapping['ZRBM']"
-                    ></custom-select-array>
+                    <el-form-item
+                        prop="ZRBM"
+                        label-width="150px"
+                        class="add-form-item"
+                    >
+                      <template slot="label">责任部门</template>
+                      <el-input
+                          :key="zrbmOptions.options"
+                          :config="zrbmOptions"
+                          clearable
+                          v-model="advanceSearchMapping['ZRBM']"
+                          :disabled="formdisableflag" placeholder="查询责任部门"
+                          @click.native="choiceZRBM('ZRBMId', '查询责任部门', advanceSearchMapping['ZRBM'])">
+                      </el-input>
+                    </el-form-item>
                   </template>
+<!--                  <template>-->
+<!--                    <custom-select-array-->
+<!--                        :key="zrbmOptions.options"-->
+<!--                        :config="zrbmOptions"-->
+<!--                        v-model="advanceSearchMapping['ZRBM']"-->
+<!--                    ></custom-select-array>-->
+<!--                  </template>-->
 <!--                  <el-form-item label="责任部门" class="add-form-item form-item-disabled">-->
 <!--                    <el-select v-model="advanceSearchMapping.ZRBM" placeholder="根据责任部门查找" clearable filterable-->
 <!--                               @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
@@ -2574,6 +2603,8 @@ export default {
         this.sarStandardsInfoEO['WSSMR'] = nameList
       }else if (this.drawerTitle === '选择责任工程师'){
         this.sarStandardsInfoEO['ZRGCS'] = nameList
+      }else if (this.drawerTitle === '查询责任工程师'){
+        this.advanceSearchMapping['ZRGCS'] = nameList
       }
 
     },
@@ -4981,8 +5012,12 @@ export default {
           nameList += item.name
         // }
       })
-      this.sarStandardsInfoEO.ZRBMId = idList;
-      this.sarStandardsInfoEO['ZRBM'] = nameList;
+      if (this.drawerTitle === '责任部门'){
+        this.sarStandardsInfoEO.ZRBMId = idList;
+        this.sarStandardsInfoEO['ZRBM'] = nameList;
+      }else if (this.drawerTitle === '查询责任部门'){
+        this.advanceSearchMapping['ZRBM'] = nameList
+      }
     },
   },
   computed: {

From 1ea35ee8c61e76a1f565f9c3da50ab6f1ea83015 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Tue, 21 Dec 2021 16:29:08 +0800
Subject: [PATCH 15/26] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2bug?=
 =?UTF-8?q?=20=20=E9=A1=B5=E9=9D=A2=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/xmpg/step1-1.vue       | 123 +++---
 .../pages/creatProcess/xmpg/step1-7.vue       | 272 ++++++-------
 .../pages/creatProcess/xmpg/step1.vue         |  89 ++--
 .../pages/creatProcess/xmpg/step2.vue         |  96 ++---
 .../pages/creatProcess/xmpg/step3.vue         | 225 ++++++-----
 .../pages/creatProcess/xmpg/step4.vue         | 380 +++++++++---------
 .../pages/creatProcess/xmpg/step5.vue         | 272 ++++++-------
 .../pages/creatProcess/xmpg/step6.vue         | 272 ++++++-------
 .../pages/creatProcess/xmpg/step7.vue         | 272 ++++++-------
 9 files changed, 1005 insertions(+), 996 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue
index 61751a987..779be09ba 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue
@@ -10,7 +10,7 @@
       <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">人员信息</div>
     </div>
     <div class="content" v-show="active === '1'">
-      <div style="flex: auto; overflow: auto">
+      <div style=" overflow: auto">
         <process-title>
           <template slot="title">基础信息</template>
         </process-title>
@@ -149,76 +149,77 @@
             </el-col>
           </el-row>
         </el-form>
-        <process-title>
-          <template slot="title">填写信息</template>
-        </process-title>
-        <div class="tableTitle">
-          <div class="tableButton">
-            <el-button plain class="common-button-primary" size="mini" @click="addList">添加</el-button>
-            <el-button plain class="common-button-primary" size="mini" @click="deleteList">批量删除</el-button>
-          </div>
-        </div>
-        <el-table
-          :data="dataList"
-          border
-          ref="selection"
-          height="49%"
-          style="width: 100%;"
-          @selection-change="selectStandChange"
-          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
-              fontWeight: 'bold', height: '48px'}">
-          <el-table-column
-            type="selection"
-            width="55"
-            align="center">
-          </el-table-column>
-          <el-table-column
-            prop="productLine"
-            label="产品线">
-          </el-table-column>
-          <el-table-column
-            prop="uname"
-            label="产品线责任人">
-          </el-table-column>
-          <el-table-column
-            prop="distributePerson"
-            label="分发责任人">
-            <template slot-scope="scope">
-              <el-input
-                v-model="scope.row.distributePerson"
-                placeholder="请选择分发负责人"
-                readonly
-                @click.native="choiceZRR(scope,'distributePerson', '选择分发责任人', roleForm.distributePerson)"
-                ></el-input>
-<!--              <span v-else>{{ scope.row.distributePerson }}</span>-->
-            </template>
-            <!--            <template slot-scope="scope,text" v-if="showColumn">-->
-            <!--              <div>-->
-            <!--                <div  @click="choiceZRR(scope,'distributePerson', '选择分发责任人', roleForm.distributePerson)">-->
-            <!--                  {{ listForm.dataList[scope.$index].distributePerson == null ? "请选择分发负责人" : listForm.dataList[scope.$index].distributePerson-->
-            <!--                  }}-->
-            <!--                </div>-->
-            <!--              </div>-->
-            <!--            </template>-->
-          </el-table-column>
-        </el-table>
+
       </div>
-    </div>
-    <div>
+      <process-title>
+        <template slot="title">填写信息</template>
+      </process-title>
+      <div class="tableTitle">
+        <div class="tableButton">
+          <el-button plain class="common-button-primary" size="mini" @click="addList">添加</el-button>
+          <el-button plain class="common-button-primary" size="mini" @click="deleteList">批量删除</el-button>
+        </div>
+      </div>
+      <el-table
+        :data="dataList"
+        border
+        ref="selection"
+        height="100%"
+        style="width: 100%;"
+        @selection-change="selectStandChange"
+        :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+              fontWeight: 'bold', height: '48px'}">
+        <el-table-column
+          type="selection"
+          width="55"
+          align="center">
+        </el-table-column>
+        <el-table-column
+          prop="productLine"
+          label="产品线">
+        </el-table-column>
+        <el-table-column
+          prop="uname"
+          label="产品线责任人">
+        </el-table-column>
+        <el-table-column
+          prop="distributePerson"
+          label="分发责任人">
+          <template slot-scope="scope">
+            <el-input
+              v-model="scope.row.distributePerson"
+              placeholder="请选择分发负责人"
+              readonly
+              @click.native="choiceZRR(scope,'distributePerson', '选择分发责任人', roleForm.distributePerson)"
+            ></el-input>
+            <!--              <span v-else>{{ scope.row.distributePerson }}</span>-->
+          </template>
+          <!--            <template slot-scope="scope,text" v-if="showColumn">-->
+          <!--              <div>-->
+          <!--                <div  @click="choiceZRR(scope,'distributePerson', '选择分发责任人', roleForm.distributePerson)">-->
+          <!--                  {{ listForm.dataList[scope.$index].distributePerson == null ? "请选择分发负责人" : listForm.dataList[scope.$index].distributePerson-->
+          <!--                  }}-->
+          <!--                </div>-->
+          <!--              </div>-->
+          <!--            </template>-->
+        </el-table-column>
+      </el-table>
       <el-collapse accordion>
         <el-collapse-item title="回执说明">
           <div style="margin: 10px 0;">
             <el-input
-                type="textarea"
-                :rows="3"
-                resize="none"
-                placeholder="请输入意见"
-                v-model="commentText">
+              type="textarea"
+              :rows="3"
+              resize="none"
+              placeholder="请输入意见"
+              v-model="commentText">
             </el-input>
           </div>
         </el-collapse-item>
       </el-collapse>
     </div>
+    <div>
+    </div>
     <div class="content" v-show="active === '2'">
       <div class="block" style="padding-top: 20px;">
         <el-timeline>
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue
index 31429b97f..fecc071a4 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue
@@ -11,7 +11,7 @@
       <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
     </div>
     <div class="content" v-show="active === '1'">
-      <div style="flex: auto; overflow: auto">
+      <div style="overflow: auto">
         <process-title>
           <template slot="title">基础信息</template>
         </process-title>
@@ -132,143 +132,143 @@
             </el-col>
           </el-row>
         </el-form>
-        <process-title>
-          <template slot="title">填写信息</template>
-        </process-title>
-        <div class="tableTitle">
-        </div>
-        <el-table
-          ref="multipleTable"
-          :data="dataList"
-          tooltip-effect="dark"
-          style="width: 100%"
-          border
-          @selection-change="selectStandChange"
-          height="52%"
-          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
-             fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold'}">
-          <el-table-column
-            type="selection"
-            width="55"
-            align="center">
-          </el-table-column>
-          <el-table-column
-            prop="productLine"
-            align="center"
-            width="200"
-            label="产品线">
-          </el-table-column>
-          <el-table-column
-            prop="projectNumber"
-            align="center"
-            width="200"
-            label="项目编号">
-          </el-table-column>
-          <el-table-column
-            prop="projectName"
-            align="center"
-            width="200"
-            label="项目名称">
-          </el-table-column>
-          <el-table-column
-            prop="itemNum"
-            align="center"
-            width="200"
-            label="条款号">
-          </el-table-column>
-          <el-table-column
-            prop="itemsName"
-            width="200"
-            align="center"
-            label="条款名称">
-          </el-table-column>
-          <el-table-column
-            prop="technicalRequir"
-            align="center"
-            width="250"
-            label="核心技术要求/变化点">
-          </el-table-column>
-          <el-table-column
-            prop="changePoint"
-            width="250"
-            align="center"
-            label="基于上一版本差异">
-          </el-table-column>
-          <el-table-column
-            prop="xCXSSRQ"
-            width="200"
-            align="center"
-            label="新车型实施日期">
-          </el-table-column>
-          <el-table-column
-            prop="zCCSSRQ"
-            width="200"
-            align="center"
-            label="在产车实施日期">
-          </el-table-column>
-            <el-table-column
-              prop="complianceReasons"
-              align="center"
-              width="160"
-              label="合规">
-            </el-table-column>
-            <el-table-column
-              align="center"
-              width="160"
-              prop="researchNonCompliance"
-              label="不合规">
-              <el-table-column
-                prop="noCompliance"
-                align="center"
-                width="170"
-                label="不合规项目">
-              </el-table-column>
-              <el-table-column
-                prop="countermeasures"
-                align="center"
-                width="160"
-                label="应对措施">
-              </el-table-column>
-              <el-table-column
-                prop="completionTime"
-                align="center"
-                width="120"
-                label="完成时间">
-                <template slot-scope="scope">
-                  <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
-                </template>
-              </el-table-column>
-            </el-table-column>
-          <el-table-column
-            fixed="right"
-            align="center"
-            width="150"
-            prop="implementer"
-            label="落实人">
-          </el-table-column>
-          <el-table-column
-            fixed="right"
-            align="center"
-            width="150"
-            prop="distributePerson"
-            label="责任人">
-          </el-table-column>
-        </el-table>
       </div>
+      <process-title>
+        <template slot="title">填写信息</template>
+      </process-title>
+      <div class="tableTitle">
+      </div>
+      <el-table
+        ref="multipleTable"
+        :data="dataList"
+        tooltip-effect="dark"
+        style="width: 100%"
+        border
+        @selection-change="selectStandChange"
+        height="52%"
+        :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+             fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold'}">
+        <el-table-column
+          type="selection"
+          width="55"
+          align="center">
+        </el-table-column>
+        <el-table-column
+          prop="productLine"
+          align="center"
+          width="200"
+          label="产品线">
+        </el-table-column>
+        <el-table-column
+          prop="projectNumber"
+          align="center"
+          width="200"
+          label="项目编号">
+        </el-table-column>
+        <el-table-column
+          prop="projectName"
+          align="center"
+          width="200"
+          label="项目名称">
+        </el-table-column>
+        <el-table-column
+          prop="itemNum"
+          align="center"
+          width="200"
+          label="条款号">
+        </el-table-column>
+        <el-table-column
+          prop="itemsName"
+          width="200"
+          align="center"
+          label="条款名称">
+        </el-table-column>
+        <el-table-column
+          prop="technicalRequir"
+          align="center"
+          width="250"
+          label="核心技术要求/变化点">
+        </el-table-column>
+        <el-table-column
+          prop="changePoint"
+          width="250"
+          align="center"
+          label="基于上一版本差异">
+        </el-table-column>
+        <el-table-column
+          prop="xCXSSRQ"
+          width="200"
+          align="center"
+          label="新车型实施日期">
+        </el-table-column>
+        <el-table-column
+          prop="zCCSSRQ"
+          width="200"
+          align="center"
+          label="在产车实施日期">
+        </el-table-column>
+        <el-table-column
+          prop="complianceReasons"
+          align="center"
+          width="160"
+          label="合规">
+        </el-table-column>
+        <el-table-column
+          align="center"
+          width="160"
+          prop="researchNonCompliance"
+          label="不合规">
+          <el-table-column
+            prop="noCompliance"
+            align="center"
+            width="170"
+            label="不合规项目">
+          </el-table-column>
+          <el-table-column
+            prop="countermeasures"
+            align="center"
+            width="160"
+            label="应对措施">
+          </el-table-column>
+          <el-table-column
+            prop="completionTime"
+            align="center"
+            width="120"
+            label="完成时间">
+            <template slot-scope="scope">
+              <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
+            </template>
+          </el-table-column>
+        </el-table-column>
+        <el-table-column
+          fixed="right"
+          align="center"
+          width="150"
+          prop="implementer"
+          label="落实人">
+        </el-table-column>
+        <el-table-column
+          fixed="right"
+          align="center"
+          width="150"
+          prop="distributePerson"
+          label="责任人">
+        </el-table-column>
+      </el-table>
+      <el-collapse accordion>
+        <el-collapse-item title="审批意见">
+          <div style="margin: 10px 0;">
+            <el-input
+              type="textarea"
+              :rows="3"
+              resize="none"
+              placeholder="请输入意见"
+              v-model="commentText">
+            </el-input>
+          </div>
+        </el-collapse-item>
+      </el-collapse>
       <div>
-        <el-collapse accordion>
-          <el-collapse-item title="审批意见">
-            <div style="margin: 10px 0;">
-              <el-input
-                type="textarea"
-                :rows="3"
-                resize="none"
-                placeholder="请输入意见"
-                v-model="commentText">
-              </el-input>
-            </div>
-          </el-collapse-item>
-        </el-collapse>
       </div>
     </div>
 
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
index 4e537e0a6..a9b8e2959 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
@@ -10,7 +10,7 @@
       <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">人员信息</div>
     </div>
     <div class="content" v-show="active === '1'">
-      <div style="flex: auto; overflow: auto">
+      <div style=" overflow: auto">
         <process-title>
           <template slot="title">基础信息</template>
         </process-title>
@@ -163,50 +163,49 @@
             </el-col>
           </el-row>
         </el-form>
-        <process-title>
-          <template slot="title">填写信息</template>
-        </process-title>
-        <div class="tableTitle">
-          <div class="tableButton">
-            <el-button plain class="common-button-primary" size="mini" @click="addList">添加</el-button>
-            <el-button plain class="common-button-primary" size="mini" @click="deleteList">批量删除</el-button>
-          </div>
-        </div>
-        <el-table
-          :data="dataList"
-          border
-          ref="selection"
-          height="49%"
-          style="width: 100%;"
-          @selection-change="selectStandChange"
-          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
-              fontWeight: 'bold', height: '48px'}">
-          <el-table-column
-            type="selection"
-            width="55"
-            align="center">
-          </el-table-column>
-          <el-table-column
-            prop="productLine"
-            label="产品线">
-          </el-table-column>
-          <el-table-column
-            prop="uname"
-            label="产品线责任人">
-          </el-table-column>
-          <el-table-column
-            prop="distributePerson"
-            label="分发责任人">
-            <template slot-scope="scope">
-              <el-input v-model="scope.row.distributePersonId" style="display: none;" />
-              <el-input v-model="scope.row.distributePerson" placeholder="请选择责任人"
-                        @click.native="choiceZRR(scope,'distributePerson', '选择分发责任人', roleForm.distributePerson)" />
-            </template>
-          </el-table-column>
-        </el-table>
+
       </div>
-    </div>
-    <div>
+      <process-title>
+        <template slot="title">填写信息</template>
+      </process-title>
+      <div class="tableTitle">
+        <div class="tableButton">
+          <el-button plain class="common-button-primary" size="mini" @click="addList">添加</el-button>
+          <el-button plain class="common-button-primary" size="mini" @click="deleteList">批量删除</el-button>
+        </div>
+      </div>
+      <el-table
+        :data="dataList"
+        border
+        ref="selection"
+        height="100%"
+        style="width: 100%;"
+        @selection-change="selectStandChange"
+        :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+              fontWeight: 'bold', height: '48px'}">
+        <el-table-column
+          type="selection"
+          width="55"
+          align="center">
+        </el-table-column>
+        <el-table-column
+          prop="productLine"
+          label="产品线">
+        </el-table-column>
+        <el-table-column
+          prop="uname"
+          label="产品线责任人">
+        </el-table-column>
+        <el-table-column
+          prop="distributePerson"
+          label="分发责任人">
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.distributePersonId" style="display: none;" />
+            <el-input v-model="scope.row.distributePerson" placeholder="请选择责任人"
+                      @click.native="choiceZRR(scope,'distributePerson', '选择分发责任人', roleForm.distributePerson)" />
+          </template>
+        </el-table-column>
+      </el-table>
       <el-collapse accordion>
         <el-collapse-item title="回执说明">
           <div style="margin: 10px 0;">
@@ -221,6 +220,8 @@
         </el-collapse-item>
       </el-collapse>
     </div>
+    <div>
+    </div>
     <div class="content" v-show="active === '2'">
       <div class="block" style="padding-top: 20px;">
         <el-timeline>
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
index ee767fa04..64aaa2992 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
@@ -10,7 +10,7 @@
       <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
     </div>
     <div class="content" v-show="active === '1'">
-      <div style="flex: auto; overflow: auto">
+      <div style="overflow: auto">
         <process-title>
           <template slot="title">基础信息</template>
         </process-title>
@@ -131,55 +131,55 @@
             </el-col>
           </el-row>
         </el-form>
-        <process-title>
-          <template slot="title">填写信息</template>
-        </process-title>
-        <el-table
-          :data="dataList"
-          border
-          ref="selection"
-          height="49%"
-          style="width: 100%;"
-          @selection-change="selectStandChange"
-          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
-              fontWeight: 'bold', height: '48px'}">
-          <el-table-column
-            type="selection"
-            width="55"
-            align="center">
-          </el-table-column>
-          <el-table-column
-            prop="productLine"
-            label="产品线">
-          </el-table-column>
-          <el-table-column
-            prop="productLine"
-            label="项目名称">
-          </el-table-column>
-          <el-table-column
-            prop="uname"
-            label="产品线责任人">
-          </el-table-column>
-          <el-table-column
-            prop="distributePerson"
-            label="分发责任人">
-          </el-table-column>
-        </el-table>
       </div>
+      <process-title>
+        <template slot="title">填写信息</template>
+      </process-title>
+      <el-table
+        :data="dataList"
+        border
+        ref="selection"
+        height="100%"
+        style="width: 100%;"
+        @selection-change="selectStandChange"
+        :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+              fontWeight: 'bold', height: '48px'}">
+        <el-table-column
+          type="selection"
+          width="55"
+          align="center">
+        </el-table-column>
+        <el-table-column
+          prop="productLine"
+          label="产品线">
+        </el-table-column>
+        <el-table-column
+          prop="productLine"
+          label="项目名称">
+        </el-table-column>
+        <el-table-column
+          prop="uname"
+          label="产品线责任人">
+        </el-table-column>
+        <el-table-column
+          prop="distributePerson"
+          label="分发责任人">
+        </el-table-column>
+      </el-table>
+      <el-collapse accordion>
+        <el-collapse-item title="审批意见">
+          <div style="margin: 10px 0;">
+            <el-input
+              type="textarea"
+              :rows="3"
+              resize="none"
+              placeholder="请输入意见"
+              v-model="commentText">
+            </el-input>
+          </div>
+        </el-collapse-item>
+      </el-collapse>
       <div>
-        <el-collapse accordion>
-          <el-collapse-item title="审批意见">
-            <div style="margin: 10px 0;">
-              <el-input
-                type="textarea"
-                :rows="3"
-                resize="none"
-                placeholder="请输入意见"
-                v-model="commentText">
-              </el-input>
-            </div>
-          </el-collapse-item>
-        </el-collapse>
       </div>
     </div>
 
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
index cb4584e91..84d1538ad 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
@@ -15,7 +15,7 @@
           <template slot="title">基础信息</template>
         </process-title>
         <el-collapse-transition>
-          <div class="prc-content-border" v-if="foldFormFlag === false">
+          <div  v-if="foldFormFlag === false">
          <el-form
           :model="listForm"
           class="label-input-form prc-content-border"
@@ -132,108 +132,7 @@
             </el-col>
           </el-row>
         </el-form>
-        <process-title>
-          <template slot="title">填写信息</template>
-        </process-title>
-        <div class="tableTitle">
-          <div class="tableButton">
-            <el-button class="common-button-primary" plain size="mini" @click="addProject">添加
-            </el-button>
-            <el-button plain class="common-button-primary" type="primary" size="mini" @click="deleteList">批量删除
-            </el-button>
-            <el-button plain class="common-button-primary" type="primary" size="mini" @click="choiceZRRS('', 2, '')">
-              批量分发落实人
-            </el-button>
-          </div>
-        </div>
-        <el-table
-          ref="multipleTable"
-          :data="breakdownList"
-          style="width: 100%; border: 1px solid #cccccc;height: 400px"
-          height="48%"
-          border
-          highlight-current-row
-          @selection-change="selectStandChange"
-          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
-             fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}">
-          <el-table-column
-            type="selection"
-            width="55"
-            align="center">
-          </el-table-column>
-          <el-table-column
-            prop="productLine"
-            align="center"
-            width="150"
-            label="产品线">
-          </el-table-column>
-          <el-table-column
-            prop="projectNumber"
-            align="center"
-            width="160px"
-            label="项目编号">
-          </el-table-column>
-          <el-table-column
-            prop="projectName"
-            align="center"
-            min-width="300"
-            label="项目名称">
-          </el-table-column>
-          <el-table-column
-            prop="itemNum"
-            align="center"
-            width="100px"
-            label="条款号">
-          </el-table-column>
-          <el-table-column
-            prop="itemsName"
-            align="center"
-            width="160px"
-            label="条款名称">
-          </el-table-column>
-          <el-table-column
-            prop="technicalRequir"
-            align="center"
-            width="160px"
-            label="核心技术要求/变化点">
-          </el-table-column>
-          <el-table-column
-            prop="changePoint"
-            align="center"
-            width="160px"
-            label="基于上一版本差异">
-          </el-table-column>
-          <el-table-column
-            prop="xcxssrq"
-            align="center"
-            width="120px"
-            label="新车型实施日期">
-          </el-table-column>
-          <el-table-column
-            prop="zccssrq"
-            align="center"
-            width="120px"
-            label="在产车实施日期">
-          </el-table-column>
-          <el-table-column
-            label="落实人"
-            width="210"
-            align="center">
-            <template slot-scope="scope">
-              <el-input v-model="scope.row.implementerId" style="display: none;" />
-              <el-input v-model="scope.row.implementer" placeholder="请选择落实人"
-                        @click.native="choiceZRRS(scope.row, 1, scope.$index)" />
-            </template>
-          </el-table-column>
-        </el-table>
-<!--        <el-pagination-->
-<!--          layout="total,sizes, prev, pager, next"-->
-<!--          background-->
-<!--          :page-sizes="[20, 40, 60]"-->
-<!--          :total="total"-->
-<!--          @size-change="handleSizeChange"-->
-<!--          @current-change="handleCurrentChange"-->
-<!--        />-->
+
         <!--    选择责任人-->
         <Role-tree
           is-title="选择落实人"
@@ -242,6 +141,108 @@
           :nodeList="nodeList"
         ></Role-tree>
       </div>
+      <process-title>
+        <template slot="title">填写信息</template>
+      </process-title>
+      <div class="tableTitle">
+        <div class="tableButton">
+          <el-button class="common-button-primary" plain size="mini" @click="addProject">添加
+          </el-button>
+          <el-button plain class="common-button-primary" type="primary" size="mini" @click="deleteList">批量删除
+          </el-button>
+          <el-button plain class="common-button-primary" type="primary" size="mini" @click="choiceZRRS('', 2, '')">
+            批量分发落实人
+          </el-button>
+        </div>
+      </div>
+      <el-table
+        ref="multipleTable"
+        :data="breakdownList"
+        style="width: 100%; border: 1px solid #cccccc;height: 400px"
+        height="100%"
+        border
+        highlight-current-row
+        @selection-change="selectStandChange"
+        :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+             fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}">
+        <el-table-column
+          type="selection"
+          width="55"
+          align="center">
+        </el-table-column>
+        <el-table-column
+          prop="productLine"
+          align="center"
+          width="150"
+          label="产品线">
+        </el-table-column>
+        <el-table-column
+          prop="projectNumber"
+          align="center"
+          width="160px"
+          label="项目编号">
+        </el-table-column>
+        <el-table-column
+          prop="projectName"
+          align="center"
+          min-width="300"
+          label="项目名称">
+        </el-table-column>
+        <el-table-column
+          prop="itemNum"
+          align="center"
+          width="100px"
+          label="条款号">
+        </el-table-column>
+        <el-table-column
+          prop="itemsName"
+          align="center"
+          width="160px"
+          label="条款名称">
+        </el-table-column>
+        <el-table-column
+          prop="technicalRequir"
+          align="center"
+          width="160px"
+          label="核心技术要求/变化点">
+        </el-table-column>
+        <el-table-column
+          prop="changePoint"
+          align="center"
+          width="160px"
+          label="基于上一版本差异">
+        </el-table-column>
+        <el-table-column
+          prop="xcxssrq"
+          align="center"
+          width="120px"
+          label="新车型实施日期">
+        </el-table-column>
+        <el-table-column
+          prop="zccssrq"
+          align="center"
+          width="120px"
+          label="在产车实施日期">
+        </el-table-column>
+        <el-table-column
+          label="落实人"
+          width="210"
+          align="center">
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.implementerId" style="display: none;" />
+            <el-input v-model="scope.row.implementer" placeholder="请选择落实人"
+                      @click.native="choiceZRRS(scope.row, 1, scope.$index)" />
+          </template>
+        </el-table-column>
+      </el-table>
+      <!--        <el-pagination-->
+      <!--          layout="total,sizes, prev, pager, next"-->
+      <!--          background-->
+      <!--          :page-sizes="[20, 40, 60]"-->
+      <!--          :total="total"-->
+      <!--          @size-change="handleSizeChange"-->
+      <!--          @current-change="handleCurrentChange"-->
+      <!--        />-->
     </div>
 
     <div class="content" v-show="active === '3'">
@@ -341,7 +342,7 @@
                     type="primary"
                     class="common-button-primary"
                     size="small"
-                    @click="getProject">
+                    @click="getProjectBtn">
                     查询
                   </el-button>
                 </el-form-item>
@@ -360,7 +361,7 @@
               style="width: 100%"
               border
               ref="table"
-              height="100%"
+              class="table-height"
               :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
               @selection-change="selectThree"
@@ -679,6 +680,10 @@ export default {
       }
 
     },
+    getProjectBtn(){
+      this.pageNo = 1,
+      this.getProject()
+    },
     getProject() {
       this.$http.get("sarStandProjectLibrary/queryProjectUnderLine", {
         productLine: this.projectLineId,
@@ -967,16 +972,14 @@ export default {
       padding: 0 20px 0;
     }
   }
-
+  position: relative;
+  height: 100%;
   .choiceBtn {
     .el-button--primary {
       width: 150px;
     }
   }
 
-  position: relative;
-  height: 100%;
-
   .headerTabs {
     height: 52px;
     display: flex;
@@ -1035,6 +1038,10 @@ export default {
   .demo-drawer-content {
     margin-top: 10px;
   }
+  .table-height{
+    height: calc(~'100% - 65px');
+    overflow: auto;
+  }
 }
 </style>
 
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
index d53e467ad..ad6f211cc 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
@@ -10,7 +10,7 @@
       <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
     </div>
     <div class="content" v-show="active === '1'">
-      <div style="flex: auto; overflow: auto">
+      <div style="overflow: auto">
         <process-title>
           <template slot="title">基础信息</template>
         </process-title>
@@ -131,201 +131,201 @@
             </el-col>
           </el-row>
         </el-form>
-        <process-title>
-          <template slot="title">填写信息</template>
-        </process-title>
-        <div class="tableTitle">
-          <div class="tableButton">
-            <el-button :disabled="acceptShow" class="common-button-primary add-button" type="primary" size="mini"
-                       @click="batchEdit">批量编辑
-            </el-button>
-          </div>
+      </div>
+      <process-title>
+        <template slot="title">填写信息</template>
+      </process-title>
+      <div class="tableTitle">
+        <div class="tableButton">
+          <el-button :disabled="acceptShow" class="common-button-primary add-button" type="primary" size="mini"
+                     @click="batchEdit">批量编辑
+          </el-button>
         </div>
-        <el-table
-          ref="multipleTable"
-          :data="dataList"
-          tooltip-effect="dark"
-          style="width: 100%"
-          border
-          @selection-change="selectStandChange"
-          height="48%"
-          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+      </div>
+      <el-table
+        ref="multipleTable"
+        :data="dataList"
+        tooltip-effect="dark"
+        style="width: 100%"
+        border
+        @selection-change="selectStandChange"
+        height="100%"
+        :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
              fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold'}">
-          <el-table-column
-            type="selection"
-            width="55"
-            align="center">
-          </el-table-column>
-          <el-table-column
-            prop="productLine"
-            align="center"
-            width="200"
-            label="产品线">
-          </el-table-column>
-          <el-table-column
-            prop="projectNumber"
-            align="center"
-            width="200"
-            label="项目编号">
-          </el-table-column>
-          <el-table-column
-            prop="projectName"
-            align="center"
-            width="200"
-            label="项目名称">
-          </el-table-column>
-          <el-table-column
-            prop="itemNum"
-            align="center"
-            width="200"
-            label="条款号">
-          </el-table-column>
-          <el-table-column
-            prop="itemsName"
-            width="200"
-            align="center"
-            label="条款名称">
-          </el-table-column>
-          <el-table-column
-            prop="technicalRequir"
-            align="center"
-            width="250"
-            label="核心技术要求/变化点">
-          </el-table-column>
-          <el-table-column
-            prop="changePoint"
-            width="250"
-            align="center"
-            label="基于上一版本差异">
-          </el-table-column>
-          <el-table-column
-            prop="xCXSSRQ"
-            width="200"
-            align="center"
-            label="新车型实施日期">
-          </el-table-column>
-          <el-table-column
-            prop="zCCSSRQ"
-            width="200"
-            align="center"
-            label="在产车实施日期">
-          </el-table-column>
-            <el-table-column
-              prop="researchCompliance"
-              align="center"
-              width="160"
-              label="合规">
-              <template slot-scope="scope">
-                <el-input
-                    v-if="dataList[scope.$index].noCompliance && dataList[scope.$index].noCompliance.length>0
+        <el-table-column
+          type="selection"
+          width="55"
+          align="center">
+        </el-table-column>
+        <el-table-column
+          prop="productLine"
+          align="center"
+          width="200"
+          label="产品线">
+        </el-table-column>
+        <el-table-column
+          prop="projectNumber"
+          align="center"
+          width="200"
+          label="项目编号">
+        </el-table-column>
+        <el-table-column
+          prop="projectName"
+          align="center"
+          width="200"
+          label="项目名称">
+        </el-table-column>
+        <el-table-column
+          prop="itemNum"
+          align="center"
+          width="200"
+          label="条款号">
+        </el-table-column>
+        <el-table-column
+          prop="itemsName"
+          width="200"
+          align="center"
+          label="条款名称">
+        </el-table-column>
+        <el-table-column
+          prop="technicalRequir"
+          align="center"
+          width="250"
+          label="核心技术要求/变化点">
+        </el-table-column>
+        <el-table-column
+          prop="changePoint"
+          width="250"
+          align="center"
+          label="基于上一版本差异">
+        </el-table-column>
+        <el-table-column
+          prop="xCXSSRQ"
+          width="200"
+          align="center"
+          label="新车型实施日期">
+        </el-table-column>
+        <el-table-column
+          prop="zCCSSRQ"
+          width="200"
+          align="center"
+          label="在产车实施日期">
+        </el-table-column>
+        <el-table-column
+          prop="researchCompliance"
+          align="center"
+          width="160"
+          label="合规">
+          <template slot-scope="scope">
+            <el-input
+              v-if="dataList[scope.$index].noCompliance && dataList[scope.$index].noCompliance.length>0
                     || dataList[scope.$index].countermeasures && dataList[scope.$index].countermeasures.length>0
                     || dataList[scope.$index].completionTime && dataList[scope.$index].completionTime !== null"
-                    disabled
-                  v-model="dataList[scope.$index].complianceReasons"
-                  placeholder="请输入合规原因"
-                >
-                </el-input>
-                <el-input
-                   v-else
-                   :disabled="acceptShow"
-                   clearable
-                    v-model="dataList[scope.$index].complianceReasons"
-                    placeholder="请输入合规原因"
-                >
-                </el-input>
-              </template>
-            </el-table-column>
-            <el-table-column
-              align="center"
-              width="160"
-              prop="researchNonCompliance"
-              label="不合规">
-              <el-table-column
-                prop="researchNonCompliance"
-                align="center"
-                width="170"
-                label="不合规项目">
-                <template slot-scope="scope">
-                  <el-input
-                      v-if="dataList[scope.$index].complianceReasons && dataList[scope.$index].complianceReasons.length>0"
-                      disabled
-                    v-model="dataList[scope.$index].noCompliance"
-                    placeholder="请输入不合规项目"
-                  >
-                  </el-input>
-                  <el-input
-                      v-else
-                      :disabled="acceptShow"
-                      v-model="dataList[scope.$index].noCompliance"
-                      placeholder="请输入不合规项目"
-                  >
-                  </el-input>
-                </template>
-              </el-table-column>
-              <el-table-column
-                prop="researchCountermeasures"
-                align="center"
-                width="160"
-                label="应对措施">
-                <template slot-scope="scope">
-                  <el-input
-                      v-if="dataList[scope.$index].complianceReasons && dataList[scope.$index].complianceReasons.length>0"
-                      disabled
-                    v-model="dataList[scope.$index].countermeasures"
-                    placeholder="请输入应对措施"
-                  >
-                  </el-input>
-                  <el-input
-                      v-else
-                      :disabled="acceptShow"
-                      v-model="dataList[scope.$index].countermeasures"
-                      placeholder="请输入应对措施"
-                  >
-                  </el-input>
-                </template>
-              </el-table-column>
-              <el-table-column
-                prop="researchCompletionTime"
-                align="center"
-                width="140"
-                label="完成时间">
-                <template slot-scope="scope">
-                  <el-date-picker
-                      v-if="dataList[scope.$index].complianceReasons && dataList[scope.$index].complianceReasons.length>0"
-                      disabled
-                    v-model="dataList[scope.$index].completionTime"
-                    type="date"
-                    placeholder="请选择日期">
-                  </el-date-picker>
-                  <el-date-picker
-                      v-else
-                      :disabled="acceptShow"
-                      class="datePickLen"
-                      clearable
-                      value-format="yyyy-MM-dd HH:mm:ss"
-                      v-model="dataList[scope.$index].completionTime"
-                      type="date"
-                      placeholder="请选择日期">
-                  </el-date-picker>
-                </template>
-              </el-table-column>
-            </el-table-column>
-        </el-table>
-      </div>
-      <div>
-        <el-collapse accordion>
-          <el-collapse-item title="回执说明">
-            <div style="margin: 10px 0;">
+              disabled
+              v-model="dataList[scope.$index].complianceReasons"
+              placeholder="请输入合规原因"
+            >
+            </el-input>
+            <el-input
+              v-else
+              :disabled="acceptShow"
+              clearable
+              v-model="dataList[scope.$index].complianceReasons"
+              placeholder="请输入合规原因"
+            >
+            </el-input>
+          </template>
+        </el-table-column>
+        <el-table-column
+          align="center"
+          width="160"
+          prop="researchNonCompliance"
+          label="不合规">
+          <el-table-column
+            prop="researchNonCompliance"
+            align="center"
+            width="170"
+            label="不合规项目">
+            <template slot-scope="scope">
               <el-input
-                type="textarea"
-                :rows="3"
-                resize="none"
-                placeholder="请输入意见"
-                v-model="commentText">
+                v-if="dataList[scope.$index].complianceReasons && dataList[scope.$index].complianceReasons.length>0"
+                disabled
+                v-model="dataList[scope.$index].noCompliance"
+                placeholder="请输入不合规项目"
+              >
               </el-input>
-            </div>
-          </el-collapse-item>
-        </el-collapse>
+              <el-input
+                v-else
+                :disabled="acceptShow"
+                v-model="dataList[scope.$index].noCompliance"
+                placeholder="请输入不合规项目"
+              >
+              </el-input>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="researchCountermeasures"
+            align="center"
+            width="160"
+            label="应对措施">
+            <template slot-scope="scope">
+              <el-input
+                v-if="dataList[scope.$index].complianceReasons && dataList[scope.$index].complianceReasons.length>0"
+                disabled
+                v-model="dataList[scope.$index].countermeasures"
+                placeholder="请输入应对措施"
+              >
+              </el-input>
+              <el-input
+                v-else
+                :disabled="acceptShow"
+                v-model="dataList[scope.$index].countermeasures"
+                placeholder="请输入应对措施"
+              >
+              </el-input>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="researchCompletionTime"
+            align="center"
+            width="140"
+            label="完成时间">
+            <template slot-scope="scope">
+              <el-date-picker
+                v-if="dataList[scope.$index].complianceReasons && dataList[scope.$index].complianceReasons.length>0"
+                disabled
+                v-model="dataList[scope.$index].completionTime"
+                type="date"
+                placeholder="请选择日期">
+              </el-date-picker>
+              <el-date-picker
+                v-else
+                :disabled="acceptShow"
+                class="datePickLen"
+                clearable
+                value-format="yyyy-MM-dd HH:mm:ss"
+                v-model="dataList[scope.$index].completionTime"
+                type="date"
+                placeholder="请选择日期">
+              </el-date-picker>
+            </template>
+          </el-table-column>
+        </el-table-column>
+      </el-table>
+      <el-collapse accordion>
+        <el-collapse-item title="回执说明">
+          <div style="margin: 10px 0;">
+            <el-input
+              type="textarea"
+              :rows="3"
+              resize="none"
+              placeholder="请输入意见"
+              v-model="commentText">
+            </el-input>
+          </div>
+        </el-collapse-item>
+      </el-collapse>
+      <div>
       </div>
     </div>
 
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
index 913ab3266..47848c7d6 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
@@ -10,7 +10,7 @@
       <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
     </div>
     <div class="content" v-show="active === '1'">
-      <div style="flex: auto; overflow: auto">
+      <div style="overflow: auto">
         <process-title>
           <template slot="title">基础信息</template>
         </process-title>
@@ -131,143 +131,143 @@
             </el-col>
           </el-row>
         </el-form>
-        <process-title>
-          <template slot="title">填写信息</template>
-        </process-title>
-        <div class="tableTitle">
-        </div>
-        <el-table
-          ref="multipleTable"
-          :data="dataList"
-          tooltip-effect="dark"
-          style="width: 100%"
-          border
-          @selection-change="selectStandChange"
-          height="55%"
-          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
-             fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold'}">
-          <el-table-column
-            type="selection"
-            width="55"
-            align="center">
-          </el-table-column>
-          <el-table-column
-            prop="productLine"
-            align="center"
-            width="200"
-            label="产品线">
-          </el-table-column>
-          <el-table-column
-            prop="projectNumber"
-            align="center"
-            width="200"
-            label="项目编号">
-          </el-table-column>
-          <el-table-column
-            prop="projectName"
-            align="center"
-            width="200"
-            label="项目名称">
-          </el-table-column>
-          <el-table-column
-            prop="itemNum"
-            align="center"
-            width="200"
-            label="条款号">
-          </el-table-column>
-          <el-table-column
-            prop="itemsName"
-            width="200"
-            align="center"
-            label="条款名称">
-          </el-table-column>
-          <el-table-column
-            prop="technicalRequir"
-            align="center"
-            width="250"
-            label="核心技术要求/变化点">
-          </el-table-column>
-          <el-table-column
-            prop="changePoint"
-            width="250"
-            align="center"
-            label="基于上一版本差异">
-          </el-table-column>
-          <el-table-column
-            prop="xCXSSRQ"
-            width="200"
-            align="center"
-            label="新车型实施日期">
-          </el-table-column>
-          <el-table-column
-            prop="zCCSSRQ"
-            width="200"
-            align="center"
-            label="在产车实施日期">
-          </el-table-column>
-            <el-table-column
-              prop="complianceReasons"
-              align="center"
-              width="160"
-              label="合规">
-            </el-table-column>
-            <el-table-column
-              align="center"
-              width="160"
-              prop="researchNonCompliance"
-              label="不合规">
-              <el-table-column
-                prop="noCompliance"
-                align="center"
-                width="170"
-                label="不合规项目">
-              </el-table-column>
-              <el-table-column
-                prop="countermeasures"
-                align="center"
-                width="160"
-                label="应对措施">
-              </el-table-column>
-              <el-table-column
-                prop="completionTime"
-                align="center"
-                width="120"
-                label="完成时间">
-                <template slot-scope="scope">
-                  <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
-                </template>
-              </el-table-column>
-            </el-table-column>
-          <el-table-column
-            fixed="right"
-            align="center"
-            width="150"
-            prop="implementer"
-            label="落实人">
-          </el-table-column>
-          <el-table-column
-            fixed="right"
-            align="center"
-            width="150"
-            prop="distributePerson"
-            label="责任人">
-          </el-table-column>
-        </el-table>
       </div>
+      <process-title>
+        <template slot="title">填写信息</template>
+      </process-title>
+      <div class="tableTitle">
+      </div>
+      <el-table
+        ref="multipleTable"
+        :data="dataList"
+        tooltip-effect="dark"
+        style="width: 100%"
+        border
+        @selection-change="selectStandChange"
+        height="100%"
+        :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+             fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold'}">
+        <el-table-column
+          type="selection"
+          width="55"
+          align="center">
+        </el-table-column>
+        <el-table-column
+          prop="productLine"
+          align="center"
+          width="200"
+          label="产品线">
+        </el-table-column>
+        <el-table-column
+          prop="projectNumber"
+          align="center"
+          width="200"
+          label="项目编号">
+        </el-table-column>
+        <el-table-column
+          prop="projectName"
+          align="center"
+          width="200"
+          label="项目名称">
+        </el-table-column>
+        <el-table-column
+          prop="itemNum"
+          align="center"
+          width="200"
+          label="条款号">
+        </el-table-column>
+        <el-table-column
+          prop="itemsName"
+          width="200"
+          align="center"
+          label="条款名称">
+        </el-table-column>
+        <el-table-column
+          prop="technicalRequir"
+          align="center"
+          width="250"
+          label="核心技术要求/变化点">
+        </el-table-column>
+        <el-table-column
+          prop="changePoint"
+          width="250"
+          align="center"
+          label="基于上一版本差异">
+        </el-table-column>
+        <el-table-column
+          prop="xCXSSRQ"
+          width="200"
+          align="center"
+          label="新车型实施日期">
+        </el-table-column>
+        <el-table-column
+          prop="zCCSSRQ"
+          width="200"
+          align="center"
+          label="在产车实施日期">
+        </el-table-column>
+        <el-table-column
+          prop="complianceReasons"
+          align="center"
+          width="160"
+          label="合规">
+        </el-table-column>
+        <el-table-column
+          align="center"
+          width="160"
+          prop="researchNonCompliance"
+          label="不合规">
+          <el-table-column
+            prop="noCompliance"
+            align="center"
+            width="170"
+            label="不合规项目">
+          </el-table-column>
+          <el-table-column
+            prop="countermeasures"
+            align="center"
+            width="160"
+            label="应对措施">
+          </el-table-column>
+          <el-table-column
+            prop="completionTime"
+            align="center"
+            width="120"
+            label="完成时间">
+            <template slot-scope="scope">
+              <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
+            </template>
+          </el-table-column>
+        </el-table-column>
+        <el-table-column
+          fixed="right"
+          align="center"
+          width="150"
+          prop="implementer"
+          label="落实人">
+        </el-table-column>
+        <el-table-column
+          fixed="right"
+          align="center"
+          width="150"
+          prop="distributePerson"
+          label="责任人">
+        </el-table-column>
+      </el-table>
+      <el-collapse accordion>
+        <el-collapse-item title="审批意见">
+          <div style="margin: 10px 0;">
+            <el-input
+              type="textarea"
+              :rows="3"
+              resize="none"
+              placeholder="请输入意见"
+              v-model.trim="commentText">
+            </el-input>
+          </div>
+        </el-collapse-item>
+      </el-collapse>
       <div>
-        <el-collapse accordion>
-          <el-collapse-item title="审批意见">
-            <div style="margin: 10px 0;">
-              <el-input
-                type="textarea"
-                :rows="3"
-                resize="none"
-                placeholder="请输入意见"
-                v-model.trim="commentText">
-              </el-input>
-            </div>
-          </el-collapse-item>
-        </el-collapse>
       </div>
     </div>
 
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
index a8c69fcbc..3452a93fc 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
@@ -10,7 +10,7 @@
       <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
     </div>
     <div class="content" v-show="active === '1'">
-      <div style="flex: auto; overflow: auto">
+      <div style="overflow: auto">
         <process-title>
           <template slot="title">基础信息</template>
         </process-title>
@@ -131,143 +131,143 @@
             </el-col>
           </el-row>
         </el-form>
-        <process-title>
-          <template slot="title">填写信息</template>
-        </process-title>
-        <div class="tableTitle">
-        </div>
-        <el-table
-          ref="multipleTable"
-          :data="dataList"
-          tooltip-effect="dark"
-          style="width: 100%"
-          border
-          @selection-change="selectStandChange"
-          height="55%"
-          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
-             fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold'}">
-          <el-table-column
-            type="selection"
-            width="55"
-            align="center">
-          </el-table-column>
-          <el-table-column
-            prop="productLine"
-            align="center"
-            width="200"
-            label="产品线">
-          </el-table-column>
-          <el-table-column
-            prop="projectNumber"
-            align="center"
-            width="200"
-            label="项目编号">
-          </el-table-column>
-          <el-table-column
-            prop="projectName"
-            align="center"
-            width="200"
-            label="项目名称">
-          </el-table-column>
-          <el-table-column
-            prop="itemNum"
-            align="center"
-            width="200"
-            label="条款号">
-          </el-table-column>
-          <el-table-column
-            prop="itemsName"
-            width="200"
-            align="center"
-            label="条款名称">
-          </el-table-column>
-          <el-table-column
-            prop="technicalRequir"
-            align="center"
-            width="250"
-            label="核心技术要求/变化点">
-          </el-table-column>
-          <el-table-column
-            prop="changePoint"
-            width="250"
-            align="center"
-            label="基于上一版本差异">
-          </el-table-column>
-          <el-table-column
-            prop="xCXSSRQ"
-            width="200"
-            align="center"
-            label="新车型实施日期">
-          </el-table-column>
-          <el-table-column
-            prop="zCCSSRQ"
-            width="200"
-            align="center"
-            label="在产车实施日期">
-          </el-table-column>
-            <el-table-column
-              prop="complianceReasons"
-              align="center"
-              width="160"
-              label="合规">
-            </el-table-column>
-            <el-table-column
-              align="center"
-              width="160"
-              prop="researchNonCompliance"
-              label="不合规">
-              <el-table-column
-                prop="noCompliance"
-                align="center"
-                width="170"
-                label="不合规项目">
-              </el-table-column>
-              <el-table-column
-                prop="countermeasures"
-                align="center"
-                width="160"
-                label="应对措施">
-              </el-table-column>
-              <el-table-column
-                prop="completionTime"
-                align="center"
-                width="120"
-                label="完成时间">
-                <template slot-scope="scope">
-                  <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
-                </template>
-              </el-table-column>
-            </el-table-column>
-          <el-table-column
-            fixed="right"
-            align="center"
-            width="150"
-            prop="implementer"
-            label="落实人">
-          </el-table-column>
-          <el-table-column
-            fixed="right"
-            align="center"
-            width="150"
-            prop="distributePerson"
-            label="责任人">
-          </el-table-column>
-        </el-table>
       </div>
+      <process-title>
+        <template slot="title">填写信息</template>
+      </process-title>
+      <div class="tableTitle">
+      </div>
+      <el-table
+        ref="multipleTable"
+        :data="dataList"
+        tooltip-effect="dark"
+        style="width: 100%"
+        border
+        @selection-change="selectStandChange"
+        height="100%"
+        :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+             fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold'}">
+        <el-table-column
+          type="selection"
+          width="55"
+          align="center">
+        </el-table-column>
+        <el-table-column
+          prop="productLine"
+          align="center"
+          width="200"
+          label="产品线">
+        </el-table-column>
+        <el-table-column
+          prop="projectNumber"
+          align="center"
+          width="200"
+          label="项目编号">
+        </el-table-column>
+        <el-table-column
+          prop="projectName"
+          align="center"
+          width="200"
+          label="项目名称">
+        </el-table-column>
+        <el-table-column
+          prop="itemNum"
+          align="center"
+          width="200"
+          label="条款号">
+        </el-table-column>
+        <el-table-column
+          prop="itemsName"
+          width="200"
+          align="center"
+          label="条款名称">
+        </el-table-column>
+        <el-table-column
+          prop="technicalRequir"
+          align="center"
+          width="250"
+          label="核心技术要求/变化点">
+        </el-table-column>
+        <el-table-column
+          prop="changePoint"
+          width="250"
+          align="center"
+          label="基于上一版本差异">
+        </el-table-column>
+        <el-table-column
+          prop="xCXSSRQ"
+          width="200"
+          align="center"
+          label="新车型实施日期">
+        </el-table-column>
+        <el-table-column
+          prop="zCCSSRQ"
+          width="200"
+          align="center"
+          label="在产车实施日期">
+        </el-table-column>
+        <el-table-column
+          prop="complianceReasons"
+          align="center"
+          width="160"
+          label="合规">
+        </el-table-column>
+        <el-table-column
+          align="center"
+          width="160"
+          prop="researchNonCompliance"
+          label="不合规">
+          <el-table-column
+            prop="noCompliance"
+            align="center"
+            width="170"
+            label="不合规项目">
+          </el-table-column>
+          <el-table-column
+            prop="countermeasures"
+            align="center"
+            width="160"
+            label="应对措施">
+          </el-table-column>
+          <el-table-column
+            prop="completionTime"
+            align="center"
+            width="120"
+            label="完成时间">
+            <template slot-scope="scope">
+              <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
+            </template>
+          </el-table-column>
+        </el-table-column>
+        <el-table-column
+          fixed="right"
+          align="center"
+          width="150"
+          prop="implementer"
+          label="落实人">
+        </el-table-column>
+        <el-table-column
+          fixed="right"
+          align="center"
+          width="150"
+          prop="distributePerson"
+          label="责任人">
+        </el-table-column>
+      </el-table>
+      <el-collapse accordion>
+        <el-collapse-item title="审批意见">
+          <div style="margin: 10px 0;">
+            <el-input
+              type="textarea"
+              :rows="3"
+              resize="none"
+              placeholder="请输入意见"
+              v-model="commentText">
+            </el-input>
+          </div>
+        </el-collapse-item>
+      </el-collapse>
       <div>
-        <el-collapse accordion>
-          <el-collapse-item title="审批意见">
-            <div style="margin: 10px 0;">
-              <el-input
-                type="textarea"
-                :rows="3"
-                resize="none"
-                placeholder="请输入意见"
-                v-model="commentText">
-              </el-input>
-            </div>
-          </el-collapse-item>
-        </el-collapse>
       </div>
     </div>
 
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue
index af28d33af..9b38a0e3c 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue
@@ -10,7 +10,7 @@
       <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
     </div>
     <div class="content" v-show="active === '1'">
-      <div style="flex: auto; overflow: auto">
+      <div style="overflow: auto">
         <process-title>
           <template slot="title">基础信息</template>
         </process-title>
@@ -131,143 +131,143 @@
             </el-col>
           </el-row>
         </el-form>
-        <process-title>
-          <template slot="title">填写信息</template>
-        </process-title>
-        <div class="tableTitle">
-        </div>
-        <el-table
-          ref="multipleTable"
-          :data="dataList"
-          tooltip-effect="dark"
-          style="width: 100%"
-          border
-          @selection-change="selectStandChange"
-          height="52%"
-          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
-             fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold'}">
-          <el-table-column
-            type="selection"
-            width="55"
-            align="center">
-          </el-table-column>
-          <el-table-column
-            prop="productLine"
-            align="center"
-            width="200"
-            label="产品线">
-          </el-table-column>
-          <el-table-column
-            prop="projectNumber"
-            align="center"
-            width="200"
-            label="项目编号">
-          </el-table-column>
-          <el-table-column
-            prop="projectName"
-            align="center"
-            width="200"
-            label="项目名称">
-          </el-table-column>
-          <el-table-column
-            prop="itemNum"
-            align="center"
-            width="200"
-            label="条款号">
-          </el-table-column>
-          <el-table-column
-            prop="itemsName"
-            width="200"
-            align="center"
-            label="条款名称">
-          </el-table-column>
-          <el-table-column
-            prop="technicalRequir"
-            align="center"
-            width="250"
-            label="核心技术要求/变化点">
-          </el-table-column>
-          <el-table-column
-            prop="changePoint"
-            width="250"
-            align="center"
-            label="基于上一版本差异">
-          </el-table-column>
-          <el-table-column
-            prop="xCXSSRQ"
-            width="200"
-            align="center"
-            label="新车型实施日期">
-          </el-table-column>
-          <el-table-column
-            prop="zCCSSRQ"
-            width="200"
-            align="center"
-            label="在产车实施日期">
-          </el-table-column>
-            <el-table-column
-              prop="complianceReasons"
-              align="center"
-              width="160"
-              label="合规">
-            </el-table-column>
-            <el-table-column
-              align="center"
-              width="160"
-              prop="researchNonCompliance"
-              label="不合规">
-              <el-table-column
-                prop="noCompliance"
-                align="center"
-                width="170"
-                label="不合规项目">
-              </el-table-column>
-              <el-table-column
-                prop="countermeasures"
-                align="center"
-                width="160"
-                label="应对措施">
-              </el-table-column>
-              <el-table-column
-                prop="completionTime"
-                align="center"
-                width="120"
-                label="完成时间">
-                <template slot-scope="scope">
-                  <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
-                </template>
-              </el-table-column>
-            </el-table-column>
-          <el-table-column
-            fixed="right"
-            align="center"
-            width="150"
-            prop="implementer"
-            label="落实人">
-          </el-table-column>
-          <el-table-column
-            fixed="right"
-            align="center"
-            width="150"
-            prop="distributePerson"
-            label="责任人">
-          </el-table-column>
-        </el-table>
       </div>
+      <process-title>
+        <template slot="title">填写信息</template>
+      </process-title>
+      <div class="tableTitle">
+      </div>
+      <el-table
+        ref="multipleTable"
+        :data="dataList"
+        tooltip-effect="dark"
+        style="width: 100%"
+        border
+        @selection-change="selectStandChange"
+        height="100%"
+        :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+             fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold'}">
+        <el-table-column
+          type="selection"
+          width="55"
+          align="center">
+        </el-table-column>
+        <el-table-column
+          prop="productLine"
+          align="center"
+          width="200"
+          label="产品线">
+        </el-table-column>
+        <el-table-column
+          prop="projectNumber"
+          align="center"
+          width="200"
+          label="项目编号">
+        </el-table-column>
+        <el-table-column
+          prop="projectName"
+          align="center"
+          width="200"
+          label="项目名称">
+        </el-table-column>
+        <el-table-column
+          prop="itemNum"
+          align="center"
+          width="200"
+          label="条款号">
+        </el-table-column>
+        <el-table-column
+          prop="itemsName"
+          width="200"
+          align="center"
+          label="条款名称">
+        </el-table-column>
+        <el-table-column
+          prop="technicalRequir"
+          align="center"
+          width="250"
+          label="核心技术要求/变化点">
+        </el-table-column>
+        <el-table-column
+          prop="changePoint"
+          width="250"
+          align="center"
+          label="基于上一版本差异">
+        </el-table-column>
+        <el-table-column
+          prop="xCXSSRQ"
+          width="200"
+          align="center"
+          label="新车型实施日期">
+        </el-table-column>
+        <el-table-column
+          prop="zCCSSRQ"
+          width="200"
+          align="center"
+          label="在产车实施日期">
+        </el-table-column>
+        <el-table-column
+          prop="complianceReasons"
+          align="center"
+          width="160"
+          label="合规">
+        </el-table-column>
+        <el-table-column
+          align="center"
+          width="160"
+          prop="researchNonCompliance"
+          label="不合规">
+          <el-table-column
+            prop="noCompliance"
+            align="center"
+            width="170"
+            label="不合规项目">
+          </el-table-column>
+          <el-table-column
+            prop="countermeasures"
+            align="center"
+            width="160"
+            label="应对措施">
+          </el-table-column>
+          <el-table-column
+            prop="completionTime"
+            align="center"
+            width="120"
+            label="完成时间">
+            <template slot-scope="scope">
+              <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
+            </template>
+          </el-table-column>
+        </el-table-column>
+        <el-table-column
+          fixed="right"
+          align="center"
+          width="150"
+          prop="implementer"
+          label="落实人">
+        </el-table-column>
+        <el-table-column
+          fixed="right"
+          align="center"
+          width="150"
+          prop="distributePerson"
+          label="责任人">
+        </el-table-column>
+      </el-table>
+      <el-collapse accordion>
+        <el-collapse-item title="审批意见">
+          <div style="margin: 10px 0;">
+            <el-input
+              type="textarea"
+              :rows="3"
+              resize="none"
+              placeholder="请输入意见"
+              v-model="commentText">
+            </el-input>
+          </div>
+        </el-collapse-item>
+      </el-collapse>
       <div>
-        <el-collapse accordion>
-          <el-collapse-item title="审批意见">
-            <div style="margin: 10px 0;">
-              <el-input
-                type="textarea"
-                :rows="3"
-                resize="none"
-                placeholder="请输入意见"
-                v-model="commentText">
-              </el-input>
-            </div>
-          </el-collapse-item>
-        </el-collapse>
       </div>
     </div>
 

From 4757f1f0c2c315ba60977c91835ff7614f9509d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Tue, 21 Dec 2021 16:44:38 +0800
Subject: [PATCH 16/26] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=BA=9F=E6=AD=A2=20?=
 =?UTF-8?q?=E5=AE=A1=E6=89=B9=E5=8E=86=E5=8F=B2=E8=A1=A8=E6=A0=BC=E9=AB=98?=
 =?UTF-8?q?=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue | 2 +-
 src/pages/processCenter/pages/creatProcess/qbfz/step2.vue   | 2 +-
 src/pages/processCenter/pages/creatProcess/qbfz/step3.vue   | 2 +-
 src/pages/processCenter/pages/creatProcess/qbfz/step4.vue   | 2 +-
 src/pages/processCenter/pages/creatProcess/qbfz/step5.vue   | 2 +-
 src/pages/processCenter/pages/creatProcess/qbfz/step6.vue   | 2 +-
 src/pages/processCenter/pages/creatProcess/qbfz/step7.vue   | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue
index f4031ff2c..e3f943558 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue
@@ -159,7 +159,7 @@
       </div>
     </div>
     <div class="content" v-show="active === '3'">
-      <div class="flow-list">
+      <div class="flow-list" style="height: 100%">
         <el-table
           height="100%"
           ref="selection"
diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step2.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step2.vue
index 34a5b11af..6dea54c04 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfz/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfz/step2.vue
@@ -115,7 +115,7 @@
       </div>
     </div>
     <div class="content" v-show="active === '3'">
-      <div class="flow-list">
+      <div class="flow-list" style="height: 100%">
         <el-table
           height="100%"
           ref="selection"
diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step3.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step3.vue
index 3b6277c6c..735f75c30 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfz/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfz/step3.vue
@@ -124,7 +124,7 @@
       </div>
     </div>
     <div class="content" v-show="active === '3'">
-      <div class="flow-list">
+      <div class="flow-list" style="height: 100%">
         <el-table
           height="100%"
           ref="selection"
diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step4.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step4.vue
index 471b228c4..db380c5f2 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfz/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfz/step4.vue
@@ -159,7 +159,7 @@
       </div>
     </div>
     <div class="content" v-show="active === '3'">
-      <div class="flow-list">
+      <div class="flow-list" style="height: 100%">
         <el-table
           height="100%"
           ref="selection"
diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step5.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step5.vue
index 6f93f475f..0fcf7f0b6 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfz/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfz/step5.vue
@@ -159,7 +159,7 @@
       </div>
     </div>
     <div class="content" v-show="active === '3'">
-      <div class="flow-list">
+      <div class="flow-list" style="height: 100%">
         <el-table
           height="100%"
           ref="selection"
diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step6.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step6.vue
index eb8200695..83cda9209 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfz/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfz/step6.vue
@@ -159,7 +159,7 @@
       </div>
     </div>
     <div class="content" v-show="active === '3'">
-      <div class="flow-list">
+      <div class="flow-list" style="height: 100%">
         <el-table
           height="100%"
           ref="selection"
diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step7.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step7.vue
index 66b26a6c9..94a04acb1 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfz/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfz/step7.vue
@@ -159,7 +159,7 @@
       </div>
     </div>
     <div class="content" v-show="active === '3'">
-      <div class="flow-list">
+      <div class="flow-list" style="height: 100%">
         <el-table
           height="100%"
           ref="selection"

From f9a945f5ef8f71fe2e54da024f95d055881a5879 Mon Sep 17 00:00:00 2001
From: shenyanpei <shenyanpei>
Date: Tue, 21 Dec 2021 17:03:15 +0800
Subject: [PATCH 17/26] =?UTF-8?q?=E5=85=A5=E4=BC=9A=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzhHd-rh/step1.vue     |  29 +-
 .../pages/creatProcess/bzhHd-rh/step2.vue     |   5 +-
 .../pages/creatProcess/bzhHd-rh/step3.vue     |   2 +-
 .../pages/creatProcess/bzhHd-rh/step5.vue     | 288 +++++++++++++++++-
 4 files changed, 306 insertions(+), 18 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue
index c7d65f6e4..2b52174d8 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue
@@ -197,7 +197,8 @@
                   align="center"
                   label="联络人">
                   <template slot-scope="scope">
-                    <el-input v-model="scope.row.tel_name" placeholder="请填写联络人"/>
+                    <el-input v-model="scope.row.tel_nameId" style="display: none" placeholder="请填写联络人"/>
+                    <el-input v-model="scope.row.tel_name" readonly @click.native="choiceTel('tel_nameId', '选择联络人', scope.row)"  placeholder="请填写联络人"/>
                   </template>
                 </el-table-column>
                 <el-table-column
@@ -407,6 +408,13 @@
       :nodeList="nodeList"
       @checkedRole="drawerCheck"
     />
+    <Role-tree
+      check-box
+      is-title="选择联络人"
+      :is-visible.sync="telShowflag"
+      :nodeList="nodeListTel"
+      @checkedRole="drawerCheckTel"
+    />
   </div>
 </template>
 
@@ -517,8 +525,10 @@ export default {
       },
       roleShowflag: false,
       roleShowflagOne: false,
+      telShowflag: false,
       nodeList: [],
       nodeListOne: [],
+      nodeListTel: [],
       isSubmit: false,
       saveLoading: false,
 
@@ -724,6 +734,21 @@ export default {
       this.deleteDataList = val
     },
 
+    // 列表选人
+    choiceTel(type, title, val,id) {
+      this.choiceTelList = val
+      this.nodeListTel = []
+      this.nodeListTel.push(id)
+      this.type = type
+      this.telShowflag = true
+    },
+    drawerCheckTel(data) {
+      if(data.length > 0) {
+        this.choiceTelList.tel_nameId = data[0].id
+        this.choiceTelList.tel_name = data[0].name
+      }
+      this.telShowflag = false
+    },
     // 流程阶段负责人选择
     choiceZRR(type, title, id) {
       this.nodeList = []
@@ -774,7 +799,7 @@ export default {
       } else if (this.type === 'engineerUser') {
         this.roleForm.engineerUser = data[0].name
         this.roleForm.engineerUserId = data[0].id
-      } else {
+      }else {
         this.roleForm.directorUserName = data[0].name
         this.roleForm.directorUserId = data[0].id
       }
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue
index b3d7f0df8..b49d22b79 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue
@@ -112,10 +112,11 @@
               <template slot="title">选择人员</template>
             </ProcessTitle>
             <el-form-item class="add-form-item" label="入会人员:">
+              <el-input v-model="rh_pageData.comityOpRoleId" style="display: none;"></el-input>
               <el-input
                 placeholder="请选择入会成员"
                 style="width: 50%"
-                @click.native="choiceRole"
+                @click.native="choiceRole('','请选择入会成员',rh_pageData.comityOpRoleId,)"
                 v-model="rh_pageData.comityOpRole"
               />
             </el-form-item>
@@ -380,7 +381,7 @@ export default {
     },
 
     /** 选择入会人员 */
-    choiceRole(id) {
+    choiceRole(type,title,id) {
       this.nodeList = []
       this.nodeList.push(id)
       this.roleShowflag = true
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue
index d47554dbc..c44e9d1f7 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue
@@ -431,7 +431,7 @@ export default {
         this.rh_pageData.fillDept = this.$store.getters.userInfo.institutionName
         this.rh_pageData.fillUnit = this.$store.getters.userInfo.upDeptName
         this.rh_pageData.fillTel = this.$store.getters.userInfo.phone
-        this.rh_pageData.fillPeople = this.$store.getters.userInfo.userName
+        this.rh_pageData.fillPeople = this.$store.getters.userInfo.userName + '(' + this.$store.getters.userInfo.userId + ')'
         if (this.rh_pageData.fillFile !== undefined) {
           this.fillFileList = this.rh_pageData.fillFile
         }
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue
index e6f16403b..633899635 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue
@@ -138,11 +138,16 @@
             </el-form-item>
             <el-form-item class="add-form-item" label="我司参与人员:" style="margin-top: 10px">
               <div class="myPart_btn">
+                <el-button
+                  type="primary"
+                  size="small"
+                  @click="add_partForm">
+                  新增
+                </el-button>
                 <el-button
                   type="danger"
                   size="small"
-                  icon="el-icon-delete"
-                  @click="del_paryForm">
+                  @click="del_partForm">
                   批量删除
                 </el-button>
               </div>
@@ -156,18 +161,53 @@
                 :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
               fontWeight: 'bold', height: '20px'}">
                 <el-table-column type="selection" width="55"/>
-                <el-table-column prop="fillPeople" align="center" label="参与人"/>
-                <el-table-column prop="fillUnit" align="center" label="单位"/>
-                <el-table-column prop="fillDept" align="center" label="部门"/>
-                <el-table-column prop="fillPost" align="center" label="身份"/>
-                <el-table-column prop="fillTel" align="center" label="电话"/>
-                <el-table-column prop="fillMail" align="center" label="邮箱"/>
-                <el-table-column prop="fillFile" align="center" label="资料">
+                <el-table-column prop="fillPeople" align="center" label="参与人">
                   <template slot-scope="scope">
-                    <span v-if="scope.row.fillFile.length === 0">{{ '-' }}</span>
+                    {{ scope.row.fillPeople || '' }}
+                  </template>
+                </el-table-column>
+                <el-table-column prop="fillUnit" align="center" label="单位">
+                  <template slot-scope="scope">
+                    {{ scope.row.fillUnit || '' }}
+                  </template>
+                </el-table-column>
+                <el-table-column prop="fillDept" align="center" label="部门">
+                  <template slot-scope="scope">
+                    {{ scope.row.fillDept || '' }}
+                  </template>
+                </el-table-column>
+                <el-table-column prop="fillPost" align="center" label="身份">
+                  <template slot-scope="scope">
+                    {{ scope.row.fillPost || '' }}
+                  </template>
+                </el-table-column>
+                <el-table-column prop="fillTel" align="center" label="电话">
+                  <template slot-scope="scope">
+                    {{ scope.row.fillTel || '' }}
+                  </template>
+                </el-table-column>
+                <el-table-column prop="fillMail" align="center" label="邮箱">
+                  <template slot-scope="scope">
+                    {{ scope.row.fillMail || '' }}
+                  </template>
+                </el-table-column>
+                <el-table-column prop="fillFile" width="120" align="center" label="资料">
+                  <template slot-scope="scope">
+                    <el-button v-if="scope.row.fillFile.length === 0" type="primary" plain size="mini" @click="fillFile_up(scope.row)">点击上传</el-button>
+                    <el-button v-else size="mini" plain type="primary" @click="fillFile_up(scope.row)">查看附件</el-button>
+<!--                    <span v-if="scope.row.fillFile.length === 0">{{ '-' }}</span>
                     <span v-for="item in scope.row.fillFile" :key="item.id" style="color: #409EFF;" @click="previews(item.id)">
                     {{ item.name }} {{ ';' }}
-                   </span>
+                   </span>-->
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  fixed="right"
+                  label="操作"
+                  align="center"
+                  width="100">
+                  <template slot-scope="scope">
+                    <el-button type="primary" plain size="mini" @click="edit_partForm(scope.row)">编辑</el-button>
                   </template>
                 </el-table-column>
               </el-table>
@@ -256,6 +296,88 @@
         <loading :loading="loading">流程列表加载中</loading>
       </div>
     </div>
+    <el-drawer
+      title="编辑人员信息"
+      :visible.sync="editFlag"
+      size="500px"
+    >
+      <div class="content_form">
+        <el-form class="label-input-form" ref="editForm" :model="editForm" label-width="80px">
+        <el-form-item class="add-form-item" label="参与人员:">
+          <el-input v-model="editForm.fillPeopleId" style="display: none;"></el-input>
+          <el-input
+            placeholder="请选择参与人员"
+            style="width: 50%"
+            @click.native="choiceRole('fillPeopleId','请选择入会成员',editForm.fillPeopleId,)"
+            v-model="editForm.fillPeople"
+          />
+        </el-form-item>
+        <el-form-item class="add-form-item" label="单位:">
+          <el-input v-model="editForm.fillUnit" placeholder=""></el-input>
+        </el-form-item>
+        <el-form-item class="add-form-item" label="部门:">
+          <el-input v-model="editForm.fillDept" placeholder=""></el-input>
+        </el-form-item>
+        <el-form-item class="add-form-item" label="身份:">
+          <el-input v-model="editForm.fillPost" placeholder=""></el-input>
+        </el-form-item>
+        <el-form-item class="add-form-item" label="电话:">
+          <el-input v-model="editForm.fillTel" placeholder=""></el-input>
+        </el-form-item>
+        <el-form-item class="add-form-item" label="邮箱:">
+          <el-input v-model="editForm.fillMail" placeholder=""></el-input>
+        </el-form-item>
+        <el-form-item class="add-form-item" label="资料:">
+          <el-upload
+            :disabled="acceptShow"
+            multiple
+            ref="uploadFile"
+            :action="actionPath"
+            name="file"
+            :file-list="reData"
+            accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF"
+            :before-upload="handleBeforeUpload"
+            :before-remove="handleBeforeRemove"
+            :on-success="handleOnsuccess"
+          >
+            <el-button type="primary" size="small">
+              上传文件
+            </el-button>
+          </el-upload>
+        </el-form-item>
+      </el-form>
+      </div>
+      <div class="demo-drawer-footer">
+        <el-button size="mini" @click="falseDrawer">取消</el-button>
+        <el-button type="primary" size="mini" @click="OkDrawer">确认</el-button>
+      </div>
+    </el-drawer>
+
+    <!--  标准号table上传弹框  -->
+    <el-dialog
+      :visible.sync="upDialog"
+      width='400px'
+      :before-close="handleClose">
+      <el-upload
+        :disabled="acceptShow"
+        multiple
+        class="upload-demo"
+        ref="uploadFile"
+        :action="actionPath"
+        name="file"
+        drag
+        :file-list="reData"
+        accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF"
+        :before-upload="handleBeforeUpload"
+        :before-remove="handleBeforeRemove"
+        :on-success="handleOnsuccess"
+      >
+        <div style="padding: 20px 0">
+          <i class="el-icon-upload" style="color: #3399ff"></i>
+          <p>点击或拖拽上传文件</p>
+        </div>
+      </el-upload>
+    </el-dialog>
     <ProcessFooter
       show-submit
       show-save
@@ -265,6 +387,13 @@
       @submit="handleSubmit"
     >
     </ProcessFooter>
+    <Role-tree
+      check-box
+      is-title="选择入会人员"
+      :is-visible.sync="roleShowflag"
+      :nodeList="nodeList"
+      @checkedRole="drawerCheck"
+    />
   </div>
 </template>
 
@@ -333,7 +462,25 @@ export default {
       deleteDataList: [],
 
       infoSourcesLength: '',
-      commentText: ''
+      commentText: '',
+
+      editFlag: false,
+      editForm: {
+        fillPeople: '',
+        fillUnit: '',
+        fillDept: '',
+        fillPost: '',
+        fillTel: '',
+        fillMail: '',
+      },
+
+      // 上传文件储存
+      reData: [],
+      upDialog: false,
+      actionPath: 'api/att/attFile/upload',
+      acceptShow: false,
+      roleShowflag: false,
+      nodeList: [],
     }
   },
   computed: {
@@ -382,8 +529,123 @@ export default {
         // this.rh_pageData.comityFileNum = this.fileTextList
       })
     },
+    /** 我司参与人员新增 */
+    add_partForm() {
+      var list = {
+        fillPeople: this.fillPeople,
+        fillUnit: this.fillUnit,
+        fillDept: this.fillDept,
+        fillPost: this.fillPost,
+        fillTel: this.fillTel,
+        fillMail: this.fillMail,
+        fillFile: this.fillFile = []
+      }
+      this.rh_pageData.myPartRole.push(list)
+    },
+
+    fillFile_up(row) {
+      this.fileListData = row
+      this.reData = this.fileListData.fillFile
+      this.upDialog = true
+    },
+    // 文件上传成功
+    handleOnsuccess(res, file, fileList) {
+      if (res.ok) {
+        if (this.reData !== undefined) {
+          this.newDataList = this.reData
+          this.newDataList.push({
+            id: res.data.attId,
+            name: res.data.name
+          })
+        } else {
+          this.newDataList.push({
+            id: res.data.attId,
+            name: res.data.name
+          })
+        }
+
+        this.fileListData.fillFile = this.newDataList
+        this.$message({
+          showClose: true,
+          message: res.message,
+          type: 'success'
+        })
+        this.newDataList = []
+        this.fileMadel = false
+      }
+    },
+    // 文件上传限制条件
+    handleBeforeUpload(file) {
+      var filename = file.name
+      var index1 = filename.lastIndexOf('.')
+      var index2 = filename.length
+      var fileSuffix = filename.substring(index1, index2)
+      // const fileSuffix = file.name.split('.')[1] // 后缀名
+      // 判断上传文件格式
+      if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.pdf' || fileSuffix === '.PDF') {
+        return true
+      } else {
+        this.spinShow = false
+        this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX/PDF或XLS文件')
+        return false
+      }
+      // 判断文件上传大小
+      // eslint-disable-next-line no-unreachable
+      if (file.size / 1024 / 1024 <= 200) {
+        return true
+      } else {
+        this.$message.error('文件' + file.name + '大小不超过200M')
+        return false
+      }
+      return true
+    },
+    // 移除上传的文件
+    handleBeforeRemove(file, fileList) {
+      this.reData.forEach((item, index) => {
+        if (item.name === file.name || item.id === file.id) {
+          this.reData.splice(index, 1)
+        }
+      })
+      this.fileListData.fillFile = this.reData
+    },
+
+    handleClose() {
+      this.upDialog = false
+    },
+    // 编辑按钮
+    edit_partForm(row) {
+      // 用来储存取消时原来的数据，防止取消时修改
+      localStorage.setItem('obj', JSON.stringify(row))
+      this.fileListData = row
+      this.reData = this.fileListData.fillFile
+      this.editForm = row
+      this.editFlag = true
+    },
+    // 编辑框确认按钮
+    OkDrawer() {
+      this.editFlag = false
+    },
+    falseDrawer() {
+      let item = JSON.parse(localStorage.getItem('obj'))
+      this.editForm = item
+      this.editFlag = false
+    },
+    // 编辑框选人
+    choiceRole(type, title,id) {
+      this.nodeList = []
+      this.nodeList.push(id)
+      this.type = type
+      this.roleShowflag = true
+    },
+    drawerCheck(data) {
+      if(data.length > 0) {
+        this.fileListData.fillPeopleId = data[0].id
+        this.fileListData.fillPeople = data[0].name
+      }
+      this.roleShowflag = false
+    },
     /** 批量删除 */
-    del_paryForm() {
+    del_partForm() {
       if (this.deleteDataList.length < 1) {
         this.$message.warning("请选择一条数据进行删除");
       } else {

From cbb7a2d543feaabd900ab4c33049b80e38d854b3 Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Tue, 21 Dec 2021 17:08:26 +0800
Subject: [PATCH 18/26] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=BA=93=20-=20?=
 =?UTF-8?q?=E9=AB=98=E7=BA=A7=E6=A3=80=E7=B4=A2=20-=20=E5=A4=9A=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/EnterpriseStandardDatabase.vue | 132 ++++++++++++------
 1 file changed, 87 insertions(+), 45 deletions(-)

diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
index e52e9660e..5ec3604e4 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
@@ -1151,17 +1151,25 @@
 <!--                                      ></el-option>-->
 <!--                                  </el-select>-->
                               </el-form-item>
-                              <el-form-item label="适用车型" class="add-form-item form-item-disabled">
-                                  <el-select v-model="sarBussionessSearch.SYCXCLASS" filterable clearable>
-                                      <el-option
-                                              v-for="item in applyArcticOptions"
-                                              placeholder="请选择"
-                                              :key="item.value"
-                                              :value="item.value"
-                                              :label="item.label"
-                                      ></el-option>
-                                  </el-select>
-                              </el-form-item>
+                            <!--            适用车型-->
+                            <template>
+                              <custom-select-array
+                                  :key="applyArcticOptions.options"
+                                  :config="applyArcticOptions"
+                                  v-model="sarBussionessSearch['SYCXCLASS']"
+                              ></custom-select-array>
+                            </template>
+<!--                              <el-form-item label="适用车型" class="add-form-item form-item-disabled">-->
+<!--                                  <el-select v-model="sarBussionessSearch.SYCXCLASS" filterable clearable>-->
+<!--                                      <el-option-->
+<!--                                              v-for="item in applyArcticOptions"-->
+<!--                                              placeholder="请选择"-->
+<!--                                              :key="item.value"-->
+<!--                                              :value="item.value"-->
+<!--                                              :label="item.label"-->
+<!--                                      ></el-option>-->
+<!--                                  </el-select>-->
+<!--                              </el-form-item>-->
                               <el-form-item label="体系类别" class="add-form-item form-item-disabled">
                                   <el-input v-model="sarBussionessSearch.TXLBBUSS" placeholder="选择体系类别" clearable @click.native="choiceZRR1('TXLBBUSS', '体系类别', sarBussionessStandEO.TXLBBUSS)"></el-input>
                               </el-form-item>
@@ -1182,28 +1190,44 @@
 <!--                                      ></el-option>-->
 <!--                                  </el-select>-->
                               </el-form-item>
-                              <el-form-item label="能源类型" class="add-form-item form-item-disabled">
-                                  <el-select v-model="sarBussionessSearch.NYLXCLASS" filterable clearable>
-                                      <el-option
-                                              v-for="item in categoryOptions"
-                                              placeholder="请选择"
-                                              :key="item.value"
-                                              :value="item.value"
-                                              :label="item.label"
-                                      ></el-option>
-                                  </el-select>
-                              </el-form-item>
-                              <el-form-item label="适用产品线" title="适用产品线" class="add-form-item form-item-disabled">
-                                  <el-select v-model="sarBussionessSearch.SYCPXCLASS" filterable clearable>
-                                      <el-option
-                                              v-for="item in sycpxOptions"
-                                              placeholder="请选择"
-                                              :key="item.value"
-                                              :value="item.value"
-                                              :label="item.label"
-                                      ></el-option>
-                                  </el-select>
-                              </el-form-item>
+                            <!--            能源类型-->
+                            <template>
+                              <custom-select-array
+                                  :key="categoryOptions.options"
+                                  :config="categoryOptions"
+                                  v-model="sarBussionessSearch['NYLXCLASS']"
+                              ></custom-select-array>
+                            </template>
+<!--                              <el-form-item label="能源类型" class="add-form-item form-item-disabled">-->
+<!--                                  <el-select v-model="sarBussionessSearch.NYLXCLASS" filterable clearable>-->
+<!--                                      <el-option-->
+<!--                                              v-for="item in categoryOptions"-->
+<!--                                              placeholder="请选择"-->
+<!--                                              :key="item.value"-->
+<!--                                              :value="item.value"-->
+<!--                                              :label="item.label"-->
+<!--                                      ></el-option>-->
+<!--                                  </el-select>-->
+<!--                              </el-form-item>-->
+                            <!--            适用产品线（新增字段）-->
+                            <template>
+                              <custom-select-array
+                                  :key="sycpxOptions.options"
+                                  :config="sycpxOptions"
+                                  v-model="sarBussionessSearch['SYCPXCLASS']"
+                              ></custom-select-array>
+                            </template>
+<!--                              <el-form-item label="适用产品线" title="适用产品线" class="add-form-item form-item-disabled">-->
+<!--                                  <el-select v-model="sarBussionessSearch.SYCPXCLASS" filterable clearable>-->
+<!--                                      <el-option-->
+<!--                                              v-for="item in sycpxOptions"-->
+<!--                                              placeholder="请选择"-->
+<!--                                              :key="item.value"-->
+<!--                                              :value="item.value"-->
+<!--                                              :label="item.label"-->
+<!--                                      ></el-option>-->
+<!--                                  </el-select>-->
+<!--                              </el-form-item>-->
                               <el-form-item label="模块中文名称" title="模块中文名称" class="add-form-item form-item-disabled">
                                   <el-input v-model="sarBussionessSearch.VPPSCNBUSS" placeholder="请输入模块中文名称" clearable></el-input>
                               </el-form-item>
@@ -2047,25 +2071,43 @@ export default {
         stahndinfoList: [],
         tableFlag: '',
         // sycpxOptions: [], // 适用产品线
-        syzrOptions: [], // 适用认证
+        syzrOptions: {
+          attrName: '适用认证',
+          options:[]
+        }, // 适用认证
         // zrgcsOptions: [], // 责任工程师
 
         countryOptions: [],
         regionOptions: [], // 区域
         standSortOptions: [], // 标准类别下拉框
         standSystemOptions: [], // 标准体系下拉框
-        sycpxOptions: [], // 适用产品线下拉框
+        sycpxOptions: {
+          attrName: '适用产品线',
+          options:[]
+        }, // 适用产品线下拉框
         zrbmOptions: [], // 责任部门下拉框
         zrgcsOptions: [], // 责任工程师下拉框
         txlbOptions: [], // 体系类别下拉框
         standSortConfigOptions: [], // 标准类别下拉框
-        applyArcticOptions: [], // 适用车型下拉框
+        applyArcticOptions: {
+          attrName: '适用车型',
+          options:[]
+        }, // 适用车型下拉框
         standStateOptions: [], // 标准状态下拉框
         standNatureOptions: [], // 标准性质下拉框
         adoptExtentOptions: [], // 采标程度下拉框
-        emergyKindOptions: [], // 能源种类下拉框
-        applyAuthOptions: [], // 适用认证下拉框
-        categoryOptions: [], // 所属类别下拉框
+        emergyKindOptions: {
+          attrName: '能源类型',
+          options:[]
+        }, // 能源种类下拉框
+        applyAuthOptions: {
+          attrName: '适用认证',
+          options:[]
+        }, // 适用认证下拉框
+        categoryOptions: {
+          attrName: '能源类型',
+          options:[]
+        }, // 所属类别下拉框
         categoryConfigOptions: [], // 所属类别下拉框
         assemClassOptions: [], // 总成分类下拉框
         qcdwOptions:[],//起草单位下拉框
@@ -4500,17 +4542,17 @@ export default {
         this.standNatureOptions = res.data.SARPROPERTY // 标准性质
         this.standStateOptions = res.data.TEXTSTATUSBUSS // 文本状态
         this.standSystemOptions = res.data.TXLBBUSS // 标准体系
-        this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型
-        this.categoryOptions = res.data.NYLXCLASS // 能源类型
-        this.applyAuthOptions = res.data.SYRZCLASS // 适用认证
+        this.applyArcticOptions.options = res.data.ENERGYTYPES // 适用车型
+        this.categoryOptions.options = res.data.NYLXCLASS // 能源类型
+        this.applyAuthOptions.options = res.data.SYRZCLASS // 适用认证
         this.cysdOptions = res.data.WSCYSD // 我司参与深度
         this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
         this.txlbOptions = res.data.TXLBCLASS // 体系类别
         this.qcdwOptions = res.data.QCDW // 起草单位
         this.qcrOptions = res.data.QCRBUSS // 起草人
-        this.nylxOptions = res.data.NYLXCLASS // 能源类型
-        this.syrzOptions = res.data.SYRZCLASS // 适用认证
-        this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
+        this.nylxOptions.options = res.data.NYLXCLASS // 能源类型
+        this.syrzOptions.options = res.data.SYRZCLASS // 适用认证
+        this.sycpxOptions.options = res.data.SYCPXCLASS // 适用产品线
         this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
         this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
         this.gkglbmOptions=res.data.GKGLBM;//归口管理部门

From b89c419c439eeabfd315da5ce8165f21c46e116d Mon Sep 17 00:00:00 2001
From: "wangxiahui@91isoft.com" <140316hui>
Date: Tue, 21 Dec 2021 17:11:17 +0800
Subject: [PATCH 19/26] =?UTF-8?q?=E6=88=AA=E6=AD=A2=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue
index 093914c98..44c57ab17 100644
--- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue
@@ -401,7 +401,7 @@ export default {
     return {
       pickerOptions: {
         disabledDate(time) {
-          return time.getTime() < Date.now();
+          return time.getTime() < Date.now() - 8.64e7;
         },
       },
       multipleSelection: [],

From ec1085c5e3110808aa9301023aae99862b119792 Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Tue, 21 Dec 2021 17:39:05 +0800
Subject: [PATCH 20/26] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=BA=93=20-=20?=
 =?UTF-8?q?=E9=AB=98=E7=BA=A7=E6=A3=80=E7=B4=A2=20-=20=E8=B5=B7=E8=8D=89?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8=E5=92=8C=E8=B5=B7=E8=8D=89=E4=BA=BA=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E5=8F=B3=E4=BE=A7=E5=BC=B9=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/EnterpriseStandardDatabase.vue | 94 +++++++++++++------
 1 file changed, 66 insertions(+), 28 deletions(-)

diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
index 5ec3604e4..c10eeb8fe 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
@@ -1139,18 +1139,33 @@
                   <div class="prc-content-border">
                       <el-row :gutter="24">
                           <el-col :span="12">
-                              <el-form-item label="起草部门" class="add-form-item form-item-disabled">
-                                <el-input v-model="sarBussionessSearch.QCDW" clearable placeholder="请输入起草部门"></el-input>
-<!--                                  <el-select v-model="sarBussionessSearch.QCDW" filterable clearable>-->
-<!--                                      <el-option-->
-<!--                                              v-for="item in qcdwOptions"-->
-<!--                                              placeholder="请选择"-->
-<!--                                              :key="item.value"-->
-<!--                                              :value="item.value"-->
-<!--                                              :label="item.label"-->
-<!--                                      ></el-option>-->
-<!--                                  </el-select>-->
-                              </el-form-item>
+                            <el-form-item
+                                prop="QCDW"
+                                label-width="150px"
+                                class="add-form-item"
+                            >
+                              <template slot="label">起草部门</template>
+                              <el-input
+                                  :key="qcdwOptions.options"
+                                  :config="qcdwOptions"
+                                  clearable
+                                  v-model="sarBussionessSearch.QCDW"
+                                  :disabled="formdisableflag" placeholder="查询起草部门"
+                                  @click.native="choiceQCDW('QCDWId', '查询起草部门', sarBussionessSearch.QCDW)">
+                              </el-input>
+                            </el-form-item>
+<!--                              <el-form-item label="起草部门" class="add-form-item form-item-disabled">-->
+<!--                                <el-input v-model="sarBussionessSearch.QCDW" clearable placeholder="请输入起草部门"></el-input>-->
+<!--&lt;!&ndash;                                  <el-select v-model="sarBussionessSearch.QCDW" filterable clearable>&ndash;&gt;-->
+<!--&lt;!&ndash;                                      <el-option&ndash;&gt;-->
+<!--&lt;!&ndash;                                              v-for="item in qcdwOptions"&ndash;&gt;-->
+<!--&lt;!&ndash;                                              placeholder="请选择"&ndash;&gt;-->
+<!--&lt;!&ndash;                                              :key="item.value"&ndash;&gt;-->
+<!--&lt;!&ndash;                                              :value="item.value"&ndash;&gt;-->
+<!--&lt;!&ndash;                                              :label="item.label"&ndash;&gt;-->
+<!--&lt;!&ndash;                                      ></el-option>&ndash;&gt;-->
+<!--&lt;!&ndash;                                  </el-select>&ndash;&gt;-->
+<!--                              </el-form-item>-->
                             <!--            适用车型-->
                             <template>
                               <custom-select-array
@@ -1178,18 +1193,28 @@
                               </el-form-item>
                           </el-col>
                           <el-col :span="12">
-                              <el-form-item label="起草人" class="add-form-item form-item-disabled">
-                                <el-input v-model="sarBussionessSearch.QCRBUSS" clearable placeholder="请输入起草人"></el-input>
-<!--                                  <el-select v-model="sarBussionessSearch.QCRBUSS" filterable clearable>-->
-<!--                                      <el-option-->
-<!--                                              v-for="item in qcrOptions"-->
-<!--                                              placeholder="请选择"-->
-<!--                                              :key="item.value"-->
-<!--                                              :value="item.value"-->
-<!--                                              :label="item.label"-->
-<!--                                      ></el-option>-->
-<!--                                  </el-select>-->
-                              </el-form-item>
+                            <el-form-item
+                                prop="ZRGCSUser"
+                                label-width="150px"
+                                class="add-form-item"
+                            >
+                              <template slot="label">起草人</template>
+                              <el-input v-model="sarBussionessSearch['QCRBUSS']" placeholder="查询起草人"
+                                        @click.native="choiceQCR('QCRBUSS', '查询起草人', sarBussionessSearch['QCRBUSS'])">
+                              </el-input>
+                            </el-form-item>
+<!--                              <el-form-item label="起草人" class="add-form-item form-item-disabled">-->
+<!--                                <el-input v-model="sarBussionessSearch.QCRBUSS" clearable placeholder="请输入起草人"></el-input>-->
+<!--&lt;!&ndash;                                  <el-select v-model="sarBussionessSearch.QCRBUSS" filterable clearable>&ndash;&gt;-->
+<!--&lt;!&ndash;                                      <el-option&ndash;&gt;-->
+<!--&lt;!&ndash;                                              v-for="item in qcrOptions"&ndash;&gt;-->
+<!--&lt;!&ndash;                                              placeholder="请选择"&ndash;&gt;-->
+<!--&lt;!&ndash;                                              :key="item.value"&ndash;&gt;-->
+<!--&lt;!&ndash;                                              :value="item.value"&ndash;&gt;-->
+<!--&lt;!&ndash;                                              :label="item.label"&ndash;&gt;-->
+<!--&lt;!&ndash;                                      ></el-option>&ndash;&gt;-->
+<!--&lt;!&ndash;                                  </el-select>&ndash;&gt;-->
+<!--                              </el-form-item>-->
                             <!--            能源类型-->
                             <template>
                               <custom-select-array
@@ -2110,8 +2135,14 @@ export default {
         }, // 所属类别下拉框
         categoryConfigOptions: [], // 所属类别下拉框
         assemClassOptions: [], // 总成分类下拉框
-        qcdwOptions:[],//起草单位下拉框
-        qcrOptions:[],//起草人下拉框
+        qcdwOptions:{
+          attrName: '起草单位',
+          options:[]
+        },//起草单位下拉框
+        qcrOptions:{
+          attrName: '起草人',
+          options:[]
+        },//起草人下拉框
         cysdOptions:[], //我司参与深度下拉框
         nylxOptions:[],//能源类型下拉框
         syrzOptions:[],//适用认证下拉框
@@ -3146,6 +3177,7 @@ export default {
       this.modalShowRoleFlag = true
     },
     checkedRole2 (data) {
+      console.log('1712',data)
       let idList = ''
       let nameList = ''
       data.forEach( item => {
@@ -3156,6 +3188,9 @@ export default {
         idList += item.id
         nameList += item.name
       })
+      if (this.drawerTitle === '查询起草人'){
+        this.sarBussionessSearch['QCRBUSS'] = nameList
+      }
       this.$set(this.sarBussionessStandEO, 'QCRBUSS', nameList)
       if(this.sarBussionessStandEO.QCRBUSS){
         this.$refs.sarBussionessStandForm.validateField('QCRBUSS')
@@ -3185,6 +3220,9 @@ export default {
         nameList += item.name
         // }
       })
+      if (this.drawerTitle === '查询起草部门'){
+        this.sarBussionessSearch.QCDW = nameList
+      }
       this.$set(this.sarBussionessStandEO, 'QCDWId', idList)
       this.$set(this.sarBussionessStandEO, 'QCDW', nameList)
       if(this.sarBussionessStandEO.QCRBUSS){
@@ -4548,8 +4586,8 @@ export default {
         this.cysdOptions = res.data.WSCYSD // 我司参与深度
         this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
         this.txlbOptions = res.data.TXLBCLASS // 体系类别
-        this.qcdwOptions = res.data.QCDW // 起草单位
-        this.qcrOptions = res.data.QCRBUSS // 起草人
+        this.qcdwOptions.options = res.data.QCDW // 起草单位
+        this.qcrOptions.options = res.data.QCRBUSS // 起草人
         this.nylxOptions.options = res.data.NYLXCLASS // 能源类型
         this.syrzOptions.options = res.data.SYRZCLASS // 适用认证
         this.sycpxOptions.options = res.data.SYCPXCLASS // 适用产品线

From 3b4dc3dc33497a46facbe569b4c0fe4d3d6b672e Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Tue, 21 Dec 2021 17:45:45 +0800
Subject: [PATCH 21/26] feat: There is no way the,

---
 src/main.js | 45 +++++++++++++++++++++------------------------
 1 file changed, 21 insertions(+), 24 deletions(-)

diff --git a/src/main.js b/src/main.js
index add9eb6ed..b4b8f57ad 100644
--- a/src/main.js
+++ b/src/main.js
@@ -116,16 +116,20 @@ router.beforeEach(function (to, from, next) {
       }
     } else {
       if (toName.slice(0,5) !== 'phone') {
-        if (toName === 'processCenter') {
-          next()
-        }else {
-          let paramPhone = 'taskIds=' + taskId + '&prcId=' + prcId + '&prcNum=' + prcNum +
+        let paramPhone = 'taskIds=' + taskId + '&prcId=' + prcId + '&prcNum=' + prcNum +
             '&taskAssignee=' + toName + '&prcName=' + prcName + '&prcType=' + prcType
-          let phoneRouter = 'phone' + toName.charAt(0).toUpperCase() + toName.slice(1)
-          next({path: phoneRouter + '?' + paramPhone})
-        }
+        let phoneRouter = 'phone' + toName.charAt(0).toUpperCase() + toName.slice(1)
+        next({path: phoneRouter + '?' + paramPhone})
       }else {
-        extractedVerify(token)
+        if(toName !== 'blankPage'){
+          if(to.matched.length == 0){
+            next('/blankPage')
+          }else {
+            next()
+          }
+        }else {
+          next()
+        }
       }
     }
   } else {
@@ -147,7 +151,12 @@ router.beforeEach(function (to, from, next) {
           }
         }
       }else if(webLoginType != null && webLoginType === 'dev'){
-        next('/Login')
+        if (isMobile()) {
+          extractedVerify(token)
+        } else {
+          next('/Login')
+        }
+
       }
     }else {
       extractedVerify(token)
@@ -236,11 +245,7 @@ router.beforeEach(function (to, from, next) {
               }
             }
           } else {
-            if (isMobile()){
-              next()
-            } else {
-              extracted3()
-            }
+            extracted3()
           }
         }
         function extracted(routerPath) {
@@ -284,17 +289,9 @@ router.beforeEach(function (to, from, next) {
     }
     if(path === '/loginVerify'){
       if(webLoginType != null && webLoginType === 'dev'){
-        if(isMobile()) {
-          next('/blankPage')
-        } else {
-          next('/Login')
-        }
+        next('/Login')
       }else {
-        if(isMobile()) {
-          next('/blankPage')
-        } else {
-          next('/Login')
-        }
+        next()
       }
     }else {
       next()

From 5f6879b54770d03772237a67e0a83c04d571d637 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Tue, 21 Dec 2021 17:53:10 +0800
Subject: [PATCH 22/26] feat: There is no way the,

---
 src/pages/processCenter/pages/phone/index.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/processCenter/pages/phone/index.vue b/src/pages/processCenter/pages/phone/index.vue
index fea9edc89..dac11efef 100644
--- a/src/pages/processCenter/pages/phone/index.vue
+++ b/src/pages/processCenter/pages/phone/index.vue
@@ -28,6 +28,7 @@ export default {
       });
     },
     loginNew (res) {
+      window.sessionStorage.clear()
       let Base64 = require('js-base64').Base64
       let userInfoStr = Base64.decode(res.data)
       let userInfo2 = decodeURIComponent(userInfoStr)

From fe6e040846fddcd2d8b65ac612169d4a43f00ffd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Tue, 21 Dec 2021 17:19:28 +0800
Subject: [PATCH 23/26] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?=
 =?UTF-8?q?=E8=AE=A2=E8=AE=A1=E5=88=92=E7=AE=A1=E6=8E=A7=E8=B5=B7=E8=8D=89?=
 =?UTF-8?q?=E8=B4=A3=E4=BB=BB=E5=8D=95=E4=BD=8D=E5=AD=97=E6=AE=B5=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E8=B5=8B=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../creatProcess/qbzxdjhgk/component/cancel.vue  | 14 +++++++-------
 .../creatProcess/qbzxdjhgk/component/delay.vue   | 14 +++++++-------
 .../qbzxdjhgk/component/establish.vue            | 14 +++++++-------
 .../creatProcess/qbzxdjhgk/component/merge.vue   | 16 ++++++++--------
 .../creatProcess/qbzxdjhgk/component/rename.vue  | 14 +++++++-------
 .../pages/creatProcess/qbzxdjhgk/step1-5.vue     |  4 ++--
 .../pages/creatProcess/qbzxdjhgk/step2.vue       |  4 ++--
 .../pages/creatProcess/qbzxdjhgk/step3.vue       |  4 ++--
 .../pages/creatProcess/qbzxdjhgk/step4.vue       |  4 ++--
 .../pages/creatProcess/qbzxdjhgk/step5.vue       |  4 ++--
 10 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue
index 0974ca740..e77ff7e04 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue
@@ -96,12 +96,12 @@
                 placeholder="请选择标准发布时间">
               </el-date-picker>
             </el-form-item>
-            <el-form-item label="起草责任单位" prop="unit" class="add-form-item form-item-disabled">
-              <div v-if="qbfsForm.unit">
-                <el-tooltip class="item" effect="dark" :content="qbfsForm.unit" placement="top-start">
+            <el-form-item label="起草责任单位" prop="unitName" class="add-form-item form-item-disabled">
+              <div v-if="qbfsForm.unitName">
+                <el-tooltip class="item" effect="dark" :content="qbfsForm.unitName" placement="top-start">
                   <el-input
                     readonly
-                    v-model="qbfsForm.unit"
+                    v-model="qbfsForm.unitName"
                     placeholder="请输入起草责任单位"
                     clearable
                   ></el-input>
@@ -110,7 +110,7 @@
               <div v-else>
                 <el-input
                   readonly
-                  v-model="qbfsForm.unit"
+                  v-model="qbfsForm.unitName"
                   placeholder="请输入起草责任单位"
                   clearable
                 ></el-input>
@@ -233,7 +233,7 @@
               </el-table-column>
               <el-table-column
                 align="center"
-                prop="unit"
+                prop="unitName"
                 label="起草责任单位">
               </el-table-column>
             </el-table>
@@ -370,7 +370,7 @@ export default {
         this.qbfsForm.releaseTime = this.selectList[0].releaseTime
         this.qbfsForm.resPersonName = this.selectList[0].resPersonName
         this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus === '0'? '制定完成' : (this.selectList[0].reviseStatus  === '1'? '制定中' : '未制定')
-        this.qbfsForm.unit = this.selectList[0].unit
+        this.qbfsForm.unitName = this.selectList[0].unitName
         this.qbfsForm.wgLeaderName = this.selectList[0].wgLeaderName
         this.ListModel = false
       }
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue
index 086e2a1a8..33119c5c4 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue
@@ -104,12 +104,12 @@
                placeholder="请选择标准发布时间">
              </el-date-picker>
            </el-form-item>
-           <el-form-item label="起草责任单位" prop="unit" class="add-form-item form-item-disabled">
-             <div v-if="qbfsForm.unit">
-               <el-tooltip class="item" effect="dark" :content="qbfsForm.unit" placement="top-start">
+           <el-form-item label="起草责任单位" prop="unitName" class="add-form-item form-item-disabled">
+             <div v-if="qbfsForm.unitName">
+               <el-tooltip class="item" effect="dark" :content="qbfsForm.unitName" placement="top-start">
                  <el-input
                    readonly
-                   v-model="qbfsForm.unit"
+                   v-model="qbfsForm.unitName"
                    placeholder="请输入起草责任单位"
                    clearable
                  ></el-input>
@@ -118,7 +118,7 @@
              <div v-else>
                <el-input
                  readonly
-                 v-model="qbfsForm.unit"
+                 v-model="qbfsForm.unitName"
                  placeholder="请输入起草责任单位"
                  clearable
                ></el-input>
@@ -249,7 +249,7 @@
              </el-table-column>
              <el-table-column
                align="center"
-               prop="unit"
+               prop="unitName"
                label="起草责任单位">
              </el-table-column>
            </el-table>
@@ -391,7 +391,7 @@ export default {
         this.qbfsForm.releaseTime = this.selectList[0].releaseTime
         this.qbfsForm.resPersonName = this.selectList[0].resPersonName
         this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus === '0'? '制定完成' : (this.selectList[0].reviseStatus  === '1'? '制定中' : '未制定')
-        this.qbfsForm.unit = this.selectList[0].unit
+        this.qbfsForm.unitName = this.selectList[0].unitName
         this.qbfsForm.wgLeaderName = this.selectList[0].wgLeaderName
         this.ListModel = false
       }
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
index 16c197c24..8981da546 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
@@ -64,10 +64,10 @@
           placeholder="请选择计划标准发布时间">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px"  prop="unit" class="add-form-item form-item-disabled">
-        <el-input v-model="qbfsForm.unitId" style="display: none;"></el-input>
-        <el-input v-model="qbfsForm.unit" placeholder="请选择起草责任单位"
-                  @click.native="choiceZRBM('unit', '选择起草责任单位', qbfsForm.unitId)">
+      <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px"  prop="unitName" class="add-form-item form-item-disabled">
+        <el-input v-model="qbfsForm.unit" style="display: none;"></el-input>
+        <el-input v-model="qbfsForm.unitName" placeholder="请选择起草责任单位"
+                  @click.native="choiceZRBM('unit', '选择起草责任单位', qbfsForm.unit)">
         </el-input>
       </el-form-item>
       <el-form-item label="新增原因" style="width: 100%; margin-right:10px"  prop="newReason" class="add-form-item form-item-disabled">
@@ -133,7 +133,7 @@ export default {
       qbfsForm: {
         type: '5',
         unit: '', // 单位
-        unitId: '',
+        unitName: '',
         esName: '', // 企标名称
         planStatus: '', // 计划状态
         reviseStatus: '', // 制修订状态
@@ -222,8 +222,8 @@ export default {
         idList += item.id
         nameList += item.name
       })
-      this.$set(this.qbfsForm, 'unitId', idList)
-      this.$set(this.qbfsForm, 'unit', nameList)
+      this.$set(this.qbfsForm, 'unit', idList)
+      this.$set(this.qbfsForm, 'unitName', nameList)
       if(this.qbfsForm.unit){
         this.$refs.qbfsForm.validateField('unit')
       }
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
index 6da0c9887..23973cf52 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
@@ -81,10 +81,10 @@
                 placeholder="请选择初稿完成时间">
               </el-date-picker>
             </el-form-item>
-            <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px"  prop="unit" class="add-form-item form-item-disabled">
-              <el-input v-model="qbfsForm.unitId" style="display: none;"></el-input>
-              <el-input v-model="qbfsForm.unit" placeholder="请选择起草责任单位"
-                        @click.native="choiceZRBM('unit', '选择起草责任单位', qbfsForm.unitId)">
+            <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px"  prop="unitName" class="add-form-item form-item-disabled">
+              <el-input v-model="qbfsForm.unit" style="display: none;"></el-input>
+              <el-input v-model="qbfsForm.unitName" placeholder="请选择起草责任单位"
+                        @click.native="choiceZRBM('unit', '选择起草责任单位', qbfsForm.unit)">
               </el-input>
 <!--              <el-select v-model="qbfsForm.unit" filterable multiple  clearable>-->
 <!--                <el-option-->
@@ -249,7 +249,7 @@
               </el-table-column>
               <el-table-column
                 align="center"
-                prop="unit"
+                prop="unitName"
                 label="起草责任单位">
               </el-table-column>
             </el-table>
@@ -330,7 +330,7 @@ export default {
         esName2: [
           {required: true, message: '请选择合并计划企标名称', trigger: 'blur'},
         ],
-        unit: [
+        unitName: [
           {required: true, message: '请选择起草单位', trigger: 'change'},
         ],
         esName: [
@@ -444,8 +444,8 @@ export default {
         idList += item.id
         nameList += item.name
       })
-      this.$set(this.qbfsForm, 'unitId', idList)
-      this.$set(this.qbfsForm, 'unit', nameList)
+      this.$set(this.qbfsForm, 'unit', idList)
+      this.$set(this.qbfsForm, 'unitName', nameList)
       if(this.qbfsForm.unit){
         this.$refs.qbfsForm.validateField('unit')
       }
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue
index fda02ac8a..97a49d619 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue
@@ -95,12 +95,12 @@
                 placeholder="请选择标准发布时间">
               </el-date-picker>
             </el-form-item>
-            <el-form-item label="起草责任单位" prop="unit" class="add-form-item form-item-disabled">
-             <div v-if="qbfsForm.unit">
-               <el-tooltip class="item" effect="dark" :content="qbfsForm.unit" placement="top-start">
+            <el-form-item label="起草责任单位" prop="unitName" class="add-form-item form-item-disabled">
+             <div v-if="qbfsForm.unitName">
+               <el-tooltip class="item" effect="dark" :content="qbfsForm.unitName" placement="top-start">
                  <el-input
                    readonly
-                   v-model="qbfsForm.unit"
+                   v-model="qbfsForm.unitName"
                    placeholder="请输入起草责任单位"
                    clearable
                  ></el-input>
@@ -109,7 +109,7 @@
               <div v-else>
                 <el-input
                   readonly
-                  v-model="qbfsForm.unit"
+                  v-model="qbfsForm.unitName"
                   placeholder="请输入起草责任单位"
                   clearable
                 ></el-input>
@@ -240,7 +240,7 @@
               </el-table-column>
               <el-table-column
                 align="center"
-                prop="unit"
+                prop="unitName"
                 label="起草责任单位">
               </el-table-column>
             </el-table>
@@ -379,7 +379,7 @@ export default {
         this.qbfsForm.releaseTime = this.selectList[0].releaseTime
         this.qbfsForm.resPersonName = this.selectList[0].resPersonName
         this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus === '0'? '制定完成' : (this.selectList[0].reviseStatus  === '1'? '制定中' : '未制定')
-        this.qbfsForm.unit = this.selectList[0].unit
+        this.qbfsForm.unitName = this.selectList[0].unitName
         this.qbfsForm.wgLeaderName = this.selectList[0].wgLeaderName
         this.ListModel = false
       }
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue
index 7ccb9ed36..7ac67bbd9 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue
@@ -75,10 +75,10 @@
               placeholder="请选择计划标准发布时间">
             </el-date-picker>
           </el-form-item>
-          <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px"  prop="unit" class="add-form-item form-item-disabled">
+          <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px"  prop="unitName" class="add-form-item form-item-disabled">
             <el-input
               disabled
-              v-model="qbfsForm.unit"
+              v-model="qbfsForm.unitName"
               placeholder="请输入起草责任单位"
               :maxlength="500"/>
           </el-form-item>
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue
index 9ef124af9..5be9a3a1f 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue
@@ -75,10 +75,10 @@
               placeholder="请选择计划标准发布时间">
             </el-date-picker>
           </el-form-item>
-          <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px"  prop="unit" class="add-form-item form-item-disabled">
+          <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px"  prop="unitName" class="add-form-item form-item-disabled">
             <el-input
               disabled
-              v-model="qbfsForm.unit"
+              v-model="qbfsForm.unitName"
               placeholder="请输入起草责任单位"
               :maxlength="500"/>
           </el-form-item>
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue
index c749e3dfa..94cd454fb 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue
@@ -75,10 +75,10 @@
               placeholder="请选择计划标准发布时间">
             </el-date-picker>
           </el-form-item>
-          <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px"  prop="unit" class="add-form-item form-item-disabled">
+          <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px"  prop="unitName" class="add-form-item form-item-disabled">
             <el-input
               disabled
-              v-model="qbfsForm.unit"
+              v-model="qbfsForm.unitName"
               placeholder="请输入起草责任单位"
               :maxlength="500"/>
           </el-form-item>
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue
index ebcd79a4d..944f67249 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue
@@ -75,10 +75,10 @@
               placeholder="请选择计划标准发布时间">
             </el-date-picker>
           </el-form-item>
-          <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px"  prop="unit" class="add-form-item form-item-disabled">
+          <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px"  prop="unitName" class="add-form-item form-item-disabled">
             <el-input
               disabled
-              v-model="qbfsForm.unit"
+              v-model="qbfsForm.unitName"
               placeholder="请输入起草责任单位"
               :maxlength="500"/>
           </el-form-item>
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue
index 38eb4ec00..6978aa1c0 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue
@@ -75,10 +75,10 @@
               placeholder="请选择计划标准发布时间">
             </el-date-picker>
           </el-form-item>
-          <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px"  prop="unit" class="add-form-item form-item-disabled">
+          <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px"  prop="unitName" class="add-form-item form-item-disabled">
             <el-input
               disabled
-              v-model="qbfsForm.unit"
+              v-model="qbfsForm.unitName"
               placeholder="请输入起草责任单位"
               :maxlength="500"/>
           </el-form-item>

From b628ca76499ed985a6196d3356d8ed53870a3363 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Tue, 21 Dec 2021 19:15:32 +0800
Subject: [PATCH 24/26] =?UTF-8?q?=E6=B8=85=E5=8D=95=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/addEdit.vue                         | 59 ++++++++-----------
 .../pages/otherAddEit.vue                     | 14 ++---
 .../pages/projectAddEit.vue                   | 16 ++---
 3 files changed, 41 insertions(+), 48 deletions(-)

diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
index 117aa3e11..99cae6987 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
@@ -211,26 +211,19 @@
             </template>
           </el-table-column>
           <el-table-column
-              prop="xcxssrqgj"
+              prop="xcxssrq"
               sortable
               align="center"
               width="150"
               label="新车型实施日期">
-            <template slot-scope="scope">
-              <span v-if="scope.row.xcxssrqgj">{{ scope.row.xcxssrqgj }}</span>
-              <span v-else-if="scope.row.putTime">{{ scope.row.putTime }}</span>
-            </template>
           </el-table-column>
           <el-table-column
               show-overflow-tooltip
-              prop="zccssrqgj"
+              prop="zccssrq"
               sortable
               align="center"
               width="150"
               label="在产车实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.zccssrqgj }}</span>
-            </template>
           </el-table-column>
           <el-table-column
               show-overflow-tooltip
@@ -341,14 +334,14 @@
         </el-table-column>
         <el-table-column
             show-overflow-tooltip
-            prop="zccssrqgj"
+            prop="zccssrq"
             sortable
             width="210px"
             align="center"
             label="在产车实施日期">
         </el-table-column>
         <el-table-column
-            prop="xcxssrqgj"
+            prop="xcxssrq"
             sortable
             align="center"
             width="210px"
@@ -464,17 +457,17 @@
               placeholder="选择日期">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="在产车实施日期" prop="zccssrqgj">
+        <el-form-item label="在产车实施日期" prop="zccssrq">
           <el-date-picker
-              v-model.trim="editRowData.zccssrqgj"
+              v-model.trim="editRowData.zccssrq"
               type="dates"
               value-format="yyyy-MM-dd"
               placeholder="选择日期">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="新车型实施日期" prop="xcxssrqgj">
+        <el-form-item label="新车型实施日期" prop="xcxssrq">
           <el-date-picker
-              v-model.trim="editRowData.xcxssrqgj"
+              v-model.trim="editRowData.xcxssrq"
               type="dates"
               value-format="yyyy-MM-dd"
               placeholder="选择日期">
@@ -575,8 +568,8 @@ export default {
         typeApplicable: '',
         nylx: '',
         ssrq: '',
-        zccssrqgj: '',
-        xcxssrqgj: '',
+        zccssrq: '',
+        xcxssrq: '',
         zrbm: '',
         sycpx: '',
         cycvppsbm: '',
@@ -1251,11 +1244,11 @@ export default {
       if (this.editRowData.ssrq !== null) {
         this.editRowData.ssrq = this.editRowData.ssrq.split(',')
       }
-      if (this.editRowData.zccssrqgj !== null) {
-        this.editRowData.zccssrqgj = this.editRowData.zccssrqgj.split(',')
+      if (this.editRowData.zccssrq !== null) {
+        this.editRowData.zccssrq = this.editRowData.zccssrq.split(',')
       }
-      if (this.editRowData.xcxssrqgj !== null) {
-        this.editRowData.xcxssrqgj = this.editRowData.xcxssrqgj.split(',')
+      if (this.editRowData.xcxssrq !== null) {
+        this.editRowData.xcxssrq = this.editRowData.xcxssrq.split(',')
       }
       this.drawerEdit = true
     },
@@ -1263,8 +1256,8 @@ export default {
     cancelInfo() {
       let Item = JSON.parse(localStorage.getItem('obj'))
       this.editRowData.ssrq = Item.ssrq
-      this.editRowData.xcxssrqgj = Item.xcxssrqgj
-      this.editRowData.zccssrqgj = Item.zccssrqgj
+      this.editRowData.xcxssrq = Item.xcxssrq
+      this.editRowData.zccssrq = Item.zccssrq
       this.drawerEdit = false
     },
     // 抽屉提交按钮
@@ -1272,11 +1265,11 @@ export default {
       if (this.editRowData.ssrq !== null) {
         this.editRowData.ssrq = this.editRowData.ssrq.join(',')
       }
-      if (this.editRowData.xcxssrqgj !== null){
-        this.editRowData.xcxssrqgj = this.editRowData.xcxssrqgj.join(',')
+      if (this.editRowData.xcxssrq !== null){
+        this.editRowData.xcxssrq = this.editRowData.xcxssrq.join(',')
       }
-      if (this.editRowData.zccssrqgj !== null){
-        this.editRowData.zccssrqgj = this.editRowData.zccssrqgj.join(',')
+      if (this.editRowData.zccssrq !== null){
+        this.editRowData.zccssrq = this.editRowData.zccssrq.join(',')
       }
       this.drawerEdit = false
     },
@@ -1351,15 +1344,15 @@ export default {
             } else {
               rowlist1.push(this.sarAccessInfoList[i].ssrq)
             }
-            if (this.sarAccessInfoList[i].xcxssrqgj === null || this.sarAccessInfoList[i].xcxssrqgj === undefined) {
-              rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '-')
+            if (this.sarAccessInfoList[i].xcxssrq === null || this.sarAccessInfoList[i].xcxssrq === undefined) {
+              rowlist3.push(this.sarAccessInfoList[i].xcxssrq = '-')
             } else {
-              rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj)
+              rowlist3.push(this.sarAccessInfoList[i].xcxssrq)
             }
-            if (this.sarAccessInfoList[i].zccssrqgj === null || this.sarAccessInfoList[i].zccssrqgj === undefined) {
-              rowlist2.push(this.sarAccessInfoList[i].zccssrqgj = '-')
+            if (this.sarAccessInfoList[i].zccssrq === null || this.sarAccessInfoList[i].zccssrq === undefined) {
+              rowlist2.push(this.sarAccessInfoList[i].zccssrq = '-')
             } else {
-              rowlist2.push(this.sarAccessInfoList[i].zccssrqgj)
+              rowlist2.push(this.sarAccessInfoList[i].zccssrq)
             }
           }
           console.log(rowlist1)
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
index d2aba5df2..67875773a 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
@@ -369,7 +369,7 @@
           width="210px"
           label="卡车VPPS中文名称">
         </el-table-column>-->
-        <el-table-column width="240" align="center"  fixed="right"  label="操作">
+        <el-table-column width="160" align="center"  fixed="right"  label="操作">
           <template slot-scope="scope">
             <el-button
               class="common-button-default"
@@ -383,12 +383,12 @@
               size="small" @click="moveDown(scope.$index, scope.row)"
               v-if="!disabledFlag"
             >下移</el-button>
-            <el-button
-              size="small"
-              @click="editTghisRow(scope.row)"
-              class="common-button-default"
-              type="warning"
-            >编辑</el-button>
+<!--            <el-button-->
+<!--              size="small"-->
+<!--              @click="editTghisRow(scope.row)"-->
+<!--              class="common-button-default"-->
+<!--              type="warning"-->
+<!--            >编辑</el-button>-->
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
index b5b1a6e23..b750c661a 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
@@ -399,7 +399,7 @@
             align="center"
             label="适用产品线">
         </el-table-column>
-        <el-table-column width="240" align="center" fixed="right" label="操作">
+        <el-table-column width="160" align="center" fixed="right" label="操作">
           <template slot-scope="scope">
             <el-button
                 class="common-button-default"
@@ -415,13 +415,13 @@
                 v-if="!disabledFlag"
             >下移
             </el-button>
-            <el-button
-                size="small"
-                @click="editTghisRow(scope.row)"
-                class="common-button-default"
-                type="warning"
-            >编辑
-            </el-button>
+<!--            <el-button-->
+<!--                size="small"-->
+<!--                @click="editTghisRow(scope.row)"-->
+<!--                class="common-button-default"-->
+<!--                type="warning"-->
+<!--            >编辑-->
+<!--            </el-button>-->
           </template>
         </el-table-column>
       </el-table>

From 8ee51672fe9a553bae5ec057438930aef2312855 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Tue, 21 Dec 2021 20:00:14 +0800
Subject: [PATCH 25/26] commit

---
 .../processCenter/pages/phone/bzqdfb/step4.vue    | 15 +++------------
 .../processCenter/pages/phone/wbsm/step3.vue      |  2 +-
 .../processCenter/pages/phone/wbsm/step4.vue      |  2 +-
 .../processCenter/pages/phone/wbsm/step5.vue      |  2 +-
 4 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/src/pages/processCenter/pages/phone/bzqdfb/step4.vue b/src/pages/processCenter/pages/phone/bzqdfb/step4.vue
index 6527ac52e..6680fdf58 100644
--- a/src/pages/processCenter/pages/phone/bzqdfb/step4.vue
+++ b/src/pages/processCenter/pages/phone/bzqdfb/step4.vue
@@ -69,7 +69,7 @@
           :data="dataList"
           border
           tooltip-effect="dark"
-          height="60%"
+          height="50%"
           style="width: 100%"
           @selection-change="selectStandChange"
           :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
@@ -109,18 +109,12 @@
             min-width="130"
             align="center"
             label="新车型实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.XCXSSRQ ? $moment(scope.row.XCXSSRQ).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             prop="ZCCSSRQ"
             min-width="130"
             align="center"
             label="在产车实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.ZCCSSRQ ? $moment(scope.row.ZCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
@@ -128,9 +122,6 @@
             width="100px"
             align="center"
             label="文本状态">
-            <template slot-scope="scope">
-              <span>{{ textStatusMap[scope.row.textStatus] }}</span>
-            </template>
           </el-table-column>
         </el-table>
       </div>
@@ -154,7 +145,7 @@
       <el-table
         height="100%"
         ref="selection"
-        :data="histortData"
+        :data="detailData"
         tooltip-effect="dark"
         style="width: 100%"
         border
@@ -509,7 +500,7 @@ export default {
       }, res => {
         if (res.success) {
           this.$message.success(res.message);
-          this.$router.push("/processCenter");
+          window.history.back()
         }
         this.isSubmit = false
       });
diff --git a/src/pages/processCenter/pages/phone/wbsm/step3.vue b/src/pages/processCenter/pages/phone/wbsm/step3.vue
index 573f9a011..cddc3a78f 100644
--- a/src/pages/processCenter/pages/phone/wbsm/step3.vue
+++ b/src/pages/processCenter/pages/phone/wbsm/step3.vue
@@ -77,7 +77,7 @@
       <el-table
         height="100%"
         ref="selection"
-        :data="histortData"
+        :data="detailData"
         tooltip-effect="dark"
         style="width: 100%"
         border
diff --git a/src/pages/processCenter/pages/phone/wbsm/step4.vue b/src/pages/processCenter/pages/phone/wbsm/step4.vue
index 1ea6a06c9..8d1fc8573 100644
--- a/src/pages/processCenter/pages/phone/wbsm/step4.vue
+++ b/src/pages/processCenter/pages/phone/wbsm/step4.vue
@@ -77,7 +77,7 @@
       <el-table
         height="100%"
         ref="selection"
-        :data="histortData"
+        :data="detailData"
         tooltip-effect="dark"
         style="width: 100%"
         border
diff --git a/src/pages/processCenter/pages/phone/wbsm/step5.vue b/src/pages/processCenter/pages/phone/wbsm/step5.vue
index bf035914a..f2d79b4fe 100644
--- a/src/pages/processCenter/pages/phone/wbsm/step5.vue
+++ b/src/pages/processCenter/pages/phone/wbsm/step5.vue
@@ -77,7 +77,7 @@
       <el-table
         height="100%"
         ref="selection"
-        :data="histortData"
+        :data="detailData"
         tooltip-effect="dark"
         style="width: 100%"
         border

From 755de140c05e7bda630073f30d71eab0be495efb Mon Sep 17 00:00:00 2001
From: shenyanpei <shenyanpei>
Date: Tue, 21 Dec 2021 20:03:12 +0800
Subject: [PATCH 26/26] =?UTF-8?q?=E5=8F=82=E4=BC=9A=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                   |  28 ----
 src/components/navMenu/index.vue              |   5 +-
 src/pages/home2/components/navMenu/index.vue  |   4 +-
 src/pages/home2/components/todoList/index.vue |   2 +-
 src/pages/home2/index.vue                     |   2 +-
 .../pages/creatProcess/bzhHd-rh/step5.vue     | 126 ++++++++--------
 .../pages/creatProcess/bzhHy-ch/step1.vue     |   7 +-
 .../pages/creatProcess/bzhHy-ch/step2.vue     |  39 ++++-
 .../pages/creatProcess/bzhHy-ch/step3.vue     |   2 +-
 .../pages/creatProcess/bzhHy-ch/step5.vue     | 142 ++++++++++++++++--
 .../pages/creatProcess/wfhxzg/step2.vue       |   2 +-
 .../pages/creatProcess/wfhxzg/step4.vue       |   1 -
 12 files changed, 247 insertions(+), 113 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 5ddb7f29c..77b537dbb 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -69,34 +69,6 @@
           <el-main>
             <nav-menu></nav-menu>
             <div class="sub-container" style="margin-left: 200px">
-              <!--            <div style="background-color: #0068B7; height: 65px; width: 100%">
-                        <span style="color: #fff; line-height: 65px; float: left; font-size: 20px; font-weight: 600;">
-                          标准法规管理系统  Standard and Regulation Management System
-                        </span>
-                             header头部 右侧内容 当前登录人和退出
-                            <div class="header-right" style="display: inline-block; float: right; margin-right: 20px; color: #fff">
-                              <div class="user-info">
-                                <el-dropdown
-                                  trigger="click"
-                                  @command="handleCommand"
-                                >
-                                  <div class="user-box" style="margin-top: 23px;">
-                                    <img :src="userAvator" v-if="$store.getters.userInfo.avator">
-                                    <span class="iconfont" v-else style="color: #FFFFFF;">&#xe69b;</span>
-                                    <span style="color: #FFFFFF;">{{ $store.getters.userInfo.uName }}</span>
-                                    <i style="color: #FFFFFF;" class="el-icon-arrow-down"/>
-                                  </div>
-                                  <el-dropdown-menu slot="dropdown">
-                                    <el-dropdown-item command="loginOut">退出</el-dropdown-item>
-                                  </el-dropdown-menu>
-                                </el-dropdown>
-                              </div>
-                            </div>
-                                      <div class="logo">
-                                        <img :src="logo" />
-                                      </div>
-                          </div>
-                                  <com-header></com-header>-->
               <div class="container-box">
                 <router-view/>
               </div>
diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue
index e5f91a8f5..37d3d434e 100644
--- a/src/components/navMenu/index.vue
+++ b/src/components/navMenu/index.vue
@@ -617,6 +617,7 @@
     color: #fff;
   }
   .nav-menu /deep/.el-submenu__title i {
+    font-size: 16px;
     color: #fff;
   }
   .nav-menu{
@@ -642,6 +643,7 @@
   }
 
   .el-menu-item {
+    font-size: 16px;
     span {
       margin-left: 5px;
       font-weight: normal;
@@ -678,6 +680,7 @@
       background-color: red;
     }
     /deep/.el-submenu__title {
+      font-size: 16px;
       padding: 0 16px !important;
       span {
         font-weight: normal;
@@ -712,7 +715,7 @@
     }
     .el-menu-item {
       padding-left: 29px !important;
-      font-size: 14px;
+      font-size: 16px;
       font-weight: normal;
       height: 40px;
       line-height: 40px;
diff --git a/src/pages/home2/components/navMenu/index.vue b/src/pages/home2/components/navMenu/index.vue
index cfe0c4c93..862e81518 100644
--- a/src/pages/home2/components/navMenu/index.vue
+++ b/src/pages/home2/components/navMenu/index.vue
@@ -77,11 +77,11 @@
                 height: 40px;
                 line-height: 40px;
                 background: #fff;
-                font-size: 15px;
+                font-size: 14px;
               border-radius: 10px;
             }
             .menu-wrap {
-                height: 240px;
+                height: 200px;
                 display: flex;
                 flex-wrap: wrap;
                 justify-content: space-between;
diff --git a/src/pages/home2/components/todoList/index.vue b/src/pages/home2/components/todoList/index.vue
index b3b911791..b774e6e8a 100644
--- a/src/pages/home2/components/todoList/index.vue
+++ b/src/pages/home2/components/todoList/index.vue
@@ -1310,7 +1310,7 @@ export default {
 .to-do-list {
   margin-right: 10px;
   border-radius: 3px;
-  height: calc(~'100% - 310px');
+  height: calc(~'100% - 269px');
   overflow: hidden;
   background: #FFFFFF;
   box-shadow: 1px 1px 10px rgba(0,0,0,0.1);
diff --git a/src/pages/home2/index.vue b/src/pages/home2/index.vue
index 22a127dcb..bb26a0be7 100644
--- a/src/pages/home2/index.vue
+++ b/src/pages/home2/index.vue
@@ -173,7 +173,7 @@ export default {
     .right_wrapper {
       display: flex;
       flex-direction: column;
-      width: 30vw;
+      width: 25vw;
       height: 100%;
     }
     .search-condition {
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue
index 633899635..be7ceb2ba 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue
@@ -22,7 +22,7 @@
                     v-for="item in rh_pageData.comityOptionsOne"
                     :key="item.id"
                     v-if="item.id === rh_pageData.comityName">
-                    {{ item.name || '-'}}
+                    {{ item.name || '-' }}
                   </span>
                 </el-form-item>
               </el-col>
@@ -74,7 +74,7 @@
                   <span v-if="infoSourcesLength === 0">{{ '-' }}</span>
                   <div v-for="item in rh_pageData.infoSources" :key="item.id" style="color: #409EFF;">
                     <a v-if="item.name.length > 30" style="cursor: pointer" @click="fileLook(item)">
-                      {{ item.name.slice(0,30) + '...' }} {{ ';' }}
+                      {{ item.name.slice(0, 30) + '...' }} {{ ';' }}
                     </a>
                     <a v-else style="cursor: pointer" @click="fileLook(item)">
                       {{ item.name }} {{ ';' }}
@@ -193,12 +193,10 @@
                 </el-table-column>
                 <el-table-column prop="fillFile" width="120" align="center" label="资料">
                   <template slot-scope="scope">
-                    <el-button v-if="scope.row.fillFile.length === 0" type="primary" plain size="mini" @click="fillFile_up(scope.row)">点击上传</el-button>
+                    <el-button v-if="scope.row.fillFile.length === 0" type="primary" plain size="mini" @click="fillFile_up(scope.row)">
+                      点击上传
+                    </el-button>
                     <el-button v-else size="mini" plain type="primary" @click="fillFile_up(scope.row)">查看附件</el-button>
-<!--                    <span v-if="scope.row.fillFile.length === 0">{{ '-' }}</span>
-                    <span v-for="item in scope.row.fillFile" :key="item.id" style="color: #409EFF;" @click="previews(item.id)">
-                    {{ item.name }} {{ ';' }}
-                   </span>-->
                   </template>
                 </el-table-column>
                 <el-table-column
@@ -303,49 +301,49 @@
     >
       <div class="content_form">
         <el-form class="label-input-form" ref="editForm" :model="editForm" label-width="80px">
-        <el-form-item class="add-form-item" label="参与人员:">
-          <el-input v-model="editForm.fillPeopleId" style="display: none;"></el-input>
-          <el-input
-            placeholder="请选择参与人员"
-            style="width: 50%"
-            @click.native="choiceRole('fillPeopleId','请选择入会成员',editForm.fillPeopleId,)"
-            v-model="editForm.fillPeople"
-          />
-        </el-form-item>
-        <el-form-item class="add-form-item" label="单位:">
-          <el-input v-model="editForm.fillUnit" placeholder=""></el-input>
-        </el-form-item>
-        <el-form-item class="add-form-item" label="部门:">
-          <el-input v-model="editForm.fillDept" placeholder=""></el-input>
-        </el-form-item>
-        <el-form-item class="add-form-item" label="身份:">
-          <el-input v-model="editForm.fillPost" placeholder=""></el-input>
-        </el-form-item>
-        <el-form-item class="add-form-item" label="电话:">
-          <el-input v-model="editForm.fillTel" placeholder=""></el-input>
-        </el-form-item>
-        <el-form-item class="add-form-item" label="邮箱:">
-          <el-input v-model="editForm.fillMail" placeholder=""></el-input>
-        </el-form-item>
-        <el-form-item class="add-form-item" label="资料:">
-          <el-upload
-            :disabled="acceptShow"
-            multiple
-            ref="uploadFile"
-            :action="actionPath"
-            name="file"
-            :file-list="reData"
-            accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF"
-            :before-upload="handleBeforeUpload"
-            :before-remove="handleBeforeRemove"
-            :on-success="handleOnsuccess"
-          >
-            <el-button type="primary" size="small">
-              上传文件
-            </el-button>
-          </el-upload>
-        </el-form-item>
-      </el-form>
+          <el-form-item class="add-form-item" label="参与人员:">
+            <el-input v-model="editForm.fillPeopleId" style="display: none;"></el-input>
+            <el-input
+              placeholder="请选择参与人员"
+              style="width: 50%"
+              @click.native="choiceRole('fillPeopleId','请选择入会成员',editForm.fillPeopleId,)"
+              v-model="editForm.fillPeople"
+            />
+          </el-form-item>
+          <el-form-item class="add-form-item" label="单位:">
+            <el-input v-model="editForm.fillUnit" placeholder=""></el-input>
+          </el-form-item>
+          <el-form-item class="add-form-item" label="部门:">
+            <el-input v-model="editForm.fillDept" placeholder=""></el-input>
+          </el-form-item>
+          <el-form-item class="add-form-item" label="身份:">
+            <el-input v-model="editForm.fillPost" placeholder=""></el-input>
+          </el-form-item>
+          <el-form-item class="add-form-item" label="电话:">
+            <el-input v-model="editForm.fillTel" placeholder=""></el-input>
+          </el-form-item>
+          <el-form-item class="add-form-item" label="邮箱:">
+            <el-input v-model="editForm.fillMail" placeholder=""></el-input>
+          </el-form-item>
+          <el-form-item class="add-form-item" label="资料:">
+            <el-upload
+              :disabled="acceptShow"
+              multiple
+              ref="uploadFile"
+              :action="actionPath"
+              name="file"
+              :file-list="reData"
+              accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF"
+              :before-upload="handleBeforeUpload"
+              :before-remove="handleBeforeRemove"
+              :on-success="handleOnsuccess"
+            >
+              <el-button type="primary" size="small">
+                上传文件
+              </el-button>
+            </el-upload>
+          </el-form-item>
+        </el-form>
       </div>
       <div class="demo-drawer-footer">
         <el-button size="mini" @click="falseDrawer">取消</el-button>
@@ -472,6 +470,7 @@ export default {
         fillPost: '',
         fillTel: '',
         fillMail: '',
+        fillFile: [],
       },
 
       // 上传文件储存
@@ -626,19 +625,26 @@ export default {
       this.editFlag = false
     },
     falseDrawer() {
-      let item = JSON.parse(localStorage.getItem('obj'))
-      this.editForm = item
+      let Item = JSON.parse(localStorage.getItem('obj'))
+      this.editForm.fillPeopleId = Item.fillPeopleId
+      this.editForm.fillPeople = Item.fillPeople
+      this.editForm.fillUnit = Item.fillUnit
+      this.editForm.fillDept = Item.fillDept
+      this.editForm.fillPost = Item.fillPost
+      this.editForm.fillTel = Item.fillTel
+      this.editForm.fillMail = Item.fillMail
+      this.editForm.fillFile = Item.fillFile
       this.editFlag = false
     },
     // 编辑框选人
-    choiceRole(type, title,id) {
+    choiceRole(type, title, id) {
       this.nodeList = []
       this.nodeList.push(id)
       this.type = type
       this.roleShowflag = true
     },
     drawerCheck(data) {
-      if(data.length > 0) {
+      if (data.length > 0) {
         this.fileListData.fillPeopleId = data[0].id
         this.fileListData.fillPeople = data[0].name
       }
@@ -739,16 +745,16 @@ export default {
       const attId = file.id
       this.getBusStandFileByAttId(attId)
         .then(res => {
-          if(res){
+          if (res) {
             const editFileInfo = res
-            if(editFileInfo.fileSuffix === 'pdg' || editFileInfo.fileSuffix === 'PDG'){
-              window.open('book://ssreader/e0?url='+editFileInfo.downLoadUrl)
-            }else if(editFileInfo.fileSuffix === 'pdf' || editFileInfo.fileSuffix === 'PDF'){
+            if (editFileInfo.fileSuffix === 'pdg' || editFileInfo.fileSuffix === 'PDG') {
+              window.open('book://ssreader/e0?url=' + editFileInfo.downLoadUrl)
+            } else if (editFileInfo.fileSuffix === 'pdf' || editFileInfo.fileSuffix === 'PDF') {
               window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id))
-            }else {
+            } else {
               const nowTime = new Date().getTime()
               // window.open('http://127.0.0.1:8012/onlinePreview?url='+encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl)));
-              window.open('/static/onlyOffice/onlinePreview.html?oldFileName=' + editFileInfo.oldFileName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName)
+              window.open('/static/onlyOffice/onlinePreview.html?oldFileName=' + editFileInfo.oldFileName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime + '&filePath=' + editFileInfo.filePath + '&fileName=' + editFileInfo.fileName)
             }
             // window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id))
           }
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue
index 30289bc72..6a7f3f15c 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue
@@ -283,7 +283,7 @@
             </el-timeline-item>
             <el-timeline-item timestamp="批准" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
               <el-card>
-                <el-form-item prop="totalLeader" style="margin-bottom: 0">
+                <el-form-item prop="directorUserName" style="margin-bottom: 0">
                   <h4>技术委员会主任</h4>
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.directorUserId" style="display: none;"></el-input>
@@ -392,7 +392,9 @@ export default {
         fillFile: '',
         associaOptionsOne: [],
         associaOptionsTwo: [],
-        associaOptionsTree: []
+        associaOptionsTree: [],
+        meetingInRole: '',
+        meetingInRoleId: ''
 
       },
       feeKindOptions: [
@@ -429,6 +431,7 @@ export default {
         leaderUser: [{required: true, message: "请选择标准法规部主管中心主任", trigger: ['blur', 'change']}],
         feeUser: [{required: true, message: "请选择管理推荐部", trigger: ['blur', 'change']}],
         engineerUser: [{required: true, message: "请选择技术委员会常务副主任/总院院长", trigger: ['blur', 'change']}],
+        directorUserName: [{required: true, message: "请选择技术委员会主任", trigger: ['blur', 'change']}],
       },
       deleteDataList: [],
 
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue
index 00c3c0ff3..170ac078a 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue
@@ -107,11 +107,12 @@
             <ProcessTitle>
               <template slot="title">选择人员</template>
             </ProcessTitle>
-            <el-form-item class="add-form-item" label="入会人员:">
+            <el-form-item class="add-form-item" label="参会人员:">
+              <el-input v-model="ch_pageData.meetingInRoleId" style="display: none;"></el-input>
               <el-input
-                :disabled="true"
-                style="width: 30%"
-                placeholder="请选择入会人员"
+                placeholder="请选择参会人员"
+                style="width: 50%"
+                @click.native="choiceRole('meetingInRoleId','选择参会人员',ch_pageData.meetingInRoleId,)"
                 v-model="ch_pageData.meetingInRole"
               />
             </el-form-item>
@@ -209,6 +210,13 @@
       @submit="handleSubmit"
     >
     </ProcessFooter>
+
+    <Role-tree
+      is-title="选择入会人员"
+      :is-visible.sync="roleShowflag"
+      :nodeList="nodeList"
+      @checkedRole="drawerCheck"
+    />
   </div>
 </template>
 
@@ -293,10 +301,31 @@ export default {
       this.$nextTick(() => {
         this.ch_pageData = JSON.parse(JSON.stringify(item)).ch_pageData
         this.uploadFileLength = this.ch_pageData.fileTextList.length
-        this.ch_pageData.meetingInRole = this.$store.getters.userInfo.userName
         this.roleForm = JSON.parse(JSON.stringify(item)).roleList
       })
     },
+
+    /** 选择入会人员 */
+    choiceRole(type,title,id) {
+      this.nodeList = []
+      this.nodeList.push(id)
+      this.roleShowflag = true
+    },
+    drawerCheck(data) {
+      var idList = ''
+      var nameList = ''
+      data.forEach(item => {
+        if (nameList.length > 0) {
+          nameList += ','
+          idList += ','
+        }
+        idList += item.id;
+        nameList += item.name;
+      })
+      this.ch_pageData.meetingInRole = nameList
+      this.ch_pageData.meetingInRoleId = idList
+      this.roleShowflag = false
+    },
     // 退回按钮
     handleSubmitNo() {
       if (this.commentText === '') {
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue
index b8094a74b..c40384c2c 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue
@@ -372,7 +372,7 @@ export default {
         this.ch_pageData.fillUnit = this.$store.getters.userInfo.upDeptName
         this.ch_pageData.fillTel = this.$store.getters.userInfo.phone
         this.ch_pageData.fillPeopleId = this.$store.getters.userInfo.userId
-        this.ch_pageData.fillPeople = this.$store.getters.userInfo.userName
+        this.ch_pageData.fillPeople = this.$store.getters.userInfo.userName  + '(' + this.$store.getters.userInfo.userId + ')'
         this.roleForm = JSON.parse(JSON.stringify(item)).roleList
         // this.rh_pageData.comityFileNum = this.fileTextList
       })
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue
index ae37361e7..461a598d9 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue
@@ -113,11 +113,15 @@
             </el-form-item>
             <el-form-item class="add-form-item" label="入会人员:">
               <div class="myPart_btn">
+                <el-button
+                  type="primary"
+                  size="small"
+                  @click="add_partForm">
+                  新增</el-button>
                 <el-button
                   type="danger"
                   size="small"
-                  icon="el-icon-delete"
-                  @click="del_paryForm">
+                  @click="del_partForm">
                   批量删除
                 </el-button>
               </div>
@@ -132,11 +136,40 @@
               fontWeight: 'bold', height: '20px'}">
                 <el-table-column type="selection" width="55"/>
                 <el-table-column type="index" width="50" align="center"/>
-                <el-table-column prop="fillPeople" align="center" label="人员"/>
-                <el-table-column prop="fillUnit" align="center" label="单位"/>
-                <el-table-column prop="fillDept" align="center" label="部门"/>
-                <el-table-column prop="fillTel" align="center" label="电话"/>
-                <el-table-column prop="fillMail" align="center" label="邮箱"/>
+                <el-table-column prop="fillPeople" align="center" label="人员">
+                  <template slot-scope="scope">
+                    {{ scope.row.fillPeople || '' }}
+                  </template>
+                </el-table-column>
+                <el-table-column prop="fillUnit" align="center" label="单位">
+                  <template slot-scope="scope">
+                    {{ scope.row.fillUnit || '' }}
+                  </template>
+                </el-table-column>
+                <el-table-column prop="fillDept" align="center" label="部门">
+                  <template slot-scope="scope">
+                    {{ scope.row.fillDept || '' }}
+                  </template>
+                </el-table-column>
+                <el-table-column prop="fillTel" align="center" label="电话">
+                  <template slot-scope="scope">
+                    {{ scope.row.fillTel || '' }}
+                  </template>
+                </el-table-column>
+                <el-table-column prop="fillMail" align="center" label="邮箱">
+                  <template slot-scope="scope">
+                    {{ scope.row.fillMail || '' }}
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  fixed="right"
+                  label="操作"
+                  align="center"
+                  width="100">
+                  <template slot-scope="scope">
+                    <el-button type="primary" plain size="mini" @click="edit_partForm(scope.row)">编辑</el-button>
+                  </template>
+                </el-table-column>
               </el-table>
             </el-form-item>
           </el-form>
@@ -223,6 +256,41 @@
         <loading :loading="loading">流程列表加载中</loading>
       </div>
     </div>
+    <el-drawer
+      title="编辑人员信息"
+      :visible.sync="editFlag"
+      size="500px"
+    >
+      <div class="content_form">
+        <el-form class="label-input-form" ref="editForm" :model="editForm" label-width="80px">
+          <el-form-item class="add-form-item" label="参与人员:">
+            <el-input v-model="editForm.fillPeopleId" style="display: none;"></el-input>
+            <el-input
+              placeholder="请选择参与人员"
+              style="width: 50%"
+              @click.native="choiceRole('fillPeopleId','请选择入会成员',editForm.fillPeopleId,)"
+              v-model="editForm.fillPeople"
+            />
+          </el-form-item>
+          <el-form-item class="add-form-item" label="单位:">
+            <el-input v-model="editForm.fillUnit" placeholder=""></el-input>
+          </el-form-item>
+          <el-form-item class="add-form-item" label="部门:">
+            <el-input v-model="editForm.fillDept" placeholder=""></el-input>
+          </el-form-item>
+          <el-form-item class="add-form-item" label="电话:">
+            <el-input v-model="editForm.fillTel" placeholder=""></el-input>
+          </el-form-item>
+          <el-form-item class="add-form-item" label="邮箱:">
+            <el-input v-model="editForm.fillMail" placeholder=""></el-input>
+          </el-form-item>
+        </el-form>
+      </div>
+      <div class="demo-drawer-footer">
+        <el-button size="mini" @click="falseDrawer">取消</el-button>
+        <el-button type="primary" size="mini" @click="OkDrawer">确认</el-button>
+      </div>
+    </el-drawer>
     <ProcessFooter
       show-save
       show-submit
@@ -269,7 +337,16 @@ export default {
       pId: this.$route.query.prcId,
 
       uploadFileLength: '',
-      commentText: ''
+      commentText: '',
+      // 人员编辑
+      editFlag: false,
+      editForm: {
+        fillPeople: '',
+        fillUnit: '',
+        fillDept: '',
+        fillTel: '',
+        fillMail: '',
+      }
     }
   },
   computed: {
@@ -318,9 +395,54 @@ export default {
         // this.ch_pageData.comityFileNum = this.fileTextList
       })
     },
-
+    /** 我司参与人员新增 */
+    add_partForm() {
+      var list = {
+        fillPeople: this.fillPeople,
+        fillUnit: this.fillUnit,
+        fillDept: this.fillDept,
+        fillTel: this.fillTel,
+        fillMail: this.fillMail,
+      }
+      this.ch_pageData.myPartRole.push(list)
+    },
+    // 编辑框确认按钮
+    OkDrawer() {
+      this.editFlag = false
+    },
+    falseDrawer() {
+      let Item = JSON.parse(localStorage.getItem('obj'))
+      this.editForm.fillPeopleId = Item.fillPeopleId
+      this.editForm.fillPeople = Item.fillPeople
+      this.editForm.fillUnit = Item.fillUnit
+      this.editForm.fillDept = Item.fillDept
+      this.editForm.fillTel = Item.fillTel
+      this.editForm.fillMail = Item.fillMail
+      this.editFlag = false
+    },
+    /** 入会人员编辑 */
+    edit_partForm(row) {
+      // 用来储存取消时原来的数据，防止取消时修改
+      localStorage.setItem('obj', JSON.stringify(row))
+      this.editForm = row
+      this.editFlag = true
+    },
+    // 编辑框选人
+    choiceRole(type, title, id) {
+      this.nodeList = []
+      this.nodeList.push(id)
+      this.type = type
+      this.roleShowflag = true
+    },
+    drawerCheck(data) {
+      if (data.length > 0) {
+        this.fileListData.fillPeopleId = data[0].id
+        this.fileListData.fillPeople = data[0].name
+      }
+      this.roleShowflag = false
+    },
     /** 批量删除 */
-    del_paryForm() {
+    del_partForm() {
       if (this.deleteDataList.length < 1) {
         this.$message.warning("请选择一条数据进行删除");
       } else {
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue
index 07ebb1d69..d381a84b2 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue
@@ -53,7 +53,7 @@
           </el-table-column>
           <el-table-column prop="responsibleUnit" label="责任部门" align="center"/>
           <el-table-column prop="dutyEngineer" width="150" label="责任工程师" align="center"/>
-          <el-table-column label="选择分发责任人" prop="dutyPeopleInfo" align="center">
+          <el-table-column label="选择分发责任人" width="150" prop="dutyPeopleInfo" align="center">
               <template slot-scope="scope">
                   <el-input
                     @click.native="clickOpen(scope.row)"
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
index 85aee04c8..ecccd9be3 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
@@ -48,7 +48,6 @@
                   multiple
                   ref="uploadFile"
                   :action="uploadPath"
-                  name="file"
                   :file-list="fileTextList"
                   accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx"
                   :before-upload="handleBeforeUpload"