@fecp/designer 5.5.113 → 5.5.115

package/es/packages/mobile/src/components/custom/approvalBar/ApprovalBar.vue.mjs

@@ -1,22 +1,22 @@
-/* empty css                                               */
-/* empty css                                                */
-/* empty css                                                  */
-/* empty css                                                 */
-/* empty css                                                */
 /* empty css                                                     */
-/* empty css                                               */
-/* empty css                                              */
+/* empty css                                                      */
+/* empty css                                                        */
 /* empty css                                                       */
-/* empty css                                                 */
-/* empty css                                               */
-/* empty css                                                  */
-/* empty css                                                */
-/* empty css                                               */
-/* empty css                                                */
+/* empty css                                                      */
+/* empty css                                                           */
 /* empty css                                                     */
-/* empty css                                                 */
-/* empty css                                                            */
-import { getCurrentInstance, inject, ref, reactive, createElementBlock, openBlock, Fragment, createVNode, withCtx, renderList, createBlock, normalizeClass, unref, isRef, createElementVNode, createCommentVNode } from "vue";
+/* empty css                                                    */
+/* empty css                                                             */
+/* empty css                                                       */
+/* empty css                                                     */
+/* empty css                                                        */
+/* empty css                                                      */
+/* empty css                                                     */
+/* empty css                                                      */
+/* empty css                                                           */
+/* empty css                                                       */
+/* empty css                                                                  */
+import { getCurrentInstance, inject, ref, reactive, createElementBlock, openBlock, Fragment, createVNode, normalizeStyle, withCtx, renderList, createBlock, normalizeClass, unref, isRef, createElementVNode, createCommentVNode } from "vue";
 import { findPageById } from "../../../utils/common.mjs";
 import { pageHistory } from "../../../utils/pageHistory.mjs";
 import emitter from "../../../utils/eventBus.mjs";
@@ -24,20 +24,24 @@ import MobilePage from "../../../page.vue.mjs";
 import { useStore } from "../../../../../../node_modules/vuex/dist/vuex.esm-bundler.mjs";
 /* empty css                  */
 import _export_sfc from "../../../../../../_virtual/_plugin-vue_export-helper.mjs";
