From 341e78ea8df57f2de7409e572c9f8db8e8ab935a Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Fri, 22 Oct 2021 15:16:56 +0800
Subject: [PATCH 1/4] feat: There is no way the test conf

---
 src/sysConfig/index.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js
index 5d43f6adf..76b50a183 100644
--- a/src/sysConfig/index.js
+++ b/src/sysConfig/index.js
@@ -9,6 +9,8 @@
 // const devIp = '192.168.10.248'
 const devIp = '62.234.136.153'
 const devInterfacePORT = '8033'
+// const devIp = '10.19.11.243'
+// const devInterfacePORT = '4304'
 // 配置 idm 认证
 const ssoLogin = 'http://sso.foton.com.cn/oauth2.0/authorize?client_id=app_slrs&response_type=code&redirect_uri='
 // 配置 前端服务
@@ -37,8 +39,10 @@ const processPort = '17210'
 
  *****************************************************************/
 // 生产环境配置
-const prodIp = '10.100.5.117'
-const prodInterfacePORT = '4202'
+const prodIp = '62.234.136.153'
+const prodInterfacePORT = '8033'
+// const prodIp = 'slrs.foton.com.cn'
+// const prodInterfacePORT = ''
 
 // 判断环境
 const serverIP = process.env.NODE_ENV === 'production' ? prodIp : devIp

From 3f7500be6e614b3f91bc3cd0eb1071d4464d6d22 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, 26 Oct 2021 17:23:36 +0800
Subject: [PATCH 2/4] commit

---
 .../pages/creatProcess/cywbbzzxd/step1.vue    | 343 ++++++++++-
 .../pages/creatProcess/cywbbzzxd/step2.vue    |  13 +
 .../pages/creatProcess/jrbzhxh/step1.vue      | 237 +++++++-
 .../pages/creatProcess/jrbzhxh/step2.vue      | 537 ++++++++++++++++++
 4 files changed, 1119 insertions(+), 11 deletions(-)
 create mode 100644 src/pages/processCenter/pages/creatProcess/cywbbzzxd/step2.vue
 create mode 100644 src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue

diff --git a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue
index 8511d7862..80f0fab34 100644
--- a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue
@@ -1,16 +1,349 @@
 <!--  参与外部标准制修订流程-->
 <template>
-<div>
-  参与外部标准制修订流程
-</div>
+  <div class="wbbz-step1">
+    <ProcessHeader>
+      <template slot="proName">参与外部标准制修订信息提报流程</template>
+      <template slot="proNode">发起流程</template>
+    </ProcessHeader>
+    <div class="headerTabs">
+      <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
+      <div class="headerTabsItem" :class="active === '2' ? 'active' : '' " @click="handleTabs('2')">人员信息</div>
+    </div>
+    <div class="content" v-show="active === '1'">
+      <div>
+        <el-form
+          ref="wbbzForm"
+          :model="wbbzform"
+          :rules="formRules"
+          class="label-input-form"
+          label-width="210px"
+        >
+          <ProcessTitle>
+            <template slot="title">基础信息</template>
+          </ProcessTitle>
+         <div class="prc-content-border" v-if="foldFormFlag">
+           <el-row :gutter="24">
+             <el-col :gutter="24">
+               <el-form-item label="提报单位" prop="reportingUnit" class="add-form-item ">
+                 <el-input
+                   v-model="wbbzform.reportingUnit"
+                   placeholder="请输入提报单位"
+                   clearable>
+                 </el-input>
+               </el-form-item>
+               <el-form-item label="协会名称" prop="associationName" class="add-form-item ">
+                 <div class="form-select">
+                   <el-select v-model="wbbzform.associationName" placeholder="请选择协会名称">
+                     <el-option
+                       v-for="item in associationOptions"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
+                     </el-option>
+                   </el-select>
+                   <el-select v-model="wbbzform.committee" placeholder="请选择分标委">
+                     <el-option
+                       v-for="item in associationOptions"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
+                     </el-option>
+                   </el-select>
+                   <el-select v-model="wbbzform.workingGroup" placeholder="请选择工作组">
+                     <el-option
+                       v-for="item in associationOptions"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
+                     </el-option>
+                   </el-select>
+                 </div>
+               </el-form-item>
+               <el-form-item label="人员角色" prop="personnelRole" class="add-form-item ">
+                 <div class="form-select">
+                   <el-select v-model="wbbzform.personnelRole" placeholder="请选择会员角色">
+                     <el-option
+                       v-for="item in associationOptions"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
+                     </el-option>
+                   </el-select>
+                     <el-date-picker
+                       v-model="wbbzform.membershipTime"
+                       type="date"
+                       placeholder="请选择入会时间">
+                     </el-date-picker>
+                 </div>
+               </el-form-item>
+               <el-form-item label="证书" prop="fileName" class="add-form-item form-item-disabled">
+                 <div>
+                   <el-upload
+                     :action="uploadFileListPath"
+                     show-file-list
+                     :file-list="fileInfoList"
+                     name="file"
+                     accept=".PDF, .pdf, .doc, .DOC, .docx, .DOCX, .xls, .xlsx, .ppt, .pptx, .PPT, .PPTX, .JPG, .JPEG, .PNG, .jpg, .jpeg, .png"
+                     :on-remove="delFileInfo"
+                     :on-success="uploadBackSuccess"
+                     :before-upload="beforeUpload"
+                   >
+                     <el-button class="common-button-default" size="mini">
+                       点击上传
+                     </el-button>
+                   </el-upload>
+                 </div>
+               </el-form-item>
+             </el-col>
+           </el-row>
+         </div>
+          <el-button style="width: 100%" icon="el-icon-caret-top" @click="foldForm">{{ foldFormFlag ? '隐藏基础信息' : '展开基础信息' }}</el-button>
+        </el-form>
+        <ProcessTitle>
+          <template slot="title">参与人信息</template>
+        </ProcessTitle>
+        <el-table border
+                  ref="selection"
+                  :data="participantsData"
+                  tooltip-effect="dark"
+                  style="width: 100%;"
+                  :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+         fontWeight: 'bold', height: '48px'}"
+                  @selection-change="handleSelectionChange1"
+                  row-key="id">
+          <el-table-column type="selection" width="55" align="center"/>
+          <el-table-column
+            prop="itemsNum"
+            label="参与人"
+            width="150"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="itemsName"
+            label="职务"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="itermsConditions"
+            label="所在部门"
+            width="200"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            label="联系方式"
+            width="350"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="itemsName"
+            label="任期"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="itermsConditions"
+            label="账户"
+            width="200"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            label="密码"
+            width="350"
+            align="center">
+          </el-table-column>
+        </el-table>
+        <ProcessTitle>
+          <template slot="title">协会信息</template>
+        </ProcessTitle>
+        <el-table border
+                  ref="selection"
+                  :data="associationData"
+                  tooltip-effect="dark"
+                  style="width: 100%;"
+                  :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+         fontWeight: 'bold', height: '48px'}"
+                  @selection-change="handleSelectionChange2"
+                  row-key="id">
+          <el-table-column type="selection" width="55" align="center"/>
+          <el-table-column
+            prop="itemsNum"
+            label="协会联络人"
+            width="170"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="itemsName"
+            label="电话"
+            width="150"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="itermsConditions"
+            label="邮箱"
+            align="center">
+          </el-table-column>
+        </el-table>
+      </div>
+    </div>
+    <div class="content" v-show="active === '2'">
+      2
+    </div>
+    <ProcessFooter
+      show-save
+      show-submit
+      :submitLoading="isSubmit"
+      :saveLoading="saveLoading"
+      @save="handleSave"
+      @submit="handleSubmit"
+    >
+    </ProcessFooter>
+  </div>
 </template>
 
 <script>
+import ProcessHeader from "../../components/ProcessHeader";
+import ProcessTitle from "process/components/ProcessTitle";
+import ProcessFooter from "process/components/ProcessFooter";
+
 export default {
-  name: "cywbbzzxdStep1"
+  name: "cywbbzzxdStep1",
+  components: {
+    ProcessHeader,
+    ProcessTitle,
+    ProcessFooter
+  },
+  data() {
+    return {
+      //切换tab
+      active: "1",
+      foldFormFlag: true,
+      isSubmit: false,
+      saveLoading: false,
+      uploadFileListPath: "api/att/attFile/upload", // 上传的地址
+      fileInfoList: [], // 上传的附件
+      wbbzform: {
+        reportingUnit:'',
+        associationName: '',
+        committee:'',
+        workingGroup:'',
+        personnelRole:'',
+        membershipTime:'',
+      },
+      formRules: {},
+      participantsData: [], //参与人表格信息
+      associationData: [], //协会表格信息
+      associationOptions: [{
+        value: '选项1',
+        label: '1'
+      }, {
+        value: '选项2',
+        label: '2'
+      },{
+        value: '选项3',
+        label: '3'
+      }],
+    };
+  },
+  methods: {
+    handleTabs(type) {
+      this.active = type;
+    },
+    foldForm() {
+      this.foldFormFlag = !this.foldFormFlag
+    },
+    handleSave() {},
+    handleSubmit() {
+      console.log(this.wbbzform);
+    },
+    handleSelectionChange1(){
+
+    },
+    handleSelectionChange2(){
+
+    },
+    // 删除上传的文件
+    delFileInfo(file, fileList) {
+      this.fileInfoList.forEach((item, index) => {
+        if (item.name === file.name || item.id === file.id ) {
+          this.fileInfoList.splice(index,1)
+        }
+      })
+    },
+    // 上传文件成功回调
+    uploadBackSuccess(res, file, fileList) {
+      if (res.ok) {
+        this.fileInfoList.push(res.data)
+        this.$message.success("上传成功");
+      } else {
+        this.$message.error(res.message);
+        fileList.pop();
+      }
+    },
+    // 上传之前钩子
+    beforeUpload(file) {
+      var filename = file.name;
+      var index1 = filename.lastIndexOf(".");
+      var index2 = filename.length;
+      var fileSuffix = filename.substring(index1, index2);
+      //把后缀转大写
+      if (fileSuffix !== undefined && fileSuffix !== null) {
+        fileSuffix = fileSuffix.toUpperCase();
+      }
+      // 判断上传文件格式
+      if (fileSuffix === ".PDF" || fileSuffix === ".DOC" || fileSuffix === ".DOCX" || fileSuffix === ".PPT"
+        || fileSuffix === ".PPTX" || fileSuffix === ".XLS" || fileSuffix === ".XLSX"
+        || fileSuffix === ".PNG" || fileSuffix === ".JPG" || fileSuffix === ".JPEG") {
+        return true;
+      } else {
+        this.$message.error("文件" + file.name + "格式不正确，请上传pdf、doc、docx、ppt、pptx、xls、xlsx、png、jpg、jpeg等文件");
+        return false;
+      }
+      // 判断文件上传大小
+      if (file.size / 1024 / 1024 > 300) {
+        this.$message.warning("文件" + file.name + "大小不能超过300M");
+        return false;
+      }
+      return true;
+    },
+  }
 };
 </script>
 
