@lambo-design/workflow-approve 1.0.0-beta.2 → 1.0.0-beta.4

package/src/horizontal.vue

@@ -14,10 +14,9 @@
           </a>
           <transition name="draw" @before-enter="beforeEnter" @enter="enter" @before-leave="beforeLeave" @leave="leave">
             <div class="box" v-show="historyShow">
-              <Card class="processHistory" dis-hover :bordered="false"
+              <Card class="process-history" dis-hover :bordered="false"
                     v-if="!handleButtons || handleButtons.includes('auditHistory')">
-                <processHistory :list="this.processHistory"
-                                :smart-flow-server-context="smartFlowServerContext" :oss-server-context="ossServerContext"></processHistory>
+                <processHistory :list="processHistory" :smart-flow-server-context="smartFlowServerContext"></processHistory>
               </Card>
             </div>
           </transition>
@@ -61,11 +60,11 @@
         </TabPane>
         <TabPane label="流程跟踪图" :name="auditProcess"  v-if="!handleButtons || handleButtons.includes('processTrace')">
           <div>
-            <Workflow_Print ref="processTrace" :instanceId="process.instanceId" :applyId="process.applyId"
+            <Workflow_Diagram ref="processTrace" :instanceId="process.instanceId" :applyId="process.applyId"
                             :procId="process.procId"
                             :tableData="process.tableData" :hisAudit="hisAudit"
                             :smart-flow-server-context="smartFlowServerContext">
-            </Workflow_Print>
+            </Workflow_Diagram>
           </div>
         </TabPane>
       </Tabs>
@@ -73,7 +72,7 @@
     <div class="sticky" v-if="custChange.includes('auditInfo')">
       <lamboIndicatorCard :has-title="false" :hasExtend="false">
         <a @click="auditShow = !auditShow">
-          <Title v-if="!handleButtons || handleButtons.includes('opinion.vue') || handleButtons.includes('attachmentFile')">
+          <Title v-if="!handleButtons || handleButtons.includes('auditOpinion') || handleButtons.includes('attachmentFile')">
             <a style="color: #989898">
               <Icon v-if="auditShow" type="ios-arrow-down"/>
               <Icon v-if="!auditShow" type="ios-arrow-up"/>
@@ -82,48 +81,48 @@
           </Title>
         </a>
         <transition name="draw" @before-enter="beforeEnter" @enter="enter" @before-leave="beforeLeave" @leave="leave">
-          <div class="box" v-show="auditShow" style="min-height: 260px">
+          <div class="box horizontal-audit" v-show="auditShow">
             <Form ref="auditOpinion" justify="center"
-                  v-if="!handleButtons || handleButtons.includes('opinion.vue') || handleButtons.includes('attachmentFile')"
+                  v-if="!handleButtons || handleButtons.includes('auditOpinion') || handleButtons.includes('attachmentFile')"
                   style=" margin-top: 15px;margin-left: 100px;margin-right: 100px" :rules="ruleValidate">
               <Row>
                 <Col span="24" offset="0">
                   <FormItem :label-width="120" label="处理意见：" prop="auditOpinion"
-                            v-if="!handleButtons || handleButtons.includes('opinion.vue')">
+                            v-if="!handleButtons || handleButtons.includes('auditOpinion')">
                     <AuditOpinion v-model="auditOpinion" :smart-flow-server-context="smartFlowServerContext"></AuditOpinion>
                   </FormItem>
-                  <attachment style="margin-left: 120px" :attachmentdata="fileList" :oss-server-context="ossServerContext"
-                              v-if="!handleButtons || handleButtons.includes('attachmentFile')"></attachment>
+                  <UploadFile style="margin-left: 120px" v-if="!handleButtons || handleButtons.includes('attachmentFile')"
+                              @upload-result="uploadFile" :multiple="true"
+                              :oss-server-context="smartFlowServerContext" :oss-file-put-url="ossFilePutUrl"></UploadFile>
                 </Col>
               </Row>
             </Form>
-
             <Divider/>
             <Row type="flex" justify="center" style="margin-top: 10px;margin-bottom: 10px;">
               <Button style="margin-left: 10px;" v-if="isShowSave && businessFormSave" @click="saveBusinessForm">保存</Button>
               <Button style="margin-left: 10px;" v-if="!handleButtons || handleButtons.includes('auditTo30')"
