@lambo-design/workflow-approve 1.0.0-beta.96 → 1.0.0-beta.97

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lambo-design/workflow-approve",
-  "version": "1.0.0-beta.96",
+  "version": "1.0.0-beta.97",
   "description": "",
   "main": "index.js",
   "author": "lambo",
@@ -12,8 +12,8 @@
   "devDependencies": {
     "axios": "^0.24.0",
     "axios-cache-plugin": "^0.1.0",
-    "@lambo-design/core": "^4.7.1-beta.169",
-    "@lambo-design/shared": "^1.0.0-beta.298"
+    "@lambo-design/core": "^4.7.1-beta.170",
+    "@lambo-design/shared": "^1.0.0-beta.299"
   },
   "dependencies": {
     "bpmn-js": "^7.3.1",

package/src/components/assignee-box.vue

@@ -11,7 +11,7 @@
           </div>
         </div>
         <div class="org-detil">
-          <LamboPagingTable ref="selection" highlight-row :data="tableData" :dataUrl="dataUrl" :columns="tableColumn" :searchParams="tableSearchParams"
+          <LamboPagingTable :key="useTransferRangeUsers" ref="selection" highlight-row :data="tableData" :dataUrl="dataUrl" :columns="tableColumn" :searchParams="tableSearchParams" :height="tableHeight"
                             @on-selection-change="onSelectionChange" @on-current-change="onCurrentChange" :page-disable="useTransferRangeUsers" :showTableOption="!useTransferRangeUsers">
             <div slot="search" v-if="!useTransferRangeUsers">
               <Form :label-width="60">
@@ -135,7 +135,9 @@ export default {
     this.getSystemConfig()
   },
   computed: {
-
+    tableHeight(){
+      return this.useTransferRangeUsers ? 600 : 0
+    },
     tableColumn () {
       let columns = []
       let self = this
@@ -162,7 +164,7 @@ export default {
         sortable: 'custom'
       })
 
-      if (self.useTransferRangeUsers){
+      if (self.useTransferRangeUsers && self.ucAdapterType == 'x1'){
         columns.push({
           title: '联系电话',
           key: 'tel',
@@ -176,30 +178,33 @@ export default {
         sortField: 'organ_name',
         sortable: 'custom'
       })
-      if (self.useTransferRangeUsers){
+      if (self.useTransferRangeUsers && self.ucAdapterType == 'x1'){
         columns.push({
           title: '公司名称',
           key: 'comName',
           sortField: 'com_name',
           sortable: 'custom'
         })
-      } else {
-        columns.push({
-          title: '状态',
-          key: 'status',
-          sortable: 'custom',
-          align: 'center',
-          width: 100,
-          render: function (h, param) {
-            let state = param.row.status
-            if (state === '00') {
-              state = '正常'
-            } else {
-              state = '锁定'
+      }
+      if (!self.useTransferRangeUsers){
+        {
+          columns.push({
+            title: '状态',
+            key: 'status',
+            sortable: 'custom',
+            align: 'center',
+            width: 100,
+            render: function (h, param) {
+              let state = param.row.status
+              if (state === '00') {
+                state = '正常'
+              } else {
+                state = '锁定'
+              }
+              return h('span', state)
             }
-            return h('span', state)
-          }
-        })
+          })
+        }
       }
 
       return columns
@@ -309,23 +314,33 @@ export default {
               code: self.data.auditResult,
               name: self.data.auditResultName,
             }
-            self.data.selectedUserId=idSelectedArr[0];
-            let url = this.smartFlowServerContext + '/manage/processTodo/audit'
-            ajax.post(url, self.data).then(function (resp) {
-              let result = resp.data
-              if (result.code == '200') {
-                self.loading = false
-                self.$Message.success(result.message);
-                if (self.executionCompleted) {
-                  self.executionCompleted(true, self.data.instanceId, self.data.taskId, auditResult, self.data.taskId);
-                }
-                self.toBeDoneListDoSearch();
-              } else {
+            self.$Modal.confirm({
+              title: '提示',
+              content: '确定要' + auditResult.name + '吗？',
+              onOk: () => {
+                self.data.selectedUserId=idSelectedArr[0];
+                let url = this.smartFlowServerContext + '/manage/processTodo/audit'
+                ajax.post(url, self.data).then(function (resp) {
+                  let result = resp.data
+                  if (result.code == '200') {
+                    self.loading = false
+                    self.$Message.success(result.message);
+                    if (self.executionCompleted) {
+                      self.executionCompleted(true, self.data.instanceId, self.data.taskId, auditResult, self.data.taskId);
+                    }
+                    self.toBeDoneListDoSearch();
+                  } else {
+                    self.loading = false
+                    self.$Message.error(result.message)
+                    if (self.executionCompleted) {
+                      self.executionCompleted(false, null, null, auditResult, self.data.taskId);
+                    }
+                  }
+                })
+              },
+              onCancel: () => {
                 self.loading = false
-                self.$Message.error(result.message)
-                if (self.executionCompleted) {
-                  self.executionCompleted(false, null, null, auditResult, self.data.taskId);
-                }
+                self.disable = false
               }
             })
           } else if (self.helpBoxType === 'delegateTask'){

package/src/components/history.vue

@@ -381,7 +381,7 @@ export default {
       allGroupKeys: [],
       displayedList: [],
       arrowShow: true, // 控制加载更多按钮的显示
-      activeName: 'panel0',
+      activeName: '',
       modalDocx: false,
       setModals: {
         modals: []
@@ -513,6 +513,7 @@ export default {
 
         return groupedRecords;
       } else {
+        this.activeName = ''
         // 按节点分组：保持原有的节点分组结构
         return this.itemList;
       }

package/src/components/horizontal/attachment.vue

@@ -1,224 +1,224 @@
-<template>
-  <div>
-    <Row>
-      <Row>
-        <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>
-          <div slot="buttons">
-            <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']">
-              <Button :loading="loading" icon="ios-arrow-round-up" type="primary"
-                      style="color: #808080;border-color:#e0e0e0;" ghost>添加附件
-              </Button>
-            </Upload>
-          </div>
-        </div>
-      </Row>
-      <Row style="margin-top: 10px">
-        <span style="color: red;font-size: 14px">* 支持扩展名： .rar .zip .doc .docx .pdf .jpg...</span>
-      </Row>
-    </Row>
-  </div>
-</template>
-
-<script>
-
-
-export default {
-  name: "attachment",
-  components: {},
-  props: {
-    actionUrl: {
-      default: "/api/oss-server/file/put",
-    },
-    attachmentdata: {
-      type: Array,
-      default: function () {
-        return []
-      }
-    },
-    attachmentColumn: {
-      default: function () {
-        let column = [
-          {title: "序号", type: 'index', width: 80, align: "center"},
-          {
-            title: "相关附件", key: "fileName", minWidth: 200, align: 'left', tooltip: true,
-            render: (h, {row}) => {
-              return h("a", {
-                on: {
-                  'click': () => {
-                    let reg = /\.(gif|jpg|jpeg|bmp|png)$/
-                    let regs = /\.pdf$/
-                    if (reg.test(row.fileName)) {
-                      let imgs = [];
-                      let url = this.ossServerContext + "/file/get/" + row.fileId;
-                      this.imgPreview(url);
-                    } else if (regs.test(row.fileName)) {
-                      window.open(this.ossServerContext + "/file/getFileStream?fileId=" + row.fileId, "_blank");
-                    } else {
-                      window.open(this.ossServerContext + "/file/get/" + row.fileId, "_blank");
-                    }
-                  }
-                }
-              }, row.fileName);
-            }
-          },
-          {
-            title: "操作", width: 80, align: "center",
-            render: (h, {index}) => {
-              return h('div', [
-                h('Button', {
-                  props: {
-                    type: 'warning',
-                    size: 'small',
-                    ghost: true
-                  },
-                  on: {
-                    click: () => {
-                      this.forRemoveAttachment(index)
-                    }
-                  }
-                }, '删除')
-              ]);
-            }
-          }
-        ];
-        return column
-      }
-    },
-  },
-  data() {
-    return {
-      loading: false,
-      modalImg: false,
-      image: "",
-      tempFileArr: [],
-      percentage: null,
-      file_name: '',
-      fileList: [],
-    }
-  },
-  methods: {
-    openAttachment(item) {
-      let reg = /\.(gif|jpg|jpeg|bmp|png)$/;
-      let regs = /\.pdf$/;
-
-      if (reg.test(item.fileName)) {
-        let imgs = [];
-        let url = this.ossServerContext + "/file/get/" + item.fileId;
-        this.imgPreview(url);
-      } else if (regs.test(item.fileName)) {
-        window.open(this.ossServerContext + "/file/getFileStream?fileId=" + item.fileId, "_blank");
-      } else {
-        window.open(this.ossServerContext + "/file/get/" + item.fileId, "_blank");
-      }
-    },
-    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 + '上传失败！',
-        });
-        //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);
-
-      }
-
-    },
-    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)
-      }
-    },
-    forRemoveAttachment: function (index) {
-      this.attachmentdata.splice(index, 1);
-      this.$refs.attachmentTable.tableRefresh()
-    },
-    //查看附件
-    imgPreview: function (img) {
-      this.modalImg = true
-      this.image = img;
-    },
-    //查看附件
-    cancelUpload: function (item, fileList) {
-      item.showProgress = false;
-      item.canceled = true;
-    },
-    handleProgress(event, file, fileList) {
-      this.loading = true
-
-
-    },
-    handleFormatError(file) {
-      this.loading = false
-      this.$Notice.warning({
-        title: "文件格式不正确",
-        desc: "文件 " + file.name + " 格式不支持，请上传其他格式的文件。",
-      });
-    },
-
-  }
-}
-</script>
-
-<style scoped>
-.demo-spin-icon-load {
-  animation: ani-demo-spin 1s linear infinite;
-}
-
-/deep/ .ivu-icon {
-  zoom: 130%;
-  color: #808080;
-  margin-right: -1px;
-}
-</style>
+<template>
+  <div>
+    <Row>
+      <Row>
+        <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>
+          <div slot="buttons">
+            <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']">
+              <Button :loading="loading" icon="ios-arrow-round-up" type="primary"
+                      style="color: #808080;border-color:#e0e0e0;" ghost>添加附件
+              </Button>
+            </Upload>
+          </div>
+        </div>
+      </Row>
+      <Row style="margin-top: 10px">
+        <span style="color: red;font-size: 14px">* 支持扩展名： .rar .zip .doc .docx .pdf .jpg...</span>
+      </Row>
+    </Row>
+  </div>
+</template>
+
+<script>
+
+
+export default {
+  name: "attachment",
+  components: {},
+  props: {
+    actionUrl: {
+      default: "/api/oss-server/file/put",
+    },
+    attachmentdata: {
+      type: Array,
+      default: function () {
+        return []
+      }
+    },
+    attachmentColumn: {
+      default: function () {
+        let column = [
+          {title: "序号", type: 'index', width: 80, align: "center"},
+          {
+            title: "相关附件", key: "fileName", minWidth: 200, align: 'left', tooltip: true,
+            render: (h, {row}) => {
+              return h("a", {
+                on: {
+                  'click': () => {
+                    let reg = /\.(gif|jpg|jpeg|bmp|png)$/
+                    let regs = /\.pdf$/
+                    if (reg.test(row.fileName)) {
+                      let imgs = [];
+                      let url = this.ossServerContext + "/file/get/" + row.fileId;
+                      this.imgPreview(url);
+                    } else if (regs.test(row.fileName)) {
+                      window.open(this.ossServerContext + "/file/getFileStream?fileId=" + row.fileId, "_blank");
+                    } else {
+                      window.open(this.ossServerContext + "/file/get/" + row.fileId, "_blank");
+                    }
+                  }
+                }
+              }, row.fileName);
+            }
+          },
+          {
+            title: "操作", width: 80, align: "center",
+            render: (h, {index}) => {
+              return h('div', [
+                h('Button', {
+                  props: {
+                    type: 'warning',
+                    size: 'small',
+                    ghost: true
+                  },
+                  on: {
+                    click: () => {
+                      this.forRemoveAttachment(index)
+                    }
+                  }
+                }, '删除')
+              ]);
+            }
+          }
+        ];
+        return column
+      }
+    },
+  },
+  data() {
+    return {
+      loading: false,
+      modalImg: false,
+      image: "",
+      tempFileArr: [],
+      percentage: null,
+      file_name: '',
+      fileList: [],
+    }
+  },
+  methods: {
+    openAttachment(item) {
+      let reg = /\.(gif|jpg|jpeg|bmp|png)$/;
+      let regs = /\.pdf$/;
+
+      if (reg.test(item.fileName)) {
+        let imgs = [];
+        let url = this.ossServerContext + "/file/get/" + item.fileId;
+        this.imgPreview(url);
+      } else if (regs.test(item.fileName)) {
+        window.open(this.ossServerContext + "/file/getFileStream?fileId=" + item.fileId, "_blank");
+      } else {
+        window.open(this.ossServerContext + "/file/get/" + item.fileId, "_blank");
+      }
+    },
+    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 + '上传失败！',
+        });
+        //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);
+
+      }
+
+    },
+    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)
+      }
+    },
+    forRemoveAttachment: function (index) {
+      this.attachmentdata.splice(index, 1);
+      this.$refs.attachmentTable.tableRefresh()
+    },
+    //查看附件
+    imgPreview: function (img) {
+      this.modalImg = true
+      this.image = img;
+    },
+    //查看附件
+    cancelUpload: function (item, fileList) {
+      item.showProgress = false;
+      item.canceled = true;
+    },
+    handleProgress(event, file, fileList) {
+      this.loading = true
+
+
+    },
+    handleFormatError(file) {
+      this.loading = false
+      this.$Notice.warning({
+        title: "文件格式不正确",
+        desc: "文件 " + file.name + " 格式不支持，请上传其他格式的文件。",
+      });
+    },
+
+  }
+}
+</script>
+
+<style scoped>
+.demo-spin-icon-load {
+  animation: ani-demo-spin 1s linear infinite;
+}
+
+/deep/ .ivu-icon {
+  zoom: 130%;
+  color: #808080;
+  margin-right: -1px;
+}
+</style>