手机端选人

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/phone/bzqdfb/step4.vue

@@ -122,6 +122,9 @@
             width="100px"
             align="center"
             label="文本状态">
+            <template slot-scope="scope">
+              <span>{{ textStatusMap[scope.row.textStatus] }}</span>
+            </template>
           </el-table-column>
         </el-table>
       </div>
@@ -206,6 +209,7 @@
     <ProcessFooter
       show-back
       show-submit
+      show-transfer
       :transfer-loading="isTransfer"
       :submitLoading="isSubmit"
       :saveLoading="saveLoading"
@@ -223,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>
 
@@ -232,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",
@@ -244,6 +254,9 @@ export default {
   },
   data() {
     return {
+      modalshowflag: false,
+      phoneRoleList: [],
+      phoneDrawerTitle: '',
       nodeList:[],
       isTransfer: false,
       drawerTitle:'',
@@ -304,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({
@@ -341,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", {

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

@@ -10,18 +10,19 @@
       <div class="headerTabsItem" :class="active === '3' ? 'active' : '' " @click="handleTabs('3')">审批历史</div>
     </div>
     <div class="content" v-show="active === '1'">
-      <div>
+      <div style="overflow: auto">
+        <ProcessTitle>
+          <template slot="title">基础信息</template>
+        </ProcessTitle>
+        <el-collapse-transition>
+          <div class="prc-content-border" v-if="foldFormFlag">
             <el-form
               ref="wbbzForm"
               :model="wbbzform"
               :rules="formRules"
               class="label-input-form"
-          label-width="210px"
+              label-width="120px"
             >
-          <ProcessTitle>
-            <template slot="title">基础信息</template>
-          </ProcessTitle>
-          <div class="prc-content-border" v-if="foldFormFlag">
               <el-row :gutter="24">
                 <el-col :span="24">
                   <el-form-item label="提报单位" prop="reportingUnit" class="add-form-item ">
@@ -106,13 +107,15 @@
                   </el-form-item>
                 </el-col>
               </el-row>
-          </div>
-          <el-button style="width: 100%" :icon=" foldFormFlag ? 'el-icon-caret-top': 'el-icon-caret-bottom'" @click="foldForm">{{ foldFormFlag ? '隐藏基础信息' : '展开基础信息' }}</el-button>
             </el-form>
+          </div>
+        </el-collapse-transition>
+          <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: "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,18 +10,19 @@
       <div class="headerTabsItem" :class="active === '3' ? 'active' : '' " @click="handleTabs('3')">审批历史</div>
     </div>
     <div class="content" v-show="active === '1'">
-      <div>
+      <div style="overflow: auto">
+        <ProcessTitle>
+          <template slot="title">基础信息</template>
+        </ProcessTitle>
+        <el-collapse-transition>
+          <div class="prc-content-border" v-if="foldFormFlag">
             <el-form
               ref="wbbzForm"
               :model="wbbzform"
               :rules="formRules"
               class="label-input-form"
-          label-width="210px"
+              label-width="120px"
             >
-          <ProcessTitle>
-            <template slot="title">基础信息</template>
-          </ProcessTitle>
-          <div class="prc-content-border" v-if="foldFormFlag">
               <el-row :gutter="24">
                 <el-col :span="24">
                   <el-form-item label="提报单位" prop="reportingUnit" class="add-form-item ">
@@ -106,13 +107,15 @@
                   </el-form-item>
                 </el-col>
               </el-row>
-          </div>
-          <el-button style="width: 100%" :icon=" foldFormFlag ? 'el-icon-caret-top': 'el-icon-caret-bottom'" @click="foldForm">{{ foldFormFlag ? '隐藏基础信息' : '展开基础信息' }}</el-button>
             </el-form>
+          </div>
+        </el-collapse-transition>
+        <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,18 +10,19 @@
       <div class="headerTabsItem" :class="active === '3' ? 'active' : '' " @click="handleTabs('3')">审批历史</div>
     </div>
     <div class="content" v-show="active === '1'">
-      <div>
+      <div style="overflow: auto">
+        <ProcessTitle>
+          <template slot="title">基础信息</template>
+        </ProcessTitle>
+        <el-collapse-transition>
+          <div class="prc-content-border" v-if="foldFormFlag">
             <el-form
               ref="wbbzForm"
               :model="wbbzform"
               :rules="formRules"
               class="label-input-form"
-          label-width="210px"
+              label-width="120px"
             >
-          <ProcessTitle>
-            <template slot="title">基础信息</template>
-          </ProcessTitle>
-          <div class="prc-content-border" v-if="foldFormFlag">
               <el-row :gutter="24">
                 <el-col :span="24">
                   <el-form-item label="提报单位" prop="reportingUnit" class="add-form-item ">
@@ -106,13 +107,15 @@
                   </el-form-item>
                 </el-col>
               </el-row>
-          </div>
-          <el-button style="width: 100%" :icon=" foldFormFlag ? 'el-icon-caret-top': 'el-icon-caret-bottom'" @click="foldForm">{{ foldFormFlag ? '隐藏基础信息' : '展开基础信息' }}</el-button>
             </el-form>
+          </div>
+        </el-collapse-transition>
+        <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 => {