@lambo-design/workflow-approve 1.0.0-beta.27 → 1.0.0-beta.29

package/src/portrait.vue

@@ -188,107 +188,108 @@
         <Modal title="查看附件" v-model="modalDocx" fullscreen scrollable :mask="false">
           <div ref="file"></div>
         </Modal>
-        <Modal v-model="modal1" title="选择节点"
-               @on-cancel="cancel"
-               @on-ok="doPass">
-          <Table border
-                 :data="allNode"
-                 :columns="nodeColumn"
-                 highlight-row
-                 @on-current-change="selectNode">
-          </Table>
-        </Modal>
-        <assigneeBox ref="assigneeHelpBox" :execution-completed="executionCompleted"
-                     @update-selected="handleSelectedUser" @update-next-node-assignee="updateNextNodeAssignee"
-                     :data="assigneeBoxData" :smart-flow-server-context="smartFlowServerContext"
-                     :upms-server-context="upmsServerContext"/>
-        <Modal v-model="modalBoxShow" width="1000" title="流程跟踪图">
-          <Workflow_Diagram ref="processTrace" :instanceId="process.instanceId" :applyId="process.applyId"
-                            :procId="process.procId" :table-columns="diagramTableColumns"
-                            :tableData="process.tableData" :hisAudit="hisAudit"
-                            :smart-flow-server-context="smartFlowServerContext">
-          </Workflow_Diagram>
-        </Modal>
-        <Modal v-model="appointBoxShow" title="下一环节设置"
-               @on-cancel="appointBoxShow = false" width="600"
-               @on-ok="appointOk">
-          <Card v-for="(item,index) of nextNodesFormList" :key="index" style="margin-bottom: 10px"
-                v-if="handleButtons && (handleButtons.includes('appointHandler') || handleButtons.includes('appointTimeoutTime'))">
-            <Form ref="appointBox" justify="center" :label-width="100" :model="item"
-                  style="margin: 10px 0 0 10px;" :rules="ruleValidate">
-              <div v-if="handleButtons && handleButtons.includes('appointHandler')">
-                <FormItem label="下一环节：">
-                  {{ item.name }}
-                </FormItem>
-                <FormItem label="人员类型：" v-if="!item.isMultiInstance">
-                  <RadioGroup v-model="item.actionType">
-                    <Radio label="ASSIGNEE">办理人</Radio>
-                    <Radio label="CAND">候选人</Radio>
-                  </RadioGroup>
+      </lamboIndicatorCard>
+    </transition>
+
+    <Modal v-model="modal1" title="选择节点"
+           @on-cancel="cancel"
+           @on-ok="doPass">
+      <Table border
+             :data="allNode"
+             :columns="nodeColumn"
+             highlight-row
+             @on-current-change="selectNode">
+      </Table>
+    </Modal>
+    <assigneeBox ref="assigneeHelpBox" :execution-completed="executionCompleted"
+                 @update-selected="handleSelectedUser" @update-next-node-assignee="updateNextNodeAssignee"
+                 :data="assigneeBoxData" :smart-flow-server-context="smartFlowServerContext"
+                 :upms-server-context="upmsServerContext"/>
+    <Modal v-model="modalBoxShow" width="1000" title="流程跟踪图">
+      <Workflow_Diagram ref="processTrace" :instanceId="process.instanceId" :applyId="process.applyId"
+                        :procId="process.procId" :table-columns="diagramTableColumns"
+                        :tableData="process.tableData" :hisAudit="hisAudit"
+                        :smart-flow-server-context="smartFlowServerContext">
+      </Workflow_Diagram>
+    </Modal>
+    <Modal v-model="appointBoxShow" title="下一环节设置"
+           @on-cancel="appointBoxShow = false" width="600"
+           @on-ok="appointOk">
+      <Card v-for="(item,index) of nextNodesFormList" :key="index" style="margin-bottom: 10px"
+            v-if="handleButtons && (handleButtons.includes('appointHandler') || handleButtons.includes('appointTimeoutTime'))">
+        <Form ref="appointBox" justify="center" :label-width="100" :model="item"
+              style="margin: 10px 0 0 10px;" :rules="ruleValidate">
+          <div v-if="handleButtons && handleButtons.includes('appointHandler')">
+            <FormItem label="下一环节：">
+              {{ item.name }}
+            </FormItem>
+            <FormItem label="人员类型：" v-if="!item.isMultiInstance">
+              <RadioGroup v-model="item.actionType">
+                <Radio label="ASSIGNEE">办理人</Radio>
+                <Radio label="CAND">候选人</Radio>
+              </RadioGroup>
+            </FormItem>
+            <FormItem label="办理人员：" prop="assignee" v-if="!item.isMultiInstance && item.actionType === 'ASSIGNEE'">
+              <Input v-model="item.assigneeName"
+                     placeholder="请选择办理人"
+                     style="width: 68%"
+                     icon="md-apps"
+                     @on-focus="readingRangeClick(item)"
+                     @on-click="readingRangeClick(item)"/>
+            </FormItem>
+            <FormItem label="候选人员：" prop="candidateGroups" v-if="item.isMultiInstance || item.actionType === 'CAND'">
+              <Input v-model="item.candidateNames"
+                     placeholder="请选择候选人"
+                     style="width: 68%"
+                     icon="md-apps"
+                     @on-focus="candidateGroupsReadingRangeClick(item)"
+                     @on-click="candidateGroupsReadingRangeClick(item)"/>
+            </FormItem>
+          </div>
+          <div v-if="handleButtons && handleButtons.includes('appointTimeoutTime')">
+            <Row>
+              <Col span="12">
+                <FormItem label="停留时间：">
+                  <Input v-model="item.remainDay" style="width: 100px" type="number" :min="0"></Input>
+                  天
                 </FormItem>