-<style scoped>
+<style lang="less" scoped>
+.wbbz-step1 {
+  height: 100%;
+  position: relative;
+  .content {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    height: calc(~'100% - 103px');
+    overflow: auto;
+    .form-select{
+      display: flex;
+    }
+  }
+  .headerTabs {
+    display: flex;
+    align-items: center;
+    position: absolute;
+    height: 52px;
+    top: 0;
+    right: 10px;
 
+    .headerTabsItem {
+      border: 1px solid #c1c1c1;
+      padding: 0 5px;
+      height: 30px;
+      line-height: 30px;
+      cursor: pointer;
+    }
+
+    .active {
+      border: 1px solid #E6A23C;
+      color: #fff;
+      background: #E6A23C;
+    }
+  }
+
+}
 </style>
diff --git a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step2.vue b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step2.vue
new file mode 100644
index 000000000..8448aa369
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step2.vue
@@ -0,0 +1,13 @@
+<template>
+
+</template>
+
+<script>
+export default {
+  name: "cywbbzzxdStep1"
+};
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step1.vue b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step1.vue
index ab5e0161a..e666ae495 100644
--- a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step1.vue
@@ -1,16 +1,241 @@
-<!--加入标准化协会信息备案流程-->
+<!-- 加入标准化协会信息备案流程-->
 <template>
-<div>
-  加入标准化协会信息备案流程
-</div>
+  <div class="jrbzhxh-step1">
+    <ProcessHeader>
+      <template slot="proName">加入标准化协会信息备案流程</template>
+      <template slot="proNode">发起流程</template>
+    </ProcessHeader>
+    <div class="content">
+      <ProcessTitle>
+        <template slot="title">人员信息</template>
+      </ProcessTitle>
+      <div class="block" style="padding-top: 20px; height: 100%">
+        <el-timeline>
+          <el-form
+            ref="Form"
+            :model="roleForm"
+            :rules="roleFormRules"
+            class="label-input-form">
+            <el-timeline-item timestamp="发起流程" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
+              <el-card>
+                <el-form-item prop="prcCreateUserName" style="margin-bottom: 0">
+                  <h4>标准法规工程师</h4>
+                  <div style="margin-top: 10px;width: 300px;">
+                    <el-input v-model="roleForm.prcCreateUser" style="display: none;"></el-input>
+                    <el-input v-model="roleForm.prcCreateUserName" placeholder="流程发起人"
+                              disabled></el-input>
+                  </div>
+                </el-form-item>
+              </el-card>
+            </el-timeline-item>
+            <el-timeline-item timestamp="选择标准化员进行入会信息填报" placement="top"
+                              :color="roleForm.dockUser ? '#66b1ff' : ''" >
+              <el-card>
+                <el-form-item prop="dockUserName" style="margin-bottom: 0">
+                  <h4>标准化员</h4>
+                  <div style="margin-top: 10px;width: 300px;">
+                    <el-input v-model="roleForm.dockUser" style="display: none;"></el-input>
+                    <el-input v-model="roleForm.dockUserName" placeholder="选择标准化员"
+                              @click.native="choiceZRRS">
+                    </el-input>
+                  </div>
+                </el-form-item>
+              </el-card>
+            </el-timeline-item>
+            <el-timeline-item timestamp="审批" placement="top"
+                              :color="roleForm.directorUser ? '#66b1ff' : ''">
+              <el-card>
+                <el-form-item prop="directorUserName" style="margin-bottom: 0">
+                  <h4>标准法规部部长</h4>
+                  <div style="margin-top: 10px;width: 300px;">
+                    <el-input v-model="roleForm.directorUser" style="display: none;"></el-input>
+                    <el-input v-model="roleForm.directorUserName" placeholder="选择标准法规部部长"
+                              @click.native="choiceZRR('directorUser', '选择标准法规部部长', roleForm.directorUser)"></el-input>
+                  </div>
+                </el-form-item>
+              </el-card>
+            </el-timeline-item>
+          </el-form>
+        </el-timeline>
+      </div>
+    </div>
+    <!--    多选择责任人-->
+    <Role-tree
+      is-title="选择责任部门对接人"
+      :is-visible.sync="modalshowflag2"
+      @checkedRole="checkedRole2"
+      :nodeList="nodeList2"
+    ></Role-tree>
+    <Role-tree
+      check-box
+      :is-title="drawerTitle"
+      :is-visible.sync="modalshowflag"
+      @checkedRole="checkedRole"
+      :nodeList="nodeList"
+    ></Role-tree>
+    <ProcessFooter
+      show-save
+      show-submit
+      :submitLoading="isSubmit"
+      :saveLoading="saveLoading"
+      @save="handleSave"
+      @submit="handleSubmit"
+    >
+    </ProcessFooter>
+  </div>
 </template>
 
 <script>
+import ProcessHeader from "../../components/ProcessHeader";
+import ProcessTitle from "process/components/ProcessTitle";
+import ProcessFooter from "process/components/ProcessFooter";
+
 export default {
-  name: "jrbzhxhStep1"
+  name: "jrbzhxhStep1",
+  components: {
+    ProcessHeader,
+    ProcessTitle,
+    ProcessFooter
+  },
+  data() {
+    return {
+      isSubmit: false,
+      saveLoading: false,
+      modalshowflag: false, // drawer开关
+      modalshowflag2: false,
+      nodeList2: [],
+      drawerTitle: "", //drawer标题
+      nodeList: [],
+      roleForm: {
+        prcCreateUserName: this.$store.getters.userInfo.userName,
+        prcCreateUser: this.$store.getters.userInfo.userId,
+        dockUser: "",
+        directorUser: "",
+        dockUserName: "",
+        directorUserName: ""
+      },
+      roleFormRules: {
+        dockUserName: [
+          {required: true, message: "请选择标准化员", trigger: "change"}
+        ],
+        directorUserName: [
+          {required: true, message: "请选择标准法规部部长", trigger: "change"}
+        ]
+      },
+    };
+  },
+  methods:{
+    choiceZRR(type, title, id) {
+      this.nodeList = [];
+      this.nodeList.push(id);
+      this.type = type;
+      this.drawerTitle = title;
+      this.modalshowflag = true;
+    },
+    choiceZRRS() {
+      this.nodeList2 = [];
+      if (this.roleForm.dockUser.length > 0) {
+        this.nodeList2 = this.roleForm.dockUser.split(",");
+      }
+      this.modalshowflag2 = true;
+    },
+    checkedRole(data) {
+      if (this.type === "dockUser") {
+        this.roleForm.dockUser = this.roleRow.id;
+        this.roleForm.dockUserName = this.roleRow.name;
+      } else if (this.type === "directorUser") {
+        this.roleForm.directorUser = data[0].id;
+        this.roleForm.directorUserName = data[0].name;
+      }
+      this.modalshowflag = false;
+    },
+    checkedRole2(data) {
+      var idList = "";
+      var nameList = "";
+      data.forEach(item => {
+        if (nameList.length > 0) {
+          nameList += ",";
+          idList += ",";
+        }
+        idList += item.id;
+        nameList += item.name;
+      });
+      this.roleForm.dockUser = idList;
+      this.roleForm.dockUserName = nameList;
+    },
+    handleSubmit(){
+      var json = this.roleForm
+      this.$refs["Form"].validate((valid) => {
+        if (valid) {
+          this.isSubmit = true
+          this.$http.get("lawss/activiti/startProcess", {type: "15"}, {
+            _this: this
+          }, res => {
+            if (res.ok) {
+              this.$http.post("lawss/activiti/completeTask", {
+                taskIds: res.data,
+                userId: this.$store.getters.userInfo.userId,
+                json: JSON.stringify(json)
+              }, {
+                _this: this
+              }, res => {
+                if (res.success) {
+                  this.$message.success(res.message);
+                  this.$router.push("/processCenter");
+                }
+                this.isSubmit = false
+              });
+            }
+          });
+        } else {
+          return this.$message.warning("请完善人员信息");
+        }
+      });
+
+    },
+    handleSave(){
+
+    },
+  },
 };
 </script>
 
-<style scoped>
+<style lang="less" scoped>
+.jrbzhxh-step1 {
+  height: 100%;
+  position: relative;
+  .content {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    height: calc(~'100% - 103px');
+    overflow: auto;
+    .form-select{
+      display: flex;
+    }
+  }
+  .headerTabs {
+    display: flex;
+    align-items: center;
+    position: absolute;
+    height: 52px;
+    top: 0;
+    right: 10px;
 
+    .headerTabsItem {
+      border: 1px solid #c1c1c1;
+      padding: 0 5px;
+      height: 30px;
+      line-height: 30px;
+      cursor: pointer;
+    }
+
+    .active {
+      border: 1px solid #E6A23C;
+      color: #fff;
+      background: #E6A23C;
+    }
+  }
+
+}
 </style>