-                      :disabled="disable" :loading="loading" type="success" @click="audit('30')">通过
+                      :disabled="disable" :loading="loading" @click="audit('30')">通过
               </Button>
               <Button style="margin-left: 10px;" v-if="!handleButtons || handleButtons.includes('auditTo70')"
-                      :disabled="disable" :loading="loading" type="warning" @click="audit('70')">驳回到原点
+                      :disabled="disable" :loading="loading" @click="audit('70')">驳回到原点
               </Button>
               <Button style="margin-left: 10px;" v-if="!handleButtons || handleButtons.includes('auditTo40')"
-                      :disabled="disable" :loading="loading" type="warning" @click="audit('40')">驳回到上一级
-              </Button>
-              <Button style="margin-left: 10px;" v-if="!handleButtons || handleButtons.includes('auditTo80')"
-                      :disabled="disable" :loading="loading" type="info" @click="audit('80')">跳转指定节点
+                      :disabled="disable" :loading="loading" @click="audit('40')">驳回到上一级
               </Button>
               <Button style="margin-left: 10px;" v-if="!handleButtons || handleButtons.includes('auditTo90')"
-                      :disabled="disable" :loading="loading" type="info" @click="audit('90')">驳回指定节点
+                      :disabled="disable" :loading="loading" @click="audit('90')">驳回指定节点
+              </Button>
+              <Button style="margin-left: 10px;" v-if="!handleButtons || handleButtons.includes('auditTo80')"
+                      :disabled="disable" :loading="loading" @click="audit('80')">跳转指定节点
               </Button>
               <Button style="margin-left: 10px;" v-if="!handleButtons || handleButtons.includes('auditTo82')"
-                      :disabled="disable" :loading="loading" type="info" @click="audit('82')">指定他人处理
+                      :disabled="disable" :loading="loading" @click="audit('82')">指定他人处理
               </Button>
               <Button style="margin-left: 10px;" v-if="!handleButtons || handleButtons.includes('auditTo50')"
-                      :disabled="disable" :loading="loading" type="error" @click="audit('50')">直接结束流程
+                      :disabled="disable" :loading="loading" @click="audit('50')">直接结束流程
               </Button>
               <Button style="margin-left: 10px;" v-if="isShowReturn"
-                      :disabled="disable" :loading="loading" type="default" @click="pageGoBack()">返回
+                      :disabled="disable" :loading="loading" @click="pageGoBack()">返回
               </Button>
             </Row>
           </div>
@@ -138,8 +137,8 @@
 <script>
 import LamboPageContainer from '@lambo-design/page-container'
 import LamboIndicatorCard from '@lambo-design/indicator-card'
-import Attachment from './components/attachment';
-import Workflow_Print from './workflow-diagram'
+import Attachment from './components/horizontal/attachment';
+import Workflow_Diagram from './workflow-diagram'
 import ajax from "@lambo-design/shared/utils/ajax";
 import { operateBtn } from '@lambo-design/shared/utils/assist';
 import bus from '@lambo-design/shared/utils/bus';
@@ -149,6 +148,7 @@ import assigneeBox from "./components/assignee-box";
 import LamboPagingTable from "@lambo-design/paging-table";
 import axios from "axios";
 import AuditOpinion from "./components/horizontal/opinion";
+import UploadFile from "@lambo-design/upload-file";
 
 // 引入docx-preview插件
 let docx = require('docx-preview');
@@ -192,10 +192,6 @@ export default {
       type: String,
       default: '/api/smart-flow-server',
     },
