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

src/App.vue

@@ -69,34 +69,6 @@
           <el-main>
             <nav-menu></nav-menu>
             <div class="sub-container" style="margin-left: 200px">
-              <!--            <div style="background-color: #0068B7; height: 65px; width: 100%">
-                        <span style="color: #fff; line-height: 65px; float: left; font-size: 20px; font-weight: 600;">
-                          标准法规管理系统  Standard and Regulation Management System
-                        </span>
-                             header头部 右侧内容 当前登录人和退出
-                            <div class="header-right" style="display: inline-block; float: right; margin-right: 20px; color: #fff">
-                              <div class="user-info">
-                                <el-dropdown
-                                  trigger="click"
-                                  @command="handleCommand"
-                                >
-                                  <div class="user-box" style="margin-top: 23px;">
-                                    <img :src="userAvator" v-if="$store.getters.userInfo.avator">
-                                    <span class="iconfont" v-else style="color: #FFFFFF;">&#xe69b;</span>
-                                    <span style="color: #FFFFFF;">{{ $store.getters.userInfo.uName }}</span>
-                                    <i style="color: #FFFFFF;" class="el-icon-arrow-down"/>
-                                  </div>
-                                  <el-dropdown-menu slot="dropdown">
-                                    <el-dropdown-item command="loginOut">退出</el-dropdown-item>
-                                  </el-dropdown-menu>
-                                </el-dropdown>
-                              </div>
-                            </div>
-                                      <div class="logo">
-                                        <img :src="logo" />
-                                      </div>
-                          </div>
-                                  <com-header></com-header>-->
               <div class="container-box">
                 <router-view/>
               </div>
