From 2d3fe39e2803e88172fac1cbfa6b9031344a923c Mon Sep 17 00:00:00 2001
From: shenyanpei <shenyanpei>
Date: Tue, 4 Jan 2022 15:48:52 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=85=A5=E4=BC=9A=E3=80=81=E5=8F=82?=
 =?UTF-8?q?=E4=BC=9A=E4=BA=BA=E5=91=98=E5=BF=85=E9=80=89=EF=BC=8C=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=E5=88=86=E8=A7=A3=E5=8D=95=E5=AD=97=E6=AE=B5=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../details/otherStandardDetails/index.vue    |  2 +-
 .../pages/creatProcess/bzhHd-rh/step2.vue     |  6 +-
 .../pages/creatProcess/bzhHy-ch/step2.vue     |  6 +-
 .../domesticStandardsAndRegulations/index.vue | 97 +------------------
 4 files changed, 14 insertions(+), 97 deletions(-)

diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index 1d3f00ea0..85e0aecc1 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -1314,7 +1314,7 @@
             }}</span>
         </div>
         <div class="see-drawer-div">
-          <label class="see-drawer-name" style="font-size: 14px" title="解读内容">解读内容</label>
+          <label class="see-drawer-name" style="font-size: 14px" title="核心技术要求">核心技术要求</label>
           <span class="see-drawer-val" style="font-size: 12px"
                 :title="standShowItemEO.readContent ? standShowItemEO.readContent.replace(/<.*?>/ig, ' ') : ''">
             {{
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue
index 90f200642..fa5ae3de2 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue
@@ -111,7 +111,7 @@
             <ProcessTitle>
               <template slot="title">选择人员</template>
             </ProcessTitle>
-            <el-form-item class="add-form-item" label="入会人员:">
+            <el-form-item class="add-form-item" label="入会人员:" prop="comityOpRoleId">
               <el-input v-model="rh_pageData.comityOpRoleId" style="display: none;"></el-input>
               <el-input
                 placeholder="请选择入会成员"
@@ -243,7 +243,9 @@ export default {
   data() {
     return {
       active: '1', // 默认显示
-      rh_rules: {},
+      rh_rules: {
+        meetingInRoleId: [{required: true, message: "请选择参会人员", trigger: ['blur', 'change']}]
+      },
       rh_pageData: {
         comityFileNum: '',
         comityFileName: '',
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue
index d056e26d5..6f0f9b648 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue
@@ -107,7 +107,7 @@
             <ProcessTitle>
               <template slot="title">选择人员</template>
             </ProcessTitle>
-            <el-form-item class="add-form-item" label="参会人员:">
+            <el-form-item class="add-form-item" label="参会人员:" prop="meetingInRoleId">
               <el-input v-model="ch_pageData.meetingInRoleId" style="display: none;"></el-input>
               <el-input
                 placeholder="请选择参会人员"
@@ -239,7 +239,9 @@ export default {
 
       acceptShow: false,
       ch_pageData: {},
-      ch_rules: {},
+      ch_rules: {
+        meetingInRoleId: [{required: true, message: "请选择入会人员", trigger: ['blur', 'change']}]
+      },
       nodeList: [],
       commentText: '',
 
diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index a8b000438..00a6f4de9 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -307,6 +307,11 @@
                 <span v-else>{{ textStatusMap[scope.row.textStatus] }}</span>
               </template>
             </el-table-column>
+            <el-table-column
+              prop="replaceStandNum"
+              width="150"
+              label="代替标准号">
+            </el-table-column>
             <el-table-column fixed="right"
                              v-if="isPermission('cac1eb379eb8e3b987cbb2e4599adb50,247cebaefa7cf1683092af160af11502,dbaf9df2990a595c8abea28e68b1a681')>0"
                              label="收藏" align="center" width="50px"
@@ -5136,97 +5141,6 @@ export default {
         })
       }
     },
-    /**
-     * 获取新增弹框的表单
-     */
-    getAddFormFieldList(isEdit) {
-      this.$http.get('lawss/sarStandAttrDetails/list', {}, {
-            _this: this
-          },
-          res => {
-            if (res.ok) {
-              const {data = {}} = res
-              this.formFieldListData = data['INLAND_STAND'] || []
-              // 追加高级查询动态下拉框数据s
-              this.twoOptions = [
-                {
-                  label: '标准类别',
-                  value: 'stand_sort',
-                  type: 'SEL_OPTION',
-                  disabled: false
-                },
-                {
-                  label: '文本状态',
-                  value: 'stand_state_show',
-                  type: 'SEL_OPTION',
-                  disabled: false
-                },
-                // {
-                //   label: '适用区域',
-                //   value: 'country',
-                //   type: 'SEL_OPTION',
-                //   disabled: false
-                // },
-                {
-                  label: '重要度',
-                  value: 'is_relate_access',
-                  type: 'SEL_OPTION',
-                  disabled: false
-                },
-                {
-                  label: '标准编号',
-                  value: 'stand_number',
-                  type: 'INPUT',
-                  disabled: false
-                },
-                {
-                  label: '标准年份',
-                  value: 'stand_year',
-                  type: 'INPUT',
-                  disabled: false
-                },
-                {
-                  label: '中文名称',
-                  value: 'stand_name',
-                  type: 'INPUT',
-                  disabled: false
-                },
-                {
-                  label: '英文名称',
-                  value: 'stand_en_name',
-                  type: 'INPUT',
-                  disabled: false
-                },
-                {
-                  label: '发布日期',
-                  value: 'issue_time',
-                  type: 'DATE_PIC_OPTS',
-                  disabled: false
-                },
-                {
-                  label: '文本说明',
-                  value: 'synopsis',
-                  type: 'INPUT',
-                  disabled: false
-                }
-              ]
-              this.formFieldListData.map(item => {
-                if (item.attrType !== 'FILE' && item.attrField !== 'ZRLX') {
-                  this.twoOptions.push({
-                    value: item.attrField,
-                    label: item.attrName,
-                    selVal: item.selVal,
-                    type: item.attrType,
-                    disabled: false,
-                    __wx__: item
-                  })
-                }
-              })
-              // this.resolveFormFieldList()
-            }
-          }, e => {
-          })
-    },
     /**
      * 展示位置
      */
@@ -5718,7 +5632,6 @@ export default {
     // 加载所有的部门
     this.getOrgTreeSource()
     // 加载动态表单数据
-    this.getAddFormFieldList()
     this.getDept()
     this.busVsFunc()
     this.modelFunc()

From fadd8674aded01c08a9ca9ab4e4a8ca6fe1607a5 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, 4 Jan 2022 16:39:40 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BC=81=E6=A0=87=E7=B1=BB=E5=88=AB?=
 =?UTF-8?q?=E5=8D=95=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/qbzxdjhgk/component/establish.vue        | 2 +-
 .../pages/creatProcess/qbzxdjhgk/component/merge.vue            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
index c91987b76..221b2be10 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
@@ -12,7 +12,7 @@
         ></el-input>
       </el-form-item>
       <el-form-item prop="bussSort" label="企标类别" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
-        <el-select v-model="qbfsForm.bussSort" multiple filterable placeholder="请选择企标类别" style="width: 100%;">
+        <el-select v-model="qbfsForm.bussSort"  filterable placeholder="请选择企标类别" style="width: 100%;">
           <el-option
             v-for="(item, index) in standSortOptions"
             :key="index"
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
index 6ba125ffd..4f9347a76 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
@@ -54,7 +54,7 @@
               ></el-input>
             </el-form-item>
             <el-form-item prop="bussSort" label="企标类别" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
-              <el-select v-model="qbfsForm.bussSort" multiple filterable placeholder="请选择企标类别" style="width: 100%;">
+              <el-select v-model="qbfsForm.bussSort"  filterable placeholder="请选择企标类别" style="width: 100%;">
                 <el-option
                   v-for="(item, index) in standSortOptions"
                   :key="index"

From 78850434c71c569c7ffd44ad86e1dd103efa5f48 Mon Sep 17 00:00:00 2001
From: shenyanpei <shenyanpei>
Date: Tue, 4 Jan 2022 16:50:33 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=85=A5=E4=BC=9A=E3=80=81=E5=8F=82?=
 =?UTF-8?q?=E4=BC=9A=E6=98=BE=E7=A4=BA=E6=A0=BC=E5=BC=8F=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/step2.vue     |  2 +-
 .../pages/creatProcess/bzhHy-ch/step2.vue     |  2 +-
 .../pages/phone/bzhHd-ch/step2.vue            | 44 ++++++-------------
 .../pages/phone/bzhHd-ch/step4.vue            | 38 ++++------------
 .../pages/phone/bzhHd-ch/step6.vue            | 38 ++++------------
 .../pages/phone/bzhHd-rh/step2.vue            | 44 ++++++-------------
 .../pages/phone/bzhHd-rh/step4.vue            | 38 ++++------------
 .../pages/phone/bzhHd-rh/step6.vue            | 42 ++++++------------
 8 files changed, 68 insertions(+), 180 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue
index fa5ae3de2..1ce2f8320 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue
@@ -244,7 +244,7 @@ export default {
     return {
       active: '1', // 默认显示
       rh_rules: {
-        meetingInRoleId: [{required: true, message: "请选择参会人员", trigger: ['blur', 'change']}]
+        comityOpRoleId: [{required: true, message: "请选择入会人员", trigger: ['blur', 'change']}]
       },
       rh_pageData: {
         comityFileNum: '',
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue
index 6f0f9b648..de701e95d 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue
@@ -240,7 +240,7 @@ export default {
       acceptShow: false,
       ch_pageData: {},
       ch_rules: {
-        meetingInRoleId: [{required: true, message: "请选择入会人员", trigger: ['blur', 'change']}]
+        meetingInRoleId: [{required: true, message: "请选择参会人员", trigger: ['blur', 'change']}]
       },
       nodeList: [],
       commentText: '',
diff --git a/src/pages/processCenter/pages/phone/bzhHd-ch/step2.vue b/src/pages/processCenter/pages/phone/bzhHd-ch/step2.vue
index 40e757002..f105da6c2 100644
--- a/src/pages/processCenter/pages/phone/bzhHd-ch/step2.vue
+++ b/src/pages/processCenter/pages/phone/bzhHd-ch/step2.vue
@@ -15,65 +15,42 @@
         </ProcessTitle>
         <div class="content_form">
           <el-form class="label-input-form" ref="ch_pageData" :model="ch_pageData" :rules="ch_rules" label-width="90px">
-            <el-row :gutter="24">
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="会议名称:">
                   {{ ch_pageData.meetingName || '-' }}
                 </el-form-item>
-              </el-col>
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="主办单位:">
                   {{ ch_pageData.primaryUnit || '-' }}
                 </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="24">
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="协会名称:">
-                  {{ ch_pageData.associaName || '-' }}
+                  <span
+                    v-for="item in ch_pageData.associaOptionsOne"
+                    :key="item.id"
+                    v-if="item.id === ch_pageData.associaName">
+                    {{ item.name || '-'}}
+                  </span>
                 </el-form-item>
-              </el-col>
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="会议时间:">
                   {{ ch_pageData.meetingStartTime || '-' }}
                 </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="24">
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="会议地点:">
                   {{ ch_pageData.meetingPlace || '-' }}
                 </el-form-item>
-              </el-col>
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="费用标准:">
                   {{ ch_pageData.feeStand || '-' }}
                 </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="24">
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="费用列支:">
                   {{ ch_pageData.feeKind || '-' }}
                 </el-form-item>
-              </el-col>
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="上传附件:" prop="uploadFile">
                   <span v-if="uploadFileLength < 1">{{ '-' }}</span>
                   <span v-for="item in ch_pageData.fileTextList" :key="item.id" @click="previews(item.id)">
                     {{ item.name }} {{ ';' }}
                    </span>
                 </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="24">
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="类别:">
                   <span v-if="ch_pageData.sort === '1'">计划内</span>
                   <span v-else>计划外</span>
                 </el-form-item>
-              </el-col>
-            </el-row>
             <el-form-item class="add-form-item" label-width="0px">
               <el-table
                     class="meeting_table"
@@ -91,7 +68,7 @@
             <ProcessTitle>
               <template slot="title">选择人员</template>
             </ProcessTitle>
-            <el-form-item class="add-form-item" label="入会人员:">
+            <el-form-item class="add-form-item" label="参会人员:" prop="meetingInRoleId">
               <el-input v-model="ch_pageData.meetingInRoleId" style="display: none;"></el-input>
               <el-input
                 placeholder="请选择参会人员"
@@ -170,7 +147,9 @@ export default {
         fillLeader: '',
         fillFile: '',
       },
-      ch_rules: {},
+      ch_rules: {
+        meetingInRoleId: [{required: true, message: "请选择参会人员", trigger: ['blur', 'change']}]
+      },
       nodeList: [],
       modalshowflag: false,
       commentText: '',
@@ -314,6 +293,9 @@ export default {
   .prc-content-border {
     overflow: auto;
   }
+  /deep/.el-form-item__content {
+    margin-top: 5px;
+  }
   /deep/.prc-content-border .el-form-item__content {
     width: 270px;
   }
diff --git a/src/pages/processCenter/pages/phone/bzhHd-ch/step4.vue b/src/pages/processCenter/pages/phone/bzhHd-ch/step4.vue
index 423b9b7f4..c949c088b 100644
--- a/src/pages/processCenter/pages/phone/bzhHd-ch/step4.vue
+++ b/src/pages/processCenter/pages/phone/bzhHd-ch/step4.vue
@@ -15,65 +15,42 @@
         </ProcessTitle>
         <div class="content_form">
           <el-form class="label-input-form" ref="ch_pageData" :model="ch_pageData" :rules="ch_rules" label-width="90px">
-            <el-row :gutter="24">
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="会议名称:">
                   {{ ch_pageData.meetingName || '-' }}
                 </el-form-item>
-              </el-col>
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="主办单位:">
                   {{ ch_pageData.primaryUnit || '-' }}
                 </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="24">
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="协会名称:">
-                  {{ ch_pageData.associaName || '-' }}
+                  <span
+                    v-for="item in ch_pageData.associaOptionsOne"
+                    :key="item.id"
+                    v-if="item.id === ch_pageData.associaName">
+                    {{ item.name || '-'}}
+                  </span>
                 </el-form-item>
-              </el-col>
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="会议时间:">
                   {{ ch_pageData.meetingStartTime || '-' }}
                 </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="24">
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="会议地点:">
                   {{ ch_pageData.meetingPlace || '-' }}
                 </el-form-item>
-              </el-col>
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="费用标准:">
                   {{ ch_pageData.feeStand || '-' }}
                 </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="24">
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="费用列支:">
                   {{ ch_pageData.feeKind || '-' }}
                 </el-form-item>
-              </el-col>
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="上传附件:" prop="uploadFile">
                   <span v-if="uploadFileLength < 1">{{ '-' }}</span>
                   <span v-for="item in ch_pageData.fileTextList" :key="item.id" @click="previews(item.id)">
                     {{ item.name }} {{ ';' }}
                    </span>
                 </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="24">
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="类别:">
                   <span v-if="ch_pageData.sort === '1'">计划内</span>
                   <span v-else>计划外</span>
                 </el-form-item>
-              </el-col>
-            </el-row>
             <el-form-item class="add-form-item" label="议题:">
               <el-table
                 class="meeting_table"
@@ -285,6 +262,9 @@ export default {
   .prc-content-border {
     overflow: auto;
   }
+  /deep/.el-form-item__content {
+    margin-top: 5px;
+  }
   /deep/.prc-content-border .el-form-item__content {
     width: 270px;
   }
diff --git a/src/pages/processCenter/pages/phone/bzhHd-ch/step6.vue b/src/pages/processCenter/pages/phone/bzhHd-ch/step6.vue
index 96d44bb14..4814dccd2 100644
--- a/src/pages/processCenter/pages/phone/bzhHd-ch/step6.vue
+++ b/src/pages/processCenter/pages/phone/bzhHd-ch/step6.vue
@@ -17,65 +17,42 @@
         </ProcessTitle>
         <div class="content_form">
           <el-form class="label-input-form" ref="ch_pageData" :model="ch_pageData" :rules="ch_rules" label-width="90px">
-            <el-row :gutter="24">
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="会议名称:">
                   {{ ch_pageData.meetingName || '-' }}
                 </el-form-item>
-              </el-col>
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="主办单位:">
                   {{ ch_pageData.primaryUnit || '-' }}
                 </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="24">
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="协会名称:">
-                  {{ ch_pageData.associaName || '-' }}
+                 <span
+                   v-for="item in ch_pageData.associaOptionsOne"
+                   :key="item.id"
+                   v-if="item.id === ch_pageData.associaName">
+                    {{ item.name || '-'}}
+                  </span>
                 </el-form-item>
-              </el-col>
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="会议时间:">
                   {{ ch_pageData.meetingStartTime || '-' }}
                 </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="24">
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="会议地点:">
                   {{ ch_pageData.meetingPlace || '-' }}
                 </el-form-item>
-              </el-col>
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="费用标准:">
                   {{ ch_pageData.feeStand || '-' }}
                 </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="24">
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="费用列支:">
                   {{ ch_pageData.feeKind || '-' }}
                 </el-form-item>
-              </el-col>
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="上传附件:" prop="uploadFile">
                   <span v-if="uploadFileLength < 1">{{ '-' }}</span>
                   <span v-for="item in ch_pageData.fileTextList" :key="item.id" @click="previews(item.id)">
                     {{ item.name }} {{ ';' }}
                    </span>
                 </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="24">
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="类别:">
                   <span v-if="ch_pageData.sort === '1'">计划内</span>
                   <span v-else>计划外</span>
                 </el-form-item>
-              </el-col>
-            </el-row>
             <el-form-item class="add-form-item" label="议题:">
               <el-table
                 class="meeting_table"
@@ -348,6 +325,9 @@ export default {
   .prc-content-border {
     overflow: auto;
   }
+  /deep/.el-form-item__content {
+    margin-top: 5px;
+  }
   /deep/.prc-content-border .el-form-item__content {
     width: 270px;
   }
diff --git a/src/pages/processCenter/pages/phone/bzhHd-rh/step2.vue b/src/pages/processCenter/pages/phone/bzhHd-rh/step2.vue
index 8e4821d79..1a75288eb 100644
--- a/src/pages/processCenter/pages/phone/bzhHd-rh/step2.vue
+++ b/src/pages/processCenter/pages/phone/bzhHd-rh/step2.vue
@@ -15,64 +15,41 @@
         </ProcessTitle>
         <div class="content_form">
           <el-form class="label-input-form" ref="rh_pageData" :model="rh_pageData" label-width="90px" :rules="rh_rules">
-            <el-row>
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="协会名称:">
-                  {{ rh_pageData.comityName || '-' }}
+                  <span
+                    v-for="item in rh_pageData.comityOptionsOne"
+                    :key="item.id"
+                    v-if="item.id === rh_pageData.comityName">
+                    {{ item.name || '-'}}
+                  </span>
                 </el-form-item>
-              </el-col>
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="协会状态:" prop="comityState">
                   {{ rh_pageData.comityState || '-' }}
                 </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="入会性质:" prop="comityKind">
                   {{ rh_pageData.comityKind || '-' }}
                 </el-form-item>
-              </el-col>
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="资质:">
                   {{ rh_pageData.comityMake.makeQualification || '-' }}
                 </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="成员:">
                   {{ rh_pageData.comityMake.makeRole || '' }}
                 </el-form-item>
-              </el-col>
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="费用估计:">
                   {{ rh_pageData.comityMake.makeCost || '-' }}
                 </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="职责:">
                   {{ rh_pageData.comityMake.makeDuties || '-' }}
                 </el-form-item>
-              </el-col>
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="任期:">
                   {{ rh_pageData.comityMake.makeTime || '-' }}
                 </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="24">
                 <el-form-item class="add-form-item" label="信息来源:" prop="infoSources">
                   <span v-if="infoSourcesLength === 0">{{ '-' }}</span>
                   <span v-for="item in rh_pageData.infoSources" :key="item.id" @click="previews(item.id)">
                     {{ item.name }} {{ ';' }}
                    </span>
                 </el-form-item>
-              </el-col>
-            </el-row>
             <el-form-item class="add-form-item" label="工作方向:" prop="workPath">
               <el-input v-model="rh_pageData.workPath" type="textarea" readonly style="width: 50%;height: auto"></el-input>
             </el-form-item>
@@ -95,7 +72,7 @@
             <ProcessTitle>
               <template slot="title">选择人员</template>
             </ProcessTitle>
-            <el-form-item class="add-form-item" label="入会人员:">
+            <el-form-item class="add-form-item" label="入会人员:" prop="comityOpRoleId">
               <el-input v-model="rh_pageData.comityOpRoleId" style="display: none;"></el-input>
               <el-input
                 placeholder="请选择入会成员"
@@ -182,7 +159,9 @@ export default {
         comityOpRole: '',
         comityInRoleId: '',
       },
-      roleForm: {},
+      roleForm: {
+        comityOpRoleId: [{required: true, message: "请选择入会人员", trigger: ['blur', 'change']}]
+      },
       commentText: '',
       roleShowflag: false,
       nodeList: [],
@@ -324,6 +303,9 @@ export default {
   .prc-content-border {
     overflow: auto;
   }
+  /deep/.el-form-item__content {
+    margin-top: 5px;
+  }
   /deep/.prc-content-border .el-form-item__content {
     width: 270px;
   }
diff --git a/src/pages/processCenter/pages/phone/bzhHd-rh/step4.vue b/src/pages/processCenter/pages/phone/bzhHd-rh/step4.vue
index 892187bcf..bce63efb4 100644
--- a/src/pages/processCenter/pages/phone/bzhHd-rh/step4.vue
+++ b/src/pages/processCenter/pages/phone/bzhHd-rh/step4.vue
@@ -15,64 +15,41 @@
         </ProcessTitle>
         <div class="content_form">
           <el-form class="label-input-form" ref="rh_pageData" :model="rh_pageData" label-width="90px" :rules="rh_rules">
-            <el-row>
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="协会名称:">
-                  {{ rh_pageData.comityName || '-' }}
+                  <span
+                    v-for="item in rh_pageData.comityOptionsOne"
+                    :key="item.id"
+                    v-if="item.id === rh_pageData.comityName">
+                    {{ item.name || '-'}}
+                  </span>
                 </el-form-item>
-              </el-col>
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="协会状态:" prop="comityState">
                   {{ rh_pageData.comityState || '-' }}
                 </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="入会性质:" prop="comityKind">
                   {{ rh_pageData.comityKind || '-' }}
                 </el-form-item>
-              </el-col>
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="资质:">
                   {{ rh_pageData.comityMake.makeQualification || '-' }}
                 </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="成员:">
                   {{ rh_pageData.comityMake.makeRole || '' }}
                 </el-form-item>
-              </el-col>
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="费用估计:">
                   {{ rh_pageData.comityMake.makeCost || '-' }}
                 </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="职责:">
                   {{ rh_pageData.comityMake.makeDuties || '-' }}
                 </el-form-item>
-              </el-col>
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="任期:">
                   {{ rh_pageData.comityMake.makeTime || '-' }}
                 </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="24">
                 <el-form-item class="add-form-item" label="信息来源:" prop="infoSources">
                   <span v-if="infoSourcesLength === 0">{{ '-' }}</span>
                   <span v-for="item in rh_pageData.infoSources" :key="item.id" @click="previews(item.id)">
                     {{ item.name }} {{ ';' }}
                    </span>
                 </el-form-item>
-              </el-col>
-            </el-row>
             <el-form-item class="add-form-item" label="工作方向:" prop="workPath">
               <el-input v-model="rh_pageData.workPath" type="textarea" :disabled="true" style="width: 50%;height: auto"></el-input>
             </el-form-item>
@@ -327,6 +304,9 @@ export default {
   .prc-content-border {
     overflow: auto;
   }
+  /deep/.el-form-item__content {
+    margin-top: 5px;
+  }
   /deep/.prc-content-border .el-form-item__content {
     width: 270px;
   }
diff --git a/src/pages/processCenter/pages/phone/bzhHd-rh/step6.vue b/src/pages/processCenter/pages/phone/bzhHd-rh/step6.vue
index a962d58c6..d6b40386b 100644
--- a/src/pages/processCenter/pages/phone/bzhHd-rh/step6.vue
+++ b/src/pages/processCenter/pages/phone/bzhHd-rh/step6.vue
@@ -17,64 +17,45 @@
         </ProcessTitle>
         <div class="content_form">
           <el-form class="label-input-form" ref="rh_pageData" :model="rh_pageData" label-width="90px" :rules="rh_rules">
-            <el-row>
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="协会名称:">
-                  {{ rh_pageData.comityName || '-' }}
+                  <span
+                    v-for="item in rh_pageData.comityOptionsOne"
+                    :key="item.id"
+                    v-if="item.id === rh_pageData.comityName">
+                    {{ item.name || '-'}}
+                  </span>
                 </el-form-item>
-              </el-col>
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="协会状态:" prop="comityState">
                   {{ rh_pageData.comityState || '-' }}
                 </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="12">
+
                 <el-form-item class="add-form-item" label="入会性质:" prop="comityKind">
                   {{ rh_pageData.comityKind || '-' }}
                 </el-form-item>
-              </el-col>
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="资质:">
                   {{ rh_pageData.comityMake.makeQualification || '-' }}
                 </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="12">
+
                 <el-form-item class="add-form-item" label="成员:">
                   {{ rh_pageData.comityMake.makeRole || '' }}
                 </el-form-item>
-              </el-col>
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="费用估计:">
                   {{ rh_pageData.comityMake.makeCost || '-' }}
                 </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="12">
+
                 <el-form-item class="add-form-item" label="职责:">
                   {{ rh_pageData.comityMake.makeDuties || '-' }}
                 </el-form-item>
-              </el-col>
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="任期:">
                   {{ rh_pageData.comityMake.makeTime || '-' }}
                 </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="24">
+
                 <el-form-item class="add-form-item" label="信息来源:" prop="infoSources">
                   <span v-if="infoSourcesLength < 1">{{ '-' }}</span>
                   <span v-for="item in rh_pageData.infoSources" :key="item.id" @click="previews(item.id)">
                     {{ item.name }} {{ ';' }}
                    </span>
                 </el-form-item>
-              </el-col>
-            </el-row>
             <el-form-item class="add-form-item" label="工作方向:" prop="workPath">
               <el-input v-model="rh_pageData.workPath" readonly type="textarea" style="width: 50%;height: auto"></el-input>
             </el-form-item>
@@ -340,6 +321,9 @@ export default {
   .prc-content-border {
     overflow: auto;
   }
+  /deep/.el-form-item__content {
+    margin-top: 5px;
+  }
   /deep/.prc-content-border .el-form-item__content {
     width: 270px;
   }