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

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/process-info.vue

@@ -84,7 +84,7 @@
         <Card class="process-history" :style="processHistoryHeight" dis-hover :bordered="false"
               v-if="handleButtons && handleButtons.includes('auditHistory')">
           <processHistory :portrait-width="processInfoWidth" :list="processHistory" :done-page="isDetail"
-                          :push-button="pushButton"
+                          :push-button="pushButton" :history-sort-by="historySortBy"
                           :smart-flow-server-context="smartFlowServerContext"></processHistory>
         </Card>
       </div>
@@ -261,6 +261,11 @@ export default {
       type: Array,
       default: () => ([])
     },
+    //审批历史默认排序规则
+    historySortBy: {
+      type: String,
+      default: 'time'
+    },
     smartFlowServerContext: {
       type: String,
       default: '/api/smart-flow-server',

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>