@fecp/designer 5.5.111 → 5.5.113

package/lib/packages/mobile/src/components/custom/approvalBar/ApprovalBar.vue.js

@@ -11,73 +11,141 @@ Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toString
 ;/* empty css                                                       */
 ;/* empty css                                                 */
 ;/* empty css                                               */
-;/* empty css                                               */
-;/* empty css                                                */
 ;/* empty css                                                  */
 ;/* empty css                                                */
+;/* empty css                                               */
+;/* empty css                                                */
 ;/* empty css                                                     */
 ;/* empty css                                                 */
 ;/* empty css                                                            */
 const Vue = require("vue");
+const common = require("../../../utils/common.js");
+const pageHistory = require("../../../utils/pageHistory.js");
+const eventBus = require("../../../utils/eventBus.js");
+const page = require("../../../page.vue.js");
+const vuex_esmBundler = require("../../../../../../node_modules/vuex/dist/vuex.esm-bundler.js");
 ;/* empty css                  */
 const _pluginVue_exportHelper = require("../../../../../../_virtual/_plugin-vue_export-helper.js");
+const functionCall = require("../../../../node_modules/vant/es/toast/function-call.js");
+require("../../../../node_modules/vant/es/toast/index.js");
 const index = require("../../../../node_modules/vant/es/action-bar/index.js");
 const index$1 = require("../../../../node_modules/vant/es/action-bar-button/index.js");
 const index$2 = require("../../../../node_modules/vant/es/popup/index.js");
 const index$3 = require("../../../../node_modules/vant/es/field/index.js");
 const index$4 = require("../../../../node_modules/vant/es/picker/index.js");
 const _hoisted_1 = { class: "appPopContent" };