diff --git a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue
new file mode 100644
index 000000000..19f6d92d3
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue
@@ -0,0 +1,537 @@
+<!--  加入标准化协会信息备案流程-->
+<template>
+  <div class="jrbzhxh-step2">
+    <ProcessHeader>
+      <template slot="proName">加入标准化协会信息备案流程</template>
+      <template slot="proNode">入会信息填报</template>
+    </ProcessHeader>
+    <div class="headerTabs">
+      <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
+      <div class="headerTabsItem" :class="active === '3' ? 'active' : '' " @click="handleTabs('3')">审批历史</div>
+    </div>
+    <div class="content" v-show="active === '1'">
+      <div>
+        <el-form
+          ref="wbbzForm"
+          :model="wbbzform"
+          :rules="formRules"
+          class="label-input-form"
+          label-width="210px"
+        >
+          <ProcessTitle>
+            <template slot="title">基础信息</template>
+          </ProcessTitle>
+          <div class="prc-content-border" v-if="foldFormFlag">
+            <el-row :gutter="24">
+              <el-col :gutter="24">
+                <el-form-item label="提报单位" prop="reportingUnit" class="add-form-item ">
+                  <el-input
+                    v-model="wbbzform.reportingUnit"
+                    placeholder="请输入提报单位"
+                    clearable>
+                  </el-input>
+                </el-form-item>
+                <el-form-item label="协会名称" prop="associationName" class="add-form-item ">
+                  <div class="form-select">
+                    <el-select v-model="wbbzform.associationName" placeholder="请选择协会名称">
+                      <el-option
+                        v-for="item in associationOptions"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value">
+                      </el-option>
+                    </el-select>
+                    <el-select v-model="wbbzform.committee" placeholder="请选择分标委">
+                      <el-option
+                        v-for="item in associationOptions"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value">
+                      </el-option>
+                    </el-select>
+                    <el-select v-model="wbbzform.workingGroup" placeholder="请选择工作组">
+                      <el-option
+                        v-for="item in associationOptions"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value">
+                      </el-option>
+                    </el-select>
+                  </div>
+                </el-form-item>
+                <el-form-item label="人员角色" prop="personnelRole" class="add-form-item ">
+                  <div class="form-select">
+                    <el-select v-model="wbbzform.personnelRole" placeholder="请选择会员角色">
+                      <el-option
+                        v-for="item in associationOptions"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value">
+                      </el-option>
+                    </el-select>
+                    <el-date-picker
+                      v-model="wbbzform.membershipTime"
+                      type="date"
+                      placeholder="请选择入会时间">
+                    </el-date-picker>
+                  </div>
+                </el-form-item>
+                <el-form-item label="证书" prop="fileName" class="add-form-item form-item-disabled">
+                  <div>
+                    <el-upload
+                      :action="uploadFileListPath"
+                      show-file-list
+                      :file-list="fileInfoList"
+                      name="file"
+                      accept=".PDF, .pdf, .doc, .DOC, .docx, .DOCX, .xls, .xlsx, .ppt, .pptx, .PPT, .PPTX, .JPG, .JPEG, .PNG, .jpg, .jpeg, .png"
+                      :on-remove="delFileInfo"
+                      :on-success="uploadBackSuccess"
+                      :before-upload="beforeUpload"
+                    >
+                      <el-button class="common-button-default" size="mini">
+                        点击上传
+                      </el-button>
+                    </el-upload>
+                  </div>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </div>
+          <el-button style="width: 100%" icon="el-icon-caret-top" @click="foldForm">{{ foldFormFlag ? '隐藏基础信息' : '展开基础信息' }}</el-button>
+        </el-form>
+        <ProcessTitle>
+          <template slot="title">参与人信息</template>
+        </ProcessTitle>
+        <div class="tableTitle">
+          <div class="tableButton">
+            <el-button plain class="common-button-primary" size="mini" @click="addPeople">添加</el-button>
+            <el-button plain class="common-button-primary" size="mini" @click="deletePeople">批量删除</el-button>
+          </div>
+        </div>
+        <el-table border
+                  ref="selection"
+                  :data="participantsData"
+                  tooltip-effect="dark"
+                  style="width: 100%;"
+                  :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+         fontWeight: 'bold', height: '48px'}"
+                  @selection-change="handleSelectionChange1"
+                  row-key="id">
+          <el-table-column type="selection" width="55" align="center"/>
+          <el-table-column
+            prop="workPeople"
+            label="参与人"
+            width="150"
+            align="center">
+            <template slot-scope="scope">
+              <el-input  v-model="scope.row.workPeopleId" style="display: none;" readonly/>
+              <el-input  v-model="scope.row.workPeople" placeholder="请选择分发责任人"
+                        @click.native="choiceZRRS(scope.row, scope.$index)" readonly/>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="duties"
+            label="职务"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="department"
+            label="所在部门"
+            width="200"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="contact"
+            label="联系方式"
+            width="350"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="tenure"
+            label="任期"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="account"
+            label="账户"
+            width="200"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="password"
+            label="密码"
+            width="350"
+            align="center">
+          </el-table-column>
+        </el-table>
+        <ProcessTitle>
+          <template slot="title">协会信息</template>
+        </ProcessTitle>
+        <div class="tableTitle">
+          <div class="tableButton">
+            <el-button plain class="common-button-primary" size="mini" @click="addSociety">添加</el-button>
+            <el-button plain class="common-button-primary" size="mini" @click="deleteSociety">批量删除</el-button>
+          </div>
+        </div>
+        <el-table border
+                  ref="selection"
+                  :data="associationData"
+                  tooltip-effect="dark"
+                  style="width: 100%;"
+                  :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+         fontWeight: 'bold', height: '48px'}"
+                  @selection-change="handleSelectionChange2"
+                  row-key="id">
+          <el-table-column type="selection" width="55" align="center"/>
+          <el-table-column
+            prop="contactPerson"
+            label="协会联络人"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="telephone"
+            label="电话"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="mailbox"
+            label="邮箱"
+            align="center">
+          </el-table-column>
+        </el-table>
+      </div>
+    </div>
+    <div class="content" v-show="active === '3'">
+      <div class="flow-list">
+        <el-table
+          height="100%"
+          ref="selection"
+          :data="detailData"
+          tooltip-effect="dark"
+          style="width: 100%"
+          border
+          row-key="id"
+          :no-data-text="listNoDataText"
+          :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
+        >
+          <el-table-column
+            type="selection"
+            width="55"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="name"
+            label="任务步骤"
+            align="center"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="assignee"
+            label="任务受理人"
+            align="center"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="createTime"
+            label="创建时间"
+            sortable="custom"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="endTime"
+            label="完成时间"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="comment"
+            label="流程信息"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.commentText }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="completeFlag"
+            label="状态"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.endTime ? "已完成" : "未完成" }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+        <loading :loading="loading">流程列表加载中</loading>
+      </div>
+    </div>
+    <ProcessFooter
+      show-save
+      show-submit
+      show-record
+      :recordLoading="recordLoading"
+      :submitLoading="isSubmit"
+      :saveLoading="saveLoading"
+      @record="handleRecord"
+      @save="handleSave"
+      @submit="handleSubmit"
+    >
+    </ProcessFooter>
+    <Role-tree
+      check-box
+      :is-title="drawerTitle"
+      :is-visible.sync="modalshowflag"
+      @checkedRole="checkedRole"
+      :nodeList="nodeList"
+    ></Role-tree>
+  </div>
+</template>
+
+<script>
+import ProcessHeader from "../../components/ProcessHeader";
+import ProcessTitle from "process/components/ProcessTitle";
+import ProcessFooter from "process/components/ProcessFooter";
+
+export default {
+  name: "jrbzhxhStep2",
+  components: {
+    ProcessHeader,
+    ProcessTitle,
+    ProcessFooter
+  },
+  data() {
+    return {
+      //切换tab
+      active: "1",
+      foldFormFlag: true,
+      isSubmit: false,
+      saveLoading: false,
+      recordLoading: false,
+      loading: false,
+      modalshowflag: false,
+      drawerTitle: '',
+      nodeList: [],
+      uploadFileListPath: "api/att/attFile/upload", // 上传的地址
+      fileInfoList: [], // 上传的附件
+      wbbzform: {
+        reportingUnit:'',
+        associationName: '',
+        committee:'',
+        workingGroup:'',
+        personnelRole:'',
+        membershipTime:'',
+        participantsData: [{
+          workPeople: '', //参与人
+          duties: '', //职务
+          department: '', //所在部门
+          contact: '', //联系方式
+          tenure:'', //任期
+          account:'', //账户
+          password:'', //密码
+        }],
+        associationData: [{
+          contactPerson: '', //协议联络人
+          telephone: '',  //电话
+          mailbox:'', //邮箱
+        }],
+      },
+      formRules: {},
+      participantsData: [], //参与人表格信息
+      associationData: [], //协会表格信息
+      detailData: [], //审批历史信息
+      selectedId: "",
+      associationOptions: [{
+        value: '选项1',
+        label: '1'
+      }, {
+        value: '选项2',
+        label: '2'
+      },{
+        value: '选项3',
+        label: '3'
+      }],
+    };
+  },
+  methods: {
+    processTable() {
+      this.$http.get("lawss/activiti/get_list_by_instance", {
+        prcNum: this.$route.query.prcNum,
+        sortWord: this.shunxu ? this.paixu : "",
+        shunxu: this.shunxu
+      }, {
+        loading: "loading",
+        _this: this
+      }, res => {
+        this.detailData = res;
+      }, e => {
+      });
+    },
+    choiceZRRS(row, index) {
+        this.selectedId = index;
+        this.drawerTitle = "选择责任人";
+        this.nodeList = [];
+        this.zrIndex = index;
+        this.nodeList.push(row);
+        this.modalshowflag = true;
+      },
+    checkedRole(data){
+      console.log(data);
+      this.participantsData.forEach(item => {
+        console.log(item.index);
+        console.log(this.selectedId);
+        if (item.index === this.selectedId) {
+              item.workPeople = data[0].name;
+              item.workPeopleId = data[0].id;
+            }
+      });
+      this.participantsData = JSON.parse(JSON.stringify(this.participantsData));
+    },
+
+    handleTabs(type) {
+      this.active = type;
+    },
+    foldForm() {
+      this.foldFormFlag = !this.foldFormFlag
+    },
+    //不备案
+    handleRecord(){
+
+    },
+    //流程保存
+    handleSave() {},
+    //流程提交
+    handleSubmit() {
+      console.log(this.wbbzform);
+    },
+    handleSelectionChange1(){
+
+    },
+    handleSelectionChange2(){
+
+    },
+    //添加参与人信息
+    addPeople(){
+      var list =[]
+      this.participantsData.push(list)
+    },
+    //批量删除参与人信息
+    deletePeople(){
+
+    },
+    //添加协会信息
+    addSociety(){
+
+    },
+    //批量删除协会信息
+    deleteSociety(){
+
+    },
+    // 删除上传的文件
+    delFileInfo(file, fileList) {
+      this.fileInfoList.forEach((item, index) => {
+        if (item.name === file.name || item.id === file.id ) {
+          this.fileInfoList.splice(index,1)
+        }
+      })
+    },
+    // 上传文件成功回调
+    uploadBackSuccess(res, file, fileList) {
+      if (res.ok) {
+        this.fileInfoList.push(res.data)
+        this.$message.success("上传成功");
+      } else {
+        this.$message.error(res.message);
+        fileList.pop();
+      }
+    },
+    // 上传之前钩子
+    beforeUpload(file) {
+      var filename = file.name;
+      var index1 = filename.lastIndexOf(".");
+      var index2 = filename.length;
+      var fileSuffix = filename.substring(index1, index2);
+      //把后缀转大写
+      if (fileSuffix !== undefined && fileSuffix !== null) {
+        fileSuffix = fileSuffix.toUpperCase();
+      }
+      // 判断上传文件格式
+      if (fileSuffix === ".PDF" || fileSuffix === ".DOC" || fileSuffix === ".DOCX" || fileSuffix === ".PPT"
+        || fileSuffix === ".PPTX" || fileSuffix === ".XLS" || fileSuffix === ".XLSX"
+        || fileSuffix === ".PNG" || fileSuffix === ".JPG" || fileSuffix === ".JPEG") {
+        return true;
+      } else {
+        this.$message.error("文件" + file.name + "格式不正确，请上传pdf、doc、docx、ppt、pptx、xls、xlsx、png、jpg、jpeg等文件");
+        return false;
+      }
+      // 判断文件上传大小
+      if (file.size / 1024 / 1024 > 300) {
+        this.$message.warning("文件" + file.name + "大小不能超过300M");
+        return false;
+      }
+      return true;
+    },
+  },
+  computed: {
+    listNoDataText() {
+      return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
+    }
+  },
+};
+</script>
+
+<style lang="less" scoped>
+.jrbzhxh-step2 {
+  height: 100%;
+  position: relative;
+  .content {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    height: calc(~'100% - 103px');
+    overflow: auto;
+    .form-select{
+      display: flex;
+    }
+    .tableTitle {
+      margin-bottom: 10px;
+      height: 30px;
+      line-height: 30px;
+      position: relative;
+      font-size: 13px;
+      font-weight: bold;
+
+      .tableButton {
+        position: absolute;
+        right: 0;
+        top: 0;
+      }
+    }
+  }
+  .headerTabs {
+    display: flex;
+    align-items: center;
+    position: absolute;
+    height: 52px;
+    top: 0;
+    right: 10px;
+
+    .headerTabsItem {
+      border: 1px solid #c1c1c1;
+      padding: 0 5px;
+      height: 30px;
+      line-height: 30px;
+      cursor: pointer;
+    }
+
+    .active {
+      border: 1px solid #E6A23C;
+      color: #fff;
+      background: #E6A23C;
+    }
+  }
+
+}
+</style>

