@fecp/designer 5.5.111 → 5.5.113

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (103) hide show
  1. package/es/designer/package.json.mjs +1 -1
  2. package/es/designer/src/components/DocumentParam.vue.mjs +1 -1
  3. package/es/designer/src/components/ParamsConfig.vue2.mjs +1 -1
  4. package/es/designer/src/layout/aside/HiddenFieldDialog.vue.mjs +1 -1
  5. package/es/designer/src/packages/advancedFilter/ValueInput.vue2.mjs +1 -1
  6. package/es/designer/src/packages/dataLinkage/index.vue.mjs +1 -1
  7. package/es/designer/src/packages/dialogGlobal/index.vue2.mjs +1 -1
  8. package/es/designer/src/packages/eventFlow/dialog/action/RiskSch.vue.mjs +1 -1
  9. package/es/designer/src/packages/form/property/approvalHistory.vue.mjs +1 -1
  10. package/es/designer/src/packages/form/property/contract.vue.mjs +1 -1
  11. package/es/designer/src/packages/form/property/document.vue.mjs +25 -11
  12. package/es/designer/src/packages/form/property/subForm.vue.mjs +1 -1
  13. package/es/designer/src/packages/prod/index.vue.mjs +1 -1
  14. package/es/designer/src/packages/table/headerBtn.vue.mjs +1 -1
  15. package/es/designer.css +554 -132
  16. package/es/packages/mobile/index.mjs +2 -2
  17. package/es/packages/mobile/src/components/all.mjs +4 -2
  18. package/es/packages/mobile/src/components/custom/appDetail/AppDetail.vue.mjs +40 -11
  19. package/es/packages/mobile/src/components/custom/appTimeLine/AppTimeLine.vue.mjs +471 -0
  20. package/es/packages/mobile/src/components/custom/appTimeLine/index.mjs +10 -0
  21. package/es/packages/mobile/src/components/custom/approvalBar/ApprovalBar.vue.mjs +142 -62
  22. package/es/packages/mobile/src/components/custom/approvalList/ApprovalCard.vue.mjs +7 -6
  23. package/es/packages/mobile/src/components/custom/approvalList/ApprovalList.vue.mjs +168 -52
  24. package/es/packages/mobile/src/components/custom/document/Document.vue.mjs +258 -0
  25. package/es/packages/mobile/src/components/custom/document/assets/404.png.mjs +4 -0
  26. package/es/packages/mobile/src/components/custom/document/assets/audio.png.mjs +4 -0
  27. package/es/packages/mobile/src/components/custom/document/assets/black.png.mjs +4 -0
  28. package/es/packages/mobile/src/components/custom/document/assets/exl.png.mjs +4 -0
  29. package/es/packages/mobile/src/components/custom/document/assets/folder.png.mjs +4 -0
  30. package/es/packages/mobile/src/components/custom/document/assets/img.png.mjs +4 -0
  31. package/es/packages/mobile/src/components/custom/document/assets/other.png.mjs +4 -0
  32. package/es/packages/mobile/src/components/custom/document/assets/pdf.png.mjs +4 -0
  33. package/es/packages/mobile/src/components/custom/document/assets/ppt.png.mjs +4 -0
  34. package/es/packages/mobile/src/components/custom/document/assets/rar.png.mjs +4 -0
  35. package/es/packages/mobile/src/components/custom/document/assets/supp.png.mjs +4 -0
  36. package/es/packages/mobile/src/components/custom/document/assets/txt.png.mjs +4 -0
  37. package/es/packages/mobile/src/components/custom/document/assets/upload.png.mjs +4 -0
  38. package/es/packages/mobile/src/components/custom/document/assets/uploadBu.png.mjs +4 -0
  39. package/es/packages/mobile/src/components/custom/document/assets/uploadBuHover.png.mjs +4 -0
  40. package/es/packages/mobile/src/components/custom/document/assets/uploadHover.png.mjs +4 -0
  41. package/es/packages/mobile/src/components/custom/document/assets/video.png.mjs +4 -0
  42. package/es/packages/mobile/src/components/custom/document/assets/word.png.mjs +4 -0
  43. package/es/packages/mobile/src/components/custom/document/index.mjs +10 -0
  44. package/es/packages/mobile/src/components/custom/timeLineFilter/index.mjs +1 -5
  45. package/es/packages/mobile/src/components/dataDisplay/menuGrid/MenuGrid.vue.mjs +2 -2
  46. package/es/packages/mobile/src/components/navigation/navBar/NavBar.vue.mjs +2 -2
  47. package/es/packages/mobile/src/components/navigation/tabs/Tabs.vue.mjs +15 -7
  48. package/es/packages/mobile/src/index.vue.mjs +3 -3
  49. package/es/packages/mobile/src/page.vue.mjs +53 -3
  50. package/es/packages/vue/src/components/bus/document/Document.vue.mjs +1 -1
  51. package/es/packages/vue/src/utils/datasource.mjs +5 -1
  52. package/lib/designer/package.json.js +1 -1
  53. package/lib/designer/src/components/DocumentParam.vue.js +1 -1
  54. package/lib/designer/src/components/ParamsConfig.vue2.js +1 -1
  55. package/lib/designer/src/layout/aside/HiddenFieldDialog.vue.js +1 -1
  56. package/lib/designer/src/packages/advancedFilter/ValueInput.vue2.js +1 -1
  57. package/lib/designer/src/packages/dataLinkage/index.vue.js +1 -1
  58. package/lib/designer/src/packages/dialogGlobal/index.vue2.js +1 -1
  59. package/lib/designer/src/packages/eventFlow/dialog/action/RiskSch.vue.js +1 -1
  60. package/lib/designer/src/packages/form/property/approvalHistory.vue.js +1 -1
  61. package/lib/designer/src/packages/form/property/contract.vue.js +1 -1
  62. package/lib/designer/src/packages/form/property/document.vue.js +27 -13
  63. package/lib/designer/src/packages/form/property/subForm.vue.js +1 -1
  64. package/lib/designer/src/packages/prod/index.vue.js +1 -1
  65. package/lib/designer/src/packages/table/headerBtn.vue.js +1 -1
  66. package/lib/designer.css +554 -132
  67. package/lib/packages/mobile/index.js +8 -8
  68. package/lib/packages/mobile/src/components/all.js +10 -8
  69. package/lib/packages/mobile/src/components/custom/appDetail/AppDetail.vue.js +39 -10
  70. package/lib/packages/mobile/src/components/custom/appTimeLine/AppTimeLine.vue.js +471 -0
  71. package/lib/packages/mobile/src/components/custom/appTimeLine/index.js +10 -0
  72. package/lib/packages/mobile/src/components/custom/approvalBar/ApprovalBar.vue.js +141 -61
  73. package/lib/packages/mobile/src/components/custom/approvalList/ApprovalCard.vue.js +7 -6
  74. package/lib/packages/mobile/src/components/custom/approvalList/ApprovalList.vue.js +168 -52
  75. package/lib/packages/mobile/src/components/custom/document/Document.vue.js +258 -0
  76. package/lib/packages/mobile/src/components/custom/document/assets/404.png.js +4 -0
  77. package/lib/packages/mobile/src/components/custom/document/assets/audio.png.js +4 -0
  78. package/lib/packages/mobile/src/components/custom/document/assets/black.png.js +4 -0
  79. package/lib/packages/mobile/src/components/custom/document/assets/exl.png.js +4 -0
  80. package/lib/packages/mobile/src/components/custom/document/assets/folder.png.js +4 -0
  81. package/lib/packages/mobile/src/components/custom/document/assets/img.png.js +4 -0
  82. package/lib/packages/mobile/src/components/custom/document/assets/other.png.js +4 -0
  83. package/lib/packages/mobile/src/components/custom/document/assets/pdf.png.js +4 -0
  84. package/lib/packages/mobile/src/components/custom/document/assets/ppt.png.js +4 -0
  85. package/lib/packages/mobile/src/components/custom/document/assets/rar.png.js +4 -0
  86. package/lib/packages/mobile/src/components/custom/document/assets/supp.png.js +4 -0
  87. package/lib/packages/mobile/src/components/custom/document/assets/txt.png.js +4 -0
  88. package/lib/packages/mobile/src/components/custom/document/assets/upload.png.js +4 -0
  89. package/lib/packages/mobile/src/components/custom/document/assets/uploadBu.png.js +4 -0
  90. package/lib/packages/mobile/src/components/custom/document/assets/uploadBuHover.png.js +4 -0
  91. package/lib/packages/mobile/src/components/custom/document/assets/uploadHover.png.js +4 -0
  92. package/lib/packages/mobile/src/components/custom/document/assets/video.png.js +4 -0
  93. package/lib/packages/mobile/src/components/custom/document/assets/word.png.js +4 -0
  94. package/lib/packages/mobile/src/components/custom/document/index.js +10 -0
  95. package/lib/packages/mobile/src/components/custom/timeLineFilter/index.js +1 -4
  96. package/lib/packages/mobile/src/components/dataDisplay/menuGrid/MenuGrid.vue.js +2 -2
  97. package/lib/packages/mobile/src/components/navigation/navBar/NavBar.vue.js +2 -2
  98. package/lib/packages/mobile/src/components/navigation/tabs/Tabs.vue.js +14 -6
  99. package/lib/packages/mobile/src/index.vue.js +3 -3
  100. package/lib/packages/mobile/src/page.vue.js +53 -3
  101. package/lib/packages/vue/src/components/bus/document/Document.vue.js +1 -1
  102. package/lib/packages/vue/src/utils/datasource.js +5 -1
  103. package/package.json +1 -1
