mooho-base-admin-plus 2.10.67 → 2.10.69

package/history.md

@@ -238,3 +238,5 @@ mooho-base-admin-plus@2.10.64 - 修复默认日期的bug
 mooho-base-admin-plus@2.10.65 - 增加任务批量转移功能
 mooho-base-admin-plus@2.10.66 - 修复Excel表格修改视图后报错的Bug
 mooho-base-admin-plus@2.10.67 - 修复Excel表格文本框编辑的bug
+mooho-base-admin-plus@2.10.68 - 增加指定节点退回功能
+mooho-base-admin-plus@2.10.69 - Excel表格弹出选择框每次弹出时重置筛选条件

package/package/mooho-base-admin-plus.min.esm.js

@@ -19866,13 +19866,14 @@ const home = /* @__PURE__ */ _export_sfc(_sfc_main$1t, [["render", _sfc_render$1
       }
     });
   },
-  reject(a, r) {
+  reject(a, r, o) {
     return service({
       url: `api/${res$i}/reject`,
       method: "post",
       data: {
         id: a,
-        comment: r
+        rejectToID: r,
+        comment: o
       }
     });
   },
@@ -19940,6 +19941,15 @@ const home = /* @__PURE__ */ _export_sfc(_sfc_main$1t, [["render", _sfc_render$1
       method: "post",
       data: a
     });
+  },
+  queryRejectTo(a) {
+    return service({
+      url: `api/${res$i}/queryRejectTo`,
+      method: "get",
+      params: {
+        id: a
+      }
+    });
   }
 }, _sfc_main$1s = {
   name: "common-myTask",
@@ -23542,6 +23552,29 @@ function _sfc_render$13(a, r, o, s, l, c) {
             ]),
             _: 2
           }, 1032, ["modelValue", "onUpdate:modelValue"])) : createCommentVNode("", !0)
+        ], 64)) : createCommentVNode("", !0),
+        _ == "rejectActivityPids" ? (openBlock(), createElementBlock(Fragment, { key: 1 }, [
+          c.activities ? (openBlock(), createBlock(g, {
+            key: 0,
+            "model-value": a.parseArrayData(y, _),
+            "onUpdate:modelValue": (S) => a.setArrayData(y, _, S),
+            clearable: !0,
+            transfer: !0,
+            multiple: !0
+          }, {
+            default: withCtx(() => [
+              (openBlock(!0), createElementBlock(Fragment, null, renderList(c.activities.filter((S) => S.pid != y.pid && (S.activityType == "Interactive" || S.activityType == "Judgement" || S.activityType == "Service" || S.activityType == "ParallelStart")), (S) => (openBlock(), createBlock(p, {
+                key: S.pid,
+                value: S.pid
+              }, {
+                default: withCtx(() => [
+                  createTextVNode(toDisplayString$2(S.name), 1)
+                ]),
+                _: 2
+              }, 1032, ["value"]))), 128))
+            ]),
+            _: 2
+          }, 1032, ["model-value", "onUpdate:modelValue"])) : createCommentVNode("", !0)
         ], 64)) : createCommentVNode("", !0)
       ]),
       _: 1
@@ -40292,6 +40325,14 @@ const modalForm = /* @__PURE__ */ _export_sfc(_sfc_main$t, [["render", _sfc_rend
     // 选中项变化事件
     onSelectChange() {
       this.$emit("on-select-change");
+    },
+    /**
+     * 重置筛选
+     *
+     * @public
+     */
+    resetFilter() {
+      this.$refs.table.resetFilter();
     }
   }
 }, _hoisted_1$k = { class: "title" }, _hoisted_2$f = { class: "description" }, _hoisted_3$d = { class: "ivu-ml-8 ivu-mr-8" };
@@ -41709,7 +41750,7 @@ const tableSetting = /* @__PURE__ */ _export_sfc(_sfc_main$q, [["render", _sfc_r
             let r, o = {}, s = this.$refs["table_" + a.code][0].tableView, l = s.filtering;
             (l || "").trim() && (o = JSON.parse(l)), o[a.sourceDataCode] = this.data.id, a.isSourceCustom ? r = await customModelApi.query(a.sourceModel, o, null, s.isReturnSimple ? s : null) : r = await modelApi.query(a.sourceModel, o, null, s.isReturnSimple ? s : null, s.functionName, s.functionType), this.$refs["table_" + a.code][0].loadData(r.data);
           }
-        }) : a.controlType == "Attachment" && this.$refs["attachment_" + a.code] && this.$refs["attachment_" + a.code][0].setData(this.parseData(this.data, a.code));
+        }) : a.controlType == "Attachment" && this.$refs["attachment_" + a.code] && this.$refs["attachment_" + a.code].length > 0 && this.$refs["attachment_" + a.code][0].setData(this.parseData(this.data, a.code));
       });
     }
     // staticData() {
