Merge remote-tracking branch 'origin/develop' into develop

src/pages/processCenter/pages/components/ProcessFooter.vue

@@ -70,7 +70,7 @@
         size="mini"
         class="common-button-primary"
         @click="handleSave"
-        :loading="submitLoading"
+        :loading="saveLoading"
         v-if="showSave">
         <i class="iconfont">&#xe608;</i>
         保存
@@ -80,7 +80,7 @@
         size="small"
         class="common-button-danger"
         @click="beforeBack"
-        :loading="submitLoading"
+        :loading="isSubmitBack"
         v-if="showBack">
         <i class="iconfont" style="font-size: 12px;">&#xe615;</i>
         {{ backBTNText }}</el-button>
@@ -239,7 +239,7 @@ export default {
       type: Boolean,
       default: false
     },
-    // 保存按钮loading
+    // 退回按钮loading
     isSubmitBack: {
       type: Boolean,
       default: false
@@ -426,7 +426,7 @@ export default {
   text-align: right;
   background: #fff;
   z-index: 999;
-  padding: 0;
+  padding: 0 10px 0 0;
   .footer-line {
     height: 1px;
     box-shadow: 0 -1px 2px 0px #e8e8e8;

src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue

@@ -15,7 +15,7 @@
           <template slot="title">基础信息</template>
         </ProcessTitle>
         <div class="content_form">
-          <el-form ref="rh_pageData" :model="rh_pageData" :rules="rh_rules" label-width="auto">
+          <el-form ref="rh_pageData" :model="rh_pageData" :rules="rh_rules" label-width="150px">
             <el-row>
               <el-col :span="8">
                 <el-form-item label="协会名称:">
@@ -33,7 +33,7 @@
               <el-col :span="8">
                 <el-form-item v-if="rh_pageData.comityName !== ''">
                   <el-select
-                    v-model="rh_pageData.comityName2"
+                    v-model="rh_pageData.comityNameOne"
                     placeholder="请选择分标委">
                     <el-option
                       v-for="item in comityNameOptions"
@@ -44,9 +44,9 @@
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="" v-if="rh_pageData.comityName !== '' && rh_pageData.comityName2 !== ''">
+                <el-form-item label="" v-if="rh_pageData.comityName !== '' && rh_pageData.comityNameOne !== ''">
                   <el-select
-                    v-model="rh_pageData.comityName3"
+                    v-model="rh_pageData.comityNameTwo"
                     placeholder="请选择工作组">
                     <el-option
                       v-for="item in comityNameOptions"
@@ -100,7 +100,7 @@
               </el-col>
             </el-row>
             <el-divider/>
-            <el-form-item label="信息来源:" prop="InfoSources">
+            <el-form-item label="信息来源:" prop="infoSources">
               <el-upload
                 style="width: 30%"
                 class="upload_style"
@@ -156,7 +156,7 @@
                   </el-col>
                   <el-col :span="8">
                     <el-form-item label="任期:">
-                      <el-input v-model="rh_pageData.comityMake.makeTime" ></el-input>
+                      <el-input v-model="rh_pageData.comityMake.makeTime"></el-input>
                     </el-form-item>
                   </el-col>
                 </el-row>
@@ -196,35 +196,35 @@
               fontWeight: 'bold', height: '20px'}">
                 <el-table-column type="selection" width="55"></el-table-column>
                 <el-table-column
-                  prop="rh_pageData.comityTel.tel_name"
+                  prop="tel_name"
                   align="center"
                   label="联络人">
                   <template slot-scope="scope">
-                    <el-input v-model="scope.row.tel_name"></el-input>
+                    <el-input v-model="scope.row.tel_name"/>
                   </template>
                 </el-table-column>
                 <el-table-column
-                  prop="rh_pageData.comityTel.tel_unit"
+                  prop="tel_unit"
                   align="center"
                   label="单位">
                   <template slot-scope="scope">
-                    <el-input v-model="scope.row.tel_unit"></el-input>
+                    <el-input v-model="scope.row.tel_unit"/>
                   </template>
                 </el-table-column>
                 <el-table-column
-                  prop="rh_pageData.comityTel.tel_phone"
+                  prop="tel_phone"
                   align="center"
                   label="电话">
                   <template slot-scope="scope">
-                    <el-input v-model="scope.row.tel_phone"></el-input>
+                    <el-input v-model="scope.row.tel_phone"/>
                   </template>
                 </el-table-column>
                 <el-table-column
-                  prop="rh_pageData.comityTel.tel_mail"
+                  prop="tel_mail"
                   align="center"
                   label="邮箱">
                   <template slot-scope="scope">
-                    <el-input v-model="scope.row.tel_mail"></el-input>
+                    <el-input v-model="scope.row.tel_mail"/>
                   </template>
                 </el-table-column>
               </el-table>
@@ -252,7 +252,7 @@
                 </el-form-item>
               </el-card>
             </el-timeline-item>
-            <el-timeline-item timestamp="指派人员" placement="top" :color="roleForm.dockUser ? '#66b1ff' : ''">
+            <el-timeline-item timestamp="指派人员" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
               <el-card>
                 <el-form-item prop="dockUserName" style="margin-bottom: 0">
                   <h4>技术委员会分委会主任/技术主管部门负责人</h4>
@@ -264,85 +264,85 @@
                 </el-form-item>
               </el-card>
             </el-timeline-item>
-            <el-timeline-item timestamp="填写信息" placement="top" :color="roleForm.dockUser ? '#66b1ff' : ''">
+            <el-timeline-item timestamp="填写信息" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
               <el-card>
-                <el-form-item prop="dockUserName" style="margin-bottom: 0">
+                <el-form-item prop="dockUserName1" 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.dutyUser1" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.dutyUserName" :disabled="true" placeholder="责任工程师">
+                    <el-input v-model="roleForm.dutyUserName1" :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-timeline-item timestamp="审批" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
               <el-card>
-                <el-form-item prop="dockUserName" style="margin-bottom: 0">
+                <el-form-item prop="partUserId" 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.partUserId" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.uploadUserName" :disabled="true" placeholder="参会人员所在部门负责人">
+                    <el-input v-model="roleForm.partUser" :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-timeline-item timestamp="汇总修订" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
               <el-card>
-                <el-form-item prop="dockUserName" style="margin-bottom: 0">
+                <el-form-item prop="startUserName" 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.startUser" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.dockUserName" :disabled="true" placeholder="选择标准法规部人员" @click.native="choiceZRR('dockUser', '选择标准法规部人员', roleForm.dockUser)">
+                    <el-input v-model="roleForm.startUserName" :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-timeline-item timestamp="审批" placement="top" :color="roleForm.leaderUser ? '#66b1ff' : ''">
               <el-card>
-                <el-form-item prop="dockUserName" style="margin-bottom: 0">
+                <el-form-item prop="leaderUser" 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.leaderUserId" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.dockUserName" :disabled="true" placeholder="选择标准法规部主管领导" @click.native="choiceZRR('dockUser', '选择标准法规部主管领导', roleForm.dockUser)">
+                    <el-input v-model="roleForm.leaderUser"  placeholder="选择标准法规部主管领导" @click.native="choiceZRROne('leaderUser', '选择标准法规部主管领导', roleForm.leaderUser)">
                     </el-input>
                   </div>
                 </el-form-item>
               </el-card>
             </el-timeline-item>
-            <el-timeline-item timestamp="会签" placement="top" :color="roleForm.dockUser ? '#66b1ff' : ''">
+            <el-timeline-item timestamp="会签" placement="top" :color="roleForm.feeUser ? '#66b1ff' : ''">
               <el-card>
-                <el-form-item prop="dockUserName" style="margin-bottom: 0">
+                <el-form-item prop="feeUser" 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.feeUserId" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.dockUserName" :disabled="true" placeholder="选择费用管理部门" @click.native="choiceZRR('dockUser', '选择费用管理部门', roleForm.dockUser)">
+                    <el-input v-model="roleForm.feeUser" placeholder="选择费用管理部门" @click.native="choiceZRR('feeUser', '选择费用管理部门', roleForm.feeUser)">
                     </el-input>
                   </div>
                 </el-form-item>
               </el-card>
             </el-timeline-item>
-            <el-timeline-item timestamp="审定" placement="top" :color="roleForm.dockUser ? '#66b1ff' : ''">
+            <el-timeline-item timestamp="审定" placement="top" :color="roleForm.engineerUser ? '#66b1ff' : ''">
               <el-card>
-                <el-form-item prop="dockUserName" style="margin-bottom: 0">
+                <el-form-item prop="engineerUser" 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.engineerUserId" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.dockUserName" :disabled="true" placeholder="选择人员" @click.native="choiceZRR('dockUser', '选择人员', roleForm.dockUser)">
+                    <el-input v-model="roleForm.engineerUser" placeholder="选择人员" @click.native="choiceZRROne('engineerUser', '选择人员', roleForm.engineerUser)">
                     </el-input>
                   </div>
                 </el-form-item>
               </el-card>
             </el-timeline-item>
-            <el-timeline-item timestamp="批准" placement="top" :color="roleForm.dockUser ? '#66b1ff' : ''">
+            <el-timeline-item timestamp="批准" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
               <el-card>
-                <el-form-item prop="dockUserName" style="margin-bottom: 0">
+                <el-form-item prop="totalLeader" 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.startUser" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.dockUserName" :disabled="true" placeholder="选择总院技术委员会主任" @click.native="choiceZRR('dockUser', '选择总院技术委员会主任', roleForm.dockUser)">
+                    <el-input v-model="roleForm.startUserName" :disabled="true" placeholder="选择总院技术委员会主任" @click.native="choiceZRROne('startUser', '选择总院技术委员会主任', roleForm.startUser)">
                     </el-input>
                   </div>
                 </el-form-item>
@@ -363,6 +363,12 @@
     </ProcessFooter>
     <Role-tree
       check-box
+      is-title="选择人员信息"
+      :is-visible.sync="roleShowflagOne"
+      :nodeList="nodeListOne"
+      @checkedRole="drawerCheckOne"
+    />
+    <Role-tree
       is-title="选择人员信息"
       :is-visible.sync="roleShowflag"
       :nodeList="nodeList"
@@ -375,7 +381,8 @@
 import ProcessHeader from '../../components/ProcessHeader'
 import ProcessFooter from '../../components/ProcessFooter'
 import ProcessTitle from '../../components/ProcessTitle'
-import { startProcess, saveTaskFirst,completeTask } from '@/api/process.js'
+import {startProcess, saveTaskFirst, completeTask, queryTaskFirst} from '@/api/process.js'
+
 export default {
   components: {
     ProcessHeader,
@@ -388,12 +395,12 @@ export default {
       active: '1', // 默认显示
       rh_pageData: {
         comityName: '',
-        comityName2: '',
+        comityNameOne: '',
-        comityName3: '',
+        comityNameTwo: '',
         comityRole: '',
         comityState: '',
         comityKind: '',
-        InfoSources: '',
+        infoSources: [],
         comityMake: {
           makeQualification: '',
           makeRole: '',
@@ -402,26 +409,26 @@ export default {
           makeTime: '',
         },
         workPath: '',
-        comityTel:[],
+        comityTel: [],
       },
       comityNameOptions: [
-        { value: '0' ,label: '国内法规入库流程'},
+        {value: '0', label: '国内法规入库流程'},
-        { value: '1' ,label: '标准法规技术评估流程'},
+        {value: '1', label: '标准法规技术评估流程'},
       ],
       comityRoleOptions: [
-        { value: '0' ,label: '委员'},
+        {value: '0', label: '委员'},
-        { value: '1' ,label: '观察委员'},
+        {value: '1', label: '观察委员'},
-        { value: '2' ,label: '通讯委员'},
+        {value: '2', label: '通讯委员'},
-        { value: '3' ,label: '成员'}
+        {value: '3', label: '成员'}
       ],
       comityStateOptions: [
-        { value: '0' ,label: '常设机构'},
+        {value: '0', label: '常设机构'},
-        { value: '1' ,label: '临时机构'}
+        {value: '1', label: '临时机构'}
       ],
       comityKindOptions: [
-        { value: '0' ,label: '新增'},
+        {value: '0', label: '新增'},
-        { value: '1' ,label: '换届'},
+        {value: '1', label: '换届'},
-        { value: '2' ,label: '委员改选'}
+        {value: '2', label: '委员改选'}
       ],
       /** 上传相关   */
       acceptShow: false,
@@ -429,6 +436,7 @@ export default {
       uploadPath: 'api/att/attFile/upload',
       // 上传所储存文件数组
       fileTextList: [],
+      newDataList: [],
 
       deleteDataList: [],
 
@@ -438,26 +446,51 @@ export default {
         startUserName: this.$store.getters.userInfo.userName,
         startUser: this.$store.getters.userInfo.userId,
         dockUserName: '',
-        dockUser: ''
+        dockUser: '',
+        leaderUser: '',
+        leaderUserId: '',
+        feeUser: '',
+        feeUserId: '',
+        engineerUser: '',
+        engineerUserId: '',
+
       },
       rh_rules: {},
       roleFormRules: {
-        dockUserName: [{ required: true, message: "请选择标准法规工程师", trigger: ['blur', 'change']}]
+        dockUserName: [{required: true, message: "请选择标准法规工程师", trigger: ['blur', 'change']}]
       },
       roleShowflag: false,
+      roleShowflagOne: false,
       nodeList: [],
+      nodeListOne: [],
       isSubmit: false,
       saveLoading: false,
     }
   },
+
+  mounted() {
+    this.bpnId = this.$route.query.bpnId
+    if (this.bpnId !== undefined) {
+      this.getData()
+    }
+  },
   methods: {
     // 右上标签页面切换
     handleTabs(name) {
       this.active = name
     },
 
+    getData() {
+      queryTaskFirst({
+        bpnId: this.$route.query.bpnId
+      }).then(res => {
+        let mes = JSON.parse(res.mes)
+        this.rh_pageData = mes.rh_pageData
+        this.roleForm = mes.roleForm
+      });
+    },
     //上传按钮
-    uploadFile (val) {
+    uploadFile(val) {
     },
     // 文件上传限制条件
     handleBeforeUpload(file) {
@@ -488,13 +521,35 @@ export default {
     handleBeforeRemove(file, fileList) {
       this.fileData = fileList
       this.fileTextList.forEach((item, index) => {
-        if (item.name === file.name || item.id === file.id ) {
+        if (item.name === file.name || item.id === file.id) {
-          this.fileTextList.splice(index,1)
+          this.fileTextList.splice(index, 1)
         }
       })
     },
     // 文件上传成功
-    handleOnsuccess() {},
+    handleOnsuccess(res, file, fileList) {
+      if (res.ok) {
+        if (this.fileTextList !== null) {
+          this.newDataList = this.fileTextList
+          this.newDataList.push({
+            id: res.data.attId,
+            name: res.data.standName
+          })
+        } else {
+          this.newDataList.push({
+            id: res.data.attId,
+            name: res.data.standName
+          })
+        }
+        this.rh_pageData.infoSources = this.newDataList
+        this.$message({
+          showClose: true,
+          message: res.message,
+          type: 'success'
+        })
+        this.fileMadel = false
+      }
+    },
 
 
     /** 添加 */
@@ -522,7 +577,7 @@ export default {
           this.deleteDataList.map(item => {
             let index;
             index = this.rh_pageData.comityTel.findIndex(items => {
-              return items.id === item;
+              return items === item;
             });
             if (index > -1) {
               this.rh_pageData.comityTel.splice(index, 1);
@@ -537,35 +592,88 @@ export default {
     // 协会外部联系方式批量选择
     selectedDelete(val) {
       this.deleteDataList = val
-      console.log(val)
     },
 
     // 流程阶段负责人选择
-    choiceZRR (type, title, id) {
+    choiceZRR(type, title, id) {
       this.nodeList = []
       this.nodeList.push(id)
       this.type = type
       this.drawerTitle = title
       this.roleShowflag = true
     },
-    drawerCheck (data) {
+    drawerCheck(data) {
+      var idList = ''
+      var nameList = ''
+      data.forEach(item => {
+        if (nameList.length > 0) {
+          nameList += ','
+          idList += ','
+        }
+        idList += item.id;
+        nameList += item.name;
+      });
+      if (this.type === 'feeUser') {
+        this.roleForm.feeUser = nameList
+        this.roleForm.feeUserId = idList
+      } else {
+        this.roleForm.dockUser = idList
+        this.roleForm.dockUserName = nameList
+        this.rh_pageData.comityInRole = nameList
+        this.rh_pageData.comityInRoleId = idList
+      }
+      this.roleShowflag = false
+    },
+
+    // 流程阶段人选择
+    choiceZRROne(type, title, id) {
+      this.nodeListOne = []
+      this.nodeListOne.push(id)
+      this.type = type
+      this.drawerTitleOne = title
+      this.roleShowflagOne = true
+    },
+    drawerCheckOne(data) {
       this.unqualidiedData.forEach(item => {
         item.engineer = data[0].name
         item.engineerId = data[0].id
       })
-      this.roleForm.dockUser = data[0].id
+      if (this.type === 'leaderUser') {
-      this.roleForm.dockUserName = data[0].name
+        this.roleForm.leaderUser = data[0].name
-      this.roleShowflag = false
+        this.roleForm.leaderUserId = data[0].id
+      } else {
+        this.roleForm.engineerUser = data[0].name
+        this.roleForm.engineerUserId = data[0].id
+      }
+      this.roleShowflagOne = false
     },
+
     // 保存按钮
-    handleSave(){},
+    handleSave() {
+      this.saveLoading = true
+      let _formData = new FormData()
+      _formData.append('id', this.bpnId || '')
+      _formData.append('createUser', this.$store.getters.userInfo.userId)
+      _formData.append('createUserName', this.$store.getters.userInfo.userName)
+      _formData.append('prcType', '20')
+      _formData.append('json', JSON.stringify({
+        roleForm: this.roleForm,
+        rh_pageData: this.rh_pageData
+      }))
+      saveTaskFirst(_formData).then(res => {
+        this.saveLoading = false
+        this.$message.success('保存成功')
+        this.bpnId = res.result
+      }).catch(e => {
+        this.saveLoading = false
+      })
+    },
     // 提交按钮
     handleSubmit() {
       let json = {
-        prcCreateUser: this.$store.getters.userInfo.userId,
+        roleList: this.roleForm,
-        prcCreateUserName: this.$store.getters.userInfo.userName,
         rh_pageData: this.rh_pageData,
-        directorList: this.roleForm.dockUser,
+        directorList: this.rh_pageData.comityInRoleId,
       }
       this.$refs['rh_pageData'].validate((valid) => {
         if (valid) {
@@ -573,16 +681,16 @@ export default {
             if (valid) {
               this.isSubmit = true
               const paramsInfo = {
-                type: '11'
+                type: '20'
               }
-              startProcess(paramsInfo).then(res=>{
+              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) {
+                  if (res.success === true) {
                     this.$message.success('提交成功')
                     this.$router.push("/processCenter");
                   }
@@ -591,7 +699,8 @@ export default {
               })
             }
           })
-        } })
+        }
+      })
     }
   }
 }
@@ -599,15 +708,18 @@ export default {
 
 <style lang="less" scoped>
 @import '~@/assets/styles/style';
+
 .bzrhStep1 {
   position: relative;
   height: 100%;
-  /deep/.el-drawer__container {
+
+  /deep/ .el-drawer__container {
     .prc-content-border {
       border: none;
       padding: 0 20px 0;
     }
   }
+
   .headerTabs {
     height: 52px;
     display: flex;
@@ -615,6 +727,7 @@ export default {
     position: absolute;
     top: 0;
     right: 10px;
+
     .headerTabsItem {
       border: 1px solid #c1c1c1;
       padding: 0 5px;
@@ -622,21 +735,25 @@ export default {
       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;
@@ -644,6 +761,7 @@ export default {
       position: relative;
       font-size: 13px;
       font-weight: bold;
+
       .tableButton {
         position: absolute;
         right: 0;
@@ -651,33 +769,46 @@ export default {
       }
     }
   }
+
   .content_form {
     border: 1px solid #DCDFE6;
     padding-top: 15px;
+
     .el-divider--horizontal {
       margin-top: 0px;
     }
-    /deep/.el-table__body-wrapper {
+
-      height: auto!important;
+    /deep/ .el-table__body-wrapper {
+      height: auto !important;
     }
+
+    /deep/ .el-textarea__inner {
+      font-family: inherit;
+    }
+
     .make_form {
       border: 1px solid #DCDFE6;
       padding: 10px;
-      /deep/.el-form-item__label-wrap {
+
-        margin-left: 0!important;
+      /deep/ .el-form-item__label-wrap {
+        margin-left: 0 !important;
       }
-      /deep/.el-form-item__content {
+
-        margin-left: 40px!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 {
+
+    /deep/ .el-table th {
       padding: 0px;
     }
   }

src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue

@@ -2,7 +2,7 @@
   <div class="bzrhStep2">
     <ProcessHeader toggle>
       <template slot="proName">外部标准化协会入会流程</template>
-      <template slot="proNode">发起流程</template>
+      <template slot="proNode">选择人员确认</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -14,7 +14,19 @@
           <template slot="title">基础信息</template>
         </ProcessTitle>
         <div class="content_form">
-          <el-form ref="rh_pageData" :model="rh_pageData" label-width="auto">
+          <el-form ref="rh_pageData" :model="rh_pageData" label-width="150px" :rules="rh_rules">
+            <el-row>
+              <el-col :span="8">
+                <el-form-item label="文件编号:" prop="comityFileNum">
+                  {{ rh_pageData.comityFileNum || '-' }}
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="文件名称:" prop="comityFileName">
+                  {{ rh_pageData.comityFileName || '-' }}
+                </el-form-item>
+              </el-col>
+            </el-row>
             <el-row>
               <el-col :span="8">
                 <el-form-item label="协会名称:">
@@ -33,32 +45,30 @@
                   {{ 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-row>
+            <el-row>
               <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-row>
+            <el-row>
               <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 || '-' }}
@@ -77,27 +87,11 @@
                 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 type="selection" width="55"/>
-                <el-table-column
+                <el-table-column prop="tel_name" align="center" label="联络人"/>
-                  v-model="rh_pageData.comityTel.tel_name"
+                <el-table-column prop="tel_unit" align="center" label="单位"/>
-                  align="center"
+                <el-table-column prop="tel_phone" align="center" label="电话"/>
-                  label="联络人">
+                <el-table-column prop="tel_mail" 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>
@@ -105,15 +99,28 @@
             </ProcessTitle>
             <el-form-item label="入会人员:">
               <el-input
+                :disabled="true"
                 style="width: 30%"
-                placeholder="请选择入会人员"
+                v-model="rh_pageData.comityOpRole"
-                v-model="rh_pageData.comityInRole"
+              >
-                @click.native="inRoleChice">
               </el-input>
             </el-form-item>
           </el-form>
         </div>
       </div>
+      <el-collapse accordion>
+        <el-collapse-item title="回执说明">
+          <div style="margin: 10px 0;">
+            <el-input
+              type="textarea"
+              :rows="3"
+              resize="none"
+              placeholder="请输入意见"
+              v-model="commentText">
+            </el-input>
+          </div>
+        </el-collapse-item>
+      </el-collapse>
     </div>
     <div class="content" v-show="active === '3'">
       <div class="flow-list">
@@ -183,24 +190,15 @@
       </div>
     </div>
     <ProcessFooter
-      show-save
       show-submit
       show-back
       backBTNTexts="不涉及"
+      :isSubmitBack="isBack"
       :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>
 
@@ -208,6 +206,13 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
+import {
+  completeTask,
+  inboundLiaisonDetail,
+  startProcess,
+  saveinboundTask,
+  saveTaskForPub,
+} from "@/api/process.js"
 
 export default {
   components: {
@@ -219,12 +224,15 @@ export default {
   data() {
     return {
       active: '1', // 默认显示
+      rh_rules: {},
       rh_pageData: {
+        comityFileNum: '',
+        comityFileName: '',
         comityName: '',
         comityRole: '',
         comityState: '',
         comityKind: '',
-        InfoSources: '',
+        infoSources: '',
         comityMake: {
           makeQualification: '',
           makeRole: '',
@@ -234,20 +242,22 @@ export default {
         },
         workPath: '',
         comityTel: [],
+        comityOpRole: '',
+        comityInRoleId: '',
       },
-      /** 上传相关   */
+      roleForm: {},
-      acceptShow: false,
+      commentText: '',
-      // 上传所储存文件数组
-      fileTextList: [],
-
-
       roleShowflag: false,
       nodeList: [],
       detailData: [],
       loading: false,
 
       isSubmit: false,
+      isBack: false,
       saveLoading: false,
+
+      taskIds: this.$route.query.taskIds,
+      pId: this.$route.query.prcId,
     }
   },
   computed: {
@@ -257,6 +267,7 @@ export default {
   },
   created() {
     this.processTable()
+    this.getData()
   },
   methods: {
     processTable() {
@@ -272,28 +283,80 @@ export default {
       }, e => {
       })
     },
+
+    getData() {
+      const params = {
+        taskIds: this.taskIds,
+        pId: this.pId,
+      }
+      inboundLiaisonDetail(params).then(res => {
+        const processForm = JSON.parse(res.mesg)
+        this.getFormFieldList(processForm)
+      })
+    },
+    getFormFieldList(item) {
+      this.$nextTick(() => {
+        this.rh_pageData = JSON.parse(JSON.stringify(item)).rh_pageData
+        this.rh_pageData.comityOpRole = this.$store.getters.userInfo.userName
+        this.roleForm = JSON.parse(JSON.stringify(item)).roleList
+        // this.rh_pageData.comityFileNum = this.fileTextList
+      })
+    },
     // 右上标签页面切换
     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() {},
+    handleSubmitNo() {
-    // 保存按钮
+      let json = {
-    handleSave() {
+        roleList: this.roleForm,
+        memberId: this.$store.getters.userInfo.userId,
+        passFlag: '0',
+        commentText: this.commentText,
+        rh_pageData: this.rh_pageData,
+      }
+      this.$refs['rh_pageData'].validate((valid) => {
+        if (valid) {
+          this.isBack = true
+          const params = new FormData();
+          params.set('json', JSON.stringify(json))
+          params.set('userId', this.$store.getters.userInfo.userId)
+          params.set('taskId', this.taskIds)
+          completeTask(params).then(res => {
+            if (res.success === true) {
+              this.$message.success('退回成功')
+              this.$router.push("/processCenter");
+            }
+            this.isBack = false
+          });
+        }
+      })
     },
     // 提交按钮
     handleSubmit() {
+      let json = {
+        roleList: this.roleForm,
+        memberId: this.$store.getters.userInfo.userId,
+        passFlag: '1',
+        commentText: this.commentText,
+        rh_pageData: this.rh_pageData,
+      }
+      this.$refs['rh_pageData'].validate((valid) => {
+        if (valid) {
+          this.isSubmit = true
+          const params = new FormData();
+          params.set('json', JSON.stringify(json))
+          params.set('userId', this.$store.getters.userInfo.userId)
+          params.set('taskId', this.taskIds)
+          completeTask(params).then(res => {
+            if (res.success === true) {
+              this.$message.success('提交成功')
+              this.$router.push("/processCenter");
+            }
+            this.isSubmit = false
+          });
+        }
+      })
     }
   }
 }
@@ -301,15 +364,18 @@ export default {
 
 <style lang="less" scoped>
 @import '~@/assets/styles/style';
+
 .bzrhStep2 {
   position: relative;
   height: 100%;
-  /deep/.el-drawer__container {
+
+  /deep/ .el-drawer__container {
     .prc-content-border {
       border: none;
       padding: 0 20px 0;
     }
   }
+
   .headerTabs {
     height: 52px;
     display: flex;
@@ -317,6 +383,7 @@ export default {
     position: absolute;
     top: 0;
     right: 10px;
+
     .headerTabsItem {
       border: 1px solid #c1c1c1;
       padding: 0 5px;
@@ -324,21 +391,25 @@ export default {
       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;
@@ -346,6 +417,7 @@ export default {
       position: relative;
       font-size: 13px;
       font-weight: bold;
+
       .tableButton {
         position: absolute;
         right: 0;
@@ -353,12 +425,15 @@ export default {
       }
     }
   }
+
   .content_form {
     padding: 15px;
+
     .comityTel_btn {
       text-align: right;
     }
-    /deep/.el-table th {
+
+    /deep/ .el-table th {
       padding: 0px;
     }
   }

src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue

@@ -2,7 +2,7 @@
   <div class="bzrhStep3">
     <ProcessHeader toggle>
       <template slot="proName">外部标准化协会入会流程</template>
-      <template slot="proNode">发起流程</template>
+      <template slot="proNode">入选代表填写信息</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -15,6 +15,18 @@
         </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="文件编号:" prop="comityFileNum">
+                  {{ rh_pageData.comityFileNum || '-' }}
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="文件名称:" prop="comityFileName">
+                  {{ rh_pageData.comityFileName || '-' }}
+                </el-form-item>
+              </el-col>
+            </el-row>
             <el-row>
               <el-col :span="8">
                 <el-form-item label="协会名称:">
@@ -33,23 +45,16 @@
                   {{ 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="费用估计:">
+                <el-form-item label="成员:">
-                  {{ rh_pageData.comityMake.makeCost || '-' }}
+                  {{ rh_pageData.comityMake.makeRole || '' }}
                 </el-form-item>
               </el-col>
               <el-col :span="8">
@@ -59,15 +64,17 @@
               </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.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"
@@ -77,40 +84,96 @@
                 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 type="selection" width="55"/>
-                <el-table-column
+                <el-table-column prop="tel_name" align="center" label="联络人"/>
-                  v-model="rh_pageData.comityTel.tel_name"
+                <el-table-column prop="tel_unit" align="center" label="单位"/>
-                  align="center"
+                <el-table-column prop="tel_phone" align="center" label="电话"/>
-                  label="联络人">
+                <el-table-column prop="tel_mail" 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-row>
-              <el-input
+              <el-col :span="8">
-                style="width: 30%"
+                <el-form-item label="参与人:">
-                placeholder="请选择入会人员"
+                  <el-input
-                v-model="rh_pageData.comityInRole"
+                    style="width: 100%"
-                @click.native="inRoleChice">
+                    placeholder="请填写"
-              </el-input>
+                    :disabled="true"
-            </el-form-item>
+                    v-model="rh_pageData.fillPeople"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="单位:">
+                  <el-input
+                    style="width: 100%"
+                    placeholder="请填写"
+                    v-model="rh_pageData.fillUnit"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="部门:">
+                  <el-input
+                    style="width: 100%"
+                    placeholder="请填写部门"
+                    v-model="rh_pageData.fillDept"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="8">
+                <el-form-item label="身份:">
+                  <el-input
+                    style="width: 100%"
+                    placeholder="请填写身份"
+                    v-model="rh_pageData.fillPost"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="电话:">
+                  <el-input
+                    style="width: 100%"
+                    placeholder="请填写电话"
+                    v-model="rh_pageData.fillTel"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="邮箱:">
+                  <el-input
+                    style="width: 100%"
+                    placeholder="请填写邮箱"
+                    v-model="rh_pageData.fillMail"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="8">
+                <el-form-item label="参与人部门领导:">
+                  <el-input
+                    style="width: 100%"
+                    placeholder="请填写"
+                    v-model="rh_pageData.fillLeader"
+                    @click.native="choiceZRR"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="资料:">
+                  <el-input
+                    style="width: 100%"
+                    placeholder="请填写"
+                    v-model="rh_pageData.fillFile"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
           </el-form>
         </div>
       </div>
@@ -205,6 +268,12 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
+import {
+  completeTask,
+  inboundLiaisonDetail,
+  saveinboundTask,
+  saveTaskForPub,
+} from "@/api/process.js"
 
 export default {
   components: {
@@ -217,6 +286,8 @@ export default {
     return {
       active: '1', // 默认显示
       rh_pageData: {
+        comityFileNum: '',
+        comityFileName: '',
         comityName: '',
         comityRole: '',
         comityState: '',
@@ -231,13 +302,18 @@ export default {
         },
         workPath: '',
         comityTel: [],
+        fillPeople: '',
+        fillUnit: '',
+        fillDept: '',
+        fillPost: '',
+        fillTel: '',
+        fillMail: '',
+        fillLeader: '',
+        fillLeaderId: '',
+        fillFile: '',
       },
-      /** 上传相关   */
+      roleForm: {},
-      acceptShow: false,
+      unqualidiedData: [],
-      // 上传所储存文件数组
-      fileTextList: [],
-
-
       roleShowflag: false,
       nodeList: [],
       detailData: [],
@@ -245,6 +321,9 @@ export default {
 
       isSubmit: false,
       saveLoading: false,
+
+      taskIds: this.$route.query.taskIds,
+      pId: this.$route.query.prcId,
     }
   },
   computed: {
@@ -252,6 +331,10 @@ export default {
       return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
     }
   },
+  created() {
+    this.processTable()
+    this.getData()
+  },
   methods: {
     processTable() {
       this.$http.get("lawss/activiti/get_list_by_instance", {
@@ -266,15 +349,88 @@ export default {
       }, e => {
       })
     },
+
+    getData() {
+      const params = {
+        taskIds: this.taskIds,
+        pId: this.pId,
+      }
+      inboundLiaisonDetail(params).then(res => {
+        const processForm = JSON.parse(res.mesg)
+        this.getFormFieldList(processForm)
+      })
+    },
+    getFormFieldList (item) {
+      this.$nextTick(() => {
+        this.rh_pageData = JSON.parse(JSON.stringify(item)).rh_pageData
+        this.rh_pageData.fillPeople = this.$store.getters.userInfo.userName
+        this.roleForm = JSON.parse(JSON.stringify(item)).roleList
+        // this.rh_pageData.comityFileNum = this.fileTextList
+      })
+    },
     // 右上标签页面切换
     handleTabs(name) {
       this.active = name
     },
+    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.rh_pageData.fillLeaderId = data[0].id
+      this.rh_pageData.fillLeader = data[0].name
+      this.roleShowflag = false
+    },
     // 保存按钮
     handleSave() {
+      this.saveLoading = true
+      let _formData = new FormData()
+      _formData.append('taskIds', this.taskIds)
+      _formData.append('json', JSON.stringify({
+        roleList: this.roleForm,
+        selfUser: this.$store.getters.userInfo.userId,
+        charge: this.rh_pageData.fillLeaderId,
+        rh_pageData: this.rh_pageData,
+      }))
+      saveTaskForPub(_formData).then(res => {
+        this.saveLoading = false
+        this.$message.success('保存成功')
+        this.bpnId = res.result
+      }).catch(e => {
+        this.saveLoading = false
+      })
     },
     // 提交按钮
     handleSubmit() {
+      let json = {
+        roleList: this.roleForm,
+        selfUser: this.$store.getters.userInfo.userId,
+        charge: this.rh_pageData.fillLeaderId,
+        rh_pageData: this.rh_pageData,
+      }
+      this.$refs['rh_pageData'].validate((valid) => {
+        if (valid) {
+          this.isSubmit = true
+          const params = new FormData();
+          params.set('json', JSON.stringify(json))
+          params.set('userId', this.$store.getters.userInfo.userId)
+          params.set('taskId', this.taskIds)
+          completeTask(params).then(res => {
+            if (res.success === true) {
+              this.$message.success('提交成功')
+              this.$router.push("/processCenter");
+            }
+            this.isSubmit = false
+          });
+        }
+      })
     }
   }
 }

src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue

@@ -1,13 +1,453 @@
 <template>
-
+  <div class="bzrhStep4">
+    <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" :rules="rh_rules">
+            <el-row>
+              <el-col :span="8">
+                <el-form-item label="文件编号:" prop="comityFileNum">
+                  {{ rh_pageData.comityFileNum || '-' }}
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="文件名称:" prop="comityFileName">
+                  {{ rh_pageData.comityFileName || '-' }}
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <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-col :span="8">
+                <el-form-item label="资质:">
+                  {{ rh_pageData.comityMake.makeQualification || '-' }}
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="8">
+                <el-form-item label="成员:">
+                  {{ rh_pageData.comityMake.makeRole || '' }}
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="费用估计:">
+                  {{ rh_pageData.comityMake.makeCost || '-' }}
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="8">
+                <el-form-item label="职责:">
+                  {{ rh_pageData.comityMake.makeDuties || '-' }}
+                </el-form-item>
+              </el-col>
+              <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 prop="tel_name" align="center" label="联络人"/>
+                <el-table-column prop="tel_unit" align="center" label="单位"/>
+                <el-table-column prop="tel_phone" align="center" label="电话"/>
+                <el-table-column prop="tel_mail" align="center" label="邮箱"/>
+              </el-table>
+            </el-form-item>
+            <el-form-item label="入会人员:">
+              <el-table
+                :data="rh_pageData.myPartRole"
+                border
+                ref="entryTable"
+                height="49%"
+                style="width: 100%"
+                :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+              fontWeight: 'bold', height: '20px'}">
+                <el-table-column prop="fillPeople" align="center" label="参与人"/>
+                <el-table-column prop="fillUnit" align="center" label="单位"/>
+                <el-table-column prop="fillDept" align="center" label="部门"/>
+                <el-table-column prop="fillPost" align="center" label="身份"/>
+                <el-table-column prop="fillTel" align="center" label="电话"/>
+                <el-table-column prop="fillMail" align="center" label="邮箱"/>
+                <el-table-column prop="fillFile" align="center" label="资料"/>
+              </el-table>
+            </el-form-item>
+          </el-form>
+        </div>
+      </div>
+      <el-collapse accordion>
+        <el-collapse-item title="回执说明">
+          <div style="margin: 10px 0;">
+            <el-input
+              type="textarea"
+              :rows="3"
+              resize="none"
+              placeholder="请输入意见"
+              v-model="textarea">
+            </el-input>
+          </div>
+        </el-collapse-item>
+      </el-collapse>
+    </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-submit
+      show-back
+      backBTNTexts="驳回"
+      :submitLoading="isSubmit"
+      :isSubmitBack="isBack"
+      @back="handleSubmitNo"
+      @submit="handleSubmit"
+    >
+    </ProcessFooter>
+  </div>
 </template>
 
 <script>
+import ProcessHeader from "../../components/ProcessHeader";
+import ProcessFooter from "../../components/ProcessFooter";
+import ProcessTitle from "../../components/ProcessTitle";
+import {
+  completeTask,
+  inboundLiaisonDetail,
+  saveinboundTask,
+  saveTaskForPub,
+  changeAssigneeNew
+} from "@/api/process.js"
 export default {
-  name: "bzrhStep4"
+  components: {
+    ProcessHeader,
+    ProcessFooter,
+    ProcessTitle
+  },
+  name: "bzrhStep4",
+  data() {
+    return {
+      active: '1', // 默认显示
+      rh_rules: {},
+      rh_pageData: {
+        comityFileNum: '',
+        comityFileName: '',
+        comityName: '',
+        comityRole: '',
+        comityState: '',
+        comityKind: '',
+        InfoSources: '',
+        comityMake: {
+          makeQualification: '',
+          makeRole: '',
+          makeCost: '',
+          makeDuties: '',
+          makeTime: '',
+        },
+        prcCreateUser: {},
+        workPath: '',
+        comityTel: [],
+        fillPeople: '',
+        fillUnit: '',
+        fillDept: '',
+        fillPost: '',
+        fillTel: '',
+        fillMail: '',
+        fillLeader: '',
+        fillFile: '',
+        myPartRole: [],
+      },
+      roleForm: {},
+      selfUser: '',
+      detailData: [],
+      loading: false,
+
+      textarea: '',
+      isSubmit: false,
+      isBack: false,
+      saveLoading: false,
+
+      taskIds: this.$route.query.taskIds,
+      pId: this.$route.query.prcId,
+    }
+  },
+  computed: {
+    listNoDataText() {
+      return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
+    }
+  },
+  created() {
+    this.processTable()
+    this.getData()
+  },
+  methods: {
+    // 右上标签页面切换
+    handleTabs(name) {
+      this.active = name
+    },
+    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 => {
+      })
+    },
+
+    getData() {
+      const params = {
+        taskIds: this.taskIds,
+        pId: this.pId,
+      }
+      inboundLiaisonDetail(params).then(res => {
+        const processForm = JSON.parse(res.mesg)
+        this.getFormFieldList(processForm)
+      })
+    },
+    getFormFieldList (item) {
+      this.$nextTick(() => {
+        this.rh_pageData = JSON.parse(JSON.stringify(item)).rh_pageData
+        this.rh_pageData.myPartRole = [{
+          fillPeople: this.rh_pageData.fillPeople,
+          fillUnit: this.rh_pageData.fillUnit,
+          fillDept: this.rh_pageData.fillDept,
+          fillPost: this.rh_pageData.fillPost,
+          fillTel: this.rh_pageData.fillTel,
+          fillMail: this.rh_pageData.fillMail,
+          fillFile: this.rh_pageData.fillFile,
+        }]
+        this.selfUser = JSON.parse(JSON.stringify(item)).selfUser
+        this.roleForm = JSON.parse(JSON.stringify(item)).roleList
+        // this.rh_pageData.comityFileNum = this.fileTextList
+      })
+    },
+
+    // 退回按钮
+    handleSubmitNo() {
+      let json = {
+        member: this.selfUser,
+        passFlag: '0',
+        roleList: this.roleForm,
+        commentText: this.textarea,
+        rh_pageData: this.rh_pageData,
+      }
+      this.$refs['rh_pageData'].validate((valid) => {
+        if (valid) {
+          this.isBack = true
+          const params = new FormData();
+          params.set('json', JSON.stringify(json))
+          params.set('userId', this.$store.getters.userInfo.userId)
+          params.set('taskId', this.taskIds)
+          completeTask(params).then(res => {
+            if (res.success === true) {
+              this.$message.success('退回成功')
+              this.$router.push("/processCenter");
+            }
+            this.isBack = false
+          });
+        }
+      })
+    },
+    // 提交按钮
+    handleSubmit() {
+      let json = {
+        member: this.selfUser,
+        passFlag: '1',
+        engineerSum: this.roleForm.startUser,
+        roleList: this.roleForm,
+        commentText: this.textarea,
+        rh_pageData: this.rh_pageData,
+      }
+      this.$refs['rh_pageData'].validate((valid) => {
+        if (valid) {
+          this.isSubmit = true
+          const params = new FormData();
+          params.set('json', JSON.stringify(json))
+          params.set('userId', this.$store.getters.userInfo.userId)
+          params.set('taskId', this.taskIds)
+          completeTask(params).then(res => {
+            if (res.success === true) {
+              this.$message.success('提交成功')
+              this.$router.push("/processCenter");
+            }
+            this.isSubmit = false
+          });
+        }
+      })
+    }
+  }
 }
 </script>
 
-<style scoped>
+<style lang="less" scoped>
-
+@import '~@/assets/styles/style';
+.bzrhStep4 {
+  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>

src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue

@@ -1,13 +1,477 @@
 <template>
-
+  <div class="bzrhStep5">
+    <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" :rules="rh_rules">
+            <el-row>
+              <el-col :span="8">
+                <el-form-item label="文件编号:" prop="comityFileNum">
+                  {{ rh_pageData.comityFileNum || '-' }}
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="文件名称:" prop="comityFileName">
+                  {{ rh_pageData.comityFileName || '-' }}
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <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-col :span="8">
+                <el-form-item label="资质:">
+                  {{ rh_pageData.comityMake.makeQualification || '-' }}
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="8">
+                <el-form-item label="成员:">
+                  {{ rh_pageData.comityMake.makeRole || '' }}
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="费用估计:">
+                  {{ rh_pageData.comityMake.makeCost || '-' }}
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="8">
+                <el-form-item label="职责:">
+                  {{ rh_pageData.comityMake.makeDuties || '-' }}
+                </el-form-item>
+              </el-col>
+              <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" 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
+                  prop="tel_name"
+                  align="center"
+                  label="联络人">
+                  <template slot-scope="scope">
+                    <el-input v-model="scope.row.tel_name"/>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="tel_unit"
+                  align="center"
+                  label="单位">
+                  <template slot-scope="scope">
+                    <el-input v-model="scope.row.tel_unit"/>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="tel_phone"
+                  align="center"
+                  label="电话">
+                  <template slot-scope="scope">
+                    <el-input v-model="scope.row.tel_phone"/>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="tel_mail"
+                  align="center"
+                  label="邮箱">
+                  <template slot-scope="scope">
+                    <el-input v-model="scope.row.tel_mail"/>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </el-form-item>
+            <el-form-item label="我司参与人员:">
+              <div class="myPart_btn">
+                <el-button
+                  type="danger"
+                  size="small"
+                  icon="el-icon-delete"
+                  @click="del_paryForm">
+                  批量删除
+                </el-button>
+              </div>
+              <el-table
+                :data="rh_pageData.myPartRole"
+                border
+                ref="entryTable"
+                @selection-change="selectedDelete"
+                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 prop="fillPeople" align="center" label="参与人"/>
+                <el-table-column prop="fillUnit" align="center" label="单位"/>
+                <el-table-column prop="fillDept" align="center" label="部门"/>
+                <el-table-column prop="fillPost" align="center" label="身份"/>
+                <el-table-column prop="fillTel" align="center" label="电话"/>
+                <el-table-column prop="fillMail" align="center" label="邮箱"/>
+                <el-table-column prop="fillFile" align="center" label="资料"/>
+              </el-table>
+            </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-submit
+      show-save
+      :submitLoading="isSubmit"
+      :saveLoading="saveLoading"
+      @save="handleSave"
+      @submit="handleSubmit"
+    >
+    </ProcessFooter>
+  </div>
 </template>
 
 <script>
+import ProcessHeader from "../../components/ProcessHeader";
+import ProcessFooter from "../../components/ProcessFooter";
+import ProcessTitle from "../../components/ProcessTitle";
+import {
+  completeTask,
+  inboundLiaisonDetail,
+  saveinboundTask,
+  saveTaskForPub,
+  changeAssigneeNew
+} from "@/api/process.js"
 export default {
-  name: "bzrhStep5"
+  components: {
+    ProcessHeader,
+    ProcessFooter,
+    ProcessTitle
+  },
+  name: "bzrhStep5",
+  data() {
+    return {
+      active: '1', // 默认显示
+      rh_rules: {},
+      rh_pageData: {
+        comityFileNum: '',
+        comityFileName: '',
+        comityName: '',
+        comityRole: '',
+        comityState: '',
+        comityKind: '',
+        InfoSources: '',
+        comityMake: {
+          makeQualification: '',
+          makeRole: '',
+          makeCost: '',
+          makeDuties: '',
+          makeTime: '',
+        },
+        workPath: '',
+        comityTel: [],
+        fillPeople: '',
+        fillUnit: '',
+        fillDept: '',
+        fillPost: '',
+        fillTel: '',
+        fillMail: '',
+        fillLeader: '',
+        fillFile: '',
+        myPartRole: [],
+      },
+
+      roleForm: {},
+      detailData: [],
+      loading: false,
+
+      textarea: '',
+      isSubmit: false,
+      saveLoading: false,
+
+      taskIds: this.$route.query.taskIds,
+      pId: this.$route.query.prcId,
+    }
+  },
+  computed: {
+    listNoDataText() {
+      return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
+    }
+  },
+  created() {
+    this.processTable()
+    this.getData()
+  },
+  methods: {
+    // 右上标签页面切换
+    handleTabs(name) {
+      this.active = name
+    },
+    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 => {
+      })
+    },
+
+    getData() {
+      const params = {
+        taskIds: this.taskIds,
+        pId: this.pId,
+      }
+      inboundLiaisonDetail(params).then(res => {
+        const processForm = JSON.parse(res.mesg)
+        this.getFormFieldList(processForm)
+      })
+    },
+    getFormFieldList (item) {
+      this.$nextTick(() => {
+        this.rh_pageData = JSON.parse(JSON.stringify(item)).rh_pageData
+        this.roleForm = JSON.parse(JSON.stringify(item)).roleList
+        // this.rh_pageData.comityFileNum = this.fileTextList
+      })
+    },
+    /** 批量删除 */
+    del_paryForm() {
+      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.myPartRole.findIndex(items => {
+              return items.id === item;
+            });
+            if (index > -1) {
+              this.rh_pageData.myPartRole.splice(index, 1);
+            }
+            exits.push(item);
+          });
+          this.deleteDataList = [];
+        }).catch(() => {
+        });
+      }
+    },
+
+    selectedDelete(val) {
+      this.deleteDataList = val
+    },
+    // 保存按钮
+    handleSave() {
+    },
+    // 提交按钮
+    handleSubmit() {
+        let json = {
+          leader: this.roleForm.leaderUserId,
+          rh_pageData: this.rh_pageData,
+          roleList: this.roleForm,
+        }
+        this.$refs['rh_pageData'].validate((valid) => {
+          if (valid) {
+            this.isSubmit = true
+            const params = new FormData();
+            params.set('json', JSON.stringify(json))
+            params.set('userId', this.$store.getters.userInfo.userId)
+            params.set('taskId', this.taskIds)
+            completeTask(params).then(res => {
+              if (res.success === true) {
+                this.$message.success('提交成功')
+                this.$router.push("/processCenter");
+              }
+              this.isSubmit = false
+            });
+          }
+        })
+    }
+  }
 }
 </script>
 
-<style scoped>
+<style lang="less" scoped>
+@import '~@/assets/styles/style';
+.bzrhStep5 {
+  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;
+    }
+    /deep/.el-table__body-wrapper {
+      height: auto!important;
+    }
+    .myPart_btn {
+      text-align: right;
+    }
+  }
+}
 </style>

src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue

@@ -0,0 +1,506 @@
+<template>
+  <div class="bzrhStep6">
+    <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" :rules="rh_rules">
+            <el-row>
+              <el-col :span="8">
+                <el-form-item label="文件编号:" prop="comityFileNum">
+                  {{ rh_pageData.comityFileNum || '-' }}
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="文件名称:" prop="comityFileName">
+                  {{ rh_pageData.comityFileName || '-' }}
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <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-col :span="8">
+                <el-form-item label="资质:">
+                  {{ rh_pageData.comityMake.makeQualification || '-' }}
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="8">
+                <el-form-item label="成员:">
+                  {{ rh_pageData.comityMake.makeRole || '' }}
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="费用估计:">
+                  {{ rh_pageData.comityMake.makeCost || '-' }}
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="8">
+                <el-form-item label="职责:">
+                  {{ rh_pageData.comityMake.makeDuties || '-' }}
+                </el-form-item>
+              </el-col>
+              <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" 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 prop="tel_name" align="center" label="联络人"/>
+                <el-table-column prop="tel_unit" align="center" label="单位"/>
+                <el-table-column prop="tel_phone" align="center" label="电话"/>
+                <el-table-column prop="tel_mail" align="center" label="邮箱"/>
+              </el-table>
+            </el-form-item>
+            <el-form-item label="我司参与人员:">
+              <div class="myPart_btn">
+                <el-button
+                  type="danger"
+                  size="small"
+                  icon="el-icon-delete"
+                  @click="del_paryForm">
+                  批量删除
+                </el-button>
+              </div>
+              <el-table
+                :data="rh_pageData.myPartRole"
+                border
+                ref="entryTable"
+                @selection-change="selectedDelete"
+                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 prop="fillPeople" align="center" label="参与人"/>
+                <el-table-column prop="fillUnit" align="center" label="单位"/>
+                <el-table-column prop="fillDept" align="center" label="部门"/>
+                <el-table-column prop="fillPost" align="center" label="身份"/>
+                <el-table-column prop="fillTel" align="center" label="电话"/>
+                <el-table-column prop="fillMail" align="center" label="邮箱"/>
+                <el-table-column prop="fillFile" align="center" label="资料"/>
+              </el-table>
+            </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-submit
+      show-back
+      :isSubmitBack="isBack"
+      :submitLoading="isSubmit"
+      @back="handleSubmitNo"
+      @submit="handleSubmit"
+    >
+    </ProcessFooter>
+  </div>
+</template>
+
+<script>
+import ProcessHeader from "../../components/ProcessHeader";
+import ProcessFooter from "../../components/ProcessFooter";
+import ProcessTitle from "../../components/ProcessTitle";
+import {
+  completeTask,
+  inboundLiaisonDetail,
+  saveinboundTask,
+  saveTaskForPub,
+  changeAssigneeNew
+} from "@/api/process.js"
+
+export default {
+  components: {
+    ProcessHeader,
+    ProcessFooter,
+    ProcessTitle
+  },
+  name: "bzrhStep6",
+  data() {
+    return {
+      active: '1', // 默认显示
+      rh_rules: {},
+      rh_pageData: {
+        comityFileNum: '',
+        comityFileName: '',
+        comityName: '',
+        comityRole: '',
+        comityState: '',
+        comityKind: '',
+        InfoSources: '',
+        comityMake: {
+          makeQualification: '',
+          makeRole: '',
+          makeCost: '',
+          makeDuties: '',
+          makeTime: '',
+        },
+        workPath: '',
+        comityTel: [],
+        fillPeople: '',
+        fillUnit: '',
+        fillDept: '',
+        fillPost: '',
+        fillTel: '',
+        fillMail: '',
+        fillLeader: '',
+        fillFile: '',
+        myPartRole: [],
+      },
+
+      detailData: [],
+      loading: false,
+
+      roleForm: {},
+      textarea: '',
+      isSubmit: false,
+      isBack: false,
+      saveLoading: false,
+      taskInfo: this.$route.query.taskInfo,
+      taskIds: this.$route.query.taskIds,
+      pId: this.$route.query.prcId,
+    }
+  },
+  computed: {
+    listNoDataText() {
+      return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
+    }
+  },
+  created() {
+    this.processTable()
+    this.getData()
+  },
+  methods: {
+    // 右上标签页面切换
+    handleTabs(name) {
+      this.active = name
+    },
+    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 => {
+      })
+    },
+
+    getData() {
+      const params = {
+        taskIds: this.taskIds,
+        pId: this.pId,
+      }
+      inboundLiaisonDetail(params).then(res => {
+        const processForm = JSON.parse(res.mesg)
+        this.getFormFieldList(processForm)
+      })
+    },
+    getFormFieldList(item) {
+      this.$nextTick(() => {
+        this.rh_pageData = JSON.parse(JSON.stringify(item)).rh_pageData
+        this.roleForm = JSON.parse(JSON.stringify(item)).roleList
+        // this.rh_pageData.comityFileNum = this.fileTextList
+      })
+    },
+    /** 批量删除 */
+    del_paryForm() {
+      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.myPartRole.findIndex(items => {
+              return items.id === item;
+            });
+            if (index > -1) {
+              this.rh_pageData.myPartRole.splice(index, 1);
+            }
+            exits.push(item);
+          });
+          this.deleteDataList = [];
+        }).catch(() => {
+        });
+      }
+    },
+
+    selectedDelete(val) {
+      this.deleteDataList = val
+    },
+    // 退回按钮
+    handleSubmitNo() {
+      let json = {
+        rh_pageData: this.rh_pageData,
+        roleList: this.roleForm
+      }
+      if (this.taskInfo === '标准法规部主管领导审核') {
+        json.passFlag = '0',
+        json.manageDepartmentList = this.roleForm.feeUserId
+      } else if (this.taskInfo === '费用管理部门会签') {
+        json.passFlag = '0',
+        json.manageDepartment = this.$store.getters.userInfo.userId
+        json.president = this.roleForm.engineerUserId
+      } else if (this.taskInfo === '技术委员会常务副主任/总院院长审定') {
+        json.passFlag = '0',
+        json.engineerSumDone = this.roleForm.startUser
+      } else {
+        json = json
+      }
+      this.$refs['rh_pageData'].validate((valid) => {
+        if (valid) {
+          this.isBack = true
+          const params = new FormData();
+          params.set('json', JSON.stringify(json))
+          params.set('userId', this.$store.getters.userInfo.userId)
+          params.set('taskId', this.taskIds)
+          completeTask(params).then(res => {
+            if (res.success === true) {
+              this.$message.success('提交成功')
+              this.$router.push("/processCenter");
+            }
+            this.isBack = false
+          });
+        }
+      })
+    },
+
+    // 提交按钮
+    handleSubmit() {
+      let json = {
+        rh_pageData: this.rh_pageData,
+        roleList: this.roleForm
+      }
+      if (this.taskInfo === '标准法规部主管领导审核') {
+        json.passFlag = '1',
+        json.manageDepartmentList = this.roleForm.feeUserId
+      } else if (this.taskInfo === '费用管理部门会签') {
+        json.passFlag = '1',
+        json.manageDepartment = this.$store.getters.userInfo.userId
+        json.president = this.roleForm.engineerUserId
+      } else if (this.taskInfo === '技术委员会常务副主任/总院院长审定') {
+        json.passFlag = '1',
+        json.engineerSumDone = this.roleForm.startUser
+      } else {
+        json = json
+      }
+      this.$refs['rh_pageData'].validate((valid) => {
+        if (valid) {
+          this.isSubmit = true
+          const params = new FormData();
+          params.set('json', JSON.stringify(json))
+          params.set('userId', this.$store.getters.userInfo.userId)
+          params.set('taskId', this.taskIds)
+          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';
+
+.bzrhStep6 {
+  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;
+    }
+
+    .myPart_btn {
+      text-align: right;
+    }
+  }
+}
+</style>

src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue

@@ -0,0 +1,455 @@
+<!--外部标准化协会参会流程-->
+<template>
+  <div class="bzchStep1">
+    <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="ch_pageData" :model="ch_pageData" :rules="ch_rules" label-width="auto">
+            <el-row :gutter="24">
+              <el-col :span="8">
+                <el-form-item label="会议名称:">
+                  <el-input
+                    v-model="ch_pageData.meetingName"
+                    placeholder="请填写"/>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="主办单位:">
+                  <el-input v-model="ch_pageData.primaryUnit" placeholder="请填写"/>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24">
+              <el-col :span="8">
+                <el-form-item label="协会名称:">
+                  <el-select v-model="ch_pageData.associaName" placeholder="请选择"></el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8" v-if="ch_pageData.associaName !== ''">
+                <el-form-item>
+                  <el-select v-model="ch_pageData.associaNameOne" placeholder="请选择"></el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8" v-if="ch_pageData.associaName !== '' && ch_pageData.associaNameOne !== ''">
+                <el-form-item>
+                  <el-select v-model="ch_pageData.associaNameTwo" placeholder="请选择"></el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24">
+              <el-col :span="8">
+                <el-form-item label="会议时间:">
+                  <el-date-picker
+                    v-model="ch_pageData.meetingTime"
+                    type="datetime"
+                    placeholder="选择日期时间"
+                    align="right">
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="会议地点:">
+                  <el-input v-model="ch_pageData.meetingPlace" placeholder="请填写"/>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24">
+              <el-col :span="8">
+                <el-form-item label="费用标准:">
+                  <el-input v-model="ch_pageData.feeStand" placeholder="请填写"/>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="费用列支:">
+                  <el-select v-model="ch_pageData.feeKind" placeholder="请选择"></el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24">
+              <el-col :span="8">
+                <el-form-item label="上传附件:" prop="uploadFile">
+                  <el-upload></el-upload>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="类别:">
+                  <el-radio v-model="ch_pageData.sort" label="1">计划内</el-radio>
+                  <el-radio v-model="ch_pageData.sort" label="2">计划外</el-radio>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-form-item>
+              <div class="table_btn">
+                <el-button type="primary" size="small" @click="meeting_add">添加</el-button>
+                <el-button type="danger" size="small" @click="meeting_delete">批量删除</el-button>
+              </div>
+              <el-table
+                class="meeting_table"
+                :data="ch_pageData.meetingTable"
+                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" align="center"/>
+                <el-table-column type="index" width="50" align="center"/>
+                <el-table-column label="议题" align="center">
+                  <template slot-scope="scope">
+                    <el-input v-model="scope.row.meetingTheme" placeholder="请填写"></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: "bzchStep1",
+  data() {
+    return {
+      active: '1',
+
+      ch_pageData: {
+        meetingName: '',
+        primaryUnit: '',
+        associaName: '',
+        associaNameOne: '',
+        associaNameTwo: '',
+        meetingTime: '',
+        meetingPlace: '',
+        feeStand: '',
+        feeKind: '',
+        uploadFile: '',
+        sort: '1',
+        meetingTable: [],
+      },
+      ch_rules: {},
+      roleForm: {
+        startUserName: this.$store.getters.userInfo.userName,
+        startUser: this.$store.getters.userInfo.userId,
+        dockUserName: '',
+        dockUser: ''
+      },
+      roleFormRules: {
+        dockUserName: [{ required: true, message: "请选择标准法规工程师", trigger: ['blur', 'change']}]
+      },
+      deleteDataList: [],
+
+      nodeList: [],
+      roleShowflag: false,
+      isSubmit: false,
+      saveLoading: false,
+    }
+  },
+  methods: {
+    // 右上标签页面切换
+    handleTabs(name) {
+      this.active = name
+    },
+
+    meeting_add() {
+      var list = {
+        meetingTheme: this.meetingTheme,
+      }
+      this.ch_pageData.meetingTable.push(list)
+    },
+    meeting_delete() {
+      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.ch_pageData.meetingTable.findIndex(items => {
+              return items === item
+            })
+            if (index > -1) {
+              this.ch_pageData.meetingTable.splice(index, 1)
+            }
+            exits.push(item)
+          })
+          this.deleteDataList = []
+        }).catch(() => {
+        })
+      }
+    },
+    selectedDelete(val) {
+      this.deleteDataList = 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() {}
+
+  }
+}
+</script>
+
+<style lang="less" scoped>
+@import '~@/assets/styles/style';
+.bzchStep1 {
+  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-top: 15px;
+    padding-left: 30px;
+    .el-divider--horizontal {
+      margin-top: 0px;
+    }
+    /deep/.el-table__body-wrapper {
+      height: auto!important;
+    }
+    .el-select {
+      width: 100%;
+    }
+    .el-date-editor.el-input {
+      width: 100%;
+    }
+    .table_btn {
+      text-align: right;
+    }
+    .meeting_table {
+      /deep/.el-input__inner {
+        text-align: center;
+      }
+    }
+    /deep/.el-table th {
+      padding: 0px;
+    }
+  }
+}
+</style>

src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue

@@ -0,0 +1,372 @@
+<template>
+  <div class="bzchStep2">
+    <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="ch_pageData" :model="ch_pageData" :rules="ch_rules" label-width="auto">
+            <el-row :gutter="24">
+              <el-col :span="8">
+                <el-form-item label="会议名称:">
+                  {{ ch_pageData.meetingName || '-' }}
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="主办单位:">
+                  {{ ch_pageData.primaryUnit || '-' }}
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24">
+              <el-col :span="8">
+                <el-form-item label="协会名称:">
+                  {{ ch_pageData.associaName || '-' }}
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="会议时间:">
+                  {{ ch_pageData.meetingTime || '-' }}
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24">
+              <el-col :span="8">
+                <el-form-item label="会议地点:">
+                  {{ ch_pageData.meetingPlace || '-' }}
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="费用标准:">
+                  {{ ch_pageData.feeStand || '-' }}
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24">
+              <el-col :span="8">
+                <el-form-item label="费用列支:">
+                  {{ ch_pageData.feeKind || '-' }}
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="上传附件:" prop="uploadFile">
+                  <el-upload></el-upload>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24">
+              <el-col :span="8">
+                <el-form-item label="类别:">
+                  {{ ch_pageData.sort || '-'}}
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-form-item>
+              <el-table
+                class="meeting_table"
+                :data="ch_pageData.meetingTable"
+                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="index" width="50" align="center"/>
+                <el-table-column label="议题" align="center" prop="ch_pageData.meetingTable.meetingTheme"/>
+              </el-table>
+            </el-form-item>
+            <ProcessTitle>
+              <template slot="title">选择人员</template>
+            </ProcessTitle>
+            <el-form-item label="入会人员:">
+              <el-input
+                style="width: 30%"
+                clearable
+                placeholder="请选择入会人员"
+                v-model="ch_pageData.meetingInRole"
+                @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
+      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, inboundLiaisonDetail } from '@/api/process.js'
+export default {
+  components: {
+    ProcessHeader,
+    ProcessFooter,
+    ProcessTitle
+  },
+  name: "bzchStep2",
+  data() {
+    return {
+      active: '1',
+
+      ch_pageData: {},
+      ch_rules: {},
+      nodeList: [],
+
+      isSubmit: false,
+      saveLoading: false,
+      roleShowflag: false,
+      detailData: [],
+      loading: false,
+
+      taskIds: this.$route.query.taskIds,
+      pId: this.$route.query.prcId,
+    }
+  },
+  computed: {
+    listNoDataText() {
+      return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
+    }
+  },
+  created() {
+    this.processTable()
+    this.getData()
+  },
+  methods: {
+    // 右上标签页面切换
+    handleTabs(name) {
+      this.active = name
+    },
+
+    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 => {
+      })
+    },
+
+    getData() {
+      const params = {
+        taskIds: this.taskIds,
+        pId: this.pId,
+      }
+      inboundLiaisonDetail(params).then(res => {
+        const processForm = JSON.parse(res.mesg)
+        this.getFormFieldList(processForm)
+      })
+    },
+    getFormFieldList (item) {
+      this.$nextTick(() => {
+        this.rh_pageData = JSON.parse(JSON.stringify(item)).ch_pageData
+        // this.rh_pageData.comityFileNum = this.fileTextList
+      })
+    },
+    // 流程阶段负责人选择
+    inRoleChice (type, title, id) {
+      this.nodeList = []
+      this.nodeList.push(id)
+      this.type = type
+      this.drawerTitle = title
+      this.roleShowflag = true
+    },
+    drawerCheck (data) {
+      var idList = ''
+      var nameList = ''
+      data.forEach(item => {
+        if (nameList.length > 0) {
+          nameList += ','
+          idList += ','
+        }
+        idList += item.id;
+        nameList += item.name;
+      });
+      this.ch_pageData.meetingInRole = nameList
+      this.ch_pageData.meetingInRoleId = idList
+      this.roleShowflag = false
+    },
+    // 退回按钮
+    handleSubmitNo() {},
+    // 保存按钮
+    handleSave() {
+    },
+    // 提交按钮
+    handleSubmit() {
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+@import '~@/assets/styles/style';
+.bzchStep2 {
+  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-top: 15px;
+    padding-left: 30px;
+    .el-divider--horizontal {
+      margin-top: 0px;
+    }
+    /deep/.el-table__body-wrapper {
+      height: auto!important;
+    }
+    /deep/.el-textarea__inner {
+      font-family: inherit;
+    }
+    /deep/.el-table th {
+      padding: 0px;
+    }
+  }
+}
+</style>

src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue

@@ -0,0 +1,401 @@
+<template>
+  <div class="bzchStep3">
+    <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="ch_pageData" :model="ch_pageData" :rules="ch_rules" label-width="auto">
+            <el-row :gutter="24">
+              <el-col :span="8">
+                <el-form-item label="会议名称:">
+                  {{ ch_pageData.meetingName || '-' }}
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="主办单位:">
+                  {{ ch_pageData.primaryUnit || '-' }}
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24">
+              <el-col :span="8">
+                <el-form-item label="协会名称:">
+                  {{ ch_pageData.associaName || '-' }}
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="会议时间:">
+                  {{ ch_pageData.meetingTime || '-' }}
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24">
+              <el-col :span="8">
+                <el-form-item label="会议地点:">
+                  {{ ch_pageData.meetingPlace || '-' }}
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="费用标准:">
+                  {{ ch_pageData.feeStand || '-' }}
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24">
+              <el-col :span="8">
+                <el-form-item label="费用列支:">
+                  {{ ch_pageData.feeKind || '-' }}
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="上传附件:" prop="uploadFile">
+                  <el-upload></el-upload>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24">
+              <el-col :span="8">
+                <el-form-item label="类别:">
+                  {{ ch_pageData.sort || '-' }}
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-form-item>
+              <el-table
+                class="meeting_table"
+                :data="ch_pageData.meetingTable"
+                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="index" width="50" align="center"/>
+                <el-table-column label="议题" align="center" prop="ch_pageData.meetingTable.meetingTheme"/>
+              </el-table>
+            </el-form-item>
+            <ProcessTitle>
+              <template slot="title">填写信息</template>
+            </ProcessTitle>
+            <el-row>
+              <el-col :span="8">
+                <el-form-item label="人员:">
+                  <el-input
+                    style="width: 100%"
+                    placeholder="请填写"
+                    v-model="ch_pageData.fillPeople"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="单位:">
+                  <el-input
+                    style="width: 100%"
+                    placeholder="请填写"
+                    v-model="ch_pageData.fillUnit"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="部门:">
+                  <el-input
+                    style="width: 100%"
+                    placeholder="请填写部门"
+                    v-model="ch_pageData.fillDept"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="8">
+                <el-form-item label="参与人部门领导:">
+                  <el-input
+                    style="width: 100%"
+                    placeholder="请填写"
+                    v-model="ch_pageData.fillLeader"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="电话:">
+                  <el-input
+                    style="width: 100%"
+                    placeholder="请填写电话"
+                    v-model="ch_pageData.fillTel"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="邮箱:">
+                  <el-input
+                    style="width: 100%"
+                    placeholder="请填写邮箱"
+                    v-model="ch_pageData.fillMail"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </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>
+  </div>
+</template>
+
+<script>
+import ProcessHeader from "../../components/ProcessHeader";
+import ProcessFooter from "../../components/ProcessFooter";
+import ProcessTitle from "../../components/ProcessTitle";
+import {startProcess, saveTaskFirst, completeTask, inboundLiaisonDetail } from '@/api/process.js'
+
+export default {
+  components: {
+    ProcessHeader,
+    ProcessFooter,
+    ProcessTitle
+  },
+  name: "bzchStep3",
+  data() {
+    return {
+      active: '1',
+
+      ch_pageData: {},
+      ch_rules: {},
+
+      detailData: [],
+      loading: false,
+
+
+      isSubmit: false,
+      saveLoading: false,
+
+      taskIds: this.$route.query.taskIds,
+      pId: this.$route.query.prcId,
+    }
+  },
+  computed: {
+    listNoDataText() {
+      return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
+    }
+  },
+  created() {
+    this.processTable()
+    this.getData()
+  },
+  methods: {
+    // 右上标签页面切换
+    handleTabs(name) {
+      this.active = name
+    },
+    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 => {
+      })
+    },
+
+    getData() {
+      const params = {
+        taskIds: this.taskIds,
+        pId: this.pId,
+      }
+      inboundLiaisonDetail(params).then(res => {
+        const processForm = JSON.parse(res.mesg)
+        this.getFormFieldList(processForm)
+      })
+    },
+    getFormFieldList (item) {
+      this.$nextTick(() => {
+        this.rh_pageData = JSON.parse(JSON.stringify(item)).rh_pageData
+        // this.rh_pageData.comityFileNum = this.fileTextList
+      })
+    },
+    // 保存按钮
+    handleSave() {
+    },
+    // 提交按钮
+    handleSubmit() {
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+@import '~@/assets/styles/style';
+
+.bzchStep3 {
+  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-left: 30px;
+    padding-top: 15px;
+
+    .el-divider--horizontal {
+      margin-top: 0px;
+    }
+
+    /deep/ .el-table__body-wrapper {
+      height: auto !important;
+    }
+
+    /deep/ .el-textarea__inner {
+      font-family: inherit;
+    }
+
+    /deep/ .el-table th {
+      padding: 0px;
+    }
+  }
+}
+</style>

src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue

@@ -0,0 +1,376 @@
+<template>
+  <div class="bzchStep4">
+    <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="ch_pageData" :model="ch_pageData" :rules="ch_rules" label-width="auto">
+            <el-row :gutter="24">
+              <el-col :span="8">
+                <el-form-item label="会议名称:">
+                  {{ ch_pageData.meetingName || '-' }}
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="主办单位:">
+                  {{ ch_pageData.primaryUnit || '-' }}
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24">
+              <el-col :span="8">
+                <el-form-item label="协会名称:">
+                  {{ ch_pageData.associaName || '-' }}
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="会议时间:">
+                  {{ ch_pageData.meetingTime || '-' }}
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24">
+              <el-col :span="8">
+                <el-form-item label="会议地点:">
+                  {{ ch_pageData.meetingPlace || '-' }}
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="费用标准:">
+                  {{ ch_pageData.feeStand || '-' }}
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24">
+              <el-col :span="8">
+                <el-form-item label="费用列支:">
+                  {{ ch_pageData.feeKind || '-' }}
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="上传附件:" prop="uploadFile">
+                  <el-upload></el-upload>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24">
+              <el-col :span="8">
+                <el-form-item label="类别:">
+                  {{ ch_pageData.sort || '-' }}
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-form-item label="议题:">
+              <el-table
+                class="meeting_table"
+                :data="ch_pageData.meetingTable"
+                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="index" width="50" align="center"/>
+                <el-table-column label="议题" align="center" prop="ch_pageData.meetingTable.meetingTheme"/>
+              </el-table>
+            </el-form-item>
+            <el-form-item label="入会人员:">
+              <el-table
+                :data="ch_pageData.myPartRole"
+                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="index" width="50" align="center"/>
+                <el-table-column
+                  v-model="ch_pageData.myPartRole.fillPeople"
+                  align="center"
+                  label="人员">
+                </el-table-column>
+                <el-table-column
+                  v-model="ch_pageData.myPartRole.fillUnit"
+                  align="center"
+                  label="单位">
+                </el-table-column>
+                <el-table-column
+                  v-model="ch_pageData.myPartRole.fillDept"
+                  align="center"
+                  label="部门">
+                </el-table-column>
+                <el-table-column
+                  v-model="ch_pageData.myPartRole.fillTel"
+                  align="center"
+                  label="电话">
+                </el-table-column>
+                <el-table-column
+                  v-model="ch_pageData.myPartRole.fillMail"
+                  align="center"
+                  label="邮箱">
+                </el-table-column>
+              </el-table>
+            </el-form-item>
+          </el-form>
+        </div>
+        <el-collapse accordion>
+          <el-collapse-item title="回执说明">
+            <div style="margin: 10px 0;">
+              <el-input
+                type="textarea"
+                :rows="3"
+                resize="none"
+                placeholder="请输入意见"
+                v-model="textarea">
+              </el-input>
+            </div>
+          </el-collapse-item>
+        </el-collapse>
+      </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>
+  </div>
+</template>
+
+<script>
+import ProcessHeader from "../../components/ProcessHeader";
+import ProcessFooter from "../../components/ProcessFooter";
+import ProcessTitle from "../../components/ProcessTitle";
+import { startProcess, saveTaskFirst,completeTask, inboundLiaisonDetail } from '@/api/process.js'
+export default {
+  components: {
+    ProcessHeader,
+    ProcessFooter,
+    ProcessTitle
+  },
+  name: "bzchStep4",
+  data() {
+    return {
+      active: '1',
+
+      ch_pageData: {
+        myPartRole: [],
+      },
+      ch_rules: {},
+      textarea: '',
+
+      isSubmit: false,
+      saveLoading: false,
+
+      detailData: [],
+      loading: false,
+
+    }
+  },
+  computed: {
+    listNoDataText() {
+      return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
+    }
+  },
+  created() {
+    this.processTable()
+    this.getData()
+  },
+  methods: {
+    // 右上标签页面切换
+    handleTabs(name) {
+      this.active = name
+    },
+    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 => {
+      })
+    },
+
+    getData() {
+      const params = {
+        taskIds: this.taskIds,
+        pId: this.pId,
+      }
+      inboundLiaisonDetail(params).then(res => {
+        const processForm = JSON.parse(res.mesg)
+        this.getFormFieldList(processForm)
+      })
+    },
+    getFormFieldList (item) {
+      this.$nextTick(() => {
+        this.ch_pageData = JSON.parse(JSON.stringify(item)).ch_pageData
+        // this.ch_pageData.comityFileNum = this.fileTextList
+      })
+    },
+    // 保存按钮
+    handleSave() {
+    },
+    // 提交按钮
+    handleSubmit() {
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+@import '~@/assets/styles/style';
+.bzchStep4 {
+  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-top: 15px;
+    padding-left: 30px;
+    .el-divider--horizontal {
+      margin-top: 0px;
+    }
+    /deep/.el-table__body-wrapper {
+      height: auto!important;
+    }
+    /deep/.el-textarea__inner {
+      font-family: inherit;
+    }
+    /deep/.el-table th {
+      padding: 0px;
+    }
+  }
+}
+</style>
+

src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue

@@ -0,0 +1,370 @@
+<template>
+  <div class="bzchStep5">
+    <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="ch_pageData" :model="ch_pageData" :rules="ch_rules" label-width="auto">
+            <el-row :gutter="24">
+              <el-col :span="8">
+                <el-form-item label="会议名称:">
+                  {{ ch_pageData.meetingName || '-' }}
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="主办单位:">
+                  {{ ch_pageData.primaryUnit || '-' }}
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24">
+              <el-col :span="8">
+                <el-form-item label="协会名称:">
+                  {{ ch_pageData.associaName || '-' }}
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="会议时间:">
+                  {{ ch_pageData.meetingTime || '-' }}
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24">
+              <el-col :span="8">
+                <el-form-item label="会议地点:">
+                  {{ ch_pageData.meetingPlace || '-' }}
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="费用标准:">
+                  {{ ch_pageData.feeStand || '-' }}
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24">
+              <el-col :span="8">
+                <el-form-item label="费用列支:">
+                  {{ ch_pageData.feeKind || '-' }}
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="上传附件:" prop="uploadFile">
+                  <el-upload></el-upload>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24">
+              <el-col :span="8">
+                <el-form-item label="类别:">
+                  {{ ch_pageData.sort || '-' }}
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-form-item label="议题:">
+              <el-table
+                class="meeting_table"
+                :data="ch_pageData.meetingTable"
+                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="index" width="50" align="center"/>
+                <el-table-column
+                  label="议题"
+                  align="center"
+                  prop="ch_pageData.meetingTable.meetingTheme">
+                  <template slot-scope="scope">
+                    <el-input v-model="scope.row.meetingTheme"/>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </el-form-item>
+            <el-form-item label="入会人员:">
+              <el-table
+                :data="ch_pageData.myPartRole"
+                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="index" width="50" align="center"/>
+                <el-table-column
+                  v-model="ch_pageData.myPartRole.fillPeople"
+                  align="center"
+                  label="人员">
+                </el-table-column>
+                <el-table-column
+                  v-model="ch_pageData.myPartRole.fillUnit"
+                  align="center"
+                  label="单位">
+                </el-table-column>
+                <el-table-column
+                  v-model="ch_pageData.myPartRole.fillDept"
+                  align="center"
+                  label="部门">
+                </el-table-column>
+                <el-table-column
+                  v-model="ch_pageData.myPartRole.fillTel"
+                  align="center"
+                  label="电话">
+                </el-table-column>
+                <el-table-column
+                  v-model="ch_pageData.myPartRole.fillMail"
+                  align="center"
+                  label="邮箱">
+                </el-table-column>
+              </el-table>
+            </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>
+  </div>
+</template>
+
+<script>
+import ProcessHeader from "../../components/ProcessHeader";
+import ProcessFooter from "../../components/ProcessFooter";
+import ProcessTitle from "../../components/ProcessTitle";
+import { startProcess, saveTaskFirst,completeTask, inboundLiaisonDetail } from '@/api/process.js'
+export default {
+  components: {
+    ProcessHeader,
+    ProcessFooter,
+    ProcessTitle
+  },
+  name: "bzchStep5",
+  data() {
+    return {
+      active: '1',
+
+      ch_pageData: {
+        myPartRole: [],
+      },
+      ch_rules: {},
+      textarea: '',
+
+      isSubmit: false,
+      saveLoading: false,
+
+      detailData: [],
+      loading: false,
+
+    }
+  },
+  computed: {
+    listNoDataText() {
+      return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
+    }
+  },
+  created() {
+    this.processTable()
+    this.getData()
+  },
+  methods: {
+    // 右上标签页面切换
+    handleTabs(name) {
+      this.active = name
+    },
+    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 => {
+      })
+    },
+
+    getData() {
+      const params = {
+        taskIds: this.taskIds,
+        pId: this.pId,
+      }
+      inboundLiaisonDetail(params).then(res => {
+        const processForm = JSON.parse(res.mesg)
+        this.getFormFieldList(processForm)
+      })
+    },
+    getFormFieldList (item) {
+      this.$nextTick(() => {
+        this.ch_pageData = JSON.parse(JSON.stringify(item)).ch_pageData
+        // this.ch_pageData.comityFileNum = this.fileTextList
+      })
+    },
+    // 保存按钮
+    handleSave() {
+    },
+    // 提交按钮
+    handleSubmit() {
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+@import '~@/assets/styles/style';
+.bzchStep5 {
+  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-top: 15px;
+    padding-left: 30px;
+    .el-divider--horizontal {
+      margin-top: 0px;
+    }
+    /deep/.el-table__body-wrapper {
+      height: auto!important;
+    }
+    /deep/.el-textarea__inner {
+      font-family: inherit;
+    }
+    /deep/.el-table th {
+      padding: 0px;
+    }
+  }
+}
+</style>
+

src/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue

@@ -1,192 +1,78 @@
-<!--  参与外部标准制修订流程-->
+<!-- 加入标准化协会信息备案流程-->
 <template>
-  <div class="wbbz-step1">
+  <div class="jrbzhxh-step1">
     <ProcessHeader>
-      <template slot="proName">参与外部标准制修订信息提报流程</template>
+      <template slot="proName">参与外部标准制修订信息备案流程</template>
       <template slot="proNode">发起流程</template>
     </ProcessHeader>
-    <div class="headerTabs">
+    <div class="content">
-      <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
+      <ProcessTitle>
-      <div class="headerTabsItem" :class="active === '2' ? 'active' : '' " @click="handleTabs('2')">人员信息</div>
+        <template slot="title">人员信息</template>
-    </div>
+      </ProcessTitle>
-    <div class="content" v-show="active === '1'">
+      <div class="block" style="padding-top: 20px; height: 100%">
-      <div>
+        <el-timeline>
-        <el-form
+          <el-form
-          ref="wbbzForm"
+            ref="Form"
-          :model="wbbzform"
+            :model="roleForm"
-          :rules="formRules"
+            :rules="roleFormRules"
-          class="label-input-form"
+            class="label-input-form">
-          label-width="210px"
+            <el-timeline-item timestamp="发起流程" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
-        >
+              <el-card>
-          <ProcessTitle>
+                <el-form-item prop="prcCreateUserName" style="margin-bottom: 0">
-            <template slot="title">基础信息</template>
+                  <h4>标准法规工程师</h4>
-          </ProcessTitle>
+                  <div style="margin-top: 10px;width: 300px;">
-         <div class="prc-content-border" v-if="foldFormFlag">
+                    <el-input v-model="roleForm.prcCreateUser" style="display: none;"></el-input>
-           <el-row :gutter="24">
+                    <el-input v-model="roleForm.prcCreateUserName" placeholder="流程发起人"
-             <el-col :gutter="24">
+                              disabled></el-input>
-               <el-form-item label="提报单位" prop="reportingUnit" class="add-form-item ">
+                  </div>
-                 <el-input
+                </el-form-item>
-                   v-model="wbbzform.reportingUnit"
+              </el-card>
-                   placeholder="请输入提报单位"
+            </el-timeline-item>
-                   clearable>
+            <el-timeline-item timestamp="选择标准化员进行入会信息填报" placement="top"
-                 </el-input>
+                              :color="roleForm.dockUser ? '#66b1ff' : ''" >
-               </el-form-item>
+              <el-card>
-               <el-form-item label="协会名称" prop="associationName" class="add-form-item ">
+                <el-form-item prop="dockUserName" style="margin-bottom: 0">
-                 <div class="form-select">
+                  <h4>标准化员</h4>
-                   <el-select v-model="wbbzform.associationName" placeholder="请选择协会名称">
+                  <div style="margin-top: 10px;width: 300px;">
-                     <el-option
+                    <el-input v-model="roleForm.dockUser" style="display: none;"></el-input>
-                       v-for="item in associationOptions"
+                    <el-input v-model="roleForm.dockUserName" placeholder="选择标准化员"
-                       :key="item.value"
+                              @click.native="choiceZRRS">
-                       :label="item.label"
+                    </el-input>
-                       :value="item.value">
+                  </div>
-                     </el-option>
+                </el-form-item>
-                   </el-select>
+              </el-card>
-                   <el-select v-model="wbbzform.committee" placeholder="请选择分标委">
+            </el-timeline-item>
-                     <el-option
+            <el-timeline-item timestamp="审批" placement="top"
-                       v-for="item in associationOptions"
+                              :color="roleForm.directorUser ? '#66b1ff' : ''">
-                       :key="item.value"
+              <el-card>
-                       :label="item.label"
+                <el-form-item prop="directorUserName" style="margin-bottom: 0">
-                       :value="item.value">
+                  <h4>标准法规部部长</h4>
-                     </el-option>
+                  <div style="margin-top: 10px;width: 300px;">
-                   </el-select>
+                    <el-input v-model="roleForm.directorUser" style="display: none;"></el-input>
-                   <el-select v-model="wbbzform.workingGroup" placeholder="请选择工作组">
+                    <el-input v-model="roleForm.directorUserName" placeholder="选择标准法规部部长"
-                     <el-option
+                              @click.native="choiceZRR('directorUser', '选择标准法规部部长', roleForm.directorUser)"></el-input>
-                       v-for="item in associationOptions"
+                  </div>
-                       :key="item.value"
+                </el-form-item>
-                       :label="item.label"
+              </el-card>
-                       :value="item.value">
+            </el-timeline-item>
-                     </el-option>
+          </el-form>
-                   </el-select>
+        </el-timeline>
-                 </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
+    <Role-tree
-    </div>
+      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
@@ -213,103 +99,109 @@ export default {
   },
   data() {
     return {
-      //切换tab
-      active: "1",
-      foldFormFlag: true,
       isSubmit: false,
       saveLoading: false,
-      uploadFileListPath: "api/att/attFile/upload", // 上传的地址
+      modalshowflag: false, // drawer开关
-      fileInfoList: [], // 上传的附件
+      modalshowflag2: false,
-      wbbzform: {
+      nodeList2: [],
-        reportingUnit:'',
+      drawerTitle: "", //drawer标题
-        associationName: '',
+      nodeList: [],
-        committee:'',
+      roleForm: {
-        workingGroup:'',
+        prcCreateUserName: this.$store.getters.userInfo.userName,
-        personnelRole:'',
+        prcCreateUser: this.$store.getters.userInfo.userId,
-        membershipTime:'',
+        dockUser: "",
+        directorUser: "",
+        dockUserName: "",
+        directorUserName: ""
+      },
+      roleFormRules: {
+        dockUserName: [
+          {required: true, message: "请选择标准化员", trigger: "change"}
+        ],
+        directorUserName: [
+          {required: true, message: "请选择标准法规部部长", trigger: "change"}
+        ]
       },
-      formRules: {},
-      participantsData: [], //参与人表格信息
-      associationData: [], //协会表格信息
-      associationOptions: [{
-        value: '选项1',
-        label: '1'
-      }, {
-        value: '选项2',
-        label: '2'
-      },{
-        value: '选项3',
-        label: '3'
-      }],
     };
   },
-  methods: {
+  methods:{
-    handleTabs(type) {
+    choiceZRR(type, title, id) {
-      this.active = type;
+      this.nodeList = [];
+      this.nodeList.push(id);
+      this.type = type;
+      this.drawerTitle = title;
+      this.modalshowflag = true;
     },
-    foldForm() {
+    choiceZRRS() {
-      this.foldFormFlag = !this.foldFormFlag
+      this.nodeList2 = [];
+      if (this.roleForm.dockUser.length > 0) {
+        this.nodeList2 = this.roleForm.dockUser.split(",");
+      }
+      this.modalshowflag2 = true;
     },
-    handleSave() {},
+    checkedRole(data) {
-    handleSubmit() {
+      if (this.type === "dockUser") {
-      console.log(this.wbbzform);
+        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;
     },
-    handleSelectionChange1(){
+    checkedRole2(data) {
-
+      var idList = "";
-    },
+      var nameList = "";
-    handleSelectionChange2(){
+      data.forEach(item => {
-
+        if (nameList.length > 0) {
-    },
+          nameList += ",";
-    // 删除上传的文件
+          idList += ",";
-    delFileInfo(file, fileList) {
-      this.fileInfoList.forEach((item, index) => {
-        if (item.name === file.name || item.id === file.id ) {
-          this.fileInfoList.splice(index,1)
         }
-      })
+        idList += item.id;
+        nameList += item.name;
+      });
+      this.roleForm.dockUser = idList;
+      this.roleForm.dockUserName = nameList;
     },
-    // 上传文件成功回调
+    handleSubmit(){
-    uploadBackSuccess(res, file, fileList) {
+      var json = this.roleForm
-      if (res.ok) {
+      this.$refs["Form"].validate((valid) => {
-        this.fileInfoList.push(res.data)
+        if (valid) {
-        this.$message.success("上传成功");
+          this.isSubmit = true
-      } else {
+          this.$http.get("lawss/activiti/startProcess", {type: "15"}, {
-        this.$message.error(res.message);
+            _this: this
-        fileList.pop();
+          }, 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(){
-    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 lang="less" scoped>
-.wbbz-step1 {
+.jrbzhxh-step1 {
   height: 100%;
   position: relative;
   .content {

src/pages/processCenter/pages/creatProcess/cywbbzzxd/step3.vue

@@ -0,0 +1,419 @@
+<!--  参与外部标准制修订流程-->
+<template>
+  <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 === '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 :span="12">
+                <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="standNumber" class="add-form-item ">
+                  <el-input
+                    v-model="wbbzform.standNumber"
+                    placeholder="请输入标准编号"
+                    clearable>
+                  </el-input>
+                </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>
+                  </div>
+                </el-form-item>
+                <el-form-item label="参与人" prop="standNumber" class="add-form-item ">
+                  <el-input
+                    v-model="wbbzform.standNumber"
+                    placeholder="请选择参与人"
+                    clearable>
+                  </el-input>
+                </el-form-item>
+                <el-form-item label="标准制定机构" prop="standNumber" class="add-form-item ">
+                  <el-input
+                    v-model="wbbzform.standNumber"
+                    placeholder="请选择标准制定机构"
+                    clearable>
+                  </el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="参与时间" prop="reportingUnit" class="add-form-item form-item-disabled">
+                  <el-date-picker
+                    v-model="wbbzform.membershipTime"
+                    type="date"
+                    placeholder="请选择入会时间">
+                  </el-date-picker>
+                </el-form-item>
+                <el-form-item label="标准名称" prop="standName" class="add-form-item ">
+                  <el-input
+                    v-model="wbbzform.standName"
+                    placeholder="请输入标准名称"
+                    clearable>
+                  </el-input>
+                </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>
+                  </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>
+                  </div>
+                </el-form-item>
+                <el-form-item label="标准(拟)发布时间" prop="reportingUnit" class="add-form-item form-item-disabled">
+                  <el-date-picker
+                    v-model="wbbzform.membershipTime"
+                    type="date"
+                    placeholder="请选择标准(拟)发布时间">
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </div>
+          <el-button style="width: 100%" :icon="foldFormFlag ? 'el-icon-caret-top' : 'el-icon-caret-bottom'" @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="addProject">添加</el-button>
+            <el-button plain class="common-button-primary" size="mini" @click="deleteProject">批量删除</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="projectNumber"
+            label="项目编号"
+            align="center">
+            <template slot-scope="scope">
+               <el-input
+                 v-model="scope.row.projectNumber"
+                 placeholder="请输入项目编号"
+               >
+               </el-input>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="projectName"
+            label="项目名称"
+            align="center">
+            <template slot-scope="scope">
+              <el-input
+                v-model="scope.row.projectName"
+                placeholder="请输入项目名称"
+              >
+              </el-input>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="expenses"
+            label="费用支出项"
+            align="center">
+            <template slot-scope="scope">
+              <el-input
+                v-model="scope.row.expenses"
+                placeholder="请输入费用支出项"
+              >
+              </el-input>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="costBudget"
+            label="费用预算"
+            align="center">
+            <template slot-scope="scope">
+              <el-input
+                v-model="scope.row.costBudget"
+                placeholder="请输入费用预算"
+              >
+              </el-input>
+            </template>
+          </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
+      :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: "cywbbzzxdStep3",
+  components: {
+    ProcessHeader,
+    ProcessTitle,
+    ProcessFooter
+  },
+  data() {
+    return {
+      //切换tab
+      active: "1",
+      foldFormFlag: true,
+      isSubmit: false,
+      saveLoading: false,
+      loading: false,
+      detailData: [],  //审批历史信息
+      wbbzform: {
+        reportingUnit:'',
+        associationName: '',
+        committee:'',
+        workingGroup:'',
+        personnelRole:'',
+        membershipTime:'',
+      },
+      formRules: {},
+      participantsData: [{
+        projectNumber: '',
+        projectName: '',
+        expenses: '',
+        costBudget:'',
+      }], //参与人表格信息
+      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 => {
+      });
+    },
+    handleTabs(type) {
+      this.active = type;
+    },
+    foldForm() {
+      this.foldFormFlag = !this.foldFormFlag
+    },
+    handleSave() {},
+    handleSubmit() {
+      console.log(this.wbbzform);
+    },
+    //添加按鈕事件
+    addProject(){
+       var list = {
+         projectNumber: this.projectNumber,
+         projectName: this.projectName,
+         expenses: this.expenses,
+         costBudget: this.costBudget
+       }
+      this.participantsData.push(list)
+    },
+    //批量刪除按鈕事件
+    deleteProject(){
+
+    },
+    handleSelectionChange1(data){
+
+    },
+  },
+  computed: {
+    listNoDataText() {
+      return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
+    }
+  },
+};
+</script>
+
+<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;
+    }
+    .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>

src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue

@@ -72,6 +72,7 @@
                     <el-date-picker
                       v-model="wbbzform.membershipTime"
                       type="date"
+                      value-format="yyyy-MM-dd"
                       placeholder="请选择入会时间">
                     </el-date-picker>
                   </div>
@@ -97,7 +98,7 @@
               </el-col>
             </el-row>
           </div>
-          <el-button style="width: 100%" icon="el-icon-caret-top" @click="foldForm">{{ foldFormFlag ? '隐藏基础信息' : '展开基础信息' }}</el-button>
+          <el-button style="width: 100%" :icon="foldFormFlag ? 'el-icon-caret-top' : 'el-icon-caret-bottom'" @click="foldForm">{{ foldFormFlag ? '隐藏基础信息' : '展开基础信息' }}</el-button>
         </el-form>
         <ProcessTitle>
           <template slot="title">参与人信息</template>
@@ -135,13 +136,13 @@
             align="center">
           </el-table-column>
           <el-table-column
-            prop="department"
+            prop="institutionName"
             label="所在部门"
             width="200"
             align="center">
           </el-table-column>
           <el-table-column
-            prop="contact"
+            prop="email"
             label="联系方式"
             width="350"
             align="center">
@@ -187,19 +188,53 @@
             prop="contactPerson"
             label="协会联络人"
             align="center">
+            <template slot-scope="scope">
+              <el-input
+                v-model="scope.row.contactPerson"
+                clearable
+                placeholder="请输入协会联络人">
+              </el-input>
+            </template>
           </el-table-column>
           <el-table-column
             prop="telephone"
             label="电话"
             align="center">
+            <template slot-scope="scope">
+              <el-input
+                clearable
+                v-model="scope.row.telephone"
+                placeholder="请输入电话">
+              </el-input>
+            </template>
           </el-table-column>
           <el-table-column
             prop="mailbox"
             label="邮箱"
             align="center">
+            <template slot-scope="scope">
+              <el-input
+                v-model="scope.row.mailbox"
+                clearable
+                placeholder="请输入邮箱">
+              </el-input>
+            </template>
           </el-table-column>
         </el-table>
       </div>
+      <el-collapse accordion>
+        <el-collapse-item title="回执说明">
+          <div style="margin: 10px 0;">
+            <el-input
+              type="textarea"
+              :rows="3"
+              resize="none"
+              placeholder="请输入意见"
+              v-model="commentText">
+            </el-input>
+          </div>
+        </el-collapse-item>
+      </el-collapse>
     </div>
     <div class="content" v-show="active === '3'">
       <div class="flow-list">
@@ -294,6 +329,7 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessTitle from "process/components/ProcessTitle";
 import ProcessFooter from "process/components/ProcessFooter";
+import { inboundLiaisonDetail } from "api/process";
 
 export default {
   name: "jrbzhxhStep2",
@@ -306,6 +342,7 @@ export default {
     return {
       //切换tab
       active: "1",
+      commentText: '', // 意见
       foldFormFlag: true,
       isSubmit: false,
       saveLoading: false,
@@ -316,6 +353,9 @@ export default {
       nodeList: [],
       uploadFileListPath: "api/att/attFile/upload", // 上传的地址
       fileInfoList: [], // 上传的附件
+      userId: this.$store.getters.userInfo.userId,
+      taskIds: this.$route.query.taskIds,
+      dlFlag: '', // 1为通过 0为不通过
       wbbzform: {
         reportingUnit:'',
         associationName: '',
@@ -323,11 +363,12 @@ export default {
         workingGroup:'',
         personnelRole:'',
         membershipTime:'',
+        fileName:'',
         participantsData: [{
-          workPeople: '', //参与人
+          name: '', //参与人
           duties: '', //职务
-          department: '', //所在部门
+          institutionName: '', //所在部门
-          contact: '', //联系方式
+          email: '', //联系方式
           tenure:'', //任期
           account:'', //账户
           password:'', //密码
@@ -338,7 +379,13 @@ export default {
           mailbox:'', //邮箱
         }],
       },
-      formRules: {},
+      selectList2: [],
+      selectList1: [],
+      formRules: {
+        reportingUnit: [
+          { required: true, message: "请输入提报单位", trigger: "blur" }
+        ],
+      },
       participantsData: [], //参与人表格信息
       associationData: [], //协会表格信息
       detailData: [], //审批历史信息
@@ -369,6 +416,35 @@ export default {
       }, e => {
       });
     },
+    getData() {
+      return new Promise((resolve, reject) => {
+        inboundLiaisonDetail({
+          taskIds: this.$route.query.taskIds,
+          pId: this.$route.query.prcId
+        }).then(res => {
+          if (res) {
+            const processForm = JSON.parse(res.mesg);
+            this.getFormFieldList(processForm);
+          }
+        }).catch(e => {
+        });
+      });
+    },
+    /**
+     * @description: 动态表单读取
+     */
+    getFormFieldList(item) {
+      console.log(item);
+      this.$nextTick(() => {
+        if(!item.directorUser){
+          this.wbbzform = JSON.parse(JSON.stringify(item));
+          this.associationData = item.associationData
+          this.participantsData = item.participantsData
+        }else{
+
+        }
+      });
+    },
     choiceZRRS(row, index) {
         this.selectedId = index;
         this.drawerTitle = "选择责任人";
@@ -378,16 +454,25 @@ export default {
         this.modalshowflag = true;
       },
     checkedRole(data){
-      console.log(data);
+      if(this.participantsData.length > 1){
-      this.participantsData.forEach(item => {
+        let parList = data
-        console.log(item.index);
+        this.participantsData.forEach(item =>{
-        console.log(this.selectedId);
+          parList.forEach(items => {
-        if (item.index === this.selectedId) {
+            if(items.name === item.workPeople){
-              item.workPeople = data[0].name;
+                this.$message.warning('请勿重复添加参与人')
-              item.workPeopleId = data[0].id;
+                return
+            }else{
+              console.log(items);
             }
-      });
+          })
-      this.participantsData = JSON.parse(JSON.stringify(this.participantsData));
+        })
+      }else{
+        this.participantsData = data
+        this.participantsData.forEach(item => {
+          this.$set(item, "workPeople", item.name)
+        });
+        this.participantsData = JSON.parse(JSON.stringify(this.participantsData));
+      }
     },
 
     handleTabs(type) {
@@ -398,19 +483,64 @@ export default {
     },
     //不备案
     handleRecord(){
+      this.recordLoading = true
+      this.dlFlag = '0',
+      this.wbbzform.commentText = this.commentText;
+      this.wbbzform.participantsData = this.participantsData
+      this.wbbzform.associationData = this.associationData
+      var json = JSON.stringify( this.wbbzform)
+      this.$http.post("lawss/activiti/completeTask", {
+        taskIds: this.taskIds,
+        userId: this.userId,
+        json: json
+      }, {
+        _this: this
+      }, res => {
+        if (res.success) {
+          this.$message.success(res.message);
+          this.$router.push("/processCenter");
+        }
+        this.recordLoading = false
+      }, e => {
 
+      });
     },
     //流程保存
     handleSave() {},
     //流程提交
     handleSubmit() {
-      console.log(this.wbbzform);
+      this.isSubmit = true
-    },
+      this.wbbzform.dlFlag = '1',
-    handleSelectionChange1(){
+      this.wbbzform.passUser = this.$store.getters.userInfo.userId,
+      this.wbbzform.commentText = this.commentText;
+      this.wbbzform.participantsData = this.participantsData
+      this.wbbzform.associationData = this.associationData
+      var json = JSON.stringify( this.wbbzform)
+      this.$http.post("lawss/activiti/completeTask", {
+        taskIds: this.taskIds,
+        userId: this.userId,
+        json: json
+      }, {
+        _this: this
+      }, res => {
+        if (res.success) {
+          this.$message.success(res.message);
+          this.$router.push("/processCenter");
+        }
+        this.isSubmit = false
+      }, e => {
 
+      });
     },
-    handleSelectionChange2(){
+    handleSelectionChange1(data){
-
+      for (let i = 0; i < data.length; i++){
+        this.selectList1.push(data[i].account)
+      }
+    },
+    handleSelectionChange2(data){
+      for (let i = 0; i < data.length; i++){
+        this.selectList2.push(data[i].id)
+      }
     },
     //添加参与人信息
     addPeople(){
@@ -419,11 +549,39 @@ export default {
     },
     //批量删除参与人信息
     deletePeople(){
-
+      if(this.selectList1.length < 1){
+        this.$message.warning('请选择一条数据进行删除')
+      }else{
+        this.$confirm('您确认删除这些数据？', '提示', {
+          confirmButtonText: "确认",
+          confirmButtonClass: "common-button-primary",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          let exits = [];
+          this.selectList1.map(item => {
+            let index;
+            index = this.participantsData.findIndex(items => {
+              return items.account === item;
+            });
+            if (index > -1) {
+              this.participantsData.splice(index, 1);
+            }
+            exits.push(item);
+          });
+          this.selectList1 = [];
+        }).catch(() => {
+        });
+      }
     },
     //添加协会信息
     addSociety(){
-
+      var list = {
+        contactPerson: this.contactPerson,
+        telephone: this.telephone,
+        mailbox: this.mailbox,
+      }
+      this.associationData.push(list)
     },
     //批量删除协会信息
     deleteSociety(){
@@ -449,6 +607,7 @@ export default {
     },
     // 上传之前钩子
     beforeUpload(file) {
+      console.log(file);
       var filename = file.name;
       var index1 = filename.lastIndexOf(".");
       var index2 = filename.length;
@@ -474,6 +633,10 @@ export default {
       return true;
     },
   },
+  mounted() {
+    this.getData()
+    this.processTable()
+  },
   computed: {
     listNoDataText() {
       return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";

src/pages/processCenter/pages/creatProcess/jrbzhxh/step3.vue

@@ -0,0 +1,678 @@
+<!--  加入标准化协会信息备案流程-->
+<template>
+  <div class="jrbzhxh-step3">
+    <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="请输入提报单位"
+                    readonly>
+                  </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 class="file-box" v-if="fileList.length > 0">
+                    <p v-for="item in fileList"
+                       :key="item.id"> {{ item.name }}
+                      <i
+                        title="下载"
+                        @click="downloadFile(item.id)"
+                        class="icon-download"
+                        v-btn-permission="''"
+                      />
+                      <i
+                        title="下载带水印"
+                        @click="downloadFileByWater(item.id, item.name)"
+                        class="icon-download2"
+                        v-btn-permission="''"
+                      />
+                    </p>
+                  </div>
+                  <div v-else>
+                    暂无数据
+                  </div>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </div>
+          <el-button style="width: 100%" :icon=" foldFormFlag ? 'el-icon-caret-top': 'el-icon-caret-bottom'" @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'}"
+                  row-key="id">
+          <el-table-column type="selection" width="55" align="center"/>
+          <el-table-column
+            prop="workPeople"
+            label="参与人"
+            width="150"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="duties"
+            label="职务"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="institutionName"
+            label="所在部门"
+            width="200"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="email"
+            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="addPeople">添加</el-button>-->
+            <!--            <el-button plain class="common-button-primary" size="mini" @click="deletePeople">批量删除</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'}"
+                  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>
+      <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 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-back
+      show-transfer
+      show-submit
+      :submitLoading="isSubmit"
+      :transfer-loading="isTransfer"
+      :saveLoading="saveLoading"
+      :approval="true"
+      @back="beforeBack"
+      @transfer="handleTransfer"
+      @submit="handleSubmit"
+    >
+    </ProcessFooter>
+    <Role-tree
+      check-box
+      :is-title="drawerTitle"
+      :is-visible.sync="modalshowflag"
+      @checkedRole="checkedRole"
+      :nodeList="nodeList"
+    ></Role-tree>
+    <!-- 福田全公司选人解决方案 -->
+    <Role-tree
+      check-box
+      :is-title="drawerTitle"
+      :is-visible.sync="drawerModal"
+      @checkedRole="checkedTransferRole"
+      :nodeList="nodeList"
+    ></Role-tree>
+  </div>
+</template>
+
+<script>
+import ProcessHeader from "../../components/ProcessHeader";
+import ProcessTitle from "process/components/ProcessTitle";
+import ProcessFooter from "process/components/ProcessFooter";
+import { changeAssigneeNew,inboundLiaisonDetail } from "api/process";
+
+export default {
+  name: "jrbzhxhStep3",
+  components: {
+    ProcessHeader,
+    ProcessTitle,
+    ProcessFooter
+  },
+  data() {
+    return {
+      //切换tab
+      active: "1",
+      foldFormFlag: true,
+      isSubmit: false,
+      isTransfer: false,
+      saveLoading: false,
+      loading: false,
+      modalshowflag: false,
+      drawerModal: false,
+      drawerTitle: '',
+      nodeList: [],
+      fileList:[],
+      commentText: '',
+      uploadFileListPath: "api/att/attFile/upload", // 上传的地址
+      fileInfoList: [], // 上传的附件
+      userId: this.$store.getters.userInfo.userId,
+      taskIds: this.$route.query.taskIds,
+      signFlag:'',
+      wbbzform: {
+        reportingUnit:'',
+        associationName: '',
+        committee:'',
+        workingGroup:'',
+        personnelRole:'',
+        membershipTime:'',
+        userId: this.$store.getters.userInfo.userId,
+        taskIds: this.$route.query.taskIds,
+        pId: this.$route.query.prcId,
+        participantsData: [{
+          name: '', //参与人
+          duties: '', //职务
+          institutionName: '', //所在部门
+          email: '', //联系方式
+          tenure:'', //任期
+          account:'', //账户
+          password:'', //密码
+        }],
+        associationData: [{
+          contactPerson: '', //协议联络人
+          telephone: '',  //电话
+          mailbox:'', //邮箱
+        }],
+      },
+      selectList2: [],
+      selectList1: [],
+      formRules: {},
+      participantsData: [], //参与人表格信息
+      associationData: [], //协会表格信息
+      detailData: [], //审批历史信息
+      selectedId: "",
+      associationOptions: [{
+        value: '选项1',
+        label: '1'
+      }, {
+        value: '选项2',
+        label: '2'
+      },{
+        value: '选项3',
+        label: '3'
+      }],
+    };
+  },
+  methods: {
+    //确认转办
+    checkedTransferRole (data) {
+      this.assigneeNewLoading = true
+      changeAssigneeNew({
+        taskId: this.$route.query.taskIds, // 任务id
+        assignee: data[0].id, // 被委托人
+        userId: this.$store.getters.userInfo.userId, // 委托人
+        pId: this.$route.query.prcId // 流程实例
+      }).then(res => {
+        this.isTransfer = false
+        if (res.success) {
+          this.drawerModal = false
+          this.$message.success('调整成功')
+          this.$router.push("/processCenter");
+          this.processNum()
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
+    },
+    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) {
+      if (this.participantsData.length > 1) {
+        let parList = data
+        this.participantsData.forEach(item => {
+          parList.forEach(items => {
+            if (items.name === item.workPeople) {
+              this.$message.warning('请勿重复添加参与人')
+              return
+            } else {
+              console.log(items);
+            }
+          })
+        })
+      } else {
+        this.participantsData = data
+        this.participantsData.forEach(item => {
+          this.$set(item, "workPeople", item.name)
+        });
+        this.participantsData = JSON.parse(JSON.stringify(this.participantsData));
+      }
+    },
+
+    handleTabs(type) {
+      this.active = type;
+    },
+    foldForm() {
+      this.foldFormFlag = !this.foldFormFlag
+    },
+    //不备案
+    handleRecord() {
+
+    },
+    getData() {
+      return new Promise((resolve, reject) => {
+        inboundLiaisonDetail({
+          taskIds: this.$route.query.taskIds,
+          pId: this.$route.query.prcId
+        }).then(res => {
+          if (res) {
+            const processForm = JSON.parse(res.mesg);
+            this.getFormFieldList(processForm);
+          }
+        }).catch(e => {
+        });
+      });
+    },
+    /**
+     * @description: 动态表单读取
+     */
+    getFormFieldList(item) {
+      console.log(item);
+      this.$nextTick(() => {
+        this.wbbzform = JSON.parse(JSON.stringify(item));
+        this.associationData = item.associationData
+        this.participantsData = item.participantsData
+      });
+    },
+    // 请求上传的文件信息
+    getFileInfo() {
+      this.$http.get("att/attFile/getMultiFileInfos", {
+        fileIds: this.fileIds
+      }, {
+        _this: this
+      }, res => {
+        this.$nextTick(() => {
+          res.data.map(item => {
+            // 赋值要回显的上传文件内容
+            this.fileList.push({
+              name: item.oldFileName,
+              uid: item.uid,
+              status: item.status,
+              id: item.id
+            });
+          });
+        });
+      }, e => {
+      });
+    },
+    /**
+     * @Description: 点击下载
+     */
+    downloadFile(attId) {
+      if (attId != null && attId !== "") {
+        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+      } else {
+        this.$message.error("请选择要下载的文件");
+      }
+    },
+    downloadFileByWater(attId, fileSuffix) {
+      let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
+      if (fileExtension !== "pdf" && fileExtension !== "PDF") {
+        this.$message.error("水印下载仅支持PDF,pdf格式文件");
+      } else {
+        if (attId != null && attId !== "") {
+          window.location.href = "/api/att/attFile/downloadFileForSarWaterMark?fileId=" + attId;
+        } else {
+          this.$message.error("请选择要下载的文件");
+        }
+      }
+    },
+    //流程转办
+    handleTransfer(){
+        this.drawerModal = true
+        this.drawerTitle = '转办处理人'
+        this.selectPeople = row
+    },
+    //流程提交
+    handleSubmit() {
+      this.isSubmit = true
+      this.wbbzform.signFlag = '1',
+      this.wbbzform.passUser = this.$store.getters.userInfo.userId,
+      this.wbbzform.commentText = this.commentText;
+      this.wbbzform.participantsData = this.participantsData
+      this.wbbzform.associationData = this.associationData
+      var json = JSON.stringify( this.wbbzform)
+      this.$http.post("lawss/activiti/completeTask", {
+        taskIds: this.taskIds,
+        userId: this.userId,
+        json: json
+      }, {
+        _this: this
+      }, res => {
+        if (res.success) {
+          this.$message.success(res.message);
+          this.$router.push("/processCenter");
+        }
+        this.isSubmit = false
+      }, e => {
+
+      });
+    },
+    //流程驳回
+    beforeBack(){
+      this.isSubmit = true
+      this.wbbzform.signFlag = '0',
+      this.wbbzform.passUser = this.$store.getters.userInfo.userId,
+      this.wbbzform.commentText = this.commentText;
+      this.wbbzform.participantsData = this.participantsData
+      this.wbbzform.associationData = this.associationData
+      var json = JSON.stringify( this.wbbzform)
+      this.$http.post("lawss/activiti/completeTask", {
+        taskIds: this.taskIds,
+        userId: this.userId,
+        json: json
+      }, {
+        _this: this
+      }, res => {
+        if (res.success) {
+          this.$message.success(res.message);
+          this.$router.push("/processCenter");
+        }
+        this.isSubmit = false
+      }, e => {
+
+      });
+    },
+  },
+  mounted() {
+     this.getData()
+     this.processTable()
+  },
+  computed: {
+    listNoDataText() {
+      return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
+    }
+  },
+};
+</script>
+
+<style lang="less" scoped>
+.jrbzhxh-step3 {
+  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;
+      }
+    }
+  }
+  p {
+    & > a {
+      cursor: pointer;
+    }
+
+    & > i {
+      display: inline-block;
+      margin-left: 3px;
+      width: 18px;
+      height: 16px;
+      background-repeat: no-repeat;
+      background-size: 100% 100%;
+      background-position: center center;
+      vertical-align: sub;
+      cursor: pointer;
+    }
+
+    .icon-download {
+      background-image: url("~assets/images/shangqi/img/download.png");
+    }
+
+    .icon-download2 {
+      background-image: url("~assets/images/shangqi/img/download2.png");
+    }
+  }
+  .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>

src/pages/processCenter/pages/creatProcess/jrbzhxh/step4.vue

@@ -0,0 +1,678 @@
+<!--  加入标准化协会信息备案流程-->
+<template>
+  <div class="jrbzhxh-step3">
+    <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="请输入提报单位"
+                    readonly>
+                  </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 class="file-box" v-if="fileList.length > 0">
+                    <p v-for="item in fileList"
+                       :key="item.id"> {{ item.name }}
+                      <i
+                        title="下载"
+                        @click="downloadFile(item.id)"
+                        class="icon-download"
+                        v-btn-permission="''"
+                      />
+                      <i
+                        title="下载带水印"
+                        @click="downloadFileByWater(item.id, item.name)"
+                        class="icon-download2"
+                        v-btn-permission="''"
+                      />
+                    </p>
+                  </div>
+                  <div v-else>
+                    暂无数据
+                  </div>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </div>
+          <el-button style="width: 100%" :icon=" foldFormFlag ? 'el-icon-caret-top': 'el-icon-caret-bottom'" @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'}"
+                  row-key="id">
+          <el-table-column type="selection" width="55" align="center"/>
+          <el-table-column
+            prop="workPeople"
+            label="参与人"
+            width="150"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="duties"
+            label="职务"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="institutionName"
+            label="所在部门"
+            width="200"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="email"
+            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="addPeople">添加</el-button>-->
+            <!--            <el-button plain class="common-button-primary" size="mini" @click="deletePeople">批量删除</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'}"
+                  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>
+      <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 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-back
+      show-transfer
+      show-submit
+      :submitLoading="isSubmit"
+      :transfer-loading="isTransfer"
+      :saveLoading="saveLoading"
+      :approval="true"
+      @back="beforeBack"
+      @transfer="handleTransfer"
+      @submit="handleSubmit"
+    >
+    </ProcessFooter>
+    <Role-tree
+      check-box
+      :is-title="drawerTitle"
+      :is-visible.sync="modalshowflag"
+      @checkedRole="checkedRole"
+      :nodeList="nodeList"
+    ></Role-tree>
+    <!-- 福田全公司选人解决方案 -->
+    <Role-tree
+      check-box
+      :is-title="drawerTitle"
+      :is-visible.sync="drawerModal"
+      @checkedRole="checkedTransferRole"
+      :nodeList="nodeList"
+    ></Role-tree>
+  </div>
+</template>
+
+<script>
+import ProcessHeader from "../../components/ProcessHeader";
+import ProcessTitle from "process/components/ProcessTitle";
+import ProcessFooter from "process/components/ProcessFooter";
+import { changeAssigneeNew,inboundLiaisonDetail } from "api/process";
+
+export default {
+  name: "jrbzhxhStep4",
+  components: {
+    ProcessHeader,
+    ProcessTitle,
+    ProcessFooter
+  },
+  data() {
+    return {
+      //切换tab
+      active: "1",
+      foldFormFlag: true,
+      isSubmit: false,
+      isTransfer: false,
+      saveLoading: false,
+      loading: false,
+      modalshowflag: false,
+      drawerModal: false,
+      drawerTitle: '',
+      nodeList: [],
+      fileList:[],
+      uploadFileListPath: "api/att/attFile/upload", // 上传的地址
+      fileInfoList: [], // 上传的附件
+      userId: this.$store.getters.userInfo.userId,
+      taskIds: this.$route.query.taskIds,
+      bzFlag:'',
+      wbbzform: {
+        reportingUnit:'',
+        associationName: '',
+        committee:'',
+        workingGroup:'',
+        personnelRole:'',
+        membershipTime:'',
+        userId: this.$store.getters.userInfo.userId,
+        taskIds: this.$route.query.taskIds,
+        pId: this.$route.query.prcId,
+        participantsData: [{
+          name: '', //参与人
+          duties: '', //职务
+          institutionName: '', //所在部门
+          email: '', //联系方式
+          tenure:'', //任期
+          account:'', //账户
+          password:'', //密码
+        }],
+        associationData: [{
+          contactPerson: '', //协议联络人
+          telephone: '',  //电话
+          mailbox:'', //邮箱
+        }],
+      },
+      selectList2: [],
+      commentText: '',
+      selectList1: [],
+      formRules: {},
+      participantsData: [], //参与人表格信息
+      associationData: [], //协会表格信息
+      detailData: [], //审批历史信息
+      selectedId: "",
+      associationOptions: [{
+        value: '选项1',
+        label: '1'
+      }, {
+        value: '选项2',
+        label: '2'
+      },{
+        value: '选项3',
+        label: '3'
+      }],
+    };
+  },
+  methods: {
+    //确认转办
+    checkedTransferRole (data) {
+      this.assigneeNewLoading = true
+      changeAssigneeNew({
+        taskId: this.$route.query.taskIds, // 任务id
+        assignee: data[0].id, // 被委托人
+        userId: this.$store.getters.userInfo.userId, // 委托人
+        pId: this.$route.query.prcId // 流程实例
+      }).then(res => {
+        this.isTransfer = false
+        if (res.success) {
+          this.drawerModal = false
+          this.$message.success('调整成功')
+          this.$router.push("/processCenter");
+          this.processNum()
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
+    },
+    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) {
+      if (this.participantsData.length > 1) {
+        let parList = data
+        this.participantsData.forEach(item => {
+          parList.forEach(items => {
+            if (items.name === item.workPeople) {
+              this.$message.warning('请勿重复添加参与人')
+              return
+            } else {
+              console.log(items);
+            }
+          })
+        })
+      } else {
+        this.participantsData = data
+        this.participantsData.forEach(item => {
+          this.$set(item, "workPeople", item.name)
+        });
+        this.participantsData = JSON.parse(JSON.stringify(this.participantsData));
+      }
+    },
+
+    handleTabs(type) {
+      this.active = type;
+    },
+    foldForm() {
+      this.foldFormFlag = !this.foldFormFlag
+    },
+    //不备案
+    handleRecord() {
+
+    },
+    getData() {
+      return new Promise((resolve, reject) => {
+        inboundLiaisonDetail({
+          taskIds: this.$route.query.taskIds,
+          pId: this.$route.query.prcId
+        }).then(res => {
+          if (res) {
+            const processForm = JSON.parse(res.mesg);
+            this.getFormFieldList(processForm);
+          }
+        }).catch(e => {
+        });
+      });
+    },
+    /**
+     * @description: 动态表单读取
+     */
+    getFormFieldList(item) {
+      console.log(item);
+      this.$nextTick(() => {
+        this.wbbzform = JSON.parse(JSON.stringify(item));
+        this.associationData = item.associationData
+        this.participantsData = item.participantsData
+      });
+    },
+    // 请求上传的文件信息
+    getFileInfo() {
+      this.$http.get("att/attFile/getMultiFileInfos", {
+        fileIds: this.fileIds
+      }, {
+        _this: this
+      }, res => {
+        this.$nextTick(() => {
+          res.data.map(item => {
+            // 赋值要回显的上传文件内容
+            this.fileList.push({
+              name: item.oldFileName,
+              uid: item.uid,
+              status: item.status,
+              id: item.id
+            });
+          });
+        });
+      }, e => {
+      });
+    },
+    /**
+     * @Description: 点击下载
+     */
+    downloadFile(attId) {
+      if (attId != null && attId !== "") {
+        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+      } else {
+        this.$message.error("请选择要下载的文件");
+      }
+    },
+    downloadFileByWater(attId, fileSuffix) {
+      let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
+      if (fileExtension !== "pdf" && fileExtension !== "PDF") {
+        this.$message.error("水印下载仅支持PDF,pdf格式文件");
+      } else {
+        if (attId != null && attId !== "") {
+          window.location.href = "/api/att/attFile/downloadFileForSarWaterMark?fileId=" + attId;
+        } else {
+          this.$message.error("请选择要下载的文件");
+        }
+      }
+    },
+    //流程转办
+    handleTransfer(){
+      this.drawerModal = true
+      this.drawerTitle = '转办处理人'
+      this.selectPeople = row
+    },
+    //流程提交
+    handleSubmit() {
+      this.isSubmit = true
+      this.wbbzform.bzFlag = '1',
+      this.wbbzform.passUser = this.$store.getters.userInfo.userId,
+      this.wbbzform.commentText = this.commentText;
+      this.wbbzform.participantsData = this.participantsData
+      this.wbbzform.associationData = this.associationData
+      var json = JSON.stringify( this.wbbzform)
+      this.$http.post("lawss/activiti/completeTask", {
+        taskIds: this.taskIds,
+        userId: this.userId,
+        json: json
+      }, {
+        _this: this
+      }, res => {
+        if (res.success) {
+          this.$message.success(res.message);
+          this.$router.push("/processCenter");
+        }
+        this.isSubmit = false
+      }, e => {
+
+      });
+    },
+    //流程驳回
+    beforeBack(){
+      this.isSubmit = true
+      this.wbbzform.bzFlag = '2',
+      this.wbbzform.passUser = this.$store.getters.userInfo.userId,
+      this.wbbzform.commentText = this.commentText;
+      this.wbbzform.participantsData = this.participantsData
+      this.wbbzform.associationData = this.associationData
+      var json = JSON.stringify( this.wbbzform)
+      this.$http.post("lawss/activiti/completeTask", {
+        taskIds: this.taskIds,
+        userId: this.userId,
+        json: json
+      }, {
+        _this: this
+      }, res => {
+        if (res.success) {
+          this.$message.success(res.message);
+          this.$router.push("/processCenter");
+        }
+        this.isSubmit = false
+      }, e => {
+
+      });
+    },
+  },
+  mounted() {
+    this.getData()
+    this.processTable()
+  },
+  computed: {
+    listNoDataText() {
+      return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
+    }
+  },
+};
+</script>
+
+<style lang="less" scoped>
+.jrbzhxh-step3 {
+  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;
+      }
+    }
+  }
+  p {
+    & > a {
+      cursor: pointer;
+    }
+
+    & > i {
+      display: inline-block;
+      margin-left: 3px;
+      width: 18px;
+      height: 16px;
+      background-repeat: no-repeat;
+      background-size: 100% 100%;
+      background-position: center center;
+      vertical-align: sub;
+      cursor: pointer;
+    }
+
+    .icon-download {
+      background-image: url("~assets/images/shangqi/img/download.png");
+    }
+
+    .icon-download2 {
+      background-image: url("~assets/images/shangqi/img/download2.png");
+    }
+  }
+  .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>

src/pages/processCenter/pages/creatProcess/wbsm/step1.vue

@@ -24,42 +24,64 @@
             :data="dataList"
             border
             ref="entryTable"
-            height="49%"
+            height="90%"
             @selection-change="selectedDelete"
             style="width: 100%"
             :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
               fontWeight: 'bold', height: '48px'}">
             <el-table-column type="selection" width="55" align="center"/>
-            <el-table-column prop="standSerialNumber" label="标准号" show-overflow-tooltip align="center">
+            <el-table-column
+              prop="code"
+              width="180px"
+              align="center"
+              label="标准号">
               <template slot-scope="scope">
-                <a  class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a>
+                <a v-if="scope.row.standYear" class="table-jump"
+                   @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
+                    scope.row.standNumber
+                  }}-{{ scope.row.standYear }}</a>
+                <a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }}
+                  {{ scope.row.standNumber }}</a>
               </template>
             </el-table-column>
-            <el-table-column prop="standName" align="center" show-overflow-tooltip label="标准名称">
+            <el-table-column
+              prop="standName"
+              label="标准名称"
+              align="center"
+            >
               <template slot-scope="scope">
                 <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
               </template>
             </el-table-column>
-            <el-table-column prop="productName" label="标准类别" align="center" show-overflow-tooltip>
+            <el-table-column prop="standSortShow" label="标准类别" align="center" show-overflow-tooltip>
-              <template>
-                <el-select v-model="dataList.productName" placeholder="请选择标准类别">
-                  <el-option
-                    v-for="item in standOptions"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value">
-                  </el-option>
-                </el-select>
-              </template>
-            </el-table-column>
-            <el-table-column prop="itemsNum" label="推荐署名人及单位" align="center"/>
-            <el-table-column prop="itemsName" label="署名人所在单位" align="center"/>
-            <el-table-column prop="planCloseTime" label="推荐署名原因" align="center">
               <template slot-scope="scope">
-                <el-input></el-input>
+                <a>{{ scope.row.standSortShow }}</a>
+              </template>
+            </el-table-column>
+
+            <el-table-column prop="workPeople" label="推荐署名人及单位" 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="reason" label="推荐署名原因" align="center">
+              <template slot-scope="scope">
+                <el-input
+                  v-model="scope.row.reason"
+                  placeholder="请填写推荐署名原因"
+                ></el-input>
+              </template>
+            </el-table-column>
+            <el-table-column prop="expenses" label="费用" align="center">
+              <template slot-scope="scope">
+                <el-input
+                  v-model="scope.row.expenses"
+                  placeholder="请填写费用"
+                ></el-input>
               </template>
             </el-table-column>
-            <el-table-column prop="itemsNum" label="费用" align="center"/>
           </el-table>
       </div>
       <el-collapse accordion>
@@ -153,6 +175,151 @@
         </el-timeline>
       </div>
     </div>
+    <!--    添加标准抽屉-->
+    <el-drawer
+      title="添加标准"
+      :visible.sync="standModel"
+      size="900px"
+      custom-class="demo-drawer"
+    >
+      <div class="demo-drawer-content">
+        <div style="position: absolute;bottom: 48px;top:60px;left: 0;right: 0">
+          <div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
+            <div class="left">
+              <el-form :modal="standardSearch" :inline="true" class="label-input-form"
+                       style="margin-left:10px">
+                <el-form-item label="类型" class="search-item search-item-last">
+                  <el-select
+                    @change="typeChange"
+                    v-model="standardSearch.standType"
+                    placeholder="请选择"
+                    filterable
+                  >
+                    <el-option
+                      v-for="item in standardTypeOptions"
+                      :value="item.value"
+                      :key="item.value"
+                      :label="item.label"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="标准号/标准名称" class="search-item search-item-last">
+                  <el-input
+                    v-model="standardSearch.standNumber"
+                    placeholder="请输入标准号或标准名称"
+                  ></el-input>
+                </el-form-item>
+                <el-form-item class="search-item btn-box">
+                  <el-button
+                    type="primary"
+                    class="common-button-primary"
+                    size="small"
+                    v-btn-permission="''"
+                    @click="getStandDataBtn">
+                    查询
+                  </el-button>
+                </el-form-item>
+                <el-form-item class="search-item btn-box">
+                  <el-button
+                    class="common-button-default"
+                    size="small"
+                    v-btn-permission="''"
+                    @click="clearStandSearch">清空
+                  </el-button>
+                </el-form-item>
+              </el-form>
+            </div>
+            <el-table
+              :data="standardData"
+              tooltip-effect="dark"
+              style="width: 100%"
+              border
+              ref="table"
+              height="90%"
+              :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
+         fontWeight: 'bold', height: '48px'}"
+              @selection-change="selectThree"
+            >
+              <el-table-column
+                type="selection"
+                width="55"
+                align="center">
+              </el-table-column>
+              <el-table-column
+                prop="code"
+                align="center"
+                label="标准号">
+                <template slot-scope="scope">
+                  <a v-if="scope.row.standYear" class="table-jump"
+                     @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
+                      scope.row.standNumber
+                    }}-{{ scope.row.standYear }}</a>
+                  <a v-else @click="handlePreview(scope.row)" class="table-jump">{{
+                      scope.row.standSortShow
+                    }}
+                    {{ scope.row.standNumber }}</a>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="standName"
+                align="center"
+                label="标准名称"
+              >
+                <template slot-scope="scope">
+                  <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="issueTime"
+                align="center"
+                label="发布日期">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format("YYYY-MM-DD") : "" }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="XCXSSRQ"
+                align="center"
+                label="新车型实施日期">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.XCXSSRQ ? $moment(scope.row.XCXSSRQ).format("YYYY-MM-DD") : "" }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column
+                show-overflow-tooltip
+                prop="ZCCSSRQ"
+                align="center"
+                label="在产车实施日期">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.ZCCSSRQ ? $moment(scope.row.ZCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column
+                show-overflow-tooltip
+                prop="textStatus"
+                align="center"
+                label="文本状态">
+                <template slot-scope="scope">
+                  <span>{{ textStatusMap[scope.row.textStatus] }}</span>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+          <pagination
+            :page="pageNo"
+            :pageSize="pageSizeNo"
+            :total="totalNo"
+            @pageChange="pageChangeNo"
+            @pageSizeChange="pageSizeChangeNo"
+          />
+        </div>
+      </div>
+      <div class="demo-drawer-footer">
+        <el-button size="mini" @click="cancelStand">取消</el-button>
+        <el-button type="primary" size="mini" @click="okStand">添加</el-button>
+      </div>
+    </el-drawer>
     <ProcessFooter
       show-save
       show-submit
@@ -190,8 +357,35 @@ export default {
       deleteDataList: [],
       drawerTitle: "", //drawer标题
       modalshowflag: false, // 选择人员drawer开关
+      standModel: false, //添加标准抽屉
+      zrIndex: "",
       nodeList: [],     //存放人员信息数组
       standOptions: [], //标准类别
+      standardData:[],
+      pageNo: 1,
+      totalNo: 0,
+      pageSizeNo: this.$store.getters.userInfo.configContent,
+      standardTypeOptions: [
+        {
+          value: "INLAND",
+          label: "国内标准法规",
+          item: "INLAND"
+        },
+        {
+          value: "FOREIGN",
+          label: "海外标准法规",
+          item: "FOREIGN"
+        }
+      ],
+      textStatusMap: {},// 文本状态id与name对应
+      standList:[],
+      //查询添加标准相关数据
+      standardSearch: {
+        standType: "",
+        standNumber: "",
+        pageNo: 1,
+        pageSizeNo: this.$store.getters.userInfo.configContent
+      },
       roleForm: {
         prcCreateUserName: this.$store.getters.userInfo.userName,
         prcCreateUser: this.$store.getters.userInfo.userId,
@@ -227,27 +421,62 @@ export default {
     ProcessTitle
   },
   mounted() {
+    this.getStandData()
     //从数据库中查询下拉框数据
     this.$http.get('sys/dictype/getDicTypeListCode', '',{
       _this:this
     },res =>{
      this.standOptions = res.data.STANDCLASSIFY
+      this.standStateOptions = res.data.WBZTCLASS; // 文本状态
+      this.setMap(this.standStateOptions);
     }, e => {
     })
   },
   methods: {
     //点击新增事件
     addList() {
+      this.standModel = true
     },
     // 批量删除按钮table，选择数据
-    selectedDelete(val) {
+    selectedDelete(data) {
-      this.deleteDataList = []
+      this.deleteDataList = data
-      for (let i = 0; i < val.length; i++) {
+      // this.deleteDataList = []
-        this.deleteDataList.push(val[i].id);
+      // for (let i = 0; i < val.length; i++) {
-      }
+      //   this.deleteDataList.push(val[i].id);
+      // }
     },
     // 点击批量删除事件
     deleteList() {
+      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.dataList.findIndex(items => {
+              return items.id === item.id;
+            });
+            if (index > -1) {
+              this.dataList.splice(index, 1);
+            }
+            exits.push(item);
+          });
+          this.deleteDataList = [];
+        }).catch(() => {
+        });
+      }
+    },
+    // 将文本状态的id与name对应
+    setMap(data) {
+      data.forEach(item => {
+        this.$set(this.textStatusMap, item.value, item.label);
+      });
     },
     // 点击查看
     handlePreview (item) {
@@ -264,7 +493,94 @@ export default {
     handleTabs(name) {
       this.active = name
     },
+    //添加标准select的改变
+    selectThree(data) {
+      this.standList = data;
+    },
+    choiceZRRS(row, index) {
+      this.drawerTitle = "选择责任人";
+      this.nodeList = [];
+      this.zrIndex = index;
+      this.nodeList.push(row);
+      this.modalshowflag = true;
+    },
+    typeChange(type) {
+      this.standardSearch.standType = type;
+    },
+    //添加标准取消事件
+    cancelStand() {
+      this.standModel = false;
+    },
+    //添加标准确定事件
+    okStand() {
+      this.getStandData()
+      if(this.standList.length < 1){
+        this.$message.warning('请选择需要添加的数据')
+      }else{
+        let exits = [];
+        this.standList.map(item => {
+          let newStand = false;
+          for (let itemKey of this.dataList) {
+            if (item.id == itemKey.id) {
+              newStand = true;
+              break;
+            }
+          }
+          if (newStand) {
+            this.$message.warning("请勿重复添加数据");
+          } else {
+            this.dataList.push(item);
+            exits.push(item.id);
+          }
+        });
+        this.standardData = [];
+        this.standModel = false;
+      }
+    },
+    pageChangeNo(page) {
+      this.pageNo = page;
+      this.getStandData();
+    },
+    pageSizeChangeNo(pageSize) {
+      this.pageSizeNo = this.$store.getters.userInfo.configContent;
+      this.getStandData();
 
+    },
+    clearStandSearch() {
+      this.standardSearch = {
+        standType: "",
+        standNumber: ""
+      };
+      this.getStandData();
+    },
+    getStandDataBtn(){
+      this.pageNo =1;
+      this.getStandData();
+    },
+    //查询项目下的标准
+    getStandData() {
+      this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", {
+        standType: this.standardSearch.standType,
+        standNumber: this.standardSearch.standNumber,
+        page: this.pageNo,
+        pageSize: this.pageSizeNo
+      }, {
+        _this: this
+      }, res => {
+        this.standardData = res.data.list;
+        this.standardData.forEach(item => {
+          if (item.attrInfoMap === null) {
+            this.$set(item, "ZCCSSRQ", '');
+            this.$set(item, "XCXSSRQ", '');
+          } else {
+            this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ);
+            this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ);
+          }
+        })
+        this.totalNo = res.data.count;
+      }, e => {
+      });
+    },
     // 保存按钮
     handleSave() {
       this.saveLoading = true
@@ -310,6 +626,11 @@ export default {
       }else if(this.type === 'president'){
         this.roleForm.president = data[0].id;
         this.roleForm.presidentName = data[0].name;
+      }else{
+        const newRow = JSON.parse(JSON.stringify(this.dataList[this.zrIndex]));
+        newRow.workPeopleId = data[0].id;
+        newRow.workPeople = data[0].name;
+        this.$set(this.dataList, this.zrIndex, newRow);
       }
       this.modalshowflag = false;
     },

src/pages/processCenter/pages/creatProcess/wbsm/step2.vue

@@ -2,7 +2,7 @@
   <div class="wfhxzgStep2">
     <ProcessHeader toggle>
       <template slot="proName">外部署名推荐审批流程</template>
-      <template slot="proNode">署名人领导审批流程</template>
+      <template slot="proNode">署名人领导会签</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -17,9 +17,8 @@
           :data="dataList"
           border
           ref="entryTable"
-          height="49%"
+          height="94%"
-          @selection-change="selectedDelete"
+          style="width: 100%; margin-top: 10px; "
-          style="width: 100%"
           :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
               fontWeight: 'bold', height: '48px'}">
           <el-table-column type="selection" width="55" align="center"/>
@@ -137,14 +136,15 @@
       </div>
     </div>
     <ProcessFooter
-      show-save
+      show-back
-      show-submit
       show-transfer
+      show-submit
       :submitLoading="isSubmit"
+      :transfer-loading="isTransfer"
       :saveLoading="saveLoading"
-      :transferLoading="turnLoading"
+      :approval="true"
-      @transfer="handleTurnTo"
+      @back="beforeBack"
-      @save="handleSave"
+      @transfer="handleTransfer"
       @submit="handleSubmit"
     >
     </ProcessFooter>
@@ -155,6 +155,14 @@
       :nodeList="nodeList"
       @checkedRole="drawerCheck"
     />
+    <!-- 福田全公司选人解决方案 -->
+    <Role-tree
+      check-box
+      :is-title="drawerTitle"
+      :is-visible.sync="drawerModal"
+      @checkedRole="checkedTransferRole"
+      :nodeList="nodeList"
+    ></Role-tree>
   </div>
 </template>
 
@@ -188,6 +196,7 @@ export default {
       isSubmit: false,
       saveLoading: false,
       turnLoading: false,
+      drawerModal: false,
       dataList: [],
       endDataList: [],
       lastDataList: [],
@@ -240,6 +249,26 @@ export default {
     }
   },
   methods: {
+    //确认转办
+    checkedTransferRole (data) {
+      this.assigneeNewLoading = true
+      changeAssigneeNew({
+        taskId: this.$route.query.taskIds, // 任务id
+        assignee: data[0].id, // 被委托人
+        userId: this.$store.getters.userInfo.userId, // 委托人
+        pId: this.$route.query.prcId // 流程实例
+      }).then(res => {
+        this.isTransfer = false
+        if (res.success) {
+          this.drawerModal = false
+          this.$message.success('调整成功')
+          this.$router.push("/processCenter");
+          this.processNum()
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
+    },
     processTable() {
       this.$http.get("lawss/activiti/get_list_by_instance", {
         prcNum: this.$route.query.prcNum,
@@ -326,51 +355,17 @@ export default {
     },
     // 提交按钮
     handleSubmit() {
-      this.isSubmit = true
-      let zqa = new Map();
-      for (let lastDataListElement of this.dataList) {
-        let a = zqa.get(lastDataListElement.dutyPeopleInfoId)
-        if( a == null){
-          a = {
-            id: lastDataListElement.dutyPeopleInfoId,
-            name: lastDataListElement.dutyPeopleInfo,
-            standardInfoList: []
-          }
-        }
-        a.standardInfoList.push(lastDataListElement);
-        zqa.set(a.id, a);
-      }
-      let list = [];
-      for(let item of zqa) {
-        list.push(item[1])
-      }
-      let json = {
-        dockUserList: list,
-        passInfo: this.passInfo
-      }
-      let flag=false
-      this.dataList.forEach(item => {
-        if (item.dutyPeopleInfo === '') {
-          flag=true
-          this.isSubmit = false
-        }
-      })
-      if(flag)return this.$message.warning('请选择分发负责人填入')
-      const params = new FormData();
-      params.set('json', JSON.stringify(json))
-      params.set('userId', this.$store.getters.userInfo.userId)
-      params.set('taskIds', this.taskIds)
-      completeTask(params).then(res => {
-        if(res.success === true) {
-          this.$message.success('提交成功')
-          this.$router.push("/processCenter");
-        }
-        this.isSubmit = false
-      }).catch(e => {
-        this.isSubmit = false
-      })
     },
+    //驳回按钮
+    beforeBack(){
 
+    },
+    //转办按钮
+    handleTransfer(){
+        this.drawerModal = true
+        this.drawerTitle = '转办处理人'
+        this.selectPeople = row
+    },
     // 流程阶段负责人选择
     choiceZRR (type, title, id) {
       this.nodeList = []

src/pages/processCenter/pages/creatProcess/zcch/step1-1.vue

@@ -0,0 +1,904 @@
+<template>
+    <div class="zcch-step1-1">
+        <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;">
+                <el-form
+                        ref="rhForm"
+                        :model="rhform"
+                        :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 :span="24">
+                                <el-form-item label="课题名称" prop="title" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            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
+                                            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
+                                            v-model="rhform.price"
+                                            placeholder="请输入参会费用"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                                <el-form-item label="参会时间" prop="time2" class="add-form-item form-item-disabled">
+                                    <el-date-picker
+                                            v-model="rhform.time2"
+                                            value-format="yyyy-MM-ddHH:mm:ss"
+                                            type="datetime"
+                                            placeholder="请选择参会时间">
+                                    </el-date-picker>
+                                </el-form-item>
+                                <el-form-item label="参会地点" prop="place" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            v-model="rhform.place"
+                                            placeholder="请输入参会地点"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                                <el-form-item label="承办单位" prop="Company" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            v-model="rhform.Company"
+                                            placeholder="请输入承办单位"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                                <el-form-item label="会议通知" prop="modelNameList" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            disabled
+                                            style="display: none;"
+                                            v-model="rhform.modelNameList"
+                                            clearable
+                                    ></el-input>
+                                    <div v-if="rhform.modelList.length > 0" class="fileClass" style="display: flex;">
+                                        <div v-for="(item, index) in rhform.modelList" :key="index" @click="fileUpload" style="margin-right: 5px;">
+                                            {{ item.name }}
+                                        </div>
+                                    </div>
+                                    <div v-else>
+                                        <el-button
+                                                type="primary"
+                                                class="common-button-primary"
+                                                @click="fileUpload"
+                                                size="mini">
+                                            点击上传
+                                        </el-button>
+                                    </div>
+                                </el-form-item>
+                                <el-form-item label="课题研究周期" prop="time" class="add-form-item form-item-disabled">
+                                    <el-date-picker
+                                            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="foldFormFlag ? 'el-icon-caret-top' : 'el-icon-caret-bottom'" @click="foldForm">{{ foldFormFlag ? '隐藏基础信息' : '展开基础信息' }}</el-button>
+                </el-form>
+                <ProcessTitle>
+                    <template slot="title">课题组联系方式</template>
+                </ProcessTitle>
+                <div class="action-bar">
+                    <el-button type="primary" class="common-button-primary add-button" size="mini" @click="add1">
+                        添加
+                    </el-button>
+                    <el-button type="primary" :disabled="!idList1.length > 0" class="common-button-primary add-button" size="mini" @click="addDelete1">
+                        批量删除
+                    </el-button>
+                </div>
+                <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'}"
+                          @selection-change="handleSelectionChange1"
+                          row-key="id">
+                    <el-table-column type="selection" width="55" align="center"/>
+                    <el-table-column
+                            prop="ContactPerson"
+                            label="联络人"
+                            width="150"
+                            align="center">
+                        <template slot-scope="scope">
+                            <el-input style="margin: 10px 0;" v-model="scope.row.ContactPerson"></el-input>
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                            prop="Company"
+                            label="单位"
+                            align="center">
+                        <template slot-scope="scope">
+                            <el-input style="margin: 10px 0;" v-model="scope.row.Company"></el-input>
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                            prop="Telephone"
+                            label="电话"
+                            width="200"
+                            align="center">
+                        <template slot-scope="scope">
+                            <el-input style="margin: 10px 0;" v-model="scope.row.Telephone"></el-input>
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                            prop="Email"
+                            label="邮箱"
+                            width="350"
+                            align="center">
+                        <template slot-scope="scope">
+                            <el-input style="margin: 10px 0;" v-model="scope.row.Email"></el-input>
+                        </template>
+                    </el-table-column>
+                </el-table>
+                <ProcessTitle>
+                    <template slot="title">集团内部参与人员</template>
+                </ProcessTitle>
+                <div class="action-bar">
+                    <el-button type="primary" class="common-button-primary add-button" size="mini" @click="add2">
+                        添加
+                    </el-button>
+                    <el-button :disabled="!idList2.length > 0" type="primary" class="common-button-primary add-button" size="mini" @click="addDelete2">
+                        批量删除
+                    </el-button>
+                </div>
+                <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'}"
+                          @selection-change="handleSelectionChange2"
+                          row-key="id">
+                    <el-table-column type="selection" width="55" align="center"/>
+                    <el-table-column
+                            prop="Sindex"
+                            label="我司在工作组排名顺序"
+                            width="170"
+                            align="center">
+                        <template slot-scope="scope">
+                            <el-input style="margin: 10px 0;" v-model="scope.row.Sindex"></el-input>
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                            prop="Member"
+                            label="我司成员"
+                            width="150"
+                            align="center">
+                        <template slot-scope="scope">
+                            <el-input style="margin: 10px 0;" v-model="scope.row.Member"></el-input>
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                            prop="Company"
+                            label="单位"
+                            align="center">
+                        <template slot-scope="scope">
+                            <el-input style="margin: 10px 0;" v-model="scope.row.Company"></el-input>
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                            prop="Department"
+                            label="部门"
+                            width="150"
+                            align="center">
+                        <template slot-scope="scope">
+                            <el-input style="margin: 10px 0;" v-model="scope.row.Department"></el-input>
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                            prop="Telephone"
+                            label="电话"
+                            width="200"
+                            align="center">
+                        <template slot-scope="scope">
+                            <el-input style="margin: 10px 0;" v-model="scope.row.Telephone"></el-input>
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                            prop="Email"
+                            label="邮箱"
+                            width="300"
+                            align="center">
+                        <template slot-scope="scope">
+                            <el-input style="margin: 10px 0;" v-model="scope.row.Email"></el-input>
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                            prop="Identity"
+                            label="身份"
+                            width="150"
+                            align="center">
+                        <template slot-scope="scope">
+                            <el-input style="margin: 10px 0;" v-model="scope.row.Identity"></el-input>
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                            prop="data"
+                            label="资料"
+                            width="250"
+                            align="center">
+                        <template slot-scope="scope">
+                            <div v-if="scope.row.data.length > 0" class="fileClass">
+                                <div v-for="(item, index) in scope.row.data" :key="index" @click="fileUpload2(scope.$index)" style="margin-right: 5px;">
+                                    {{ item.name }}
+                                </div>
+                            </div>
+                            <div v-else>
+                                <el-button
+                                        type="primary"
+                                        class="common-button-primary"
+                                        @click="fileUpload2(scope.$index)"
+                                        size="mini">
+                                    点击上传
+                                </el-button>
+                            </div>
+                        </template>
+                    </el-table-column>
+                </el-table>
+                <el-collapse accordion>
+                    <el-collapse-item title="回执说明">
+                        <div style="margin: 10px 0;">
+                            <el-input
+                                    type="textarea"
+                                    :rows="3"
+                                    resize="none"
+                                    placeholder="请输入意见"
+                                    v-model="commentText">
+                            </el-input>
+                        </div>
+                    </el-collapse-item>
+                </el-collapse>
+            </div>
+        </div>
+        <div class="content" v-show="active === '2'">
+            <div class="block" style="padding-top: 20px;">
+                <el-timeline>
+                    <el-form
+                            ref="Form"
+                            :model="roleForm"
+                            :rules="roleFormRules"
+                            class="label-input-form">
+                        <el-timeline-item timestamp="发起流程" placement="top" :color="roleForm.applyUserId ? '#66b1ff' : ''">
+                            <el-card>
+                                <el-form-item prop="revisionId" style="margin-bottom: 0">
+                                    <h4>流程发起人</h4>
+                                    <div style="margin-top: 10px;width: 300px;">
+                                        <el-input v-model="roleForm.revisionId" style="display: none;"/>
+                                        <el-input v-model="roleForm.revisionIdName" placeholder="流程发起人" disabled/>
+                                    </div>
+                                </el-form-item>
+                            </el-card>
+                        </el-timeline-item>
+                        <el-timeline-item timestamp="审批" placement="top" :color="roleForm.ministerId ? '#66b1ff' : ''">
+                            <el-card>
+                                <el-form-item prop="ministerIdName" style="margin-bottom: 0">
+                                    <h4>法规认证部部长</h4>
+                                    <div style="margin-top: 10px;width: 300px;">
+                                        <el-input v-model="roleForm.ministerId" style="display: none;"></el-input>
+                                        <el-input v-model="roleForm.ministerIdName" placeholder="选择法规认证部部长" @click.native="choiceZRR('ministerId', '选择法规认证部部长', roleForm.ministerId)"></el-input>
+                                    </div>
+                                </el-form-item>
+                            </el-card>
+                        </el-timeline-item>
+                        <el-timeline-item timestamp="审批" placement="top" :color="roleForm.presidentUser ? '#66b1ff' : ''">
+                            <el-card>
+                                <el-form-item prop="presidentIdName" style="margin-bottom: 0">
+                                    <h4>公司副总</h4>
+                                    <div style="margin-top: 10px;width: 300px;">
+                                        <el-input v-model="roleForm.presidentId" style="display: none;"></el-input>
+                                        <el-input v-model="roleForm.presidentIdName" placeholder="选择公司副总" @click.native="choiceZRR('presidentId', '选择公司副总', roleForm.presidentId)"></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>
+        <el-dialog width='400px' :visible.sync="fileMadel" title="上传会议通知">
+            <el-upload
+                    v-if="fileMadel"
+                    multiple
+                    class="upload-demo"
+                    drag
+                    :action="fileUrl"
+                    ref="importfile"
+                    name="file"
+                    accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx"
+                    :before-upload="beginImportFile"
+                    :on-success="importFileSuccess"
+                    :on-remove="importFileRemove"
+                    :show-file-list="true"
+                    :file-list="fileList1"
+            >
+                <div style="padding: 20px 0">
+                    <i class="el-icon-upload" style="color: #3399ff"></i>
+                    <p>点击或拖拽上传文件</p>
+                </div>
+            </el-upload>
+        </el-dialog>
+        <el-dialog width='400px' :visible.sync="fileMadel2" title="上传资料">
+            <el-upload
+                    v-if="fileMadel2"
+                    multiple
+                    class="upload-demo"
+                    drag
+                    :action="fileUrl"
+                    ref="importfile2"
+                    name="file"
+                    accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx"
+                    :before-upload="beginImportFile"
+                    :on-success="importFileSuccess2"
+                    :on-remove="importFileRemove2"
+                    :show-file-list="true"
+                    :file-list="fileList"
+            >
+                <div style="padding: 20px 0">
+                    <i class="el-icon-upload" style="color: #3399ff"></i>
+                    <p>点击或拖拽上传文件</p>
+                </div>
+            </el-upload>
+        </el-dialog>
+        <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 ProcessFooter from "../../components/ProcessFooter";
+    import ProcessTitle from "../../components/ProcessTitle";
+    import { saveTaskFirst,inboundLiaisonDetail } from "api/process";
+
+    export default {
+        name: "zcchStep1-1",
+        components: {
+            ProcessHeader,
+            ProcessFooter,
+            ProcessTitle
+        },
+        data() {
+            return {
+                commentText: '',
+                isSubmit: false,
+                saveLoading: false,
+                active: "1", //默认显示
+                rhform: {
+                    title: '',
+                    content: '',
+                    price: '',
+                    time: '',
+                    time2: '',
+                    place: '',
+                    Company: '',
+                    modelNameList: '',
+                    modelList: []
+                },
+                formRules: {
+                    title: [
+                        { required: true, message: '请输入课题名称', trigger: 'blur' },
+                    ],
+                    content: [
+                        { required: true, message: '请输入主要议题', trigger: 'blur' },
+                    ],
+                    price: [
+                        { required: true, message: '请输入费用', trigger: 'blur' },
+                    ],
+                    time: [
+                        { required: true, message: '请选择课题研究周期', trigger: 'change' },
+                    ],
+                    time2: [
+                        { required: true, message: '请选择参会时间', trigger: 'change' },
+                    ],
+                    place: [
+                        { required: true, message: '请输入参会地点', trigger: 'blur' },
+                    ],
+                    Company: [
+                        { required: true, message: '请输入承办单位', trigger: 'blur' },
+                    ],
+                    modelNameList: [
+                        { required: true, message: '请上传课题组通知', trigger: 'blur' },
+                    ]
+                },
+                foldFormFlag: true,
+                data1: [],
+                data2: [],
+                roleForm: {
+                    revisionId: this.$store.getters.userInfo.userId,
+                    revisionIdName: this.$store.getters.userInfo.userName,
+                    ministerId: '',
+                    ministerIdName: '',
+                    presidentId: '',
+                    presidentIdName: '',
+                },
+                roleFormRules: {
+                    ministerIdName: [
+                        {required: true, message: '请选择法规认证部部长', trigger: 'change'},
+                    ],
+                    inspectorIdName: [
+                        {required: true, message: '请选择法规认证部总监', trigger: 'change'},
+                    ],
+                    presidentIdName: [
+                        {required: true, message: '请选择公司副总', trigger: 'change'},
+                    ]
+                },
+                fileMadel: false,
+                fileMadel2: false,
+                fileUrl:  'api/att/attFile/upload',
+                idList1: [],
+                idList2: [],
+                fileIndex: '',
+                fileList: [],
+                fileList1: [],
+                nodeList: [],
+                type: '',
+                drawerTitle: '',
+                modalshowflag: false,
+                taskIds: this.$route.query.taskIds,
+                pId: this.$route.query.prcId,
+            }
+        },
+        methods: {
+            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.Company = data.Company
+                        this.rhform.place = data.place
+                        this.rhform.time2 = data.time2
+                        this.rhform.modelList = data.modelList
+                        this.rhform.modelNameList = data.modelNameList
+                        this.roleForm.ministerId = data.ministerId
+                        this.roleForm.ministerIdName = data.ministerIdName
+                        this.roleForm.presidentId = data.presidentId
+                        this.roleForm.presidentIdName = data.presidentIdName
+                    }).catch(e => {
+                    })
+                })
+            },
+            add1() {
+                var id = Number(Math.random().toString().substr(3, 3) + Date.now()).toString(36);
+                var json = {
+                    ContactPerson: '',
+                    Company: '',
+                    Telephone: '',
+                    Email: '',
+                    id: id
+                }
+                this.data1.push(json)
+            },
+            add2() {
+                var id = Number(Math.random().toString().substr(3, 3) + Date.now()).toString(36);
+                var json = {
+                    Sindex: '',
+                    Member: '',
+                    Company: '',
+                    Email: '',
+                    id: id,
+                    Department: '',
+                    Telephone: '',
+                    Identity: '',
+                    dataName: '',
+                    data: [],
+                }
+                this.data2.push(json)
+            },
+            addDelete1() {
+                if (this.idList1.length > 0) {
+                    this.$confirm('删除选中数据, 是否继续?', '提示', {
+                        confirmButtonText: '确定',
+                        cancelButtonText: '取消',
+                        type: 'warning'
+                    }).then(() => {
+                        for (let a = 0; a < this.data1.length; a++) {
+                            this.idList1.forEach(item => {
+                                if (this.data1[a].id === item) {
+                                    this.data1.splice(a, 1)
+                                }
+                            })
+                        }
+                    }).catch(() => {
+                        this.$message({
+                            type: 'info',
+                            message: '已取消删除'
+                        });
+                    });
+                } else {
+                    this.$message.warning('请选择要删除的数据')
+                }
+            },
+            addDelete2() {
+                if (this.idList2.length > 0) {
+                    this.$confirm('删除选中数据, 是否继续?', '提示', {
+                        confirmButtonText: '确定',
+                        cancelButtonText: '取消',
+                        type: 'warning'
+                    }).then(() => {
+                        for (let a = 0; a < this.data2.length; a++) {
+                            this.idList2.forEach(item => {
+                                if (this.data2[a].id === item) {
+                                    this.data2.splice(a, 1)
+                                }
+                            })
+                        }
+                    }).catch(() => {
+                        this.$message({
+                            type: 'info',
+                            message: '已取消删除'
+                        });
+                    });
+                } else {
+                    this.$message.warning('请选择要删除的数据')
+                }
+            },
+            // 导入按钮 上传之前的钩子
+            beginImportFile(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 === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
+                    return true
+                } else {
+                    this.$message.error('文件' + file.name + '格式不正确，请上传PPT,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
+            },
+            importFileSuccess(response, file) {
+                if (response.ok) {
+                    this.rhform.modelList.push(response.data)
+                    let list = ''
+                    this.rhform.modelList.forEach(item => {
+                        if (list.length > 0) {
+                            list += ','
+                            list += item.name
+                        } else {
+                            list+= item.name
+                        }
+                    })
+                    this.rhform.modelNameList = list
+                    this.$message({
+                        showClose: true,
+                        message: response.message,
+                        type: 'success'
+                    })
+                } else {
+                    this.$message.error('程序异常，上传失败')
+                }
+            },
+            importFileRemove(file, fileList) {
+                let list = ''
+                this.rhform.modelList = []
+                fileList.forEach(item => {
+                    this.rhform.modelList.push(item)
+                    if (list.length > 0) {
+                        list += ','
+                        list += item.name
+                    } else {
+                        list+= item.name
+                    }
+                })
+                this.rhform.modelNameList = list
+            },
+            importFileSuccess2(response, file) {
+                if (response.ok) {
+                    this.data2[this.fileIndex].data.push(response.data)
+                    let list = ''
+                    this.data2[this.fileIndex].data.forEach(item => {
+                        if (list.length > 0) {
+                            list += ','
+                            list += item.name
+                        } else {
+                            list+= item.name
+                        }
+                    })
+                    this.data2[this.fileIndex].dataName = list
+                    this.$message({
+                        showClose: true,
+                        message: response.message,
+                        type: 'success'
+                    })
+                } else {
+                    this.$message.error('程序异常，上传失败')
+                }
+            },
+            importFileRemove2(file, fileList) {
+                let list = ''
+                this.data2[this.fileIndex].data = []
+                fileList.forEach(item => {
+                    this.data2[this.fileIndex].data.push(item)
+                    if (list.length > 0) {
+                        list += ','
+                        list += item.name
+                    } else {
+                        list+= item.name
+                    }
+                })
+                this.data2[this.fileIndex].dataName = list
+            },
+            fileUpload() {
+                this.fileList1 = this.rhform.modelList
+                this.fileMadel = true
+            },
+            fileUpload2(index) {
+                this.fileIndex = index
+                this.fileList = this.data2[this.fileIndex].data
+                this.fileMadel2 = true
+            },
+            handleTabs(type) {
+                this.active = type;
+            }, // 切换tabs
+            foldForm() {
+                this.foldFormFlag = !this.foldFormFlag
+            }, // 基础信息显隐
+            handleSave() {
+            }, // 保存事件
+            handleSubmit() {
+                this.$refs['rhForm'].validate((valid) => {
+                    if (valid) {
+                        if (this.data1.length) {
+                            if (this.data2.length) {
+                                let ContactPerson = 0,Company = 0,Telephone = 0,Email = 0,Sindex = 0,Member = 0,Telephone2 = 0,Email2 = 0, Company2 = 0,Department = 0,Identity = 0
+                                this.data1.forEach((item, index) =>{
+                                    if (!item.ContactPerson) {
+                                        ContactPerson++
+                                    } else if (!item.Company) {
+                                        Company++
+                                    } else if (!item.Telephone) {
+                                        Telephone++
+                                    } else if (!item.Email) {
+                                        Email++
+                                    }
+                                })
+                                this.data2.forEach((item, index) =>{
+                                    if (!item.Sindex) {
+                                        Sindex++
+                                    } else if (!item.Member) {
+                                        Member++
+                                    } else if (!item.Telephone) {
+                                        Telephone2++
+                                    } else if (!item.Email) {
+                                        Email2++
+                                    } else if (!item.Company) {
+                                        Company2++
+                                    } else if (!item.Department) {
+                                        Department++
+                                    } else if (!item.Identity) {
+                                        Identity++
+                                    }
+                                })
+                                if (ContactPerson > 0) {
+                                    return this.$message.warning('请输入联络人')
+                                } else if (Company > 0) {
+                                    return this.$message.warning('请输入课题组联络人单位')
+                                } else if (Telephone > 0) {
+                                    return this.$message.warning('请输入课题组联络人电话')
+                                } else if (Email > 0) {
+                                    return this.$message.warning('请输入课题组联络人邮箱')
+                                } else if (Sindex > 0) {
+                                    return this.$message.warning('请输入工作组排名顺序')
+                                } else if (Member > 0) {
+                                    return this.$message.warning('请输入我司成员')
+                                } else if (Telephone2 > 0) {
+                                    return this.$message.warning('请输入内部参与人员电话')
+                                } else if (Email2 > 0) {
+                                    return this.$message.warning('请输入内部参与人员油邮箱')
+                                } else if (Company2 > 0) {
+                                    return this.$message.warning('请输入内部参与人员单位')
+                                } else if (Department > 0) {
+                                    return this.$message.warning('请输入内部参与人员部门')
+                                } else if (Identity > 0) {
+                                    return this.$message.warning('请输入内部参与人员身份')
+                                } else {
+                                    this.$refs['Form'].validate((valid) => {
+                                        if (valid) {
+                                            this.isSubmit = true
+                                            this.$http.get('lawss/activiti/startProcess', {
+                                                type: '18'
+                                            }, {}, res => {
+                                                if (res.ok) {
+                                                    var json = Object.assign(this.rhform, this.roleForm)
+                                                    json.commentText = this.commentText
+                                                    json.data1 = this.data1
+                                                    json.data2 = this.data2
+                                                    this.$http.post('lawss/activiti/completeTask', {
+                                                        json: JSON.stringify(json),
+                                                        taskId: res.data,
+                                                        userId: this.$store.getters.userInfo.userId
+                                                    }, {}, res => {
+                                                        if (res.success) {
+                                                            this.$message.success('流程发起成功')
+                                                            this.$router.push('/processCenter')
+                                                            this.isSubmit = false
+                                                        } else {
+                                                            this.$message.warning('流程启动失败')
+                                                            this.isSubmit = false
+                                                        }
+                                                    })
+                                                } else {
+                                                    this.$message.warning('流程启动失败')
+                                                    this.isSubmit = false
+                                                }
+                                            })
+                                        } else {
+                                            return this.$message.warning('请完善人员信息')
+                                        }
+                                    })
+                                }
+                            } else {
+                                return this.$message.warning('请添加集团内部参与人员')
+                            }
+                        } else {
+                            return this.$message.warning('请添加课题组人员')
+                        }
+                    } else {
+                        return this.$message.warning('请完善基础信息')
+                    }
+                })
+            }, // 提交事件
+            handleSelectionChange1(val) {
+                this.idList1 = []
+                val.forEach(item => {
+                    this.idList1.push(item.id)
+                })
+            }, // table1选中change事件
+            handleSelectionChange2(val) {
+                this.idList2 = []
+                val.forEach(item => {
+                    this.idList2.push(item.id)
+                })
+            }, // table2选中change事件
+            choiceZRR(type, title, id) {
+                this.nodeList = []
+                this.nodeList.push(id)
+                this.type = type
+                this.drawerTitle = title
+                this.modalshowflag = true
+            }, // 点击人员input事件
+            checkedRole(data) {
+                if (this.type === 'ministerId') {
+                    this.roleForm.ministerId = data[0].id
+                    this.roleForm.ministerIdName = data[0].name
+                } else if (this.type === 'inspectorId') {
+                    this.roleForm.inspectorId = data[0].id
+                    this.roleForm.inspectorIdName = data[0].name
+                } else if (this.type === 'presidentId') {
+                    this.roleForm.presidentId = data[0].id
+                    this.roleForm.presidentIdName = data[0].name
+                }
+            }, // 选择人员确认事件
+        },
+        mounted() {
+            this.getData()
+        }
+    };
+</script>
+
+<style lang="less" scoped>
+    @import '~@/assets/styles/style';
+
+    .zcch-step1-1 {
+        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>
+
+

src/pages/processCenter/pages/creatProcess/zcch/step1.vue

@@ -11,7 +11,7 @@
         <div class="content" v-show="active === '1'">
             <div style="flex: auto; overflow: auto;">
                 <el-form
-                        ref="qdqrForm"
+                        ref="rhForm"
                         :model="rhform"
                         :rules="formRules"
                         class="label-input-form"
@@ -44,11 +44,12 @@
                                             clearable
                                     ></el-input>
                                 </el-form-item>
-                                <el-form-item label="参会时间" prop="price" class="add-form-item form-item-disabled">
+                                <el-form-item label="参会时间" prop="time2" class="add-form-item form-item-disabled">
                                     <el-date-picker
                                             v-model="rhform.time2"
+                                            value-format="yyyy-MM-dd HH:mm:ss"
                                             type="datetime"
-                                            placeholder="请选择完成时间">
+                                            placeholder="请选择参会时间">
                                     </el-date-picker>
                                 </el-form-item>
                                 <el-form-item label="参会地点" prop="place" class="add-form-item form-item-disabled">
@@ -66,12 +67,26 @@
                                     ></el-input>
                                 </el-form-item>
                                 <el-form-item label="会议通知" prop="modelNameList" class="add-form-item form-item-disabled">
-                                    <el-button
+                                    <el-input
-                                            type="primary"
+                                            disabled
-                                            class="common-button-primary"
+                                            style="display: none;"
-                                            size="mini">
+                                            v-model="rhform.modelNameList"
-                                        点击上传
+                                            clearable
-                                    </el-button>
+                                    ></el-input>
+                                    <div v-if="rhform.modelList.length > 0" class="fileClass" style="display: flex;">
+                                        <div v-for="(item, index) in rhform.modelList" :key="index" @click="fileUpload" style="margin-right: 5px;">
+                                            {{ item.name }}
+                                        </div>
+                                    </div>
+                                    <div v-else>
+                                        <el-button
+                                                type="primary"
+                                                class="common-button-primary"
+                                                @click="fileUpload"
+                                                size="mini">
+                                            点击上传
+                                        </el-button>
+                                    </div>
                                 </el-form-item>
                                 <el-form-item label="课题研究周期" prop="time" class="add-form-item form-item-disabled">
                                     <el-date-picker
@@ -85,16 +100,16 @@
                             </el-col>
                         </el-row>
                     </div>
-                    <el-button style="width: 100%" icon="el-icon-caret-top" @click="foldForm">{{ foldFormFlag ? '隐藏基础信息' : '展开基础信息' }}</el-button>
+                    <el-button style="width: 100%" :icon="foldFormFlag ? 'el-icon-caret-top' : 'el-icon-caret-bottom'" @click="foldForm">{{ foldFormFlag ? '隐藏基础信息' : '展开基础信息' }}</el-button>
                 </el-form>
                 <ProcessTitle>
-                    <template slot="title">外部信息</template>
+                    <template slot="title">课题组联系方式</template>
                 </ProcessTitle>
                 <div class="action-bar">
-                    <el-button type="primary" class="common-button-primary add-button" size="mini">
+                    <el-button type="primary" class="common-button-primary add-button" size="mini" @click="add1">
                         添加
                     </el-button>
-                    <el-button type="primary" class="common-button-primary add-button" size="mini">
+                    <el-button type="primary" :disabled="!idList1.length > 0" class="common-button-primary add-button" size="mini" @click="addDelete1">
                         批量删除
                     </el-button>
                 </div>
@@ -109,36 +124,49 @@
                           row-key="id">
                     <el-table-column type="selection" width="55" align="center"/>
                     <el-table-column
-                            prop="itemsNum"
+                            prop="ContactPerson"
                             label="联络人"
                             width="150"
                             align="center">
+                        <template slot-scope="scope">
+                            <el-input style="margin: 10px 0;" v-model="scope.row.ContactPerson"></el-input>
+                        </template>
                     </el-table-column>
                     <el-table-column
-                            prop="itemsName"
+                            prop="Company"
                             label="单位"
                             align="center">
+                        <template slot-scope="scope">
+                            <el-input style="margin: 10px 0;" v-model="scope.row.Company"></el-input>
+                        </template>
                     </el-table-column>
                     <el-table-column
-                            prop="itermsConditions"
+                            prop="Telephone"
                             label="电话"
                             width="200"
                             align="center">
+                        <template slot-scope="scope">
+                            <el-input style="margin: 10px 0;" v-model="scope.row.Telephone"></el-input>
+                        </template>
                     </el-table-column>
                     <el-table-column
+                            prop="Email"
                             label="邮箱"
                             width="350"
                             align="center">
+                        <template slot-scope="scope">
+                            <el-input style="margin: 10px 0;" v-model="scope.row.Email"></el-input>
+                        </template>
                     </el-table-column>
                 </el-table>
                 <ProcessTitle>
-                    <template slot="title">内部信息</template>
+                    <template slot="title">集团内部参与人员</template>
                 </ProcessTitle>
                 <div class="action-bar">
-                    <el-button type="primary" class="common-button-primary add-button" size="mini">
+                    <el-button type="primary" class="common-button-primary add-button" size="mini" @click="add2">
                         添加
                     </el-button>
-                    <el-button type="primary" class="common-button-primary add-button" size="mini">
+                    <el-button :disabled="!idList2.length > 0" type="primary" class="common-button-primary add-button" size="mini" @click="addDelete2">
                         批量删除
                     </el-button>
                 </div>
@@ -153,48 +181,103 @@
                           row-key="id">
                     <el-table-column type="selection" width="55" align="center"/>
                     <el-table-column
-                            prop="itemsNum"
+                            prop="Sindex"
                             label="我司在工作组排名顺序"
                             width="170"
                             align="center">
+                        <template slot-scope="scope">
+                            <el-input style="margin: 10px 0;" v-model="scope.row.Sindex"></el-input>
+                        </template>
                     </el-table-column>
                     <el-table-column
-                            prop="itemsName"
+                            prop="Member"
                             label="我司成员"
                             width="150"
                             align="center">
+                        <template slot-scope="scope">
+                            <el-input style="margin: 10px 0;" v-model="scope.row.Member"></el-input>
+                        </template>
                     </el-table-column>
                     <el-table-column
-                            prop="itermsConditions"
+                            prop="Company"
                             label="单位"
                             align="center">
+                        <template slot-scope="scope">
+                            <el-input style="margin: 10px 0;" v-model="scope.row.Company"></el-input>
+                        </template>
                     </el-table-column>
                     <el-table-column
+                            prop="Department"
                             label="部门"
                             width="150"
                             align="center">
+                        <template slot-scope="scope">
+                            <el-input style="margin: 10px 0;" v-model="scope.row.Department"></el-input>
+                        </template>
                     </el-table-column>
                     <el-table-column
+                            prop="Telephone"
                             label="电话"
                             width="200"
                             align="center">
+                        <template slot-scope="scope">
+                            <el-input style="margin: 10px 0;" v-model="scope.row.Telephone"></el-input>
+                        </template>
                     </el-table-column>
                     <el-table-column
+                            prop="Email"
                             label="邮箱"
                             width="300"
                             align="center">
+                        <template slot-scope="scope">
+                            <el-input style="margin: 10px 0;" v-model="scope.row.Email"></el-input>
+                        </template>
                     </el-table-column>
                     <el-table-column
+                            prop="Identity"
                             label="身份"
                             width="150"
                             align="center">
+                        <template slot-scope="scope">
+                            <el-input style="margin: 10px 0;" v-model="scope.row.Identity"></el-input>
+                        </template>
                     </el-table-column>
                     <el-table-column
+                            prop="data"
                             label="资料"
-                            width="200"
+                            width="250"
                             align="center">
+                        <template slot-scope="scope">
+                            <div v-if="scope.row.data.length > 0" class="fileClass">
+                                <div v-for="(item, index) in scope.row.data" :key="index" @click="fileUpload2(scope.$index)" style="margin-right: 5px;">
+                                    {{ item.name }}
+                                </div>
+                            </div>
+                            <div v-else>
+                                <el-button
+                                        type="primary"
+                                        class="common-button-primary"
+                                        @click="fileUpload2(scope.$index)"
+                                        size="mini">
+                                    点击上传
+                                </el-button>
+                            </div>
+                        </template>
                     </el-table-column>
                 </el-table>
+                <el-collapse accordion>
+                    <el-collapse-item title="回执说明">
+                        <div style="margin: 10px 0;">
+                            <el-input
+                                    type="textarea"
+                                    :rows="3"
+                                    resize="none"
+                                    placeholder="请输入意见"
+                                    v-model="commentText">
+                            </el-input>
+                        </div>
+                    </el-collapse-item>
+                </el-collapse>
             </div>
         </div>
         <div class="content" v-show="active === '2'">
@@ -207,44 +290,33 @@
                             class="label-input-form">
                         <el-timeline-item timestamp="发起流程" placement="top" :color="roleForm.applyUserId ? '#66b1ff' : ''">
                             <el-card>
-                                <el-form-item prop="applyUserId" style="margin-bottom: 0">
+                                <el-form-item prop="revisionId" style="margin-bottom: 0">
                                     <h4>流程发起人</h4>
                                     <div style="margin-top: 10px;width: 300px;">
-                                        <el-input v-model="roleForm.applyUserId" style="display: none;"/>
+                                        <el-input v-model="roleForm.revisionId" style="display: none;"/>
-                                        <el-input v-model="roleForm.applyUserIdName" placeholder="流程发起人" disabled/>
+                                        <el-input v-model="roleForm.revisionIdName" placeholder="流程发起人" disabled/>
                                     </div>
                                 </el-form-item>
                             </el-card>
                         </el-timeline-item>
-                        <el-timeline-item timestamp="审批" placement="top" :color="roleForm.ministerUser ? '#66b1ff' : ''">
+                        <el-timeline-item timestamp="审批" placement="top" :color="roleForm.ministerId ? '#66b1ff' : ''">
                             <el-card>
-                                <el-form-item prop="ministerUserName" style="margin-bottom: 0">
+                                <el-form-item prop="ministerIdName" style="margin-bottom: 0">
                                     <h4>法规认证部部长</h4>
                                     <div style="margin-top: 10px;width: 300px;">
-                                        <el-input v-model="roleForm.ministerUser" style="display: none;"></el-input>
+                                        <el-input v-model="roleForm.ministerId" style="display: none;"></el-input>
-                                        <el-input v-model="roleForm.ministerUserName" placeholder="选择法规认证部部长" @click.native="choiceZRR('ministerUser', '选择标准法规部部长', roleForm.ministerUser)"></el-input>
+                                        <el-input v-model="roleForm.ministerIdName" placeholder="选择法规认证部部长" @click.native="choiceZRR('ministerId', '选择法规认证部部长', roleForm.ministerId)"></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-timeline-item timestamp="审批" placement="top" :color="roleForm.presidentUser ? '#66b1ff' : ''">
                             <el-card>
-                                <el-form-item prop="presidentUserName" style="margin-bottom: 0">
+                                <el-form-item prop="presidentIdName" style="margin-bottom: 0">
                                     <h4>公司副总</h4>
                                     <div style="margin-top: 10px;width: 300px;">
-                                        <el-input v-model="roleForm.presidentUser" style="display: none;"></el-input>
+                                        <el-input v-model="roleForm.presidentId" style="display: none;"></el-input>
-                                        <el-input v-model="roleForm.presidentUserName" placeholder="选择公司副总" @click.native="choiceZRR('presidentUser', '选择工程研究总院院长', roleForm.presidentUser)"></el-input>
+                                        <el-input v-model="roleForm.presidentIdName" placeholder="选择公司副总" @click.native="choiceZRR('presidentId', '选择公司副总', roleForm.presidentId)"></el-input>
                                     </div>
                                 </el-form-item>
                             </el-card>
@@ -262,6 +334,55 @@
                 @submit="handleSubmit"
         >
         </ProcessFooter>
+        <el-dialog width='400px' :visible.sync="fileMadel" title="上传会议通知">
+            <el-upload
+                    multiple
+                    class="upload-demo"
+                    drag
+                    :action="fileUrl"
+                    ref="importfile"
+                    name="file"
+                    accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx"
+                    :before-upload="beginImportFile"
+                    :on-success="importFileSuccess"
+                    :on-remove="importFileRemove"
+                    :show-file-list="true"
+            >
+                <div style="padding: 20px 0">
+                    <i class="el-icon-upload" style="color: #3399ff"></i>
+                    <p>点击或拖拽上传文件</p>
+                </div>
+            </el-upload>
+        </el-dialog>
+        <el-dialog width='400px' :visible.sync="fileMadel2" title="上传资料">
+            <el-upload
+                    v-if="fileMadel2"
+                    multiple
+                    class="upload-demo"
+                    drag
+                    :action="fileUrl"
+                    ref="importfile2"
+                    name="file"
+                    accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx"
+                    :before-upload="beginImportFile"
+                    :on-success="importFileSuccess2"
+                    :on-remove="importFileRemove2"
+                    :show-file-list="true"
+                    :file-list="fileList"
+            >
+                <div style="padding: 20px 0">
+                    <i class="el-icon-upload" style="color: #3399ff"></i>
+                    <p>点击或拖拽上传文件</p>
+                </div>
+            </el-upload>
+        </el-dialog>
+        <Role-tree
+                check-box
+                :is-title="drawerTitle"
+                :is-visible.sync="modalshowflag"
+                @checkedRole="checkedRole"
+                :nodeList="nodeList"
+        ></Role-tree>
     </div>
 </template>
 
@@ -280,6 +401,7 @@
         },
         data() {
             return {
+                commentText: '',
                 isSubmit: false,
                 saveLoading: false,
                 active: "1", //默认显示
@@ -291,16 +413,250 @@
                     time2: '',
                     place: '',
                     Company: '',
+                    modelNameList: '',
+                    modelList: []
+                },
+                formRules: {
+                    title: [
+                        { required: true, message: '请输入课题名称', trigger: 'blur' },
+                    ],
+                    content: [
+                        { required: true, message: '请输入主要议题', trigger: 'blur' },
+                    ],
+                    price: [
+                        { required: true, message: '请输入费用', trigger: 'blur' },
+                    ],
+                    time: [
+                        { required: true, message: '请选择课题研究周期', trigger: 'change' },
+                    ],
+                    time2: [
+                        { required: true, message: '请选择参会时间', trigger: 'change' },
+                    ],
+                    place: [
+                        { required: true, message: '请输入参会地点', trigger: 'blur' },
+                    ],
+                    Company: [
+                        { required: true, message: '请输入承办单位', trigger: 'blur' },
+                    ],
+                    modelNameList: [
+                        { required: true, message: '请上传课题组通知', trigger: 'blur' },
+                    ]
                 },
-                formRules: {},
                 foldFormFlag: true,
                 data1: [],
                 data2: [],
-                roleForm: {},
+                roleForm: {
-                roleFormRules: {}
+                    revisionId: this.$store.getters.userInfo.userId,
+                    revisionIdName: this.$store.getters.userInfo.userName,
+                    ministerId: '',
+                    ministerIdName: '',
+                    presidentId: '',
+                    presidentIdName: '',
+                },
+                roleFormRules: {
+                    ministerIdName: [
+                        {required: true, message: '请选择法规认证部部长', trigger: 'change'},
+                    ],
+                    inspectorIdName: [
+                        {required: true, message: '请选择法规认证部总监', trigger: 'change'},
+                    ],
+                    presidentIdName: [
+                        {required: true, message: '请选择公司副总', trigger: 'change'},
+                    ]
+                },
+                fileMadel: false,
+                fileMadel2: false,
+                fileUrl:  'api/att/attFile/upload',
+                idList1: [],
+                idList2: [],
+                fileIndex: '',
+                fileList: [],
+                nodeList: [],
+                type: '',
+                drawerTitle: '',
+                modalshowflag: false,
             }
         },
         methods: {
+            add1() {
+                var id = Number(Math.random().toString().substr(3, 3) + Date.now()).toString(36);
+                var json = {
+                    ContactPerson: '',
+                    Company: '',
+                    Telephone: '',
+                    Email: '',
+                    id: id
+                }
+                this.data1.push(json)
+            },
+            add2() {
+                var id = Number(Math.random().toString().substr(3, 3) + Date.now()).toString(36);
+                var json = {
+                    Sindex: '',
+                    Member: '',
+                    Company: '',
+                    Email: '',
+                    id: id,
+                    Department: '',
+                    Telephone: '',
+                    Identity: '',
+                    dataName: '',
+                    data: [],
+                }
+                this.data2.push(json)
+            },
+            addDelete1() {
+                if (this.idList1.length > 0) {
+                    this.$confirm('删除选中数据, 是否继续?', '提示', {
+                        confirmButtonText: '确定',
+                        cancelButtonText: '取消',
+                        type: 'warning'
+                    }).then(() => {
+                        for (let a = 0; a < this.data1.length; a++) {
+                            this.idList1.forEach(item => {
+                                if (this.data1[a].id === item) {
+                                    this.data1.splice(a, 1)
+                                }
+                            })
+                        }
+                    }).catch(() => {
+                        this.$message({
+                            type: 'info',
+                            message: '已取消删除'
+                        });
+                    });
+                } else {
+                    this.$message.warning('请选择要删除的数据')
+                }
+            },
+            addDelete2() {
+                if (this.idList2.length > 0) {
+                    this.$confirm('删除选中数据, 是否继续?', '提示', {
+                        confirmButtonText: '确定',
+                        cancelButtonText: '取消',
+                        type: 'warning'
+                    }).then(() => {
+                        for (let a = 0; a < this.data2.length; a++) {
+                            this.idList2.forEach(item => {
+                                if (this.data2[a].id === item) {
+                                    this.data2.splice(a, 1)
+                                }
+                            })
+                        }
+                    }).catch(() => {
+                        this.$message({
+                            type: 'info',
+                            message: '已取消删除'
+                        });
+                    });
+                } else {
+                    this.$message.warning('请选择要删除的数据')
+                }
+            },
+            // 导入按钮 上传之前的钩子
+            beginImportFile(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 === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
+                    return true
+                } else {
+                    this.$message.error('文件' + file.name + '格式不正确，请上传PPT,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
+            },
+            importFileSuccess(response, file) {
+                if (response.ok) {
+                    this.rhform.modelList.push(response.data)
+                    let list = ''
+                    this.rhform.modelList.forEach(item => {
+                        if (list.length > 0) {
+                            list += ','
+                            list += item.name
+                        } else {
+                            list+= item.name
+                        }
+                    })
+                    this.rhform.modelNameList = list
+                    this.$message({
+                        showClose: true,
+                        message: response.message,
+                        type: 'success'
+                    })
+                } else {
+                    this.$message.error('程序异常，上传失败')
+                }
+            },
+            importFileRemove(file, fileList) {
+                let list = ''
+                this.rhform.modelList = []
+                fileList.forEach(item => {
+                    this.rhform.modelList.push(item)
+                    if (list.length > 0) {
+                        list += ','
+                        list += item.name
+                    } else {
+                        list+= item.name
+                    }
+                })
+                this.rhform.modelNameList = list
+            },
+            importFileSuccess2(response, file) {
+                if (response.ok) {
+                    this.data2[this.fileIndex].data.push(response.data)
+                    let list = ''
+                    this.data2[this.fileIndex].data.forEach(item => {
+                        if (list.length > 0) {
+                            list += ','
+                            list += item.name
+                        } else {
+                            list+= item.name
+                        }
+                    })
+                    this.data2[this.fileIndex].dataName = list
+                    this.$message({
+                        showClose: true,
+                        message: response.message,
+                        type: 'success'
+                    })
+                } else {
+                    this.$message.error('程序异常，上传失败')
+                }
+            },
+            importFileRemove2(file, fileList) {
+                let list = ''
+                this.data2[this.fileIndex].data = []
+                fileList.forEach(item => {
+                    this.data2[this.fileIndex].data.push(item)
+                    if (list.length > 0) {
+                        list += ','
+                        list += item.name
+                    } else {
+                        list+= item.name
+                    }
+                })
+                this.data2[this.fileIndex].dataName = list
+            },
+            fileUpload() {
+                this.fileMadel = true
+            },
+            fileUpload2(index) {
+                this.fileIndex = index
+                this.fileList = this.data2[this.fileIndex].data
+                this.fileMadel2 = true
+            },
             handleTabs(type) {
                 this.active = type;
             }, // 切换tabs
@@ -310,14 +666,139 @@
             handleSave() {
             }, // 保存事件
             handleSubmit() {
-                console.log(this.rhform);
+                this.$refs['rhForm'].validate((valid) => {
+                    if (valid) {
+                        if (this.data1.length) {
+                            if (this.data2.length) {
+                                let ContactPerson = 0,Company = 0,Telephone = 0,Email = 0,Sindex = 0,Member = 0,Telephone2 = 0,Email2 = 0, Company2 = 0,Department = 0,Identity = 0
+                                this.data1.forEach((item, index) =>{
+                                    if (!item.ContactPerson) {
+                                        ContactPerson++
+                                    } else if (!item.Company) {
+                                        Company++
+                                    } else if (!item.Telephone) {
+                                        Telephone++
+                                    } else if (!item.Email) {
+                                        Email++
+                                    }
+                                })
+                                this.data2.forEach((item, index) =>{
+                                    if (!item.Sindex) {
+                                        Sindex++
+                                    } else if (!item.Member) {
+                                        Member++
+                                    } else if (!item.Telephone) {
+                                        Telephone2++
+                                    } else if (!item.Email) {
+                                        Email2++
+                                    } else if (!item.Company) {
+                                        Company2++
+                                    } else if (!item.Department) {
+                                        Department++
+                                    } else if (!item.Identity) {
+                                        Identity++
+                                    }
+                                })
+                                if (ContactPerson > 0) {
+                                    return this.$message.warning('请输入联络人')
+                                } else if (Company > 0) {
+                                    return this.$message.warning('请输入课题组联络人单位')
+                                } else if (Telephone > 0) {
+                                    return this.$message.warning('请输入课题组联络人电话')
+                                } else if (Email > 0) {
+                                    return this.$message.warning('请输入课题组联络人邮箱')
+                                } else if (Sindex > 0) {
+                                    return this.$message.warning('请输入工作组排名顺序')
+                                } else if (Member > 0) {
+                                    return this.$message.warning('请输入我司成员')
+                                } else if (Telephone2 > 0) {
+                                    return this.$message.warning('请输入内部参与人员电话')
+                                } else if (Email2 > 0) {
+                                    return this.$message.warning('请输入内部参与人员油邮箱')
+                                } else if (Company2 > 0) {
+                                    return this.$message.warning('请输入内部参与人员单位')
+                                } else if (Department > 0) {
+                                    return this.$message.warning('请输入内部参与人员部门')
+                                } else if (Identity > 0) {
+                                    return this.$message.warning('请输入内部参与人员身份')
+                                } else {
+                                    this.$refs['Form'].validate((valid) => {
+                                        if (valid) {
+                                            this.isSubmit = true
+                                            this.$http.get('lawss/activiti/startProcess', {
+                                                type: '18'
+                                            }, {}, res => {
+                                                if (res.ok) {
+                                                    var json = Object.assign(this.rhform, this.roleForm)
+                                                    json.commentText = this.commentText
+                                                    json.data1 = this.data1
+                                                    json.data2 = this.data2
+                                                    this.$http.post('lawss/activiti/completeTask', {
+                                                        json: JSON.stringify(json),
+                                                        taskId: res.data,
+                                                        userId: this.$store.getters.userInfo.userId
+                                                    }, {}, res => {
+                                                        if (res.success) {
+                                                            this.$message.success('流程发起成功')
+                                                            this.$router.push('/processCenter')
+                                                            this.isSubmit = false
+                                                        } else {
+                                                            this.$message.warning('流程启动失败')
+                                                            this.isSubmit = false
+                                                        }
+                                                    })
+                                                } else {
+                                                    this.$message.warning('流程启动失败')
+                                                    this.isSubmit = false
+                                                }
+                                            })
+                                        } else {
+                                            return this.$message.warning('请完善人员信息')
+                                        }
+                                    })
+                                }
+                            } else {
+                                return this.$message.warning('请添加集团内部参与人员')
+                            }
+                        } else {
+                            return this.$message.warning('请添加课题组人员')
+                        }
+                    } else {
+                        return this.$message.warning('请完善基础信息')
+                    }
+                })
             }, // 提交事件
-            handleSelectionChange1() {
+            handleSelectionChange1(val) {
+                this.idList1 = []
+                val.forEach(item => {
+                    this.idList1.push(item.id)
+                })
             }, // table1选中change事件
-            handleSelectionChange2() {
+            handleSelectionChange2(val) {
+                this.idList2 = []
+                val.forEach(item => {
+                    this.idList2.push(item.id)
+                })
             }, // table2选中change事件
-            choiceZRR() {
+            choiceZRR(type, title, id) {
+                this.nodeList = []
+                this.nodeList.push(id)
+                this.type = type
+                this.drawerTitle = title
+                this.modalshowflag = true
             }, // 点击人员input事件
+            checkedRole(data) {
+                if (this.type === 'ministerId') {
+                    this.roleForm.ministerId = data[0].id
+                    this.roleForm.ministerIdName = data[0].name
+                } else if (this.type === 'inspectorId') {
+                    this.roleForm.inspectorId = data[0].id
+                    this.roleForm.inspectorIdName = data[0].name
+                } else if (this.type === 'presidentId') {
+                    this.roleForm.presidentId = data[0].id
+                    this.roleForm.presidentIdName = data[0].name
+                }
+            }, // 选择人员确认事件
         },
         mounted() {}
     };

src/pages/processCenter/pages/creatProcess/zcch/step2.vue

@@ -0,0 +1,434 @@
+<template>
+    <div class="zcch-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="time2" class="add-form-item form-item-disabled">
+                                    <el-date-picker
+                                            disabled
+                                            v-model="rhform.time2"
+                                            value-format="yyyy-MM-ddHH:mm:ss"
+                                            type="datetime"
+                                            placeholder="请选择参会时间">
+                                    </el-date-picker>
+                                </el-form-item>
+                                <el-form-item label="参会地点" prop="place" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            disabled
+                                            v-model="rhform.place"
+                                            placeholder="请输入参会地点"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                                <el-form-item label="承办单位" prop="Company" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            disabled
+                                            v-model="rhform.Company"
+                                            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="foldFormFlag ? 'el-icon-caret-top' : 'el-icon-caret-bottom'" @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="250"
+                            align="center">
+                        <template slot-scope="scope">
+                            <div v-if="scope.row.data.length > 0">
+                                <div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in scope.row.data" :key="index">{{ item.name }}</div>
+                            </div>
+                            <div v-else>
+                                - -
+                            </div>
+                        </template>
+                    </el-table-column>
+                </el-table>
+                <el-collapse accordion>
+                    <el-collapse-item title="回执说明">
+                        <div style="margin: 10px 0;">
+                            <el-input
+                                    type="textarea"
+                                    :rows="3"
+                                    resize="none"
+                                    placeholder="请输入意见"
+                                    v-model="commentText">
+                            </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 { saveTaskFirst,inboundLiaisonDetail } from "api/process";
+
+    export default {
+        name: "zcchStep2",
+        components: {
+            ProcessHeader,
+            ProcessFooter,
+            ProcessTitle
+        },
+        data() {
+            return {
+                commentText: '',
+                isSubmit: false,
+                saveLoading: false,
+                active: "1", //默认显示
+                rhform: {
+                    title: '',
+                    content: '',
+                    price: '',
+                    time: '',
+                    time2: '',
+                    place: '',
+                    Company: '',
+                    modelNameList: '',
+                    modelList: []
+                },
+                foldFormFlag: true,
+                data1: [],
+                data2: [],
+                roleForm: {
+                    revisionId: this.$store.getters.userInfo.userId,
+                    revisionIdName: this.$store.getters.userInfo.userName,
+                    ministerId: '',
+                    ministerIdName: '',
+                    presidentId: '',
+                    presidentIdName: '',
+                },
+                taskIds: this.$route.query.taskIds,
+                pId: this.$route.query.prcId,
+            }
+        },
+        methods: {
+            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
+                        this.rhform.time2 = data.time2
+                        this.rhform.place = data.place
+                        this.rhform.Company = data.Company
+                    }).catch(e => {
+                    })
+                })
+            },
+            updataFj (item) {
+                window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.id
+            },
+            handleTabs(type) {
+                this.active = type;
+            }, // 切换tabs
+            foldForm() {
+                this.foldFormFlag = !this.foldFormFlag
+            }, // 基础信息显隐
+            handleSave() {
+            }, // 保存事件
+            handleSubmit() {
+                let fgfbz
+                this.$confirm('是否继续审批?', '提示', {
+                    confirmButtonText: '继续审批',
+                    cancelButtonText: '结束流程',
+                    type: 'warning'
+                }).then(() => {
+                    fgfbz = 1
+                    this.isSubmit = true
+                    var json = this.json
+                    json.fgfbz = fgfbz
+                    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
+                    })
+                }).catch(() => {
+                    fgfbz = 2
+                    this.isSubmit = true
+                    var json = this.json
+                    json.fgfbz = fgfbz
+                    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('请输入反馈意见')
+                }
+            },
+        },
+        mounted() {
+            this.getData()
+        }
+    };
+</script>
+
+<style lang="less" scoped>
+    @import '~@/assets/styles/style';
+
+    .zcch-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>
+
+

src/pages/processCenter/pages/creatProcess/zcch/step3.vue

@@ -0,0 +1,409 @@
+<template>
+    <div class="zcch-step3">
+        <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="time2" class="add-form-item form-item-disabled">
+                                    <el-date-picker
+                                            disabled
+                                            value-format="yyyy-MM-ddHH:mm:ss"
+                                            v-model="rhform.time2"
+                                            type="datetime"
+                                            placeholder="请选择参会时间">
+                                    </el-date-picker>
+                                </el-form-item>
+                                <el-form-item label="参会地点" prop="place" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            disabled
+                                            v-model="rhform.place"
+                                            placeholder="请输入参会地点"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                                <el-form-item label="承办单位" prop="Company" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            disabled
+                                            v-model="rhform.Company"
+                                            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="foldFormFlag ? 'el-icon-caret-top' : 'el-icon-caret-bottom'" @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="250"
+                            align="center">
+                        <template slot-scope="scope">
+                            <div v-if="scope.row.data.length > 0">
+                                <div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in scope.row.data" :key="index">{{ item.name }}</div>
+                            </div>
+                            <div v-else>
+                                - -
+                            </div>
+                        </template>
+                    </el-table-column>
+                </el-table>
+                <el-collapse accordion>
+                    <el-collapse-item title="回执说明">
+                        <div style="margin: 10px 0;">
+                            <el-input
+                                    type="textarea"
+                                    :rows="3"
+                                    resize="none"
+                                    placeholder="请输入意见"
+                                    v-model="commentText">
+                            </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 { saveTaskFirst,inboundLiaisonDetail } from "api/process";
+
+    export default {
+        name: "zcchStep3",
+        components: {
+            ProcessHeader,
+            ProcessFooter,
+            ProcessTitle
+        },
+        data() {
+            return {
+                commentText: '',
+                isSubmit: false,
+                saveLoading: false,
+                active: "1", //默认显示
+                rhform: {
+                    title: '',
+                    content: '',
+                    price: '',
+                    time: '',
+                    time2: '',
+                    place: '',
+                    Company: '',
+                    modelNameList: '',
+                    modelList: []
+                },
+                foldFormFlag: true,
+                data1: [],
+                data2: [],
+                roleForm: {
+                    revisionId: this.$store.getters.userInfo.userId,
+                    revisionIdName: this.$store.getters.userInfo.userName,
+                    ministerId: '',
+                    ministerIdName: '',
+                    presidentId: '',
+                    presidentIdName: '',
+                },
+                taskIds: this.$route.query.taskIds,
+                pId: this.$route.query.prcId,
+            }
+        },
+        methods: {
+            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
+                        this.rhform.time2 = data.time2
+                        this.rhform.place = data.place
+                        this.rhform.Company = data.Company
+                    }).catch(e => {
+                    })
+                })
+            },
+            updataFj (item) {
+                window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.id
+            },
+            handleTabs(type) {
+                this.active = type;
+            }, // 切换tabs
+            foldForm() {
+                this.foldFormFlag = !this.foldFormFlag
+            }, // 基础信息显隐
+            handleSave() {
+            }, // 保存事件
+            handleSubmit() {
+                this.isSubmit = true
+                var json = this.json
+                json.gsfz = 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.gsfz = 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('请输入反馈意见')
+                }
+            },
+        },
+        mounted() {
+            this.getData()
+        }
+    };
+</script>
+
+<style lang="less" scoped>
+    @import '~@/assets/styles/style';
+
+    .zcch-step3 {
+        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>
+
+

src/pages/processCenter/pages/creatProcess/zchh/step1.vue

@@ -11,9 +11,8 @@
         <div class="content" v-show="active === '1'">
             <div style="flex: auto; overflow: auto;">
                 <el-form
-                        ref="qdqrForm"
+                        ref="rhForm"
                         :model="rhform"
-                        :rules="formRules"
                         class="label-input-form"
                         label-width="210px"
                 >
@@ -25,20 +24,15 @@
                             <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="Participants" class="add-form-item form-item-disabled">
-                                    <el-input
-                                            v-model="rhform.Participants"
-                                            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
@@ -46,20 +40,24 @@
                                 </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="price" class="add-form-item form-item-disabled">
+                                <el-form-item label="参会时间" prop="time2" class="add-form-item form-item-disabled">
                                     <el-date-picker
+                                            disabled
                                             v-model="rhform.time2"
+                                            value-format="yyyy-MM-ddHH:mm:ss"
                                             type="datetime"
-                                            placeholder="请选择完成时间">
+                                            placeholder="请选择参会时间">
                                     </el-date-picker>
                                 </el-form-item>
                                 <el-form-item label="参会地点" prop="place" class="add-form-item form-item-disabled">
                                     <el-input
+                                            disabled
                                             v-model="rhform.place"
                                             placeholder="请输入参会地点"
                                             clearable
@@ -67,28 +65,20 @@
                                 </el-form-item>
                                 <el-form-item label="承办单位" prop="Company" class="add-form-item form-item-disabled">
                                     <el-input
+                                            disabled
                                             v-model="rhform.Company"
                                             placeholder="请输入承办单位"
                                             clearable
                                     ></el-input>
                                 </el-form-item>
-                                <el-form-item label="会议总结" prop="summary" class="add-form-item form-item-disabled">
+                                <el-form-item label="会议通知" prop="modelNameList" class="add-form-item form-item-disabled">
-                                    <el-input
+                                    <div style="display: flex;">
-                                            v-model="rhform.summary"
+                                        <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>
-                                            placeholder="请输入会议总结"
+                                    </div>
-                                            clearable
-                                    ></el-input>
-                                </el-form-item>
-                                <el-form-item label="会议资料" prop="modelNameList" class="add-form-item form-item-disabled">
-                                    <el-button
-                                            type="primary"
-                                            class="common-button-primary"
-                                            size="mini">
-                                        点击上传
-                                    </el-button>
                                 </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="至"
@@ -99,19 +89,55 @@
                             </el-col>
                         </el-row>
                     </div>
-                    <el-button style="width: 100%" icon="el-icon-caret-top" @click="foldForm">{{ foldFormFlag ? '隐藏基础信息' : '展开基础信息' }}</el-button>
+                    <el-button style="width: 100%" :icon="foldFormFlag ? 'el-icon-caret-top' : 'el-icon-caret-bottom'" @click="foldForm">{{ foldFormFlag ? '隐藏基础信息' : '展开基础信息' }}</el-button>
                 </el-form>
                 <ProcessTitle>
-                    <template slot="title">外部信息</template>
+                    <template slot="title">会后信息</template>
+                </ProcessTitle>
+                <el-form
+                        ref="hhForm"
+                        :model="hhform"
+                        :rules="formRules"
+                        class="label-input-form"
+                        label-width="210px"
+                >
+                    <el-row :gutter="24">
+                        <el-col :span="24">
+                            <el-form-item label="会议总结" prop="title2" class="add-form-item form-item-disabled">
+                                <el-input
+                                        v-model="hhform.title2"
+                                        placeholder="请输入会议总结"
+                                        clearable
+                                ></el-input>
+                            </el-form-item>
+                            <el-form-item label="会议资料" prop="modelNameList2" class="add-form-item form-item-disabled">
+                                <el-input
+                                        disabled
+                                        style="display: none;"
+                                        v-model="hhform.modelNameList2"
+                                        clearable
+                                ></el-input>
+                                <div v-if="hhform.modelList2.length > 0" class="fileClass" style="display: flex;">
+                                    <div v-for="(item, index) in hhform.modelList2" :key="index" @click="fileUpload" style="margin-right: 5px;">
+                                        {{ item.name }}
+                                    </div>
+                                </div>
+                                <div v-else>
+                                    <el-button
+                                            type="primary"
+                                            class="common-button-primary"
+                                            @click="fileUpload"
+                                            size="mini">
+                                        点击上传
+                                    </el-button>
+                                </div>
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+                </el-form>
+                <ProcessTitle>
+                    <template slot="title">课题组联系方式</template>
                 </ProcessTitle>
-                <div class="action-bar">
-                    <el-button type="primary" class="common-button-primary add-button" size="mini">
-                        添加
-                    </el-button>
-                    <el-button type="primary" class="common-button-primary add-button" size="mini">
-                        批量删除
-                    </el-button>
-                </div>
                 <el-table border
                           ref="selection"
                           :data="data1"
@@ -119,43 +145,34 @@
                           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"
+                            prop="ContactPerson"
                             label="联络人"
                             width="150"
                             align="center">
                     </el-table-column>
                     <el-table-column
-                            prop="itemsName"
+                            prop="Company"
                             label="单位"
                             align="center">
                     </el-table-column>
                     <el-table-column
-                            prop="itermsConditions"
+                            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>
+                    <template slot="title">集团内部参与人员</template>
                 </ProcessTitle>
-                <div class="action-bar">
-                    <el-button type="primary" class="common-button-primary add-button" size="mini">
-                        添加
-                    </el-button>
-                    <el-button type="primary" class="common-button-primary add-button" size="mini">
-                        批量删除
-                    </el-button>
-                </div>
                 <el-table border
                           ref="selection"
                           :data="data2"
@@ -163,52 +180,88 @@
                           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"
+                            prop="Sindex"
                             label="我司在工作组排名顺序"
                             width="170"
                             align="center">
                     </el-table-column>
                     <el-table-column
-                            prop="itemsName"
+                            prop="Member"
                             label="我司成员"
                             width="150"
                             align="center">
                     </el-table-column>
                     <el-table-column
-                            prop="itermsConditions"
+                            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"
+                            width="250"
                             align="center">
+                        <template slot-scope="scope">
+                            <div v-if="scope.row.data.length > 0">
+                                <div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in scope.row.data" :key="index">{{ item.name }}</div>
+                            </div>
+                            <div v-else>
+                                - -
+                            </div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                            prop="info"
+                            label="是否参会"
+                            width="150"
+                            align="center">
+                        <template slot-scope="scope">
+                            <el-select v-model="scope.row.info" placeholder="请选择">
+                                <el-option label="是" value="1"></el-option>
+                                <el-option label="否" value="0"></el-option>
+                            </el-select>
+                        </template>
                     </el-table-column>
                 </el-table>
+                <el-collapse accordion>
+                    <el-collapse-item title="回执说明">
+                        <div style="margin: 10px 0;">
+                            <el-input
+                                    type="textarea"
+                                    :rows="3"
+                                    resize="none"
+                                    placeholder="请输入意见"
+                                    v-model="commentText">
+                            </el-input>
+                        </div>
+                    </el-collapse-item>
+                </el-collapse>
             </div>
         </div>
         <div class="content" v-show="active === '2'">
@@ -221,44 +274,22 @@
                             class="label-input-form">
                         <el-timeline-item timestamp="发起流程" placement="top" :color="roleForm.applyUserId ? '#66b1ff' : ''">
                             <el-card>
-                                <el-form-item prop="applyUserId" style="margin-bottom: 0">
+                                <el-form-item prop="revisionId" style="margin-bottom: 0">
                                     <h4>流程发起人</h4>
                                     <div style="margin-top: 10px;width: 300px;">
-                                        <el-input v-model="roleForm.applyUserId" style="display: none;"/>
+                                        <el-input v-model="roleForm.revisionId" style="display: none;"/>
-                                        <el-input v-model="roleForm.applyUserIdName" placeholder="流程发起人" disabled/>
+                                        <el-input v-model="roleForm.revisionIdName" placeholder="流程发起人" disabled/>
                                     </div>
                                 </el-form-item>
                             </el-card>
                         </el-timeline-item>
-                        <el-timeline-item timestamp="审批" placement="top" :color="roleForm.ministerUser ? '#66b1ff' : ''">
+                        <el-timeline-item timestamp="审批" placement="top" :color="roleForm.approvalId ? '#66b1ff' : ''">
                             <el-card>
-                                <el-form-item prop="ministerUserName" style="margin-bottom: 0">
+                                <el-form-item prop="approvalIdName" style="margin-bottom: 0">
                                     <h4>法规认证部部长</h4>
                                     <div style="margin-top: 10px;width: 300px;">
-                                        <el-input v-model="roleForm.ministerUser" style="display: none;"></el-input>
+                                        <el-input v-model="roleForm.approvalId" style="display: none;"></el-input>
-                                        <el-input v-model="roleForm.ministerUserName" placeholder="选择法规认证部部长" @click.native="choiceZRR('ministerUser', '选择标准法规部部长', roleForm.ministerUser)"></el-input>
+                                        <el-input v-model="roleForm.approvalIdName" placeholder="选择法规认证部部长" @click.native="choiceZRR('approvalId', '选择法规认证部部长', roleForm.approvalId)"></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-timeline-item timestamp="审批" placement="top" :color="roleForm.presidentUser ? '#66b1ff' : ''">
-                            <el-card>
-                                <el-form-item prop="presidentUserName" style="margin-bottom: 0">
-                                    <h4>公司副总</h4>
-                                    <div style="margin-top: 10px;width: 300px;">
-                                        <el-input v-model="roleForm.presidentUser" style="display: none;"></el-input>
-                                        <el-input v-model="roleForm.presidentUserName" placeholder="选择公司副总" @click.native="choiceZRR('presidentUser', '选择工程研究总院院长', roleForm.presidentUser)"></el-input>
                                     </div>
                                 </el-form-item>
                             </el-card>
@@ -268,14 +299,40 @@
             </div>
         </div>
         <ProcessFooter
-                show-save
                 show-submit
                 :submitLoading="isSubmit"
                 :saveLoading="saveLoading"
-                @save="handleSave"
                 @submit="handleSubmit"
         >
         </ProcessFooter>
+        <el-dialog width='400px' :visible.sync="fileMadel" title="上传会议资料">
+            <el-upload
+                    multiple
+                    class="upload-demo"
+                    drag
+                    :action="fileUrl"
+                    ref="importfile"
+                    name="file"
+                    accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx"
+                    :before-upload="beginImportFile"
+                    :on-success="importFileSuccess"
+                    :on-remove="importFileRemove"
+                    :show-file-list="true"
+                    :file-list="fileList"
+            >
+                <div style="padding: 20px 0">
+                    <i class="el-icon-upload" style="color: #3399ff"></i>
+                    <p>点击或拖拽上传文件</p>
+                </div>
+            </el-upload>
+        </el-dialog>
+        <Role-tree
+                check-box
+                :is-title="drawerTitle"
+                :is-visible.sync="modalshowflag"
+                @checkedRole="checkedRole"
+                :nodeList="nodeList"
+        ></Role-tree>
     </div>
 </template>
 
@@ -283,7 +340,7 @@
     import ProcessHeader from "../../components/ProcessHeader";
     import ProcessFooter from "../../components/ProcessFooter";
     import ProcessTitle from "../../components/ProcessTitle";
-    import { saveTaskFirst } from "api/process";
+    import { saveTaskFirst,inboundLiaisonDetail } from "api/process";
 
     export default {
         name: "zchhStep1",
@@ -294,48 +351,222 @@
         },
         data() {
             return {
+                fileList: [],
+                commentText: '',
                 isSubmit: false,
                 saveLoading: false,
                 active: "1", //默认显示
+                hhform: {
+                    title2: '',
+                    modelNameList2: '',
+                    modelList2: []
+                },
+                formRules: {
+                    title2: [
+                        { required: true, message: '请输入会议总结', trigger: 'blur' },
+                    ],
+                    modelNameList2: [
+                        { required: true, message: '请上传课题组通知', trigger: 'blur' },
+                    ]
+                },
                 rhform: {
                     title: '',
-                    Participants: '',
                     content: '',
                     price: '',
                     time: '',
                     time2: '',
                     place: '',
                     Company: '',
-                    summary: '',
+                    modelNameList: '',
+                    modelList: []
                 },
-                formRules: {},
                 foldFormFlag: true,
                 data1: [],
                 data2: [],
-                roleForm: {},
+                roleForm: {
-                roleFormRules: {}
+                    revisionId: this.$store.getters.userInfo.userId,
+                    revisionIdName: this.$store.getters.userInfo.userName,
+                    approvalId: '',
+                    approvalIdName: '',
+                },
+                roleFormRules: {
+                    approvalIdName: [
+                        {required: true, message: '请选择法规认证部部长', trigger: 'change'},
+                    ],
+                },
+                fileMadel: false,
+                fileUrl:  'api/att/attFile/upload',
+                nodeList: [],
+                type: '',
+                drawerTitle: '',
+                modalshowflag: false,
+                taskIds: this.$route.query.taskIds,
+                pId: this.$route.query.prcId,
             }
         },
         methods: {
+            updataFj (item) {
+                window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.id
+            },
+            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.Company = data.Company
+                        this.rhform.place = data.place
+                        this.rhform.time2 = data.time2
+                        this.rhform.modelList = data.modelList
+                        this.rhform.modelNameList = data.modelNameList
+                        this.hhform.title2 = data.title2 || ''
+                        this.hhform.modelList2 = data.modelList2 || []
+                        this.hhform.modelNameList2 = data.modelNameList2 || ''
+                        this.roleForm.approvalId = data.approvalId
+                        this.roleForm.approvalIdName = data.approvalIdName
+                    }).catch(e => {
+                    })
+                })
+            },
+            // 导入按钮 上传之前的钩子
+            beginImportFile(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 === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
+                    return true
+                } else {
+                    this.$message.error('文件' + file.name + '格式不正确，请上传PPT,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
+            },
+            importFileSuccess(response, file) {
+                if (response.ok) {
+                    this.hhform.modelList2.push(response.data)
+                    let list = ''
+                    this.hhform.modelList2.forEach(item => {
+                        if (list.length > 0) {
+                            list += ','
+                            list += item.name
+                        } else {
+                            list+= item.name
+                        }
+                    })
+                    this.hhform.modelNameList2 = list
+                    this.$message({
+                        showClose: true,
+                        message: response.message,
+                        type: 'success'
+                    })
+                } else {
+                    this.$message.error('程序异常，上传失败')
+                }
+            },
+            importFileRemove(file, fileList) {
+                let list = ''
+                this.hhform.modelList2 = []
+                fileList.forEach(item => {
+                    this.hhform.modelList2.push(item)
+                    if (list.length > 0) {
+                        list += ','
+                        list += item.name
+                    } else {
+                        list+= item.name
+                    }
+                })
+                this.hhform.modelNameList2 = list
+            },
+            fileUpload() {
+                this.fileList = this.hhform.modelList2
+                this.fileMadel = true
+            },
             handleTabs(type) {
                 this.active = type;
             }, // 切换tabs
             foldForm() {
                 this.foldFormFlag = !this.foldFormFlag
             }, // 基础信息显隐
-            handleSave() {
-            }, // 保存事件
             handleSubmit() {
-                console.log(this.rhform);
+                this.$refs['hhForm'].validate((valid) => {
+                    if (valid) {
+                        let info = 0
+                        this.data2.forEach((item, index) =>{
+                            if (!item.info) {
+                                info++
+                            }
+                        })
+                        if (info > 0) {
+                            return this.$message.warning('请选择是否参会')
+                        } else{
+                            this.$refs['Form'].validate((valid) => {
+                                if (valid) {
+                                    this.isSubmit = true
+                                    var json = Object.assign(this.rhform, this.roleForm, this.hhform)
+                                    json.commentText = this.commentText
+                                    json.data1 = this.data1
+                                    json.data2 = this.data2
+                                    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('流程启动失败')
+                                            this.isSubmit = false
+                                        }
+                                    })
+                                } else {
+                                    return this.$message.warning('请完善人员信息')
+                                }
+                            })
+                        }
+                    } else {
+                        return this.$message.warning('请完善会后信息')
+                    }
+                })
             }, // 提交事件
-            handleSelectionChange1() {
+            choiceZRR(type, title, id) {
-            }, // table1选中change事件
+                this.nodeList = []
-            handleSelectionChange2() {
+                this.nodeList.push(id)
-            }, // table2选中change事件
+                this.type = type
-            choiceZRR() {
+                this.drawerTitle = title
+                this.modalshowflag = true
             }, // 点击人员input事件
+            checkedRole(data) {
+                if (this.type === 'approvalId') {
+                    this.roleForm.approvalId = data[0].id
+                    this.roleForm.approvalIdName = data[0].name
+                }
+            }, // 选择人员确认事件
         },
-        mounted() {}
+        mounted() {
+            this.getData()
+        }
     };
 </script>
 

src/pages/processCenter/pages/creatProcess/zchh/step2.vue

@@ -0,0 +1,474 @@
+<template>
+    <div class="zchh-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="time2" class="add-form-item form-item-disabled">
+                                    <el-date-picker
+                                            disabled
+                                            v-model="rhform.time2"
+                                            value-format="yyyy-MM-ddHH:mm:ss"
+                                            type="datetime"
+                                            placeholder="请选择参会时间">
+                                    </el-date-picker>
+                                </el-form-item>
+                                <el-form-item label="参会地点" prop="place" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            disabled
+                                            v-model="rhform.place"
+                                            placeholder="请输入参会地点"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                                <el-form-item label="承办单位" prop="Company" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            disabled
+                                            v-model="rhform.Company"
+                                            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="foldFormFlag ? 'el-icon-caret-top' : 'el-icon-caret-bottom'" @click="foldForm">{{ foldFormFlag ? '隐藏基础信息' : '展开基础信息' }}</el-button>
+                </el-form>
+                <ProcessTitle>
+                    <template slot="title">会后信息</template>
+                </ProcessTitle>
+                <el-form
+                        ref="hhForm"
+                        :model="hhform"
+                        :rules="formRules"
+                        class="label-input-form"
+                        label-width="210px"
+                >
+                    <el-row :gutter="24">
+                        <el-col :span="24">
+                            <el-form-item label="会议总结" prop="title2" class="add-form-item form-item-disabled">
+                                <el-input
+                                        disabled
+                                        v-model="hhform.title2"
+                                        placeholder="请输入会议总结"
+                                        clearable
+                                ></el-input>
+                            </el-form-item>
+                            <el-form-item label="会议资料" prop="modelNameList2" 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 hhform.modelList2" :key="index">{{ item.name }}</div>
+                                </div>
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+                </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="250"
+                            align="center">
+                        <template slot-scope="scope">
+                            <div v-if="scope.row.data.length > 0">
+                                <div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in scope.row.data" :key="index">{{ item.name }}</div>
+                            </div>
+                            <div v-else>
+                                - -
+                            </div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                            prop="info"
+                            label="是否参会"
+                            width="150"
+                            align="center">
+                        <template slot-scope="scope">
+                            <div>
+                                {{ scope.row.info === '1' ? '是': '否' }}
+                            </div>
+                        </template>
+                    </el-table-column>
+                </el-table>
+                <el-collapse accordion>
+                    <el-collapse-item title="回执说明">
+                        <div style="margin: 10px 0;">
+                            <el-input
+                                    type="textarea"
+                                    :rows="3"
+                                    resize="none"
+                                    placeholder="请输入意见"
+                                    v-model="commentText">
+                            </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 { saveTaskFirst,inboundLiaisonDetail } from "api/process";
+
+    export default {
+        name: "zchhStep2",
+        components: {
+            ProcessHeader,
+            ProcessFooter,
+            ProcessTitle
+        },
+        data() {
+            return {
+                commentText: '',
+                isSubmit: false,
+                saveLoading: false,
+                active: "1", //默认显示
+                hhform: {
+                    title2: '',
+                    modelNameList2: '',
+                    modelList2: []
+                },
+                formRules: {
+                    title2: [
+                        { required: true, message: '请输入会议总结', trigger: 'blur' },
+                    ],
+                    modelNameList2: [
+                        { required: true, message: '请上传课题组通知', trigger: 'blur' },
+                    ]
+                },
+                rhform: {
+                    title: '',
+                    content: '',
+                    price: '',
+                    time: '',
+                    time2: '',
+                    place: '',
+                    Company: '',
+                    modelNameList: '',
+                    modelList: []
+                },
+                foldFormFlag: true,
+                data1: [],
+                data2: [],
+                roleForm: {
+                    revisionId: this.$store.getters.userInfo.userId,
+                    revisionIdName: this.$store.getters.userInfo.userName,
+                    approvalId: '',
+                    approvalIdName: '',
+                },
+                roleFormRules: {
+                    approvalIdName: [
+                        {required: true, message: '请选择法规认证部部长', trigger: 'change'},
+                    ],
+                },
+                fileMadel: false,
+                fileUrl:  'api/att/attFile/upload',
+                nodeList: [],
+                type: '',
+                drawerTitle: '',
+                modalshowflag: false,
+                taskIds: this.$route.query.taskIds,
+                pId: this.$route.query.prcId,
+            }
+        },
+        methods: {
+            updataFj (item) {
+                window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.id
+            },
+            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.Company = data.Company
+                        this.rhform.place = data.place
+                        this.rhform.time2 = data.time2
+                        this.rhform.modelList = data.modelList
+                        this.rhform.modelNameList = data.modelNameList
+                        this.hhform.title2 = data.title2 || ''
+                        this.hhform.modelList2 = data.modelList2 || []
+                        this.hhform.modelNameList2 = data.modelNameList2 || ''
+                        this.roleForm.approvalId = data.approvalId
+                        this.roleForm.approvalIdName = data.approvalIdName
+                    }).catch(e => {
+                    })
+                })
+            },
+            handleTabs(type) {
+                this.active = type;
+            }, // 切换tabs
+            foldForm() {
+                this.foldFormFlag = !this.foldFormFlag
+            }, // 基础信息显隐
+            handleSubmit() {
+                this.isSubmit = true
+                var json = this.json
+                json.shyFlag = 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.shyFlag = 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('请输入反馈意见')
+                }
+            },
+        },
+        mounted() {
+            this.getData()
+        }
+    };
+</script>
+
+<style lang="less" scoped>
+    @import '~@/assets/styles/style';
+
+    .zchh-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>
+
+

src/pages/processCenter/pages/creatProcess/zcrh/step1-1.vue

@@ -0,0 +1,881 @@
+<template>
+    <div class="zcrh-step1">
+        <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;">
+                <el-form
+                        ref="rhForm"
+                        :model="rhform"
+                        :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 :span="24">
+                                <el-form-item label="课题名称" prop="title" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            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
+                                            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
+                                            v-model="rhform.price"
+                                            placeholder="请输入费用"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                                <el-form-item label="课题组通知" prop="modelNameList" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            disabled
+                                            style="display: none;"
+                                            v-model="rhform.modelNameList"
+                                            clearable
+                                    ></el-input>
+                                    <div v-if="rhform.modelList.length > 0" class="fileClass" style="display: flex;">
+                                        <div v-for="(item, index) in rhform.modelList" :key="index" @click="fileUpload" style="margin-right: 5px;">
+                                            {{ item.name }}
+                                        </div>
+                                    </div>
+                                    <div v-else>
+                                        <el-button
+                                                type="primary"
+                                                class="common-button-primary"
+                                                @click="fileUpload"
+                                                size="mini">
+                                            点击上传
+                                        </el-button>
+                                    </div>
+                                </el-form-item>
+                                <el-form-item label="课题研究周期" prop="time" class="add-form-item form-item-disabled">
+                                    <el-date-picker
+                                            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="foldFormFlag ? 'el-icon-caret-top' : 'el-icon-caret-bottom'" @click="foldForm">{{ foldFormFlag ? '隐藏基础信息' : '展开基础信息' }}</el-button>
+                </el-form>
+                <ProcessTitle>
+                    <template slot="title">课题组联系方式</template>
+                </ProcessTitle>
+                <div class="action-bar">
+                    <el-button type="primary" class="common-button-primary add-button" size="mini" @click="add1">
+                        添加
+                    </el-button>
+                    <el-button type="primary" :disabled="!idList1.length > 0" class="common-button-primary add-button" size="mini" @click="addDelete1">
+                        批量删除
+                    </el-button>
+                </div>
+                <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'}"
+                          @selection-change="handleSelectionChange1"
+                          row-key="id">
+                    <el-table-column type="selection" width="55" align="center"/>
+                    <el-table-column
+                            prop="ContactPerson"
+                            label="联络人"
+                            width="150"
+                            align="center">
+                        <template slot-scope="scope">
+                            <el-input style="margin: 10px 0;" v-model="scope.row.ContactPerson"></el-input>
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                            prop="Company"
+                            label="单位"
+                            align="center">
+                        <template slot-scope="scope">
+                            <el-input style="margin: 10px 0;" v-model="scope.row.Company"></el-input>
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                            prop="Telephone"
+                            label="电话"
+                            width="200"
+                            align="center">
+                        <template slot-scope="scope">
+                            <el-input style="margin: 10px 0;" v-model="scope.row.Telephone"></el-input>
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                            prop="Email"
+                            label="邮箱"
+                            width="350"
+                            align="center">
+                        <template slot-scope="scope">
+                            <el-input style="margin: 10px 0;" v-model="scope.row.Email"></el-input>
+                        </template>
+                    </el-table-column>
+                </el-table>
+                <ProcessTitle>
+                    <template slot="title">集团内部参与人员</template>
+                </ProcessTitle>
+                <div class="action-bar">
+                    <el-button type="primary" class="common-button-primary add-button" size="mini" @click="add2">
+                        添加
+                    </el-button>
+                    <el-button :disabled="!idList2.length > 0" type="primary" class="common-button-primary add-button" size="mini" @click="addDelete2">
+                        批量删除
+                    </el-button>
+                </div>
+                <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'}"
+                          @selection-change="handleSelectionChange2"
+                          row-key="id">
+                    <el-table-column type="selection" width="55" align="center"/>
+                    <el-table-column
+                            prop="Sindex"
+                            label="我司在工作组排名顺序"
+                            width="170"
+                            align="center">
+                        <template slot-scope="scope">
+                            <el-input style="margin: 10px 0;" v-model="scope.row.Sindex"></el-input>
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                            prop="Member"
+                            label="我司成员"
+                            width="150"
+                            align="center">
+                        <template slot-scope="scope">
+                            <el-input style="margin: 10px 0;" v-model="scope.row.Member"></el-input>
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                            prop="Company"
+                            label="单位"
+                            align="center">
+                        <template slot-scope="scope">
+                            <el-input style="margin: 10px 0;" v-model="scope.row.Company"></el-input>
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                            prop="Department"
+                            label="部门"
+                            width="150"
+                            align="center">
+                        <template slot-scope="scope">
+                            <el-input style="margin: 10px 0;" v-model="scope.row.Department"></el-input>
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                            prop="Telephone"
+                            label="电话"
+                            width="200"
+                            align="center">
+                        <template slot-scope="scope">
+                            <el-input style="margin: 10px 0;" v-model="scope.row.Telephone"></el-input>
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                            prop="Email"
+                            label="邮箱"
+                            width="300"
+                            align="center">
+                        <template slot-scope="scope">
+                            <el-input style="margin: 10px 0;" v-model="scope.row.Email"></el-input>
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                            prop="Identity"
+                            label="身份"
+                            width="150"
+                            align="center">
+                        <template slot-scope="scope">
+                            <el-input style="margin: 10px 0;" v-model="scope.row.Identity"></el-input>
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                            prop="data"
+                            label="资料"
+                            width="250"
+                            align="center">
+                        <template slot-scope="scope">
+                            <div v-if="scope.row.data.length > 0" class="fileClass">
+                                <div v-for="(item, index) in scope.row.data" :key="index" @click="fileUpload2(scope.$index)" style="margin-right: 5px;">
+                                    {{ item.name }}
+                                </div>
+                            </div>
+                            <div v-else>
+                                <el-button
+                                        type="primary"
+                                        class="common-button-primary"
+                                        @click="fileUpload2(scope.$index)"
+                                        size="mini">
+                                    点击上传
+                                </el-button>
+                            </div>
+                        </template>
+                    </el-table-column>
+                </el-table>
+                <el-collapse accordion>
+                    <el-collapse-item title="回执说明">
+                        <div style="margin: 10px 0;">
+                            <el-input
+                                    type="textarea"
+                                    :rows="3"
+                                    resize="none"
+                                    placeholder="请输入意见"
+                                    v-model="commentText">
+                            </el-input>
+                        </div>
+                    </el-collapse-item>
+                </el-collapse>
+            </div>
+        </div>
+        <div class="content" v-show="active === '2'">
+            <div class="block" style="padding-top: 20px;">
+                <el-timeline>
+                    <el-form
+                            ref="Form"
+                            :model="roleForm"
+                            :rules="roleFormRules"
+                            class="label-input-form">
+                        <el-timeline-item timestamp="发起流程" placement="top" :color="roleForm.applyUserId ? '#66b1ff' : ''">
+                            <el-card>
+                                <el-form-item prop="revisionId" style="margin-bottom: 0">
+                                    <h4>流程发起人</h4>
+                                    <div style="margin-top: 10px;width: 300px;">
+                                        <el-input v-model="roleForm.revisionId" style="display: none;"/>
+                                        <el-input v-model="roleForm.revisionIdName" placeholder="流程发起人" disabled/>
+                                    </div>
+                                </el-form-item>
+                            </el-card>
+                        </el-timeline-item>
+                        <el-timeline-item timestamp="审批" placement="top" :color="roleForm.ministerId ? '#66b1ff' : ''">
+                            <el-card>
+                                <el-form-item prop="ministerIdName" style="margin-bottom: 0">
+                                    <h4>法规认证部部长</h4>
+                                    <div style="margin-top: 10px;width: 300px;">
+                                        <el-input v-model="roleForm.ministerId" style="display: none;"></el-input>
+                                        <el-input v-model="roleForm.ministerIdName" placeholder="选择法规认证部部长" @click.native="choiceZRR('ministerId', '选择法规认证部部长', roleForm.ministerId)"></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="inspectorIdName" style="margin-bottom: 0">
+                                    <h4>法规认证部副总监</h4>
+                                    <div style="margin-top: 10px;width: 300px;">
+                                        <el-input v-model="roleForm.inspectorId" style="display: none;"></el-input>
+                                        <el-input v-model="roleForm.inspectorIdName" placeholder="选择法规认证部副总监" @click.native="choiceZRR('inspectorId', '选择法规认证部副总监', roleForm.inspectorId)"></el-input>
+                                    </div>
+                                </el-form-item>
+                            </el-card>
+                        </el-timeline-item>
+                        <el-timeline-item timestamp="审批" placement="top" :color="roleForm.presidentUser ? '#66b1ff' : ''">
+                            <el-card>
+                                <el-form-item prop="presidentIdName" style="margin-bottom: 0">
+                                    <h4>公司副总</h4>
+                                    <div style="margin-top: 10px;width: 300px;">
+                                        <el-input v-model="roleForm.presidentId" style="display: none;"></el-input>
+                                        <el-input v-model="roleForm.presidentIdName" placeholder="选择公司副总" @click.native="choiceZRR('presidentId', '选择公司副总', roleForm.presidentId)"></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>
+        <el-dialog width='400px' :visible.sync="fileMadel" title="上传课题组通知">
+            <el-upload
+                    v-if="fileMadel"
+                    multiple
+                    class="upload-demo"
+                    drag
+                    :action="fileUrl"
+                    ref="importfile"
+                    name="file"
+                    accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx"
+                    :before-upload="beginImportFile"
+                    :on-success="importFileSuccess"
+                    :on-remove="importFileRemove"
+                    :show-file-list="true"
+                    :file-list="fileList1"
+            >
+                <div style="padding: 20px 0">
+                    <i class="el-icon-upload" style="color: #3399ff"></i>
+                    <p>点击或拖拽上传文件</p>
+                </div>
+            </el-upload>
+        </el-dialog>
+        <el-dialog width='400px' :visible.sync="fileMadel2" title="上传资料">
+            <el-upload
+                    v-if="fileMadel2"
+                    multiple
+                    class="upload-demo"
+                    drag
+                    :action="fileUrl"
+                    ref="importfile2"
+                    name="file"
+                    accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx"
+                    :before-upload="beginImportFile"
+                    :on-success="importFileSuccess2"
+                    :on-remove="importFileRemove2"
+                    :show-file-list="true"
+                    :file-list="fileList"
+            >
+                <div style="padding: 20px 0">
+                    <i class="el-icon-upload" style="color: #3399ff"></i>
+                    <p>点击或拖拽上传文件</p>
+                </div>
+            </el-upload>
+        </el-dialog>
+        <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 ProcessFooter from "../../components/ProcessFooter";
+    import ProcessTitle from "../../components/ProcessTitle";
+    import { saveTaskFirst,inboundLiaisonDetail } from "api/process";
+
+    export default {
+        name: "zcrhStep1",
+        components: {
+            ProcessHeader,
+            ProcessFooter,
+            ProcessTitle
+        },
+        data() {
+            return {
+                commentText: '',
+                isSubmit: false,
+                saveLoading: false,
+                active: "1", //默认显示
+                rhform: {
+                    title: '',
+                    content: '',
+                    price: '',
+                    time: '',
+                    modelNameList: '',
+                    modelList: []
+                },
+                formRules: {
+                    title: [
+                        { required: true, message: '请输入课题名称', trigger: 'blur' },
+                    ],
+                    content: [
+                        { required: true, message: '请输入主要议题', trigger: 'blur' },
+                    ],
+                    price: [
+                        { required: true, message: '请输入费用', trigger: 'blur' },
+                    ],
+                    time: [
+                        { required: true, message: '请选择课题研究周期', trigger: 'change' },
+                    ],
+                    modelNameList: [
+                        { required: true, message: '请上传课题组通知', trigger: 'blur' },
+                    ]
+                },
+                foldFormFlag: true,
+                data1: [],
+                data2: [],
+                roleForm: {
+                    revisionId: this.$store.getters.userInfo.userId,
+                    revisionIdName: this.$store.getters.userInfo.userName,
+                    ministerId: '',
+                    ministerIdName: '',
+                    inspectorId: '',
+                    inspectorIdName: '',
+                    presidentId: '',
+                    presidentIdName: '',
+                },
+                roleFormRules: {
+                    ministerIdName: [
+                        {required: true, message: '请选择法规认证部部长', trigger: 'change'},
+                    ],
+                    inspectorIdName: [
+                        {required: true, message: '请选择法规认证部总监', trigger: 'change'},
+                    ],
+                    presidentIdName: [
+                        {required: true, message: '请选择公司副总', trigger: 'change'},
+                    ]
+                },
+                fileMadel: false,
+                fileMadel2: false,
+                fileUrl:  'api/att/attFile/upload',
+                idList1: [],
+                idList2: [],
+                fileIndex: '',
+                fileList: [],
+                fileList1: [],
+                nodeList: [],
+                type: '',
+                drawerTitle: '',
+                modalshowflag: false,
+                taskIds: this.$route.query.taskIds,
+                pId: this.$route.query.prcId,
+            }
+        },
+        methods: {
+            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
+                        this.rhform.modelNameList = data.modelNameList
+                        this.roleForm.inspectorId = data.inspectorId
+                        this.roleForm.inspectorIdName = data.inspectorIdName
+                        this.roleForm.ministerId = data.ministerId
+                        this.roleForm.ministerIdName = data.ministerIdName
+                        this.roleForm.presidentId = data.presidentId
+                        this.roleForm.presidentIdName = data.presidentIdName
+                    }).catch(e => {
+                    })
+                })
+            },
+            add1() {
+                var id = Number(Math.random().toString().substr(3, 3) + Date.now()).toString(36);
+                var json = {
+                    ContactPerson: '',
+                    Company: '',
+                    Telephone: '',
+                    Email: '',
+                    id: id
+                }
+                this.data1.push(json)
+            },
+            add2() {
+                var id = Number(Math.random().toString().substr(3, 3) + Date.now()).toString(36);
+                var json = {
+                    Sindex: '',
+                    Member: '',
+                    Company: '',
+                    Email: '',
+                    id: id,
+                    Department: '',
+                    Telephone: '',
+                    Identity: '',
+                    dataName: '',
+                    data: [],
+                }
+                this.data2.push(json)
+            },
+            addDelete1() {
+                if (this.idList1.length > 0) {
+                    this.$confirm('删除选中数据, 是否继续?', '提示', {
+                        confirmButtonText: '确定',
+                        cancelButtonText: '取消',
+                        type: 'warning'
+                    }).then(() => {
+                        for (let a = 0; a < this.data1.length; a++) {
+                            this.idList1.forEach(item => {
+                                if (this.data1[a].id === item) {
+                                    this.data1.splice(a, 1)
+                                }
+                            })
+                        }
+                    }).catch(() => {
+                        this.$message({
+                            type: 'info',
+                            message: '已取消删除'
+                        });
+                    });
+                } else {
+                    this.$message.warning('请选择要删除的数据')
+                }
+            },
+            addDelete2() {
+                if (this.idList2.length > 0) {
+                    this.$confirm('删除选中数据, 是否继续?', '提示', {
+                        confirmButtonText: '确定',
+                        cancelButtonText: '取消',
+                        type: 'warning'
+                    }).then(() => {
+                        for (let a = 0; a < this.data2.length; a++) {
+                            this.idList2.forEach(item => {
+                                if (this.data2[a].id === item) {
+                                    this.data2.splice(a, 1)
+                                }
+                            })
+                        }
+                    }).catch(() => {
+                        this.$message({
+                            type: 'info',
+                            message: '已取消删除'
+                        });
+                    });
+                } else {
+                    this.$message.warning('请选择要删除的数据')
+                }
+            },
+            // 导入按钮 上传之前的钩子
+            beginImportFile(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 === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
+                    return true
+                } else {
+                    this.$message.error('文件' + file.name + '格式不正确，请上传PPT,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
+            },
+            importFileSuccess(response, file) {
+                if (response.ok) {
+                    this.rhform.modelList.push(response.data)
+                    let list = ''
+                    this.rhform.modelList.forEach(item => {
+                        if (list.length > 0) {
+                            list += ','
+                            list += item.name
+                        } else {
+                            list+= item.name
+                        }
+                    })
+                    this.rhform.modelNameList = list
+                    this.$message({
+                        showClose: true,
+                        message: response.message,
+                        type: 'success'
+                    })
+                } else {
+                    this.$message.error('程序异常，上传失败')
+                }
+            },
+            importFileRemove(file, fileList) {
+                let list = ''
+                this.rhform.modelList = []
+                fileList.forEach(item => {
+                    this.rhform.modelList.push(item)
+                    if (list.length > 0) {
+                        list += ','
+                        list += item.name
+                    } else {
+                        list+= item.name
+                    }
+                })
+                this.rhform.modelNameList = list
+            },
+            importFileSuccess2(response, file) {
+                if (response.ok) {
+                    this.data2[this.fileIndex].data.push(response.data)
+                    let list = ''
+                    this.data2[this.fileIndex].data.forEach(item => {
+                        if (list.length > 0) {
+                            list += ','
+                            list += item.name
+                        } else {
+                            list+= item.name
+                        }
+                    })
+                    this.data2[this.fileIndex].dataName = list
+                    this.$message({
+                        showClose: true,
+                        message: response.message,
+                        type: 'success'
+                    })
+                } else {
+                    this.$message.error('程序异常，上传失败')
+                }
+            },
+            importFileRemove2(file, fileList) {
+                let list = ''
+                this.data2[this.fileIndex].data = []
+                fileList.forEach(item => {
+                    this.data2[this.fileIndex].data.push(item)
+                    if (list.length > 0) {
+                        list += ','
+                        list += item.name
+                    } else {
+                        list+= item.name
+                    }
+                })
+                this.data2[this.fileIndex].dataName = list
+            },
+            fileUpload() {
+                this.fileList1 = this.rhform.modelList
+                this.fileMadel = true
+            },
+            fileUpload2(index) {
+                this.fileIndex = index
+                this.fileList = this.data2[this.fileIndex].data
+                this.fileMadel2 = true
+            },
+            handleTabs(type) {
+                this.active = type;
+            }, // 切换tabs
+            foldForm() {
+                this.foldFormFlag = !this.foldFormFlag
+            }, // 基础信息显隐
+            handleSave() {
+            }, // 保存事件
+            handleSubmit() {
+                this.$refs['rhForm'].validate((valid) => {
+                    if (valid) {
+                        if (this.data1.length) {
+                            if (this.data2.length) {
+                                let ContactPerson = 0,Company = 0,Telephone = 0,Email = 0,Sindex = 0,Member = 0,Telephone2 = 0,Email2 = 0, Company2 = 0,Department = 0,Identity = 0
+                                this.data1.forEach((item, index) =>{
+                                    if (!item.ContactPerson) {
+                                        ContactPerson++
+                                    } else if (!item.Company) {
+                                        Company++
+                                    } else if (!item.Telephone) {
+                                        Telephone++
+                                    } else if (!item.Email) {
+                                        Email++
+                                    }
+                                })
+                                this.data2.forEach((item, index) =>{
+                                    if (!item.Sindex) {
+                                        Sindex++
+                                    } else if (!item.Member) {
+                                        Member++
+                                    } else if (!item.Telephone) {
+                                        Telephone2++
+                                    } else if (!item.Email) {
+                                        Email2++
+                                    } else if (!item.Company) {
+                                        Company2++
+                                    } else if (!item.Department) {
+                                        Department++
+                                    } else if (!item.Identity) {
+                                        Identity++
+                                    }
+                                })
+                                if (ContactPerson > 0) {
+                                    return this.$message.warning('请输入联络人')
+                                } else if (Company > 0) {
+                                    return this.$message.warning('请输入课题组联络人单位')
+                                } else if (Telephone > 0) {
+                                    return this.$message.warning('请输入课题组联络人电话')
+                                } else if (Email > 0) {
+                                    return this.$message.warning('请输入课题组联络人邮箱')
+                                } else if (Sindex > 0) {
+                                    return this.$message.warning('请输入工作组排名顺序')
+                                } else if (Member > 0) {
+                                    return this.$message.warning('请输入我司成员')
+                                } else if (Telephone2 > 0) {
+                                    return this.$message.warning('请输入内部参与人员电话')
+                                } else if (Email2 > 0) {
+                                    return this.$message.warning('请输入内部参与人员油邮箱')
+                                } else if (Company2 > 0) {
+                                    return this.$message.warning('请输入内部参与人员单位')
+                                } else if (Department > 0) {
+                                    return this.$message.warning('请输入内部参与人员部门')
+                                } else if (Identity > 0) {
+                                    return this.$message.warning('请输入内部参与人员身份')
+                                } else {
+                                    this.$refs['Form'].validate((valid) => {
+                                        if (valid) {
+                                            this.isSubmit = true
+                                            this.$http.get('lawss/activiti/startProcess', {
+                                                type: '17'
+                                            }, {}, res => {
+                                                if (res.ok) {
+                                                    var json = Object.assign(this.rhform, this.roleForm)
+                                                    json.commentText = this.commentText
+                                                    json.data1 = this.data1
+                                                    json.data2 = this.data2
+                                                    this.$http.post('lawss/activiti/completeTask', {
+                                                        json: JSON.stringify(json),
+                                                        taskId: res.data,
+                                                        userId: this.$store.getters.userInfo.userId
+                                                    }, {}, res => {
+                                                        if (res.success) {
+                                                            this.$message.success('流程发起成功')
+                                                            this.$router.push('/processCenter')
+                                                            this.isSubmit = false
+                                                        } else {
+                                                            this.$message.warning('流程启动失败')
+                                                            this.isSubmit = false
+                                                        }
+                                                    })
+                                                } else {
+                                                    this.$message.warning('流程启动失败')
+                                                    this.isSubmit = false
+                                                }
+                                            })
+                                        } else {
+                                            return this.$message.warning('请完善人员信息')
+                                        }
+                                    })
+                                }
+                            } else {
+                                return this.$message.warning('请添加集团内部参与人员')
+                            }
+                        } else {
+                            return this.$message.warning('请添加课题组人员')
+                        }
+                    } else {
+                        return this.$message.warning('请完善基础信息')
+                    }
+                })
+            }, // 提交事件
+            handleSelectionChange1(val) {
+                this.idList1 = []
+                val.forEach(item => {
+                    this.idList1.push(item.id)
+                })
+            }, // table1选中change事件
+            handleSelectionChange2(val) {
+                this.idList2 = []
+                val.forEach(item => {
+                    this.idList2.push(item.id)
+                })
+            }, // table2选中change事件
+            choiceZRR(type, title, id) {
+                this.nodeList = []
+                this.nodeList.push(id)
+                this.type = type
+                this.drawerTitle = title
+                this.modalshowflag = true
+            }, // 点击人员input事件
+            checkedRole(data) {
+                if (this.type === 'ministerId') {
+                    this.roleForm.ministerId = data[0].id
+                    this.roleForm.ministerIdName = data[0].name
+                } else if (this.type === 'inspectorId') {
+                    this.roleForm.inspectorId = data[0].id
+                    this.roleForm.inspectorIdName = data[0].name
+                } else if (this.type === 'presidentId') {
+                    this.roleForm.presidentId = data[0].id
+                    this.roleForm.presidentIdName = data[0].name
+                }
+            }, // 选择人员确认事件
+        },
+        mounted() {
+            this.getData()
+        }
+    };
+</script>
+
+<style lang="less" scoped>
+    @import '~@/assets/styles/style';
+    .zcrh-step1 {
+        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>
+
+

src/pages/processCenter/pages/creatProcess/zcrh/step1.vue

@@ -78,7 +78,7 @@
                             </el-col>
                         </el-row>
                     </div>
-                    <el-button style="width: 100%" icon="el-icon-caret-top" @click="foldForm">{{ foldFormFlag ? '隐藏基础信息' : '展开基础信息' }}</el-button>
+                    <el-button style="width: 100%" :icon="foldFormFlag ? 'el-icon-caret-top' : 'el-icon-caret-bottom'" @click="foldForm">{{ foldFormFlag ? '隐藏基础信息' : '展开基础信息' }}</el-button>
                 </el-form>
                 <ProcessTitle>
                     <template slot="title">课题组联系方式</template>
@@ -223,7 +223,7 @@
                     <el-table-column
                             prop="data"
                             label="资料"
-                            width="200"
+                            width="250"
                             align="center">
                         <template slot-scope="scope">
                             <div v-if="scope.row.data.length > 0" class="fileClass">

src/pages/processCenter/pages/creatProcess/zcrh/step2.vue

@@ -63,7 +63,7 @@
                             </el-col>
                         </el-row>
                     </div>
-                    <el-button style="width: 100%" icon="el-icon-caret-top" @click="foldForm">{{ foldFormFlag ? '隐藏基础信息' : '展开基础信息' }}</el-button>
+                    <el-button style="width: 100%" :icon="foldFormFlag ? 'el-icon-caret-top' : 'el-icon-caret-bottom'" @click="foldForm">{{ foldFormFlag ? '隐藏基础信息' : '展开基础信息' }}</el-button>
                 </el-form>
                 <ProcessTitle>
                     <template slot="title">课题组联系方式</template>
@@ -155,8 +155,16 @@
                     <el-table-column
                             prop="data"
                             label="资料"
-                            width="200"
+                            width="250"
                             align="center">
+                        <template slot-scope="scope">
+                            <div v-if="scope.row.data.length > 0">
+                                <div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in scope.row.data" :key="index">{{ item.name }}</div>
+                            </div>
+                            <div v-else>
+                                - -
+                            </div>
+                        </template>
                     </el-table-column>
                 </el-table>
                 <el-collapse accordion>

src/pages/processCenter/pages/creatProcess/zcrh/step3.vue

@@ -0,0 +1,364 @@
+<template>
+    <div class="zcrh-step3">
+        <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="foldFormFlag ? 'el-icon-caret-top' : 'el-icon-caret-bottom'" @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="250"
+                            align="center">
+                        <template slot-scope="scope">
+                            <div v-if="scope.row.data.length > 0">
+                                <div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in scope.row.data" :key="index">{{ item.name }}</div>
+                            </div>
+                            <div v-else>
+                                - -
+                            </div>
+                        </template>
+                    </el-table-column>
+                </el-table>
+                <el-collapse accordion>
+                    <el-collapse-item title="回执说明">
+                        <div style="margin: 10px 0;">
+                            <el-input
+                                    type="textarea"
+                                    :rows="3"
+                                    resize="none"
+                                    placeholder="请输入意见"
+                                    v-model="commentText">
+                            </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: "zcrhStep3",
+        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.fgfzj = 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.fgfzj = 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-step3 {
+        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>

src/pages/processCenter/pages/creatProcess/zcrh/step4.vue

@@ -0,0 +1,364 @@
+<template>
+    <div class="zcrh-step4">
+        <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="foldFormFlag ? 'el-icon-caret-top' : 'el-icon-caret-bottom'" @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="250"
+                            align="center">
+                        <template slot-scope="scope">
+                            <div v-if="scope.row.data.length > 0">
+                                <div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in scope.row.data" :key="index">{{ item.name }}</div>
+                            </div>
+                            <div v-else>
+                                - -
+                            </div>
+                        </template>
+                    </el-table-column>
+                </el-table>
+                <el-collapse accordion>
+                    <el-collapse-item title="回执说明">
+                        <div style="margin: 10px 0;">
+                            <el-input
+                                    type="textarea"
+                                    :rows="3"
+                                    resize="none"
+                                    placeholder="请输入意见"
+                                    v-model="commentText">
+                            </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: "zcrhStep4",
+        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.gsfz = 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.gsfz = 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-step4 {
+        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>

src/pages/processCenter/pages/newProcess/index.vue

@@ -142,7 +142,7 @@
             </div>
           </el-card>
         </el-col>
-        <el-col :span="size ? 6 : 8" v-btn-permission="'7d81e0afa045f8ba8911bcf984b64675'">
+        <el-col :span="size ? 6 : 8" v-btn-permission="'2e3f4c0aaf77629755533255f1335801'">
           <el-card shadow="hover">
             <div class="card-box" @click="handleCreateProcess('17')">
               <div class="card-top">
@@ -157,7 +157,7 @@
             </div>
           </el-card>
         </el-col>
-        <el-col :span="size ? 6 : 8" v-btn-permission="'7128980e23ca7726ef92aad579ac7cb1'">
+        <el-col :span="size ? 6 : 8" v-btn-permission="'d415c764036a02559976b41b9dfe2cf1'">
           <el-card shadow="hover">
             <div class="card-box" @click="handleCreateProcess('18')">
               <div class="card-top">
@@ -247,6 +247,21 @@
             </div>
           </el-card>
         </el-col>
+        <el-col :span="size ? 6 : 8">
+          <el-card shadow="hover">
+            <div class="card-box" @click="handleCreateProcess('21')">
+              <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">-->
@@ -443,11 +458,16 @@ export default {
           break
         // 外部标准化协会入会流程
         case '20':
-          //政策课题会后流程
           this.$router.push({
             name: 'bzrhStep1'
           })
           break
+        // 外部标准化协会参会流程
+        case '21':
+          this.$router.push({
+            name: 'bzchStep1'
+          })
+          break
       }
     },
     checkPermission(permissionIdArray) {

src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue

@@ -870,7 +870,8 @@ export default {
           }
           break
         case '15':
-          if (row.taskInfo === '备案任务下发') {
+          //加入标准化协会信息备案流程
+          if (row.taskInfo === '填写入会信息') {
             this.$router.push({
               name: 'jrbzhxhStep2',
               query: {
@@ -881,19 +882,29 @@ export default {
                 prcType: row.prcType
               }
             })
+          } else if(row.taskInfo === '标准法规工程师审核'){
+            this.$router.push({
+              name: 'jrbzhxhStep3',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }else if(row.taskInfo === '标准法规部部长批准'){
+            this.$router.push({
+              name: 'jrbzhxhStep4',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
           }
-          // else if(row.taskInfo === '标准法规部经理审批'){
-          //   this.$router.push({
-          //     name: 'xmqdqrStep3',
-          //     query: {
-          //       taskIds: row.taskIds,
-          //       prcId: row.prcId,
-          //       prcNum: row.prcNum,
-          //       prcName: row.prcName,
-          //       prcType: row.prcType
-          //     }
-          //   })
-          // }
           break
         // 外部标准化协会入会流程
         case '20':
@@ -908,7 +919,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          } else if (row.taskInfo === '') {
+          } else if (row.taskInfo === '入会代表填写入会信息表') {
             this.$router.push({
               name: 'bzrhStep3',
               query:{
@@ -919,7 +930,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          } else if (row.taskInfo === '') {
+          } else if (row.taskInfo === '入会人员所在部门负责人审核') {
             this.$router.push({
               name: 'bzrhStep4',
               query:{
@@ -930,7 +941,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          } else if (row.taskInfo === '') {
+          } else if (row.taskInfo === '标准法规工程师汇总修订') {
             this.$router.push({
               name: 'bzrhStep5',
               query:{
@@ -941,12 +952,60 @@ export default {
                 prcType: row.prcType
               }
             })
+          }else if (row.taskInfo === '标准法规部主管领导审核') {
+            this.$router.push({
+              name: 'bzrhStep6',
+              query:{
+                taskInfo: row.taskInfo,
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if (row.taskInfo === '费用管理部门会签') {
+            this.$router.push({
+              name: 'bzrhStep6',
+              query:{
+                taskInfo: row.taskInfo,
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if (row.taskInfo === '技术委员会常务副主任/总院院长审定') {
+            this.$router.push({
+              name: 'bzrhStep6',
+              query:{
+                taskInfo: row.taskInfo,
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if (row.taskInfo === '标准法规工程师汇总修订完毕'){
+            this.$router.push({
+              name: 'bzrhStep6',
+              query:{
+                taskInfo: row.taskInfo,
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
           }
           break
-        case '17':
+        case '18':
-          if (row.taskInfo === '法规认证部副部长审核') {
+          if (row.taskInfo === '法规认证部副部长批准') {
             this.$router.push({
-              name: 'zcrhStep2',
+              name: 'zcchStep2',
               query: {
                 taskIds: row.taskIds,
                 prcId: row.prcId,
@@ -955,6 +1014,113 @@ export default {
                 prcType: row.prcType
               }
             })
+          } else if (row.taskInfo === '公司副总批准') {
+            this.$router.push({
+              name: 'zcchStep3',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if (row.taskInfo === '修订参会信息') {
+            this.$router.push({
+              name: 'zcchStep1-1',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }
+          break
+        // 政策参会流程
+        case '19':
+          if (row.taskInfo === '申请人填写表单') {
+            this.$router.push({
+              name: 'zchhStep1',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if (row.taskInfo === '审核员批准') {
+            this.$router.push({
+              name: 'zchhStep2',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if (row.taskInfo === '申请人修订申请信息') {
+            this.$router.push({
+              name: 'zchhStep1',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }
+          break
+              // 政策会后流程
+        case '21':
+          if (row.taskInfo === '技术委员会分委会主任/入会代表所在中心主任提名入会代表') {
+            this.$router.push({
+              name: 'bzchStep2',
+              query:{
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if (row.taskInfo === '') {
+            this.$router.push({
+              name: 'bzchStep3',
+              query:{
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if (row.taskInfo === '') {
+            this.$router.push({
+              name: 'bzchStep4',
+              query:{
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if (row.taskInfo === '') {
+            this.$router.push({
+              name: 'bzchStep5',
+              query:{
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
           }
           break
       }

src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue

@@ -389,6 +389,16 @@ export default {
             }
           })
           break
+        case '20':
+          this.$router.push({
+            name: 'bzrhStep1',
+            query: {
+              type: '20',
+              processName: '外部标准化协会入会流程',
+              bpnId: id
+            }
+          })
+          break
       }
     },
     ...mapMutations(['setProcess', 'setHandleInfo']),

src/router/index.js

@@ -997,6 +997,33 @@ const routes = [
           title: '政策课题入会流程'
         }
       },
+        {
+            path: '/zcrhStep3',
+            name: 'zcrhStep3',
+            component: () => import('@/pages/processCenter/pages/creatProcess/zcrh/step3.vue'),
+            meta: {
+                requireAuth: true,
+                title: '政策课题入会流程'
+            }
+        },
+        {
+            path: '/zcrhStep4',
+            name: 'zcrhStep4',
+            component: () => import('@/pages/processCenter/pages/creatProcess/zcrh/step4.vue'),
+            meta: {
+                requireAuth: true,
+                title: '政策课题入会流程'
+            }
+        },
+        {
+            path: '/zcrhStep1-1',
+            name: 'zcrhStep1-1',
+            component: () => import('@/pages/processCenter/pages/creatProcess/zcrh/step1-1.vue'),
+            meta: {
+                requireAuth: true,
+                title: '政策课题入会流程'
+            }
+        },
       {
         path: '/zcchStep1',
         name: 'zcchStep1',
@@ -1006,6 +1033,33 @@ const routes = [
           title: '政策课题参会流程'
         }
       },
+      {
+        path: '/zcchStep2',
+        name: 'zcchStep2',
+        component: () => import('@/pages/processCenter/pages/creatProcess/zcch/step2.vue'),
+        meta: {
+          requireAuth: true,
+          title: '政策课题参会流程'
+        }
+      },
+      {
+        path: '/zcchStep3',
+        name: 'zcchStep3',
+        component: () => import('@/pages/processCenter/pages/creatProcess/zcch/step3.vue'),
+        meta: {
+          requireAuth: true,
+          title: '政策课题参会流程'
+        }
+      },
+      {
+        path: '/zcchStep1-1',
+        name: 'zcchStep1-1',
+        component: () => import('@/pages/processCenter/pages/creatProcess/zcch/step1-1.vue'),
+        meta: {
+          requireAuth: true,
+          title: '政策课题参会流程'
+        }
+      },
       {
         path: '/zchhStep1',
         name: 'zchhStep1',
@@ -1015,6 +1069,15 @@ const routes = [
           title: '政策课题会后流程'
         }
       },
+      {
+        path: '/zchhStep2',
+        name: 'zchhStep2',
+        component: () => import('@/pages/processCenter/pages/creatProcess/zchh/step2.vue'),
+        meta: {
+          requireAuth: true,
+          title: '政策课题会后流程'
+        }
+      },
       {
         path: '/wbsmStep1',
         name: 'wbsmStep1',
@@ -1051,6 +1114,15 @@ const routes = [
           title: '参与外部标准制修订信息提报流程'
         }
       },
+      {
+        path: '/cywbbzzxdStep3',
+        name: 'cywbbzzxdStep3',
+        component: () => import('@/pages/processCenter/pages/creatProcess/cywbbzzxd/step3.vue'),
+        meta: {
+          requireAuth: true,
+          title: '参与外部标准制修订信息提报流程'
+        }
+      },
       {
         path: '/jrbzhxhStep1',
         name: 'jrbzhxhStep1',
@@ -1060,6 +1132,24 @@ const routes = [
           title: '加入标准化协会信息提报流程'
         }
       },
+      {
+        path: '/jrbzhxhStep3',
+        name: 'jrbzhxhStep3',
+        component: () => import('@/pages/processCenter/pages/creatProcess/jrbzhxh/step3.vue'),
+        meta: {
+          requireAuth: true,
+          title: '加入标准化协会信息提报流程'
+        }
+      },
+      {
+        path: '/jrbzhxhStep4',
+        name: 'jrbzhxhStep4',
+        component: () => import('@/pages/processCenter/pages/creatProcess/jrbzhxh/step4.vue'),
+        meta: {
+          requireAuth: true,
+          title: '加入标准化协会信息提报流程'
+        }
+      },
       {
         path: '/jrbzhxhStep2',
         name: 'jrbzhxhStep2',
@@ -1069,6 +1159,108 @@ const routes = [
           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: '外部标准化协会入会流程（修订）'
+        }
+      },
+      {
+        path: '/bzrhStep6',
+        name: 'bzrhStep6',
+        component: () => import('@/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue'),
+        meta: {
+          requireAuth: true,
+          title: '外部标准化协会入会流程（审批)'
+        }
+      },
+
+      // 外部标准化协会参会流程
+      {
+        path: '/bzchStep1',
+        name: 'bzchStep1',
+        component: () => import('@/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue'),
+        meta: {
+          requireAuth: true,
+          title: '外部标准化协会参会流程（流程发起）'
+        }
+      },
+      {
+        path: '/bzchStep2',
+        name: 'bzchStep2',
+        component: () => import('@/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue'),
+        meta: {
+          requireAuth: true,
+          title: '外部标准化协会参会流程（选择入会代表）'
+        }
+      },
+      {
+        path: '/bzchStep3',
+        name: 'bzchStep3',
+        component: () => import('@/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue'),
+        meta: {
+          requireAuth: true,
+          title: '外部标准化协会参会流程（入会人确认）'
+        }
+      },
+      {
+        path: '/bzchStep4',
+        name: 'bzchStep4',
+        component: () => import('@/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue'),
+        meta: {
+          requireAuth: true,
+          title: '外部标准化协会参会流程（审批）'
+        }
+      },
+      {
+        path: '/bzchStep5',
+        name: 'bzchStep5',
+        component: () => import('@/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue'),
+        meta: {
+          requireAuth: true,
+          title: '外部标准化协会参会流程（修订）'
+        }
+      },
     ]
   },
   // 本地工具
@@ -1252,52 +1444,6 @@ const routes = [
           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: '外部标准化协会入会流程（修订）'
-        }
-      },
     ]
   },
   // 标准法规库

src/sysConfig/index.js

@@ -6,11 +6,9 @@
 // 服务器地址
 // const devIp = '39.98.140.126'
 // const devInterfacePORT = '10005'
-// const devIp = '192.168.10.248'
+const devIp = '192.168.10.50'
-const devIp = '62.234.136.153'
+// const devIp = '62.234.136.153'
-const devInterfacePORT = '8033'
+const devInterfacePORT = '9999'
-// 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='
 // 配置 前端服务