@@ -9,73 +9,141 @@
9
9
  /* empty css */
10
10
  /* empty css */
11
11
  /* empty css */
12
- /* empty css */
13
- /* empty css */
14
12
  /* empty css */
15
13
  /* empty css */
14
+ /* empty css */
15
+ /* empty css */
16
16
  /* empty css */
17
17
  /* empty css */
18
18
  /* empty css */
19
- import { ref, reactive, createElementBlock, openBlock, Fragment, createVNode, withCtx, renderList, createBlock, normalizeClass, unref, isRef, createElementVNode, createCommentVNode } from "vue";
19
+ import { getCurrentInstance, inject, ref, reactive, createElementBlock, openBlock, Fragment, createVNode, withCtx, renderList, createBlock, normalizeClass, unref, isRef, createElementVNode, createCommentVNode } from "vue";
20
+ import { findPageById } from "../../../utils/common.mjs";
21
+ import { pageHistory } from "../../../utils/pageHistory.mjs";
22
+ import emitter from "../../../utils/eventBus.mjs";
23
+ import MobilePage from "../../../page.vue.mjs";
24
+ import { useStore } from "../../../../../../node_modules/vuex/dist/vuex.esm-bundler.mjs";
20
25
  /* empty css */
21
26
  import _export_sfc from "../../../../../../_virtual/_plugin-vue_export-helper.mjs";
