@fecp/designer 5.5.120 → 5.6.1

package/es/packages/mobile/src/assets/images/user.png.mjs

@@ -0,0 +1,4 @@
+const userImg = "data:image/png;base64,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";
+export {
+  userImg as default
+};

package/es/packages/mobile/src/components/all.mjs

@@ -76,6 +76,7 @@ import { MobileApprovalList } from "./custom/approvalList/index.mjs";
 import "./custom/appTimeLine/index.mjs";
 import { MobileDocument } from "./custom/document/index.mjs";
 import { MobileUserSelect } from "./custom/userSelect/index.mjs";
+import { MobileCustomCode } from "./custom/customCode/index.mjs";
 export {
   MobileActionBar,
   MobileActionSheet,
@@ -92,6 +93,7 @@ export {
   MobileCheckboxGroup,
   MobileCollapse,
   MobileCollapseItem,
+  MobileCustomCode,
   MobileDataStat,
   MobileDivider,
   MobileDocument,

package/es/packages/mobile/src/components/custom/appDetail/AppDetail.vue.mjs

@@ -1,6 +1,8 @@
 /* empty css                                                     */
 /* empty css                                                      */
-import { getCurrentInstance, ref, computed, resolveComponent, createElementBlock, unref, openBlock, createVNode, Fragment, createBlock, createCommentVNode, isRef, mergeProps } from "vue";
+import { inject, getCurrentInstance, ref, computed, resolveComponent, createElementBlock, unref, openBlock, createVNode, Fragment, createBlock, createCommentVNode, mergeProps } from "vue";
+import MobilePage from "../../../page.vue.mjs";
+import { findPageById } from "../../../utils/common.mjs";
 /* empty css                */
 import _export_sfc from "../../../../../../_virtual/_plugin-vue_export-helper.mjs";
 import { Empty } from "../../../../../../node_modules/vant/es/empty/index.mjs";
@@ -12,6 +14,14 @@ const _hoisted_2 = {
   key: 1,
   class: "route-wrapper"
 };
+const _hoisted_3 = {
+  key: 0,
+  class: "approve-wrapper tip"
+};
+const _hoisted_4 = {
+  key: 1,
+  class: "approve-wrapper"
+};
 const _sfc_main = {
   __name: "AppDetail",
   props: {
@@ -42,14 +52,15 @@ const _sfc_main = {
       type: Boolean,
       default: true
     },
-    operationPageId: {
-      type: String,
-      default: ""
+    isDev: {
+      type: Boolean,
+      default: false
     }
   },
   setup(__props) {
     var _a, _b;
     const props = __props;
+    const pageList = inject("pageList");
     const currentInstance = getCurrentInstance();
     const ctx = currentInstance.proxy;
     ctx.route;
@@ -57,19 +68,28 @@ const _sfc_main = {
     const taskData = { ...props.params.taskData };
     const taskParams = { ...props.params };
     delete taskParams.taskData;
+    const appDetailPage = ref();
     const canMobileApproval = ref(true);
     const baseInfoPageId = ref("");
+    const operationPageId = ref("");
     if (props.baseInfoPageSource == "fixed") {
       baseInfoPageId.value = props.baseInfoPageId;
+      appDetailPage.value = findPageById(pageList.value, props.baseInfoPageId);
     }
+    const page = computed(() => {
+      return { ...appDetailPage.value, isNavBar: false };
+    });
     const expandingTabOptions = ref([]);
     const show = ref(false);
     const showEmpty = ref(false);
     const taskNotFound = ref(false);
     function handleData(data) {
+      taskParams.processInstanceId = data.processInstanceId;
       if (props.baseInfoPageSource == "dynamic") {
         baseInfoPageId.value = data.mobileDetailPage;
+        appDetailPage.value = findPageById(pageList.value, data.mobileDetailPage);
       }
+      operationPageId.value = data.mobileAppPage;
       canMobileApproval.value = data.mobileApproval != "1";
       opinionTypeOptions.value = data.approvalBtn.filter(
         (item) => item.approveType != "C1"
@@ -87,33 +107,35 @@ const _sfc_main = {
     }
     const taskId = (_a = props.params) == null ? void 0 : _a.taskId;
     const type = (_b = props.params) == null ? void 0 : _b.type;
-    if (!taskId) {
-      showEmpty.value = true;
-    } else {
-      ctx.$http.postForm(
-        "/base-server/flow/flowApproveDetail/findById",
-        {
-          taskId,
-          type
-        },
-        true
-      ).then((data) => {
-        if (data.notFound) {
-          ctx.$http.postForm(
-            "/base-server/flow/flowApproveDetail/findById",
-            { taskId, type: "1" },
-            true
-          ).then((retryData) => {
-            if (retryData.notFound) {
-              taskNotFound.value = true;
-              return;
-            }
-            handleData(retryData);
-          });
-          return;
-        }
-        handleData(data);
-      });
+    if (!props.isDev) {
+      if (!taskId) {
+        showEmpty.value = true;
+      } else {
+        ctx.$http.postFormMobile(
+          "/" + window.$servers.base + "/flow/flowApproveDetail/findById",
+          {
+            taskId,
+            type
+          },
+          true
+        ).then((data) => {
+          if (data.notFound) {
+            ctx.$http.postFormMobile(
+              "/" + window.$servers.base + "/flow/flowApproveDetail/findById",
+              { taskId, type: "1" },
+              true
+            ).then((retryData) => {
+              if (retryData.notFound) {
+                taskNotFound.value = true;
+                return;
+              }
+              handleData(retryData);
+            });
+            return;
+          }
+          handleData(data);
+        });
+      }
     }
     const activeName = ref("tab_base_info");
     const tabsOptions = computed(() => {
@@ -133,7 +155,6 @@ const _sfc_main = {
     return (_ctx, _cache) => {
       var _a2;
       const _component_van_empty = Empty;
-      const _component_FecMobileTabs = resolveComponent("FecMobileTabs");
       const _component_FecMobileApprovalBar = resolveComponent("FecMobileApprovalBar");
       return unref(showEmpty) ? (openBlock(), createElementBlock("div", _hoisted_1, [
         createVNode(_component_van_empty, {
@@ -146,27 +167,25 @@ const _sfc_main = {
           description: "任务不存在"
         })
       ])) : (openBlock(), createElementBlock(Fragment, { key: 2 }, [
-        createVNode(_component_FecMobileTabs, {
-          modelValue: unref(activeName),
-          "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => isRef(activeName) ? activeName.value = $event : null),
-          options: unref(tabsOptions),
-          params: taskParams,
-          swipeable: __props.swipeable,
-          document: __props.document,
-          approvalHistory: __props.approvalHistory
-        }, null, 8, ["modelValue", "options", "swipeable", "document", "approvalHistory"]),
-        unref(show) && ((_a2 = props.params) == null ? void 0 : _a2.type) == "0" ? (openBlock(), createBlock(_component_FecMobileApprovalBar, mergeProps({ key: 0 }, __props.actionBar, {
+        __props.isDev ? (openBlock(), createElementBlock("div", _hoisted_3, "审批详情页面显示区")) : (openBlock(), createElementBlock("div", _hoisted_4, [
+          unref(appDetailPage) ? (openBlock(), createBlock(MobilePage, {
+            key: 0,
+            parentPage: unref(page),
+            params: taskParams
+          }, null, 8, ["parentPage"])) : createCommentVNode("", true)
+        ])),
+        unref(show) && ((_a2 = props.params) == null ? void 0 : _a2.type) == "0" ? (openBlock(), createBlock(_component_FecMobileApprovalBar, mergeProps({ key: 2 }, __props.actionBar, {
           params: taskParams,
           taskData,
           opinionTypeOptions: unref(opinionTypeOptions),
-          operationPageId: __props.operationPageId,
+          operationPageId: unref(operationPageId),
           canMobileApproval: unref(canMobileApproval)
         }), null, 16, ["opinionTypeOptions", "operationPageId", "canMobileApproval"])) : createCommentVNode("", true)
       ], 64));
     };
   }
 };
-const _AppDetail = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-ade90293"]]);
+const _AppDetail = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-2edc3d85"]]);
 export {
   _AppDetail as default
 };

package/es/packages/mobile/src/components/custom/appTimeLine/AppTimeLine.vue.mjs

@@ -104,6 +104,10 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       type: String,
       default: ""
     },
+    processInstanceId: {
+      type: String,
+      default: ""
+    },
     hisTaskData: {
       type: Array,
       default: []
@@ -152,7 +156,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       currentAssignees.value = item.assignee || [];
       showAssigneePopup.value = true;
     }
-    if (props.traceNo) {
+    if (props.processInstanceId) {
       fetchData();
     } else if (props.hisTaskData.length > 0) {
       hisTask.value = props.hisTaskData;
@@ -163,10 +167,10 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     }
     function fetchData() {
       loading.value = true;
-      ctx.$http.postForm(
-        "/base-server/flow/flowData/findTimeLineByTraceNo",
+      ctx.$http.postFormMobile(
+        "/" + window.$servers.base + "/flow/flowData/findTimeLineByProcessInstanceId",
         {
-          traceNo: props.traceNo,
+          processInstanceId: props.processInstanceId,
           type: "app",
           taskDefKey: ""
         },
@@ -480,7 +484,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _TimeLineFilter = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-e967cbbd"]]);
+const _TimeLineFilter = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-c284e414"]]);
 export {
   _TimeLineFilter as default
 };

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

@@ -16,7 +16,7 @@
 /* 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 { getCurrentInstance, inject, ref, reactive, createElementBlock, openBlock, Fragment, createVNode, normalizeStyle, withCtx, renderList, createBlock, normalizeClass, unref, isRef, createElementVNode, createCommentVNode, nextTick } from "vue";
 import { findPageById } from "../../../utils/common.mjs";
 import { pageHistory } from "../../../utils/pageHistory.mjs";
 import emitter from "../../../utils/eventBus.mjs";
@@ -29,19 +29,19 @@ 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 { Form } from "../../../../../../node_modules/vant/es/form/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 = {
+const _hoisted_2 = {
   class: "appOptContent",
-  style: { "max-height": "235px", "padding-bottom": "0" }
+  style: { "height": "200px", "padding-bottom": "0" }
 };
-const _hoisted_4 = { class: "appPopContent" };
-const _hoisted_5 = { class: "appOptContent" };
+const _hoisted_3 = { class: "appPopContent" };
+const _hoisted_4 = { class: "appOptContent" };
 const _sfc_main = {
   __name: "ApprovalBar",
   props: {
@@ -92,11 +92,25 @@ const _sfc_main = {
     };
     const targetNodeList = ref([]);
     const targetNodeSelectShow = ref(false);
+    const operPageRef = ref();
+    const agreeFormRef = ref();
+    const otherFormRef = ref();
+    const agreePopContentRef = ref(null);
+    function layoutDataHeight(height) {
+      nextTick(() => {
+        const el = agreePopContentRef.value;
+        if (!el) return;
+        el.style.height = 272 + height + "px";
+      });
+    }
     function clickHandler(item) {
+      var _a, _b;
       console.log("🚀 ~ clickHandler ~ item:", item);
       if (item.approvalType == "agree") {
+        (_a = agreeFormRef.value) == null ? void 0 : _a.resetValidation();
         showAgreePop.value = true;
       } else if (item.approvalType == "other") {
+        (_b = otherFormRef.value) == null ? void 0 : _b.resetValidation();
         opinionForm.approveId = "";
         opinionForm.approveText = "";
         opinionForm.approveType = "";
@@ -137,48 +151,44 @@ const _sfc_main = {
       switch (approveType) {
         //提交到当前节点后的指定节点
         case "C2":
-          ctx.$http.postForm(
-            "/base-server/flow/flowApproveDetail/getAllNextNodeList",
+          ctx.$http.postFormMobile(
+            "/" + window.$servers.base + "/flow/flowApproveDetail/getAllNextNodeList",
             { taskId },
             false
           ).then((data) => {
             nodeList.value = data;
-            debugger;
           });
           break;
         //提交到已执行过的指定节点
         case "C22":
-          ctx.$http.postForm(
-            "/base-server/flow/flowApproveDetail/getFinishNodeList",
+          ctx.$http.postFormMobile(
+            "/" + window.$servers.base + "/flow/flowApproveDetail/getFinishNodeList",
             { taskId },
             false
           ).then((data) => {
             nodeList.value = data;
-            debugger;
           });
           break;
         //退回到主流指定节点
         case "R50":
-          ctx.$http.postForm(
-            "/base-server/flow/flowApproveDetail/getFinishParentNodeList",
+          ctx.$http.postFormMobile(
+            "/" + window.$servers.base + "/flow/flowApproveDetail/getFinishParentNodeList",
             { taskId },
             false
           ).then((data) => {
             nodeList.value = data;
-            debugger;
           });
           break;
         //退回到指定节点
         case "R5":
         //退回到指定节点并提交到退回节点
         case "R55":
-          ctx.$http.postForm(
-            "/base-server/flow/flowApproveDetail/getRollBackNodeList",
+          ctx.$http.postFormMobile(
+            "/" + window.$servers.base + "/flow/flowApproveDetail/getRollBackNodeList",
             { taskId },
             false
           ).then((data) => {
             nodeList.value = data;
-            debugger;
           });
           break;
       }
@@ -189,8 +199,25 @@ const _sfc_main = {
       opinionForm.targetNodeText = (_b = selectedOptions[0]) == null ? void 0 : _b.name;
       showTargetNodePicker.value = false;
     }
-    const operPageRef = ref();
+    function submitAgreeOpinion() {
+      var _a, _b;
+      if ((_a = operPageRef.value) == null ? void 0 : _a.validate) {
+        (_b = operPageRef.value) == null ? void 0 : _b.validate().then(() => {
+          submitOpinion();
+        });
+      } else {
+        submitOpinion();
+      }
+    }
     function submitOpinion() {
+      const formRef = showAgreePop.value ? agreeFormRef : otherFormRef;
+      formRef.value.validate().then(() => {
+        doSubmit();
+      }).catch((errors) => {
+        console.log("表单校验失败:", errors);
+      });
+    }
+    function doSubmit() {
       var _a;
       const formData = ((_a = operPageRef.value) == null ? void 0 : _a.getFormData()) || {};
       const commitData = {
@@ -214,7 +241,11 @@ const _sfc_main = {
         forbidClick: true,
         duration: 0
       });
-      ctx.$http.post("/base-server/flow/flowApproveDetail/doCommit", commitData, false).then((data) => {
+      ctx.$http.postMobile(
+        "/" + window.$servers.base + "/flow/flowApproveDetail/doCommit",
+        commitData,
+        false
+      ).then((data) => {
         if (data && data.needOper) {
           showFailToast("待开发：需要人工操作的节点");
         } else {
@@ -233,6 +264,7 @@ const _sfc_main = {
       const _component_van_action_bar_button = ActionBarButton;
       const _component_van_action_bar = ActionBar;
       const _component_van_field = Field;
+      const _component_van_form = Form;
       const _component_van_popup = Popup;
       const _component_van_picker = Picker;
       return openBlock(), createElementBlock(Fragment, null, [
@@ -247,7 +279,7 @@ const _sfc_main = {
                 text: item.text,
                 onClick: ($event) => clickHandler(item)
               }, null, 8, ["class", "text", "onClick"]);
-            }), 256)) : (openBlock(), createElementBlock("div", _hoisted_1, " 当前流程任务不支持移动端审批，请前往 PC 端处理 "))
+            }), 256)) : (openBlock(), createElementBlock("div", _hoisted_1, " 当前任务节点，不允许移动端办理，请前往 PC 端处理 "))
           ]),
           _: 1
         }, 8, ["style"]),
@@ -259,38 +291,55 @@ const _sfc_main = {
           style: { "max-height": "80%" }
         }, {
           default: withCtx(() => [
-            createElementVNode("div", _hoisted_2, [
+            createElementVNode("div", {
+              class: "appPopContent",
+              ref_key: "agreePopContentRef",
+              ref: agreePopContentRef
+            }, [
               unref(operPage) ? (openBlock(), createBlock(MobilePage, {
                 key: 0,
                 parentPage: unref(operPage),
                 params: __props.params,
+                onLayoutDataHeight: layoutDataHeight,
                 ref_key: "operPageRef",
                 ref: operPageRef
               }, null, 8, ["parentPage", "params"])) : createCommentVNode("", true),
-              createElementVNode("div", _hoisted_3, [
-                createVNode(_component_van_field, {
-                  modelValue: unref(opinionForm).approveIdea,
-                  "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => unref(opinionForm).approveIdea = $event),
-                  rows: "6",
-                  autosize: "",
-                  label: "意见内容",
-                  type: "textarea",
-                  maxlength: "500",
-                  "show-word-limit": "",
-                  placeholder: "请输入审批意见"
-                }, null, 8, ["modelValue"])
-              ]),
+              createVNode(_component_van_form, {
+                ref_key: "agreeFormRef",
+                ref: agreeFormRef,
+                required: "auto",
+                "show-error": "",
+                "show-error-message": false
+              }, {
+                default: withCtx(() => [
+                  createElementVNode("div", _hoisted_2, [
+                    createVNode(_component_van_field, {
+                      modelValue: unref(opinionForm).approveIdea,
+                      "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => unref(opinionForm).approveIdea = $event),
+                      rows: "6",
+                      autosize: "",
+                      label: "意见内容",
+                      type: "textarea",
+                      maxlength: "500",
+                      "show-word-limit": "",
+                      placeholder: "请输入审批意见",
+                      rules: [{ required: true, message: "请输入审批意见" }]
+                    }, null, 8, ["modelValue"])
+                  ])
+                ]),
+                _: 1
+              }, 512),
               createVNode(_component_van_action_bar, { "safe-area-inset-bottom": "" }, {
                 default: withCtx(() => [
                   createVNode(_component_van_action_bar_button, {
                     class: normalizeClass("icon-blue"),
                     text: "提交",
-                    onClick: submitOpinion
+                    onClick: submitAgreeOpinion
                   })
                 ]),
                 _: 1
               })
-            ])
+            ], 512)
           ]),
           _: 1
         }, 8, ["show"]),
@@ -301,39 +350,53 @@ const _sfc_main = {
           position: "bottom"
         }, {
           default: withCtx(() => [
-            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),
-                  "is-link": "",
-                  readonly: "",
-                  label: "审批意见",
-                  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[6] || (_cache[6] = ($event) => unref(opinionForm).approveIdea = $event),
-                  rows: "6",
-                  autosize: "",
-                  label: "意见内容",
-                  type: "textarea",
-                  maxlength: "500",
-                  "show-word-limit": "",
-                  placeholder: "请输入审批意见"
-                }, null, 8, ["modelValue"])
-              ]),
+            createElementVNode("div", _hoisted_3, [
+              createVNode(_component_van_form, {
+                ref_key: "otherFormRef",
+                ref: otherFormRef,
+                required: "auto",
+                "show-error": "",
+                "show-error-message": false
+              }, {
+                default: withCtx(() => [
+                  createElementVNode("div", _hoisted_4, [
+                    createVNode(_component_van_field, {
+                      modelValue: unref(opinionForm).approveText,
+                      "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => unref(opinionForm).approveText = $event),
+                      "is-link": "",
+                      readonly: "",
+                      label: "审批意见",
+                      placeholder: "请选择审批意见",
+                      rules: [{ required: true, message: "请选择审批意见" }],
+                      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: "请选择目标节点",
+                      rules: [{ required: true, message: "请选择目标节点" }],
+                      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[6] || (_cache[6] = ($event) => unref(opinionForm).approveIdea = $event),
+                      rows: "6",
+                      autosize: "",
+                      label: "意见内容",
+                      type: "textarea",
+                      maxlength: "500",
+                      "show-word-limit": "",
+                      placeholder: "请输入审批意见",
+                      rules: [{ required: true, message: "请输入审批意见" }]
+                    }, null, 8, ["modelValue"])
+                  ])
+                ]),
+                _: 1
+              }, 512),
               createVNode(_component_van_action_bar, { "safe-area-inset-bottom": "" }, {
                 default: withCtx(() => [
                   createVNode(_component_van_action_bar_button, {
@@ -387,7 +450,7 @@ const _sfc_main = {
     };
   }
 };
-const _ApprovalBar = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-8d0c761c"]]);
+const _ApprovalBar = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-09c36d09"]]);
 export {
   _ApprovalBar as default
 };

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

@@ -74,7 +74,7 @@ const _sfc_main = {
               _: 1
             })) : createCommentVNode("", true)
           ]),
-          __props.type != "0" ? (openBlock(), createElementBlock("span", {
+          __props.type != "0" && __props.item.statusText ? (openBlock(), createElementBlock("span", {
             key: 0,
             class: "fec-card-status",
             style: normalizeStyle({ background: __props.item.statusColor || "#fa8c16" })
@@ -83,7 +83,7 @@ const _sfc_main = {
               name: __props.item.statusIcon || "clock-o",
               size: "12"
             }, null, 8, ["name"]),
-            createTextVNode(" " + toDisplayString(__props.item.statusText || "待处理"), 1)
+            createTextVNode(" " + toDisplayString(__props.item.statusText), 1)
           ], 4)) : createCommentVNode("", true)
         ]),
         createElementVNode("div", _hoisted_5, [
@@ -158,7 +158,7 @@ const _sfc_main = {
     };
   }
 };
-const ApprovalCard = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-404eba8c"]]);
+const ApprovalCard = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-7261618f"]]);
 export {
   ApprovalCard as default
 };