xyvcard-itsm-flow 0.0.8 → 0.0.9

package/dist/{index-B5vmtcUk.mjs → index-w_RSrZed.mjs}

@@ -1,13 +1,13 @@
-import { defineComponent as ae, mergeModels as ne, ref as g, useModel as se, reactive as E, computed as de, resolveComponent as i, openBlock as k, createElementBlock as D, Fragment as B, createVNode as t, withCtx as a, createElementVNode as r, unref as d, renderList as re, createBlock as O, createTextVNode as N, toDisplayString as w, createCommentVNode as ie } from "vue";
+import { defineComponent as ne, mergeModels as se, ref as g, useModel as de, reactive as E, computed as re, resolveComponent as i, openBlock as k, createElementBlock as D, Fragment as B, createVNode as t, withCtx as a, createElementVNode as r, unref as d, renderList as ie, createBlock as O, createTextVNode as N, toDisplayString as I, createCommentVNode as ue } from "vue";
 import "element-plus";
-import { useRoute as ue } from "vue-router";
-import { useI18n as ce } from "vue-i18n";
-import { g as me, C as M, D as I, e as pe, h as fe, p as be } from "./index-DY7ZV5kq.mjs";
-import { i as z, t as ve, a as ge } from "./common--K4gGsNT.mjs";
-import { E as Ne } from "./el-message-FfNjxLv_.mjs";
-const Ue = /* @__PURE__ */ ae({
+import { useRoute as ce } from "vue-router";
+import { useI18n as me } from "vue-i18n";
+import { g as pe, C as M, D as U, h as fe, p as be, e as ve } from "./index-CitJdS-N.mjs";
+import { i as z, t as ge, a as Ne } from "./common-Cwl5jzlM.mjs";
+import { E as ke } from "./el-message-9Nit-6wb.mjs";
+const Ve = /* @__PURE__ */ ne({
   __name: "index",
-  props: /* @__PURE__ */ ne({
+  props: /* @__PURE__ */ se({
     task: {
       type: Object,
       default: () => {
@@ -19,19 +19,19 @@ const Ue = /* @__PURE__ */ ae({
   }),
   emits: ["update:modelValue"],
   setup(_, { expose: A }) {
-    const { t: h } = ce(), R = g([]), F = new me({
+    const { t: h } = me(), R = g([]), F = new pe({
       applyStatus: M.applyStatus.finished
     });
-    F.useValues(), I.orgIdBizDict.useValues();
-    const P = ue(), U = _, V = g({
+    F.useValues(), U.orgIdBizDict.useValues();
+    const P = ce(), V = _, w = g({
       curPage: 1,
       pageSize: 10,
       reckoningId: P.query.applyId
-    }), f = se(_, "modelValue"), $ = g();
+    }), f = de(_, "modelValue"), y = g();
     let n = E({
       requestId: Math.random() * 10 + ""
     });
-    const S = de(() => p.value.map((l) => ({
+    const S = re(() => p.value.map((l) => ({
       cost: typeof l.cost == "number" ? l.cost : 0,
       duration: typeof l.duration == "number" ? l.duration : 0
     }))), p = g([
@@ -72,63 +72,64 @@ const Ue = /* @__PURE__ */ ae({
         }
       ]
     });
-    U.task.businessKey && K(), A({
-      changeModel: () => J()
+    V.task.businessKey && W(), A({
+      changeModel: () => Q()
     });
     function K() {
-      V.value.reckoningId = U.task.businessKey, z.findById({ reckoningId: V.value.reckoningId }).then(({ data: l }) => {
-        Object.assign(n, l), y(l.acceptanceNo), pe.findList({ actionId: l.entrustId }).then(({ data: e }) => {
-          const s = e.results.map(
-            (c) => ({
-              ...c
-              // duration:
-              //   typeof item.duration === "string"
-              //     ? ((item.duration.split(",") || []) as string[])
-              //     : [],
-            })
-          );
-          p.value = s;
-        });
+      ve.findList({ actionId: w.value.reckoningId }).then(({ data: l }) => {
+        const e = l.results.map(
+          (s) => ({
+            ...s,
+            duration: Number(s.duration)
+            // 将字符串转换为数字
+          })
+        );
+        p.value = e;
       });
     }
     function W() {
+      w.value.reckoningId = V.task.businessKey, z.findById({ reckoningId: w.value.reckoningId }).then(({ data: l }) => {
+        Object.assign(n, l), $(l.acceptanceNo);
+      }), K();
+    }
+    function G() {
       v.value = { values: [] }, p.value.forEach((l) => {
         l.userId = "", l.idNo = "", l.cost = 0, l.duration = 0;
       });
     }
     const v = g({});
-    function y(l) {
+    function $(l) {
       const e = F.values.find(
         (s) => s.key === l
       );
-      n.contractName = (e == null ? void 0 : e.contractName) ?? "", n.contractNo = (e == null ? void 0 : e.contractNo) ?? "", n.serviceOrg = (e == null ? void 0 : e.serviceOrg) ?? "", n.entrustName = (e == null ? void 0 : e.entrustName) ?? "", n.orderNo = (e == null ? void 0 : e.orderNo) ?? "", n.serviceContent = (e == null ? void 0 : e.serviceContent) ?? "", n.entrustId = (e == null ? void 0 : e.entrustId) ?? "", n.acceptanceId = (e == null ? void 0 : e.acceptanceId) ?? "", W(), v.value = new fe({
-        actionId: e.entrustId
+      n.contractName = (e == null ? void 0 : e.contractName) ?? "", n.contractNo = (e == null ? void 0 : e.contractNo) ?? "", n.serviceOrg = (e == null ? void 0 : e.serviceOrg) ?? "", n.entrustName = (e == null ? void 0 : e.entrustName) ?? "", n.orderNo = (e == null ? void 0 : e.orderNo) ?? "", n.serviceContent = (e == null ? void 0 : e.serviceContent) ?? "", n.entrustId = (e == null ? void 0 : e.entrustId) ?? "", n.acceptanceId = (e == null ? void 0 : e.acceptanceId) ?? "", G(), v.value = new fe({
+        actionId: (e == null ? void 0 : e.entrustId) ?? ""
       }), v.value.useValues();
     }
-    function G(l, e) {
+    function H(l, e) {
       const s = v.value.values.find(
         (c) => c.key === l
       );
       s ? (e.userName = s.value ?? "", e.idNo = s.idNo ?? "", e.cost = Number(s.cost) || 0, e.entrustUserId = s.entrustUserId ?? "") : (e.userName = "", e.idNo = "", e.cost = 0, e.entrustUserId = "");
     }
-    function H() {
+    function J() {
       R.value = p.value.map((l) => ({
         entrustUserId: l.entrustUserId,
         duration: (l.duration ?? 0).toString()
       })).filter((l) => l.entrustUserId && l.duration !== "0");
     }
-    function J() {
+    function Q() {
       return f.value && (f.value.selectActions = [
         { key: "true", value: "同意" },
         { key: "false", value: "不同意" }
       ], f.value.varName = "approved", f.value.module = "", f.value.module = M.MODULE_ITSMFLOW), new Promise((l, e) => {
         var s;
-        (s = $.value) == null || s.validate((c) => {
-          c ? f.value && (f.value.comment = "", H(), n.requestId = Math.random() * 10 + "", z.save({
+        (s = y.value) == null || s.validate((c) => {
+          c ? f.value && (f.value.comment = "", J(), n.requestId = Math.random() * 10 + "", z.save({
             ...n,
             entrustUser: R.value
           }).then((m) => {
-            m.status === 200 ? l(!0) : (Ne({
+            m.status === 200 ? l(!0) : (ke({
               message: "保存失败，请联系管理员！",
               type: "error"
             }), e(!1));
@@ -137,7 +138,7 @@ const Ue = /* @__PURE__ */ ae({
       });
     }
     return (l, e) => {
-      const s = i("el-col"), c = i("el-input"), m = i("el-form-item"), Q = i("jmash-dict-select"), q = i("jmash-select"), C = i("el-row"), b = i("el-table-column"), X = i("el-option"), Y = i("el-select"), Z = i("el-input-number"), x = i("DeleteFilled"), ee = i("el-icon"), le = i("el-table"), te = i("el-button"), oe = i("el-form");
+      const s = i("el-col"), c = i("el-input"), m = i("el-form-item"), X = i("jmash-dict-select"), q = i("jmash-select"), C = i("el-row"), b = i("el-table-column"), Y = i("el-option"), Z = i("el-select"), x = i("el-input-number"), ee = i("DeleteFilled"), le = i("el-icon"), te = i("el-table"), oe = i("el-button"), ae = i("el-form");
       return k(), D(B, null, [
         t(s, { span: 24 }, {
           default: a(() => e[8] || (e[8] = [
@@ -145,9 +146,9 @@ const Ue = /* @__PURE__ */ ae({
           ])),
           _: 1
         }),
-        t(oe, {
+        t(ae, {
           ref_key: "taskFormRef",
-          ref: $,
+          ref: y,
           model: d(n),
           "label-width": "150px",
           rules: T,
@@ -199,11 +200,11 @@ const Ue = /* @__PURE__ */ ae({
                   prop: "entrustName"
                 }, {
                   default: a(() => [
-                    t(Q, {
+                    t(X, {
                       modelValue: d(n).entrustName,
                       "onUpdate:modelValue": e[2] || (e[2] = (o) => d(n).entrustName = o),
                       placeholder: l.$t("itsmFlowReckoning.acceptanceNoRequired"),
-                      data: d(I).projectNameDict.values,
+                      data: d(U).projectNameDict.values,
                       disabled: "",
                       class: "w-full"
                     }, null, 8, ["modelValue", "placeholder", "data"])
@@ -224,7 +225,7 @@ const Ue = /* @__PURE__ */ ae({
                       modelValue: d(n).serviceOrg,
                       "onUpdate:modelValue": e[3] || (e[3] = (o) => d(n).serviceOrg = o),
                       placeholder: l.$t("itsmFlowReckoning.acceptanceNoRequired"),
-                      data: d(I).orgIdBizDict.values,
+                      data: d(U).orgIdBizDict.values,
                       disabled: "",
                       class: "w-full"
                     }, null, 8, ["modelValue", "placeholder", "data"])
@@ -249,7 +250,7 @@ const Ue = /* @__PURE__ */ ae({
                       clearable: "",
                       filterable: "",
                       class: "w-full",
-                      onChange: y
+                      onChange: $
                     }, null, 8, ["modelValue", "placeholder", "data"])
                   ]),
                   _: 1
@@ -324,7 +325,7 @@ const Ue = /* @__PURE__ */ ae({
               ]),
               _: 1
             }),
-            t(le, {
+            t(te, {
               data: p.value,
               border: "",
               style: { width: "100%" }
@@ -343,17 +344,17 @@ const Ue = /* @__PURE__ */ ae({
                   width: "150"
                 }, {
                   default: a(({ row: o }) => [
-                    t(Y, {
+                    t(Z, {
                       modelValue: o.userId,
                       "onUpdate:modelValue": (u) => o.userId = u,
                       placeholder: l.$t("itsmFlowEntrustUser.userIdRequired"),
                       class: "w-full",
                       filterable: "",
                       clearable: "",
-                      onChange: (u) => G(u, o)
+                      onChange: (u) => H(u, o)
                     }, {
                       default: a(() => [
-                        (k(!0), D(B, null, re(v.value.values, (u) => (k(), O(X, {
+                        (k(!0), D(B, null, ie(v.value.values, (u) => (k(), O(Y, {
                           key: u.key,
                           label: u.value,
                           value: u.key
@@ -401,7 +402,7 @@ const Ue = /* @__PURE__ */ ae({
                   width: "140"
                 }, {
                   default: a(({ row: o }) => [
-                    t(Z, {
+                    t(x, {
                       modelValue: o.duration,
                       "onUpdate:modelValue": (u) => o.duration = u,
                       precision: 1,
@@ -418,7 +419,7 @@ const Ue = /* @__PURE__ */ ae({
                   "header-align": "center"
                 }, {
                   default: a(({ row: o }) => [
-                    N(w(d(ve)(o.cost, o.duration)), 1)
+                    N(I(d(ge)(o.cost, o.duration)), 1)
                   ]),
                   _: 1
                 }, 8, ["label"]),
@@ -428,7 +429,7 @@ const Ue = /* @__PURE__ */ ae({
                   align: "center"
                 }, {
                   default: a((o) => [
-                    o.$index !== 0 ? (k(), O(ee, {
+                    o.$index !== 0 ? (k(), O(le, {
                       key: 0,
                       onClick: (u) => L(o),
                       size: "18",
@@ -436,23 +437,23 @@ const Ue = /* @__PURE__ */ ae({
                       class: "hover-blue"
                     }, {
                       default: a(() => [
-                        t(x)
+                        t(ee)
                       ]),
                       _: 2
-                    }, 1032, ["onClick"])) : ie("", !0)
+                    }, 1032, ["onClick"])) : ue("", !0)
                   ]),
                   _: 1
                 }, 8, ["label"])
               ]),
               _: 1
             }, 8, ["data"]),
-            t(te, {
+            t(oe, {
               icon: d(be),
               class: "addButton",
               onClick: j
             }, {
               default: a(() => [
-                N(w(d(h)("common.add")), 1)
+                N(I(d(h)("common.add")), 1)
               ]),
               _: 1
             }, 8, ["icon"]),
@@ -465,7 +466,7 @@ const Ue = /* @__PURE__ */ ae({
                   label: l.$t("itsmFlowReckoning.totalPrice")
                 }, {
                   default: a(() => [
-                    N(w(d(ge)(S.value)), 1)
+                    N(I(d(Ne)(S.value)), 1)
                   ]),
                   _: 1
                 }, 8, ["label"])
@@ -524,5 +525,5 @@ const Ue = /* @__PURE__ */ ae({
   }
 });
 export {
-  Ue as default
+  Ve as default
 };

package/dist/index.mjs

@@ -66,7 +66,9 @@ const bs = {}, Ns = {
     orderIdRequired: "请选择订单编号",
     orderIdRequireds: "根据订单编号自动带出",
     files: "验收资料",
-    filesRequired: "请上传验收资料"
+    filesRequired: "请上传验收资料",
+    deleteSuccess: "删除成功",
+    deleteFail: "删除失败"
   },
   // 结算单流程表
   itsmFlowReckoning: {
@@ -2684,7 +2686,7 @@ const Wi = {
       }
     };
   }
-}, Pi = /* @__PURE__ */ Object.assign({ "./views/itsm-flow-acceptance/edit.vue": () => import("./edit-B621RtNS.mjs"), "./views/itsm-flow-acceptance/index.vue": () => import("./index-BJl7xHYx.mjs"), "./views/itsm-flow-entrust/edit.vue": () => import("./edit-CoRzQ2SK.mjs"), "./views/itsm-flow-entrust/index.vue": () => import("./index-BlBkHqXR.mjs"), "./views/itsm-flow-reckoning/edit.vue": () => import("./edit-Czk64Yon.mjs"), "./views/itsm-flow-reckoning/index.vue": () => import("./index-CdzhLCkX.mjs") }), Wt = () => import("./index-BCP5cBN6.mjs"), Fi = () => import("./index-DX1PURJy.mjs"), Pt = () => import("./index-CVbpEq7V.mjs"), Ii = () => import("./index-Dld6YbIV.mjs"), Ft = () => import("./index-CRHpl0qA.mjs"), Ci = () => import("./index-B5vmtcUk.mjs"), Ei = {
+}, Pi = /* @__PURE__ */ Object.assign({ "./views/itsm-flow-acceptance/edit.vue": () => import("./edit-RNcc8UYn.mjs"), "./views/itsm-flow-acceptance/index.vue": () => import("./index-ay0TMqjH.mjs"), "./views/itsm-flow-entrust/edit.vue": () => import("./edit-CJKi69Ya.mjs"), "./views/itsm-flow-entrust/index.vue": () => import("./index-BqZwYXr_.mjs"), "./views/itsm-flow-reckoning/edit.vue": () => import("./edit-BatVtQjM.mjs"), "./views/itsm-flow-reckoning/index.vue": () => import("./index-2vkMhoSW.mjs") }), Wt = () => import("./index-CpSpS_gR.mjs"), Fi = () => import("./index-tnwVLRVb.mjs"), Pt = () => import("./index-BkB6hpAN.mjs"), Ii = () => import("./index-Ckl3mXfI.mjs"), Ft = () => import("./index-DmttwKtY.mjs"), Ci = () => import("./index-w_RSrZed.mjs"), Ei = {
   install(e) {
     Os(Pi, 7), xs(Ts), H("TaskItsmFlowEntrust", Wt), H("TaskItsmFlowEntrustEdit", Fi), H("TaskItsmFlowEntrustView", Wt), H("TaskItsmFlowAcceptance", Pt), H(
       "TaskItsmFlowAcceptanceEdit",

package/dts/api/itsm-flow-acceptance/index.d.ts

@@ -1,5 +1,6 @@
+import { type FilesReq } from "jmash-core";
 import type { AxiosPromise } from "axios";
-import type { ItsmFlowAcceptanceApi, ItsmFlowAcceptanceReq, ItsmFlowAcceptanceModel, ItsmFlowAcceptancePage, ItsmFlowAcceptanceList, ItsmFlowAcceptanceKey, ItsmFlowAcceptanceExportReq, ItsmFlowAcceptanceApplyReq } from "./types";
+import type { ItsmFlowAcceptanceApi, ItsmFlowAcceptanceReq, ItsmFlowAcceptanceModel, ItsmFlowAcceptancePage, ItsmFlowAcceptanceList, ItsmFlowAcceptanceKey, ItsmFlowAcceptanceExportReq, ItsmFlowAcceptanceApplyReq, ItsmFlowAcceptanceFilesReq, ItsmFlowAcceptanceFilesList, AcceptanceDeleteFilesReq, ItsmFlowAcceptanceHeadmanReq, ItsmFlowAcceptanceHeadmanList } from "./types";
 declare class ItsmFlowAcceptanceApiImpl implements ItsmFlowAcceptanceApi {
     getKey(model: ItsmFlowAcceptanceModel): ItsmFlowAcceptanceKey;
     findPage(query?: ItsmFlowAcceptanceReq): AxiosPromise<ItsmFlowAcceptancePage>;
@@ -9,6 +10,9 @@ declare class ItsmFlowAcceptanceApiImpl implements ItsmFlowAcceptanceApi {
     submit(data: ItsmFlowAcceptanceApplyReq): AxiosPromise<ItsmFlowAcceptanceModel>;
     delete(query: ItsmFlowAcceptanceKey): AxiosPromise<ItsmFlowAcceptanceModel>;
     exportFilePdf(query: ItsmFlowAcceptanceExportReq): AxiosPromise;
+    findFilesList(query: ItsmFlowAcceptanceFilesReq): AxiosPromise<ItsmFlowAcceptanceFilesList>;
+    deleteFilesList(query: AcceptanceDeleteFilesReq): AxiosPromise<FilesReq>;
+    findHeadman(query: ItsmFlowAcceptanceHeadmanReq): AxiosPromise<ItsmFlowAcceptanceHeadmanList>;
 }
 declare const itsmFlowAcceptanceApi: ItsmFlowAcceptanceApiImpl;
 export { itsmFlowAcceptanceApi };

package/dts/api/itsm-flow-acceptance/types.d.ts

@@ -1,4 +1,4 @@
-import type { EntityApi, EntityReq, EntityModel, EntityList, EntityPage, EntityTotal, EntityKey, EntityKeyList, EntityCreateReq } from "jmash-core";
+import type { EntityApi, EntityReq, EntityModel, EntityList, EntityPage, EntityTotal, EntityKey, EntityKeyList, EntityCreateReq, FilesReq } from "jmash-core";
 export interface ItsmFlowAcceptanceApi extends EntityApi {
 }
 export interface ItsmFlowAcceptanceReq extends EntityReq {
@@ -27,6 +27,7 @@ export interface ItsmFlowAcceptanceModel extends EntityModel {
     headmanName?: string;
     membersName?: string;
     membersId?: string;
+    files?: Array<FilesReq>;
 }
 export interface ItsmFlowAcceptanceList extends EntityList {
     results: Array<ItsmFlowAcceptanceModel>;
@@ -81,3 +82,30 @@ export interface ItsmFlowFormFiles {
     fileName?: string;
     fileSort?: string;
 }
+export interface ItsmFlowAcceptanceFilesReq {
+    actionId?: string;
+}
+export interface ItsmFlowAcceptanceFilesModel {
+    fileId?: string;
+    fileName?: string;
+}
+export interface ItsmFlowAcceptanceFilesList extends EntityList {
+    results: Array<ItsmFlowAcceptanceFilesModel>;
+}
+export interface AcceptanceDeleteFilesReq {
+    tenant?: string;
+    fileId?: string;
+    actionId?: string;
+}
+export interface ItsmFlowAcceptanceHeadmanReq {
+    tenant?: string;
+    deptId?: string;
+    jobId?: string;
+}
+export interface ItsmFlowAcceptanceHeadmanModel {
+    key?: string;
+    value?: string;
+}
+export interface ItsmFlowAcceptanceHeadmanList extends EntityList {
+    results: Array<ItsmFlowAcceptanceHeadmanModel>;
+}

package/dts/api/itsm-flow-entrust/index.d.ts

@@ -1,9 +1,6 @@
 import type { AxiosPromise } from "axios";
 import type { ItsmFlowEntrustApi, ItsmFlowEntrustReq, ItsmFlowEntrustModel, ItsmFlowEntrustPage, ItsmFlowEntrustList, ItsmFlowEntrustKey, ItsmFlowEntrustExportReq, ItsmFlowEntrustApplyReq, FlowTaskAttachmentCreateReq } from "./types";
 declare class ItsmFlowEntrustApiImpl implements ItsmFlowEntrustApi {
-    itsmFlowReckoningApi(arg0: {
-        entrustId: string;
-    }): void;
     getKey(model: ItsmFlowEntrustModel): ItsmFlowEntrustKey;
     findPage(query?: ItsmFlowEntrustReq): AxiosPromise<ItsmFlowEntrustPage>;
     findList(query?: ItsmFlowEntrustReq): AxiosPromise<ItsmFlowEntrustList>;

package/dts/lang/itsm-flow/zh-cn.d.ts

@@ -62,6 +62,8 @@ declare const _default: {
         orderIdRequireds: string;
         files: string;
         filesRequired: string;
+        deleteSuccess: string;
+        deleteFail: string;
     };
     itsmFlowReckoning: {
         name: string;

package/dts/views/itsm-flow-acceptance/edit.vue.d.ts

@@ -1,8 +1,8 @@
 import { type PropType } from "vue";
-import type { ItsmFlowAcceptanceKey } from "@/api/itsm-flow-acceptance/types";
+import type { ItsmFlowAcceptanceModel } from "@/api/itsm-flow-acceptance/types";
 declare const _default: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
     entityKey: {
-        type: PropType<ItsmFlowAcceptanceKey>;
+        type: PropType<ItsmFlowAcceptanceModel>;
         default: () => void;
     };
     modelValue: {
@@ -13,7 +13,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     "update:modelValue": (value: boolean) => void;
 }, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     entityKey: {
-        type: PropType<ItsmFlowAcceptanceKey>;
+        type: PropType<ItsmFlowAcceptanceModel>;
         default: () => void;
     };
     modelValue: {
@@ -23,6 +23,6 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     "onUpdate:modelValue"?: ((value: boolean) => any) | undefined;
     onRefresh?: ((...args: any[]) => any) | undefined;
 }>, {
-    entityKey: ItsmFlowAcceptanceKey;
+    entityKey: ItsmFlowAcceptanceModel;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 export default _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xyvcard-itsm-flow",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "private": false,
   "module": "dist/index.mjs",
   "types": "dts/index.d.ts",