-    ossServerContext: {
-      type: String,
-      default: '/api/oss-server',
-    },
     upmsServerContext: {
       type: String,
       default: '/api/upms-server',
@@ -204,13 +200,14 @@ export default {
   components: {
     Title,
     LamboPageContainer,
-    Workflow_Print,
+    Workflow_Diagram,
     Attachment,
     processHistory,
     assigneeBox,
     LamboPagingTable,
     AuditOpinion,
-    LamboIndicatorCard
+    LamboIndicatorCard,
+    UploadFile
   },
   data() {
     return {
@@ -245,6 +242,7 @@ export default {
       auditInfo:"auditInfo",
       auditProcess:"auditProcess",
       fileList: [],
+      ossFilePutUrl: '/manage/oss/file/put',
       hisAudit: [],
       datas: {
         orgName: "",
@@ -265,7 +263,8 @@ export default {
         '30': '同意',
         '70': '驳回原点',
         '40': '驳回上一节点',
-        '80': '驳回指定节点',
+        '90': '驳回指定节点',
+        '80': '跳转指定节点',
         '82': '转办',
         '50': '人工终止'
       }
@@ -499,7 +498,7 @@ export default {
         procId: this.procId,
         applyId: this.applyId
       }
-      ajax.get(this.smartFlowServerContext + '/manage/processDone/getAttachmentList', {params: param}).then(function (resp) {
+      ajax.get(self.smartFlowServerContext + '/manage/processDone/getAttachmentList', {params: param}).then(function (resp) {
         self.tableData = resp.data.data.rows
         self.attachListShow = true
       }).catch(err => {
@@ -513,13 +512,13 @@ export default {
         applyId: this.applyId,
         taskNode:this.taskNode
       }
-      ajax.get(this.smartFlowServerContext + "/manage/processTodo/list", {params: param}).then(function (resp) {
+      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.instanceId = resp.data.data.rows[0].procInstanceId
           self.processPrint()
         }else {
-          this.$Message.error(resp.data.message)
+          self.$Message.error(resp.data.message)
         }
       }).catch((err)=>{
         console.log(err)
@@ -531,11 +530,11 @@ export default {
         procId: this.procId,
         taskNode: this.taskNode
       }
-      ajax.post(this.smartFlowServerContext + '/manage/approvalCenter/getNodeData', param).then(function (resp) {
+      ajax.post(self.smartFlowServerContext + '/manage/approvalCenter/getNodeData', param).then(function (resp) {
         if (resp.data.code === '200') {
           self.handleButtons = resp.data.data[0].handleButtons
         }else {
-          this.$Message.error(resp.data.message)
+          self.$Message.error(resp.data.message)
         }
       }).catch((err)=>{
         console.log(err)
@@ -556,7 +555,7 @@ export default {
       const self = this;
       if (self.auditResult == '82') {
         self.assigneeBoxData = self.auditParams
-        this.$refs.assigneeHelpBox.toggleShowHelpBox();
+        self.$refs.assigneeHelpBox.toggleShowHelpBox();
       } else if (self.auditResult == '80') {
         self.getNodesBehind()
       } else if (self.auditResult == '90') {
@@ -564,7 +563,7 @@ export default {
       } else if (self.auditResult == '40') {
         self.loading = true
         self.disable = true
-        let url = this.smartFlowServerContext + '/manage/processTodo/getPreNode'
+        let url = self.smartFlowServerContext + '/manage/processTodo/getPreNode'
         ajax.post(url, self.auditParams).then(function (resp) {
           let result = resp.data
           if (result.code == '30010') {
@@ -573,7 +572,7 @@ export default {
               content: result.message,
               onOk: () => {
                 self.auditParams.auditResult = '70'
-                let url = this.smartFlowServerContext + '/manage/processTodo/audit'
+                let url = self.smartFlowServerContext + '/manage/processTodo/audit'
                 ajax.post(url, self.auditParams).then(function (resp) {
                   let result = resp.data
                   if (result.code == '200') {
@@ -600,7 +599,7 @@ export default {
           } else {
             self.loading = true
             self.disable = true
-            let url = this.smartFlowServerContext + '/manage/processTodo/audit'
+            let url = self.smartFlowServerContext + '/manage/processTodo/audit'
             ajax.post(url, self.auditParams).then(function (resp) {
               let result = resp.data
               if (result.code == '200') {
@@ -625,7 +624,7 @@ export default {
       } else {
         self.loading = true
         self.disable = true
-        let url = this.smartFlowServerContext + '/manage/processTodo/audit'
+        let url = self.smartFlowServerContext + '/manage/processTodo/audit'
         ajax.post(url, self.auditParams).then(function (resp) {
           let result = resp.data
           if (result.code == '200') {
@@ -667,24 +666,24 @@ export default {
       self.submit()
     },
     getAttach(row) {
-      window.open(this.ossServerContext + "/file/get/" + row.fileId, "_blank");
+      window.open(this.smartFlowServerContext + "/manage/oss/file/get/" + row.fileId, "_blank");
     },
     preViewAttach(row) {
       let reg = /\.(gif|jpg|jpeg|bmp|png|PNG)$/
       let regs = /\.(pdf)$/
       if (reg.test(row.fileName)) {
-        let url = this.ossServerContext + "/file/get/" + row.fileId;
+        let url = this.smartFlowServerContext + "/manage/oss/file/get/" + row.fileId;
         this.imgPreview(url);
       } else if (regs.test(row.fileName)) {
-        window.open(this.ossServerContext + "/file/getFileStream?fileId=" + row.fileId, "_blank");
+        window.open(this.smartFlowServerContext + "/manage/oss/file/getFileStream?fileId=" + row.fileId, "_blank");
       } else {
-        this.modalDocx=true
+        this.modalDocx = true
         axios({
           method: 'get',
           responseType: 'blob', // 因为是流文件，所以要指定blob类型
-          url: this.ossServerContext + "/file/get/" + row.fileId// 一个word下载文件的接口
+          url: this.smartFlowServerContext + "/manage/oss/file/get/" + row.fileId// 一个word下载文件的接口
         }).then(({data}) => {
-            docx.renderAsync(data, this.$refs.file,null, {
+            docx.renderAsync(data, this.$refs.file, null, {
               className: "docx", //默认和文档样式类的类名/前缀
               inWrapper: true, //启用围绕文档内容呈现包装器
               ignoreWidth: false, //禁用页面的渲染宽度
@@ -714,7 +713,7 @@ export default {
         procId: self.procId,
         applyId: self.applyId,
         taskId: self.taskId,
-        auditOpinion: self.opinion,
+        auditOpinion: self.auditOpinion,
         fileListStr: JSON.stringify(self.fileList),
         auditResult: self.auditResult,
         params: JSON.stringify(self.datas),
@@ -722,20 +721,19 @@ export default {
         selectedUserId: self.selectedUserId,
       }
       if (self.auditResult == '' || self.auditResult == null) {
-        this.$Message.error("请选择审批结果！");
+        self.$Message.error("请选择审批结果！");
         return;
       }
-      if (self.opinion == '' || self.opinion == null) {
-        if (!self.handleButtons || self.handleButtons.includes('opinion.vue')) {
-          this.$Message.error("请输入审批意见！")
+      if (self.auditOpinion == '' || self.auditOpinion == null) {
+        if (!self.handleButtons || self.handleButtons.includes('auditOpinion')) {
+          self.$Message.error("请输入审批意见！")
           return;
         } else {
           self.auditParams.auditOpinion = self.handleButtonsNames[self.auditResult];
         }
       }
 
-      this.businessFormSave ? this.businessFormSave(this.handleSaveResult) : this.handleSaveResult(true)
-
+      self.businessFormSave ? self.businessFormSave(self.handleSaveResult) : self.handleSaveResult(true)
     },
 
     //打印流程图信息
@@ -747,7 +745,7 @@ export default {
         procId: self.procId,
         taskId: self.taskId,
       }
-      ajax.get(this.smartFlowServerContext + '/manage/processTodo/getPrintData', {params: params}).then(function (resp) {
+      ajax.get(self.smartFlowServerContext + '/manage/processTodo/getPrintData', {params: params}).then(function (resp) {
         let result = resp.data.data
         if (resp.data.code === '200') {
           let tableData = result
@@ -774,7 +772,7 @@ export default {
         procId: self.procId,
         taskId: self.taskId
       }
-      ajax.get(this.smartFlowServerContext + '/manage/processTodo/getHisAudit', {params: params}).then(function (resp) {
+      ajax.get(self.smartFlowServerContext + '/manage/processTodo/getHisAudit', {params: params}).then(function (resp) {
         if (resp.data.code === '200') {
           self.hisAudit = resp.data.data
           let uniqueDataMap = {};
@@ -795,7 +793,7 @@ export default {
         procId: self.procId,
         taskId: self.taskId
       }
-      ajax.get(this.smartFlowServerContext + '/manage/processTodo/getProcessHis', {params: params}).then(function (resp) {
+      ajax.get(self.smartFlowServerContext + '/manage/processTodo/getProcessHis', {params: params}).then(function (resp) {
         if (resp.data.code === '200') {
           self.processHistory = resp.data.data
         }
@@ -819,7 +817,7 @@ export default {
           procId: self.procId,
           applyId: self.applyId,
           taskId: self.taskId,
-          auditOpinion: self.opinion,
+          auditOpinion: self.auditOpinion,
           fileListStr: JSON.stringify(self.fileList),
           auditResult: self.auditResult,
           params: JSON.stringify(self.datas),
@@ -829,7 +827,7 @@ export default {
         self.loading = true
         self.disable = true
 
-        let url = this.smartFlowServerContext + '/manage/processTodo/audit'
+        let url = self.smartFlowServerContext + '/manage/processTodo/audit'
         ajax.post(url, self.auditParams).then(function (resp) {
           let result = resp.data
           if (result.code === '200') {
@@ -864,10 +862,14 @@ export default {
         processDefId: self.procId,
         taskId: self.taskId,
       }
-      ajax.get(this.smartFlowServerContext + '/manage/processTodo/getAllPreNodes', {params: params}).then(function (resp) {
+      ajax.get(self.smartFlowServerContext + '/manage/processTodo/getAllPreNodes', {params: params}).then(function (resp) {
         if (resp.data.code === '200') {
-          self.allNode = resp.data.data
-          self.modal1 = true
+          if (resp.data.data.length > 0){
+            self.allNode = resp.data.data
+            self.modal1 = true
+          }else {
+            self.$Message.warning('当前流程无前序节点')
+          }
         } else {
           self.$Message.error(resp.data.message)
         }
@@ -879,10 +881,14 @@ export default {
         processDefId: self.procId,
         taskId: self.taskId,
       }
-      ajax.get(this.smartFlowServerContext + '/manage/processTodo/getNodesBehind', {params: params}).then(function (resp) {
+      ajax.get(self.smartFlowServerContext + '/manage/processTodo/getNodesBehind', {params: params}).then(function (resp) {
         if (resp.data.code === '200') {
-          self.allNode = resp.data.data
-          self.modal1 = true
+          if (resp.data.data.length > 0){
+            self.allNode = resp.data.data
+            self.modal1 = true
+          }else {
+            self.$Message.warning('当前流程无后续节点')
+          }
         } else {
           self.$Message.error(resp.data.message)
         }
@@ -917,6 +923,15 @@ export default {
 
       el.addEventListener('transitionend', done);
     },
+    uploadFile(file){
+      const self = this;
+      file.forEach(item => {
+        self.fileList.push({
+          fileName: item.fileName,
+          fileId: item.fileCode,
+        });
+      })
+    },
   },
   watch: {
     auditOpinionText(label) {
@@ -931,66 +946,28 @@ export default {
 </script>
 
 <style lang="less" scoped>
-.header-text {
-  display: flex;
-  font-size: 18px;
-  font-weight: bold;
-  color: black;
-}
-
-.cont {
-  display: flex;
-  width: 100%;
-  height: 100%;
-}
-
-.contLeft {
-  flex: 0 0 20%;
-  margin-right: 5px
-}
-
-.contRight {
-  display: flex;
-  flex: 0 0 80%;
-  height: 100%;
-  flex-direction: column;
-
-}
-
-.iframe {
-  height: 70vh;
-  width: 100%;
-  border-style: none;
-}
 
-.fontType {
-  font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "微软雅黑", Arial, sans-serif;
-  font-weight: bold;
-  color: #657180;
-  font-size: 14px
+/deep/ .ivu-table-row-highlight td {
+  background-color: #50c1ff !important;
+  color: #fff !important;
 }
 
-.processHistory {
+.process-history {
   height: 68vh;
   width: 100%;
   overflow-y: auto;
 }
 
-.processHistory::-webkit-scrollbar {
+.process-history::-webkit-scrollbar {
   width: 5px;
   height: 5px;
 }
 
-.processHistory::-webkit-scrollbar-thumb {
+.process-history::-webkit-scrollbar-thumb {
   background: linear-gradient(to bottom right, #bbbbbb 0%, #bbbbbb 100%);
   border-radius: 5px;
 }
 
-/deep/ .ivu-table-row-highlight td {
-  background-color: #50c1ff !important;
-  color: #fff !important;
-}
-
 .box {
   overflow: hidden;
   transition: height 0.3s ease;
@@ -1000,7 +977,18 @@ export default {
 .draw-enter-active, .draw-leave-active {
 
 }
+.horizontal-audit{
+  overflow-y: auto;
+}
+.horizontal-audit::-webkit-scrollbar {
+  width: 5px;
+  height: 5px;
+}
 
+.horizontal-audit::-webkit-scrollbar-thumb {
+  background: linear-gradient(to bottom right, #bbbbbb 0%, #bbbbbb 100%);
+  border-radius: 5px;
+}
 .draw-enter, .draw-leave-to {
   height: 0;
 }