From 8a8832496a782b6bd1976cebfc742ad33650ac9e Mon Sep 17 00:00:00 2001
From: shenyanpei <shenyanpei>
Date: Tue, 26 Oct 2021 17:26:57 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=A4=96=E9=83=A8=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E5=8C=96=E5=8D=8F=E4=BC=9A=E5=85=A5=E4=BC=9A=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/components/ProcessFooter.vue        |   5 +-
 .../pages/creatProcess/bzhHd-rh/step1.vue     | 685 ++++++++++++++++++
 .../pages/creatProcess/bzhHd-rh/step2.vue     | 366 ++++++++++
 .../pages/creatProcess/bzhHd-rh/step3.vue     | 347 +++++++++
 .../pages/creatProcess/bzhHd-rh/step4.vue     |  13 +
 .../pages/creatProcess/bzhHd-rh/step5.vue     |  13 +
 .../processCenter/pages/newProcess/index.vue  |  78 ++
 .../tabComponents/processCenter/index.vue     |  48 ++
 src/router/index.js                           |  48 +-
 9 files changed, 1601 insertions(+), 2 deletions(-)
 create mode 100644 src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue
 create mode 100644 src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue
 create mode 100644 src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue
 create mode 100644 src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue
 create mode 100644 src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue

diff --git a/src/pages/processCenter/pages/components/ProcessFooter.vue b/src/pages/processCenter/pages/components/ProcessFooter.vue
index c04920b05..c6537ed59 100644
--- a/src/pages/processCenter/pages/components/ProcessFooter.vue
+++ b/src/pages/processCenter/pages/components/ProcessFooter.vue
@@ -273,6 +273,9 @@ export default {
       type: Boolean,
       default: false
     },
+    backBTNTexts: {
+      type: String
+    },
     submitBTNText: {
       type: String
     }
