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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lambo-design/workflow-approve",
-  "version": "1.0.0-beta.2",
+  "version": "1.0.0-beta.4",
   "description": "",
   "main": "index.js",
   "author": "lambo",
@@ -13,7 +13,7 @@
     "axios": "^0.24.0",
     "axios-cache-plugin": "^0.1.0",
     "@lambo-design/core": "^4.7.1-beta.139",
-    "@lambo-design/shared": "^1.0.0-beta.193"
+    "@lambo-design/shared": "^1.0.0-beta.199"
   },
   "dependencies": {
     "bpmn-js": "^7.3.1",

package/src/components/history.vue

@@ -1,8 +1,8 @@
 <template>
   <div>
 
-    <Timeline :class="portraitWidth === 0 ? 'horizontalTimeline' : 'portraitTimeline'">
-      <TimelineItem v-for="(items,index) in itemList" :key="index" :class="portraitWidth === 0 ? 'horizontalTimelineItem' : 'portraitTimelineItem'">
+    <Timeline class="portrait-timeline">
+      <TimelineItem v-for="(items,index) in itemList" :key="index" class="portrait-timeline-item">
         <template #dot>
           <div v-if="items[0].auditResult === '30' || items[0].auditResult === '80'" class="cicle" style="background-color: #005aff"></div>
           <div v-else-if="items[0].auditResult === '40' || items[0].auditResult === '50'" class="cicle" style="background-color: #ffcc66"></div>
@@ -11,12 +11,12 @@
         </template>
         <Collapse v-model="activeName" simple style="margin: -10px 0 0 -2px;border: none">
           <Panel :name="'panel' + index" hide-arrow>
-            <span class="title"> {{ items[0].taskName }}</span>
+            <span class="history-title"> {{ items[0].taskName }}</span>
             <template #content>
               <div v-for="(item, index) in items" :key="index">
                 <div v-for="(itemListItem, itemListIndex) in item.auditName" :key="itemListIndex">
                   <Card dis-hover
-                        :class="portraitWidth === 0 ? 'horizontalCard' : 'portraitCard'"
+                        class="portrait-card"
                         :bordered="false">
                     <List item-layout="vertical">
                       <ListItem>
@@ -24,7 +24,7 @@
                           <!-- 左边：Avatar -->
                           <Col>
                             <avatar
-                              :class="portraitWidth === 0 ? 'horizontalAvatar' : portraitWidth >= 600 ? 'portraitAvatarLarge' : 'portraitAvatarSmall'"
+                              :class="portraitWidth >= 600 ? 'portrait-avatar-large' : 'portrait-avatar-small'"
                               size="small">
                               {{ getFirstName(itemListItem) }}</avatar>
                           </Col>
@@ -32,22 +32,21 @@
                           <Col span="17">
                             <Row>
                               <tooltip>
-                                <span class="auditNameStyle"> {{ itemListItem }}</span>
+                                <span class="audit-name-style"> {{ itemListItem }}</span>
                                 <div slot="content" style="white-space: normal"> {{ itemListItem }}</div>
                               </tooltip>
                               <Divider style="background-color:#808695;height: 1em;margin: 4px 9px 0 6px;"
                                        type="vertical"/>
                               <span v-if="item.auditOrganName"
-                                    class="auditNameStyle"> {{ item.auditOrganName[itemListIndex] }}</span>
-                              <span v-if="portraitWidth === 0 || portraitWidth >= 600" class="auditDateStyle">
+                                    class="audit-name-style"> {{ item.auditOrganName[itemListIndex] }}</span>
+                              <span v-if="portraitWidth === 0 || portraitWidth >= 600" class="audit-date-style">
                                 {{ item.startDate }}{{ item.auditDate }}
                               </span>
                             </Row>
                             <Row v-if="item.auditComment">
-                              <span class="auditNameStyle">{{ item.auditComment }}</span>
+                              <span class="audit-name-style">{{ item.auditComment }}</span>
                             </Row>
-<!--                            todo:接收时间-->
-                            <Row v-if="portraitWidth < 600" class="portraitAuditDateStyle">{{showDate(item)}}{{ item.startDate }}{{ item.auditDate }}</Row>
+                            <Row v-if="portraitWidth < 600" class="portrait-audit-date-style">{{showDate(item)}}{{ item.startDate }}{{ item.auditDate }}</Row>
                             <Row style="margin-top: 10px">
                               <Col span="12">
                                 <span style="color: #005aff;; font-size: 13px;"
@@ -152,10 +151,6 @@ export default {
       type: String,
       default: '/api/smart-flow-server',
     },
-    ossServerContext: {
-      type: String,
-      default: '/api/oss-server',
-    },
   },
   data() {
     return {
@@ -203,9 +198,7 @@ export default {
         render: (h, {row}) => {
           const index = row.fileName.lastIndexOf(".");
           const fileType = row.fileName.substr(index + 1).toLowerCase()
-          // const typeList=['jpg','pdf','gif','png','docx']
-          //由于pdf预览显示乱码 暂时不提供pdf预览功能
-          const typeList = ['jpg', 'gif', 'png', 'docx']
+          const typeList=['jpg','gif','png','docx']
           if (typeList.indexOf(fileType) !== -1) {
             return h("div", [
               operateHref(this, h, row, "下载", () => {
@@ -251,7 +244,7 @@ export default {
         effectTime: item.startDate,
         expireTime: item.warningDate,
       };
-      let url = this.smartFlowServerContext + "/manage/processTodo/sendMessage";
+      let url = self.smartFlowServerContext + "/manage/processTodo/sendMessage";
       ajax.post(url, params).then(function (resp) {
         console.log("message  ", resp);
         if (resp.data.code == 200) {
@@ -262,22 +255,22 @@ export default {
       });
     },
     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
         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, {
               className: "docx", //默认和文档样式类的类名/前缀
@@ -358,70 +351,7 @@ export default {
 </script>
 
 <style scoped>
-.arrow {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-
-.fontType {
-  font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "微软雅黑", Arial, sans-serif;
-  font-weight: bold;
-  color: #657180;
-  font-size: 14px
-}
-
-.title {
-  font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "微软雅黑", Arial, sans-serif;
-  font-weight: bold;
-  color: #515a6e;
-  font-size: 14px;
-  margin: 0 1vh 0 -2vh;
-}
-
-.imgStyle {
-  margin: 0 0 0 -5px;
-  zoom: 60%;
-
-}
-.cicle{
-  margin-left: 12px;
-  width: 15px;
-  height: 15px;
-  border-radius: 50%;
-}
-
-.cardStyle {
-  background-color: #bbbbbb;
-}
-
-.auditNameStyle {
-  margin-bottom: -5px;
-  white-space: nowrap;
-  display: inline-block;
-  max-width: 100px;
-  font-size: 14px;
-  color: #17233d;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
-
-.auditDateStyle {
-  white-space: nowrap;
-  display: inline-block;
-  max-width: 100px;
-  font-size: 14px;
-  color: #808695;
-  margin-left: 10px;
-}
-
-.horizontalTimelineItem {
-  margin-bottom: 30px !important;
-}
-.portraitTimelineItem {
-  margin-bottom: -10px !important;
-}
-
+@import "../styles/css/index.less";
 /deep/ .docx {
   width: 100% !important;
 }
@@ -445,64 +375,4 @@ export default {
   padding: 5px !important;
 }
 
-.horizontalTimeline {
-  margin: 4vh 0 0 10vh
-}
-
-.portraitTimeline {
-  margin: 0 0 0 0
-}
-
-.horizontalCard {
-  background-color: #f1f1f1;
-  border-radius: 10px;
-  margin-top: 10px;
-  width: 150vh;
-}
-
-.portraitCard {
-  background-color: #f1f1f1;
-  border-radius: 10px;
-  width: auto;
-  margin-left: -15px;
-  margin-right: -25px;
-  margin-bottom: 5px;
-}
-
-.horizontalAvatar {
-  background-color: #005aff;
-  margin: 0 30px 0 5px;
-  zoom: 200%
-}
-
-.portraitAvatarLarge {
-  background-color: #005aff;
-  margin: -15px 10px 0 10px;
-  zoom: 150%
-}
-
-.portraitAvatarSmall {
-  background-color: #005aff;
-  margin: -30px 10px 0 5px;
-  zoom: 150%
-}
-
-.urging{
-  margin-top: -3px;
-  font-size: small;
-}
-
-.attach{
-  margin-top: -3px;
-  font-size: small;
-  margin-left: 130px
-}
-
-.portraitAuditDateStyle{
-  white-space: nowrap;
-  max-width: 100px;
-  margin-top: 5px;
-  font-size: 12px;
-  color: #808695;
-}
 </style>

package/src/components/{attachment.vue → horizontal/attachment.vue}

@@ -93,10 +93,6 @@ export default {
         return column
       }
     },
-    ossServerContext: {
-      type: String,
-      default: '/api/oss-server',
-    },
   },
   data() {
     return {

package/src/components/horizontal/history.vue

@@ -154,10 +154,6 @@ export default {
       type: String,
       default: '/api/smart-flow-server',
     },
-    ossServerContext: {
-      type: String,
-      default: '/api/oss-server',
-    },
   },
   data() {
     return {
@@ -264,22 +260,22 @@ export default {
       });
     },
     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
         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, {
               className: "docx", //默认和文档样式类的类名/前缀

package/src/components/opinion.vue

@@ -4,25 +4,19 @@
        
       <a style="color: black" @click="customCommentListModal = true"><Icon type="ios-browsers-outline" /> 常用意见</a> &nbsp;
       <Tooltip placement="bottom" v-if="attachmentFile">
-        <div style="font-size: smaller" slot="content">支持扩展名：.rar .zip .doc .docx .pdf .jpg...</div>
-        <Upload :action="actionUrl" :on-error="handleError" :before-upload="handleUpload" :show-upload-list="false"
-                multiple
-                :on-success="handleSuccess" :on-progress="handleProgress"
-                :on-format-error="handleFormatError"
-                :format="['xlsx', 'xls','txt','rar','zip','doc','docx','jpg','pdf','gif','png']">
-          <a style="color: black"><Icon type="md-attach" /> 附件</a>
-        </Upload>
+        <div style="font-size: smaller" slot="content">支持扩展名：.pdf .doc .docx .txt .xls .xlsx .jpg .jpeg .png .gif</div>
+        <UploadFile @upload-result="uploadFile" :upload-btn="false" :show-file-list="false" :multiple="true"
+                    :oss-server-context="smartFlowServerContext" :oss-file-put-url="ossFilePutUrl"></UploadFile>
       </Tooltip>
     </div>
     <Input v-model="auditOpinion" type="textarea" :autosize="{ minRows: 3, maxRows: 5 }" show-word-limit
            :maxlength="200" placeholder="处理意见" style="width: 100%"
     ></Input>
      <div>
-        <span v-for="(item, index) in attachmentdata" :key="index" style="font-size: 14px">
-        <span v-if="index>0">、</span>
-        <span style="color:#2D8cF0 ">  {{ item.fileName }}</span>
-        <a @click="forRemoveAttachment(index)" style="font-size: 13px;">.删除</a>
-      </span>
+       <div v-for="(item, index) in attachmentdata" :key="index" style="font-size: 14px">
+         <span style="color:#2D8cF0 ">  {{ item.fileName }}</span>
+         <a @click="forRemoveAttachment(index)" style="font-size: 13px;"> &nbsp;.删除</a>
+       </div>
      </div>
     <Modal v-model="customCommentListModal" title="常用意见" width="800px" footer-hide>
       <LamboPagingTable :requestSuccessCodes="requestSuccessCodes" ref="customCommentTable" :dataUrl="dataUrl"
@@ -55,13 +49,14 @@
 import ajax from "@lambo-design/shared/utils/ajax";
 import { operateHref } from '@lambo-design/shared/utils/assist';
 import LamboPagingTable from "@lambo-design/paging-table";
+import UploadFile from "@lambo-design/upload-file";
 
-import axios from 'axios';
 // 引入docx-preview插件
 let docx = require('docx-preview');
 export default {
   components: {
-    LamboPagingTable
+    LamboPagingTable,
+    UploadFile
   },
   props: {
     attachmentFile:{
@@ -81,21 +76,14 @@ export default {
       type: String,
       default: '/api/smart-flow-server',
     },
-    ossServerContext: {
-      type: String,
-      default: '/api/oss-server',
-    },
   },
   data() {
     return {
       requestSuccessCodes: [200, "200"],
       tempFileArr: [],
       fileList: [],
+      ossFilePutUrl: '/manage/oss/file/put',
       auditOpinionText: '',
-      auditOpinionForSelect: [{
-        label: '',
-        value: ''
-      }],
       customCommentListModal: false,
       auditOpinion: '',
       customCommentDetailModal: false,
@@ -172,17 +160,25 @@ export default {
       column.push({
         title: "操作", width: 160, align: 'center', tooltip: true,
         render: (h, {row}) => {
-          return h("div", [
-            operateHref(this, h, row, "修改", () => {
-              this.openDetailModal('update', row);
-            }, "primary"),
-            operateHref(this, h, row, "删除", () => {
-              this.deleteCustomComment(row);
-            }, "error"),
-            operateHref(this, h, row, "选择", () => {
-              this.choose(row);
-            }, "primary")
-          ]);
+          if (row.commentType === '10'){
+            return h("div", [
+              operateHref(this, h, row, "修改", () => {
+                this.openDetailModal('update', row);
+              }, "primary"),
+              operateHref(this, h, row, "删除", () => {
+                this.deleteCustomComment(row);
+              }, "error"),
+              operateHref(this, h, row, "选择", () => {
+                this.choose(row);
+              }, "primary")
+            ]);
+          }else {
+            return h("div", [
+              operateHref(this, h, row, "选择", () => {
+                this.choose(row);
+              }, "primary")
+            ]);
+          }
 
         }
 
@@ -217,7 +213,7 @@ export default {
       self.$refs.customCommentForm.validate((valid) => {
         if (valid) {
           if (self.customCommentDetailForm.id) {
-            ajax.post(this.smartFlowServerContext + "/manage/smartflowCustomComment/update", self.customCommentDetailForm).then((resp) => {
+            ajax.post(self.smartFlowServerContext + "/manage/smartflowCustomComment/update", self.customCommentDetailForm).then((resp) => {
               if (resp.data.code === "200") {
                 self.customCommentDetailForm = {
                   id: '',
@@ -230,7 +226,7 @@ export default {
               console.log(err);
             })
           } else {
-            ajax.post(this.smartFlowServerContext + "/manage/smartflowCustomComment/insert", self.customCommentDetailForm).then((resp) => {
+            ajax.post(self.smartFlowServerContext + "/manage/smartflowCustomComment/insert", self.customCommentDetailForm).then((resp) => {
               if (resp.data.code === "200") {
                 self.customCommentDetailForm = {
                   id: '',
@@ -243,40 +239,21 @@ export default {
               console.log(err);
             })
           }
-          this.getAuditOpinionForSelect()
-          this.customCommentDetailModal = false
-        }
-      })
-    },
-    getAuditOpinionForSelect() {
-      const self = this
-      let auditOpinionForSelect = []
-      ajax.get(this.smartFlowServerContext + "/manage/smartflowCustomComment/list", {params: {limit: 100}}).then((resp) => {
-        if (resp.data.code == "200" && resp.data.data) {
-          resp.data.data.rows.forEach(item =>
-            auditOpinionForSelect.push({
-              value: item.commentContent,
-              label: item.commentContent,
-              type: item.commentType === '10' ? '自定义' : '系统预置'
-            })
-          )
-          self.auditOpinionForSelect = auditOpinionForSelect
+          self.customCommentDetailModal = false
         }
-      }).catch(err => {
-        console.log(err);
       })
     },
     deleteCustomComment(row) {
       const self = this
-      this.$Modal.confirm({
+      self.$Modal.confirm({
         title: '提示',
         content: `<p>确定要删除${row.commentContent}吗?</p>`,
         onOk: () => {
-          ajax.post(this.smartFlowServerContext + "/manage/smartflowCustomComment/delete/" + row.id).then(function (resp) {
+          ajax.post(self.smartFlowServerContext + "/manage/smartflowCustomComment/delete/" + row.id).then(function (resp) {
             if (resp.data.code === "200") {
               self.refreshTable()
             } else {
-              self.$Message.error(resp.data.data);
+              self.$Message.error(resp.data.message);
             }
           }).catch(function (err) {
             self.$Message.error('删除失败,请联系应用管理员');
@@ -287,90 +264,24 @@ export default {
     refreshTable() {
       this.$refs.customCommentTable.tableRefresh()
     },
-    updateValue() {
-      this.$emit('input', this.auditOpinion);
-    },
     choose(row) {
       this.auditOpinion = row.commentContent
       this.customCommentListModal = false
     },
-    //  上传附件
-    handleError: function (error, file, fileList) {
-      this.loading = false
-      this.$Message.error({
-        content: fileList.name + ' 上传失败！',
-      });
-    },
-    handleUpload: function (file) {
-      if (!file.canceled) {
-        this.tempFileArr.push(file.name)
-      }
-    },
-    handleSuccess: function (response, file, fileList) {
-      let self = this;
-      let tempArr = JSON.parse(JSON.stringify(this.tempFileArr))
-
-      tempArr.forEach(function (value, index, array) {
-        if (value == file.name) {
-          self.tempFileArr.splice(index, 1)
-        }
-      });
-
-      if (response.code == 1 && self.tempFileArr && self.tempFileArr.length < 1) {
-        self.loading = false;
-        self.$Message.success("上传成功");
-      }
-
-      if (response.code == 1) {
-        if (response.data != undefined && response.data != null && response.data.length > 0) {
-          let tempData = [].concat(response.data);
-          this.attachmentdata.push({
-            fileName: tempData[0].originalName,
-            fileId: tempData[0].fileName,
-          });
-        }
-
-        this.fileList = fileList
-
-      } else {
-        self.loading = false;
-        this.$Message.error({
-          content: file.name + '上传失败！',
+    uploadFile(file){
+      const self = this;
+      file.forEach(item => {
+        self.attachmentdata.push({
+          fileName: item.fileName,
+          fileId: item.fileCode,
         });
-        //this.$Message.error("上传失败！");
-
-        let j = 0;
-        for (let i = 0; i < fileList.length; i++) {
-          if (fileList[i].canceled) {
-            continue;
-          }
-          if (fileList[i].name === file.name && fileList[i].timestamp === file.timestamp) {
-            j = i;
-          }
-        }
-
-        //console.log(fileList)
-        fileList.splice(j, 1);
-
-      }
-
-    },
-    handleProgress(event, file, fileList) {
-      this.loading = true
-    },
-    handleFormatError(file) {
-      this.loading = false
-      this.$Notice.warning({
-        title: "文件格式不正确",
-        desc: "文件 " + file.name + " 格式不支持，请上传其他格式的文件。",
-      });
+      })
     },
     forRemoveAttachment: function (index) {
       this.attachmentdata.splice(index, 1);
     },
   },
   mounted() {
-    this.getAuditOpinionForSelect()
   },
   watch: {
     auditOpinionText(label) {
@@ -385,5 +296,7 @@ export default {
 </script>
 
 <style scoped>
-
+/deep/ .upload-btn-box{
+  padding-bottom: 0;
+}
 </style>