-                <FormItem label="办理人员：" prop="assignee" v-if="!item.isMultiInstance && item.actionType === 'ASSIGNEE'">
-                  <Input v-model="item.assigneeName"
-                         placeholder="请选择办理人"
-                         style="width: 68%"
-                         icon="md-apps"
-                         @on-focus="readingRangeClick(item)"
-                         @on-click="readingRangeClick(item)"/>
+              </Col>
+              <Col span="12">
+                <FormItem>
+                  <Input v-model="item.remainTime" style="margin-left: -140px; width: 100px" type="number"
+                         :min="0"></Input>
+                  小时 自动处理
                 </FormItem>
-                <FormItem label="候选人员：" prop="candidateGroups" v-if="item.isMultiInstance || item.actionType === 'CAND'">
-                  <Input v-model="item.candidateNames"
-                         placeholder="请选择候选人"
-                         style="width: 68%"
-                         icon="md-apps"
-                         @on-focus="candidateGroupsReadingRangeClick(item)"
-                         @on-click="candidateGroupsReadingRangeClick(item)"/>
+              </Col>
+            </Row>
+            <Row>
+              <Col span="12">
+                <FormItem label="任务提前：">
+                  <Input v-model="item.inAdvanceDay" style="width: 100px" type="number" :min="0"></Input>
+                  天
                 </FormItem>
-              </div>
-              <div v-if="handleButtons && handleButtons.includes('appointTimeoutTime')">
-                <Row>
-                  <Col span="12">
-                    <FormItem label="停留时间：">
-                      <Input v-model="item.remainDay" style="width: 100px" type="number" :min="0"></Input>
-                      天
-                    </FormItem>
-                  </Col>
-                  <Col span="12">
-                    <FormItem>
-                      <Input v-model="item.remainTime" style="margin-left: -140px; width: 100px" type="number"
-                             :min="0"></Input>
-                      小时 自动处理
-                    </FormItem>
-                  </Col>
-                </Row>
-                <Row>
-                  <Col span="12">
-                    <FormItem label="任务提前：">
-                      <Input v-model="item.inAdvanceDay" style="width: 100px" type="number" :min="0"></Input>
-                      天
-                    </FormItem>
-                  </Col>
-                  <Col span="12">
-                    <FormItem>
-                      <Input v-model="item.inAdvanceTime" style="margin-left: -140px;width: 100px" type="number"
-                             :min="0"></Input>
-                      小时 标红预警
-                    </FormItem>
-                  </Col>
-                </Row>
-                <FormItem label="处理方式：">
-                  <Select v-model="item.processing" style="width:200px" placeholder="自动同意">
-                    <Option v-for="item in handleTypeList" :value="item.value" :key="item.value">
-                      {{ item.label }}
-                    </Option>
-                  </Select>
+              </Col>
+              <Col span="12">
+                <FormItem>
+                  <Input v-model="item.inAdvanceTime" style="margin-left: -140px;width: 100px" type="number"
+                         :min="0"></Input>
+                  小时 标红预警
                 </FormItem>