27
+ import { showLoadingToast, showFailToast, showSuccessToast } from "../../../../node_modules/vant/es/toast/function-call.mjs";
28
+ import "../../../../node_modules/vant/es/toast/index.mjs";
22
29
  import { ActionBar } from "../../../../node_modules/vant/es/action-bar/index.mjs";
23
30
  import { ActionBarButton } from "../../../../node_modules/vant/es/action-bar-button/index.mjs";
24
31
  import { Popup } from "../../../../node_modules/vant/es/popup/index.mjs";
25
32
  import { Field } from "../../../../node_modules/vant/es/field/index.mjs";
26
33
  import { Picker } from "../../../../node_modules/vant/es/picker/index.mjs";
27
34
  const _hoisted_1 = { class: "appPopContent" };
28
- const _hoisted_2 = { class: "appOptContent" };
35
+ const _hoisted_2 = {
36
+ class: "appOptContent",
37
+ style: { "max-height": "235px", "padding-bottom": "0" }
38
+ };
39
+ const _hoisted_3 = { class: "appPopContent" };
40
+ const _hoisted_4 = { class: "appOptContent" };
29
41
  const _sfc_main = {
30
42
  __name: "ApprovalBar",
31
43
  props: {
44
+ params: {
45
+ type: Object,
46
+ default: {}
47
+ },
48
+ taskData: {
49
+ type: Object,
50
+ default: {}
51
+ },
32
52
  actionBarOptions: {
33
53
  type: Array,
34
54
  default: []
55
+ },
56
+ opinionTypeOptions: {
57
+ type: Array,
58
+ default: []
59
+ },
60
+ operationPageId: {
61
+ type: String,
62
+ default: ""
35
63
  }
36
64
  },
37
65
  setup(__props) {
66
+ const store = useStore();
67
+ const props = __props;
68
+ const currentInstance = getCurrentInstance();
69
+ const ctx = currentInstance.proxy;
70
+ const pageList = inject("pageList");
71
+ const operPage = findPageById(pageList.value, props.operationPageId);
38
72
  const showAgreePop = ref(false);
39
73
  const showOtherPop = ref(false);
40
74
  const showOpinionPicker = ref(false);
41
- const showTargetNodePicker = ref(false);
42
- const currentActionItem = ref({});
75
+ ref(false);
43
76
  const opinionForm = reactive({
44
- opinionType: "",
45
- opinionContent: "",
77
+ approveId: "",
78
+ approveIdea: "",
46
79
  targetNode: ""
47
80
  });
81
+ const opinionTypeOptionsFieldName = {
82
+ text: "approveIdea",
83
+ value: "id"
84
+ };
48
85
  function clickHandler(item) {
49
86
  console.log("🚀 ~ clickHandler ~ item:", item);
50
87
  if (item.approvalType == "agree") {
51
88
  showAgreePop.value = true;
52
89
  } else if (item.approvalType == "other") {
53
- currentActionItem.value = item;
54
- opinionForm.opinionType = "";
55
- opinionForm.opinionContent = "";
56
- opinionForm.targetNode = "";
57
90
  showOtherPop.value = true;
58
91
  }
59
92
  }
60
93
  function onOpinionConfirm({ selectedOptions }) {
61
- var _a;
62
- opinionForm.opinionType = ((_a = selectedOptions[0]) == null ? void 0 : _a.value) || "";
94
+ var _a, _b, _c;
95
+ opinionForm.approveId = ((_a = selectedOptions[0]) == null ? void 0 : _a.id) || "";
96
+ opinionForm.approveText = ((_b = selectedOptions[0]) == null ? void 0 : _b.approveIdea) || "";
97
+ opinionForm.approveType = ((_c = selectedOptions[0]) == null ? void 0 : _c.approveType) || "";
63
98
  showOpinionPicker.value = false;
64
99
  }
65
- function onTargetNodeConfirm({ selectedOptions }) {
66
- var _a;
67
- opinionForm.targetNode = ((_a = selectedOptions[0]) == null ? void 0 : _a.value) || "";
68
- showTargetNodePicker.value = false;
69
- }
100
+ const operPageRef = ref();
70
101
  function submitOpinion() {
71
- console.log("提交审批意见:", opinionForm);
72
- showOtherPop.value = false;
102
+ var _a;
103
+ const formData = ((_a = operPageRef.value) == null ? void 0 : _a.getFormData()) || {};
104
+ const commitData = {
105
+ appPageData: formData,
106
+ approveDesc: opinionForm.approveIdea,
107
+ approveId: opinionForm.approveId,
108
+ approveName: opinionForm.approveText || "同意",
109
+ approveType: opinionForm.approveType || "C1",
110
+ currentUser: store.getters.user,
111
+ sendUserId: "",
112
+ nextUser: "",
113
+ targetNodeId: "",
114
+ addSignList: [],
115
+ taskData: props.taskData,
116
+ taskId: props.taskData.taskId,
117
+ variables: {}
118
+ };
119
+ console.log("🚀 ~ submitOpinion ~ commitData:", commitData);
120
+ showLoadingToast({
121
+ message: "提交中...",
122
+ forbidClick: true,
123
+ duration: 0
124
+ });
125
+ ctx.$http.post("/base-server/flow/flowApproveDetail/doCommit", commitData, false).then((data) => {
126
+ if (data && data.needOper) {
127
+ showFailToast("待开发:需要人工操作的节点");
128
+ } else {
129
+ showSuccessToast("提交成功");
130
+ showOtherPop.value = false;
131
+ showAgreePop.value = false;
132
+ goBack();
133
+ }
134
+ });
73
135
  }
136
+ const goBack = () => {
137
+ const prevPage = pageHistory.back();
138
+ if (prevPage) {
139
+ emitter.emit("loadPage", { pageId: prevPage.id });
140
+ }
141
+ };
74
142
  return (_ctx, _cache) => {
75
143
  const _component_van_action_bar_button = ActionBarButton;
76
144
  const _component_van_action_bar = ActionBar;
77
- const _component_van_popup = Popup;
78
145
  const _component_van_field = Field;
146
+ const _component_van_popup = Popup;
79
147
  const _component_van_picker = Picker;
80
148
  return openBlock(), createElementBlock(Fragment, null, [
81
149
  createVNode(_component_van_action_bar, { "safe-area-inset-bottom": "" }, {
@@ -92,42 +160,68 @@ const _sfc_main = {
92
160
  }),
93
161
  createVNode(_component_van_popup, {
94
162
  show: unref(showAgreePop),
95
- "onUpdate:show": _cache[0] || (_cache[0] = ($event) => isRef(showAgreePop) ? showAgreePop.value = $event : null),
163
+ "onUpdate:show": _cache[1] || (_cache[1] = ($event) => isRef(showAgreePop) ? showAgreePop.value = $event : null),
96
164
  round: "",
97
165
  position: "bottom",
98
- style: { height: "30%" }
99
- }, null, 8, ["show"]),
166
+ style: { "height": "80%" }
167
+ }, {
168
+ default: withCtx(() => [
169
+ createElementVNode("div", _hoisted_1, [
170
+ unref(operPage) ? (openBlock(), createBlock(MobilePage, {
171
+ key: 0,
172
+ parentPage: unref(operPage),
173
+ params: __props.params,
174
+ ref_key: "operPageRef",
175
+ ref: operPageRef
176
+ }, null, 8, ["parentPage", "params"])) : createCommentVNode("", true),
177
+ createElementVNode("div", _hoisted_2, [
178
+ createVNode(_component_van_field, {
179
+ modelValue: unref(opinionForm).approveIdea,
180
+ "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => unref(opinionForm).approveIdea = $event),
181
+ rows: "6",
182
+ autosize: "",
183
+ label: "意见内容",
184
+ type: "textarea",
185
+ maxlength: "500",
186
+ "show-word-limit": "",
187
+ placeholder: "请输入审批意见"
188
+ }, null, 8, ["modelValue"])
189
+ ]),
190
+ createVNode(_component_van_action_bar, { "safe-area-inset-bottom": "" }, {
191
+ default: withCtx(() => [
192
+ createVNode(_component_van_action_bar_button, {
193
+ class: normalizeClass("icon-blue"),
194
+ text: "提交",
195
+ onClick: submitOpinion
196
+ })
197
+ ]),
198
+ _: 1
199
+ })
200
+ ])
201
+ ]),
202
+ _: 1
203
+ }, 8, ["show"]),
100
204
  createVNode(_component_van_popup, {
101
205
  show: unref(showOtherPop),
102
- "onUpdate:show": _cache[6] || (_cache[6] = ($event) => isRef(showOtherPop) ? showOtherPop.value = $event : null),
206
+ "onUpdate:show": _cache[5] || (_cache[5] = ($event) => isRef(showOtherPop) ? showOtherPop.value = $event : null),
103
207
  round: "",
104
208
  position: "bottom"
105
209
  }, {
106
210
  default: withCtx(() => [
107
- createElementVNode("div", _hoisted_1, [
108
- createElementVNode("div", _hoisted_2, [
211
+ createElementVNode("div", _hoisted_3, [
212
+ createElementVNode("div", _hoisted_4, [
109
213
  createVNode(_component_van_field, {
110
- modelValue: unref(currentActionItem).opinionType,
111
- "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => unref(currentActionItem).opinionType = $event),
214
+ modelValue: unref(opinionForm).approveText,
215
+ "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => unref(opinionForm).approveText = $event),
112
216
  "is-link": "",
113
217
  readonly: "",
114
218
  label: "审批意见",
115
219
  placeholder: "请选择审批意见",
116
- onClick: _cache[2] || (_cache[2] = ($event) => showOpinionPicker.value = true)
220
+ onClick: _cache[3] || (_cache[3] = ($event) => showOpinionPicker.value = true)
117
221
  }, null, 8, ["modelValue"]),
118
- unref(currentActionItem).needTargetNode ? (openBlock(), createBlock(_component_van_field, {
119
- key: 0,
120
- modelValue: unref(opinionForm).targetNode,
121
- "onUpdate:modelValue": _cache[3] || (_cache[3] = ($event) => unref(opinionForm).targetNode = $event),
122
- "is-link": "",
123
- readonly: "",
124
- label: "目标节点",
125
- placeholder: "请选择目标节点",
126
- onClick: _cache[4] || (_cache[4] = ($event) => showTargetNodePicker.value = true)
127
- }, null, 8, ["modelValue"])) : createCommentVNode("", true),
128
222
  createVNode(_component_van_field, {
129
- modelValue: unref(opinionForm).opinionContent,
130
- "onUpdate:modelValue": _cache[5] || (_cache[5] = ($event) => unref(opinionForm).opinionContent = $event),
223
+ modelValue: unref(opinionForm).approveIdea,
224
+ "onUpdate:modelValue": _cache[4] || (_cache[4] = ($event) => unref(opinionForm).approveIdea = $event),
131
225
  rows: "6",
132
226
  autosize: "",
133
227
  label: "意见内容",
@@ -153,30 +247,16 @@ const _sfc_main = {
153
247
  }, 8, ["show"]),
154
248
  createVNode(_component_van_popup, {
155
249
  show: unref(showOpinionPicker),
156
- "onUpdate:show": _cache[8] || (_cache[8] = ($event) => isRef(showOpinionPicker) ? showOpinionPicker.value = $event : null),
250
+ "onUpdate:show": _cache[7] || (_cache[7] = ($event) => isRef(showOpinionPicker) ? showOpinionPicker.value = $event : null),
157
251
  round: "",
158
252
  position: "bottom"
159
253
  }, {
160
254
  default: withCtx(() => [
161
255
  createVNode(_component_van_picker, {
162
- columns: unref(currentActionItem).opinionOptions || [],
256
+ columns: __props.opinionTypeOptions || [],
257
+ "columns-field-names": opinionTypeOptionsFieldName,
163
258
  onConfirm: onOpinionConfirm,
164
- onCancel: _cache[7] || (_cache[7] = ($event) => showOpinionPicker.value = false)
165
- }, null, 8, ["columns"])
166
- ]),
167
- _: 1
168
- }, 8, ["show"]),
169
- createVNode(_component_van_popup, {
170
- show: unref(showTargetNodePicker),
171
- "onUpdate:show": _cache[10] || (_cache[10] = ($event) => isRef(showTargetNodePicker) ? showTargetNodePicker.value = $event : null),
172
- round: "",
173
- position: "bottom"
174
- }, {
175
- default: withCtx(() => [
176
- createVNode(_component_van_picker, {
177
- columns: unref(currentActionItem).targetNodeOptions || [],
178
- onConfirm: onTargetNodeConfirm,
179
- onCancel: _cache[9] || (_cache[9] = ($event) => showTargetNodePicker.value = false)
259
+ onCancel: _cache[6] || (_cache[6] = ($event) => showOpinionPicker.value = false)
180
260
  }, null, 8, ["columns"])
181
261
  ]),
182
262
  _: 1
@@ -185,7 +265,7 @@ const _sfc_main = {
185
265
  };
186
266
  }
187
267
  };
188
- const _ApprovalBar = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-fc8cdb72"]]);
268
+ const _ApprovalBar = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-3f63aa02"]]);
189
269
  export {
190
270
  _ApprovalBar as default
191
271
  };
@@ -91,7 +91,8 @@ const _sfc_main = {
91
91
  createElementVNode("div", _hoisted_7, [
92
92
  createElementVNode("span", _hoisted_8, toDisplayString(formatTime(__props.item.taskCreateDateTime)), 1),
93
93
  createElementVNode("div", _hoisted_9, [
94
- createVNode(_component_van_button, {
94
+ __props.type != 0 ? (openBlock(), createBlock(_component_van_button, {
95
+ key: 0,
95
96
  plain: "",
96
97
  hairline: "",
97
98
  round: "",
@@ -102,21 +103,21 @@ const _sfc_main = {
102
103
  createTextVNode(" 查看 ")
103
104
  ])),
104
105
  _: 1
105
- }),
106
+ })) : createCommentVNode("", true),
106
107
  __props.type == 0 ? (openBlock(), createBlock(_component_van_button, {
107
- key: 0,
108
+ key: 1,
108
109
  type: "primary",
109
110
  round: "",
110
111
  size: "small",
111
112
  onClick: _cache[1] || (_cache[1] = ($event) => _ctx.$emit("approve", __props.item))
112
113
  }, {
113
114
  default: withCtx(() => _cache[4] || (_cache[4] = [
114
- createTextVNode(" 同意 ")
115
+ createTextVNode(" 审批 ")
115
116
  ])),
116
117
  _: 1
117
118
  })) : createCommentVNode("", true),
118
119
  __props.type == 1 ? (openBlock(), createBlock(_component_van_button, {
119
- key: 1,
120
+ key: 2,
120
121
  type: "warning",
121
122
  round: "",
122
123
  size: "small",
@@ -133,7 +134,7 @@ const _sfc_main = {
133
134
  };
134
135
  }
135
136
  };
136
- const ApprovalCard = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-8bbf96c9"]]);
137
+ const ApprovalCard = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-0c40807f"]]);
137
138
  export {
138
139
  ApprovalCard as default
139
140
  };
@@ -13,6 +13,7 @@
13
13
  /* empty css */
14
14
  import { getCurrentInstance, ref, createElementBlock, openBlock, createVNode, unref, isRef, withCtx, createElementVNode, Fragment, renderList, createBlock } from "vue";
15
15
  import ApprovalCard from "./ApprovalCard.vue.mjs";
16
+ import emitter from "../../../utils/eventBus.mjs";
16
17
  /* empty css */
17
18
  import _export_sfc from "../../../../../../_virtual/_plugin-vue_export-helper.mjs";
18
19
  import { Search } from "../../../../node_modules/vant/es/search/index.mjs";
@@ -22,13 +23,16 @@ import { List } from "../../../../node_modules/vant/es/list/index.mjs";
22
23
  const _hoisted_1 = { class: "fec-mobile-approval-list" };
23
24
  const _hoisted_2 = { class: "fec-tab-content" };
24
25
  const _hoisted_3 = { class: "fec-tab-content" };
25
- const _hoisted_4 = { class: "fec-list" };
26
- const _hoisted_5 = { class: "fec-tab-content" };
27
- const _hoisted_6 = { class: "fec-list" };
26
+ const _hoisted_4 = { class: "fec-tab-content" };
28
27
  const _sfc_main = {
29
28
  __name: "ApprovalList",
30
- props: {},
29
+ props: {
30
+ todoPage: String,
31
+ donePage: String,
32
+ ccPage: String
33
+ },
31
34
  setup(__props) {
35
+ const props = __props;
32
36
  const currentInstance = getCurrentInstance();
33
37
  const ctx = currentInstance.proxy;
34
38
  ctx.route;
@@ -37,28 +41,50 @@ const _sfc_main = {
37
41
  const doneList = ref([]);
38
42
  const ccList = ref([]);
39
43
  const searchData = ref("");
40
- const finished = ref(false);
41
- const loading = ref(false);
42
- let pageNo = 1;
44
+ const todoLoading = ref(false);
45
+ const todoFinished = ref(false);
46
+ const doneLoading = ref(false);
47
+ const doneFinished = ref(false);
48
+ const ccLoading = ref(false);
49
+ const ccFinished = ref(false);
50
+ let todoPageNo = 0;
51
+ let donePageNo = 0;
52
+ let ccPageNo = 0;
43
53
  let pageSize = 10;
44
- function onLoad() {
45
- loading.value = true;
46
- pageNo++;
47
- call();
54
+ const todoError = ref(false);
55
+ const doneError = ref(false);
56
+ const ccError = ref(false);
57
+ function onTodoLoad() {
58
+ todoLoading.value = true;
59
+ todoPageNo++;
60
+ call("0");
48
61
  }
49
- function call() {
62
+ function onDoneLoad() {
63
+ doneLoading.value = true;
64
+ donePageNo++;
65
+ call("1");
66
+ }
67
+ function onCcLoad() {
68
+ ccLoading.value = true;
69
+ ccPageNo++;
70
+ call("2");
71
+ }
72
+ function call(taskStatus) {
73
+ const errorRef = taskStatus == "0" ? todoError : taskStatus == "1" ? doneError : ccError;
74
+ errorRef.value = false;
75
+ const pageNo = taskStatus == "0" ? todoPageNo : taskStatus == "1" ? donePageNo : ccPageNo;
50
76
  ctx.$http.post(
51
77
  "/base-server/flow/workbench/findTaskListByPage",
52
78
  {
53
79
  pageNo,
54
80
  pageSize,
55
- taskStatus: activeName.value,
81
+ taskStatus,
56
82
  searchData: searchData.value
57
83
  },
58
84
  false
59
85
  ).then((data) => {
60
86
  const list = data.list;
61
- switch (activeName.value) {
87
+ switch (taskStatus) {
62
88
  case "0":
63
89
  list.forEach((item) => {
64
90
  item.statusColor = item.statusColor || "#fa8c16";
@@ -66,32 +92,91 @@ const _sfc_main = {
66
92
  item.statusText = item.statusText || "待处理";
67
93
  });
68
94
  todoList.value.push(...list);
95
+ if (list.length < pageSize) {
96
+ todoFinished.value = true;
97
+ }
69
98
  break;
70
99
  case "1":
71
- doneList.value = list;
100
+ list.forEach((item) => {
101
+ item.statusColor = item.statusColor || "#52c41a";
102
+ item.statusIcon = item.statusIcon || "checked";
103
+ item.statusText = item.statusText || "已完成";
104
+ });
105
+ doneList.value.push(...list);
106
+ if (list.length < pageSize) {
107
+ doneFinished.value = true;
108
+ }
72
109
  break;
73
110
  case "2":
74
- ccList.value = list;
111
+ list.forEach((item) => {
112
+ item.statusColor = item.statusColor || "#52c41a";
113
+ item.statusIcon = item.statusIcon || "checked";
114
+ item.statusText = item.statusText || "已完成";
115
+ });
116
+ ccList.value.push(...list);
117
+ if (list.length < pageSize) {
118
+ ccFinished.value = true;
119
+ }
75
120
  break;
76
121
  }
77
- if (list.length < pageSize) {
78
- finished.value = true;
79
- }
122
+ }).catch((err) => {
123
+ errorRef.value = true;
80
124
  }).finally(() => {
81
- loading.value = false;
125
+ switch (taskStatus) {
126
+ case "0":
127
+ todoLoading.value = false;
128
+ break;
129
+ case "1":
130
+ doneLoading.value = false;
131
+ break;
132
+ case "2":
133
+ ccLoading.value = false;
134
+ break;
135
+ }
82
136
  });
83
137
  }
84
138
  function onView(item) {
85
139
  console.log("查看:", item);
86
140
  }
87
141
  function onApprove(item) {
88
- console.log("同意:", item);
142
+ console.log("审批:", item);
143
+ if (props.todoPage) {
144
+ const params = {
145
+ traceNo: item.traceNo,
146
+ taskId: item.taskId,
147
+ type: "0",
148
+ taskData: item
149
+ };
150
+ emitter.emit("loadPage", {
151
+ pageId: props.todoPage,
152
+ params
153
+ });
154
+ }
89
155
  }
90
156
  function onRevoke(item) {
91
157
  console.log("撤销:", item);
92
158
  }
93
159
  function onSearch(val) {
94
- console.log("🚀 ~ onSearch ~ val:", val);
160
+ todoList.value = [];
161
+ todoFinished.value = false;
162
+ todoPageNo = 0;
163
+ doneList.value = [];
164
+ doneFinished.value = false;
165
+ donePageNo = 0;
166
+ ccList.value = [];
167
+ ccFinished.value = false;
168
+ ccPageNo = 0;
169
+ switch (activeName.value) {
170
+ case "0":
171
+ onTodoLoad();
172
+ break;
173
+ case "1":
174
+ onDoneLoad();
175
+ break;
176
+ case "2":
177
+ onCcLoad();
178
+ break;
179
+ }
95
180
  }
96
181
  return (_ctx, _cache) => {
97
182
  const _component_van_search = Search;
@@ -111,7 +196,7 @@ const _sfc_main = {
111
196
  sticky: "",
112
197
  class: "fec-tabs",
113
198
  active: unref(activeName),
114
- "onUpdate:active": _cache[2] || (_cache[2] = ($event) => isRef(activeName) ? activeName.value = $event : null),
199
+ "onUpdate:active": _cache[7] || (_cache[7] = ($event) => isRef(activeName) ? activeName.value = $event : null),
115
200
  swipeable: "",
116
201
  "lazy-render": ""
117
202
  }, {
@@ -125,11 +210,15 @@ const _sfc_main = {
125
210
  default: withCtx(() => [
126
211
  createElementVNode("div", _hoisted_2, [
127
212
  createVNode(_component_van_list, {
128
- loading: unref(loading),
129
- "onUpdate:loading": _cache[1] || (_cache[1] = ($event) => isRef(loading) ? loading.value = $event : null),
130
- finished: unref(finished),
213
+ loading: unref(todoLoading),
214
+ "onUpdate:loading": _cache[1] || (_cache[1] = ($event) => isRef(todoLoading) ? todoLoading.value = $event : null),
215
+ error: unref(todoError),
216
+ "onUpdate:error": _cache[2] || (_cache[2] = ($event) => isRef(todoError) ? todoError.value = $event : null),
217
+ finished: unref(todoFinished),
218
+ offset: 50,
131
219
  "finished-text": "没有更多了",
132
- onLoad,
220
+ onLoad: onTodoLoad,
221
+ "error-text": "请求失败,点击重新加载",
133
222
  class: "fec-list"
134
223
  }, {
135
224
  default: withCtx(() => [
@@ -138,13 +227,12 @@ const _sfc_main = {
138
227
  key: item.id,
139
228
  item,
140
229
  type: 0,
141
- onView,
142
230
  onApprove
143
231
  }, null, 8, ["item"]);
144
232
  }), 128))
145
233
  ]),
146
234
  _: 1
147
- }, 8, ["loading", "finished"])
235
+ }, 8, ["loading", "error", "finished"])
148
236
  ])
149
237
  ]),
150
238
  _: 1
@@ -157,17 +245,31 @@ const _sfc_main = {
157
245
  }, {
158
246
  default: withCtx(() => [
159
247
  createElementVNode("div", _hoisted_3, [
160
- createElementVNode("div", _hoisted_4, [
161
- (openBlock(true), createElementBlock(Fragment, null, renderList(unref(doneList), (item) => {
162
- return openBlock(), createBlock(ApprovalCard, {
163
- key: item.id,
164
- item,
165
- type: 1,
166
- onView,
167
- onRevoke
168
- }, null, 8, ["item"]);
169
- }), 128))
170
- ])
248
+ createVNode(_component_van_list, {
249
+ loading: unref(doneLoading),
250
+ "onUpdate:loading": _cache[3] || (_cache[3] = ($event) => isRef(doneLoading) ? doneLoading.value = $event : null),
251
+ error: unref(doneError),
252
+ "onUpdate:error": _cache[4] || (_cache[4] = ($event) => isRef(doneError) ? doneError.value = $event : null),
253
+ finished: unref(doneFinished),
254
+ offset: 50,
255
+ "finished-text": "没有更多了",
256
+ "error-text": "请求失败,点击重新加载",
257
+ onLoad: onDoneLoad,
258
+ class: "fec-list"
259
+ }, {
260
+ default: withCtx(() => [
261
+ (openBlock(true), createElementBlock(Fragment, null, renderList(unref(doneList), (item) => {
262
+ return openBlock(), createBlock(ApprovalCard, {
263
+ key: item.id,
264
+ item,
265
+ type: 1,
266
+ onView,
267
+ onRevoke
268
+ }, null, 8, ["item"]);
269
+ }), 128))
270
+ ]),
271
+ _: 1
272
+ }, 8, ["loading", "error", "finished"])
171
273
  ])
172
274
  ]),
173
275
  _: 1
@@ -179,17 +281,31 @@ const _sfc_main = {
179
281
  "show-zero-badge": false
180
282
  }, {
181
283
  default: withCtx(() => [
182
- createElementVNode("div", _hoisted_5, [
183
- createElementVNode("div", _hoisted_6, [
184
- (openBlock(true), createElementBlock(Fragment, null, renderList(unref(ccList), (item) => {
185
- return openBlock(), createBlock(ApprovalCard, {
186
- key: item.id,
187
- item,
188
- type: 2,
189
- onView
190
- }, null, 8, ["item"]);
191
- }), 128))
192
- ])
284
+ createElementVNode("div", _hoisted_4, [
285
+ createVNode(_component_van_list, {
286
+ loading: unref(ccLoading),
287
+ "onUpdate:loading": _cache[5] || (_cache[5] = ($event) => isRef(ccLoading) ? ccLoading.value = $event : null),
288
+ error: unref(ccError),
289
+ "onUpdate:error": _cache[6] || (_cache[6] = ($event) => isRef(ccError) ? ccError.value = $event : null),
290
+ finished: unref(ccFinished),
291
+ offset: 50,
292
+ "finished-text": "没有更多了",
293
+ "error-text": "请求失败,点击重新加载",
294
+ onLoad: onCcLoad,
295
+ class: "fec-list"
296
+ }, {
297
+ default: withCtx(() => [
298
+ (openBlock(true), createElementBlock(Fragment, null, renderList(unref(ccList), (item) => {
299
+ return openBlock(), createBlock(ApprovalCard, {
300
+ key: item.id,
301
+ item,
302
+ type: 2,
303
+ onView
304
+ }, null, 8, ["item"]);
305
+ }), 128))
306
+ ]),
307
+ _: 1
308
+ }, 8, ["loading", "error", "finished"])
193
309
  ])
194
310
  ]),
195
311
  _: 1
@@ -201,7 +317,7 @@ const _sfc_main = {
201
317
  };
202
318
  }
203
319
  };
204
- const _ApprovalList = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-15b64ae4"]]);
320
+ const _ApprovalList = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-64531f31"]]);
205
321
  export {
206
322
  _ApprovalList as default
207
323
  };