@@ -103842,7 +103883,7 @@ const _sfc_main$o = {
       if (this.coords = r, a.detail === 2 && r.row >= 0 && !this.readonly && !this.$refs.table.hotInstance.getCellMeta(r.row, r.col).readOnly) {
         let s = this.hotSetting.columns[r.col];
         s.controlType === "DialogSelect" && !s.readonly && this.$refs.dialogTable.init(s.source, () => {
-          this.$refs.dialogTable.open(this.getParam(this.staticData[r.row], s, this.parentData));
+          this.$refs.dialogTable.open(this.getParam(this.staticData[r.row], s, this.parentData)), this.$refs.dialogTable.resetFilter();
         });
       }
     });
@@ -106268,7 +106309,8 @@ const viewTable = /* @__PURE__ */ _export_sfc(_sfc_main$n, [["render", _sfc_rend
       description: null,
       customComponent: null,
       form: null,
-      isFullscreen: !1
+      isFullscreen: !1,
+      rejectActivities: []
     };
   },
   async created() {
@@ -106339,16 +106381,20 @@ const viewTable = /* @__PURE__ */ _export_sfc(_sfc_main$n, [["render", _sfc_rend
         (o) => (this.comment = o, !0)
       ) : this.error("Front_Msg_Form_Validate_Fail");
     },
-    // 拒绝
+    // 打开拒绝表单
     async reject() {
-      this.isCustom && typeof this.$refs.customComponent.rejectValidation == "function" && !await this.$refs.customComponent.rejectValidation() || this.confirmInput(
-        "Front_Msg_Sure_To_Reject_Application",
-        this.$t("Front_Label_Comment"),
-        async () => {
-          this.isCustom && typeof this.$refs.customComponent.beforeReject == "function" && await this.$refs.customComponent.beforeReject(this.comment), await taskApi.reject(this.task.id, this.comment), this.success("Front_Msg_Success"), this.resetNotice(), this.$emit("on-after-action"), this.opened = !1;
-        },
-        (a) => (a || "").trim() ? (this.comment = a, !0) : (this.warning("Front_Msg_Please_Input_Reject_Reason"), !1)
-      );
+      if (this.isCustom && typeof this.$refs.customComponent.rejectValidation == "function" && !await this.$refs.customComponent.rejectValidation())
+        return;
+      console.log("xxx", this.task.activityInst.activityID);
+      let a = this.$refs.rejectForm.columns.find((r) => r.code == "rejectTo");
+      a && (this.task.activityInst.activity.isRejectSelect == !0 ? (this.rejectActivities = await taskApi.queryRejectTo(this.task.id), a.isShow = !0) : a.isShow = !1), this.$refs.rejectForm.open();
+    },
+    // 拒绝提交
+    async rejectSubmit() {
+      await this.$refs.rejectForm.validate() ? this.confirm("Front_Msg_Sure_To_Reject_Application", async () => {
+        let r = this.$refs.rejectForm.data;
+        await taskApi.reject(this.task.id, r.rejectToID, r.comment), this.success("Front_Msg_Success"), this.resetNotice(), this.$emit("on-after-action"), this.$refs.rejectForm.data = {}, this.$refs.rejectForm.close(), this.opened = !1;
+      }) : this.error("Front_Msg_Form_Validate_Fail");
     },
     // 撤回
     async recall() {
@@ -106398,11 +106444,11 @@ const viewTable = /* @__PURE__ */ _export_sfc(_sfc_main$n, [["render", _sfc_rend
   }
 }, _hoisted_1$d = { class: "title" }, _hoisted_2$a = { class: "description" }, _hoisted_3$8 = { class: "ivu-ml-8 ivu-mr-8" }, _hoisted_4$4 = { class: "title" }, _hoisted_5$2 = { class: "description" }, _hoisted_6$1 = { class: "ivu-ml-8 ivu-mr-8" };
 function _sfc_render$m(a, r, o, s, l, c) {
-  const u = resolveComponent("Icon"), d = resolveComponent("view-form"), f = resolveComponent("Button"), p = resolveComponent("Modal"), g = resolveComponent("modal-table"), v = resolveComponent("modal-form"), y = resolveComponent("Input"), _ = resolveComponent("FormItem"), S = resolveComponent("Col"), C = resolveComponent("Row"), b = resolveComponent("Form"), E = resolveComponent("flow-chart");
+  const u = resolveComponent("Icon"), d = resolveComponent("view-form"), f = resolveComponent("Button"), p = resolveComponent("Modal"), g = resolveComponent("modal-table"), v = resolveComponent("modal-form"), y = resolveComponent("Input"), _ = resolveComponent("FormItem"), S = resolveComponent("Col"), C = resolveComponent("Row"), b = resolveComponent("Form"), E = resolveComponent("Option"), T = resolveComponent("Select"), P = resolveComponent("flow-chart");
   return openBlock(), createElementBlock("div", null, [
     createVNode$1(p, {
       modelValue: l.opened,
-      "onUpdate:modelValue": r[12] || (r[12] = (T) => l.opened = T),
+      "onUpdate:modelValue": r[12] || (r[12] = (I) => l.opened = I),
       scrollable: "",
       fullscreen: l.isFullscreen,
       "mask-closable": a.layout.maskClosable,
@@ -106428,30 +106474,30 @@ function _sfc_render$m(a, r, o, s, l, c) {
             key: 0,
             style: { "font-size": "20px", color: "#999", position: "relative", top: "-3px" },
             type: "ios-expand",
-            onClick: r[0] || (r[0] = (T) => l.isFullscreen = !l.isFullscreen)
+            onClick: r[0] || (r[0] = (I) => l.isFullscreen = !l.isFullscreen)
           })),
           l.isFullscreen ? (openBlock(), createBlock(u, {
             key: 1,
             style: { "font-size": "20px", color: "#999", position: "relative", top: "-3px" },
             type: "ios-contract",
-            onClick: r[1] || (r[1] = (T) => l.isFullscreen = !l.isFullscreen)
+            onClick: r[1] || (r[1] = (I) => l.isFullscreen = !l.isFullscreen)
           })) : createCommentVNode("", !0),
           createVNode$1(u, {
             type: "ios-close",
-            onClick: r[2] || (r[2] = (T) => l.opened = !1)
+            onClick: r[2] || (r[2] = (I) => l.opened = !1)
           })
         ])
       ]),
       footer: withCtx(() => [
         createElementVNode("div", null, [
-          (openBlock(!0), createElementBlock(Fragment, null, renderList(l.outcomes, (T, P) => (openBlock(), createBlock(f, {
-            key: P,
+          (openBlock(!0), createElementBlock(Fragment, null, renderList(l.outcomes, (I, A) => (openBlock(), createBlock(f, {
+            key: A,
             type: "primary",
             "custom-icon": "fa fa-check-circle",
-            onClick: (I) => c.action(T)
+            onClick: (x) => c.action(I)
           }, {
             default: withCtx(() => [
-              createTextVNode(toDisplayString$2(T.name == null ? a.$t("Front_Btn_Agree") : T.name), 1)
+              createTextVNode(toDisplayString$2(I.name == null ? a.$t("Front_Btn_Agree") : I.name), 1)
             ]),
             _: 2
           }, 1032, ["onClick"]))), 128)),
@@ -106459,7 +106505,7 @@ function _sfc_render$m(a, r, o, s, l, c) {
             key: 0,
             type: "warning",
             "custom-icon": "fa fa-reply",
-            onClick: r[4] || (r[4] = (T) => c.reject())
+            onClick: r[4] || (r[4] = (I) => c.reject())
           }, {
             default: withCtx(() => [
               createTextVNode(toDisplayString$2(a.$t("Front_Btn_Reject")), 1)
@@ -106470,7 +106516,7 @@ function _sfc_render$m(a, r, o, s, l, c) {
             key: 1,
             type: "primary",
             "custom-icon": "fa fa-share",
-            onClick: r[5] || (r[5] = (T) => c.back())
+            onClick: r[5] || (r[5] = (I) => c.back())
           }, {
             default: withCtx(() => [
               createTextVNode(toDisplayString$2(a.$t("Front_Btn_Back_Previous")), 1)
@@ -106481,7 +106527,7 @@ function _sfc_render$m(a, r, o, s, l, c) {
             key: 2,
             type: "primary",
             "custom-icon": "fa fa-share",
-            onClick: r[6] || (r[6] = (T) => a.$refs.redirectTaskForm.open())
+            onClick: r[6] || (r[6] = (I) => a.$refs.redirectTaskForm.open())
           }, {
             default: withCtx(() => [
               createTextVNode(toDisplayString$2(a.$t("Front_Btn_Redirect")), 1)
@@ -106492,7 +106538,7 @@ function _sfc_render$m(a, r, o, s, l, c) {
             key: 3,
             type: "primary",
             "custom-icon": "fa fa-reply-all",
-            onClick: r[7] || (r[7] = (T) => c.recall())
+            onClick: r[7] || (r[7] = (I) => c.recall())
           }, {
             default: withCtx(() => [
               createTextVNode(toDisplayString$2(a.$t("Front_Btn_Recall")), 1)
@@ -106503,7 +106549,7 @@ function _sfc_render$m(a, r, o, s, l, c) {
             key: 4,
             type: "primary",
             "custom-icon": "fa fa-comment-dots",
-            onClick: r[8] || (r[8] = (T) => c.openMessage())
+            onClick: r[8] || (r[8] = (I) => c.openMessage())
           }, {
             default: withCtx(() => [
               createTextVNode(toDisplayString$2(a.$t("Front_Btn_Leave_Message")), 1)
@@ -106513,7 +106559,7 @@ function _sfc_render$m(a, r, o, s, l, c) {
           createVNode$1(f, {
             type: "info",
             "custom-icon": "fa fa-route",
-            onClick: r[9] || (r[9] = (T) => a.$refs.flowChart.open({ processInstID: l.task.processInstID }))
+            onClick: r[9] || (r[9] = (I) => a.$refs.flowChart.open({ processInstID: l.task.processInstID }))
           }, {
             default: withCtx(() => [
               createTextVNode(toDisplayString$2(a.$t("Front_Btn_Process")), 1)
@@ -106523,7 +106569,7 @@ function _sfc_render$m(a, r, o, s, l, c) {
           createVNode$1(f, {
             type: "info",
             "custom-icon": "fa fa-history",
-            onClick: r[10] || (r[10] = (T) => a.$refs.approvalHistoryTable.open({ processInstID: l.task.processInstID }))
+            onClick: r[10] || (r[10] = (I) => a.$refs.approvalHistoryTable.open({ processInstID: l.task.processInstID }))
           }, {
             default: withCtx(() => [
               createTextVNode(toDisplayString$2(a.$t("Front_Btn_History")), 1)
@@ -106533,7 +106579,7 @@ function _sfc_render$m(a, r, o, s, l, c) {
           createVNode$1(f, {
             type: "default",
             "custom-icon": "fa fa-times",
-            onClick: r[11] || (r[11] = (T) => l.opened = !1)
+            onClick: r[11] || (r[11] = (I) => l.opened = !1)
           }, {
             default: withCtx(() => [
               createTextVNode(toDisplayString$2(a.$t("Front_Btn_Close")), 1)
@@ -106571,7 +106617,7 @@ function _sfc_render$m(a, r, o, s, l, c) {
         createVNode$1(f, {
           type: "primary",
           "custom-icon": "fa fa-check",
-          onClick: r[13] || (r[13] = (T) => c.redirect())
+          onClick: r[13] || (r[13] = (I) => c.redirect())
         }, {
           default: withCtx(() => [
             createTextVNode(toDisplayString$2(a.$t("Front_Btn_OK")), 1)
@@ -106583,7 +106629,7 @@ function _sfc_render$m(a, r, o, s, l, c) {
     }, 512),
     createVNode$1(p, {
       modelValue: l.messageOpened,
-      "onUpdate:modelValue": r[17] || (r[17] = (T) => l.messageOpened = T),
+      "onUpdate:modelValue": r[17] || (r[17] = (I) => l.messageOpened = I),
       scrollable: ""
     }, {
       header: withCtx(() => [
@@ -106606,7 +106652,7 @@ function _sfc_render$m(a, r, o, s, l, c) {
         createVNode$1(f, {
           type: "default",
           "custom-icon": "fa fa-times",
-          onClick: r[16] || (r[16] = (T) => l.messageOpened = !1)
+          onClick: r[16] || (r[16] = (I) => l.messageOpened = !1)
         }, {
           default: withCtx(() => [
             createTextVNode(toDisplayString$2(a.$t("Front_Btn_Close")), 1)
@@ -106648,7 +106694,7 @@ function _sfc_render$m(a, r, o, s, l, c) {
                             type: "textarea",
                             rows: 6,
                             modelValue: l.messageData.message,
-                            "onUpdate:modelValue": r[14] || (r[14] = (T) => l.messageData.message = T)
+                            "onUpdate:modelValue": r[14] || (r[14] = (I) => l.messageData.message = I)
                           }, null, 8, ["modelValue"])
                         ]),
                         _: 1
@@ -106666,7 +106712,48 @@ function _sfc_render$m(a, r, o, s, l, c) {
       ]),
       _: 1
     }, 8, ["modelValue"]),
-    createVNode$1(E, { ref: "flowChart" }, null, 512)
+    createVNode$1(v, {
+      ref: "rejectForm",
+      "view-code": "RejectTask"
+    }, {
+      column: withCtx(({ data: I, code: A }) => [
+        A == "rejectTo" ? (openBlock(), createBlock(T, {
+          key: 0,
+          modelValue: a.$refs.rejectForm.data.rejectToID,
+          "onUpdate:modelValue": (x) => a.$refs.rejectForm.data.rejectToID = x,
+          clearable: !0,
+          placeholder: "退回发起人",
+          transfer: !0
+        }, {
+          default: withCtx(() => [
+            (openBlock(!0), createElementBlock(Fragment, null, renderList(l.rejectActivities, (x) => (openBlock(), createBlock(E, {
+              key: x.id,
+              value: x.id
+            }, {
+              default: withCtx(() => [
+                createTextVNode(toDisplayString$2(x.name), 1)
+              ]),
+              _: 2
+            }, 1032, ["value"]))), 128))
+          ]),
+          _: 1
+        }, 8, ["modelValue", "onUpdate:modelValue"])) : createCommentVNode("", !0)
+      ]),
+      footer: withCtx(() => [
+        createVNode$1(f, {
+          type: "primary",
+          "custom-icon": "fa fa-check",
+          onClick: r[18] || (r[18] = (I) => c.rejectSubmit())
+        }, {
+          default: withCtx(() => [
+            createTextVNode(toDisplayString$2(a.$t("Front_Btn_OK")), 1)
+          ]),
+          _: 1
+        })
+      ]),
+      _: 1
+    }, 512),
+    createVNode$1(P, { ref: "flowChart" }, null, 512)
   ]);
 }
 const taskForm = /* @__PURE__ */ _export_sfc(_sfc_main$m, [["render", _sfc_render$m]]), __vite_glob_1_35 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({