-              </div>
-            </Form>
-          </Card>
-        </Modal>
-        <candidateGroupsHelpBox ref="candidateGroupsHelpBox" :show="candidateGroupsHelpBoxShow" @update-cand-groups="updateCandGroups"
-                                :upms-server-context="upmsServerContext" :smart-flow-server-context="smartFlowServerContext"/>
-      </lamboIndicatorCard>
-    </transition>
+              </Col>
+            </Row>
+            <FormItem label="处理方式：">
+              <Select v-model="item.processing" style="width:200px" placeholder="自动同意">
+                <Option v-for="item in handleTypeList" :value="item.value" :key="item.value">
+                  {{ item.label }}
+                </Option>
+              </Select>
+            </FormItem>
+          </div>
+        </Form>
+      </Card>
+    </Modal>
+    <candidateGroupsHelpBox ref="candidateGroupsHelpBox" :show="candidateGroupsHelpBoxShow" @update-cand-groups="updateCandGroups"
+                            :upms-server-context="upmsServerContext" :smart-flow-server-context="smartFlowServerContext"/>
     <template slot="page-footer">
       <div>
         <slot name="footer-button"></slot>
@@ -366,6 +367,16 @@ export default {
       type: String,
       required: true,
     },
+    taskId: {
+      type: String,
+      required: false,
+      default: '',
+    },
+    auditGroup: {
+      type: String,
+      required: false,
+      default: '',
+    },
     //业务表单保存方法
     businessFormSave: {
       type: Function,
@@ -443,12 +454,12 @@ export default {
       loading: false,
       disable: false,
       instanceId: '',
-      taskId: '',
+      curTaskId: '',
       handleButtons: [],
       handleName: '',
       auditOpinionTitle: '',
       auditResult: '',
-      auditGroup: '',
+      curAuditGroup: '',
       custChange: 'auditInfo',
       auditInfo: "auditInfo",
       auditProcess: "auditProcess",
@@ -737,60 +748,40 @@ export default {
       this.portraitWidth = this.width
     },
     initData() {
-      this.getAttachList()
       if (!this.isDetail) {
-        this.getTodoTaskId()
+        this.getTodoTask()
       } else {
-        this.getDoneTaskId()
+        this.getDoneTask()
       }
       this.getHandleButtons()
-      this.getHisAudit();
-      this.getProcessHistory();
     },
-    getAttachList() {
-      const self = this
-      const param = {
-        procId: this.procId,
-        applyId: this.applyId
-      }
-      ajax.get(self.smartFlowServerContext + '/manage/processDone/getAttachmentList', {params: param}).then(function (resp) {
-        self.attachmentList = resp.data.data.rows
-        self.attachmentList.forEach(item => {
-          const index = item.fileName.lastIndexOf(".")
-          const fileType = item.fileName.substr(index + 1).toLowerCase()
-          const imageList = ['jpg', 'gif', 'png', 'svg']
-          const docList = ['doc', 'docx']
-          const zipList = ['rar', 'zip']
-          const typeList = ['jpg', 'gif', 'png', 'docx']
-          item.fileType = imageList.indexOf(fileType) !== -1 ? 'image' : docList.indexOf(fileType) !== -1 ? 'doc' : zipList.indexOf(fileType) !== -1 ? 'zip' : fileType
-          item.showPreview = typeList.indexOf(fileType) !== -1
-        })
-      }).catch(err => {
-        console.log(err);
-      })
-    },
-    getTodoTaskId() {
+    getTodoTask() {
       const self = this
       let param = {
         procId: this.procId,
         applyId: this.applyId,
-        taskNode: this.taskNode
+        taskNode: this.taskNode,
+        taskId: this.taskId,
+        auditGroup: this.auditGroup
       }
       ajax.get(self.smartFlowServerContext + "/manage/processTodo/list", {params: param}).then(function (resp) {
         if (resp.data.code === '200') {
-          self.taskId = resp.data.data.rows[0].taskId
+          self.curTaskId = resp.data.data.rows[0].taskId
           self.instanceId = resp.data.data.rows[0].procInstanceId
+          self.curAuditGroup = resp.data.data.rows[0].auditGroup
           let procType = resp.data.data.rows[0].procType
           ajax.get(self.smartFlowServerContext + "/manage/processType/lists?proType=" + procType)
             .then(resp => {
               let data = resp.data.data.rows
               self.permScope = data[0].permScope
-              self.auditGroup = data[0].auditGroup
               self.defaultOrganTreeType = data[0].organTreeType ? data[0].organTreeType : '00'
               self.getNodeOrganTreeType(procType)
             }).catch(err => {
             console.log(err);
           })
+          self.getAttachList(self.curTaskId)
+          self.getHisAudit(self.curTaskId);
+          self.getProcessHistory(self.curTaskId);
         } else {
           self.$Message.error(resp.data.message)
         }
@@ -815,18 +806,20 @@ export default {
         console.log(err)
       })
     },
-    getDoneTaskId() {
+    getDoneTask() {
       const self = this
       let param = {
         procId: this.procId,
         applyId: this.applyId,
-        taskNode: this.taskNode
+        taskNode: this.taskNode,
+        taskId: this.taskId,
+        auditGroup: this.auditGroup
       }
       ajax.get(self.smartFlowServerContext + "/manage/processDone/getDoneDetail", {params: param}).then(function (resp) {
         if (resp.data.code === '200') {
           let rows = resp.data.data.rows
-          self.auditGroup = rows[0].auditGroup
           if (rows.length > 0) {
+            self.curAuditGroup = rows[0].auditGroup
             self.hisAuditOpinion = []
             let taskList = resp.data.data.rows
             taskList.forEach(item => {
@@ -835,13 +828,14 @@ export default {
                 auditTime: timestampToTime(item.auditDate)
               })
             })
-            self.taskId = taskList[0].taskId
+            self.curTaskId = taskList[0].taskId
             self.instanceId = taskList[0].procInstanceId
           } else {
             ajax.get(self.smartFlowServerContext + "/manage/processTodo/list", {params: param}).then(function (todoResp) {
               if (todoResp.data.code === '200') {
-                self.taskId = todoResp.data.data.rows[0].taskId
+                self.curTaskId = todoResp.data.data.rows[0].taskId
                 self.instanceId = todoResp.data.data.rows[0].procInstanceId
+                self.curAuditGroup = todoResp.data.data.rows[0].auditGroup
               } else {
                 self.$Message.error(todoResp.data.message)
               }
@@ -849,6 +843,9 @@ export default {
               console.log(err)
             })
           }
+          self.getAttachList(self.curTaskId)
+          self.getHisAudit(self.curTaskId);
+          self.getProcessHistory(self.curTaskId);
         } else {
           self.$Message.error(resp.data.message)
         }
@@ -953,13 +950,36 @@ export default {
         console.log(err)
       })
     },
-    getHisAudit() {
+    getAttachList(taskId) {
+      const self = this
+      const param = {
+        taskId: taskId,
+        procId: this.procId,
+        applyId: this.applyId
+      }
+      ajax.get(self.smartFlowServerContext + '/manage/processDone/getAttachmentList', {params: param}).then(function (resp) {
+        self.attachmentList = resp.data.data.rows
+        self.attachmentList.forEach(item => {
+          const index = item.fileName.lastIndexOf(".")
+          const fileType = item.fileName.substr(index + 1).toLowerCase()
+          const imageList = ['jpg', 'gif', 'png', 'svg']
+          const docList = ['doc', 'docx']
+          const zipList = ['rar', 'zip']
+          const typeList = ['jpg', 'gif', 'png', 'docx']
+          item.fileType = imageList.indexOf(fileType) !== -1 ? 'image' : docList.indexOf(fileType) !== -1 ? 'doc' : zipList.indexOf(fileType) !== -1 ? 'zip' : fileType
+          item.showPreview = typeList.indexOf(fileType) !== -1
+        })
+      }).catch(err => {
+        console.log(err);
+      })
+    },
+    getHisAudit(taskId) {
       let self = this
       let params = {
         applyId: self.applyId,
         instanceId: self.instanceId,
         procId: self.procId,
-        taskId: self.taskId
+        taskId: taskId
       }
       ajax.get(self.smartFlowServerContext + '/manage/processTodo/getHisAudit', {params: params}).then(function (resp) {
         if (resp.data.code === '200') {
@@ -973,13 +993,13 @@ export default {
         }
       })
     },
-    getProcessHistory() {
+    getProcessHistory(taskId) {
       let self = this
       let params = {
         applyId: self.applyId,
         instanceId: self.instanceId,
         procId: self.procId,
-        taskId: self.taskId
+        taskId: taskId
       }
       ajax.get(self.smartFlowServerContext + '/manage/processTodo/getProcessHis', {params: params}).then(function (resp) {
         if (resp.data.code === '200') {
@@ -998,7 +1018,7 @@ export default {
       self.auditParams = {
         procId: self.procId,
         applyId: self.applyId,
-        taskId: self.taskId,
+        taskId: self.curTaskId,
         auditOpinion: self.form.auditOpinion,
         fileListStr: JSON.stringify(self.fileList),
         auditResult: self.auditResult,
@@ -1057,7 +1077,7 @@ export default {
             self.$Message.warning(result.message)
             //避免未提示消息直接回调
             setTimeout(() => {
-              self.executionCompleted(false, null, null, auditResult, self.taskId);
+              self.executionCompleted(false, null, null, auditResult, self.curTaskId);
             }, 1000)
           } else if (result.code == '30010') {
             self.$Modal.confirm({
@@ -1074,7 +1094,7 @@ export default {
                     self.$Message.success(result.message);
                     //后端没有返回数据
                     setTimeout(() => {
-                      self.executionCompleted(true, null, null, auditResult, self.taskId);
+                      self.executionCompleted(true, null, null, auditResult, self.curTaskId);
                     }, 1000)
                     bus.$emit('triggerTimer')
                   } else {
@@ -1082,7 +1102,7 @@ export default {
                     self.disable = false
                     self.$Message.error(result.message)
                     setTimeout(() => {
-                      self.executionCompleted(false, null, null, auditResult, self.taskId);
+                      self.executionCompleted(false, null, null, auditResult, self.curTaskId);
                     }, 1000)
                   }
                   bus.$emit('triggerTimer')
@@ -1105,16 +1125,16 @@ export default {
                 self.$Message.success(result.message);
                 if (result.data) {
                   let taskIds = result.data.map(item => item.id).join(',');
-                  self.executionCompleted(true, result.data[0].processInstanceId, taskIds, auditResult, self.taskId)
+                  self.executionCompleted(true, result.data[0].processInstanceId, taskIds, auditResult, self.curTaskId)
                 } else {
-                  self.executionCompleted(true, null, null, auditResult, self.taskId)
+                  self.executionCompleted(true, null, null, auditResult, self.curTaskId)
                 }
               } else {
                 self.loading = false
                 self.disable = false
                 self.$Message.error(result.message)
                 setTimeout(() => {
-                  self.executionCompleted(false, null, null, auditResult, self.taskId);
+                  self.executionCompleted(false, null, null, auditResult, self.curTaskId);
                 }, 1000)
               }
               bus.$emit('triggerTimer')
@@ -1154,11 +1174,11 @@ export default {
             if (result.data){
               let taskIds = result.data.id ? result.data.id : result.data.map(item => item.id).join(',');
               setTimeout(() => {
-                self.executionCompleted(true, result.data.id ? result.data.processInstanceId : result.data[0].processInstanceId, taskIds, auditResult, self.taskId)
+                self.executionCompleted(true, result.data.id ? result.data.processInstanceId : result.data[0].processInstanceId, taskIds, auditResult, self.curTaskId)
               }, 1000)
             } else {
               setTimeout(() => {
-                self.executionCompleted(true, null, null, auditResult, self.taskId)
+                self.executionCompleted(true, null, null, auditResult, self.curTaskId)
               }, 1000)
             }
           } else if (result.code == '20002') {
@@ -1167,14 +1187,14 @@ export default {
             self.disable = false
             self.$Message.success(result.message)
             setTimeout(() => {
-              self.executionCompleted(true, '流程已结束', '流程已结束', auditResult, self.taskId)
+              self.executionCompleted(true, '流程已结束', '流程已结束', auditResult, self.curTaskId)
             }, 1000)
           } else {
             self.loading = false
             self.disable = false
             self.$Message.error(result.message ? result.message : `${self.handleName}失败`)
             setTimeout(() => {
-              self.executionCompleted(false, null, null, auditResult, self.taskId)
+              self.executionCompleted(false, null, null, auditResult, self.curTaskId)
             }, 1000)
           }
           bus.$emit('triggerTimer')
@@ -1237,7 +1257,7 @@ export default {
         applyId: self.applyId,
         instanceId: self.instanceId,
         procId: self.procId,
-        taskId: self.taskId,
+        taskId: self.curTaskId,
       }
       ajax.get(self.smartFlowServerContext + '/manage/processTodo/getPrintData', {params: params}).then(function (resp) {
         let result = resp.data.data
@@ -1277,7 +1297,7 @@ export default {
       let self = this
       let params = {
         processDefId: self.procId,
-        taskId: self.taskId,
+        taskId: self.curTaskId,
       }
       ajax.get(self.smartFlowServerContext + '/manage/processTodo/getAllPreNodes', {params: params}).then(function (resp) {
         if (resp.data.code === '200') {
@@ -1296,7 +1316,7 @@ export default {
       let self = this
       let params = {
         processDefId: self.procId,
-        taskId: self.taskId,
+        taskId: self.curTaskId,
       }
       ajax.get(self.smartFlowServerContext + '/manage/processTodo/getNodesBehind', {params: params}).then(function (resp) {
         if (resp.data.code === '200') {