-const _hoisted_2 = { class: "appOptContent" };
+const _hoisted_2 = {
+  class: "appOptContent",
+  style: { "max-height": "235px", "padding-bottom": "0" }
+};
+const _hoisted_3 = { class: "appPopContent" };
+const _hoisted_4 = { class: "appOptContent" };
 const _sfc_main = {
   __name: "ApprovalBar",
   props: {
+    params: {
+      type: Object,
+      default: {}
+    },
+    taskData: {
+      type: Object,
+      default: {}
+    },
     actionBarOptions: {
       type: Array,
       default: []
+    },
+    opinionTypeOptions: {
+      type: Array,
+      default: []
+    },
+    operationPageId: {
+      type: String,
+      default: ""
     }
   },
   setup(__props) {
+    const store = vuex_esmBundler.useStore();
+    const props = __props;
+    const currentInstance = Vue.getCurrentInstance();
+    const ctx = currentInstance.proxy;
+    const pageList = Vue.inject("pageList");
+    const operPage = common.findPageById(pageList.value, props.operationPageId);
     const showAgreePop = Vue.ref(false);
     const showOtherPop = Vue.ref(false);
     const showOpinionPicker = Vue.ref(false);
-    const showTargetNodePicker = Vue.ref(false);
-    const currentActionItem = Vue.ref({});
+    Vue.ref(false);
     const opinionForm = Vue.reactive({
-      opinionType: "",
-      opinionContent: "",
+      approveId: "",
+      approveIdea: "",
       targetNode: ""
     });
+    const opinionTypeOptionsFieldName = {
+      text: "approveIdea",
+      value: "id"
+    };
     function clickHandler(item) {
       console.log("🚀 ~ clickHandler ~ item:", item);
       if (item.approvalType == "agree") {
         showAgreePop.value = true;
       } else if (item.approvalType == "other") {
-        currentActionItem.value = item;
-        opinionForm.opinionType = "";
-        opinionForm.opinionContent = "";
-        opinionForm.targetNode = "";
         showOtherPop.value = true;
       }
     }
     function onOpinionConfirm({ selectedOptions }) {
-      var _a;
-      opinionForm.opinionType = ((_a = selectedOptions[0]) == null ? void 0 : _a.value) || "";
+      var _a, _b, _c;
+      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) || "";
       showOpinionPicker.value = false;
     }
-    function onTargetNodeConfirm({ selectedOptions }) {
-      var _a;
-      opinionForm.targetNode = ((_a = selectedOptions[0]) == null ? void 0 : _a.value) || "";
-      showTargetNodePicker.value = false;
-    }
+    const operPageRef = Vue.ref();
     function submitOpinion() {
-      console.log("提交审批意见:", opinionForm);
-      showOtherPop.value = false;
+      var _a;
+      const formData = ((_a = operPageRef.value) == null ? void 0 : _a.getFormData()) || {};
+      const commitData = {
+        appPageData: formData,
+        approveDesc: opinionForm.approveIdea,
+        approveId: opinionForm.approveId,
+        approveName: opinionForm.approveText || "同意",
+        approveType: opinionForm.approveType || "C1",
+        currentUser: store.getters.user,
+        sendUserId: "",
+        nextUser: "",
+        targetNodeId: "",
+        addSignList: [],
+        taskData: props.taskData,
+        taskId: props.taskData.taskId,
+        variables: {}
+      };
+      console.log("🚀 ~ submitOpinion ~ commitData:", commitData);
+      functionCall.showLoadingToast({
+        message: "提交中...",
+        forbidClick: true,
+        duration: 0
+      });
+      ctx.$http.post("/base-server/flow/flowApproveDetail/doCommit", commitData, false).then((data) => {
+        if (data && data.needOper) {
+          functionCall.showFailToast("待开发：需要人工操作的节点");
+        } else {
+          functionCall.showSuccessToast("提交成功");
+          showOtherPop.value = false;
+          showAgreePop.value = false;
+          goBack();
+        }
+      });
     }
+    const goBack = () => {
+      const prevPage = pageHistory.pageHistory.back();
+      if (prevPage) {
+        eventBus.default.emit("loadPage", { pageId: prevPage.id });
+      }
+    };
     return (_ctx, _cache) => {
       const _component_van_action_bar_button = index$1.ActionBarButton;
       const _component_van_action_bar = index.ActionBar;
-      const _component_van_popup = index$2.Popup;
       const _component_van_field = index$3.Field;
+      const _component_van_popup = index$2.Popup;
       const _component_van_picker = index$4.Picker;
       return Vue.openBlock(), Vue.createElementBlock(Vue.Fragment, null, [
         Vue.createVNode(_component_van_action_bar, { "safe-area-inset-bottom": "" }, {
@@ -94,42 +162,68 @@ const _sfc_main = {
         }),
         Vue.createVNode(_component_van_popup, {
           show: Vue.unref(showAgreePop),
-          "onUpdate:show": _cache[0] || (_cache[0] = ($event) => Vue.isRef(showAgreePop) ? showAgreePop.value = $event : null),
+          "onUpdate:show": _cache[1] || (_cache[1] = ($event) => Vue.isRef(showAgreePop) ? showAgreePop.value = $event : null),
           round: "",
           position: "bottom",
-          style: { height: "30%" }
-        }, null, 8, ["show"]),
+          style: { "height": "80%" }
+        }, {
+          default: Vue.withCtx(() => [
+            Vue.createElementVNode("div", _hoisted_1, [
+              Vue.unref(operPage) ? (Vue.openBlock(), Vue.createBlock(page.default, {
+                key: 0,
+                parentPage: Vue.unref(operPage),
+                params: __props.params,
+                ref_key: "operPageRef",
+                ref: operPageRef
+              }, null, 8, ["parentPage", "params"])) : Vue.createCommentVNode("", true),
+              Vue.createElementVNode("div", _hoisted_2, [
+                Vue.createVNode(_component_van_field, {
+                  modelValue: Vue.unref(opinionForm).approveIdea,
+                  "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => Vue.unref(opinionForm).approveIdea = $event),
+                  rows: "6",
+                  autosize: "",
+                  label: "意见内容",
+                  type: "textarea",
+                  maxlength: "500",
+                  "show-word-limit": "",
+                  placeholder: "请输入审批意见"
+                }, null, 8, ["modelValue"])
+              ]),
+              Vue.createVNode(_component_van_action_bar, { "safe-area-inset-bottom": "" }, {
+                default: Vue.withCtx(() => [
+                  Vue.createVNode(_component_van_action_bar_button, {
+                    class: Vue.normalizeClass("icon-blue"),
+                    text: "提交",
+                    onClick: submitOpinion
+                  })
+                ]),
+                _: 1
+              })
+            ])
+          ]),
+          _: 1
+        }, 8, ["show"]),
         Vue.createVNode(_component_van_popup, {
           show: Vue.unref(showOtherPop),
-          "onUpdate:show": _cache[6] || (_cache[6] = ($event) => Vue.isRef(showOtherPop) ? showOtherPop.value = $event : null),
+          "onUpdate:show": _cache[5] || (_cache[5] = ($event) => Vue.isRef(showOtherPop) ? showOtherPop.value = $event : null),
           round: "",
           position: "bottom"
         }, {
           default: Vue.withCtx(() => [
-            Vue.createElementVNode("div", _hoisted_1, [
-              Vue.createElementVNode("div", _hoisted_2, [
+            Vue.createElementVNode("div", _hoisted_3, [
+              Vue.createElementVNode("div", _hoisted_4, [
                 Vue.createVNode(_component_van_field, {
-                  modelValue: Vue.unref(currentActionItem).opinionType,
-                  "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => Vue.unref(currentActionItem).opinionType = $event),
+                  modelValue: Vue.unref(opinionForm).approveText,
+                  "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => Vue.unref(opinionForm).approveText = $event),
                   "is-link": "",
                   readonly: "",
                   label: "审批意见",
                   placeholder: "请选择审批意见",
-                  onClick: _cache[2] || (_cache[2] = ($event) => showOpinionPicker.value = true)
+                  onClick: _cache[3] || (_cache[3] = ($event) => showOpinionPicker.value = true)
                 }, null, 8, ["modelValue"]),
-                Vue.unref(currentActionItem).needTargetNode ? (Vue.openBlock(), Vue.createBlock(_component_van_field, {
-                  key: 0,
-                  modelValue: Vue.unref(opinionForm).targetNode,
-                  "onUpdate:modelValue": _cache[3] || (_cache[3] = ($event) => Vue.unref(opinionForm).targetNode = $event),
-                  "is-link": "",
-                  readonly: "",
-                  label: "目标节点",
-                  placeholder: "请选择目标节点",
-                  onClick: _cache[4] || (_cache[4] = ($event) => showTargetNodePicker.value = true)
-                }, null, 8, ["modelValue"])) : Vue.createCommentVNode("", true),
                 Vue.createVNode(_component_van_field, {
-                  modelValue: Vue.unref(opinionForm).opinionContent,
-                  "onUpdate:modelValue": _cache[5] || (_cache[5] = ($event) => Vue.unref(opinionForm).opinionContent = $event),
+                  modelValue: Vue.unref(opinionForm).approveIdea,
+                  "onUpdate:modelValue": _cache[4] || (_cache[4] = ($event) => Vue.unref(opinionForm).approveIdea = $event),
                   rows: "6",
                   autosize: "",
                   label: "意见内容",
@@ -155,30 +249,16 @@ const _sfc_main = {
         }, 8, ["show"]),
         Vue.createVNode(_component_van_popup, {
           show: Vue.unref(showOpinionPicker),
-          "onUpdate:show": _cache[8] || (_cache[8] = ($event) => Vue.isRef(showOpinionPicker) ? showOpinionPicker.value = $event : null),
+          "onUpdate:show": _cache[7] || (_cache[7] = ($event) => Vue.isRef(showOpinionPicker) ? showOpinionPicker.value = $event : null),
           round: "",
           position: "bottom"
         }, {
           default: Vue.withCtx(() => [
             Vue.createVNode(_component_van_picker, {
-              columns: Vue.unref(currentActionItem).opinionOptions || [],
+              columns: __props.opinionTypeOptions || [],
+              "columns-field-names": opinionTypeOptionsFieldName,
               onConfirm: onOpinionConfirm,
-              onCancel: _cache[7] || (_cache[7] = ($event) => showOpinionPicker.value = false)
-            }, null, 8, ["columns"])
-          ]),
-          _: 1
-        }, 8, ["show"]),
-        Vue.createVNode(_component_van_popup, {
-          show: Vue.unref(showTargetNodePicker),
-          "onUpdate:show": _cache[10] || (_cache[10] = ($event) => Vue.isRef(showTargetNodePicker) ? showTargetNodePicker.value = $event : null),
-          round: "",
-          position: "bottom"
-        }, {
-          default: Vue.withCtx(() => [
-            Vue.createVNode(_component_van_picker, {
-              columns: Vue.unref(currentActionItem).targetNodeOptions || [],
-              onConfirm: onTargetNodeConfirm,
-              onCancel: _cache[9] || (_cache[9] = ($event) => showTargetNodePicker.value = false)
+              onCancel: _cache[6] || (_cache[6] = ($event) => showOpinionPicker.value = false)
             }, null, 8, ["columns"])
           ]),
           _: 1
@@ -187,5 +267,5 @@ const _sfc_main = {
     };
   }
 };
-const _ApprovalBar = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-fc8cdb72"]]);
+const _ApprovalBar = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-3f63aa02"]]);
 exports.default = _ApprovalBar;

package/lib/packages/mobile/src/components/custom/approvalList/ApprovalCard.vue.js

@@ -93,7 +93,8 @@ const _sfc_main = {
         Vue.createElementVNode("div", _hoisted_7, [
           Vue.createElementVNode("span", _hoisted_8, Vue.toDisplayString(formatTime(__props.item.taskCreateDateTime)), 1),
           Vue.createElementVNode("div", _hoisted_9, [
-            Vue.createVNode(_component_van_button, {
+            __props.type != 0 ? (Vue.openBlock(), Vue.createBlock(_component_van_button, {
+              key: 0,
               plain: "",
               hairline: "",
               round: "",
@@ -104,21 +105,21 @@ const _sfc_main = {
                 Vue.createTextVNode(" 查看 ")
               ])),
               _: 1
-            }),
+            })) : Vue.createCommentVNode("", true),
             __props.type == 0 ? (Vue.openBlock(), Vue.createBlock(_component_van_button, {
-              key: 0,
+              key: 1,
               type: "primary",
               round: "",
               size: "small",
               onClick: _cache[1] || (_cache[1] = ($event) => _ctx.$emit("approve", __props.item))
             }, {
               default: Vue.withCtx(() => _cache[4] || (_cache[4] = [
-                Vue.createTextVNode(" 同意 ")
+                Vue.createTextVNode(" 审批 ")
               ])),
               _: 1
             })) : Vue.createCommentVNode("", true),
             __props.type == 1 ? (Vue.openBlock(), Vue.createBlock(_component_van_button, {
-              key: 1,
+              key: 2,
               type: "warning",
               round: "",
               size: "small",
@@ -135,5 +136,5 @@ const _sfc_main = {
     };
   }
 };
-const ApprovalCard = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-8bbf96c9"]]);
+const ApprovalCard = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-0c40807f"]]);
 exports.default = ApprovalCard;

package/lib/packages/mobile/src/components/custom/approvalList/ApprovalList.vue.js

@@ -15,6 +15,7 @@ Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toString
 ;/* empty css                                                 */
 const Vue = require("vue");
 const ApprovalCard = require("./ApprovalCard.vue.js");
+const eventBus = require("../../../utils/eventBus.js");
 ;/* empty css                   */
 const _pluginVue_exportHelper = require("../../../../../../_virtual/_plugin-vue_export-helper.js");
 const index = require("../../../../node_modules/vant/es/search/index.js");
@@ -24,13 +25,16 @@ const index$3 = require("../../../../node_modules/vant/es/list/index.js");
 const _hoisted_1 = { class: "fec-mobile-approval-list" };
 const _hoisted_2 = { class: "fec-tab-content" };
 const _hoisted_3 = { class: "fec-tab-content" };
-const _hoisted_4 = { class: "fec-list" };
-const _hoisted_5 = { class: "fec-tab-content" };
-const _hoisted_6 = { class: "fec-list" };
+const _hoisted_4 = { class: "fec-tab-content" };
 const _sfc_main = {
   __name: "ApprovalList",
-  props: {},
+  props: {
+    todoPage: String,
+    donePage: String,
+    ccPage: String
+  },
   setup(__props) {
+    const props = __props;
     const currentInstance = Vue.getCurrentInstance();
     const ctx = currentInstance.proxy;
     ctx.route;
@@ -39,28 +43,50 @@ const _sfc_main = {
     const doneList = Vue.ref([]);
     const ccList = Vue.ref([]);
     const searchData = Vue.ref("");
-    const finished = Vue.ref(false);
-    const loading = Vue.ref(false);
-    let pageNo = 1;
+    const todoLoading = Vue.ref(false);
+    const todoFinished = Vue.ref(false);
+    const doneLoading = Vue.ref(false);
+    const doneFinished = Vue.ref(false);
+    const ccLoading = Vue.ref(false);
+    const ccFinished = Vue.ref(false);
+    let todoPageNo = 0;
+    let donePageNo = 0;
+    let ccPageNo = 0;
     let pageSize = 10;
-    function onLoad() {
-      loading.value = true;
-      pageNo++;
-      call();
+    const todoError = Vue.ref(false);
+    const doneError = Vue.ref(false);
+    const ccError = Vue.ref(false);
+    function onTodoLoad() {
+      todoLoading.value = true;
+      todoPageNo++;
+      call("0");
     }
-    function call() {
+    function onDoneLoad() {
+      doneLoading.value = true;
+      donePageNo++;
+      call("1");
+    }
+    function onCcLoad() {
+      ccLoading.value = true;
+      ccPageNo++;
+      call("2");
+    }
+    function call(taskStatus) {
+      const errorRef = taskStatus == "0" ? todoError : taskStatus == "1" ? doneError : ccError;
+      errorRef.value = false;
+      const pageNo = taskStatus == "0" ? todoPageNo : taskStatus == "1" ? donePageNo : ccPageNo;
       ctx.$http.post(
         "/base-server/flow/workbench/findTaskListByPage",
         {
           pageNo,
           pageSize,
-          taskStatus: activeName.value,
+          taskStatus,
           searchData: searchData.value
         },
         false
       ).then((data) => {
         const list = data.list;
-        switch (activeName.value) {
+        switch (taskStatus) {
           case "0":
             list.forEach((item) => {
               item.statusColor = item.statusColor || "#fa8c16";
@@ -68,32 +94,91 @@ const _sfc_main = {
               item.statusText = item.statusText || "待处理";
             });
             todoList.value.push(...list);
+            if (list.length < pageSize) {
+              todoFinished.value = true;
+            }
             break;
           case "1":
-            doneList.value = list;
+            list.forEach((item) => {
+              item.statusColor = item.statusColor || "#52c41a";
+              item.statusIcon = item.statusIcon || "checked";
+              item.statusText = item.statusText || "已完成";
+            });
+            doneList.value.push(...list);
+            if (list.length < pageSize) {
+              doneFinished.value = true;
+            }
             break;
           case "2":
-            ccList.value = list;
+            list.forEach((item) => {
+              item.statusColor = item.statusColor || "#52c41a";
+              item.statusIcon = item.statusIcon || "checked";
+              item.statusText = item.statusText || "已完成";
+            });
+            ccList.value.push(...list);
+            if (list.length < pageSize) {
+              ccFinished.value = true;
+            }
             break;
         }
-        if (list.length < pageSize) {
-          finished.value = true;
-        }
+      }).catch((err) => {
+        errorRef.value = true;
       }).finally(() => {
-        loading.value = false;
+        switch (taskStatus) {
+          case "0":
+            todoLoading.value = false;
+            break;
+          case "1":
+            doneLoading.value = false;
+            break;
+          case "2":
+            ccLoading.value = false;
+            break;
+        }
       });
     }
     function onView(item) {
       console.log("查看:", item);
     }
     function onApprove(item) {
-      console.log("同意:", item);
+      console.log("审批:", item);
+      if (props.todoPage) {
+        const params = {
+          traceNo: item.traceNo,
+          taskId: item.taskId,
+          type: "0",
+          taskData: item
+        };
+        eventBus.default.emit("loadPage", {
+          pageId: props.todoPage,
+          params
+        });
+      }
     }
     function onRevoke(item) {
       console.log("撤销:", item);
     }
     function onSearch(val) {
-      console.log("🚀 ~ onSearch ~ val:", val);
+      todoList.value = [];
+      todoFinished.value = false;
+      todoPageNo = 0;
+      doneList.value = [];
+      doneFinished.value = false;
+      donePageNo = 0;
+      ccList.value = [];
+      ccFinished.value = false;
+      ccPageNo = 0;
+      switch (activeName.value) {
+        case "0":
+          onTodoLoad();
+          break;
+        case "1":
+          onDoneLoad();
+          break;
+        case "2":
+          onCcLoad();
+          break;
+      }
     }
     return (_ctx, _cache) => {
       const _component_van_search = index.Search;
@@ -113,7 +198,7 @@ const _sfc_main = {
           sticky: "",
           class: "fec-tabs",
           active: Vue.unref(activeName),
-          "onUpdate:active": _cache[2] || (_cache[2] = ($event) => Vue.isRef(activeName) ? activeName.value = $event : null),
+          "onUpdate:active": _cache[7] || (_cache[7] = ($event) => Vue.isRef(activeName) ? activeName.value = $event : null),
           swipeable: "",
           "lazy-render": ""
         }, {
@@ -127,11 +212,15 @@ const _sfc_main = {
               default: Vue.withCtx(() => [
                 Vue.createElementVNode("div", _hoisted_2, [
                   Vue.createVNode(_component_van_list, {
-                    loading: Vue.unref(loading),
-                    "onUpdate:loading": _cache[1] || (_cache[1] = ($event) => Vue.isRef(loading) ? loading.value = $event : null),
-                    finished: Vue.unref(finished),
+                    loading: Vue.unref(todoLoading),
+                    "onUpdate:loading": _cache[1] || (_cache[1] = ($event) => Vue.isRef(todoLoading) ? todoLoading.value = $event : null),
+                    error: Vue.unref(todoError),
+                    "onUpdate:error": _cache[2] || (_cache[2] = ($event) => Vue.isRef(todoError) ? todoError.value = $event : null),
+                    finished: Vue.unref(todoFinished),
+                    offset: 50,
                     "finished-text": "没有更多了",
-                    onLoad,
+                    onLoad: onTodoLoad,
+                    "error-text": "请求失败，点击重新加载",
                     class: "fec-list"
                   }, {
                     default: Vue.withCtx(() => [
@@ -140,13 +229,12 @@ const _sfc_main = {
                           key: item.id,
                           item,
                           type: 0,
-                          onView,
                           onApprove
                         }, null, 8, ["item"]);
                       }), 128))
                     ]),
                     _: 1
-                  }, 8, ["loading", "finished"])
+                  }, 8, ["loading", "error", "finished"])
                 ])
               ]),
               _: 1
@@ -159,17 +247,31 @@ const _sfc_main = {
             }, {
               default: Vue.withCtx(() => [
                 Vue.createElementVNode("div", _hoisted_3, [
-                  Vue.createElementVNode("div", _hoisted_4, [
-                    (Vue.openBlock(true), Vue.createElementBlock(Vue.Fragment, null, Vue.renderList(Vue.unref(doneList), (item) => {
-                      return Vue.openBlock(), Vue.createBlock(ApprovalCard.default, {
-                        key: item.id,
-                        item,
-                        type: 1,
-                        onView,
-                        onRevoke
-                      }, null, 8, ["item"]);
-                    }), 128))
-                  ])
+                  Vue.createVNode(_component_van_list, {
+                    loading: Vue.unref(doneLoading),
+                    "onUpdate:loading": _cache[3] || (_cache[3] = ($event) => Vue.isRef(doneLoading) ? doneLoading.value = $event : null),
+                    error: Vue.unref(doneError),
+                    "onUpdate:error": _cache[4] || (_cache[4] = ($event) => Vue.isRef(doneError) ? doneError.value = $event : null),
+                    finished: Vue.unref(doneFinished),
+                    offset: 50,
+                    "finished-text": "没有更多了",
+                    "error-text": "请求失败，点击重新加载",
+                    onLoad: onDoneLoad,
+                    class: "fec-list"
+                  }, {
+                    default: Vue.withCtx(() => [
+                      (Vue.openBlock(true), Vue.createElementBlock(Vue.Fragment, null, Vue.renderList(Vue.unref(doneList), (item) => {
+                        return Vue.openBlock(), Vue.createBlock(ApprovalCard.default, {
+                          key: item.id,
+                          item,
+                          type: 1,
+                          onView,
+                          onRevoke
+                        }, null, 8, ["item"]);
+                      }), 128))
+                    ]),
+                    _: 1
+                  }, 8, ["loading", "error", "finished"])
                 ])
               ]),
               _: 1
@@ -181,17 +283,31 @@ const _sfc_main = {
               "show-zero-badge": false
             }, {
               default: Vue.withCtx(() => [
-                Vue.createElementVNode("div", _hoisted_5, [
-                  Vue.createElementVNode("div", _hoisted_6, [
-                    (Vue.openBlock(true), Vue.createElementBlock(Vue.Fragment, null, Vue.renderList(Vue.unref(ccList), (item) => {
-                      return Vue.openBlock(), Vue.createBlock(ApprovalCard.default, {
-                        key: item.id,
-                        item,
-                        type: 2,
-                        onView
-                      }, null, 8, ["item"]);
-                    }), 128))
-                  ])
+                Vue.createElementVNode("div", _hoisted_4, [
+                  Vue.createVNode(_component_van_list, {
+                    loading: Vue.unref(ccLoading),
+                    "onUpdate:loading": _cache[5] || (_cache[5] = ($event) => Vue.isRef(ccLoading) ? ccLoading.value = $event : null),
+                    error: Vue.unref(ccError),
+                    "onUpdate:error": _cache[6] || (_cache[6] = ($event) => Vue.isRef(ccError) ? ccError.value = $event : null),
+                    finished: Vue.unref(ccFinished),
+                    offset: 50,
+                    "finished-text": "没有更多了",
+                    "error-text": "请求失败，点击重新加载",
+                    onLoad: onCcLoad,
+                    class: "fec-list"
+                  }, {
+                    default: Vue.withCtx(() => [
+                      (Vue.openBlock(true), Vue.createElementBlock(Vue.Fragment, null, Vue.renderList(Vue.unref(ccList), (item) => {
+                        return Vue.openBlock(), Vue.createBlock(ApprovalCard.default, {
+                          key: item.id,
+                          item,
+                          type: 2,
+                          onView
+                        }, null, 8, ["item"]);
+                      }), 128))
+                    ]),
+                    _: 1
+                  }, 8, ["loading", "error", "finished"])
                 ])
               ]),
               _: 1
@@ -203,5 +319,5 @@ const _sfc_main = {
     };
   }
 };
-const _ApprovalList = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-15b64ae4"]]);
+const _ApprovalList = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-64531f31"]]);
 exports.default = _ApprovalList;