hujunwei@agilestar.cn 1 год назад
Родитель
Сommit
20fe5b3ac0

+ 2 - 0
src/components/workflowBase.vue

@@ -458,6 +458,7 @@ export default {
           if (res.data.body.nextShapes[0].condition !== null) {
             this.node = res.data.body;
           } else {
+            this.resourceId = res.data.body.nextShapes[0].resourceId
             this.getNextPath(res.data.body.nextShapes[0].resourceId, 2);
           }
         }
@@ -572,6 +573,7 @@ export default {
     clickTransfer(e) {
       if (e == 1) {
         this.TransferStatus = true;
+        this.resourceId = ''
       } else if (e == 2) {
         this.CopyStatus = true;
       }

+ 13 - 1
src/pages/main/accountPermissions/accountPermissions.vue

@@ -78,7 +78,7 @@
             <el-dialog title="处理操作" width="100%" :visible.sync="handleStatus" :before-close="handleCloses" :modal="false"
                 v-if="handleStatus" :destroy-on-close="true">
                 <Workflow :list="fromList" v-if="isWorkflowStatus == true" @updateForm="updateForm"
-                    :requestForm="requestForm" :request_formTitle="request_form.title"/>
+                    :requestForm="requestForm" :adminResourceId="adminResourceId" :request_formTitle="request_form.title"/>
 
                 <WorkflowEntrance :list="fromList" v-else :lastManList="lastManList" @beforeClose="updateForm"
                     :requestForm="requestForm" :request_formTitle="request_form.title"/>
@@ -476,6 +476,7 @@ export default {
                 ],
             },
             savestatusBtn: false,
+            adminResourceId: "", //转派多人id
 
 
         }
@@ -530,6 +531,9 @@ export default {
 
             let res = await this.common.httpPost(obj, success);
             function success(data) {
+                if (data.lastMan == true) {
+                    _this.adminResourceId = data.adminResourceId;
+                }
                 _this.isWorkflowStatus = data.lastMan == false ? false : true;
                 _this.lastManList = data;
                 // console.log(_this.isWorkflowStatus);
@@ -834,10 +838,18 @@ export default {
                 console.log(res.data.body.nextShapes[0].multi);
                 if (res.data.body.nextShapes[0].multi) {
                     if (res.data.body.nextShapes[0].multi.multi === "true") {
+                        console.log('这是mulit节点');
                         this.getLastName();
+                    } else {
+                        this.adminResourceId = ''
+                        console.log('这不是mulit节点');
+                        this.destroy = true;
+                        this.handleStatus = true;
+                        this.getMetirialType();
                     }
                 }
                 if (this.fromList.taskId || this.fromList.processId) {
+                    this.adminResourceId = ''
                     this.destroy = true;
                     this.handleStatus = true;
                     this.getMetirialType();

+ 3 - 3
src/pages/main/internetAssessment/internetAssessment.vue

@@ -364,16 +364,16 @@
                 </div>
                 <div class="flex-load" style="display: flex; flex-direction: column">
                     <el-form-item label="附件:" prop="accessoryList">
-                        <my-upload v-if="fromList.taskName == '初评'" @uploadBack="uploadBack" @delloadBack="delloadBack"
+                        <my-upload  @uploadBack="uploadBack" @delloadBack="delloadBack"
                             @clickDownload="download" :fileInfo="fileInfo" :fileList="fromList.accessoryList"
                             style="width: 30% !important"></my-upload>
-                        <div v-if="fromList.taskName != '初评'">
+                        <!-- <div v-if="fromList.taskName != '初评'">
                             <div v-for="(item, index) in fromList.accessoryList" :key="index">
                                 <span style="color: blue;cursor: pointer;" @click="downloadOne(item)">{{
                                     item.fileName
                                 }}</span>
                             </div>
-                        </div>
+                        </div> -->
                     </el-form-item>
                 </div>
             </el-form>