@@ -405,7 +408,7 @@ export default {
     },
     // 退回按钮文字
     backBTNText() {
-      return this.approval ? '驳回' : '退回'
+      return this.backBTNTexts ? this.backBTNTexts : this.approval ? '驳回' : '退回'
     },
     userId() {
       return this.userInfo.userId
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue
new file mode 100644
index 000000000..7f255940a
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue
@@ -0,0 +1,685 @@
+<!--外部标准化协会入会流程-->
+<template>
+  <div class="bzrhStep1">
+    <ProcessHeader toggle>
+      <template slot="proName">外部标准化协会入会流程</template>
+      <template slot="proNode">发起流程</template>
+    </ProcessHeader>
+    <div class="headerTabs">
+      <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
+      <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;">
+        <ProcessTitle>
+          <template slot="title">基础信息</template>
+        </ProcessTitle>
+        <div class="content_form">
+          <el-form ref="rh_pageData" :model="rh_pageData" :rules="rh_rules" label-width="auto">
+            <el-row>
+              <el-col :span="8">
+                <el-form-item label="协会名称:">
+                  <el-select
+                    v-model="rh_pageData.comityName"
+                    placeholder="请选择标委会">
+                    <el-option
+                      v-for="item in comityNameOptions"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"/>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item v-if="rh_pageData.comityName !== ''">
+                  <el-select
+                    v-model="rh_pageData.comityName2"
+                    placeholder="请选择分标委">
+                    <el-option
+                      v-for="item in comityNameOptions"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"/>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="" v-if="rh_pageData.comityName !== '' && rh_pageData.comityName2 !== ''">
+                  <el-select
+                    v-model="rh_pageData.comityName3"
+                    placeholder="请选择工作组">
+                    <el-option
+                      v-for="item in comityNameOptions"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"/>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-divider/>
+            <el-row>
+              <el-col :span="8">
+                <el-form-item label="会员角色:" prop="comityRole">
+                  <el-select
+                    v-model="rh_pageData.comityRole"
+                    placeholder="请选择会员角色">
+                    <el-option
+                      v-for="item in comityRoleOptions"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"/>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="协会状态:" prop="comityState">
+                  <el-select
+                    v-model="rh_pageData.comityState"
+                    placeholder="选择协会状态">
+                    <el-option
+                      v-for="item in comityStateOptions"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"/>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="入会性质:" prop="comityKind">
+                  <el-select
+                    v-model="rh_pageData.comityKind"
+                    placeholder="请选择入会性质">
+                    <el-option
+                      v-for="item in comityKindOptions"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"/>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-divider/>
+            <el-form-item label="信息来源:" prop="InfoSources">
+              <el-upload
+                style="width: 30%"
+                class="upload_style"
+                :disabled="acceptShow"
+                multiple
+                ref="uploadFile"
+                :action="uploadPath"
+                name="file"
+                :file-list="fileTextList"
+                accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx"
+                :before-upload="handleBeforeUpload"
+                :before-remove="handleBeforeRemove"
+                :on-success="handleOnsuccess"
+              >
+                <el-button
+                  type="primary"
+                  class="common-button-primary"
+                  @click="uploadFile"
+                  size="mini">
+                  点击上传
+                </el-button>
+              </el-upload>
+            </el-form-item>
+            <el-divider/>
+            <el-form-item label="协会构成:" prop="comityMake">
+              <el-form
+                class="make_form"
+                ref="rh_pageData.comityMake"
+                :model="rh_pageData.comityMake"
+                label-width="auto">
+                <el-row>
+                  <el-col :span="8">
+                    <el-form-item label="资质:">
+                      <el-input v-model="rh_pageData.comityMake.makeQualification"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item label="成员:">
+                      <el-input v-model="rh_pageData.comityMake.makeRole"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item label="费用估计:">
+                      <el-input v-model="rh_pageData.comityMake.makeCost"></el-input>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row>
+                  <el-col :span="8">
+                    <el-form-item label="职责:">
+                      <el-input v-model="rh_pageData.comityMake.makeDuties"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item label="任期:">
+                      <el-input v-model="rh_pageData.comityMake.makeTime" ></el-input>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+              </el-form>
+            </el-form-item>
+            <el-divider/>
+            <el-form-item label="工作方向:" prop="workPath">
+              <el-input v-model="rh_pageData.workPath" type="textarea"></el-input>
+            </el-form-item>
+            <el-divider/>
+            <el-form-item label="协会外部联系方式:" style="margin-bottom: 50px">
+              <div class="comityTel_btn">
+                <el-button
+                  type="primary"
+                  size="small"
+                  icon="el-icon-plus"
+                  @click="add_comityTel">
+                  添加
+                </el-button>
+                <el-button
+                  type="danger"
+                  size="small"
+                  icon="el-icon-delete"
+                  @click="del_comityTel">
+                  批量删除
+                </el-button>
+              </div>
+              <el-table
+                calss="tel_table"
+                :data="rh_pageData.comityTel"
+                border
+                ref="entryTable"
+                height="49%"
+                @selection-change="selectedDelete"
+                style="width: 100%"
+                :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+              fontWeight: 'bold', height: '20px'}">
+                <el-table-column type="selection" width="55"></el-table-column>
+                <el-table-column
+                  prop="rh_pageData.comityTel.tel_name"
+                  align="center"
+                  label="联络人">
+                  <template slot-scope="scope">
+                    <el-input v-model="scope.row.tel_name"></el-input>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="rh_pageData.comityTel.tel_unit"
+                  align="center"
+                  label="单位">
+                  <template slot-scope="scope">
+                    <el-input v-model="scope.row.tel_unit"></el-input>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="rh_pageData.comityTel.tel_phone"
+                  align="center"
+                  label="电话">
+                  <template slot-scope="scope">
+                    <el-input v-model="scope.row.tel_phone"></el-input>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="rh_pageData.comityTel.tel_mail"
+                  align="center"
+                  label="邮箱">
+                  <template slot-scope="scope">
+                    <el-input v-model="scope.row.tel_mail"></el-input>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </el-form-item>
+          </el-form>
+        </div>
+      </div>
+    </div>
+    <div class="content" v-show="active === '2'">
+      <div class="block" style="padding-top: 20px;">
+        <el-timeline>
+          <el-form
+            ref="roleForm"
+            :model="roleForm"
+            :rules="roleFormRules"
+            class="label-input-form">
+            <el-timeline-item timestamp="发起流程" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
+              <el-card>
+                <el-form-item prop="startUserName" style="margin-bottom: 0">
+                  <h4>流程发起人</h4>
+                  <div style="margin-top: 10px;width: 300px;">
+                    <el-input v-model="roleForm.startUser" :disabled="true" style="display: none;"></el-input>
+                    <el-input v-model="roleForm.startUserName" :disabled="true" placeholder="流程发起人"></el-input>
+                  </div>
+                </el-form-item>
+              </el-card>
+            </el-timeline-item>
+            <el-timeline-item timestamp="指派人员" placement="top" :color="roleForm.dockUser ? '#66b1ff' : ''">
+              <el-card>
+                <el-form-item prop="dockUserName" style="margin-bottom: 0">
+                  <h4>技术委员会分委会主任/技术主管部门负责人</h4>
+                  <div style="margin-top: 10px;width: 300px;">
+                    <el-input v-model="roleForm.dockUser" style="display: none;"></el-input>
+                    <el-input v-model="roleForm.dockUserName" placeholder="选择指派人员" @click.native="choiceZRR('dockUser', '选择指派人员', roleForm.dockUser)">
+                    </el-input>
+                  </div>
+                </el-form-item>
+              </el-card>
+            </el-timeline-item>
+            <el-timeline-item timestamp="填写信息" placement="top" :color="roleForm.dockUser ? '#66b1ff' : ''">
+              <el-card>
+                <el-form-item prop="dockUserName" style="margin-bottom: 0">
+                  <h4>责任工程师</h4>
+                  <div style="margin-top: 10px;width: 300px;">
+                    <el-input v-model="roleForm.dutyUser" style="display: none;"></el-input>
+                    <el-input v-model="roleForm.dutyUserName" :disabled="true" placeholder="责任工程师">
+                    </el-input>
+                  </div>
+                </el-form-item>
+              </el-card>
+            </el-timeline-item>
+            <el-timeline-item timestamp="审批" placement="top" :color="roleForm.uploadUser ? '#66b1ff' : ''">
+              <el-card>
+                <el-form-item prop="dockUserName" style="margin-bottom: 0">
+                  <h4>参会人员所在部门负责人</h4>
+                  <div style="margin-top: 10px;width: 300px;">
+                    <el-input v-model="roleForm.uploadUser" style="display: none;"></el-input>
+                    <el-input v-model="roleForm.uploadUserName" :disabled="true" placeholder="参会人员所在部门负责人">
+                    </el-input>
+                  </div>
+                </el-form-item>
+              </el-card>
+            </el-timeline-item>
+            <el-timeline-item timestamp="汇总修订" placement="top" :color="roleForm.dockUser ? '#66b1ff' : ''">
+              <el-card>
+                <el-form-item prop="dockUserName" style="margin-bottom: 0">
+                  <h4>标准法规部人员</h4>
+                  <div style="margin-top: 10px;width: 300px;">
+                    <el-input v-model="roleForm.dockUser" style="display: none;"></el-input>
+                    <el-input v-model="roleForm.dockUserName" :disabled="true" placeholder="选择标准法规部人员" @click.native="choiceZRR('dockUser', '选择标准法规部人员', roleForm.dockUser)">
+                    </el-input>
+                  </div>
+                </el-form-item>
+              </el-card>
+            </el-timeline-item>
+            <el-timeline-item timestamp="审批" placement="top" :color="roleForm.dockUser ? '#66b1ff' : ''">
+              <el-card>
+                <el-form-item prop="dockUserName" style="margin-bottom: 0">
+                  <h4>标准法规部主管领导</h4>
+                  <div style="margin-top: 10px;width: 300px;">
+                    <el-input v-model="roleForm.dockUser" style="display: none;"></el-input>
+                    <el-input v-model="roleForm.dockUserName" :disabled="true" placeholder="选择标准法规部主管领导" @click.native="choiceZRR('dockUser', '选择标准法规部主管领导', roleForm.dockUser)">
+                    </el-input>
+                  </div>
+                </el-form-item>
+              </el-card>
+            </el-timeline-item>
+            <el-timeline-item timestamp="会签" placement="top" :color="roleForm.dockUser ? '#66b1ff' : ''">
+              <el-card>
+                <el-form-item prop="dockUserName" style="margin-bottom: 0">
+                  <h4>费用管理部门</h4>
+                  <div style="margin-top: 10px;width: 300px;">
+                    <el-input v-model="roleForm.dockUser" style="display: none;"></el-input>
+                    <el-input v-model="roleForm.dockUserName" :disabled="true" placeholder="选择费用管理部门" @click.native="choiceZRR('dockUser', '选择费用管理部门', roleForm.dockUser)">
+                    </el-input>
+                  </div>
+                </el-form-item>
+              </el-card>
+            </el-timeline-item>
+            <el-timeline-item timestamp="审定" placement="top" :color="roleForm.dockUser ? '#66b1ff' : ''">
+              <el-card>
+                <el-form-item prop="dockUserName" style="margin-bottom: 0">
+                  <h4>技术委员会常务副主任/总院院长</h4>
+                  <div style="margin-top: 10px;width: 300px;">
+                    <el-input v-model="roleForm.dockUser" style="display: none;"></el-input>
+                    <el-input v-model="roleForm.dockUserName" :disabled="true" placeholder="选择人员" @click.native="choiceZRR('dockUser', '选择人员', roleForm.dockUser)">
+                    </el-input>
+                  </div>
+                </el-form-item>
+              </el-card>
+            </el-timeline-item>
+            <el-timeline-item timestamp="批准" placement="top" :color="roleForm.dockUser ? '#66b1ff' : ''">
+              <el-card>
+                <el-form-item prop="dockUserName" style="margin-bottom: 0">
+                  <h4>总院技术委员会主任</h4>
+                  <div style="margin-top: 10px;width: 300px;">
+                    <el-input v-model="roleForm.dockUser" style="display: none;"></el-input>
+                    <el-input v-model="roleForm.dockUserName" :disabled="true" placeholder="选择总院技术委员会主任" @click.native="choiceZRR('dockUser', '选择总院技术委员会主任', roleForm.dockUser)">
+                    </el-input>
+                  </div>
+                </el-form-item>
+              </el-card>
+            </el-timeline-item>
+          </el-form>
+        </el-timeline>
+      </div>
+    </div>
+    <ProcessFooter
+      show-save
+      show-submit
+      :submitLoading="isSubmit"
+      :saveLoading="saveLoading"
+      @save="handleSave"
+      @submit="handleSubmit"
+    >
+    </ProcessFooter>
+    <Role-tree
+      check-box
+      is-title="选择人员信息"
+      :is-visible.sync="roleShowflag"
+      :nodeList="nodeList"
+      @checkedRole="drawerCheck"
+    />
+  </div>
+</template>
+
+<script>
+import ProcessHeader from '../../components/ProcessHeader'
+import ProcessFooter from '../../components/ProcessFooter'
+import ProcessTitle from '../../components/ProcessTitle'
+import { startProcess, saveTaskFirst,completeTask } from '@/api/process.js'
+export default {
+  components: {
+    ProcessHeader,
+    ProcessFooter,
+    ProcessTitle
+  },
+  name: "bzrhStep1",
+  data() {
+    return {
+      active: '1', // 默认显示
+      rh_pageData: {
+        comityName: '',
+        comityName2: '',
+        comityName3: '',
+        comityRole: '',
+        comityState: '',
+        comityKind: '',
+        InfoSources: '',
+        comityMake: {
+          makeQualification: '',
+          makeRole: '',
+          makeCost: '',
+          makeDuties: '',
+          makeTime: '',
+        },
+        workPath: '',
+        comityTel:[],
+      },
+      comityNameOptions: [
+        { value: '0' ,label: '国内法规入库流程'},
+        { value: '1' ,label: '标准法规技术评估流程'},
+      ],
+      comityRoleOptions: [
+        { value: '0' ,label: '委员'},
+        { value: '1' ,label: '观察委员'},
+        { value: '2' ,label: '通讯委员'},
+        { value: '3' ,label: '成员'}
+      ],
+      comityStateOptions: [
+        { value: '0' ,label: '常设机构'},
+        { value: '1' ,label: '临时机构'}
+      ],
+      comityKindOptions: [
+        { value: '0' ,label: '新增'},
+        { value: '1' ,label: '换届'},
+        { value: '2' ,label: '委员改选'}
+      ],
+      /** 上传相关   */
+      acceptShow: false,
+      // 上传路径
+      uploadPath: 'api/att/attFile/upload',
+      // 上传所储存文件数组
+      fileTextList: [],
+
+      deleteDataList: [],
+
+      unqualidiedData: [],
+
+      roleForm: {
+        startUserName: this.$store.getters.userInfo.userName,
+        startUser: this.$store.getters.userInfo.userId,
+        dockUserName: '',
+        dockUser: ''
+      },
+      rh_rules: {},
+      roleFormRules: {
+        dockUserName: [{ required: true, message: "请选择标准法规工程师", trigger: ['blur', 'change']}]
+      },
+      roleShowflag: false,
+      nodeList: [],
+      isSubmit: false,
+      saveLoading: false,
+    }
+  },
+  methods: {
+    // 右上标签页面切换
+    handleTabs(name) {
+      this.active = name
+    },
+
+    //上传按钮
+    uploadFile (val) {
+    },
+    // 文件上传限制条件
+    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') {
+        return true
+      } else {
+        this.spinShow = false
+        this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX或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.fileData = fileList
+      this.fileTextList.forEach((item, index) => {
+        if (item.name === file.name || item.id === file.id ) {
+          this.fileTextList.splice(index,1)
+        }
+      })
+    },
+    // 文件上传成功
+    handleOnsuccess() {},
+
+
+    /** 添加 */
+    add_comityTel() {
+      var list = {
+        tel_name: this.tel_name,
+        tel_unit: this.tel_unit,
+        tel_phone: this.tel_phone,
+        tel_mail: this.tel_mail
+      }
+      this.rh_pageData.comityTel.push(list)
+    },
+    /** 批量删除 */
+    del_comityTel() {
+      if (this.deleteDataList.length < 1) {
+        this.$message.warning("请选择一条数据进行删除");
+      } else {
+        this.$confirm("您确认删除这些数据?", "提示", {
+          confirmButtonText: "确认",
+          confirmButtonClass: "common-button-primary",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          let exits = [];
+          this.deleteDataList.map(item => {
+            let index;
+            index = this.rh_pageData.comityTel.findIndex(items => {
+              return items.id === item;
+            });
+            if (index > -1) {
+              this.rh_pageData.comityTel.splice(index, 1);
+            }
+            exits.push(item);
+          });
+          this.deleteDataList = [];
+        }).catch(() => {
+        });
+      }
+    },
+    // 协会外部联系方式批量选择
+    selectedDelete(val) {
+      this.deleteDataList = val
+      console.log(val)
+    },
+
+    // 流程阶段负责人选择
+    choiceZRR (type, title, id) {
+      this.nodeList = []
+      this.nodeList.push(id)
+      this.type = type
+      this.drawerTitle = title
+      this.roleShowflag = true
+    },
+    drawerCheck (data) {
+      this.unqualidiedData.forEach(item => {
+        item.engineer = data[0].name
+        item.engineerId = data[0].id
+      })
+      this.roleForm.dockUser = data[0].id
+      this.roleForm.dockUserName = data[0].name
+      this.roleShowflag = false
+    },
+    // 保存按钮
+    handleSave(){},
+    // 提交按钮
+    handleSubmit() {
+      let json = {
+        prcCreateUser: this.$store.getters.userInfo.userId,
+        prcCreateUserName: this.$store.getters.userInfo.userName,
+        rh_pageData: this.rh_pageData,
+        directorList: this.roleForm.dockUser,
+      }
+      this.$refs['rh_pageData'].validate((valid) => {
+        if (valid) {
+          this.$refs['roleForm'].validate((valid) => {
+            if (valid) {
+              this.isSubmit = true
+              const paramsInfo = {
+                type: '11'
+              }
+              startProcess(paramsInfo).then(res=>{
+                this.taskID = res.data
+                const params = new FormData();
+                params.set('json', JSON.stringify(json))
+                params.set('userId', this.$store.getters.userInfo.userId)
+                params.set('taskId', this.taskID)
+                completeTask(params).then(res => {
+                  if(res.success === true) {
+                    this.$message.success('提交成功')
+                    this.$router.push("/processCenter");
+                  }
+                  this.isSubmit = false
+                })
+              })
+            }
+          })
+        } })
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+@import '~@/assets/styles/style';
+.bzrhStep1 {
+  position: relative;
+  height: 100%;
+  /deep/.el-drawer__container {
+    .prc-content-border {
+      border: none;
+      padding: 0 20px 0;
+    }
+  }
+  .headerTabs {
+    height: 52px;
+    display: flex;
+    align-items: center;
+    position: absolute;
+    top: 0;
+    right: 10px;
+    .headerTabsItem {
+      border: 1px solid #c1c1c1;
+      padding: 0 5px;
+      height: 30px;
+      line-height: 30px;
+      cursor: pointer;
+    }
+    .active {
+      border: 1px solid #E6A23C;
+      color: #fff;
+      background: #E6A23C;
+    }
+  }
+  .content-center {
+    padding: 10px 0px 10px 10px;
+  }
+  .content {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    height: calc(~'100% - 103px');
+    overflow: auto;
+    .tableTitle {
+      margin-bottom: 10px;
+      height: 30px;
+      line-height: 30px;
+      position: relative;
+      font-size: 13px;
+      font-weight: bold;
+      .tableButton {
+        position: absolute;
+        right: 0;
+        top: 0;
+      }
+    }
+  }
+  .content_form {
+    border: 1px solid #DCDFE6;
+    padding-top: 15px;
+    .el-divider--horizontal {
+      margin-top: 0px;
+    }
+    /deep/.el-table__body-wrapper {
+      height: auto!important;
+    }
+    .make_form {
+      border: 1px solid #DCDFE6;
+      padding: 10px;
+      /deep/.el-form-item__label-wrap {
+        margin-left: 0!important;
+      }
+      /deep/.el-form-item__content {
+        margin-left: 40px!important;
+      }
+      .el-input {
+        padding-bottom: 10px;
+        width: 85%;
+      }
+    }
+    .comityTel_btn {
+      text-align: right;
+    }
+    /deep/.el-table th {
+      padding: 0px;
+    }
+  }
+}
+</style>
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue
new file mode 100644
index 000000000..ba97fe78e
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue
@@ -0,0 +1,366 @@
+<template>
+  <div class="bzrhStep2">
+    <ProcessHeader toggle>
+      <template slot="proName">外部标准化协会入会流程</template>
+      <template slot="proNode">发起流程</template>
+    </ProcessHeader>
+    <div class="headerTabs">
+      <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
+      <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;">
+        <ProcessTitle>
+          <template slot="title">基础信息</template>
+        </ProcessTitle>
+        <div class="content_form">
+          <el-form ref="rh_pageData" :model="rh_pageData" label-width="auto">
+            <el-row>
+              <el-col :span="8">
+                <el-form-item label="协会名称:">
+                  {{ rh_pageData.comityName || '-' }}
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="协会状态:" prop="comityState">
+                  {{ rh_pageData.comityState || '-' }}
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="8">
+                <el-form-item label="入会性质:" prop="comityKind">
+                  {{ rh_pageData.comityKind || '-' }}
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="8">
+                <el-form-item label="资质:">
+                  {{ rh_pageData.comityMake.makeQualification || '-' }}
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="成员:">
+                  {{ rh_pageData.comityMake.makeRole || '' }}
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="8">
+                <el-form-item label="费用估计:">
+                  {{ rh_pageData.comityMake.makeCost || '-' }}
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="职责:">
+                  {{ rh_pageData.comityMake.makeDuties || '-' }}
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="8">
+                <el-form-item label="任期:">
+                  {{ rh_pageData.comityMake.makeTime || '-' }}
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-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>
+            <el-form-item label="协会外部联系方式:">
+              <el-table
+                :data="rh_pageData.comityTel"
+                border
+                ref="entryTable"
+                height="49%"
+                style="width: 100%"
+                :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+              fontWeight: 'bold', height: '20px'}">
+                <el-table-column type="selection" width="55"></el-table-column>
+                <el-table-column
+                  v-model="rh_pageData.comityTel.tel_name"
+                  align="center"
+                  label="联络人">
+                </el-table-column>
+                <el-table-column
+                  v-model="rh_pageData.comityTel.tel_unit"
+                  align="center"
+                  label="单位">
+                </el-table-column>
+                <el-table-column
+                  v-model="rh_pageData.comityTel.tel_phone"
+                  align="center"
+                  label="电话">
+                </el-table-column>
+                <el-table-column
+                  v-model="rh_pageData.comityTel.tel_mail"
+                  align="center"
+                  label="邮箱">
+                </el-table-column>
+              </el-table>
+            </el-form-item>
+            <ProcessTitle>
+              <template slot="title">选择人员</template>
+            </ProcessTitle>
+            <el-form-item label="入会人员:">
+              <el-input
+                style="width: 30%"
+                placeholder="请选择入会人员"
+                v-model="rh_pageData.comityInRole"
+                @click.native="inRoleChice">
+              </el-input>
+            </el-form-item>
+          </el-form>
+        </div>
+      </div>
+    </div>
+    <div class="content" v-show="active === '3'">
+      <div class="flow-list">
+        <el-table
+          height="100%"
+          ref="selection"
+          :data="detailData"
+          tooltip-effect="dark"
+          style="width: 100%"
+          border
+          row-key="id"
+          :no-data-text="listNoDataText"
+          :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
+        >
+          <el-table-column
+            type="selection"
+            width="55"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="name"
+            label="任务步骤"
+            align="center"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="assignee"
+            label="任务受理人"
+            align="center"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="createTime"
+            label="创建时间"
+            sortable="custom"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="endTime"
+            label="完成时间"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="comment"
+            label="流程信息"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.commentText }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="completeFlag"
+            label="状态"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.endTime ? "已完成" : "未完成" }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+        <loading :loading="loading">流程列表加载中</loading>
+      </div>
+    </div>
+    <ProcessFooter
+      show-save
+      show-submit
+      show-back
+      backBTNTexts="不涉及"
+      :submitLoading="isSubmit"
+      :saveLoading="saveLoading"
+      @back="handleSubmitNo"
+      @save="handleSave"
+      @submit="handleSubmit"
+    >
+    </ProcessFooter>
+    <Role-tree
+      check-box
+      is-title="选择人员信息"
+      :is-visible.sync="roleShowflag"
+      :nodeList="nodeList"
+      @checkedRole="drawerCheck"
+    />
+  </div>
+</template>
+
+<script>
+import ProcessHeader from "../../components/ProcessHeader";
+import ProcessFooter from "../../components/ProcessFooter";
+import ProcessTitle from "../../components/ProcessTitle";
+
+export default {
+  components: {
+    ProcessHeader,
+    ProcessFooter,
+    ProcessTitle
+  },
+  name: "bzrhStep2",
+  data() {
+    return {
+      active: '1', // 默认显示
+      rh_pageData: {
+        comityName: '',
+        comityRole: '',
+        comityState: '',
+        comityKind: '',
+        InfoSources: '',
+        comityMake: {
+          makeQualification: '',
+          makeRole: '',
+          makeCost: '',
+          makeDuties: '',
+          makeTime: '',
+        },
+        workPath: '',
+        comityTel: [],
+      },
+      /** 上传相关   */
+      acceptShow: false,
+      // 上传所储存文件数组
+      fileTextList: [],
+
+
+      roleShowflag: false,
+      nodeList: [],
+      detailData: [],
+      loading: false,
+
+      isSubmit: false,
+      saveLoading: false,
+    }
+  },
+  computed: {
+    listNoDataText() {
+      return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
+    }
+  },
+  created() {
+    this.processTable()
+  },
+  methods: {
+    processTable() {
+      this.$http.get("lawss/activiti/get_list_by_instance", {
+        prcNum: this.$route.query.prcNum,
+        sortWord: this.shunxu ? this.paixu : "",
+        shunxu: this.shunxu
+      }, {
+        loading: "loading",
+        _this: this
+      }, res => {
+        this.detailData = res
+      }, e => {
+      })
+    },
+    // 右上标签页面切换
+    handleTabs(name) {
+      this.active = name
+    },
+    // 流程阶段负责人选择
+    inRoleChice (type, title, id) {
+      this.nodeList = []
+      this.nodeList.push(id)
+      this.type = type
+      this.drawerTitle = title
+      this.roleShowflag = true
+    },
+    drawerCheck (data) {
+      this.roleShowflag = false
+    },
+    // 退回按钮
+    handleSubmitNo() {},
+    // 保存按钮
+    handleSave() {
+    },
+    // 提交按钮
+    handleSubmit() {
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+@import '~@/assets/styles/style';
+.bzrhStep2 {
+  position: relative;
+  height: 100%;
+  /deep/.el-drawer__container {
+    .prc-content-border {
+      border: none;
+      padding: 0 20px 0;
+    }
+  }
+  .headerTabs {
+    height: 52px;
+    display: flex;
+    align-items: center;
+    position: absolute;
+    top: 0;
+    right: 10px;
+    .headerTabsItem {
+      border: 1px solid #c1c1c1;
+      padding: 0 5px;
+      height: 30px;
+      line-height: 30px;
+      cursor: pointer;
+    }
+    .active {
+      border: 1px solid #E6A23C;
+      color: #fff;
+      background: #E6A23C;
+    }
+  }
+  .content-center {
+    padding: 10px 0px 10px 10px;
+  }
+  .content {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    height: calc(~'100% - 103px');
+    overflow: auto;
+    .tableTitle {
+      margin-bottom: 10px;
+      height: 30px;
+      line-height: 30px;
+      position: relative;
+      font-size: 13px;
+      font-weight: bold;
+      .tableButton {
+        position: absolute;
+        right: 0;
+        top: 0;
+      }
+    }
+  }
+  .content_form {
+    padding: 15px;
+    .comityTel_btn {
+      text-align: right;
+    }
+    /deep/.el-table th {
+      padding: 0px;
+    }
+  }
+}
+</style>
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue
new file mode 100644
index 000000000..8857f2844
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue
@@ -0,0 +1,347 @@
+<template>
+  <div class="bzrhStep3">
+    <ProcessHeader toggle>
+      <template slot="proName">外部标准化协会入会流程</template>
+      <template slot="proNode">发起流程</template>
+    </ProcessHeader>
+    <div class="headerTabs">
+      <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
+      <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;">
+        <ProcessTitle>
+          <template slot="title">基础信息</template>
+        </ProcessTitle>
+        <div class="content_form">
+          <el-form ref="rh_pageData" :model="rh_pageData" label-width="auto">
+            <el-row>
+              <el-col :span="8">
+                <el-form-item label="协会名称:">
+                  {{ rh_pageData.comityName || '-' }}
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="协会状态:" prop="comityState">
+                  {{ rh_pageData.comityState || '-' }}
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="8">
+                <el-form-item label="入会性质:" prop="comityKind">
+                  {{ rh_pageData.comityKind || '-' }}
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="8">
+                <el-form-item label="资质:">
+                  {{ rh_pageData.comityMake.makeQualification || '-' }}
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="成员:">
+                  {{ rh_pageData.comityMake.makeRole || '' }}
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="8">
+                <el-form-item label="费用估计:">
+                  {{ rh_pageData.comityMake.makeCost || '-' }}
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="职责:">
+                  {{ rh_pageData.comityMake.makeDuties || '-' }}
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="8">
+                <el-form-item label="任期:">
+                  {{ rh_pageData.comityMake.makeTime || '-' }}
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-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>
+            <el-form-item label="协会外部联系方式:">
+              <el-table
+                :data="rh_pageData.comityTel"
+                border
+                ref="entryTable"
+                height="49%"
+                style="width: 100%"
+                :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+              fontWeight: 'bold', height: '20px'}">
+                <el-table-column type="selection" width="55"></el-table-column>
+                <el-table-column
+                  v-model="rh_pageData.comityTel.tel_name"
+                  align="center"
+                  label="联络人">
+                </el-table-column>
+                <el-table-column
+                  v-model="rh_pageData.comityTel.tel_unit"
+                  align="center"
+                  label="单位">
+                </el-table-column>
+                <el-table-column
+                  v-model="rh_pageData.comityTel.tel_phone"
+                  align="center"
+                  label="电话">
+                </el-table-column>
+                <el-table-column
+                  v-model="rh_pageData.comityTel.tel_mail"
+                  align="center"
+                  label="邮箱">
+                </el-table-column>
+              </el-table>
+            </el-form-item>
+            <ProcessTitle>
+              <template slot="title">填写信息</template>
+            </ProcessTitle>
+            <el-form-item label="入会人员:">
+              <el-input
+                style="width: 30%"
+                placeholder="请选择入会人员"
+                v-model="rh_pageData.comityInRole"
+                @click.native="inRoleChice">
+              </el-input>
+            </el-form-item>
+          </el-form>
+        </div>
+      </div>
+    </div>
+    <div class="content" v-show="active === '3'">
+      <div class="flow-list">
+        <el-table
+          height="100%"
+          ref="selection"
+          :data="detailData"
+          tooltip-effect="dark"
+          style="width: 100%"
+          border
+          row-key="id"
+          :no-data-text="listNoDataText"
+          :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
+        >
+          <el-table-column
+            type="selection"
+            width="55"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="name"
+            label="任务步骤"
+            align="center"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="assignee"
+            label="任务受理人"
+            align="center"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="createTime"
+            label="创建时间"
+            sortable="custom"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="endTime"
+            label="完成时间"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="comment"
+            label="流程信息"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.commentText }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="completeFlag"
+            label="状态"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.endTime ? "已完成" : "未完成" }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+        <loading :loading="loading">流程列表加载中</loading>
+      </div>
+    </div>
+    <ProcessFooter
+      show-save
+      show-submit
+      :submitLoading="isSubmit"
+      :saveLoading="saveLoading"
+      @save="handleSave"
+      @submit="handleSubmit"
+    >
+    </ProcessFooter>
+    <Role-tree
+      check-box
+      is-title="选择人员信息"
+      :is-visible.sync="roleShowflag"
+      :nodeList="nodeList"
+      @checkedRole="drawerCheck"
+    />
+  </div>
+</template>
+
+<script>
+import ProcessHeader from "../../components/ProcessHeader";
+import ProcessFooter from "../../components/ProcessFooter";
+import ProcessTitle from "../../components/ProcessTitle";
+
+export default {
+  components: {
+    ProcessHeader,
+    ProcessFooter,
+    ProcessTitle
+  },
+  name: "bzrhStep3",
+  data() {
+    return {
+      active: '1', // 默认显示
+      rh_pageData: {
+        comityName: '',
+        comityRole: '',
+        comityState: '',
+        comityKind: '',
+        InfoSources: '',
+        comityMake: {
+          makeQualification: '',
+          makeRole: '',
+          makeCost: '',
+          makeDuties: '',
+          makeTime: '',
+        },
+        workPath: '',
+        comityTel: [],
+      },
+      /** 上传相关   */
+      acceptShow: false,
+      // 上传所储存文件数组
+      fileTextList: [],
+
+
+      roleShowflag: false,
+      nodeList: [],
+      detailData: [],
+      loading: false,
+
+      isSubmit: false,
+      saveLoading: false,
+    }
+  },
+  computed: {
+    listNoDataText() {
+      return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
+    }
+  },
+  methods: {
+    processTable() {
+      this.$http.get("lawss/activiti/get_list_by_instance", {
+        prcNum: this.$route.query.prcNum,
+        sortWord: this.shunxu ? this.paixu : "",
+        shunxu: this.shunxu
+      }, {
+        loading: "loading",
+        _this: this
+      }, res => {
+        this.detailData = res
+      }, e => {
+      })
+    },
+    // 右上标签页面切换
+    handleTabs(name) {
+      this.active = name
+    },
+    // 保存按钮
+    handleSave() {
+    },
+    // 提交按钮
+    handleSubmit() {
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+@import '~@/assets/styles/style';
+.bzrhStep3 {
+  position: relative;
+  height: 100%;
+  /deep/.el-drawer__container {
+    .prc-content-border {
+      border: none;
+      padding: 0 20px 0;
+    }
+  }
+  .headerTabs {
+    height: 52px;
+    display: flex;
+    align-items: center;
+    position: absolute;
+    top: 0;
+    right: 10px;
+    .headerTabsItem {
+      border: 1px solid #c1c1c1;
+      padding: 0 5px;
+      height: 30px;
+      line-height: 30px;
+      cursor: pointer;
+    }
+    .active {
+      border: 1px solid #E6A23C;
+      color: #fff;
+      background: #E6A23C;
+    }
+  }
+  .content-center {
+    padding: 10px 0px 10px 10px;
+  }
+  .content {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    height: calc(~'100% - 103px');
+    overflow: auto;
+    .tableTitle {
+      margin-bottom: 10px;
+      height: 30px;
+      line-height: 30px;
+      position: relative;
+      font-size: 13px;
+      font-weight: bold;
+      .tableButton {
+        position: absolute;
+        right: 0;
+        top: 0;
+      }
+    }
+  }
+  .content_form {
+    padding: 15px;
+    .comityTel_btn {
+      text-align: right;
+    }
+    /deep/.el-table th {
+      padding: 0px;
+    }
+  }
+}
+</style>
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue
new file mode 100644
index 000000000..c708e9536
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue
@@ -0,0 +1,13 @@
+<template>
+
+</template>
+
+<script>
+export default {
+  name: "bzrhStep4"
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue
new file mode 100644
index 000000000..7f2ac2480
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue
@@ -0,0 +1,13 @@
+<template>
+
+</template>
+
+<script>
+export default {
+  name: "bzrhStep5"
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/pages/processCenter/pages/newProcess/index.vue b/src/pages/processCenter/pages/newProcess/index.vue
index 87f644d28..232cd4047 100644
--- a/src/pages/processCenter/pages/newProcess/index.vue
+++ b/src/pages/processCenter/pages/newProcess/index.vue
@@ -232,6 +232,77 @@
             </div>
           </el-card>
         </el-col>
+        <el-col :span="size ? 6 : 8">
+          <el-card shadow="hover">
+            <div class="card-box" @click="handleCreateProcess('20')">
+              <div class="card-top">
+                <div class="card-top-left">
+                  <img :src="getImg(Math.floor(Math.random() * 6))">
+                </div>
+                <div class="card-top-right">
+                  <div class="card-top-right-text">外部标准化协会入会流程</div>
+                  <div class="card-top-right-line"></div>
+                </div>
+              </div>
+            </div>
+          </el-card>
+        </el-col>
+<!--        &lt;!&ndash;严逸舟写的分割线&ndash;&gt;-->
+<!--        <el-col :span="size ? 6 : 8" v-btn-permission="">-->
+<!--          <el-card shadow="hover">-->
+<!--            <div class="card-box" @click="handleCreateProcess('12')">-->
+<!--              <div class="card-top">-->
+<!--                <div class="card-top-left">-->
+<!--                  <img :src="getImg(Math.floor(Math.random() * 6))">-->
+<!--                </div>-->
+<!--                <div class="card-top-right">-->
+<!--                  <div class="card-top-right-text">赵开耀的流程</div>-->
+<!--                  <div class="card-top-right-line"></div>-->
+<!--                </div>-->
+<!--              </div>-->
+<!--              &lt;!&ndash;            <div class="card-bottom">&ndash;&gt;-->
+<!--              &lt;!&ndash;              流程简介: 容器默认存在两根轴：水平的主轴（main axis）和垂直的交叉轴（cross axis）。主轴的开始位置（与边框的交叉点）叫做main start，结束位置叫做main end；交叉轴的开始位置叫做cross start，结束位置叫做cross end。&ndash;&gt;-->
+<!--              &lt;!&ndash;            </div>&ndash;&gt;-->
+<!--            </div>-->
+<!--          </el-card>-->
+<!--        </el-col>-->
+<!--        <el-col :span="size ? 6 : 8" v-btn-permission="">-->
+<!--          <el-card shadow="hover">-->
+<!--            <div class="card-box" @click="handleCreateProcess('13')">-->
+<!--              <div class="card-top">-->
+<!--                <div class="card-top-left">-->
+<!--                  <img :src="getImg(Math.floor(Math.random() * 6))">-->
+<!--                </div>-->
+<!--                <div class="card-top-right">-->
+<!--                  <div class="card-top-right-text">严逸舟的流程</div>-->
+<!--                  <div class="card-top-right-line"></div>-->
+<!--                </div>-->
+<!--              </div>-->
+<!--              &lt;!&ndash;            <div class="card-bottom">&ndash;&gt;-->
+<!--              &lt;!&ndash;              流程简介: 容器默认存在两根轴：水平的主轴（main axis）和垂直的交叉轴（cross axis）。主轴的开始位置（与边框的交叉点）叫做main start，结束位置叫做main end；交叉轴的开始位置叫做cross start，结束位置叫做cross end。&ndash;&gt;-->
+<!--              &lt;!&ndash;            </div>&ndash;&gt;-->
+<!--            </div>-->
+<!--          </el-card>-->
+<!--        </el-col>-->
+<!--        <el-col :span="size ? 6 : 8" v-btn-permission="">-->
+<!--          <el-card shadow="hover">-->
+<!--            <div class="card-box" @click="handleCreateProcess('14')">-->
+<!--              <div class="card-top">-->
+<!--                <div class="card-top-left">-->
+<!--                  <img :src="getImg(Math.floor(Math.random() * 6))">-->
+<!--                </div>-->
+<!--                <div class="card-top-right">-->
+<!--                  <div class="card-top-right-text">张宇欢的流程</div>-->
+<!--                  <div class="card-top-right-line"></div>-->
+<!--                </div>-->
+<!--              </div>-->
+<!--              &lt;!&ndash;            <div class="card-bottom">&ndash;&gt;-->
+<!--              &lt;!&ndash;              流程简介: 容器默认存在两根轴：水平的主轴（main axis）和垂直的交叉轴（cross axis）。主轴的开始位置（与边框的交叉点）叫做main start，结束位置叫做main end；交叉轴的开始位置叫做cross start，结束位置叫做cross end。&ndash;&gt;-->
+<!--              &lt;!&ndash;            </div>&ndash;&gt;-->
+<!--            </div>-->
+<!--          </el-card>-->
+<!--        </el-col>-->
+<!--        &lt;!&ndash;严逸舟写的分割线&ndash;&gt;-->
       </div>
     </div>
   </div>
@@ -370,6 +441,13 @@ export default {
             name: 'cywbbzzxdStep1'
           })
           break
+        // 外部标准化协会入会流程
+        case '20':
+          //政策课题会后流程
+          this.$router.push({
+            name: 'bzrhStep1'
+          })
+          break
       }
     },
     checkPermission(permissionIdArray) {
diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
index 0c4a73e68..ae63f687a 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
@@ -895,6 +895,54 @@ export default {
           //   })
           // }
           break
+        // 外部标准化协会入会流程
+        case '20':
+          if (row.taskInfo === '技术委员会分委会主任/入会代表所在中心主任提名入会代表') {
+            this.$router.push({
+              name: 'bzrhStep2',
+              query:{
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if (row.taskInfo === '') {
+            this.$router.push({
+              name: 'bzrhStep3',
+              query:{
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if (row.taskInfo === '') {
+            this.$router.push({
+              name: 'bzrhStep4',
+              query:{
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if (row.taskInfo === '') {
+            this.$router.push({
+              name: 'bzrhStep5',
+              query:{
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }
+          break
       }
     },
     ...mapMutations(['setProcess', 'setHandleInfo']),
diff --git a/src/router/index.js b/src/router/index.js
index 1ad0b984b..afaafc9c0 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1242,7 +1242,53 @@ const routes = [
           requireAuth: true,
           title: '技术要求清单管理'
         }
-      }
+      },
+      // 外部标准化协会入会流程
+      {
+        path: '/bzrhStep1',
+        name: 'bzrhStep1',
+        component: () => import('@/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue'),
+        meta: {
+          requireAuth: true,
+          title: '外部标准化协会入会流程（流程发起）'
+        }
+      },
+      {
+        path: '/bzrhStep2',
+        name: 'bzrhStep2',
+        component: () => import('@/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue'),
+        meta: {
+          requireAuth: true,
+          title: '外部标准化协会入会流程（选择代表）'
+        }
+      },
+      {
+        path: '/bzrhStep3',
+        name: 'bzrhStep3',
+        component: () => import('@/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue'),
+        meta: {
+          requireAuth: true,
+          title: '外部标准化协会入会流程（入选代表填写信息）'
+        }
+      },
+      {
+        path: '/bzrhStep4',
+        name: 'bzrhStep4',
+        component: () => import('@/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue'),
+        meta: {
+          requireAuth: true,
+          title: '外部标准化协会入会流程（责任负责人审批）'
+        }
+      },
+      {
+        path: '/bzrhStep5',
+        name: 'bzrhStep5',
+        component: () => import('@/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue'),
+        meta: {
+          requireAuth: true,
+          title: '外部标准化协会入会流程（修订）'
+        }
+      },
     ]
   },
   // 标准法规库

From 53eeb5cc566b9aa017d40f8e06d125c9e6334a30 Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Tue, 26 Oct 2021 17:57:58 +0800
Subject: [PATCH 4/4] commit

---
 .../pages/creatProcess/bzjd/step2.vue         |   1 -
 .../pages/creatProcess/zcrh/step2.vue         | 356 ++++++++++++++++++
 .../tabComponents/processCenter/index.vue     |  14 +
 src/router/index.js                           |   9 +
 4 files changed, 379 insertions(+), 1 deletion(-)
 create mode 100644 src/pages/processCenter/pages/creatProcess/zcrh/step2.vue

diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
index 7264af330..84017256c 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
@@ -494,7 +494,6 @@
                         pId: this.pId
                     }).then(res => {
                         let data = JSON.parse(res.mesg)
-                        console.log(data);
                         this.form.itemsNum = data.itemsNum || data.form.itemsNum
                         this.form.itemsName = data.itemsName || data.form.itemsName
                         if (data.form) {
diff --git a/src/pages/processCenter/pages/creatProcess/zcrh/step2.vue b/src/pages/processCenter/pages/creatProcess/zcrh/step2.vue
new file mode 100644
index 000000000..3f40992c5
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/zcrh/step2.vue
@@ -0,0 +1,356 @@
+<template>
+    <div class="zcrh-step2">
+        <ProcessHeader toggle>
+            <template slot="proName">政策课题入会流程</template>
+            <template slot="proNode">法规部部长审批</template>
+        </ProcessHeader>
+        <div class="headerTabs">
+            <div class="headerTabsItem active">基础信息</div>
+        </div>
+        <div class="content" v-show="active === '1'">
+            <div style="flex: auto; overflow: auto;">
+                <el-form
+                        ref="rhForm"
+                        :model="rhform"
+                        class="label-input-form"
+                        label-width="210px"
+                >
+                    <ProcessTitle>
+                        <template slot="title">基础信息</template>
+                    </ProcessTitle>
+                    <div class="prc-content-border" v-if="foldFormFlag">
+                        <el-row :gutter="24">
+                            <el-col :span="24">
+                                <el-form-item label="课题名称" prop="title" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            disabled
+                                            v-model="rhform.title"
+                                            placeholder="请输入课题名称"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                                <el-form-item label="主要议题" prop="content" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            disabled
+                                            v-model="rhform.content"
+                                            placeholder="请输入主要议题"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                                <el-form-item label="费用" prop="price" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            disabled
+                                            v-model="rhform.price"
+                                            placeholder="请输入费用"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                                <el-form-item label="课题组通知" prop="modelNameList" class="add-form-item form-item-disabled">
+                                    <div style="display: flex;">
+                                        <div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in rhform.modelList" :key="index">{{ item.name }}</div>
+                                    </div>
+                                </el-form-item>
+                                <el-form-item label="课题研究周期" prop="time" class="add-form-item form-item-disabled">
+                                    <el-date-picker
+                                            disabled
+                                            v-model="rhform.time"
+                                            type="datetimerange"
+                                            range-separator="至"
+                                            start-placeholder="开始日期"
+                                            end-placeholder="结束日期">
+                                    </el-date-picker>
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+                    </div>
+                    <el-button style="width: 100%" icon="el-icon-caret-top" @click="foldForm">{{ foldFormFlag ? '隐藏基础信息' : '展开基础信息' }}</el-button>
+                </el-form>
+                <ProcessTitle>
+                    <template slot="title">课题组联系方式</template>
+                </ProcessTitle>
+                <el-table border
+                          ref="selection"
+                          :data="data1"
+                          tooltip-effect="dark"
+                          style="width: 100%;"
+                          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+         fontWeight: 'bold', height: '48px'}"
+                          row-key="id">
+                    <el-table-column
+                            prop="ContactPerson"
+                            label="联络人"
+                            width="150"
+                            align="center">
+                    </el-table-column>
+                    <el-table-column
+                            prop="Company"
+                            label="单位"
+                            align="center">
+                    </el-table-column>
+                    <el-table-column
+                            prop="Telephone"
+                            label="电话"
+                            width="200"
+                            align="center">
+                    </el-table-column>
+                    <el-table-column
+                            prop="Email"
+                            label="邮箱"
+                            width="350"
+                            align="center">
+                    </el-table-column>
+                </el-table>
+                <ProcessTitle>
+                    <template slot="title">集团内部参与人员</template>
+                </ProcessTitle>
+                <el-table border
+                          ref="selection"
+                          :data="data2"
+                          tooltip-effect="dark"
+                          style="width: 100%;"
+                          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+         fontWeight: 'bold', height: '48px'}"
+                          row-key="id">
+                    <el-table-column
+                            prop="Sindex"
+                            label="我司在工作组排名顺序"
+                            width="170"
+                            align="center">
+                    </el-table-column>
+                    <el-table-column
+                            prop="Member"
+                            label="我司成员"
+                            width="150"
+                            align="center">
+                    </el-table-column>
+                    <el-table-column
+                            prop="Company"
+                            label="单位"
+                            align="center">
+                    </el-table-column>
+                    <el-table-column
+                            prop="Department"
+                            label="部门"
+                            width="150"
+                            align="center">
+                    </el-table-column>
+                    <el-table-column
+                            prop="Telephone"
+                            label="电话"
+                            width="200"
+                            align="center">
+                    </el-table-column>
+                    <el-table-column
+                            prop="Email"
+                            label="邮箱"
+                            width="300"
+                            align="center">
+                    </el-table-column>
+                    <el-table-column
+                            prop="Identity"
+                            label="身份"
+                            width="150"
+                            align="center">
+                    </el-table-column>
+                    <el-table-column
+                            prop="data"
+                            label="资料"
+                            width="200"
+                            align="center">
+                    </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>
+        <ProcessFooter
+                show-submit
+                show-back
+                approval
+                @back="handleSubmitNo"
+                :submitLoading="isSubmit"
+                @submit="handleSubmit"
+                submitBTNText="同意"
+        >
+        </ProcessFooter>
+    </div>
+</template>
+
+<script>
+    import ProcessHeader from "../../components/ProcessHeader";
+    import ProcessFooter from "../../components/ProcessFooter";
+    import ProcessTitle from "../../components/ProcessTitle";
+    import {inboundLiaisonDetail} from 'api/process'
+
+    export default {
+        name: "zcrhStep2",
+        data() {
+            return {
+                json: {},
+                isSubmit: false,
+                foldFormFlag: true,
+                commentText: '',
+                active: '1',
+                taskIds: this.$route.query.taskIds,
+                pId: this.$route.query.prcId,
+                data1: [],
+                data2: [],
+                rhform: {
+                    title: '',
+                    content: '',
+                    price: '',
+                    time: '',
+                    modelList: []
+                }
+            }
+        },
+        components: {
+            ProcessHeader,
+            ProcessFooter,
+            ProcessTitle
+        },
+        methods: {
+            handleSubmit() {
+                this.isSubmit = true
+                var json = this.json
+                json.fgfbz = 1
+                json.commentText = this.commentText
+                this.$http.post('lawss/activiti/completeTask', {
+                    json: JSON.stringify(json),
+                    taskId: this.taskIds,
+                    userId: this.$store.getters.userInfo.userId
+                }, {}, res => {
+                    if (res.success) {
+                        this.$message.success('提交成功')
+                        this.$router.push('/processCenter')
+                    }
+                    this.isSubmit = false
+                })
+            },
+            handleSubmitNo() {
+                if (this.commentText) {
+                    this.isSubmit = true
+                    var json = this.json
+                    json.fgfbz = 0
+                    json.commentText = this.commentText
+                    this.$http.post('lawss/activiti/completeTask', {
+                        json: JSON.stringify(json),
+                        taskId: this.taskIds,
+                        userId: this.$store.getters.userInfo.userId
+                    }, {}, res => {
+                        if (res.success) {
+                            this.$message.success('驳回成功')
+                            this.$router.push('/processCenter')
+                        }
+                        this.isSubmit = false
+                    })
+                } else {
+                    this.$message.warning('请输入反馈意见')
+                }
+            },
+            updataFj (item) {
+                window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.id
+            },
+            handleTabs(type) {
+                this.active = type;
+            }, // 切换tabs
+            foldForm() {
+                this.foldFormFlag = !this.foldFormFlag
+            }, // 基础信息显隐
+            getData() {
+                return new Promise((resolve, reject) => {
+                    inboundLiaisonDetail({
+                        taskIds: this.taskIds,
+                        pId: this.pId
+                    }).then(res => {
+                        let data = JSON.parse(res.mesg)
+                        this.json = data
+                        this.data1 = data.data1
+                        this.data2 = data.data2
+                        this.rhform.commentText = data.commentText
+                        this.rhform.content = data.content
+                        this.rhform.price = data.price
+                        this.rhform.time = data.time
+                        this.rhform.title = data.title
+                        this.rhform.modelList = data.modelList
+                    }).catch(e => {
+                    })
+                })
+            },
+        },
+        mounted () {
+            this.getData()
+        }
+    }
+</script>
+
+<style lang="less" scoped>
+    @import '~@/assets/styles/style';
+    .zcrh-step2 {
+        position: relative;
+        height: 100%;
+        .content {
+            display: flex;
+            flex-direction: column;
+            justify-content: space-between;
+            height: calc(~'100% - 103px');
+            overflow: auto;
+            .tableTitle {
+                margin-bottom: 10px;
+                height: 30px;
+                line-height: 30px;
+                position: relative;
+                font-size: 13px;
+                font-weight: bold;
+
+                .tableButton {
+                    position: absolute;
+                    right: 0;
+                    top: 0;
+                }
+            }
+        }
+        .headerTabs {
+            height: 52px;
+            display: flex;
+            align-items: center;
+            position: absolute;
+            top: 0;
+            right: 10px;
+
+            .headerTabsItem {
+                border: 1px solid #c1c1c1;
+                padding: 0 5px;
+                height: 30px;
+                line-height: 30px;
+                cursor: pointer;
+            }
+
+            .active {
+                border: 1px solid #E6A23C;
+                color: #fff;
+                background: #E6A23C;
+            }
+        }
+        .label-input-form {
+            .add-form-item {
+                /deep/.el-form-item__content {
+                    .el-date-editor {
+                        width: 400px;
+                    }
+                }
+            }
+        }
+    }
+</style>
diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
index 6c76b6aad..15dafb8e0 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
@@ -869,6 +869,20 @@ export default {
             })
           }
           break
+        case '17':
+          if (row.taskInfo === '法规认证部副部长审核') {
+            this.$router.push({
+              name: 'zcrhStep2',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }
+          break
       }
     },
     ...mapMutations(['setProcess', 'setHandleInfo']),
diff --git a/src/router/index.js b/src/router/index.js
index 6bdd35887..37ab82ac6 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -988,6 +988,15 @@ const routes = [
           title: '政策课题入会流程'
         }
       },
+      {
+        path: '/zcrhStep2',
+        name: 'zcrhStep2',
+        component: () => import('@/pages/processCenter/pages/creatProcess/zcrh/step2.vue'),
+        meta: {
+          requireAuth: true,
+          title: '政策课题入会流程'
+        }
+      },
       {
         path: '/zcchStep1',
         name: 'zcchStep1',