@@ -243,7 +215,7 @@ export default {
         && this.$route.name !== 'beeEnergyLogin' && this.$route.name !== 'mdLawLogin'
         && this.$route.name !== 'nuoBLogin' && this.$route.name !== 'sTLogin'
         && this.$route.name !== 'StandardSearch' && this.$route.name !== 'phoneIndex'
-        && this.$route.name !== 'blankPage') {
+        && this.$route.name !== 'blankPage' && this.$route.name !== 'processedPage' ) {
         this.isBoolean = true
       } else {
         this.isBoolean = false

src/api/phone.js

@@ -1,5 +1,6 @@
 import axios from "@/common/axiosV2";
 
+// 手机端查询人
 export function phoneUser(params) {
   return axios({
     url: "api/sys/user/getUserByPhone",

src/api/process.js

@@ -713,7 +713,7 @@ export function workGroup(data) {
     params: data
   })
 }
-//
+// 手机端查询token
 export function loginMobile(data) {
   return axios({
     url: 'api/lawss/activiti/loginMobile',
@@ -721,3 +721,20 @@ export function loginMobile(data) {
     params: data
   })
 }
+
+// 日历信息编辑
+export function updateMeet(data) {
+  return axios({
+    url: '/api/sapMeetInfo/updateMeeting',
+    method: 'post',
+    params: data
+  })
+}
+
+export function upFile(data) {
+  return axios({
+    url: '/api/att/attFile/upload',
+    method: 'post',
+    data
+  })
+}

src/common/axios/index.js

@@ -8,6 +8,8 @@ import router from '@/router'
 import store from '@/store'
 import {Message} from 'element-ui'
 import { baseUrl,webLoginType,ssoLoginUrlDev } from '@/sysConfig'
+import isMobile from "../../store/isMobile";
+
 import domMessage from '../messageOnce/messageOnce'
 
 const messageOnce = new domMessage()
@@ -67,8 +69,12 @@ _axios.interceptors.response.use(
         }
       }
       if(res.data && res.data.respCode && res.data.respCode === 'LE505'){
-        window.sessionStorage.clear()
+          if (isMobile()) {
-        messageOnce.warning({
+              localStorage.removeItem('token')
+              return router.push('/phoneIndex')
+          }
+          window.sessionStorage.clear()
+          messageOnce.warning({
           message: '登录超时,请重新登录',
           type: 'warning'
         })

src/common/axiosV2/index.js

@@ -3,6 +3,8 @@ import router from '@/router'
 import store from '@/store'
 import {Message} from 'element-ui'
 import { baseUrl,webLoginType,ssoLoginUrlDev } from '@/sysConfig'
+import isMobile from "../../store/isMobile";
+
 import domMessage from '../messageOnce/messageOnce'
 
 // import 'element-ui/lib/theme-chalk/index.css'
@@ -62,16 +64,21 @@ service.interceptors.response.use(
             }
         }
         if(res.data && res.data.respCode != undefined && res.data.respCode === 'LE505'){
-            window.sessionStorage.clear()
+            if (isMobile()) {
-            messageOnce.warning({
+                localStorage.removeItem('token')
-                message: '登录超时,请重新登录',
+                return router.push('/phoneIndex')
-                type: 'warning'
+            }else {
-            })
+                window.sessionStorage.clear()
-            if(webLoginType != null && webLoginType === 'idm' ) {
+                messageOnce.warning({
-                // idm 统一认证登录页面
+                    message: '登录超时,请重新登录',
-                return window.location.href = ssoLoginUrlDev
+                    type: 'warning'
-            }else if(webLoginType != null && webLoginType === 'dev'){
+                })
-                return router.push('/login')
+                if(webLoginType != null && webLoginType === 'idm' ) {
+                    // idm 统一认证登录页面
+                    return window.location.href = ssoLoginUrlDev
+                }else if(webLoginType != null && webLoginType === 'dev'){
+                    return router.push('/login')
+                }
             }
         }
       return res.data

src/components/navMenu/index.vue

@@ -617,6 +617,7 @@
     color: #fff;
   }
   .nav-menu /deep/.el-submenu__title i {
+    font-size: 16px;
     color: #fff;
   }
   .nav-menu{
@@ -642,6 +643,7 @@
   }
 
   .el-menu-item {
+    font-size: 16px;
     span {
       margin-left: 5px;
       font-weight: normal;
@@ -678,6 +680,7 @@
       background-color: red;
     }
     /deep/.el-submenu__title {
+      font-size: 16px;
       padding: 0 16px !important;
       span {
         font-weight: normal;
@@ -712,7 +715,7 @@
     }
     .el-menu-item {
       padding-left: 29px !important;
-      font-size: 14px;
+      font-size: 16px;
       font-weight: normal;
       height: 40px;
       line-height: 40px;

src/components/phoneRole/index.vue

@@ -3,6 +3,7 @@
     <van-action-sheet
       v-model="isShowPhone2"
       :title="roleTitle"
+      v-if="isShowPhone2"
     >
       <el-form
         ref="phoneForm"
@@ -42,7 +43,7 @@
                 @click="toggle(index)"
               >
                 <template #right-icon>
-                  <van-checkbox :name="item" ref="checkbox"/>
+                  <van-checkbox :name="item.usId" ref="checkbox"/>
                 </template>
               </van-cell>
             </van-cell-group>
@@ -57,7 +58,7 @@
                 @click="toggle(index)"
               >
                 <template #right-icon>
-                  <van-checkbox :name="item" ref="checkbox"/>
+                  <van-checkbox :name="item.usId" ref="checkbox"/>
                 </template>
               </van-cell>
             </van-cell-group>
@@ -125,12 +126,6 @@ export default {
     },
     isShowPhone2(val) {
       this.$emit('update:isShowPhone', val)
-    },
-    resultList (val) {
-      this.result = val
-    },
-    result() {
-      this.$emit('resultList', this.result)
     }
   },
   mounted() {
@@ -140,6 +135,7 @@ export default {
     /** 查询 */
     queryPhone() {
       this.getPhoneData()
+      this.finished = false
     },
     /** 获取人员数据 */
     async getPhoneData() {
@@ -170,22 +166,41 @@ export default {
 
     },
     roleSumit() {
-      this.$emit('checkedRole', this.result)
+      let ids = ''
-      this.isShowPhone2 = false
+      this.result.map(item => {
+        if (ids.length > 0) {
+          ids += ','
+          ids += item
+        } else {
+          ids = item
+        }
+      })
+      this.$http.get('SarInstitution/institution/getNextById', {
+        ids: ids
+      }, {
+        _this: this
+      }, res => {
+        this.$emit('checkedRole', res)
+        this.isShowPhone2 = false
+        this.phoneForm.name = ''
+        this.getPhoneData()
+      })
     },
     roleClear() {
       this.result = []
       this.isShowPhone2 = false
+      this.phoneForm.name = ''
+      this.getPhoneData()
     },
 
     // 下滑加载数据
     onLoad() {
+      this.phoneForm.page++
       phoneUser(this.phoneForm).then(res => {
         this.roleList = this.roleList.concat(res.data)
         this.total = this.roleList[0].total
         this.loading = false
         if (this.roleList.length < this.total) {
-          this.phoneForm.page ++
           this.loading = false
         } else {
           this.finished = true

src/main.js

@@ -106,26 +106,48 @@ router.beforeEach(function (to, from, next) {
   }
   // 返回值为登录状态
   /** 判断是不是在手机端操作 */
+  debugger
   if (isMobile()) {
-    if ((token === null || token === '' ) && toName !== 'Login') {
+    if(toName === 'processCenter'){
-      if(toName !== 'phoneIndex'){
+      const userAgent = navigator.userAgent;
-        sessionStorage.setItem('param',JSON.stringify(param4))
+      if (userAgent.indexOf("Firefox") != -1 || userAgent.indexOf("Chrome") !=-1) {
-        next('/phoneIndex')
+        window.location.href = "about:blank"
       }else {
-        next()
+        window.opener = null;
+        window.open("about:blank", "_self");
+        window.close();
       }
-    } else {
+    }else {
-      if (toName.slice(0,5) !== 'phone') {
+      if ((token === null || token === '' ) && toName !== 'Login') {
-        if (toName === 'processCenter') {
+        if(toName !== 'phoneIndex'){
-          next()
+          sessionStorage.removeItem("param");
+          sessionStorage.setItem('param',JSON.stringify(param4))
+          next('/phoneIndex')
         }else {
-          let paramPhone = 'taskIds=' + taskId + '&prcId=' + prcId + '&prcNum=' + prcNum +
+          next()
-            '&taskAssignee=' + toName + '&prcName=' + prcName + '&prcType=' + prcType
+        }
-          let phoneRouter = 'phone' + toName.charAt(0).toUpperCase() + toName.slice(1)
+      } else {
-          next({path: phoneRouter + '?' + paramPhone})
+        if (toName.slice(0,5) !== 'phone') {
+          if(toName === 'LoginVerify'){
+            next('/blankPage')
+          }else {
+            if(toName === 'blankPage' || toName === 'processedPage') {
+              next()
+            }else {
+              extractedVerify()
+            }
+          }
+        }else {
+          if(toName !== 'blankPage'){
+            if(to.matched.length === 0){
+              next('/blankPage')
+            }else {
+              next()
+            }
+          }else {
+            next()
+          }
         }
-      }else {
-        extractedVerify(token)
       }
     }
   } else {
@@ -147,7 +169,12 @@ router.beforeEach(function (to, from, next) {
           }
         }
       }else if(webLoginType != null && webLoginType === 'dev'){
-        next('/Login')
+        if (isMobile()) {
+          extractedVerify(token)
+        } else {
+          next('/Login')
+        }
+
       }
     }else {
       extractedVerify(token)
@@ -164,48 +191,54 @@ router.beforeEach(function (to, from, next) {
         let commitStatus = res.commitStatus === undefined ? 0 : res.commitStatus;
         let isNotFinished = res.isNotFinished === undefined ? 0 : res.isNotFinished;
 
-        if (hisCount && hisCount > 0) { // 业务系统 当前节点已完成
+        if ((hisCount && hisCount > 0)) { // 业务系统 当前节点已完成
-          // 根据type判断跳转具体流程页面
+            if(isMobile()){
-          if (prcType === '1') {
+                next('/processedPage')
-            // 标准入库流程数据
+            }else {
-            extracted("bzrkStep5");
+                // 根据type判断跳转具体流程页面
-          } else if (prcType === '4') {
+                if (prcType === '1') {
-            //标准清单发布流程数据
+                    // 标准入库流程数据
-            extracted("bzqdfbStep1-4");
+                    extracted("bzrkStep5");
-          } else if (prcType === '5') {
+                } else if (prcType === '4') {
-            //标准项目合规评估 标准维度
+                    //标准清单发布流程数据
-            if (path === "/xmpgStep2" || path === "/xmpgStep1" || path === "/xmpgStep1-2") {
+                    extracted("bzqdfbStep1-4");
-              extracted("xmpgStep1-2");
+                } else if (prcType === '5') {
-            } else {
+                    //标准项目合规评估 标准维度
-              extracted("xmpgStep1-7");
+                    if (path === "/xmpgStep2" || path === "/xmpgStep1" || path === "/xmpgStep1-2") {
+                        extracted("xmpgStep1-2");
+                    } else {
+                        extracted("xmpgStep1-7");
+                    }
+                } else if (prcType === '6') {
+                    //标准项目合规评估 项目维度
+                    if (path === "/xmpg2Step1" || path === "/xmpg2Step2" || path === "/xmpg2Step1-2") {
+                        extracted("xmpg2Step1-2");
+                    } else {
+                        extracted("xmpg2Step1-12");
+                    }
+                } else if (prcType === '8') {
+                    // 未符合项整改
+                    extracted("wfhxzgStep5-1");
+                } else if (prcType === '9') {
+                    extracted("bzjdStep1-6");
+                    //标准调研流程
+                } else if (prcType === '2') {
+                    extracted("bzdyStep1-9");
+                } else if (prcType === '3') {
+                    //标准征求意见
+                    extracted("bzzqyjStep1-9");
+                } else if (prcType === '10') {
+                    //项目清单确认
+                    extracted("xmqdqrStep1-3");
+                }
             }
-          } else if (prcType === '6') {
-            //标准项目合规评估 项目维度
-            if (path === "/xmpg2Step1" || path === "/xmpg2Step2" || path === "/xmpg2Step1-2") {
-              extracted("xmpg2Step1-2");
-            } else {
-              extracted("xmpg2Step1-12");
-            }
-          } else if (prcType === '8') {
-            // 未符合项整改
-            extracted("wfhxzgStep5-1");
-          } else if (prcType === '9') {
-            extracted("bzjdStep1-6");
-            //标准调研流程
-          } else if (prcType === '2') {
-            extracted("bzdyStep1-9");
-          } else if (prcType === '3') {
-            //标准征求意见
-            extracted("bzzqyjStep1-9");
-          } else if (prcType === '10') {
-            //项目清单确认
-            extracted("xmqdqrStep1-3");
-          }
         } else { // 业务系统 当前节点未完成
           // commitStatus 大于0 表示当前节点存在未完成干活流程
           // isNotFinished OA 系统显示接受任务 已置为已办
           if (routerType && routerType === 'oa' &&isNotFinished && isNotFinished > 0 && commitStatus && commitStatus > 0) {
-            if (prcType === '3') {
+            if(isMobile()) {
+              extractedIphone()
+            }else if (prcType === '3') {
               //标准征求意见 接受节点 未完成 oa已办 跳转详情页面
               if (path === '/bzzqyjStep3') {
                 extracted2("processAcceptDetail","prcNum=" + prcNum + "&tabsName=AlreadyProcess");
@@ -236,11 +269,12 @@ router.beforeEach(function (to, from, next) {
               }
             }
           } else {
-            if (isMobile()){
+              if(isMobile()) {
-              next()
+                  extractedIphone()
-            } else {
+              }else{
-              extracted3()
+                extracted3()
-            }
+              }
+
           }
         }
         function extracted(routerPath) {
@@ -262,6 +296,13 @@ router.beforeEach(function (to, from, next) {
             next()
           }
         }
+
+        function extractedIphone() {
+            let paramPhone = 'taskIds=' + taskId + '&prcId=' + prcId + '&prcNum=' + prcNum +
+                '&taskAssignee=' + toName + '&prcName=' + prcName + '&prcType=' + prcType
+            let phoneRouter = 'phone' + toName.charAt(0).toUpperCase() + toName.slice(1)
+            next({path: phoneRouter + '?' + paramPhone})
+        }
         function extracted2(routerPath,param2) {
           if (token === null || token === '') {
             extractedLocalStorage(routerPath,param2);
@@ -284,17 +325,9 @@ router.beforeEach(function (to, from, next) {
     }
     if(path === '/loginVerify'){
       if(webLoginType != null && webLoginType === 'dev'){
-        if(isMobile()) {
+        next('/Login')
-          next('/blankPage')
-        } else {
-          next('/Login')
-        }
       }else {
-        if(isMobile()) {
+        next()
-          next('/blankPage')
-        } else {
-          next('/Login')
-        }
       }
     }else {
       next()

src/pages/blankPage/index.vue

@@ -2,7 +2,7 @@
   <div class="blankPage">
     <van-icon name="clear" color="#dabb27" size="70"/>
     <div style="font-size: 15px;margin-top: 20px;color: #8c939d">当前任务不支持手机端处理</div>
-    <el-button type="primary" size="small" style="margin-top: 30px;width: 270px;" @click="$router.go(-1)">返回</el-button>
+    <el-button type="primary" size="small" style="margin-top: 30px;width: 270px;" @click="closeWindow()">返回</el-button>
   </div>
 </template>
 
@@ -16,7 +16,18 @@ export default {
   data() {
     return {}
   },
-  methods: {}
+  methods: {
+    closeWindow(){
+      const userAgent = navigator.userAgent;
+      if (userAgent.indexOf("Firefox") != -1 || userAgent.indexOf("Chrome") !=-1) {
+        window.location.href = "about:blank"
+      }else {
+        window.opener = null;
+        window.open("about:blank", "_self");
+        window.close();
+      }
+    }
+  }
 }
 </script>
 

src/pages/home2/components/navMenu/index.vue

@@ -77,11 +77,11 @@
                 height: 40px;
                 line-height: 40px;
                 background: #fff;
-                font-size: 15px;
+                font-size: 14px;
               border-radius: 10px;
             }
             .menu-wrap {
-                height: 240px;
+                height: 200px;
                 display: flex;
                 flex-wrap: wrap;
                 justify-content: space-between;

src/pages/home2/components/todoList/index.vue

@@ -1310,7 +1310,7 @@ export default {
 .to-do-list {
   margin-right: 10px;
   border-radius: 3px;
-  height: calc(~'100% - 310px');
+  height: calc(~'100% - 269px');
   overflow: hidden;
   background: #FFFFFF;
   box-shadow: 1px 1px 10px rgba(0,0,0,0.1);

src/pages/home2/index.vue

@@ -173,7 +173,7 @@ export default {
     .right_wrapper {
       display: flex;
       flex-direction: column;
-      width: 30vw;
+      width: 25vw;
       height: 100%;
     }
     .search-condition {

src/pages/localTool/standAutoSplit/index.vue

@@ -963,7 +963,7 @@ export default {
         _this: this
       }, res => {
         this.addSpiltStandList = res.data.list
-        this.addFileStandtotal = res.data.list.length
+        this.addFileStandtotal = res.data.count
         this.loadData = false
       }, e => {
         this.loadData = false

src/pages/localTool/standCalendar/index.vue

@@ -17,8 +17,8 @@
                 </el-select>
 	           </span>
             </div>
-            <div style="float: right;display: inline;height: 30px;">
+            <div style="float: right;display: inline;height: 30px;padding-right: 5px">
-              <el-button size="mini" @click="today">今天</el-button>
+              <el-button size="mini" type="primary" plain @click="today">今天</el-button>
             </div>
           </div>
           <el-calendar v-model="value">
@@ -33,8 +33,8 @@
                     </span>
                     <!-- 获取当前登录人的会议并表示出来-->
                     <span v-for="item in dealMyDate(data.day)" :value="item.fillPeopleId">
-                      <el-tag class="tagOne"/>
                       <el-tag v-if="userId === item.fillPeopleId" class="tagTwo"/>
+                      <el-tag v-else class="tagOne"/>
                     </span>
                   </span>
                 </div>
@@ -58,41 +58,231 @@
           </span>
           <el-card class="card_info" v-else v-for="(item, index) in todayData" :value="item" :key="index">
             <span v-for="res in item.attend" :key="res.fillPeopleId">
-               <el-tag v-if="userId === res.fillPeopleId" type="success" size="mini">会议</el-tag>
+              <el-tag v-if="userId === res.fillPeopleId" type="success" size="mini">会议</el-tag>
               <el-tag v-else type="warning" size="mini">会议</el-tag>
             </span>
+            <span style="float: right;padding-right: 5px">
+              <el-button type="primary" size="mini" plain @click="edit_meeting(item)">编辑会议内容</el-button>
+            </span>
             <i style="margin-left: 10px;font-weight: bold">{{ item.title }}</i>
-            <div class="content_text">
+            <div class="content_style">
-              <span>会议时间 : {{ $moment(item.date).format('YYYY-MM-DD HH:mm') }} </span>
+              <div class="content_text">
-            </div>
+                <span>会议时间 : {{ $moment(item.date).format('YYYY-MM-DD HH:mm:ss') }} </span>
-            <div class="content_text">
+              </div>
-              <span>参与人 : {{ item.partPeople.join('、') }} </span>
+              <div class="content_text">
-            </div>
+                <span>参与人 : {{ item.partPeople.join('、') }} </span>
-            <div class="content_text2">
+              </div>
-              <span>会议内容 : {{ item.content }}</span>
+              <div class="content_text2">
-            </div>
+                <span>会议内容 : {{ item.content }}</span>
-            <div class="content_text">
+              </div>
+              <div class="content_text2">
+                <span>会议地点 : {{ item.place }}</span>
+              </div>
+              <div class="content_text">
                 <span>会议附件 :
                  <span v-if="item.files.length === 0">{{ '-' }}</span>
-                  <span v-else v-for="res in item.files" :key="res.id" style="color: #409EFF;" @click="previews(res.id)">
+                  <div v-else v-for="res in item.files" :key="res.id" style="color: #409EFF;margin-left: 55px;margin-top: -25px;line-height: 35px" @click="previews(res.id)">
                      <a v-if="res.name.length > 30" style="cursor: pointer">
                       {{ res.name.slice(0, 30) + '...' }} {{ ';' }}
                     </a>
                     <a v-else style="cursor: pointer">
                       {{ res.name }} {{ ';' }}
                     </a>
-                   </span>
+                   </div>
                 </span>
+              </div>
             </div>
           </el-card>
         </el-card>
       </el-col>
     </el-row>
+
+    <!--  会议编辑抽屉  -->
+    <el-drawer
+      title="编辑人员信息"
+      :visible.sync="meetFlag"
+      size="600px"
+    >
+      <div class="content_form" style="height: calc(100% - 20px);overflow-y: auto">
+        <el-form class="label-input-form" ref="editMeetForm" :model="editMeetForm" label-width="80px">
+          <el-form-item class="add-form-item" label="会议标题:">
+            <el-input v-model="editMeetForm.title" placeholder=""></el-input>
+          </el-form-item>
+          <el-form-item class="add-form-item" label="参与人员:">
+            <div class="myPart_btn">
+              <el-button
+                type="primary"
+                size="small"
+                @click="add_partForm">
+                新增
+              </el-button>
+              <el-button
+                type="danger"
+                size="small"
+                @click="del_partForm">
+                批量删除
+              </el-button>
+            </div>
+            <el-table
+              :data="editMeetForm.attend"
+              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 type="index" label="序号" width="50" align="center"/>
+              <el-table-column prop="fillPeople" align="center" label="人员">
+                <template slot-scope="scope">
+                  {{ scope.row.fillPeople || '' }}
+                </template>
+              </el-table-column>
+              <el-table-column prop="fillUnit" align="center" label="单位">
+                <template slot-scope="scope">
+                  {{ scope.row.fillUnit || '' }}
+                </template>
+              </el-table-column>
+              <el-table-column prop="fillDept" align="center" label="部门">
+                <template slot-scope="scope">
+                  {{ scope.row.fillDept || '' }}
+                </template>
+              </el-table-column>
+              <el-table-column prop="fillTel" align="center" label="电话">
+                <template slot-scope="scope">
+                  {{ scope.row.fillTel || '' }}
+                </template>
+              </el-table-column>
+              <el-table-column prop="fillMail" align="center" label="邮箱">
+                <template slot-scope="scope">
+                  {{ scope.row.fillMail || '' }}
+                </template>
+              </el-table-column>
+              <el-table-column
+                fixed="right"
+                label="操作"
+                align="center"
+                width="100">
+                <template slot-scope="scope">
+                  <el-button type="primary" plain size="mini" @click="edit_partForm(scope.row)">编辑</el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+          </el-form-item>
+          <el-form-item class="add-form-item" label="会议时间:">
+            <el-date-picker
+              v-model="editMeetForm.date"
+              type="datetime"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              placeholder="选择日期时间"
+              align="right">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item class="add-form-item" label="会议内容:">
+            <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="editMeetForm.contents"
+              border
+              ref="entryTable"
+              style="width: 100%"
+              @selection-change="selectedTable"
+              :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" label="序号" width="50" align="center"/>
+              <el-table-column
+                label="议题"
+                align="center"
+                prop="meetingTheme">
+                <template slot-scope="scope">
+                  <el-input v-model="scope.row.meetingTheme"/>
+                </template>
+              </el-table-column>
+            </el-table>
+          </el-form-item>
+          <el-form-item class="add-form-item" label="会议地点:">
+            <el-input v-model="editMeetForm.place" placeholder=""></el-input>
+          </el-form-item>
+          <el-form-item class="add-form-item" label="会议附件:">
+            <el-upload
+              multiple
+              ref="uploadFile"
+              :action="actionPath"
+              name="file"
+              :file-list="reData"
+              accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF"
+              :before-upload="handleBeforeUpload"
+              :before-remove="handleBeforeRemove"
+              :on-success="handleOnsuccess"
+            >
+              <el-button type="primary" size="small">
+                上传文件
+              </el-button>
+            </el-upload>
+          </el-form-item>
+        </el-form>
+      </div>
+      <div class="demo-drawer-footer">
+        <el-button size="mini" @click="falseDrawer">取消</el-button>
+        <el-button type="primary" :loading="loading" size="mini" @click="OkDrawer">确认</el-button>
+      </div>
+    </el-drawer>
+
+    <el-drawer
+      title="编辑人员信息"
+      :visible.sync="editFlag"
+      size="500px"
+      :before-close="falseDrawerTab"
+      custom-class="demo-drawer"
+    >
+      <div class="content_form" style="height: 100%">
+        <el-form class="label-input-form" ref="editForm" :model="editForm" label-width="80px">
+          <el-form-item class="add-form-item" label="参与人员:">
+            <el-input v-model="editForm.fillPeopleId" style="display: none;"></el-input>
+            <el-input
+              placeholder="请选择参与人员"
+              style="width: 50%"
+              @click.native="choiceRole('fillPeopleId','请选择入会成员',editForm.fillPeopleId,)"
+              v-model="editForm.fillPeople"
+            />
+          </el-form-item>
+          <el-form-item class="add-form-item" label="单位:">
+            <el-input v-model="editForm.fillUnit" placeholder=""></el-input>
+          </el-form-item>
+          <el-form-item class="add-form-item" label="部门:">
+            <el-input v-model="editForm.fillDept" placeholder=""></el-input>
+          </el-form-item>
+          <el-form-item class="add-form-item" label="电话:">
+            <el-input v-model="editForm.fillTel" placeholder=""></el-input>
+          </el-form-item>
+          <el-form-item class="add-form-item" label="邮箱:">
+            <el-input v-model="editForm.fillMail" placeholder=""></el-input>
+          </el-form-item>
+        </el-form>
+      </div>
+      <div class="demo-drawer-footer">
+        <el-button size="mini" @click="falseDrawerTab">取消</el-button>
+        <el-button type="primary" size="mini" @click="OkDrawerTab">确认</el-button>
+      </div>
+    </el-drawer>
+    <Role-tree
+      check-box
+      is-title="选择入会人员"
+      :is-visible.sync="roleShowflag"
+      :nodeList="nodeList"
+      @checkedRole="drawerCheck"
+    />
   </div>
 </template>
 
 <script>
 import {meetingByMonth} from '@/api/unqualProcess.js'
+import {updateMeet} from '@/api/process.js'
 
 export default {
   name: "calendar",
@@ -119,6 +309,29 @@ export default {
       value: new Date(),
       // 当前时间
       nowDate: '',
+
+      meetFlag: false,
+      editMeetForm: {},
+      reData: [],
+      actionPath: 'api/att/attFile/upload',
+
+      roleShowflag: false,
+      nodeList: [],
+      deleteDataList: [],
+      upDialog: false,
+      reDataTable: [],
+      editFlag: false,
+      content: [],
+      editForm: {
+        fillPeople: '',
+        fillUnit: '',
+        fillDept: '',
+        fillTel: '',
+        fillMail: '',
+      },
+      // 议题选中时储存数组
+      deleteTable: [],
+      loading: false
     }
   },
   mounted() {
@@ -282,7 +495,268 @@ export default {
       if (attId != null && attId !== "") {
         window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
       }
-    }
+    },
+
+    /** 每个会议对应的编辑按钮 */
+    edit_meeting(item) {
+      this.editMeetForm.contents = []
+      console.log(item)
+      localStorage.setItem('objs', JSON.stringify(item))
+      this.fileListData = item
+      this.reData = item.files
+      this.editMeetForm = item
+      this.editMeetForm.contents
+      this.editMeetForm.contents = []
+      if (this.editMeetForm.content !== '') {
+          this.editMeetForm.content.split(';').forEach(item => {
+          this.editMeetForm.contents.push({
+            meetingTheme: item
+          })
+        })
+      }
+      this.meetFlag = true
+    },
+
+    // 文件上传成功
+    handleOnsuccess(res, file, fileList) {
+      if (res.ok) {
+        if (this.reData !== undefined) {
+          this.newDataList = this.reData
+          this.newDataList.push({
+            id: res.data.attId,
+            name: res.data.name
+          })
+        } else {
+          this.newDataList.push({
+            id: res.data.attId,
+            name: res.data.name
+          })
+        }
+
+        this.fileListData.files = this.newDataList
+        this.$message({
+          showClose: true,
+          message: res.message,
+          type: 'success'
+        })
+        this.newDataList = []
+        this.fileMadel = false
+      }
+    },
+    // 文件上传限制条件
+    handleBeforeUpload(file) {
+      var filename = file.name
+      var index1 = filename.lastIndexOf('.')
+      var index2 = filename.length
+      var fileSuffix = filename.substring(index1, index2)
+      // const fileSuffix = file.name.split('.')[1] // 后缀名
+      // 判断上传文件格式
+      if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.pdf' || fileSuffix === '.PDF') {
+        return true
+      } else {
+        this.spinShow = false
+        this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX/PDF或XLS文件')
+        return false
+      }
+      // 判断文件上传大小
+      // eslint-disable-next-line no-unreachable
+      if (file.size / 1024 / 1024 <= 200) {
+        return true
+      } else {
+        this.$message.error('文件' + file.name + '大小不超过200M')
+        return false
+      }
+      return true
+    },
+    // 移除上传的文件
+    handleBeforeRemove(file, fileList) {
+      this.reData.forEach((item, index) => {
+        if (item.name === file.name || item.id === file.id) {
+          this.reData.splice(index, 1)
+        }
+      })
+      this.fileListData.files = this.reData
+    },
+
+    add_partForm() {
+      var list = {
+        fillPeople: this.fillPeople,
+        fillUnit: this.fillUnit,
+        fillDept: this.fillDept,
+        fillPost: this.fillPost,
+        fillTel: this.fillTel,
+        fillMail: this.fillMail,
+        fillFile: this.fillFile = []
+      }
+      this.editMeetForm.attend.push(list)
+    },
+
+    // 编辑按钮
+    edit_partForm(row) {
+      // 用来储存取消时原来的数据，防止取消时修改
+      localStorage.setItem('obj', JSON.stringify(row))
+      this.editForm = row
+      this.editFlag = true
+    },
+    selectedDelete(val) {
+      this.deleteDataList = val
+    },
+    /** 批量删除 */
+    del_partForm() {
+      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.editMeetForm.attend.findIndex(items => {
+              return items === item;
+            });
+            if (index > -1) {
+              this.editMeetForm.attend.splice(index, 1);
+            }
+            exits.push(item);
+          });
+          this.deleteDataList = [];
+        }).catch(() => {
+        });
+      }
+    },
+
+    // 编辑框选人
+    choiceRole(type, title, id) {
+      this.nodeList = []
+      this.nodeList.push(id)
+      this.type = type
+      this.roleShowflag = true
+    },
+    drawerCheck(data) {
+      if (data.length > 0) {
+        this.editForm.fillPeopleId = data[0].id
+        this.editForm.fillPeople = data[0].name
+      }
+      this.roleShowflag = false
+    },
+
+    // 编辑框确认按钮
+    OkDrawerTab() {
+      this.editFlag = false
+    },
+    falseDrawerTab() {
+      let Item = JSON.parse(localStorage.getItem('obj'))
+      this.editForm.fillPeopleId = Item.fillPeopleId
+      this.editForm.fillPeople = Item.fillPeople
+      this.editForm.fillUnit = Item.fillUnit
+      this.editForm.fillDept = Item.fillDept
+      this.editForm.fillTel = Item.fillTel
+      this.editForm.fillMail = Item.fillMail
+      this.editFlag = false
+    },
+
+    selectedTable(val) {
+      this.deleteTable = val
+    },
+    // 编辑框内议题相关
+    meeting_add() {
+      var list = {
+        meetingTheme: this.meetingTheme,
+      }
+      this.editMeetForm.contents.push(list)
+    },
+    meeting_delete() {
+      if (this.deleteTable.length < 1) {
+        this.$message.warning("请选择一条数据进行删除");
+      } else {
+        this.$confirm("您确认删除这些数据?", "提示", {
+          confirmButtonText: "确认",
+          confirmButtonClass: "common-button-primary",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          let exits = [];
+          this.deleteTable.map(item => {
+            let index
+            index = this.content.findIndex(items => {
+              return items === item
+            })
+            if (index > -1) {
+              this.content.splice(index, 1)
+            }
+            exits.push(item)
+          })
+          this.deleteTable = []
+        }).catch(() => {
+        })
+      }
+    },
+
+    falseDrawer() {
+      let Items = JSON.parse(localStorage.getItem('objs'))
+      this.editMeetForm.attend = Items.attend
+      this.editMeetForm.content = Items.content
+      this.editMeetForm.date = Items.date
+      this.editMeetForm.files = Items.files
+      this.editMeetForm.id = Items.id
+      this.editMeetForm.partPeople = Items.partPeople
+      this.editMeetForm.place = Items.place
+      this.editMeetForm.title = Items.title
+      this.editMeetForm.type = Items.type
+      this.meetFlag = false
+    },
+    OkDrawer() {
+      let contentData = []
+      if (this.editMeetForm.contents.length > 0) {
+        this.editMeetForm.contents.forEach(item => {
+          if (item.meetingTheme.length > 0){
+            contentData.push(item.meetingTheme)
+          }
+        })
+      }
+      let editForm = {
+        attend: JSON.stringify( this.editMeetForm.attend),
+        content: contentData.join(';'),
+        id: this.editMeetForm.id,
+        date: this.editMeetForm.date,
+        title: this.editMeetForm.title,
+        type: 1,
+        files: JSON.stringify(this.editMeetForm.files),
+        place: this.editMeetForm.place
+      }
+      this.loading = true
+      updateMeet(editForm).then(res=>{
+        if (true) {
+          this.$message.success("编辑成功");
+          this.meetFlag = false
+          this.loading = false
+          /** 获取当前日期*/
+          let yy = new Date().getFullYear();
+          let mm = new Date().getMonth() + 1;
+          let dd = new Date().getDate();
+          if (mm < 10) {
+            mm = this.padding0(mm, 2)
+          }
+          if (dd < 10) {
+            dd = this.padding0(dd, 2)
+          }
+          this.nowDate = yy + '-' + mm + '-' + dd
+          this.formData.year = yy + '年'
+          this.formData.month = mm + '月'
+          this.lastYear = yy
+          this.lastMonth = mm
+          this.getMonthData()
+          this.init()
+        } else {
+          this.$message.warning("编辑失败");
+          this.loading = false
+        }
+      })
+    },
   }
 }
 </script>
@@ -340,7 +814,7 @@ export default {
   }
 
   /deep/ .el-card__body {
-    padding: 10px;
+    padding: 5px 0px 10px 10px;
   }
 
   .card_info_empty {
@@ -351,27 +825,33 @@ export default {
     height: 190px;
     margin-top: 10px;
 
-    .content_text {
+    .content_style {
-      white-space: nowrap;
+      height: 150px;
-      text-overflow: ellipsis;
+      overflow-y: auto;
-      overflow: hidden;
+      width: 100%;
-      word-break: break-all;
-      line-height: normal;
-      margin-top: 10px;
-      font-size: 5px;
-    }
 
-    .content_text2 {
+      .content_text {
-      text-overflow: ellipsis;
+        white-space: nowrap;
-      overflow: hidden;
+        text-overflow: ellipsis;
-      text-overflow: ellipsis;
+        overflow: hidden;
-      display: -webkit-box;
+        word-break: break-all;
-      -webkit-line-clamp: 4;
+        line-height: normal;
-      line-clamp: 4;
+        margin-top: 10px;
-      -webkit-box-orient: vertical;
+        font-size: 5px;
-      line-height: normal;
+      }
-      margin-top: 10px;
+
-      font-size: 5px;
+      .content_text2 {
+        text-overflow: ellipsis;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        display: -webkit-box;
+        -webkit-line-clamp: 4;
+        line-clamp: 4;
+        -webkit-box-orient: vertical;
+        line-height: normal;
+        margin-top: 10px;
+        font-size: 5px;
+      }
     }
   }
 }

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

@@ -562,7 +562,7 @@
                         this.$refs['Form'].validate((valid) => {
                             if (valid) {
                                 this.isSubmit = true
-                                this.$http.get('lawss/activiti/startProcess', {
+                                this.$http.post('lawss/activiti/startProcessRollBack', {
                                     type: '2'
                                 }, {}, res => {
                                     if (res.ok) {

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

@@ -559,7 +559,7 @@ export default {
           this.$refs['Form'].validate((valid) => {
             if (valid) {
               this.isSubmit = true
-              this.$http.get('lawss/activiti/startProcessRollBack', {
+              this.$http.post('lawss/activiti/startProcessRollBack', {
                 id: this.bpnId || '',
                 createUser: this.$store.getters.userInfo.userId,
                 createUserName: this.$store.getters.userInfo.userName,

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

@@ -22,7 +22,7 @@
                     v-for="item in rh_pageData.comityOptionsOne"
                     :key="item.id"
                     v-if="item.id === rh_pageData.comityName">
-                    {{ item.name || '-'}}
+                    {{ item.name || '-' }}
                   </span>
                 </el-form-item>
               </el-col>
@@ -74,7 +74,7 @@
                   <span v-if="infoSourcesLength === 0">{{ '-' }}</span>
                   <div v-for="item in rh_pageData.infoSources" :key="item.id" style="color: #409EFF;">
                     <a v-if="item.name.length > 30" style="cursor: pointer" @click="fileLook(item)">
-                      {{ item.name.slice(0,30) + '...' }} {{ ';' }}
+                      {{ item.name.slice(0, 30) + '...' }} {{ ';' }}
                     </a>
                     <a v-else style="cursor: pointer" @click="fileLook(item)">
                       {{ item.name }} {{ ';' }}
@@ -193,12 +193,10 @@
                 </el-table-column>
                 <el-table-column prop="fillFile" width="120" align="center" label="资料">
                   <template slot-scope="scope">
-                    <el-button v-if="scope.row.fillFile.length === 0" type="primary" plain size="mini" @click="fillFile_up(scope.row)">点击上传</el-button>
+                    <el-button v-if="scope.row.fillFile.length === 0" type="primary" plain size="mini" @click="fillFile_up(scope.row)">
+                      点击上传
+                    </el-button>
                     <el-button v-else size="mini" plain type="primary" @click="fillFile_up(scope.row)">查看附件</el-button>
-<!--                    <span v-if="scope.row.fillFile.length === 0">{{ '-' }}</span>
-                    <span v-for="item in scope.row.fillFile" :key="item.id" style="color: #409EFF;" @click="previews(item.id)">
-                    {{ item.name }} {{ ';' }}
-                   </span>-->
                   </template>
                 </el-table-column>
                 <el-table-column
@@ -301,51 +299,51 @@
       :visible.sync="editFlag"
       size="500px"
     >
-      <div class="content_form">
+      <div class="content_form" style="height: 100%">
         <el-form class="label-input-form" ref="editForm" :model="editForm" label-width="80px">
-        <el-form-item class="add-form-item" label="参与人员:">
+          <el-form-item class="add-form-item" label="参与人员:">
-          <el-input v-model="editForm.fillPeopleId" style="display: none;"></el-input>
+            <el-input v-model="editForm.fillPeopleId" style="display: none;"></el-input>
-          <el-input
+            <el-input
-            placeholder="请选择参与人员"
+              placeholder="请选择参与人员"
-            style="width: 50%"
+              style="width: 50%"
-            @click.native="choiceRole('fillPeopleId','请选择入会成员',editForm.fillPeopleId,)"
+              @click.native="choiceRole('fillPeopleId','请选择入会成员',editForm.fillPeopleId,)"
-            v-model="editForm.fillPeople"
+              v-model="editForm.fillPeople"
-          />
+            />
-        </el-form-item>
+          </el-form-item>
-        <el-form-item class="add-form-item" label="单位:">
+          <el-form-item class="add-form-item" label="单位:">
-          <el-input v-model="editForm.fillUnit" placeholder=""></el-input>
+            <el-input v-model="editForm.fillUnit" placeholder=""></el-input>
-        </el-form-item>
+          </el-form-item>
-        <el-form-item class="add-form-item" label="部门:">
+          <el-form-item class="add-form-item" label="部门:">
-          <el-input v-model="editForm.fillDept" placeholder=""></el-input>
+            <el-input v-model="editForm.fillDept" placeholder=""></el-input>
-        </el-form-item>
+          </el-form-item>
-        <el-form-item class="add-form-item" label="身份:">
+          <el-form-item class="add-form-item" label="身份:">
-          <el-input v-model="editForm.fillPost" placeholder=""></el-input>
+            <el-input v-model="editForm.fillPost" placeholder=""></el-input>
-        </el-form-item>
+          </el-form-item>
-        <el-form-item class="add-form-item" label="电话:">
+          <el-form-item class="add-form-item" label="电话:">
-          <el-input v-model="editForm.fillTel" placeholder=""></el-input>
+            <el-input v-model="editForm.fillTel" placeholder=""></el-input>
-        </el-form-item>
+          </el-form-item>
-        <el-form-item class="add-form-item" label="邮箱:">
+          <el-form-item class="add-form-item" label="邮箱:">
-          <el-input v-model="editForm.fillMail" placeholder=""></el-input>
+            <el-input v-model="editForm.fillMail" placeholder=""></el-input>
-        </el-form-item>
+          </el-form-item>
-        <el-form-item class="add-form-item" label="资料:">
+          <el-form-item class="add-form-item" label="资料:">
-          <el-upload
+            <el-upload
-            :disabled="acceptShow"
+              :disabled="acceptShow"
-            multiple
+              multiple
-            ref="uploadFile"
+              ref="uploadFile"
-            :action="actionPath"
+              :action="actionPath"
-            name="file"
+              name="file"
-            :file-list="reData"
+              :file-list="reData"
-            accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF"
+              accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF"
-            :before-upload="handleBeforeUpload"
+              :before-upload="handleBeforeUpload"
-            :before-remove="handleBeforeRemove"
+              :before-remove="handleBeforeRemove"
-            :on-success="handleOnsuccess"
+              :on-success="handleOnsuccess"
-          >
+            >
-            <el-button type="primary" size="small">
+              <el-button type="primary" size="small">
-              上传文件
+                上传文件
-            </el-button>
+              </el-button>
-          </el-upload>
+            </el-upload>
-        </el-form-item>
+          </el-form-item>
-      </el-form>
+        </el-form>
       </div>
       <div class="demo-drawer-footer">
         <el-button size="mini" @click="falseDrawer">取消</el-button>
@@ -472,6 +470,7 @@ export default {
         fillPost: '',
         fillTel: '',
         fillMail: '',
+        fillFile: [],
       },
 
       // 上传文件储存
@@ -626,19 +625,26 @@ export default {
       this.editFlag = false
     },
     falseDrawer() {
-      let item = JSON.parse(localStorage.getItem('obj'))
+      let Item = JSON.parse(localStorage.getItem('obj'))
-      this.editForm = item
+      this.editForm.fillPeopleId = Item.fillPeopleId
+      this.editForm.fillPeople = Item.fillPeople
+      this.editForm.fillUnit = Item.fillUnit
+      this.editForm.fillDept = Item.fillDept
+      this.editForm.fillPost = Item.fillPost
+      this.editForm.fillTel = Item.fillTel
+      this.editForm.fillMail = Item.fillMail
+      this.editForm.fillFile = Item.fillFile
       this.editFlag = false
     },
     // 编辑框选人
-    choiceRole(type, title,id) {
+    choiceRole(type, title, id) {
       this.nodeList = []
       this.nodeList.push(id)
       this.type = type
       this.roleShowflag = true
     },
     drawerCheck(data) {
-      if(data.length > 0) {
+      if (data.length > 0) {
         this.fileListData.fillPeopleId = data[0].id
         this.fileListData.fillPeople = data[0].name
       }
@@ -739,16 +745,16 @@ export default {
       const attId = file.id
       this.getBusStandFileByAttId(attId)
         .then(res => {
-          if(res){
+          if (res) {
             const editFileInfo = res
-            if(editFileInfo.fileSuffix === 'pdg' || editFileInfo.fileSuffix === 'PDG'){
+            if (editFileInfo.fileSuffix === 'pdg' || editFileInfo.fileSuffix === 'PDG') {
-              window.open('book://ssreader/e0?url='+editFileInfo.downLoadUrl)
+              window.open('book://ssreader/e0?url=' + editFileInfo.downLoadUrl)
-            }else if(editFileInfo.fileSuffix === 'pdf' || editFileInfo.fileSuffix === 'PDF'){
+            } else if (editFileInfo.fileSuffix === 'pdf' || editFileInfo.fileSuffix === 'PDF') {
               window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id))
-            }else {
+            } else {
               const nowTime = new Date().getTime()
               // window.open('http://127.0.0.1:8012/onlinePreview?url='+encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl)));
-              window.open('/static/onlyOffice/onlinePreview.html?oldFileName=' + editFileInfo.oldFileName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName)
+              window.open('/static/onlyOffice/onlinePreview.html?oldFileName=' + editFileInfo.oldFileName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime + '&filePath=' + editFileInfo.filePath + '&fileName=' + editFileInfo.fileName)
             }
             // window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id))
           }

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

@@ -283,7 +283,7 @@
             </el-timeline-item>
             <el-timeline-item timestamp="批准" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
               <el-card>
-                <el-form-item prop="totalLeader" style="margin-bottom: 0">
+                <el-form-item prop="directorUserName" style="margin-bottom: 0">
                   <h4>技术委员会主任</h4>
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.directorUserId" style="display: none;"></el-input>
@@ -392,7 +392,9 @@ export default {
         fillFile: '',
         associaOptionsOne: [],
         associaOptionsTwo: [],
-        associaOptionsTree: []
+        associaOptionsTree: [],
+        meetingInRole: '',
+        meetingInRoleId: ''
 
       },
       feeKindOptions: [
@@ -429,6 +431,7 @@ export default {
         leaderUser: [{required: true, message: "请选择标准法规部主管中心主任", trigger: ['blur', 'change']}],
         feeUser: [{required: true, message: "请选择管理推荐部", trigger: ['blur', 'change']}],
         engineerUser: [{required: true, message: "请选择技术委员会常务副主任/总院院长", trigger: ['blur', 'change']}],
+        directorUserName: [{required: true, message: "请选择技术委员会主任", trigger: ['blur', 'change']}],
       },
       deleteDataList: [],
 

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

@@ -107,11 +107,12 @@
             <ProcessTitle>
               <template slot="title">选择人员</template>
             </ProcessTitle>
-            <el-form-item class="add-form-item" label="入会人员:">
+            <el-form-item class="add-form-item" label="参会人员:">
+              <el-input v-model="ch_pageData.meetingInRoleId" style="display: none;"></el-input>
               <el-input
-                :disabled="true"
+                placeholder="请选择参会人员"
-                style="width: 30%"
+                style="width: 50%"
-                placeholder="请选择入会人员"
+                @click.native="choiceRole('meetingInRoleId','选择参会人员',ch_pageData.meetingInRoleId,)"
                 v-model="ch_pageData.meetingInRole"
               />
             </el-form-item>
@@ -209,6 +210,13 @@
       @submit="handleSubmit"
     >
     </ProcessFooter>
+
+    <Role-tree
+      is-title="选择入会人员"
+      :is-visible.sync="roleShowflag"
+      :nodeList="nodeList"
+      @checkedRole="drawerCheck"
+    />
   </div>
 </template>
 
@@ -293,10 +301,31 @@ export default {
       this.$nextTick(() => {
         this.ch_pageData = JSON.parse(JSON.stringify(item)).ch_pageData
         this.uploadFileLength = this.ch_pageData.fileTextList.length
-        this.ch_pageData.meetingInRole = this.$store.getters.userInfo.userName
         this.roleForm = JSON.parse(JSON.stringify(item)).roleList
       })
     },
+
+    /** 选择入会人员 */
+    choiceRole(type,title,id) {
+      this.nodeList = []
+      this.nodeList.push(id)
+      this.roleShowflag = true
+    },
+    drawerCheck(data) {
+      var idList = ''
+      var nameList = ''
+      data.forEach(item => {
+        if (nameList.length > 0) {
+          nameList += ','
+          idList += ','
+        }
+        idList += item.id;
+        nameList += item.name;
+      })
+      this.ch_pageData.meetingInRole = nameList
+      this.ch_pageData.meetingInRoleId = idList
+      this.roleShowflag = false
+    },
     // 退回按钮
     handleSubmitNo() {
       if (this.commentText === '') {

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

@@ -372,7 +372,7 @@ export default {
         this.ch_pageData.fillUnit = this.$store.getters.userInfo.upDeptName
         this.ch_pageData.fillTel = this.$store.getters.userInfo.phone
         this.ch_pageData.fillPeopleId = this.$store.getters.userInfo.userId
-        this.ch_pageData.fillPeople = this.$store.getters.userInfo.userName
+        this.ch_pageData.fillPeople = this.$store.getters.userInfo.userName  + '(' + this.$store.getters.userInfo.userId + ')'
         this.roleForm = JSON.parse(JSON.stringify(item)).roleList
         // this.rh_pageData.comityFileNum = this.fileTextList
       })

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

@@ -113,11 +113,15 @@
             </el-form-item>
             <el-form-item class="add-form-item" label="入会人员:">
               <div class="myPart_btn">
+                <el-button
+                  type="primary"
+                  size="small"
+                  @click="add_partForm">
+                  新增</el-button>
                 <el-button
                   type="danger"
                   size="small"
-                  icon="el-icon-delete"
+                  @click="del_partForm">
-                  @click="del_paryForm">
                   批量删除
                 </el-button>
               </div>
@@ -132,11 +136,40 @@
               fontWeight: 'bold', height: '20px'}">
                 <el-table-column type="selection" width="55"/>
                 <el-table-column type="index" width="50" align="center"/>
-                <el-table-column prop="fillPeople" align="center" label="人员"/>
+                <el-table-column prop="fillPeople" align="center" label="人员">
-                <el-table-column prop="fillUnit" align="center" label="单位"/>
+                  <template slot-scope="scope">
-                <el-table-column prop="fillDept" align="center" label="部门"/>
+                    {{ scope.row.fillPeople || '' }}
-                <el-table-column prop="fillTel" align="center" label="电话"/>
+                  </template>
-                <el-table-column prop="fillMail" align="center" label="邮箱"/>
+                </el-table-column>
+                <el-table-column prop="fillUnit" align="center" label="单位">
+                  <template slot-scope="scope">
+                    {{ scope.row.fillUnit || '' }}
+                  </template>
+                </el-table-column>
+                <el-table-column prop="fillDept" align="center" label="部门">
+                  <template slot-scope="scope">
+                    {{ scope.row.fillDept || '' }}
+                  </template>
+                </el-table-column>
+                <el-table-column prop="fillTel" align="center" label="电话">
+                  <template slot-scope="scope">
+                    {{ scope.row.fillTel || '' }}
+                  </template>
+                </el-table-column>
+                <el-table-column prop="fillMail" align="center" label="邮箱">
+                  <template slot-scope="scope">
+                    {{ scope.row.fillMail || '' }}
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  fixed="right"
+                  label="操作"
+                  align="center"
+                  width="100">
+                  <template slot-scope="scope">
+                    <el-button type="primary" plain size="mini" @click="edit_partForm(scope.row)">编辑</el-button>
+                  </template>
+                </el-table-column>
               </el-table>
             </el-form-item>
           </el-form>
@@ -223,6 +256,42 @@
         <loading :loading="loading">流程列表加载中</loading>
       </div>
     </div>
+    <el-drawer
+      title="编辑人员信息"
+      :visible.sync="editFlag"
+      size="500px"
+      custom-class="demo-drawer"
+    >
+      <div class="content_form" style="height: 100%">
+        <el-form class="label-input-form" ref="editForm" :model="editForm" label-width="80px">
+          <el-form-item class="add-form-item" label="参与人员:">
+            <el-input v-model="editForm.fillPeopleId" style="display: none;"></el-input>
+            <el-input
+              placeholder="请选择参与人员"
+              style="width: 50%"
+              @click.native="choiceRole('fillPeopleId','请选择入会成员',editForm.fillPeopleId,)"
+              v-model="editForm.fillPeople"
+            />
+          </el-form-item>
+          <el-form-item class="add-form-item" label="单位:">
+            <el-input v-model="editForm.fillUnit" placeholder=""></el-input>
+          </el-form-item>
+          <el-form-item class="add-form-item" label="部门:">
+            <el-input v-model="editForm.fillDept" placeholder=""></el-input>
+          </el-form-item>
+          <el-form-item class="add-form-item" label="电话:">
+            <el-input v-model="editForm.fillTel" placeholder=""></el-input>
+          </el-form-item>
+          <el-form-item class="add-form-item" label="邮箱:">
+            <el-input v-model="editForm.fillMail" placeholder=""></el-input>
+          </el-form-item>
+        </el-form>
+      </div>
+      <div class="demo-drawer-footer">
+        <el-button size="mini" @click="falseDrawer">取消</el-button>
+        <el-button type="primary" size="mini" @click="OkDrawer">确认</el-button>
+      </div>
+    </el-drawer>
     <ProcessFooter
       show-save
       show-submit
@@ -232,6 +301,13 @@
       @submit="handleSubmit"
     >
     </ProcessFooter>
+    <Role-tree
+      check-box
+      is-title="选择入会人员"
+      :is-visible.sync="roleShowflag"
+      :nodeList="nodeList"
+      @checkedRole="drawerCheck"
+    />
   </div>
 </template>
 
@@ -269,7 +345,18 @@ export default {
       pId: this.$route.query.prcId,
 
       uploadFileLength: '',
-      commentText: ''
+      commentText: '',
+      roleShowflag: false,
+      nodeList: [],
+      // 人员编辑
+      editFlag: false,
+      editForm: {
+        fillPeople: '',
+        fillUnit: '',
+        fillDept: '',
+        fillTel: '',
+        fillMail: '',
+      }
     }
   },
   computed: {
@@ -318,9 +405,55 @@ export default {
         // this.ch_pageData.comityFileNum = this.fileTextList
       })
     },
-
+    /** 我司参与人员新增 */
+    add_partForm() {
+      var list = {
+        fillPeople: this.fillPeople,
+        fillUnit: this.fillUnit,
+        fillDept: this.fillDept,
+        fillTel: this.fillTel,
+        fillMail: this.fillMail,
+      }
+      this.ch_pageData.myPartRole.push(list)
+    },
+    // 编辑框确认按钮
+    OkDrawer() {
+      this.editFlag = false
+    },
+    falseDrawer() {
+      let Item = JSON.parse(localStorage.getItem('obj'))
+      this.editForm.fillPeopleId = Item.fillPeopleId
+      this.editForm.fillPeople = Item.fillPeople
+      this.editForm.fillUnit = Item.fillUnit
+      this.editForm.fillDept = Item.fillDept
+      this.editForm.fillTel = Item.fillTel
+      this.editForm.fillMail = Item.fillMail
+      this.editFlag = false
+    },
+    /** 入会人员编辑 */
+    edit_partForm(row) {
+      // 用来储存取消时原来的数据，防止取消时修改
+      localStorage.setItem('obj', JSON.stringify(row))
+      this.fileListData = row
+      this.editForm = row
+      this.editFlag = true
+    },
+    // 编辑框选人
+    choiceRole(type, title, id) {
+      this.nodeList = []
+      this.nodeList.push(id)
+      this.type = type
+      this.roleShowflag = true
+    },
+    drawerCheck(data) {
+      if (data.length > 0) {
+        this.fileListData.fillPeopleId = data[0].id
+        this.fileListData.fillPeople = data[0].name
+      }
+      this.roleShowflag = false
+    },
     /** 批量删除 */
-    del_paryForm() {
+    del_partForm() {
       if (this.deleteDataList.length < 1) {
         this.$message.warning("请选择一条数据进行删除");
       } else {

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

@@ -179,7 +179,7 @@
                         align="center">
                     <template slot-scope="scope">
                         <el-button class="common-button-primary" size="mini" type="primary" @click="itemEdit(scope.row, 1, scope.$index)">编辑</el-button>
-                        <el-button class="common-button-primary" size="mini" type="primary" @click="checkBD(scope.row.itemsId, scope.row.itemsId2)">查看比对</el-button>
+                        <el-button v-if="form.itemsNum1" class="common-button-primary" size="mini" type="primary" @click="checkBD(scope.row.itemsId, scope.row.itemsId2)">查看比对</el-button>
                     </template>
                 </el-table-column>
             </el-table>
@@ -474,7 +474,7 @@
                 size="800px">
             <div class="demo-drawer-content">
                 <el-form :model="plForm" class="label-input-form" ref="plForm" label-width=150>
-                    <el-button v-if="PLmodalType === 1" style="margin: 10px 0 0 10px;" class="common-button-primary" size="mini" type="primary" @click="checkBD(plForm.itemsId, plForm.itemsId2)">查看比对</el-button>
+                    <el-button v-if="PLmodalType === 1 && form.itemsNum1" style="margin: 10px 0 0 10px;" class="common-button-primary" size="mini" type="primary" @click="checkBD(plForm.itemsId, plForm.itemsId2)">查看比对</el-button>
                     <el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item" v-if="!form.itemsNum1">
                         <el-input
                                 v-model="plForm.technicalRequir"
@@ -535,8 +535,8 @@
                 size="1100px">
             <div>相似度:{{ similarityDegree }}</div>
             <div style="height: 600px;overflow: auto;display: flex;">
-                <div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%;"></div>
+                <div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
-                <div v-html="rightData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%;"></div>
+                <div v-html="rightData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
             </div>
         </el-dialog>
     </div>
@@ -1181,7 +1181,7 @@
                                     this.$message.warning('请选择责任人')
                                 } else {
                                     this.isSubmit = true
-                                    this.$http.get('lawss/activiti/startProcess', {
+                                    this.$http.post('lawss/activiti/startProcessRollBack', {
                                         type: '9'
                                     }, {}, res => {
                                         if (res.ok) {

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

@@ -183,7 +183,7 @@
                 align="center">
           <template slot-scope="scope">
             <el-button class="common-button-primary" size="mini" type="primary" @click="itemEdit(scope.row, 1, scope.$index)">编辑</el-button>
-            <el-button class="common-button-primary" size="mini" type="primary" @click="checkBD(scope.row.itemsId, scope.row.itemsId2)">查看比对</el-button>
+            <el-button v-if="form.itemsNum1" class="common-button-primary" size="mini" type="primary" @click="checkBD(scope.row.itemsId, scope.row.itemsId2)">查看比对</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -483,7 +483,7 @@
             size="800px">
       <div class="demo-drawer-content">
         <el-form :model="plForm" class="label-input-form" ref="plForm" label-width=150>
-          <el-button v-if="PLmodalType === 1" style="margin: 10px 0 0 10px;" class="common-button-primary" size="mini" type="primary" @click="checkBD(plForm.itemsId, plForm.itemsId2)">查看比对</el-button>
+          <el-button v-if="PLmodalType === 1 && form.itemsNum1" style="margin: 10px 0 0 10px;" class="common-button-primary" size="mini" type="primary" @click="checkBD(plForm.itemsId, plForm.itemsId2)">查看比对</el-button>
           <el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item" v-if="!form.itemsNum1">
             <el-input
                     v-model="plForm.technicalRequir"
@@ -544,8 +544,8 @@
             size="1100px">
       <div>相似度:{{ similarityDegree }}</div>
       <div style="height: 600px;overflow: auto;display: flex;">
-        <div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%;"></div>
+        <div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
-        <div v-html="rightData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%;"></div>
+        <div v-html="rightData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
       </div>
     </el-dialog>
   </div>

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

@@ -188,7 +188,7 @@
                         align="center">
                     <template slot-scope="scope">
                         <el-button class="common-button-primary" size="mini" type="primary" @click="itemEdit(scope.row)">编辑</el-button>
-                        <el-button class="common-button-primary" size="mini" type="primary" @click="checkBD(scope.row.itemsId, scope.row.itemsId2)">查看比对</el-button>
+                        <el-button v-if="form.itemsNum1" class="common-button-primary" size="mini" type="primary" @click="checkBD(scope.row.itemsId, scope.row.itemsId2)">查看比对</el-button>
                     </template>
                 </el-table-column>
             </el-table>
@@ -357,7 +357,7 @@
                 size="800px">
             <div class="demo-drawer-content">
                 <el-form :model="editForm" class="label-input-form" ref="plForm" label-width=150>
-                    <el-button style="margin: 10px 0 0 10px;" class="common-button-primary" size="mini" type="primary" @click="checkBD(editForm.itemsId, editForm.itemsId2)">查看比对</el-button>
+                    <el-button v-if="form.itemsNum1" style="margin: 10px 0 0 10px;" class="common-button-primary" size="mini" type="primary" @click="checkBD(editForm.itemsId, editForm.itemsId2)">查看比对</el-button>
 <!--                    <el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item"  v-if="!form.itemsNum1">-->
 <!--                        <el-input-->
 <!--                                v-model="editForm.technicalRequir"-->
@@ -432,8 +432,8 @@
                 size="1100px">
             <div>相似度:{{ similarityDegree }}</div>
             <div style="height: 600px;overflow: auto;display: flex;">
-                <div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%;"></div>
+                <div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
-                <div v-html="rightData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%;"></div>
+                <div v-html="rightData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
             </div>
         </el-dialog>
     </div>

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

@@ -177,6 +177,7 @@
                 <el-table-column
                         label="操作"
                         width="140"
+                        v-if="form.itemsNum1"
                         align="center">
                     <template slot-scope="scope">
                         <el-button class="common-button-primary" size="mini" type="primary" @click="checkBD(scope.row.itemsId, scope.row.itemsId2)">查看比对</el-button>
@@ -285,8 +286,8 @@
                 size="1100px">
             <div>相似度:{{ similarityDegree }}</div>
             <div style="height: 600px;overflow: auto;display: flex;">
-                <div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%;"></div>
+                <div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
-                <div v-html="rightData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%;"></div>
+                <div v-html="rightData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
             </div>
         </el-dialog>
     </div>

src/pages/processCenter/pages/creatProcess/bzjd/step5.vue

@@ -176,6 +176,7 @@
                 </el-table-column>
                 <el-table-column
                         label="操作"
+                        v-if="form.itemsNum1"
                         width="140"
                         align="center">
                     <template slot-scope="scope">
@@ -290,8 +291,8 @@
                 size="1100px">
             <div>相似度:{{ similarityDegree }}</div>
             <div style="height: 600px;overflow: auto;display: flex;">
-                <div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%;"></div>
+                <div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
-                <div v-html="rightData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%;"></div>
+                <div v-html="rightData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
             </div>
         </el-dialog>
         <loading :loading="loading">加载中...</loading>

src/pages/processCenter/pages/creatProcess/bzjd/step6.vue

@@ -177,6 +177,7 @@
                 </el-table-column>
                 <el-table-column
                         label="操作"
+                        v-if="form.itemsNum1"
                         width="140"
                         align="center">
                     <template slot-scope="scope">
@@ -289,8 +290,8 @@
                 size="1100px">
             <div>相似度:{{ similarityDegree }}</div>
             <div style="height: 600px;overflow: auto;display: flex;">
-                <div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%;"></div>
+                <div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
-                <div v-html="rightData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%;"></div>
+                <div v-html="rightData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
             </div>
         </el-dialog>
         <loading :loading="loading">加载中...</loading>

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

@@ -813,7 +813,7 @@ export default {
           this.$refs['Form'].validate((valid) => {
             if (valid) {
               this.isSubmit = true
-              this.$http.get('lawss/activiti/startProcess', {
+              this.$http.post('lawss/activiti/startProcessRollBack', {
                 type: '3'
               }, {}, res => {
                 if (res.ok) {

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

@@ -829,7 +829,7 @@ export default {
           this.$refs['Form'].validate((valid) => {
             if (valid) {
               this.isSubmit = true
-              this.$http.get('lawss/activiti/startProcess', {
+              this.$http.post('lawss/activiti/startProcessRollBack', {
                 id: this.bpnId || '',
                 createUser: this.$store.getters.userInfo.userId,
                 createUserName: this.$store.getters.userInfo.userName,

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

@@ -359,14 +359,9 @@ export default {
     },
     //驳回
     beforeBack(){
-      if (this.participantsData.length < 1) {
+      if(!this.commentText){
-        this.$message.warning("项目信息不能为空");
+        this.$message.warning('请填写审批意见')
-      } else {
+      }else{
-        this.participantsData.forEach(item => {
-          if (item.projectNumber === undefined) {
-            this.$message.warning("请完善项目信息");
-          }
-        });
         this.wbbzform.commentText = this.commentText;
         let json = {
           participantsData: this.participantsData,

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

@@ -359,19 +359,14 @@ export default {
     },
     //驳回
     beforeBack(){
-      if (this.participantsData.length < 1) {
+      if (!this.commentText) {
-        this.$message.warning("项目信息不能为空");
+        this.$message.warning("请填写审批意见");
       } else {
-        this.participantsData.forEach(item => {
-          if (item.projectNumber === undefined) {
-            this.$message.warning("请完善项目信息");
-          }
-        });
         this.wbbzform.commentText = this.commentText;
         let json = {
           participantsData: this.participantsData,
           wbbzform: this.wbbzform,
-          signFlag: '2',
+          signFlag: "2"
         };
         this.$refs["wbbzForm"].validate((valid) => {
           if (valid) {

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

@@ -359,14 +359,9 @@ export default {
     },
     //驳回
     beforeBack(){
-      if (this.participantsData.length < 1) {
+      if(!this.commentText){
-        this.$message.warning("项目信息不能为空");
+        this.$message.warning('请填写审批意见')
-      } else {
+      }else{
-        this.participantsData.forEach(item => {
-          if (item.projectNumber === undefined) {
-            this.$message.warning("请完善项目信息");
-          }
-        });
         this.wbbzform.commentText = this.commentText;
         let json = {
           participantsData: this.participantsData,

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

@@ -155,21 +155,21 @@
             align="center">
           </el-table-column>
           <el-table-column
-            prop="account"
+            prop="accounts"
             label="账户"
             width="300"
             align="center">
             <template slot-scope="scope">
-                 <el-input v-model="scope.row.account" placeholder="请输入账户"></el-input>
+                 <el-input v-model="scope.row.accounts" placeholder="请输入账户"></el-input>
             </template>
           </el-table-column>
           <el-table-column
-            prop="password"
+            prop="passwords"
             label="密码"
             width="300"
             align="center">
             <template slot-scope="scope">
-              <el-input v-model="scope.row.password" placeholder="请输入密码"></el-input>
+              <el-input v-model="scope.row.passwords" placeholder="请输入密码"></el-input>
             </template>
           </el-table-column>
         </el-table>
@@ -245,7 +245,7 @@
       </el-collapse>
     </div>
     <div class="content" v-show="active === '3'">
-      <div class="flow-list">
+      <div class="flow-list" style="height: 100%">
         <el-table
           height="100%"
           ref="selection"
@@ -382,8 +382,8 @@ export default {
           institutionName: '', //所在部门
           email: '', //联系方式
           tenure:'', //任期
-          account:'', //账户
+          accounts:'', //账户
-          password:'', //密码
+          passwords:'', //密码
         }],
         associationData: [{
           contactPerson: '', //协议联络人
@@ -567,13 +567,17 @@ export default {
     //流程提交
     handleSubmit() {
       this.isSubmit = true
-      this.wbbzform.dlFlag = '1',
+      this.wbbzform.dlFlag = '1'
+      this.wbbzform.comityOptionsOne = this.comityOptionsOne
+      this.wbbzform.comityOptionsTwo = this.comityOptionsTwo
+      this.wbbzform.comityOptionsOneThree = this.comityOptionsOneThree
       this.wbbzform.fileName = this.fileInfoList
-      this.wbbzform.passUser = this.$store.getters.userInfo.userId,
+      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)
+      let json = JSON.stringify( this.wbbzform)
+      console.log(json);
       this.$http.post("lawss/activiti/completeTask", {
         taskIds: this.taskIds,
         userId: this.userId,

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

@@ -130,6 +130,7 @@
           <el-table-column
             prop="duties"
             label="职务"
+            width="180"
             align="center">
           </el-table-column>
           <el-table-column
@@ -146,17 +147,18 @@
           </el-table-column>
           <el-table-column
             prop="tenure"
+            width="200"
             label="任期"
             align="center">
           </el-table-column>
           <el-table-column
-            prop="account"
+            prop="accounts"
             label="账户"
             width="200"
             align="center">
           </el-table-column>
           <el-table-column
-            prop="password"
+            prop="passwords"
             label="密码"
             width="350"
             align="center">
@@ -198,7 +200,7 @@
         </el-table>
       </div>
       <el-collapse accordion>
-        <el-collapse-item title="回执说明">
+        <el-collapse-item title="审批意见">
           <div style="margin: 10px 0;">
             <el-input
               type="textarea"
@@ -212,7 +214,7 @@
       </el-collapse>
     </div>
     <div class="content" v-show="active === '3'">
-      <div class="flow-list">
+      <div class="flow-list" style="height: 100%">
         <el-table
           height="100%"
           ref="selection"
@@ -479,9 +481,23 @@ export default {
      * @description: 动态表单读取
      */
     getFormFieldList(item) {
-      console.log(item);
       this.$nextTick(() => {
         this.wbbzform = JSON.parse(JSON.stringify(item));
+        this.wbbzform.comityOptionsOne.forEach(item =>{
+         if(this.wbbzform.associationName === item.id){
+           this.wbbzform.associationName = item.name
+         }
+        })
+        this.wbbzform.comityOptionsTwo.forEach(item =>{
+          if(this.wbbzform.committee === item.id){
+            this.wbbzform.committee = item.name
+          }
+        })
+        this.wbbzform.comityOptionsOneThree.forEach(item =>{
+          if(this.wbbzform.workingGroup === item.id){
+            this.wbbzform.workingGroup = item.name
+          }
+        })
         this.associationData = item.associationData
         this.participantsData = item.participantsData
         item.fileName.forEach(itemId => {
@@ -547,7 +563,7 @@ export default {
       this.wbbzform.commentText = this.commentText;
       this.wbbzform.participantsData = this.participantsData
       this.wbbzform.associationData = this.associationData
-      var json = JSON.stringify( this.wbbzform)
+      let json = JSON.stringify( this.wbbzform)
       this.$http.post("lawss/activiti/completeTask", {
         taskIds: this.taskIds,
         userId: this.userId,
@@ -566,28 +582,32 @@ export default {
     },
     //流程驳回
     beforeBack(){
-      this.isSubmit = true
+      if(!this.commentText){
-      this.wbbzform.signFlag = '0',
+        this.$message.warning('请填写审批意见')
-      this.wbbzform.passUser = this.$store.getters.userInfo.userId,
+      }else{
-      this.wbbzform.commentText = this.commentText;
+        this.isSubmit = true
-      this.wbbzform.participantsData = this.participantsData
+        this.wbbzform.signFlag = '0',
-      this.wbbzform.associationData = this.associationData
+          this.wbbzform.passUser = this.$store.getters.userInfo.userId,
-      var json = JSON.stringify( this.wbbzform)
+          this.wbbzform.commentText = this.commentText;
-      this.$http.post("lawss/activiti/completeTask", {
+        this.wbbzform.participantsData = this.participantsData
-        taskIds: this.taskIds,
+        this.wbbzform.associationData = this.associationData
-        userId: this.userId,
+        var json = JSON.stringify( this.wbbzform)
-        json: json
+        this.$http.post("lawss/activiti/completeTask", {
-      }, {
+          taskIds: this.taskIds,
-        _this: this
+          userId: this.userId,
-      }, res => {
+          json: json
-        if (res.success) {
+        }, {
-          this.$message.success(res.message);
+          _this: this
-          this.$router.push("/processCenter");
+        }, res => {
-        }
+          if (res.success) {
-        this.isSubmit = false
+            this.$message.success(res.message);
-      }, e => {
+            this.$router.push("/processCenter");
+          }
+          this.isSubmit = false
+        }, e => {
 
-      });
+        });
+      }
     },
   },
   mounted() {

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

@@ -130,6 +130,7 @@
           <el-table-column
             prop="duties"
             label="职务"
+            width="180"
             align="center">
           </el-table-column>
           <el-table-column
@@ -146,17 +147,18 @@
           </el-table-column>
           <el-table-column
             prop="tenure"
+            width="200"
             label="任期"
             align="center">
           </el-table-column>
           <el-table-column
-            prop="account"
+            prop="accounts"
             label="账户"
             width="200"
             align="center">
           </el-table-column>
           <el-table-column
-            prop="password"
+            prop="passwords"
             label="密码"
             width="350"
             align="center">
@@ -198,7 +200,7 @@
         </el-table>
       </div>
       <el-collapse accordion>
-        <el-collapse-item title="回执说明">
+        <el-collapse-item title="审批意见">
           <div style="margin: 10px 0;">
             <el-input
               type="textarea"
@@ -212,7 +214,7 @@
       </el-collapse>
     </div>
     <div class="content" v-show="active === '3'">
-      <div class="flow-list">
+      <div class="flow-list" style="height: 100%">
         <el-table
           height="100%"
           ref="selection"
@@ -566,28 +568,32 @@ export default {
     },
     //流程驳回
     beforeBack(){
-      this.isSubmit = true
+      if(!this.commentText){
-      this.wbbzform.bzFlag = '2',
+        this.$message.warning('请填写审批意见')
-      this.wbbzform.passUser = this.$store.getters.userInfo.userId,
+      }else{
-      this.wbbzform.commentText = this.commentText;
+        this.isSubmit = true
-      this.wbbzform.participantsData = this.participantsData
+        this.wbbzform.bzFlag = '2',
-      this.wbbzform.associationData = this.associationData
+          this.wbbzform.passUser = this.$store.getters.userInfo.userId,
-      var json = JSON.stringify( this.wbbzform)
+          this.wbbzform.commentText = this.commentText;
-      this.$http.post("lawss/activiti/completeTask", {
+        this.wbbzform.participantsData = this.participantsData
-        taskIds: this.taskIds,
+        this.wbbzform.associationData = this.associationData
-        userId: this.userId,
+        var json = JSON.stringify( this.wbbzform)
-        json: json
+        this.$http.post("lawss/activiti/completeTask", {
-      }, {
+          taskIds: this.taskIds,
-        _this: this
+          userId: this.userId,
-      }, res => {
+          json: json
-        if (res.success) {
+        }, {
-          this.$message.success(res.message);
+          _this: this
-          this.$router.push("/processCenter");
+        }, res => {
-        }
+          if (res.success) {
-        this.isSubmit = false
+            this.$message.success(res.message);
-      }, e => {
+            this.$router.push("/processCenter");
+          }
+          this.isSubmit = false
+        }, e => {
 
-      });
+        });
+      }
     },
   },
   mounted() {

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue

@@ -96,12 +96,12 @@
                 placeholder="请选择标准发布时间">
               </el-date-picker>
             </el-form-item>
-            <el-form-item label="起草责任单位" prop="unit" class="add-form-item form-item-disabled">
+            <el-form-item label="起草责任单位" prop="unitName" class="add-form-item form-item-disabled">
-              <div v-if="qbfsForm.unit">
+              <div v-if="qbfsForm.unitName">
-                <el-tooltip class="item" effect="dark" :content="qbfsForm.unit" placement="top-start">
+                <el-tooltip class="item" effect="dark" :content="qbfsForm.unitName" placement="top-start">
                   <el-input
                     readonly
-                    v-model="qbfsForm.unit"
+                    v-model="qbfsForm.unitName"
                     placeholder="请输入起草责任单位"
                     clearable
                   ></el-input>
@@ -110,7 +110,7 @@
               <div v-else>
                 <el-input
                   readonly
-                  v-model="qbfsForm.unit"
+                  v-model="qbfsForm.unitName"
                   placeholder="请输入起草责任单位"
                   clearable
                 ></el-input>
@@ -233,7 +233,7 @@
               </el-table-column>
               <el-table-column
                 align="center"
-                prop="unit"
+                prop="unitName"
                 label="起草责任单位">
               </el-table-column>
             </el-table>
@@ -370,7 +370,7 @@ export default {
         this.qbfsForm.releaseTime = this.selectList[0].releaseTime
         this.qbfsForm.resPersonName = this.selectList[0].resPersonName
         this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus === '0'? '制定完成' : (this.selectList[0].reviseStatus  === '1'? '制定中' : '未制定')
-        this.qbfsForm.unit = this.selectList[0].unit
+        this.qbfsForm.unitName = this.selectList[0].unitName
         this.qbfsForm.wgLeaderName = this.selectList[0].wgLeaderName
         this.ListModel = false
       }

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue

@@ -104,12 +104,12 @@
                placeholder="请选择标准发布时间">
              </el-date-picker>
            </el-form-item>
-           <el-form-item label="起草责任单位" prop="unit" class="add-form-item form-item-disabled">
+           <el-form-item label="起草责任单位" prop="unitName" class="add-form-item form-item-disabled">
-             <div v-if="qbfsForm.unit">
+             <div v-if="qbfsForm.unitName">
-               <el-tooltip class="item" effect="dark" :content="qbfsForm.unit" placement="top-start">
+               <el-tooltip class="item" effect="dark" :content="qbfsForm.unitName" placement="top-start">
                  <el-input
                    readonly
-                   v-model="qbfsForm.unit"
+                   v-model="qbfsForm.unitName"
                    placeholder="请输入起草责任单位"
                    clearable
                  ></el-input>
@@ -118,7 +118,7 @@
              <div v-else>
                <el-input
                  readonly
-                 v-model="qbfsForm.unit"
+                 v-model="qbfsForm.unitName"
                  placeholder="请输入起草责任单位"
                  clearable
                ></el-input>
@@ -249,7 +249,7 @@
              </el-table-column>
              <el-table-column
                align="center"
-               prop="unit"
+               prop="unitName"
                label="起草责任单位">
              </el-table-column>
            </el-table>
@@ -391,7 +391,7 @@ export default {
         this.qbfsForm.releaseTime = this.selectList[0].releaseTime
         this.qbfsForm.resPersonName = this.selectList[0].resPersonName
         this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus === '0'? '制定完成' : (this.selectList[0].reviseStatus  === '1'? '制定中' : '未制定')
-        this.qbfsForm.unit = this.selectList[0].unit
+        this.qbfsForm.unitName = this.selectList[0].unitName
         this.qbfsForm.wgLeaderName = this.selectList[0].wgLeaderName
         this.ListModel = false
       }

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue

@@ -64,10 +64,10 @@
           placeholder="请选择计划标准发布时间">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px"  prop="unit" class="add-form-item form-item-disabled">
+      <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px"  prop="unitName" class="add-form-item form-item-disabled">
-        <el-input v-model="qbfsForm.unitId" style="display: none;"></el-input>
+        <el-input v-model="qbfsForm.unit" style="display: none;"></el-input>
-        <el-input v-model="qbfsForm.unit" placeholder="请选择起草责任单位"
+        <el-input v-model="qbfsForm.unitName" placeholder="请选择起草责任单位"
-                  @click.native="choiceZRBM('unit', '选择起草责任单位', qbfsForm.unitId)">
+                  @click.native="choiceZRBM('unit', '选择起草责任单位', qbfsForm.unit)">
         </el-input>
       </el-form-item>
       <el-form-item label="新增原因" style="width: 100%; margin-right:10px"  prop="newReason" class="add-form-item form-item-disabled">
@@ -133,7 +133,7 @@ export default {
       qbfsForm: {
         type: '5',
         unit: '', // 单位
-        unitId: '',
+        unitName: '',
         esName: '', // 企标名称
         planStatus: '', // 计划状态
         reviseStatus: '', // 制修订状态
@@ -222,8 +222,8 @@ export default {
         idList += item.id
         nameList += item.name
       })
-      this.$set(this.qbfsForm, 'unitId', idList)
+      this.$set(this.qbfsForm, 'unit', idList)
-      this.$set(this.qbfsForm, 'unit', nameList)
+      this.$set(this.qbfsForm, 'unitName', nameList)
       if(this.qbfsForm.unit){
         this.$refs.qbfsForm.validateField('unit')
       }

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue

@@ -81,10 +81,10 @@
                 placeholder="请选择初稿完成时间">
               </el-date-picker>
             </el-form-item>
-            <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px"  prop="unit" class="add-form-item form-item-disabled">
+            <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px"  prop="unitName" class="add-form-item form-item-disabled">
-              <el-input v-model="qbfsForm.unitId" style="display: none;"></el-input>
+              <el-input v-model="qbfsForm.unit" style="display: none;"></el-input>
-              <el-input v-model="qbfsForm.unit" placeholder="请选择起草责任单位"
+              <el-input v-model="qbfsForm.unitName" placeholder="请选择起草责任单位"
-                        @click.native="choiceZRBM('unit', '选择起草责任单位', qbfsForm.unitId)">
+                        @click.native="choiceZRBM('unit', '选择起草责任单位', qbfsForm.unit)">
               </el-input>
 <!--              <el-select v-model="qbfsForm.unit" filterable multiple  clearable>-->
 <!--                <el-option-->
@@ -249,7 +249,7 @@
               </el-table-column>
               <el-table-column
                 align="center"
-                prop="unit"
+                prop="unitName"
                 label="起草责任单位">
               </el-table-column>
             </el-table>
@@ -330,7 +330,7 @@ export default {
         esName2: [
           {required: true, message: '请选择合并计划企标名称', trigger: 'blur'},
         ],
-        unit: [
+        unitName: [
           {required: true, message: '请选择起草单位', trigger: 'change'},
         ],
         esName: [
@@ -444,8 +444,8 @@ export default {
         idList += item.id
         nameList += item.name
       })
-      this.$set(this.qbfsForm, 'unitId', idList)
+      this.$set(this.qbfsForm, 'unit', idList)
-      this.$set(this.qbfsForm, 'unit', nameList)
+      this.$set(this.qbfsForm, 'unitName', nameList)
       if(this.qbfsForm.unit){
         this.$refs.qbfsForm.validateField('unit')
       }

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue

@@ -95,12 +95,12 @@
                 placeholder="请选择标准发布时间">
               </el-date-picker>
             </el-form-item>
-            <el-form-item label="起草责任单位" prop="unit" class="add-form-item form-item-disabled">
+            <el-form-item label="起草责任单位" prop="unitName" class="add-form-item form-item-disabled">
-             <div v-if="qbfsForm.unit">
+             <div v-if="qbfsForm.unitName">
-               <el-tooltip class="item" effect="dark" :content="qbfsForm.unit" placement="top-start">
+               <el-tooltip class="item" effect="dark" :content="qbfsForm.unitName" placement="top-start">
                  <el-input
                    readonly
-                   v-model="qbfsForm.unit"
+                   v-model="qbfsForm.unitName"
                    placeholder="请输入起草责任单位"
                    clearable
                  ></el-input>
@@ -109,7 +109,7 @@
               <div v-else>
                 <el-input
                   readonly
-                  v-model="qbfsForm.unit"
+                  v-model="qbfsForm.unitName"
                   placeholder="请输入起草责任单位"
                   clearable
                 ></el-input>
@@ -240,7 +240,7 @@
               </el-table-column>
               <el-table-column
                 align="center"
-                prop="unit"
+                prop="unitName"
                 label="起草责任单位">
               </el-table-column>
             </el-table>
@@ -379,7 +379,7 @@ export default {
         this.qbfsForm.releaseTime = this.selectList[0].releaseTime
         this.qbfsForm.resPersonName = this.selectList[0].resPersonName
         this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus === '0'? '制定完成' : (this.selectList[0].reviseStatus  === '1'? '制定中' : '未制定')
-        this.qbfsForm.unit = this.selectList[0].unit
+        this.qbfsForm.unitName = this.selectList[0].unitName
         this.qbfsForm.wgLeaderName = this.selectList[0].wgLeaderName
         this.ListModel = false
       }

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue

@@ -75,10 +75,10 @@
               placeholder="请选择计划标准发布时间">
             </el-date-picker>
           </el-form-item>
-          <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px"  prop="unit" class="add-form-item form-item-disabled">
+          <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px"  prop="unitName" class="add-form-item form-item-disabled">
             <el-input
               disabled
-              v-model="qbfsForm.unit"
+              v-model="qbfsForm.unitName"
               placeholder="请输入起草责任单位"
               :maxlength="500"/>
           </el-form-item>

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

@@ -75,10 +75,10 @@
               placeholder="请选择计划标准发布时间">
             </el-date-picker>
           </el-form-item>
-          <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px"  prop="unit" class="add-form-item form-item-disabled">
+          <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px"  prop="unitName" class="add-form-item form-item-disabled">
             <el-input
               disabled
-              v-model="qbfsForm.unit"
+              v-model="qbfsForm.unitName"
               placeholder="请输入起草责任单位"
               :maxlength="500"/>
           </el-form-item>

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

@@ -75,10 +75,10 @@
               placeholder="请选择计划标准发布时间">
             </el-date-picker>
           </el-form-item>
-          <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px"  prop="unit" class="add-form-item form-item-disabled">
+          <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px"  prop="unitName" class="add-form-item form-item-disabled">
             <el-input
               disabled
-              v-model="qbfsForm.unit"
+              v-model="qbfsForm.unitName"
               placeholder="请输入起草责任单位"
               :maxlength="500"/>
           </el-form-item>

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

@@ -75,10 +75,10 @@
               placeholder="请选择计划标准发布时间">
             </el-date-picker>
           </el-form-item>
-          <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px"  prop="unit" class="add-form-item form-item-disabled">
+          <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px"  prop="unitName" class="add-form-item form-item-disabled">
             <el-input
               disabled
-              v-model="qbfsForm.unit"
+              v-model="qbfsForm.unitName"
               placeholder="请输入起草责任单位"
               :maxlength="500"/>
           </el-form-item>

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue

@@ -75,10 +75,10 @@
               placeholder="请选择计划标准发布时间">
             </el-date-picker>
           </el-form-item>
-          <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px"  prop="unit" class="add-form-item form-item-disabled">
+          <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px"  prop="unitName" class="add-form-item form-item-disabled">
             <el-input
               disabled
-              v-model="qbfsForm.unit"
+              v-model="qbfsForm.unitName"
               placeholder="请输入起草责任单位"
               :maxlength="500"/>
           </el-form-item>

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

@@ -74,7 +74,7 @@
       </el-collapse>
     </div>
     <div class="content" v-show="active === '3'">
-      <div class="flow-list">
+      <div class="flow-list" style="height: 100%">
         <el-table
           height="100%"
           ref="selection"

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

@@ -74,7 +74,7 @@
       </el-collapse>
     </div>
     <div class="content" v-show="active === '3'">
-      <div class="flow-list">
+      <div class="flow-list" style="height: 100%">
         <el-table
           height="100%"
           ref="selection"

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

@@ -74,7 +74,7 @@
       </el-collapse>
     </div>
     <div class="content" v-show="active === '3'">
-      <div class="flow-list">
+      <div class="flow-list" style="height: 100%">
         <el-table
           height="100%"
           ref="selection"

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

@@ -74,7 +74,7 @@
       </el-collapse>
     </div>
     <div class="content" v-show="active === '3'">
-      <div class="flow-list">
+      <div class="flow-list" style="height: 100%">
         <el-table
           height="100%"
           ref="selection"

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

@@ -74,7 +74,7 @@
       </el-collapse>
     </div>
     <div class="content" v-show="active === '3'">
-      <div class="flow-list">
+      <div class="flow-list" style="height: 100%">
         <el-table
           height="100%"
           ref="selection"

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

@@ -199,6 +199,7 @@
         </div>
       </div>
       <el-table
+        class="table_info"
           ref="searchTable"
           :data="unqualidiedData"
           tooltip-effect="dark"
@@ -593,6 +594,9 @@ export default {
 <style lang="less" scoped>
 @import '~@/assets/styles/style';
 .wfhxzgStep1 {
+  /deep/.el-table--scrollable-y .el-table__body-wrapper {
+    height: calc(100% - 80px) !important;
+  }
   /deep/.el-drawer__container {
     .prc-content-border {
       border: none;

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

@@ -53,7 +53,7 @@
           </el-table-column>
           <el-table-column prop="responsibleUnit" label="责任部门" align="center"/>
           <el-table-column prop="dutyEngineer" width="150" label="责任工程师" align="center"/>
-          <el-table-column label="选择分发责任人" prop="dutyPeopleInfo" align="center">
+          <el-table-column label="选择分发责任人" width="150" prop="dutyPeopleInfo" align="center">
               <template slot-scope="scope">
                   <el-input
                     @click.native="clickOpen(scope.row)"

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

@@ -262,6 +262,8 @@ export default {
       this.$nextTick(() => {
         if (item.passInfo !== 0) {
           this.passInfo = JSON.parse(JSON.stringify(item)).passInfo
+          let fileData = JSON.parse(JSON.stringify(item)).dockUserList
+          this.dataList = fileData[0].standardInfoList
         } else {
           let fileData = JSON.parse(JSON.stringify(item)).dockUserList
           for (let i = 0; i<fileData.length; i++) {

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

@@ -84,9 +84,8 @@
       </el-collapse>
     </div>
     <div class="content" v-show="active === '3'">
-      <div class="flow-list">
+      <div>
         <el-table
-          height="100%"
           ref="selection"
           :data="detailData"
           tooltip-effect="dark"

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

@@ -80,7 +80,7 @@
           </el-card>
         </div>
         <div class="process-name">
-          <el-card shadow="hover" v-btn-permission="''">
+          <el-card shadow="hover" v-btn-permission="'344c9c97b581400718451e8b8a319382'">
             <div class="card-box" @click="handleCreateProcess('12')">
               <div class="card-top">
                 <div class="card-top-left">
@@ -125,7 +125,7 @@
           </el-card>
         </div>
         <div class="process-name">
-          <el-card shadow="hover" v-btn-permission="'90c7bae6308595f053c6f6f90167e493'">
+          <el-card shadow="hover" v-btn-permission="'a5694521151720f41a8b22d550bf435a'">
             <div class="card-box" @click="handleCreateProcess('13')">
               <div class="card-top">
                 <div class="card-top-left">
@@ -140,7 +140,7 @@
           </el-card>
         </div>
         <div class="process-name">
-          <el-card shadow="hover">
+          <el-card shadow="hover" v-btn-permission="'14f54ef4475d9210b1ee7872ab69eca8'">
             <div class="card-box" @click="handleCreateProcess('11')">
               <div class="card-top">
                 <div class="card-top-left">
@@ -155,7 +155,7 @@
           </el-card>
         </div>
         <div class="process-name">
-          <el-card shadow="hover">
+          <el-card shadow="hover" v-btn-permission="'9c8cc1b74b1caa16f34a47895b489833'">
             <div class="card-box" @click="handleCreateProcess('laws1')">
               <div class="card-top">
                 <div class="card-top-left">
@@ -190,7 +190,7 @@
       <el-divider content-position="left"><h2>企业标准相关流程</h2></el-divider>
       <div class="process-box">
         <div class="process-name">
-          <el-card shadow="hover" v-btn-permission="''">
+          <el-card shadow="hover" v-btn-permission="'7a53ef593e5401aab19485b937ce78a0'">
             <div class="card-box" @click="handleCreateProcess('buss1')">
               <div class="card-top">
                 <div class="card-top-left">
@@ -205,7 +205,7 @@
           </el-card>
         </div>
         <div class="process-name">
-          <el-card shadow="hover">
+          <el-card shadow="hover" v-btn-permission="'5af5073695c2e1d12ca3d5a6afae67b5'">
             <div class="card-box" @click="handleCreateProcess('23')">
               <div class="card-top">
                 <div class="card-top-left">
@@ -220,7 +220,7 @@
           </el-card>
         </div>
         <div class="process-name">
-          <el-card shadow="hover">
+          <el-card shadow="hover" v-btn-permission="'5104360fd3822e73b45e65d2337cf143'">
             <div class="card-box" @click="handleCreateProcess('24')">
               <div class="card-top">
                 <div class="card-top-left">
@@ -235,7 +235,7 @@
           </el-card>
         </div>
         <div class="process-name">
-          <el-card shadow="hover">
+          <el-card shadow="hover" v-btn-permission="'afa3d1aee5fd8027b18675621afdeff6'">
             <div class="card-box" @click="handleCreateProcess('25')">
               <div class="card-top">
                 <div class="card-top-left">
@@ -256,7 +256,7 @@
       <el-divider content-position="left"><h2>标准化活动相关流程</h2></el-divider>
       <div class="process-box">
         <div class="process-name">
-          <el-card shadow="hover" v-btn-permission="'2e3f4c0aaf77629755533255f1335801'">
+          <el-card shadow="hover" v-btn-permission="'b196ef0253cebd1adfc3a8432a28e377'">
             <div class="card-box" @click="handleCreateProcess('17')">
               <div class="card-top">
                 <div class="card-top-left">
@@ -271,7 +271,7 @@
           </el-card>
         </div>
         <div class="process-name">
-          <el-card shadow="hover" v-btn-permission="'d415c764036a02559976b41b9dfe2cf1'">
+          <el-card shadow="hover" v-btn-permission="'2f2752bc8a37b87d6eaadae3fcfe61c4'">
             <div class="card-box" @click="handleCreateProcess('18')">
               <div class="card-top">
                 <div class="card-top-left">
@@ -286,7 +286,7 @@
           </el-card>
         </div>
         <div class="process-name">
-          <el-card shadow="hover">
+          <el-card shadow="hover" v-btn-permission="'7845345e5fa2b0a93eb0e021bd3486f1'">
             <div class="card-box" @click="handleCreateProcess('20')">
               <div class="card-top">
                 <div class="card-top-left">
@@ -301,7 +301,7 @@
           </el-card>
         </div>
         <div class="process-name">
-          <el-card shadow="hover">
+          <el-card shadow="hover" v-btn-permission="'321e497259b08734941a308960da2bae'">
             <div class="card-box" @click="handleCreateProcess('21')">
               <div class="card-top">
                 <div class="card-top-left">
@@ -316,7 +316,7 @@
           </el-card>
         </div>
         <div class="process-name">
-          <el-card shadow="hover">
+          <el-card shadow="hover" v-btn-permission="'8f65a365dd67634e29925098162ee8d5'">
             <div class="card-box" @click="handleCreateProcess('16')">
               <div class="card-top">
                 <div class="card-top-left">
@@ -331,14 +331,14 @@
           </el-card>
         </div>
         <div class="process-name">
-          <el-card shadow="hover">
+          <el-card shadow="hover" v-btn-permission="'0efd0f4b7a15fd1b687cc0ac36e9e7d9'">
-            <div class="card-box" @click="handleCreateProcess('15')">
+            <div class="card-box" @click="handleCreateProcess('14')">
               <div class="card-top">
                 <div class="card-top-left">
                   <img :src="getImg(Math.floor(Math.random() * 6))">
                 </div>
                 <div class="card-top-right">
-                  <div class="card-top-right-text">加入标准化协会信息提报流程</div>
+                  <div class="card-top-right-text">参与外部标准制修订信息提报流程</div>
                   <div class="card-top-right-line"></div>
                 </div>
               </div>
@@ -346,7 +346,7 @@
           </el-card>
         </div>
         <div class="process-name">
-          <el-card shadow="hover">
+          <el-card shadow="hover" v-btn-permission="'e5217a4776525b1ba63511b730a2e02d'">
             <div class="card-box" @click="handleCreateProcess('15')">
               <div class="card-top">
                 <div class="card-top-left">

src/pages/processCenter/pages/phone/bzdy/step2.vue

@@ -122,23 +122,13 @@
                 :is-show-phone.sync="drawerModal"
                 @checkedRole="checkedRole"
         />
-<!--        <Role-tree-->
+        <phone-role
-<!--                is-title="转办处理人"-->
+                check-more
-<!--                :is-visible.sync="drawerModal"-->
+                role-title="选择责任部门对接人"
-<!--                @checkedRole="checkedRole"-->
+                :result-list="nodeList2"
-<!--        ></Role-tree>-->
+                :is-show-phone.sync="modalshowflag2"
-        <Role-tree
-                is-title="选择责任部门对接人"
-                :is-visible.sync="modalshowflag2"
                 @checkedRole="checkedRole2"
-                :nodeList="nodeList2"
+        />
-        ></Role-tree>
-<!--        <phone-role-->
-<!--                role-title="选择责任部门对接人"-->
-<!--                :result-list="nodeList2"-->
-<!--                :is-show-phone.sync="modalshowflag2"-->
-<!--                @checkedRole="checkedRole2"-->
-<!--        />-->
     </div>
 </template>
 
@@ -233,7 +223,7 @@
                 changeAssigneeNew({
                     taskId: this.$route.query.taskIds, // 任务id
                     userId:this.$store.getters.userInfo.userId, // 委托人
-                    assignee: data[0].usId, // 被委托人
+                    assignee: data[0].id, // 被委托人
                     pId: this.$route.query.prcId, // 流程实例
                 }).then(res => {
                     if (res.success) {

src/pages/processCenter/pages/phone/bzdy/step4.vue

@@ -284,7 +284,7 @@
                 changeAssigneeNew({
                     taskId: this.$route.query.taskIds, // 任务id
                     userId:this.$store.getters.userInfo.userId, // 委托人
-                    assignee: data[0].usId, // 被委托人
+                    assignee: data[0].id, // 被委托人
                     pId: this.$route.query.prcId, // 流程实例
                 }).then(res => {
                     if (res.success) {

src/pages/processCenter/pages/phone/bzdy/step6.vue

@@ -261,7 +261,7 @@
                 changeAssigneeNew({
                     taskId: this.$route.query.taskIds, // 任务id
                     userId:this.$store.getters.userInfo.userId, // 委托人
-                    assignee: data[0].usId, // 被委托人
+                    assignee: data[0].id, // 被委托人
                     pId: this.$route.query.prcId, // 流程实例
                 }).then(res => {
                     if (res.success) {

src/pages/processCenter/pages/phone/bzdy/step7.vue

@@ -186,7 +186,7 @@
                 changeAssigneeNew({
                     taskId: this.$route.query.taskIds, // 任务id
                     userId:this.$store.getters.userInfo.userId, // 委托人
-                    assignee: data[0].usId, // 被委托人
+                    assignee: data[0].id, // 被委托人
                     pId: this.$route.query.prcId, // 流程实例
                 }).then(res => {
                     if (res.success) {

src/pages/processCenter/pages/phone/bzdy/step8.vue

@@ -186,7 +186,7 @@
                 changeAssigneeNew({
                     taskId: this.$route.query.taskIds, // 任务id
                     userId:this.$store.getters.userInfo.userId, // 委托人
-                    assignee: data[0].usId, // 被委托人
+                    assignee: data[0].id, // 被委托人
                     pId: this.$route.query.prcId, // 流程实例
                 }).then(res => {
                     if (res.success) {

src/pages/processCenter/pages/phone/bzdy/step9.vue

@@ -186,7 +186,7 @@
                 changeAssigneeNew({
                     taskId: this.$route.query.taskIds, // 任务id
                     userId:this.$store.getters.userInfo.userId, // 委托人
-                    assignee: data[0].usId, // 被委托人
+                    assignee: data[0].id, // 被委托人
                     pId: this.$route.query.prcId, // 流程实例
                 }).then(res => {
                     if (res.success) {

src/pages/processCenter/pages/phone/bzqdfb/step4.vue

@@ -69,7 +69,7 @@
           :data="dataList"
           border
           tooltip-effect="dark"
-          height="60%"
+          height="50%"
           style="width: 100%"
           @selection-change="selectStandChange"
           :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
@@ -109,18 +109,12 @@
             min-width="130"
             align="center"
             label="新车型实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.XCXSSRQ ? $moment(scope.row.XCXSSRQ).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             prop="ZCCSSRQ"
             min-width="130"
             align="center"
             label="在产车实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.ZCCSSRQ ? $moment(scope.row.ZCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
@@ -154,7 +148,7 @@
       <el-table
         height="100%"
         ref="selection"
-        :data="histortData"
+        :data="detailData"
         tooltip-effect="dark"
         style="width: 100%"
         border
@@ -215,6 +209,7 @@
     <ProcessFooter
       show-back
       show-submit
+      show-transfer
       :transfer-loading="isTransfer"
       :submitLoading="isSubmit"
       :saveLoading="saveLoading"
@@ -232,6 +227,12 @@
       @checkedRole="checkedRole"
       :nodeList="nodeList"
     ></Role-tree>
+    <phone-role
+      :role-title="drawerTitle"
+      :result-list="phoneRoleList"
+      :is-show-phone.sync="modalshowflag"
+      @checkedRole="drawerCheck"
+    />
   </div>
 </template>
 
@@ -241,7 +242,7 @@ import ProcessHeaderPhone from '../../components/ProcessHeaderPhone'
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
-import { inboundLiaisonDetail ,changeAssigneeNew} from "api/process";
+import {completeTask, inboundLiaisonDetail, saveTaskForPub, changeAssigneeNew} from "@/api/process.js"
 
 export default {
   name: "phoneBzqdfbStep4",
@@ -253,6 +254,9 @@ export default {
   },
   data() {
     return {
+      modalshowflag: false,
+      phoneRoleList: [],
+      phoneDrawerTitle: '',
       nodeList:[],
       isTransfer: false,
       drawerTitle:'',
@@ -313,26 +317,6 @@ export default {
     };
   },
   methods: {
-    //确认转办
-    checkedRole (data) {
-      this.assigneeNewLoading = true
-      changeAssigneeNew({
-        taskId: this.$route.query.taskIds, // 任务id
-        assignee: data[0].id, // 被委托人
-        userId: this.$store.getters.userInfo.userId, // 委托人
-        pId: this.$route.query.prcId // 流程实例
-      }).then(res => {
-        this.isTransfer = false
-        if (res.success) {
-          this.drawerModal = false
-          this.$message.success('调整成功')
-          this.$router.push("/processCenter");
-          this.processNum()
-        } else {
-          this.$message.warning(res.message)
-        }
-      })
-    },
     // 请求转换流程图
     processNum (row) {
       axios.request({
@@ -350,9 +334,29 @@ export default {
     },
     //转办事件
     handleTransfer(){
-      this.drawerModal = true
+      this.modalshowflag = true
-      this.drawerTitle = '转办处理人'
+      this.phoneRoleList = this.roleTransfer
-      this.selectPeople = row
+      this.phoneDrawerTitle = '转办处理人'
+    },
+    drawerCheck (data) {
+        this.roleTransfer = data
+        this.phoneRoleList = this.roleTransfer
+        this.turnLoading = true
+        changeAssigneeNew({
+          taskId: this.taskIds, // 任务id
+          assignee: data[0].id, // 被委托人
+          userId: this.userId, // 委托人
+          pId: this.pId // 流程实例
+        }).then(res =>{
+          if (res.success) {
+            this.turnLoading = false
+            this.$message.success('调整成功')
+            this.$router.push("/processCenter")
+          } else {
+            this.$message.warning(res.message)
+          }
+        })
+      this.modalshowflag = false
     },
     processTable() {
       this.$http.get("lawss/activiti/get_list_by_instance", {
@@ -509,7 +513,7 @@ export default {
       }, res => {
         if (res.success) {
           this.$message.success(res.message);
-          this.$router.push("/processCenter");
+          window.history.back()
         }
         this.isSubmit = false
       });

src/pages/processCenter/pages/phone/bzzqyj/step6.vue

@@ -334,7 +334,7 @@
                 changeAssigneeNew({
                     taskId: this.$route.query.taskIds, // 任务id
                     userId:this.$store.getters.userInfo.userId, // 委托人
-                    assignee: data[0].usId, // 被委托人
+                    assignee: data[0].id, // 被委托人
                     pId: this.$route.query.prcId, // 流程实例
                 }).then(res => {
                     if (res.success) {

src/pages/processCenter/pages/phone/bzzqyj/step7.vue

@@ -334,7 +334,7 @@
                 changeAssigneeNew({
                     taskId: this.$route.query.taskIds, // 任务id
                     userId:this.$store.getters.userInfo.userId, // 委托人
-                    assignee: data[0].usId, // 被委托人
+                    assignee: data[0].id, // 被委托人
                     pId: this.$route.query.prcId, // 流程实例
                 }).then(res => {
                     if (res.success) {

src/pages/processCenter/pages/phone/bzzqyj/step8.vue

@@ -334,7 +334,7 @@
                 changeAssigneeNew({
                     taskId: this.$route.query.taskIds, // 任务id
                     userId:this.$store.getters.userInfo.userId, // 委托人
-                    assignee: data[0].usId, // 被委托人
+                    assignee: data[0].id, // 被委托人
                     pId: this.$route.query.prcId, // 流程实例
                 }).then(res => {
                     if (res.success) {

src/pages/processCenter/pages/phone/bzzqyj/step9.vue

@@ -334,7 +334,7 @@
                 changeAssigneeNew({
                     taskId: this.$route.query.taskIds, // 任务id
                     userId:this.$store.getters.userInfo.userId, // 委托人
-                    assignee: data[0].usId, // 被委托人
+                    assignee: data[0].id, // 被委托人
                     pId: this.$route.query.prcId, // 流程实例
                 }).then(res => {
                     if (res.success) {

src/pages/processCenter/pages/phone/cywbbzzxd/step4.vue

@@ -10,109 +10,112 @@
       <div class="headerTabsItem" :class="active === '3' ? 'active' : '' " @click="handleTabs('3')">审批历史</div>
     </div>
     <div class="content" v-show="active === '1'">
-      <div>
+      <div style="overflow: auto">
-        <el-form
+        <ProcessTitle>
-          ref="wbbzForm"
+          <template slot="title">基础信息</template>
-          :model="wbbzform"
+        </ProcessTitle>
-          :rules="formRules"
+        <el-collapse-transition>
-          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-form
-              <el-col :span="24">
+              ref="wbbzForm"
-                <el-form-item label="提报单位" prop="reportingUnit" class="add-form-item ">
+              :model="wbbzform"
-                  <el-input
+              :rules="formRules"
-                    v-model="wbbzform.reportingUnit"
+              class="label-input-form"
-                    placeholder="请输入提报单位"
+              label-width="120px"
-                    readonly
+            >
-                    clearable>
+              <el-row :gutter="24">
-                  </el-input>
+                <el-col :span="24">
-                </el-form-item>
+                  <el-form-item label="提报单位" prop="reportingUnit" class="add-form-item ">
-                <el-form-item label="标准编号" prop="standNumber" class="add-form-item ">
+                    <el-input
-                  <el-input
+                      v-model="wbbzform.reportingUnit"
-                    v-model="wbbzform.standNumber"
+                      placeholder="请输入提报单位"
-                    readonly
+                      readonly
-                    placeholder="请输入标准编号"
+                      clearable>
-                    clearable>
+                    </el-input>
-                  </el-input>
+                  </el-form-item>
-                </el-form-item>
+                  <el-form-item label="标准编号" prop="standNumber" class="add-form-item ">
-                <el-form-item label="主持或参与" prop="hostOrTask" class="add-form-item ">
+                    <el-input
-                  <el-input
+                      v-model="wbbzform.standNumber"
-                    v-model="wbbzform.hostOrTask"
+                      readonly
-                    readonly
+                      placeholder="请输入标准编号"
-                    placeholder="请选择主持或参与"
+                      clearable>
-                    clearable>
+                    </el-input>
-                  </el-input>
+                  </el-form-item>
-                </el-form-item>
+                  <el-form-item label="主持或参与" prop="hostOrTask" class="add-form-item ">
-                <el-form-item label="参与人" prop="participants" class="add-form-item ">
+                    <el-input
-                  <el-input
+                      v-model="wbbzform.hostOrTask"
-                    v-model="wbbzform.participants"
+                      readonly
-                    readonly
+                      placeholder="请选择主持或参与"
-                    placeholder="请选择参与人"
+                      clearable>
-                    clearable>
+                    </el-input>
-                  </el-input>
+                  </el-form-item>
-                </el-form-item>
+                  <el-form-item label="参与人" prop="participants" class="add-form-item ">
-                <el-form-item label="标准制定机构" prop="standMechanism" class="add-form-item ">
+                    <el-input
-                  <el-input
+                      v-model="wbbzform.participants"
-                    v-model="wbbzform.standMechanism"
+                      readonly
-                    placeholder="请选择标准制定机构"
+                      placeholder="请选择参与人"
-                    readonly
+                      clearable>
-                    clearable>
+                    </el-input>
-                  </el-input>
+                  </el-form-item>
-                </el-form-item>
+                  <el-form-item label="标准制定机构" prop="standMechanism" class="add-form-item ">
-                <el-form-item label="参与时间" prop="partakeTime" class="add-form-item form-item-disabled">
+                    <el-input
-                  <el-input
+                      v-model="wbbzform.standMechanism"
-                    v-model="wbbzform.partakeTime"
+                      placeholder="请选择标准制定机构"
-                    readonly
+                      readonly
-                    placeholder="请选择参与时间"
+                      clearable>
-                    clearable>
+                    </el-input>
-                  </el-input>
+                  </el-form-item>
-                </el-form-item>
+                  <el-form-item label="参与时间" prop="partakeTime" class="add-form-item form-item-disabled">
-                <el-form-item label="标准名称" prop="standName" class="add-form-item ">
+                    <el-input
-                  <el-input
+                      v-model="wbbzform.partakeTime"
-                    v-model="wbbzform.standName"
+                      readonly
-                    placeholder="请输入标准名称"
+                      placeholder="请选择参与时间"
-                    readonly
+                      clearable>
-                    clearable>
+                    </el-input>
-                  </el-input>
+                  </el-form-item>
-                </el-form-item>
+                  <el-form-item label="标准名称" prop="standName" class="add-form-item ">
-                <el-form-item label="标准类型" prop="standType" class="add-form-item ">
+                    <el-input
-                  <el-input
+                      v-model="wbbzform.standName"
-                    v-model="wbbzform.standType"
+                      placeholder="请输入标准名称"
-                    readonly
+                      readonly
-                    placeholder="请选择标准类型"
+                      clearable>
-                    clearable>
+                    </el-input>
-                  </el-input>
+                  </el-form-item>
-                </el-form-item>
+                  <el-form-item label="标准类型" prop="standType" class="add-form-item ">
-                <el-form-item label="标准制修订" prop="standRevise" class="add-form-item ">
+                    <el-input
-                  <el-input
+                      v-model="wbbzform.standType"
-                    v-model="wbbzform.standRevise"
+                      readonly
-                    readonly
+                      placeholder="请选择标准类型"
-                    placeholder="请选择标准制修订"
+                      clearable>
-                    clearable>
+                    </el-input>
-                  </el-input>
+                  </el-form-item>
-                </el-form-item>
+                  <el-form-item label="标准制修订" prop="standRevise" class="add-form-item ">
-                <el-form-item label="标准(拟)发布时间" prop="releaseTime" class="add-form-item form-item-disabled">
+                    <el-input
-                  <el-input
+                      v-model="wbbzform.standRevise"
-                    v-model="wbbzform.releaseTime"
+                      readonly
-                    readonly
+                      placeholder="请选择标准制修订"
-                    placeholder="请选择标准(拟)发布时间"
+                      clearable>
-                    clearable>
+                    </el-input>
-                  </el-input>
+                  </el-form-item>
-                </el-form-item>
+                  <el-form-item label="标准(拟)发布时间" prop="releaseTime" class="add-form-item form-item-disabled">
-              </el-col>
+                    <el-input
-            </el-row>
+                      v-model="wbbzform.releaseTime"
+                      readonly
+                      placeholder="请选择标准(拟)发布时间"
+                      clearable>
+                    </el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-form>
           </div>
+        </el-collapse-transition>
           <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
+                  height="100%"
                   ref="selection"
                   :data="participantsData"
                   tooltip-effect="dark"
@@ -148,7 +151,7 @@
         </el-table>
       </div>
       <el-collapse accordion>
-        <el-collapse-item title="回执说明">
+        <el-collapse-item title="审批意见">
           <div style="margin: 10px 0;">
             <el-input
               type="textarea"
@@ -223,6 +226,7 @@
       </el-table>
     </div>
     <ProcessFooter
+      show-transfer
       show-back
       show-submit
       :submitLoading="isSubmit"
@@ -249,6 +253,12 @@
       @checkedRole="checkedTransferRole"
       :nodeList="nodeList"
     ></Role-tree>
+    <phone-role
+      :role-title="drawerTitle"
+      :result-list="phoneRoleList"
+      :is-show-phone.sync="phoneshowflag"
+      @checkedRole="drawerCheck"
+    />
   </div>
 </template>
 
@@ -258,7 +268,7 @@ import ProcessHeaderPhone from '../../components/ProcessHeaderPhone'
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessTitle from "process/components/ProcessTitle";
 import ProcessFooter from "process/components/ProcessFooter";
-import { changeAssigneeNew,inboundLiaisonDetail } from "api/process";
+import {completeTask, inboundLiaisonDetail, saveTaskForPub, changeAssigneeNew} from "@/api/process.js"
 
 export default {
   name: "phoneCywbbzzxdStep4",
@@ -270,6 +280,9 @@ export default {
   },
   data() {
     return {
+      phoneshowflag: false,
+      phoneRoleList: [],
+      phoneDrawerTitle: '',
       //切换tab
       active: "1",
       foldFormFlag: true,
@@ -371,14 +384,9 @@ export default {
     },
     //驳回
     beforeBack(){
-      if (this.participantsData.length < 1) {
+      if(!this.commentText){
-        this.$message.warning("项目信息不能为空");
+        this.$message.warning('请填写审批意见')
-      } else {
+      }else{
-        this.participantsData.forEach(item => {
-          if (item.projectNumber === undefined) {
-            this.$message.warning("请完善项目信息");
-          }
-        });
         this.wbbzform.commentText = this.commentText;
         let json = {
           participantsData: this.participantsData,
@@ -445,29 +453,30 @@ export default {
     },
     //转办按钮
     handleTransfer(){
-      this.drawerModal = true
+      this.phoneshowflag = true
-      this.drawerTitle = '转办处理人'
+      this.phoneRoleList = this.roleTransfer
-      this.selectPeople = row
+      this.phoneDrawerTitle = '转办处理人'
     },
     //确认转办
-    checkedTransferRole (data) {
+    drawerCheck (data) {
-      this.assigneeNewLoading = true
+      this.roleTransfer = data
+      this.phoneRoleList = this.roleTransfer
+      this.turnLoading = 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 => {
+      }).then(res =>{
-        this.isTransfer = false
         if (res.success) {
-          this.drawerModal = false
+          this.turnLoading = false
           this.$message.success('调整成功')
-          this.$router.push("/processCenter");
+          this.$router.push("/processCenter")
-          this.processNum()
         } else {
           this.$message.warning(res.message)
         }
       })
+      this.modalshowflag = false
     },
   },
   computed: {

src/pages/processCenter/pages/phone/cywbbzzxd/step5.vue

@@ -10,109 +10,112 @@
       <div class="headerTabsItem" :class="active === '3' ? 'active' : '' " @click="handleTabs('3')">审批历史</div>
     </div>
     <div class="content" v-show="active === '1'">
-      <div>
+      <div style="overflow: auto">
-        <el-form
+        <ProcessTitle>
-          ref="wbbzForm"
+          <template slot="title">基础信息</template>
-          :model="wbbzform"
+        </ProcessTitle>
-          :rules="formRules"
+        <el-collapse-transition>
-          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-form
-              <el-col :span="24">
+              ref="wbbzForm"
-                <el-form-item label="提报单位" prop="reportingUnit" class="add-form-item ">
+              :model="wbbzform"
-                  <el-input
+              :rules="formRules"
-                    v-model="wbbzform.reportingUnit"
+              class="label-input-form"
-                    placeholder="请输入提报单位"
+              label-width="120px"
-                    readonly
+            >
-                    clearable>
+              <el-row :gutter="24">
-                  </el-input>
+                <el-col :span="24">
-                </el-form-item>
+                  <el-form-item label="提报单位" prop="reportingUnit" class="add-form-item ">
-                <el-form-item label="标准编号" prop="standNumber" class="add-form-item ">
+                    <el-input
-                  <el-input
+                      v-model="wbbzform.reportingUnit"
-                    v-model="wbbzform.standNumber"
+                      placeholder="请输入提报单位"
-                    readonly
+                      readonly
-                    placeholder="请输入标准编号"
+                      clearable>
-                    clearable>
+                    </el-input>
-                  </el-input>
+                  </el-form-item>
-                </el-form-item>
+                  <el-form-item label="标准编号" prop="standNumber" class="add-form-item ">
-                <el-form-item label="主持或参与" prop="hostOrTask" class="add-form-item ">
+                    <el-input
-                  <el-input
+                      v-model="wbbzform.standNumber"
-                    v-model="wbbzform.hostOrTask"
+                      readonly
-                    readonly
+                      placeholder="请输入标准编号"
-                    placeholder="请选择主持或参与"
+                      clearable>
-                    clearable>
+                    </el-input>
-                  </el-input>
+                  </el-form-item>
-                </el-form-item>
+                  <el-form-item label="主持或参与" prop="hostOrTask" class="add-form-item ">
-                <el-form-item label="参与人" prop="participants" class="add-form-item ">
+                    <el-input
-                  <el-input
+                      v-model="wbbzform.hostOrTask"
-                    v-model="wbbzform.participants"
+                      readonly
-                    readonly
+                      placeholder="请选择主持或参与"
-                    placeholder="请选择参与人"
+                      clearable>
-                    clearable>
+                    </el-input>
-                  </el-input>
+                  </el-form-item>
-                </el-form-item>
+                  <el-form-item label="参与人" prop="participants" class="add-form-item ">
-                <el-form-item label="标准制定机构" prop="standMechanism" class="add-form-item ">
+                    <el-input
-                  <el-input
+                      v-model="wbbzform.participants"
-                    v-model="wbbzform.standMechanism"
+                      readonly
-                    placeholder="请选择标准制定机构"
+                      placeholder="请选择参与人"
-                    readonly
+                      clearable>
-                    clearable>
+                    </el-input>
-                  </el-input>
+                  </el-form-item>
-                </el-form-item>
+                  <el-form-item label="标准制定机构" prop="standMechanism" class="add-form-item ">
-                <el-form-item label="参与时间" prop="partakeTime" class="add-form-item form-item-disabled">
+                    <el-input
-                  <el-input
+                      v-model="wbbzform.standMechanism"
-                    v-model="wbbzform.partakeTime"
+                      placeholder="请选择标准制定机构"
-                    readonly
+                      readonly
-                    placeholder="请选择参与时间"
+                      clearable>
-                    clearable>
+                    </el-input>
-                  </el-input>
+                  </el-form-item>
-                </el-form-item>
+                  <el-form-item label="参与时间" prop="partakeTime" class="add-form-item form-item-disabled">
-                <el-form-item label="标准名称" prop="standName" class="add-form-item ">
+                    <el-input
-                  <el-input
+                      v-model="wbbzform.partakeTime"
-                    v-model="wbbzform.standName"
+                      readonly
-                    placeholder="请输入标准名称"
+                      placeholder="请选择参与时间"
-                    readonly
+                      clearable>
-                    clearable>
+                    </el-input>
-                  </el-input>
+                  </el-form-item>
-                </el-form-item>
+                  <el-form-item label="标准名称" prop="standName" class="add-form-item ">
-                <el-form-item label="标准类型" prop="standType" class="add-form-item ">
+                    <el-input
-                  <el-input
+                      v-model="wbbzform.standName"
-                    v-model="wbbzform.standType"
+                      placeholder="请输入标准名称"
-                    readonly
+                      readonly
-                    placeholder="请选择标准类型"
+                      clearable>
-                    clearable>
+                    </el-input>
-                  </el-input>
+                  </el-form-item>
-                </el-form-item>
+                  <el-form-item label="标准类型" prop="standType" class="add-form-item ">
-                <el-form-item label="标准制修订" prop="standRevise" class="add-form-item ">
+                    <el-input
-                  <el-input
+                      v-model="wbbzform.standType"
-                    v-model="wbbzform.standRevise"
+                      readonly
-                    readonly
+                      placeholder="请选择标准类型"
-                    placeholder="请选择标准制修订"
+                      clearable>
-                    clearable>
+                    </el-input>
-                  </el-input>
+                  </el-form-item>
-                </el-form-item>
+                  <el-form-item label="标准制修订" prop="standRevise" class="add-form-item ">
-                <el-form-item label="标准(拟)发布时间" prop="releaseTime" class="add-form-item form-item-disabled">
+                    <el-input
-                  <el-input
+                      v-model="wbbzform.standRevise"
-                    v-model="wbbzform.releaseTime"
+                      readonly
-                    readonly
+                      placeholder="请选择标准制修订"
-                    placeholder="请选择标准(拟)发布时间"
+                      clearable>
-                    clearable>
+                    </el-input>
-                  </el-input>
+                  </el-form-item>
-                </el-form-item>
+                  <el-form-item label="标准(拟)发布时间" prop="releaseTime" class="add-form-item form-item-disabled">
-              </el-col>
+                    <el-input
-            </el-row>
+                      v-model="wbbzform.releaseTime"
+                      readonly
+                      placeholder="请选择标准(拟)发布时间"
+                      clearable>
+                    </el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-form>
           </div>
-          <el-button style="width: 100%" :icon=" foldFormFlag ? 'el-icon-caret-top': 'el-icon-caret-bottom'" @click="foldForm">{{ foldFormFlag ? '隐藏基础信息' : '展开基础信息' }}</el-button>
+        </el-collapse-transition>
-        </el-form>
+        <el-button style="width: 100%" :icon=" foldFormFlag ? 'el-icon-caret-top': 'el-icon-caret-bottom'" @click="foldForm">{{ foldFormFlag ? '隐藏基础信息' : '展开基础信息' }}</el-button>
         <ProcessTitle>
           <template slot="title">参与人信息</template>
         </ProcessTitle>
         <el-table border
+                  height="100%"
                   ref="selection"
                   :data="participantsData"
                   tooltip-effect="dark"
@@ -148,7 +151,7 @@
         </el-table>
       </div>
       <el-collapse accordion>
-        <el-collapse-item title="回执说明">
+        <el-collapse-item title="审批意见">
           <div style="margin: 10px 0;">
             <el-input
               type="textarea"
@@ -223,6 +226,7 @@
       </el-table>
     </div>
     <ProcessFooter
+      show-transfer
       show-back
       show-submit
       :submitLoading="isSubmit"
@@ -249,6 +253,12 @@
       @checkedRole="checkedTransferRole"
       :nodeList="nodeList"
     ></Role-tree>
+    <phone-role
+      :role-title="drawerTitle"
+      :result-list="phoneRoleList"
+      :is-show-phone.sync="phoneshowflag"
+      @checkedRole="drawerCheck"
+    />
   </div>
 </template>
 
@@ -258,7 +268,7 @@ import ProcessHeaderPhone from '../../components/ProcessHeaderPhone'
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessTitle from "process/components/ProcessTitle";
 import ProcessFooter from "process/components/ProcessFooter";
-import { changeAssigneeNew,inboundLiaisonDetail } from "api/process";
+import {completeTask, inboundLiaisonDetail, saveTaskForPub, changeAssigneeNew} from "@/api/process.js"
 
 export default {
   name: "phoneCywbbzzxdStep5",
@@ -270,6 +280,9 @@ export default {
   },
   data() {
     return {
+      phoneshowflag: false,
+      phoneRoleList: [],
+      phoneDrawerTitle: '',
       //切换tab
       active: "1",
       foldFormFlag: true,
@@ -371,14 +384,9 @@ export default {
     },
     //驳回
     beforeBack(){
-      if (this.participantsData.length < 1) {
+      if(!this.commentText){
-        this.$message.warning("项目信息不能为空");
+        this.$message.warning('请填写审批意见')
-      } else {
+      }else {
-        this.participantsData.forEach(item => {
-          if (item.projectNumber === undefined) {
-            this.$message.warning("请完善项目信息");
-          }
-        });
         this.wbbzform.commentText = this.commentText;
         let json = {
           participantsData: this.participantsData,
@@ -445,29 +453,30 @@ export default {
     },
     //转办按钮
     handleTransfer(){
-      this.drawerModal = true
+      this.phoneshowflag = true
-      this.drawerTitle = '转办处理人'
+      this.phoneRoleList = this.roleTransfer
-      this.selectPeople = row
+      this.phoneDrawerTitle = '转办处理人'
     },
     //确认转办
-    checkedTransferRole (data) {
+    drawerCheck (data) {
-      this.assigneeNewLoading = true
+      this.roleTransfer = data
+      this.phoneRoleList = this.roleTransfer
+      this.turnLoading = 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 => {
+      }).then(res =>{
-        this.isTransfer = false
         if (res.success) {
-          this.drawerModal = false
+          this.turnLoading = false
           this.$message.success('调整成功')
-          this.$router.push("/processCenter");
+          this.$router.push("/processCenter")
-          this.processNum()
         } else {
           this.$message.warning(res.message)
         }
       })
+      this.modalshowflag = false
     },
   },
   computed: {

src/pages/processCenter/pages/phone/cywbbzzxd/step6.vue

@@ -10,109 +10,112 @@
       <div class="headerTabsItem" :class="active === '3' ? 'active' : '' " @click="handleTabs('3')">审批历史</div>
     </div>
     <div class="content" v-show="active === '1'">
-      <div>
+      <div style="overflow: auto">
-        <el-form
+        <ProcessTitle>
-          ref="wbbzForm"
+          <template slot="title">基础信息</template>
-          :model="wbbzform"
+        </ProcessTitle>
-          :rules="formRules"
+        <el-collapse-transition>
-          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-form
-              <el-col :span="24">
+              ref="wbbzForm"
-                <el-form-item label="提报单位" prop="reportingUnit" class="add-form-item ">
+              :model="wbbzform"
-                  <el-input
+              :rules="formRules"
-                    v-model="wbbzform.reportingUnit"
+              class="label-input-form"
-                    placeholder="请输入提报单位"
+              label-width="120px"
-                    readonly
+            >
-                    clearable>
+              <el-row :gutter="24">
-                  </el-input>
+                <el-col :span="24">
-                </el-form-item>
+                  <el-form-item label="提报单位" prop="reportingUnit" class="add-form-item ">
-                <el-form-item label="标准编号" prop="standNumber" class="add-form-item ">
+                    <el-input
-                  <el-input
+                      v-model="wbbzform.reportingUnit"
-                    v-model="wbbzform.standNumber"
+                      placeholder="请输入提报单位"
-                    readonly
+                      readonly
-                    placeholder="请输入标准编号"
+                      clearable>
-                    clearable>
+                    </el-input>
-                  </el-input>
+                  </el-form-item>
-                </el-form-item>
+                  <el-form-item label="标准编号" prop="standNumber" class="add-form-item ">
-                <el-form-item label="主持或参与" prop="hostOrTask" class="add-form-item ">
+                    <el-input
-                  <el-input
+                      v-model="wbbzform.standNumber"
-                    v-model="wbbzform.hostOrTask"
+                      readonly
-                    readonly
+                      placeholder="请输入标准编号"
-                    placeholder="请选择主持或参与"
+                      clearable>
-                    clearable>
+                    </el-input>
-                  </el-input>
+                  </el-form-item>
-                </el-form-item>
+                  <el-form-item label="主持或参与" prop="hostOrTask" class="add-form-item ">
-                <el-form-item label="参与人" prop="participants" class="add-form-item ">
+                    <el-input
-                  <el-input
+                      v-model="wbbzform.hostOrTask"
-                    v-model="wbbzform.participants"
+                      readonly
-                    readonly
+                      placeholder="请选择主持或参与"
-                    placeholder="请选择参与人"
+                      clearable>
-                    clearable>
+                    </el-input>
-                  </el-input>
+                  </el-form-item>
-                </el-form-item>
+                  <el-form-item label="参与人" prop="participants" class="add-form-item ">
-                <el-form-item label="标准制定机构" prop="standMechanism" class="add-form-item ">
+                    <el-input
-                  <el-input
+                      v-model="wbbzform.participants"
-                    v-model="wbbzform.standMechanism"
+                      readonly
-                    placeholder="请选择标准制定机构"
+                      placeholder="请选择参与人"
-                    readonly
+                      clearable>
-                    clearable>
+                    </el-input>
-                  </el-input>
+                  </el-form-item>
-                </el-form-item>
+                  <el-form-item label="标准制定机构" prop="standMechanism" class="add-form-item ">
-                <el-form-item label="参与时间" prop="partakeTime" class="add-form-item form-item-disabled">
+                    <el-input
-                  <el-input
+                      v-model="wbbzform.standMechanism"
-                    v-model="wbbzform.partakeTime"
+                      placeholder="请选择标准制定机构"
-                    readonly
+                      readonly
-                    placeholder="请选择参与时间"
+                      clearable>
-                    clearable>
+                    </el-input>
-                  </el-input>
+                  </el-form-item>
-                </el-form-item>
+                  <el-form-item label="参与时间" prop="partakeTime" class="add-form-item form-item-disabled">
-                <el-form-item label="标准名称" prop="standName" class="add-form-item ">
+                    <el-input
-                  <el-input
+                      v-model="wbbzform.partakeTime"
-                    v-model="wbbzform.standName"
+                      readonly
-                    placeholder="请输入标准名称"
+                      placeholder="请选择参与时间"
-                    readonly
+                      clearable>
-                    clearable>
+                    </el-input>
-                  </el-input>
+                  </el-form-item>
-                </el-form-item>
+                  <el-form-item label="标准名称" prop="standName" class="add-form-item ">
-                <el-form-item label="标准类型" prop="standType" class="add-form-item ">
+                    <el-input
-                  <el-input
+                      v-model="wbbzform.standName"
-                    v-model="wbbzform.standType"
+                      placeholder="请输入标准名称"
-                    readonly
+                      readonly
-                    placeholder="请选择标准类型"
+                      clearable>
-                    clearable>
+                    </el-input>
-                  </el-input>
+                  </el-form-item>
-                </el-form-item>
+                  <el-form-item label="标准类型" prop="standType" class="add-form-item ">
-                <el-form-item label="标准制修订" prop="standRevise" class="add-form-item ">
+                    <el-input
-                  <el-input
+                      v-model="wbbzform.standType"
-                    v-model="wbbzform.standRevise"
+                      readonly
-                    readonly
+                      placeholder="请选择标准类型"
-                    placeholder="请选择标准制修订"
+                      clearable>
-                    clearable>
+                    </el-input>
-                  </el-input>
+                  </el-form-item>
-                </el-form-item>
+                  <el-form-item label="标准制修订" prop="standRevise" class="add-form-item ">
-                <el-form-item label="标准(拟)发布时间" prop="releaseTime" class="add-form-item form-item-disabled">
+                    <el-input
-                  <el-input
+                      v-model="wbbzform.standRevise"
-                    v-model="wbbzform.releaseTime"
+                      readonly
-                    readonly
+                      placeholder="请选择标准制修订"
-                    placeholder="请选择标准(拟)发布时间"
+                      clearable>
-                    clearable>
+                    </el-input>
-                  </el-input>
+                  </el-form-item>
-                </el-form-item>
+                  <el-form-item label="标准(拟)发布时间" prop="releaseTime" class="add-form-item form-item-disabled">
-              </el-col>
+                    <el-input
-            </el-row>
+                      v-model="wbbzform.releaseTime"
+                      readonly
+                      placeholder="请选择标准(拟)发布时间"
+                      clearable>
+                    </el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-form>
           </div>
-          <el-button style="width: 100%" :icon=" foldFormFlag ? 'el-icon-caret-top': 'el-icon-caret-bottom'" @click="foldForm">{{ foldFormFlag ? '隐藏基础信息' : '展开基础信息' }}</el-button>
+        </el-collapse-transition>
-        </el-form>
+        <el-button style="width: 100%" :icon=" foldFormFlag ? 'el-icon-caret-top': 'el-icon-caret-bottom'" @click="foldForm">{{ foldFormFlag ? '隐藏基础信息' : '展开基础信息' }}</el-button>
         <ProcessTitle>
           <template slot="title">参与人信息</template>
         </ProcessTitle>
         <el-table border
+                  height="100%"
                   ref="selection"
                   :data="participantsData"
                   tooltip-effect="dark"
@@ -148,7 +151,7 @@
         </el-table>
       </div>
       <el-collapse accordion>
-        <el-collapse-item title="回执说明">
+        <el-collapse-item title="审批意见">
           <div style="margin: 10px 0;">
             <el-input
               type="textarea"
@@ -223,6 +226,7 @@
       </el-table>
     </div>
     <ProcessFooter
+      show-transfer
       show-back
       show-submit
       :submitLoading="isSubmit"
@@ -249,6 +253,12 @@
       @checkedRole="checkedTransferRole"
       :nodeList="nodeList"
     ></Role-tree>
+    <phone-role
+      :role-title="drawerTitle"
+      :result-list="phoneRoleList"
+      :is-show-phone.sync="phoneshowflag"
+      @checkedRole="drawerCheck"
+    />
   </div>
 </template>
 
@@ -258,7 +268,7 @@ import ProcessHeaderPhone from '../../components/ProcessHeaderPhone'
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessTitle from "process/components/ProcessTitle";
 import ProcessFooter from "process/components/ProcessFooter";
-import { changeAssigneeNew,inboundLiaisonDetail } from "api/process";
+import {completeTask, inboundLiaisonDetail, saveTaskForPub, changeAssigneeNew} from "@/api/process.js"
 
 export default {
   name: "phoneCywbbzzxdStep6",
@@ -270,6 +280,9 @@ export default {
   },
   data() {
     return {
+      phoneshowflag: false,
+      phoneRoleList: [],
+      phoneDrawerTitle: '',
       //切换tab
       active: "1",
       foldFormFlag: true,
@@ -371,14 +384,9 @@ export default {
     },
     //驳回
     beforeBack(){
-      if (this.participantsData.length < 1) {
+      if(!this.commentText){
-        this.$message.warning("项目信息不能为空");
+        this.$message.warning('请填写审批意见')
-      } else {
+      }else{
-        this.participantsData.forEach(item => {
-          if (item.projectNumber === undefined) {
-            this.$message.warning("请完善项目信息");
-          }
-        });
         this.wbbzform.commentText = this.commentText;
         let json = {
           participantsData: this.participantsData,
@@ -445,29 +453,30 @@ export default {
     },
     //转办按钮
     handleTransfer(){
-      this.drawerModal = true
+      this.phoneshowflag = true
-      this.drawerTitle = '转办处理人'
+      this.phoneRoleList = this.roleTransfer
-      this.selectPeople = row
+      this.phoneDrawerTitle = '转办处理人'
     },
     //确认转办
-    checkedTransferRole (data) {
+    drawerCheck (data) {
-      this.assigneeNewLoading = true
+      this.roleTransfer = data
+      this.phoneRoleList = this.roleTransfer
+      this.turnLoading = 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 => {
+      }).then(res =>{
-        this.isTransfer = false
         if (res.success) {
-          this.drawerModal = false
+          this.turnLoading = false
           this.$message.success('调整成功')
-          this.$router.push("/processCenter");
+          this.$router.push("/processCenter")
-          this.processNum()
         } else {
           this.$message.warning(res.message)
         }
       })
+      this.modalshowflag = false
     },
   },
   computed: {

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

@@ -478,6 +478,21 @@ export default {
       console.log(item);
       this.$nextTick(() => {
         this.wbbzform = JSON.parse(JSON.stringify(item));
+        this.wbbzform.comityOptionsOne.forEach(item =>{
+          if(this.wbbzform.associationName === item.id){
+            this.wbbzform.associationName = item.name
+          }
+        })
+        this.wbbzform.comityOptionsTwo.forEach(item =>{
+          if(this.wbbzform.committee === item.id){
+            this.wbbzform.committee = item.name
+          }
+        })
+        this.wbbzform.comityOptionsOneThree.forEach(item =>{
+          if(this.wbbzform.workingGroup === item.id){
+            this.wbbzform.workingGroup = item.name
+          }
+        })
         this.associationData = item.associationData
         this.participantsData = item.participantsData
         item.fileName.forEach(itemId => {

src/pages/processCenter/pages/phone/wbsm/step3.vue

@@ -77,7 +77,7 @@
       <el-table
         height="100%"
         ref="selection"
-        :data="histortData"
+        :data="detailData"
         tooltip-effect="dark"
         style="width: 100%"
         border

src/pages/processCenter/pages/phone/wbsm/step4.vue

@@ -77,7 +77,7 @@
       <el-table
         height="100%"
         ref="selection"
-        :data="histortData"
+        :data="detailData"
         tooltip-effect="dark"
         style="width: 100%"
         border

src/pages/processCenter/pages/phone/wbsm/step5.vue

@@ -77,7 +77,7 @@
       <el-table
         height="100%"
         ref="selection"
-        :data="histortData"
+        :data="detailData"
         tooltip-effect="dark"
         style="width: 100%"
         border

src/pages/processCenter/pages/phone/wfhxzg/step2.vue

@@ -311,7 +311,7 @@ export default {
         this.turnLoading = true
         changeAssigneeNew({
           taskId: this.taskIds, // 任务id
-          assignee: data[0].usId, // 被委托人
+          assignee: data[0].id, // 被委托人
           userId: this.userId, // 委托人
           pId: this.pId // 流程实例
         }).then(res =>{
@@ -329,12 +329,12 @@ export default {
         this.roleRow = data[0]
         // 选取负责人时的操作
         if (this.multipleSelection.length === 0) {
-          this.rowDutyPeople.dutyPeopleInfo = this.roleRow.userName
+          this.rowDutyPeople.dutyPeopleInfo = this.roleRow.name
-          this.rowDutyPeople.dutyPeopleInfoId = this.roleRow.usId
+          this.rowDutyPeople.dutyPeopleInfoId = this.roleRow.id
         }else {
           this.multipleSelection.forEach(item => {
-            item.dutyPeopleInfo = this.roleRow.userName
+            item.dutyPeopleInfo = this.roleRow.name
-            item.dutyPeopleInfoId = this.roleRow.usId
+            item.dutyPeopleInfoId = this.roleRow.id
           })
           this.$refs.multipleTable.clearSelection()
         }

src/pages/processCenter/pages/phone/wfhxzg/step3.vue

@@ -356,7 +356,7 @@ export default {
         this.turnLoading = true
         changeAssigneeNew({
           taskId: this.taskIds, // 任务id
-          assignee: this.phoneRoleList[0].usId, // 被委托人
+          assignee: this.phoneRoleList[0].id, // 被委托人
           userId: this.userId, // 委托人
           pId: this.pId // 流程实例
         }).then(res =>{

src/pages/processCenter/pages/phone/wfhxzg/step5.vue

@@ -250,7 +250,7 @@ export default {
       this.phoneRoleList = data
       changeAssigneeNew({
         taskId: this.taskIds, // 任务id
-        assignee: data[0].usId, // 被委托人
+        assignee: data[0].id, // 被委托人
         userId: this.userId, // 委托人
         pId: this.pId // 流程实例
       }).then(res =>{

src/pages/processedPage/index.vue

@@ -0,0 +1,41 @@
+<template>
+  <div class="processedPage">
+    <van-icon name="checked" color="#1fcd24" size="70"/>
+    <div style="font-size: 15px;margin-top: 20px;color: #8c939d">当前任务已处理</div>
+    <el-button type="primary" size="small" style="margin-top: 30px;width: 270px;" @click="closeWindow()">返回</el-button>
+  </div>
+</template>
+
+<script>
+import Vue from 'vue';
+import { Icon } from 'vant';
+
+Vue.use(Icon);
+export default {
+  name: "processedPage",
+  data() {
+    return {}
+  },
+  methods: {
+      closeWindow(){
+          const userAgent = navigator.userAgent;
+          if (userAgent.indexOf("Firefox") != -1 || userAgent.indexOf("Chrome") !=-1) {
+              window.location.href = "about:blank"
+          }else {
+              window.opener = null;
+              window.open("about:blank", "_self");
+              window.close();
+          }
+      }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+@import '~@/assets/styles/phone';
+.processedPage {
+  text-align: center;
+  margin-top: 55%;
+}
+
+</style>

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue

@@ -211,26 +211,19 @@
             </template>
           </el-table-column>
           <el-table-column
-              prop="xcxssrqgj"
+              prop="xcxssrq"
               sortable
               align="center"
               width="150"
               label="新车型实施日期">
-            <template slot-scope="scope">
-              <span v-if="scope.row.xcxssrqgj">{{ scope.row.xcxssrqgj }}</span>
-              <span v-else-if="scope.row.putTime">{{ scope.row.putTime }}</span>
-            </template>
           </el-table-column>
           <el-table-column
               show-overflow-tooltip
-              prop="zccssrqgj"
+              prop="zccssrq"
               sortable
               align="center"
               width="150"
               label="在产车实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.zccssrqgj }}</span>
-            </template>
           </el-table-column>
           <el-table-column
               show-overflow-tooltip
@@ -341,14 +334,14 @@
         </el-table-column>
         <el-table-column
             show-overflow-tooltip
-            prop="zccssrqgj"
+            prop="zccssrq"
             sortable
             width="210px"
             align="center"
             label="在产车实施日期">
         </el-table-column>
         <el-table-column
-            prop="xcxssrqgj"
+            prop="xcxssrq"
             sortable
             align="center"
             width="210px"
@@ -464,17 +457,17 @@
               placeholder="选择日期">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="在产车实施日期" prop="zccssrqgj">
+        <el-form-item label="在产车实施日期" prop="zccssrq">
           <el-date-picker
-              v-model.trim="editRowData.zccssrqgj"
+              v-model.trim="editRowData.zccssrq"
               type="dates"
               value-format="yyyy-MM-dd"
               placeholder="选择日期">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="新车型实施日期" prop="xcxssrqgj">
+        <el-form-item label="新车型实施日期" prop="xcxssrq">
           <el-date-picker
-              v-model.trim="editRowData.xcxssrqgj"
+              v-model.trim="editRowData.xcxssrq"
               type="dates"
               value-format="yyyy-MM-dd"
               placeholder="选择日期">
@@ -575,8 +568,8 @@ export default {
         typeApplicable: '',
         nylx: '',
         ssrq: '',
-        zccssrqgj: '',
+        zccssrq: '',
-        xcxssrqgj: '',
+        xcxssrq: '',
         zrbm: '',
         sycpx: '',
         cycvppsbm: '',
@@ -1251,11 +1244,11 @@ export default {
       if (this.editRowData.ssrq !== null) {
         this.editRowData.ssrq = this.editRowData.ssrq.split(',')
       }
-      if (this.editRowData.zccssrqgj !== null) {
+      if (this.editRowData.zccssrq !== null) {
-        this.editRowData.zccssrqgj = this.editRowData.zccssrqgj.split(',')
+        this.editRowData.zccssrq = this.editRowData.zccssrq.split(',')
       }
-      if (this.editRowData.xcxssrqgj !== null) {
+      if (this.editRowData.xcxssrq !== null) {
-        this.editRowData.xcxssrqgj = this.editRowData.xcxssrqgj.split(',')
+        this.editRowData.xcxssrq = this.editRowData.xcxssrq.split(',')
       }
       this.drawerEdit = true
     },
@@ -1263,8 +1256,8 @@ export default {
     cancelInfo() {
       let Item = JSON.parse(localStorage.getItem('obj'))
       this.editRowData.ssrq = Item.ssrq
-      this.editRowData.xcxssrqgj = Item.xcxssrqgj
+      this.editRowData.xcxssrq = Item.xcxssrq
-      this.editRowData.zccssrqgj = Item.zccssrqgj
+      this.editRowData.zccssrq = Item.zccssrq
       this.drawerEdit = false
     },
     // 抽屉提交按钮
@@ -1272,11 +1265,11 @@ export default {
       if (this.editRowData.ssrq !== null) {
         this.editRowData.ssrq = this.editRowData.ssrq.join(',')
       }
-      if (this.editRowData.xcxssrqgj !== null){
+      if (this.editRowData.xcxssrq !== null){
-        this.editRowData.xcxssrqgj = this.editRowData.xcxssrqgj.join(',')
+        this.editRowData.xcxssrq = this.editRowData.xcxssrq.join(',')
       }
-      if (this.editRowData.zccssrqgj !== null){
+      if (this.editRowData.zccssrq !== null){
-        this.editRowData.zccssrqgj = this.editRowData.zccssrqgj.join(',')
+        this.editRowData.zccssrq = this.editRowData.zccssrq.join(',')
       }
       this.drawerEdit = false
     },
@@ -1351,15 +1344,15 @@ export default {
             } else {
               rowlist1.push(this.sarAccessInfoList[i].ssrq)
             }
-            if (this.sarAccessInfoList[i].xcxssrqgj === null || this.sarAccessInfoList[i].xcxssrqgj === undefined) {
+            if (this.sarAccessInfoList[i].xcxssrq === null || this.sarAccessInfoList[i].xcxssrq === undefined) {
-              rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '-')
+              rowlist3.push(this.sarAccessInfoList[i].xcxssrq = '-')
             } else {
-              rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj)
+              rowlist3.push(this.sarAccessInfoList[i].xcxssrq)
             }
-            if (this.sarAccessInfoList[i].zccssrqgj === null || this.sarAccessInfoList[i].zccssrqgj === undefined) {
+            if (this.sarAccessInfoList[i].zccssrq === null || this.sarAccessInfoList[i].zccssrq === undefined) {
-              rowlist2.push(this.sarAccessInfoList[i].zccssrqgj = '-')
+              rowlist2.push(this.sarAccessInfoList[i].zccssrq = '-')
             } else {
-              rowlist2.push(this.sarAccessInfoList[i].zccssrqgj)
+              rowlist2.push(this.sarAccessInfoList[i].zccssrq)
             }
           }
           console.log(rowlist1)

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue

@@ -369,7 +369,7 @@
           width="210px"
           label="卡车VPPS中文名称">
         </el-table-column>-->
-        <el-table-column width="240" align="center"  fixed="right"  label="操作">
+        <el-table-column width="160" align="center"  fixed="right"  label="操作">
           <template slot-scope="scope">
             <el-button
               class="common-button-default"
@@ -383,12 +383,12 @@
               size="small" @click="moveDown(scope.$index, scope.row)"
               v-if="!disabledFlag"
             >下移</el-button>
-            <el-button
+<!--            <el-button-->
-              size="small"
+<!--              size="small"-->
-              @click="editTghisRow(scope.row)"
+<!--              @click="editTghisRow(scope.row)"-->
-              class="common-button-default"
+<!--              class="common-button-default"-->
-              type="warning"
+<!--              type="warning"-->
-            >编辑</el-button>
+<!--            >编辑</el-button>-->
           </template>
         </el-table-column>
       </el-table>

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue

@@ -399,7 +399,7 @@
             align="center"
             label="适用产品线">
         </el-table-column>
-        <el-table-column width="240" align="center" fixed="right" label="操作">
+        <el-table-column width="160" align="center" fixed="right" label="操作">
           <template slot-scope="scope">
             <el-button
                 class="common-button-default"
@@ -415,13 +415,13 @@
                 v-if="!disabledFlag"
             >下移
             </el-button>
-            <el-button
+<!--            <el-button-->
-                size="small"
+<!--                size="small"-->
-                @click="editTghisRow(scope.row)"
+<!--                @click="editTghisRow(scope.row)"-->
-                class="common-button-default"
+<!--                class="common-button-default"-->
-                type="warning"
+<!--                type="warning"-->
-            >编辑
+<!--            >编辑-->
-            </el-button>
+<!--            </el-button>-->
           </template>
         </el-table-column>
       </el-table>

src/router/index.js

@@ -23,6 +23,15 @@ const routes = [
       title: '手机提示页面',
     }
   },
+  {
+    path: '/processedPage',
+    name: 'processedPage',
+    component: resolve => require(['@/pages/processedPage/index.vue'], resolve),
+    meta: {
+      requireAuth: true,
+      title: '手机提示页面',
+    }
+  },
   {
     path: '*',
     redirect: '/loginVerify'