@lambo-design/workflow-approve 1.0.0-beta.139 → 1.0.0-beta.140

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lambo-design/workflow-approve",
-  "version": "1.0.0-beta.139",
+  "version": "1.0.0-beta.140",
   "description": "",
   "main": "index.js",
   "author": "lambo",
@@ -10,10 +10,10 @@
     "registry": "https://registry.npmjs.org/"
   },
   "devDependencies": {
-    "@lambo-design/core": "^4.7.1-beta.176",
-    "@lambo-design/shared": "^1.0.0-beta.354",
     "axios": "^0.24.0",
-    "axios-cache-plugin": "^0.1.0"
+    "axios-cache-plugin": "^0.1.0",
+    "@lambo-design/core": "^4.7.1-beta.178",
+    "@lambo-design/shared": "^1.0.0-beta.362"
   },
   "dependencies": {
     "bpmn-js": "^7.3.1",

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>

package/src/components/horizontal/opinion.vue

@@ -1,263 +1,263 @@
-<template>
-  <div>
-    <Select v-model="auditOpinionText" style="width:190px" clearable transfer>
-      <Option v-for="item in auditOpinionForSelect" :value="item.value" :key="item.value">
-        <span>{{ item.label }}</span>
-        <span style="float:right;color:#ccc">{{ item.type }}</span>
-      </Option>
-    </Select>
-    <Button style="margin-left: 10px" @click="customCommentListModal = true">自定义我的意见</Button>
-    <Input v-model="auditOpinion" type="textarea" :autosize="{ minRows: 3, maxRows: 5 }" show-word-limit
-           :maxlength="200" placeholder="处理意见" style="margin-top: 15px"
-    ></Input>
-
-    <Modal v-model="customCommentListModal" title="常用意见" width="800px" footer-hide>
-      <LamboPagingTable :requestSuccessCodes="requestSuccessCodes" ref="customCommentTable" :dataUrl="dataUrl"
-                        :columns="tableColumn">
-        <div slot="buttons">
-          <Button type="primary" ghost icon="md-add" @click="openDetailModal('create')">新增</Button>
-        </div>
-      </LamboPagingTable>
-    </Modal>
-    <Modal v-model="customCommentDetailModal" :title="customCommentDetailTitle" width="700px"
-           @on-cancel="customCommentDetailCancel"
-           @on-ok="customCommentDetailOk">
-      <Card v-model="customCommentDetailModal" width="600px" dis-hover>
-        <Form ref="customCommentForm" :model="customCommentDetailForm" :rules="customCommentRuleValidate"
-              :label-width="100" label-position="right">
-          <FormItem label="常用意见：" prop="commentContent">
-            <Input type="textarea" v-model="customCommentDetailForm.commentContent" show-word-limit :maxlength="1000"
-                   style="width: 500px"/>
-          </FormItem>
-          <FormItem label="排序码：">
-            <Input style="width: 100px" v-model="customCommentDetailForm.orders"/>
-          </FormItem>
-        </Form>
-      </Card>
-    </Modal>
-  </div>
-</template>
-
-<script>
-import ajax from "@lambo-design/shared/utils/ajax";
-import LamboPagingTable from "@lambo-design/paging-table/index";
-import { operateHref } from '@lambo-design/shared/utils/assist'
-
-// 引入docx-preview插件
-let docx = require('docx-preview');
-export default {
-  components: {
-    LamboPagingTable
-  },
-  props: {
-    smartFlowServerContext: {
-      type: String,
-      default: '/api/smart-flow-server',
-    },
-  },
-  data() {
-    return {
-      requestSuccessCodes: [200, "200"],
-      auditOpinionText: '',
-      auditOpinionForSelect: [{
-        label: '',
-        value: ''
-      }],
-      customCommentListModal: false,
-      auditOpinion: '',
-      customCommentDetailModal: false,
-      customCommentDetailTitle: '',
-      dataUrl: this.smartFlowServerContext + '/manage/smartflowCustomComment/list?commentType=10',
-      customCommentDetailForm: {
-        id: '',
-        commentContent: '',
-        orders: 10
-      },
-      customCommentRuleValidate: {
-        commentContent: [
-          {required: true, trigger: "blur", message: "意见不能为空"},
-          {max: 1000, message: "意见不能大于1000位", trigger: "blur"}
-        ]
-      },
-    }
-  },
-  computed: {
-    tableColumn() {
-      let column = [];
-      let self = this;
-      column.push({
-        title: '常用意见',
-        key: "commentContent",
-        minWidth: 150,
-        align: 'center',
-      });
-      column.push({
-        title: "排序码",
-        key: "orders",
-        width: 170,
-        align: "center",
-      });
-
-      column.push({
-        title: "修改时间",
-        key: "updateTime",
-        width: 170,
-        align: "center",
-        render: (v, param) => {
-          if (param.row.updateTime) {
-            let date = new Date(param.row.updateTime)
-            let y = date.getFullYear() // 年
-            let MM = date.getMonth() + 1 // 月
-            MM = MM < 10 ? ('0' + MM) : MM
-            let d = date.getDate() // 日
-            d = d < 10 ? ('0' + d) : d
-            let h = date.getHours() // 时
-            h = h < 10 ? ('0' + h) : h
-            let m = date.getMinutes()// 分
-            m = m < 10 ? ('0' + m) : m
-            let s = date.getSeconds()// 秒
-            s = s < 10 ? ('0' + s) : s
-            let state = y + '-' + MM + '-' + d + ' ' + h + ':' + m + ':' + s;
-            return v("span", state);
-          }
-          return v("span", '')
-        }
-      });
-
-      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")
-          ]);
-
-        }
-
-      });
-
-      return column;
-    },
-  },
-  methods: {
-    openDetailModal(type, row) {
-      this.customCommentDetailModal = true
-      if (type === 'create') {
-        this.customCommentDetailTitle = '新增常用意见'
-      } else {
-        this.customCommentDetailTitle = '修改常用意见'
-        this.customCommentDetailForm.id = row.id
-        this.customCommentDetailForm.commentContent = row.commentContent
-        this.customCommentDetailForm.orders = row.orders
-      }
-    },
-    customCommentDetailCancel() {
-      this.getAuditOpinionForSelect()
-      this.customCommentDetailForm = {
-        id: '',
-        commentContent: '',
-        orders: 10
-      }
-      this.customCommentDetailModal = false
-    },
-    customCommentDetailOk() {
-      const self = this
-      self.$refs.customCommentForm.validate((valid) => {
-        if (valid) {
-          if (self.customCommentDetailForm.id) {
-            ajax.post(this.smartFlowServerContext + "/manage/smartflowCustomComment/update", self.customCommentDetailForm).then((resp) => {
-              if (resp.data.code === "200") {
-                self.customCommentDetailForm = {
-                  id: '',
-                  commentContent: '',
-                  orders: 10
-                }
-                self.refreshTable()
-              }
-            }).catch(err => {
-              console.log(err);
-            })
-          } else {
-            ajax.post(this.smartFlowServerContext + "/manage/smartflowCustomComment/insert", self.customCommentDetailForm).then((resp) => {
-              if (resp.data.code === "200") {
-                self.customCommentDetailForm = {
-                  id: '',
-                  commentContent: '',
-                  orders: 10
-                }
-                self.refreshTable()
-              }
-            }).catch(err => {
-              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
-        }
-      }).catch(err => {
-        console.log(err);
-      })
-    },
-    deleteCustomComment(row) {
-      const self = this
-      this.$Modal.confirm({
-        title: '提示',
-        content: `<p>确定要删除${row.commentContent}吗?</p>`,
-        onOk: () => {
-          ajax.post(this.smartFlowServerContext + "/manage/smartflowCustomComment/delete/" + row.id).then(function (resp) {
-            if (resp.data.code === "200") {
-              self.refreshTable()
-            } else {
-              self.$Message.error(resp.data.data);
-            }
-          }).catch(function (err) {
-            self.$Message.error('删除失败,请联系应用管理员');
-          });
-        }
-      });
-    },
-    refreshTable() {
-      this.$refs.customCommentTable.tableRefresh()
-    },
-    updateValue() {
-      this.$emit('input', this.auditOpinion);
-    }
-  },
-  mounted() {
-    this.getAuditOpinionForSelect()
-  },
-  watch: {
-    auditOpinionText(label) {
-      this.auditOpinion = label;
-    },
-    auditOpinion(val) {
-      this.$emit('input', val)
-    }
-  }
-
-}
-</script>
-
-<style scoped>
-
-</style>
+<template>
+  <div>
+    <Select v-model="auditOpinionText" style="width:190px" clearable transfer>
+      <Option v-for="item in auditOpinionForSelect" :value="item.value" :key="item.value">
+        <span>{{ item.label }}</span>
+        <span style="float:right;color:#ccc">{{ item.type }}</span>
+      </Option>
+    </Select>
+    <Button style="margin-left: 10px" @click="customCommentListModal = true">自定义我的意见</Button>
+    <Input v-model="auditOpinion" type="textarea" :autosize="{ minRows: 3, maxRows: 5 }" show-word-limit
+           :maxlength="200" placeholder="处理意见" style="margin-top: 15px"
+    ></Input>
+
+    <Modal v-model="customCommentListModal" title="常用意见" width="800px" footer-hide>
+      <LamboPagingTable :requestSuccessCodes="requestSuccessCodes" ref="customCommentTable" :dataUrl="dataUrl"
+                        :columns="tableColumn">
+        <div slot="buttons">
+          <Button type="primary" ghost icon="md-add" @click="openDetailModal('create')">新增</Button>
+        </div>
+      </LamboPagingTable>
+    </Modal>
+    <Modal v-model="customCommentDetailModal" :title="customCommentDetailTitle" width="700px"
+           @on-cancel="customCommentDetailCancel"
+           @on-ok="customCommentDetailOk">
+      <Card v-model="customCommentDetailModal" width="600px" dis-hover>
+        <Form ref="customCommentForm" :model="customCommentDetailForm" :rules="customCommentRuleValidate"
+              :label-width="100" label-position="right">
+          <FormItem label="常用意见：" prop="commentContent">
+            <Input type="textarea" v-model="customCommentDetailForm.commentContent" show-word-limit :maxlength="1000"
+                   style="width: 500px"/>
+          </FormItem>
+          <FormItem label="排序码：">
+            <Input style="width: 100px" v-model="customCommentDetailForm.orders"/>
+          </FormItem>
+        </Form>
+      </Card>
+    </Modal>
+  </div>
+</template>
+
+<script>
+import ajax from "@lambo-design/shared/utils/ajax";
+import LamboPagingTable from "@lambo-design/paging-table/index";
+import { operateHref } from '@lambo-design/shared/utils/assist'
+
+// 引入docx-preview插件
+let docx = require('docx-preview');
+export default {
+  components: {
+    LamboPagingTable
+  },
+  props: {
+    smartFlowServerContext: {
+      type: String,
+      default: '/api/smart-flow-server',
+    },
+  },
+  data() {
+    return {
+      requestSuccessCodes: [200, "200"],
+      auditOpinionText: '',
+      auditOpinionForSelect: [{
+        label: '',
+        value: ''
+      }],
+      customCommentListModal: false,
+      auditOpinion: '',
+      customCommentDetailModal: false,
+      customCommentDetailTitle: '',
+      dataUrl: this.smartFlowServerContext + '/manage/smartflowCustomComment/list?commentType=10',
+      customCommentDetailForm: {
+        id: '',
+        commentContent: '',
+        orders: 10
+      },
+      customCommentRuleValidate: {
+        commentContent: [
+          {required: true, trigger: "blur", message: "意见不能为空"},
+          {max: 1000, message: "意见不能大于1000位", trigger: "blur"}
+        ]
+      },
+    }
+  },
+  computed: {
+    tableColumn() {
+      let column = [];
+      let self = this;
+      column.push({
+        title: '常用意见',
+        key: "commentContent",
+        minWidth: 150,
+        align: 'center',
+      });
+      column.push({
+        title: "排序码",
+        key: "orders",
+        width: 170,
+        align: "center",
+      });
+
+      column.push({
+        title: "修改时间",
+        key: "updateTime",
+        width: 170,
+        align: "center",
+        render: (v, param) => {
+          if (param.row.updateTime) {
+            let date = new Date(param.row.updateTime)
+            let y = date.getFullYear() // 年
+            let MM = date.getMonth() + 1 // 月
+            MM = MM < 10 ? ('0' + MM) : MM
+            let d = date.getDate() // 日
+            d = d < 10 ? ('0' + d) : d
+            let h = date.getHours() // 时
+            h = h < 10 ? ('0' + h) : h
+            let m = date.getMinutes()// 分
+            m = m < 10 ? ('0' + m) : m
+            let s = date.getSeconds()// 秒
+            s = s < 10 ? ('0' + s) : s
+            let state = y + '-' + MM + '-' + d + ' ' + h + ':' + m + ':' + s;
+            return v("span", state);
+          }
+          return v("span", '')
+        }
+      });
+
+      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")
+          ]);
+
+        }
+
+      });
+
+      return column;
+    },
+  },
+  methods: {
+    openDetailModal(type, row) {
+      this.customCommentDetailModal = true
+      if (type === 'create') {
+        this.customCommentDetailTitle = '新增常用意见'
+      } else {
+        this.customCommentDetailTitle = '修改常用意见'
+        this.customCommentDetailForm.id = row.id
+        this.customCommentDetailForm.commentContent = row.commentContent
+        this.customCommentDetailForm.orders = row.orders
+      }
+    },
+    customCommentDetailCancel() {
+      this.getAuditOpinionForSelect()
+      this.customCommentDetailForm = {
+        id: '',
+        commentContent: '',
+        orders: 10
+      }
+      this.customCommentDetailModal = false
+    },
+    customCommentDetailOk() {
+      const self = this
+      self.$refs.customCommentForm.validate((valid) => {
+        if (valid) {
+          if (self.customCommentDetailForm.id) {
+            ajax.post(this.smartFlowServerContext + "/manage/smartflowCustomComment/update", self.customCommentDetailForm).then((resp) => {
+              if (resp.data.code === "200") {
+                self.customCommentDetailForm = {
+                  id: '',
+                  commentContent: '',
+                  orders: 10
+                }
+                self.refreshTable()
+              }
+            }).catch(err => {
+              console.log(err);
+            })
+          } else {
+            ajax.post(this.smartFlowServerContext + "/manage/smartflowCustomComment/insert", self.customCommentDetailForm).then((resp) => {
+              if (resp.data.code === "200") {
+                self.customCommentDetailForm = {
+                  id: '',
+                  commentContent: '',
+                  orders: 10
+                }
+                self.refreshTable()
+              }
+            }).catch(err => {
+              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
+        }
+      }).catch(err => {
+        console.log(err);
+      })
+    },
+    deleteCustomComment(row) {
+      const self = this
+      this.$Modal.confirm({
+        title: '提示',
+        content: `<p>确定要删除${row.commentContent}吗?</p>`,
+        onOk: () => {
+          ajax.post(this.smartFlowServerContext + "/manage/smartflowCustomComment/delete/" + row.id).then(function (resp) {
+            if (resp.data.code === "200") {
+              self.refreshTable()
+            } else {
+              self.$Message.error(resp.data.data);
+            }
+          }).catch(function (err) {
+            self.$Message.error('删除失败,请联系应用管理员');
+          });
+        }
+      });
+    },
+    refreshTable() {
+      this.$refs.customCommentTable.tableRefresh()
+    },
+    updateValue() {
+      this.$emit('input', this.auditOpinion);
+    }
+  },
+  mounted() {
+    this.getAuditOpinionForSelect()
+  },
+  watch: {
+    auditOpinionText(label) {
+      this.auditOpinion = label;
+    },
+    auditOpinion(val) {
+      this.$emit('input', val)
+    }
+  }
+
+}
+</script>
+
+<style scoped>
+
+</style>

package/src/components/title.vue

@@ -1,24 +1,24 @@
-<template>
-  <div class="model-header">
-    <slot></slot>
-  </div>
-</template>
-
-<script>
-    export default {
-        name: "model-title"
-    }
-</script>
-
-<style scoped lang="less">
-  .model-header{
-    background: #F2F2F2;
-    line-height: 24px;
-    padding: 10px 15px;
-    font-size: 14px;
-    font-weight: bolder;
-    overflow: hidden;
-    margin: 5px 0;
-    color: #989898;
-  }
-</style>
+<template>
+  <div class="model-header">
+    <slot></slot>
+  </div>
+</template>
+
+<script>
+    export default {
+        name: "model-title"
+    }
+</script>
+
+<style scoped lang="less">
+  .model-header{
+    background: #F2F2F2;
+    line-height: 24px;
+    padding: 10px 15px;
+    font-size: 14px;
+    font-weight: bolder;
+    overflow: hidden;
+    margin: 5px 0;
+    color: #989898;
+  }
+</style>

package/src/portrait.vue

@@ -151,6 +151,13 @@
         <span>{{ rejectUsers.name }}</span>
         <Button size="small" class="reject-user-button" @click="handleSelectRejectUser">选择</Button>
       </Card>
+      <Card class="reject-attribute-card" dis-hover v-if="showRejectOption && auditResult == '90'">
+        <p slot="title">驳回给：</p>
+        <RadioGroup v-model="rejectToTakeOver">
+          <Radio label="original">原办理人</Radio>
+          <Radio label="actual">实际办理人</Radio>
+        </RadioGroup>
+      </Card>
       <Card class="reject-attribute-card" dis-hover v-if="showProcessControl && auditResult == '90'">
         <p slot="title">驳回的节点通过后：</p>
         <RadioGroup v-model="rejectAttribute">
@@ -277,15 +284,21 @@
       </template>
     </Modal>
     <!--  驳回设置弹框  -->
-    <Modal v-model="rejectAttributesBoxShow" :title="showRejectToSelected ? '驳回设置' : '驳回的节点通过后'"
+    <Modal v-model="rejectAttributesBoxShow" :title="showRejectToSelected || showRejectOption ? '驳回设置' : '驳回的节点通过后'"
            @on-cancel="rejectAttributesCancel"
            @on-ok="rejectProcessWithRejectAttributes">
       <Form :label-width="150">
-        <FormItem v-if="showProcessControl" :label="showRejectToSelected ? '驳回的节点通过后：' : ''" :label-width="showRejectToSelected ? 150 : 0">
+        <FormItem v-if="showProcessControl" :label="showRejectToSelected || showRejectOption ? '驳回的节点通过后：' : ''" :label-width="showRejectToSelected || showRejectOption ? 150 : 0">
           <RadioGroup v-model="rejectAttribute">
             <Radio v-for="(item, index) in rejectAttributeList" :key="index" :label="item.type">{{item.name}}</Radio>
           </RadioGroup>
         </FormItem>
+        <FormItem v-if="showRejectOption" label="驳回给：" :label-width="150">
+          <RadioGroup v-model="rejectToTakeOver">
+            <Radio label="original">原办理人</Radio>
+            <Radio label="actual">实际办理人</Radio>
+          </RadioGroup>
+        </FormItem>
         <FormItem v-if="showRejectToSelected">
           <template slot="label">
             <span>
@@ -474,6 +487,11 @@ export default {
       type: Array,
       default: () => ([])
     },
+    //默认是否驳回给转办人
+    defaultRejectToTakeOver: {
+      type: Boolean,
+      default: false
+    },
   },
   components: {
     Title,
@@ -527,6 +545,8 @@ export default {
       rejectAttributes: {},
       showProcessControl: false,
       showRejectToSelected: false,
+      showRejectOption: false,
+      rejectToTakeOver: this.defaultRejectToTakeOver ? 'actual' : 'original',
       rejectUsers: {
         name: '全部办理人',
         id: 'all'
@@ -555,7 +575,7 @@ export default {
         auditOpinion: '',
       },
       loading: false,
-      disable: false,
+      disable: true,
       rejectedTask: false,
       revokeDelegateTask: false,
       appointTask: false,
@@ -1604,7 +1624,14 @@ export default {
       ajax.get(self.smartFlowServerContext + '/manage/processTodo/getProcessHis', {params: params}).then(function (resp) {
         if (resp.data.code === '200') {
           self.processHistory = resp.data.data
+          self.disable = false
+        } else {
+          self.disable = !!!taskId
         }
+      }).catch(err => {
+        self.disable = !!!taskId
+        console.log('获取流程审批历史失败，任务taskId为：', taskId)
+        console.log(err)
       })
     },
 
@@ -1859,10 +1886,12 @@ export default {
               self.executionCompleted(true, null, null, auditResult, self.curTaskId)
             }, 1000)
           } else {
-            // 前序节点只有一个会签节点才可选择驳回人员
+            // 驳回会签指定人员：前序节点只有一个会签节点才可选择驳回人员
             self.showRejectToSelected = Array.isArray(result.data) && result.data.length === 1 && result.data[0].handleButtons?.includes('rejectToSelected')
             self.targetTaskNode = Array.isArray(result.data) && result.data.length === 1 ? result.data[0].taskNode : ''
-            if (self.showRejectToSelected && !self.handleButtons?.includes('rejectProcessControl')) {
+            // 前序节点进行过交接时，支持选择驳回原办理人/实际办理人
+            self.showRejectOption = Array.isArray(result.data) && result.data.some(item => item.taskTakedOver && (item.taskTakedOver === true || item.taskTakedOver === 'true'))
+            if ((self.showRejectToSelected || self.showRejectOption) && !self.handleButtons?.includes('rejectProcessControl')) {
               self.rejectAttributesBoxShow = true
             } else {
               self.handleButtons && self.handleButtons.includes('rejectProcessControl') ? self.getProcessAttributes() : self.doPass()
@@ -1921,6 +1950,7 @@ export default {
         if (self.rejectUsers.id != 'all'){
           self.auditParams.rejectUsers = self.rejectUsers.id
         }
+        self.auditParams.rejectToTakeOver = self.rejectToTakeOver && self.rejectToTakeOver != 'original'
         let url = self.smartFlowServerContext + '/manage/processTodo/audit'
         ajax.post(url, self.auditParams).then(function (resp) {
           let result = resp.data
@@ -2154,6 +2184,8 @@ export default {
       this.targetTaskNodeProcessControl = 'inSequence'
       this.showProcessControl = false
       this.showRejectToSelected = false
+      this.showRejectOption = false
+      this.rejectToTakeOver = this.defaultRejectToTakeOver ? 'actual' : 'original'
       this.selectedRejectUserList = []
       this.rejectUsers = { name: '全部办理人', id: 'all' }
     },
@@ -2187,6 +2219,8 @@ export default {
       this.disable = false
       this.showProcessControl = false
       this.showRejectToSelected = false
+      this.showRejectOption = false
+      this.rejectToTakeOver = this.defaultRejectToTakeOver ? 'actual' : 'original'
       this.selectedRejectUserList = []
       this.rejectUsers = { name: '全部办理人', id: 'all' }
     },
@@ -2202,6 +2236,8 @@ export default {
       self.rejectUsers = { name: '全部办理人', id: 'all' }
       self.targetTaskNodeProcessControl = currentRow.processControl
       self.showRejectToSelected = currentRow.rejectToSelected
+      self.rejectToTakeOver = this.defaultRejectToTakeOver ? 'actual' : 'original'
+      self.showRejectOption = currentRow.taskTakedOver && (currentRow.taskTakedOver === true || currentRow.taskTakedOver === 'true')
     },
     handleSelectRejectUser() {
       let self = this
@@ -2517,7 +2553,7 @@ export default {
       ajax.get(self.smartFlowServerContext + '/manage/processTodo/getProcessAttributes', {params: params}).then(function (resp) {
         if (resp.data.code === '200') {
           if ((self.auditParams.auditResult == '70' && !resp.data.data.jumpFirstNode) || (self.auditParams.auditResult == '40' && (resp.data.data.multiNode || resp.data.data.preNodeGateway))) {
-            if (self.showRejectToSelected && self.targetTaskNode) {
+            if ((self.showRejectToSelected && self.targetTaskNode) || self.showRejectOption) {
               self.rejectAttributesBoxShow = true
               return
             }