-import { showLoadingToast, showFailToast, showSuccessToast } from "../../../../node_modules/vant/es/toast/function-call.mjs";
-import "../../../../node_modules/vant/es/toast/index.mjs";
-import { ActionBar } from "../../../../node_modules/vant/es/action-bar/index.mjs";
-import { ActionBarButton } from "../../../../node_modules/vant/es/action-bar-button/index.mjs";
-import { Popup } from "../../../../node_modules/vant/es/popup/index.mjs";
-import { Field } from "../../../../node_modules/vant/es/field/index.mjs";
-import { Picker } from "../../../../node_modules/vant/es/picker/index.mjs";
-const _hoisted_1 = { class: "appPopContent" };
-const _hoisted_2 = {
+import { showLoadingToast, showFailToast, showSuccessToast } from "../../../../../../node_modules/vant/es/toast/function-call.mjs";
+import "../../../../../../node_modules/vant/es/toast/index.mjs";
+import { ActionBar } from "../../../../../../node_modules/vant/es/action-bar/index.mjs";
+import { ActionBarButton } from "../../../../../../node_modules/vant/es/action-bar-button/index.mjs";
+import { Popup } from "../../../../../../node_modules/vant/es/popup/index.mjs";
+import { Field } from "../../../../../../node_modules/vant/es/field/index.mjs";
+import { Picker } from "../../../../../../node_modules/vant/es/picker/index.mjs";
+const _hoisted_1 = {
+  key: 1,
+  class: "fec-mobile-approval-disabled"
+};
+const _hoisted_2 = { class: "appPopContent" };
+const _hoisted_3 = {
   class: "appOptContent",
   style: { "max-height": "235px", "padding-bottom": "0" }
 };
-const _hoisted_3 = { class: "appPopContent" };
-const _hoisted_4 = { class: "appOptContent" };
+const _hoisted_4 = { class: "appPopContent" };
+const _hoisted_5 = { class: "appOptContent" };
 const _sfc_main = {
   __name: "ApprovalBar",
   props: {
@@ -60,6 +64,10 @@ const _sfc_main = {
     operationPageId: {
       type: String,
       default: ""
+    },
+    canMobileApproval: {
+      type: Boolean,
+      default: true
     }
   },
   setup(__props) {
@@ -72,21 +80,30 @@ const _sfc_main = {
     const showAgreePop = ref(false);
     const showOtherPop = ref(false);
     const showOpinionPicker = ref(false);
-    ref(false);
+    const showTargetNodePicker = ref(false);
     const opinionForm = reactive({
       approveId: "",
       approveIdea: "",
-      targetNode: ""
+      targetNodeId: ""
     });
     const opinionTypeOptionsFieldName = {
       text: "approveIdea",
       value: "id"
     };
+    const targetNodeList = ref([]);
+    const targetNodeSelectShow = ref(false);
     function clickHandler(item) {
       console.log("🚀 ~ clickHandler ~ item:", item);
       if (item.approvalType == "agree") {
         showAgreePop.value = true;
       } else if (item.approvalType == "other") {
+        opinionForm.approveId = "";
+        opinionForm.approveText = "";
+        opinionForm.approveType = "";
+        opinionForm.targetNodeId = "";
+        opinionForm.targetNodeText = "";
+        targetNodeList.value = [];
+        targetNodeSelectShow.value = false;
         showOtherPop.value = true;
       }
     }
@@ -95,8 +112,83 @@ const _sfc_main = {
       opinionForm.approveId = ((_a = selectedOptions[0]) == null ? void 0 : _a.id) || "";
       opinionForm.approveText = ((_b = selectedOptions[0]) == null ? void 0 : _b.approveIdea) || "";
       opinionForm.approveType = ((_c = selectedOptions[0]) == null ? void 0 : _c.approveType) || "";
+      switch (opinionForm.approveType) {
+        //提交到当前节点后的指定节点
+        case "C2":
+        //提交到已执行过的指定节点
+        case "C22":
+        //退回到指定节点
+        case "R5":
+        //退回到主流指定节点
+        case "R50":
+        //退回到指定节点并提交到退回节点
+        case "R55":
+          getNodeList(
+            props.taskData.taskId,
+            targetNodeList,
+            opinionForm.approveType
+          );
+          targetNodeSelectShow.value = true;
+          break;
+      }
       showOpinionPicker.value = false;
     }
+    function getNodeList(taskId, nodeList, approveType) {
+      switch (approveType) {
+        //提交到当前节点后的指定节点
+        case "C2":
+          ctx.$http.postForm(
+            "/base-server/flow/flowApproveDetail/getAllNextNodeList",
+            { taskId },
+            false
+          ).then((data) => {
+            nodeList.value = data;
+            debugger;
+          });
+          break;
+        //提交到已执行过的指定节点
+        case "C22":
+          ctx.$http.postForm(
+            "/base-server/flow/flowApproveDetail/getFinishNodeList",
+            { taskId },
+            false
+          ).then((data) => {
+            nodeList.value = data;
+            debugger;
+          });
+          break;
+        //退回到主流指定节点
+        case "R50":
+          ctx.$http.postForm(
+            "/base-server/flow/flowApproveDetail/getFinishParentNodeList",
+            { taskId },
+            false
+          ).then((data) => {
+            nodeList.value = data;
+            debugger;
+          });
+          break;
+        //退回到指定节点
+        case "R5":
+        //退回到指定节点并提交到退回节点
+        case "R55":
+          ctx.$http.postForm(
+            "/base-server/flow/flowApproveDetail/getRollBackNodeList",
+            { taskId },
+            false
+          ).then((data) => {
+            nodeList.value = data;
+            debugger;
+          });
+          break;
+      }
+    }
+    function onTargetNodeConfirm({ selectedOptions }) {
+      var _a, _b;
+      opinionForm.targetNodeId = (_a = selectedOptions[0]) == null ? void 0 : _a.id;
+      opinionForm.targetNodeText = (_b = selectedOptions[0]) == null ? void 0 : _b.name;
+      showTargetNodePicker.value = false;
+    }
     const operPageRef = ref();
     function submitOpinion() {
       var _a;
@@ -110,7 +202,7 @@ const _sfc_main = {
         currentUser: store.getters.user,
         sendUserId: "",
         nextUser: "",
-        targetNodeId: "",
+        targetNodeId: opinionForm.targetNodeId,
         addSignList: [],
         taskData: props.taskData,
         taskId: props.taskData.taskId,
@@ -129,15 +221,13 @@ const _sfc_main = {
           showSuccessToast("提交成功");
           showOtherPop.value = false;
           showAgreePop.value = false;
+          emitter.emit("refreshFlowCutNum");
           goBack();
         }
       });
     }
     const goBack = () => {
-      const prevPage = pageHistory.back();
-      if (prevPage) {
-        emitter.emit("loadPage", { pageId: prevPage.id });
-      }
+      pageHistory.back();
     };
     return (_ctx, _cache) => {
       const _component_van_action_bar_button = ActionBarButton;
@@ -146,27 +236,30 @@ const _sfc_main = {
       const _component_van_popup = Popup;
       const _component_van_picker = Picker;
       return openBlock(), createElementBlock(Fragment, null, [
-        createVNode(_component_van_action_bar, { "safe-area-inset-bottom": "" }, {
+        createVNode(_component_van_action_bar, {
+          "safe-area-inset-bottom": "",
+          style: normalizeStyle({ paddingTop: __props.canMobileApproval ? "8px" : "0px" })
+        }, {
           default: withCtx(() => [
-            (openBlock(true), createElementBlock(Fragment, null, renderList(__props.actionBarOptions, (item) => {
+            __props.canMobileApproval ? (openBlock(true), createElementBlock(Fragment, { key: 0 }, renderList(__props.actionBarOptions, (item) => {
               return openBlock(), createBlock(_component_van_action_bar_button, {
                 class: normalizeClass(item.bgClass || "icon-blue"),
                 text: item.text,
                 onClick: ($event) => clickHandler(item)
               }, null, 8, ["class", "text", "onClick"]);
-            }), 256))
+            }), 256)) : (openBlock(), createElementBlock("div", _hoisted_1, " 当前流程任务不支持移动端审批，请前往 PC 端处理 "))
           ]),
           _: 1
-        }),
+        }, 8, ["style"]),
         createVNode(_component_van_popup, {
           show: unref(showAgreePop),
           "onUpdate:show": _cache[1] || (_cache[1] = ($event) => isRef(showAgreePop) ? showAgreePop.value = $event : null),
           round: "",
           position: "bottom",
-          style: { "height": "80%" }
+          style: { "max-height": "80%" }
         }, {
           default: withCtx(() => [
-            createElementVNode("div", _hoisted_1, [
+            createElementVNode("div", _hoisted_2, [
               unref(operPage) ? (openBlock(), createBlock(MobilePage, {
                 key: 0,
                 parentPage: unref(operPage),
@@ -174,7 +267,7 @@ const _sfc_main = {
                 ref_key: "operPageRef",
                 ref: operPageRef
               }, null, 8, ["parentPage", "params"])) : createCommentVNode("", true),
-              createElementVNode("div", _hoisted_2, [
+              createElementVNode("div", _hoisted_3, [
                 createVNode(_component_van_field, {
                   modelValue: unref(opinionForm).approveIdea,
                   "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => unref(opinionForm).approveIdea = $event),
@@ -203,13 +296,13 @@ const _sfc_main = {
         }, 8, ["show"]),
         createVNode(_component_van_popup, {
           show: unref(showOtherPop),
-          "onUpdate:show": _cache[5] || (_cache[5] = ($event) => isRef(showOtherPop) ? showOtherPop.value = $event : null),
+          "onUpdate:show": _cache[7] || (_cache[7] = ($event) => isRef(showOtherPop) ? showOtherPop.value = $event : null),
           round: "",
           position: "bottom"
         }, {
           default: withCtx(() => [
-            createElementVNode("div", _hoisted_3, [
-              createElementVNode("div", _hoisted_4, [
+            createElementVNode("div", _hoisted_4, [
+              createElementVNode("div", _hoisted_5, [
                 createVNode(_component_van_field, {
                   modelValue: unref(opinionForm).approveText,
                   "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => unref(opinionForm).approveText = $event),
@@ -219,9 +312,19 @@ const _sfc_main = {
                   placeholder: "请选择审批意见",
                   onClick: _cache[3] || (_cache[3] = ($event) => showOpinionPicker.value = true)
                 }, null, 8, ["modelValue"]),
+                unref(targetNodeSelectShow) ? (openBlock(), createBlock(_component_van_field, {
+                  key: 0,
+                  modelValue: unref(opinionForm).targetNodeText,
+                  "onUpdate:modelValue": _cache[4] || (_cache[4] = ($event) => unref(opinionForm).targetNodeText = $event),
+                  "is-link": "",
+                  readonly: "",
+                  label: "目标节点",
+                  placeholder: "请选择目标节点",
+                  onClick: _cache[5] || (_cache[5] = ($event) => showTargetNodePicker.value = true)
+                }, null, 8, ["modelValue"])) : createCommentVNode("", true),
                 createVNode(_component_van_field, {
                   modelValue: unref(opinionForm).approveIdea,
-                  "onUpdate:modelValue": _cache[4] || (_cache[4] = ($event) => unref(opinionForm).approveIdea = $event),
+                  "onUpdate:modelValue": _cache[6] || (_cache[6] = ($event) => unref(opinionForm).approveIdea = $event),
                   rows: "6",
                   autosize: "",
                   label: "意见内容",
@@ -247,7 +350,7 @@ const _sfc_main = {
         }, 8, ["show"]),
         createVNode(_component_van_popup, {
           show: unref(showOpinionPicker),
-          "onUpdate:show": _cache[7] || (_cache[7] = ($event) => isRef(showOpinionPicker) ? showOpinionPicker.value = $event : null),
+          "onUpdate:show": _cache[9] || (_cache[9] = ($event) => isRef(showOpinionPicker) ? showOpinionPicker.value = $event : null),
           round: "",
           position: "bottom"
         }, {
@@ -256,7 +359,26 @@ const _sfc_main = {
               columns: __props.opinionTypeOptions || [],
               "columns-field-names": opinionTypeOptionsFieldName,
               onConfirm: onOpinionConfirm,
-              onCancel: _cache[6] || (_cache[6] = ($event) => showOpinionPicker.value = false)
+              onCancel: _cache[8] || (_cache[8] = ($event) => showOpinionPicker.value = false)
+            }, null, 8, ["columns"])
+          ]),
+          _: 1
+        }, 8, ["show"]),
+        createVNode(_component_van_popup, {
+          show: unref(showTargetNodePicker),
+          "onUpdate:show": _cache[11] || (_cache[11] = ($event) => isRef(showTargetNodePicker) ? showTargetNodePicker.value = $event : null),
+          round: "",
+          position: "bottom"
+        }, {
+          default: withCtx(() => [
+            createVNode(_component_van_picker, {
+              columns: unref(targetNodeList) || [],
+              onConfirm: onTargetNodeConfirm,
+              "columns-field-names": {
+                text: "name",
+                value: "id"
+              },
+              onCancel: _cache[10] || (_cache[10] = ($event) => showTargetNodePicker.value = false)
             }, null, 8, ["columns"])
           ]),
           _: 1
@@ -265,7 +387,7 @@ const _sfc_main = {
     };
   }
 };
-const _ApprovalBar = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-3f63aa02"]]);
+const _ApprovalBar = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-8d0c761c"]]);
 export {
   _ApprovalBar as default
 };

package/es/packages/mobile/src/components/custom/approvalList/ApprovalCard.vue.mjs

@@ -1,15 +1,15 @@
-/* empty css                                               */
-/* empty css                                                */
-/* empty css                                               */
-/* empty css                                                  */
-/* empty css                                                 */
-/* empty css                                              */
-import { createElementBlock, openBlock, createElementVNode, createBlock, createCommentVNode, toDisplayString, withCtx, createTextVNode, normalizeStyle, createVNode } from "vue";
+/* empty css                                                     */
+/* empty css                                                      */
+/* empty css                                                     */
+/* empty css                                                        */
+/* empty css                                                       */
+/* empty css                                                    */
+import { createElementBlock, openBlock, createElementVNode, createCommentVNode, createBlock, toDisplayString, withCtx, createTextVNode, normalizeStyle, createVNode } from "vue";
 /* empty css                   */
 import _export_sfc from "../../../../../../_virtual/_plugin-vue_export-helper.mjs";
-import { Tag } from "../../../../node_modules/vant/es/tag/index.mjs";
-import { Icon } from "../../../../node_modules/vant/es/icon/index.mjs";
-import { Button } from "../../../../node_modules/vant/es/button/index.mjs";
+import { Tag } from "../../../../../../node_modules/vant/es/tag/index.mjs";
+import { Icon } from "../../../../../../node_modules/vant/es/icon/index.mjs";
+import { Button } from "../../../../../../node_modules/vant/es/button/index.mjs";
 const _hoisted_1 = { class: "fec-card" };
 const _hoisted_2 = { class: "fec-card-header" };
 const _hoisted_3 = { class: "fec-card-title-wrap" };
@@ -32,7 +32,7 @@ const _sfc_main = {
       // 0:待办 1:已办 2:抄送
     }
   },
-  emits: ["view", "approve", "revoke"],
+  emits: ["view", "approve", "revoke", "transfer"],
   setup(__props) {
     function formatTime(timeStr) {
       if (!timeStr) return "";
@@ -74,7 +74,8 @@ const _sfc_main = {
               _: 1
             })) : createCommentVNode("", true)
           ]),
-          createElementVNode("span", {
+          __props.type != "0" ? (openBlock(), createElementBlock("span", {
+            key: 0,
             class: "fec-card-status",
             style: normalizeStyle({ background: __props.item.statusColor || "#fa8c16" })
           }, [
@@ -83,7 +84,7 @@ const _sfc_main = {
               size: "12"
             }, null, 8, ["name"]),
             createTextVNode(" " + toDisplayString(__props.item.statusText || "待处理"), 1)
-          ], 4)
+          ], 4)) : createCommentVNode("", true)
         ]),
         createElementVNode("div", _hoisted_5, [
           createElementVNode("div", _hoisted_6, toDisplayString(__props.item.taskDescription), 1)
@@ -99,32 +100,55 @@ const _sfc_main = {
               size: "small",
               onClick: _cache[0] || (_cache[0] = ($event) => _ctx.$emit("view", __props.item))
             }, {
-              default: withCtx(() => _cache[3] || (_cache[3] = [
+              default: withCtx(() => _cache[5] || (_cache[5] = [
                 createTextVNode(" 查看 ")
               ])),
               _: 1
             })) : createCommentVNode("", true),
             __props.type == 0 ? (openBlock(), createBlock(_component_van_button, {
               key: 1,
+              round: "",
+              size: "small",
+              class: "fec-card-btn-transfer",
+              onClick: _cache[1] || (_cache[1] = ($event) => _ctx.$emit("transfer", __props.item))
+            }, {
+              default: withCtx(() => _cache[6] || (_cache[6] = [
+                createTextVNode(" 转办 ")
+              ])),
+              _: 1
+            })) : createCommentVNode("", true),
+            __props.type == 0 ? (openBlock(), createBlock(_component_van_button, {
+              key: 2,
               type: "primary",
               round: "",
               size: "small",
-              onClick: _cache[1] || (_cache[1] = ($event) => _ctx.$emit("approve", __props.item))
+              onClick: _cache[2] || (_cache[2] = ($event) => _ctx.$emit("approve", __props.item))
             }, {
-              default: withCtx(() => _cache[4] || (_cache[4] = [
+              default: withCtx(() => _cache[7] || (_cache[7] = [
                 createTextVNode(" 审批 ")
               ])),
               _: 1
             })) : createCommentVNode("", true),
-            __props.type == 1 ? (openBlock(), createBlock(_component_van_button, {
-              key: 2,
+            __props.type == 1 && __props.item.backType == "101" ? (openBlock(), createBlock(_component_van_button, {
+              key: 3,
               type: "warning",
               round: "",
               size: "small",
-              onClick: _cache[2] || (_cache[2] = ($event) => _ctx.$emit("revoke", __props.item))
+              onClick: _cache[3] || (_cache[3] = ($event) => _ctx.$emit("undo", __props.item))
             }, {
-              default: withCtx(() => _cache[5] || (_cache[5] = [
-                createTextVNode(" 撤销 ")
+              default: withCtx(() => _cache[8] || (_cache[8] = [
+                createTextVNode(" 撤回 ")
+              ])),
+              _: 1
+            })) : __props.type == 1 && __props.item.backType == "102" ? (openBlock(), createBlock(_component_van_button, {
+              key: 4,
+              type: "warning",
+              round: "",
+              size: "small",
+              onClick: _cache[4] || (_cache[4] = ($event) => _ctx.$emit("recall", __props.item))
+            }, {
+              default: withCtx(() => _cache[9] || (_cache[9] = [
+                createTextVNode(" 召回 ")
               ])),
               _: 1
             })) : createCommentVNode("", true)
@@ -134,7 +158,7 @@ const _sfc_main = {
     };
   }
 };
-const ApprovalCard = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-0c40807f"]]);
+const ApprovalCard = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-404eba8c"]]);
 export {
   ApprovalCard as default
 };