xyvcard-itsm-flow 0.0.11 → 0.0.13

package/dist/{edit-B6eDlOpi.mjs → edit-C5EkvsBj.mjs}

@@ -1,4 +1,4 @@
-import { _ as f } from "./edit.vue_vue_type_script_setup_true_lang-iiu5w8LK.mjs";
+import { _ as f } from "./edit.vue_vue_type_script_setup_true_lang-CXXUyaL0.mjs";
 export {
   f as default
 };

package/dist/{edit-Cfo0JZSs.mjs → edit-CF3xSSyv.mjs}

@@ -1,4 +1,4 @@
-import { _ as f } from "./edit.vue_vue_type_script_setup_true_lang-IEXBlCBV.mjs";
+import { _ as f } from "./edit.vue_vue_type_script_setup_true_lang-CMBByn6f.mjs";
 export {
   f as default
 };

package/dist/{edit-RoD8ie-7.mjs → edit-Rj9Uz_7E.mjs}

@@ -1,4 +1,4 @@
-import { _ as f } from "./edit.vue_vue_type_script_setup_true_lang-e_oZRaYA.mjs";
+import { _ as f } from "./edit.vue_vue_type_script_setup_true_lang-D1aLFtH6.mjs";
 export {
   f as default
 };

package/dist/{edit.vue_vue_type_script_setup_true_lang-IEXBlCBV.mjs → edit.vue_vue_type_script_setup_true_lang-CMBByn6f.mjs}

@@ -2,7 +2,7 @@ import { defineComponent as se, mergeModels as z, ref as k, useModel as de, reac
 import { ElMessage as S } from "element-plus";
 import { useI18n as pe } from "vue-i18n";
 import { i as I, t as fe, a as be } from "./common-Cwl5jzlM.mjs";
-import { g as ve, C as ge, D as $, h as Ne, p as ke, e as _e } from "./index-C7wI2ALv.mjs";
+import { g as ve, C as ge, D as $, h as Ne, p as ke, e as _e } from "./index-CMpeLVvR.mjs";
 const he = { class: "title" }, Ie = /* @__PURE__ */ se({
   __name: "edit",
   props: /* @__PURE__ */ z({

package/dist/{edit.vue_vue_type_script_setup_true_lang-iiu5w8LK.mjs → edit.vue_vue_type_script_setup_true_lang-CXXUyaL0.mjs}

@@ -1,7 +1,7 @@
 import { defineComponent as Ee, mergeModels as Q, ref as f, useModel as _e, reactive as W, resolveComponent as d, createBlock as k, openBlock as E, withCtx as o, createVNode as l, createElementVNode as u, unref as s, createElementBlock as X, Fragment as Y, renderList as Z, toDisplayString as U, createCommentVNode as Ve, createTextVNode as _ } from "vue";
 import { ElMessage as O } from "element-plus";
 import { useI18n as Fe } from "vue-i18n";
-import { b as Ue, C as g, c as Ne, d as Ce, D as V, a as A, e as $e, f as x, p as ke } from "./index-C7wI2ALv.mjs";
+import { b as Ue, C as g, c as Ne, d as Ce, D as V, a as A, e as $e, f as x, p as ke } from "./index-CMpeLVvR.mjs";
 import "xyvcard-itsm";
 const Oe = { class: "title" }, Te = /* @__PURE__ */ Ee({
   __name: "edit",

package/dist/edit.vue_vue_type_script_setup_true_lang-D1aLFtH6.mjs

@@ -0,0 +1,582 @@
+import { defineComponent as ve, mergeModels as L, ref as f, useModel as be, reactive as T, resolveComponent as r, createBlock as H, openBlock as y, withCtx as o, createVNode as t, createElementVNode as u, unref as d, createElementBlock as R, Fragment as G, renderList as J, createTextVNode as b, toDisplayString as F } from "vue";
+import { ElMessage as N } from "element-plus";
+import { useI18n as we } from "vue-i18n";
+import { I as ge, C as j, U as he, D as A, i as V, u as ye } from "./index-CMpeLVvR.mjs";
+import { useUserStore as Fe } from "jmash-core";
+const Ne = { class: "title" }, Ue = /* @__PURE__ */ ve({
+  __name: "edit",
+  props: /* @__PURE__ */ L({
+    entityKey: {
+      type: Object,
+      default: () => {
+      }
+    }
+  }, {
+    modelValue: { type: Boolean },
+    modelModifiers: {}
+  }),
+  emits: /* @__PURE__ */ L(["refresh"], ["update:modelValue"]),
+  setup(S, { emit: P }) {
+    const $ = f(!1), D = f(), { t: w } = we(), C = f(), c = be(S, "modelValue"), B = P, k = f([]), v = f([]), m = f([]), g = f([]), E = Fe();
+    console.log(E.user);
+    const U = new ge({
+      applyStatus: j.applyStatus.finished
+    });
+    U.useValues();
+    const _ = new he({
+      userType: j.userType.companyManager
+    });
+    _.useValues(), A.orgIdBizDict.useValues();
+    let a = T({
+      requestId: Math.random() * 10 + ""
+    });
+    function Q(l) {
+      if (!l) {
+        N.warning("当前用户缺少岗位信息，无法查询验收组长");
+        return;
+      }
+      V.findHeadman({
+        tenant: E.user.tenant,
+        deptId: l,
+        jobCode: j.jobCode.groupLeader
+      }).then(({ data: e }) => {
+        var n;
+        console.log("data", e.results[0].value), ((n = e == null ? void 0 : e.results) == null ? void 0 : n.length) > 0 && W(e.results[0]);
+      });
+    }
+    function W(l) {
+      const e = a.headmanName ? a.headmanName.split("、") : [], n = a.headmanId ? a.headmanId.split("、") : [];
+      (!e.includes(l.value) || !n.includes(l.key)) && (a.headmanName = e.length > 0 ? [...new Set(`${a.headmanName},${l.value}`.split(","))].join(",") : l.value, a.headmanId = n.length > 0 ? [...new Set(`${a.headmanId},${l.key}`.split(","))].join(",") : l.key);
+    }
+    function X() {
+      const l = Array.from(
+        new Set(
+          v.value.map((e) => {
+            const n = _.values.find(
+              (p) => p.key === e
+            );
+            return n == null ? void 0 : n.deptId;
+          }).filter(Boolean)
+        )
+      );
+      a.headmanName = "", a.headmanId = "", l.forEach((e) => {
+        Q(e);
+      });
+    }
+    function Y() {
+      $.value = !0, D.value.clearFileList();
+    }
+    function Z(l, e) {
+      m == null || m.value.splice(l, 1), g.value = g.value.filter(
+        (n) => n.fileId !== e.fileId
+      );
+    }
+    function x(l) {
+      const e = {
+        fileName: l.name,
+        fileId: l.response.fileId,
+        fileSort: "itsm"
+      };
+      m == null || m.value.push(e), m.value = [...new Set(m.value)], g.value.push(e);
+    }
+    const ee = T({
+      orderNo: [
+        {
+          required: !0,
+          message: w("itsmFlowAcceptance.orderIdRequired"),
+          trigger: "change"
+        }
+      ],
+      stage: [
+        {
+          required: !0,
+          message: w("itsmFlowAcceptance.stageRequired"),
+          trigger: "blur"
+        }
+      ]
+    }), h = S;
+    function le() {
+      V.findFilesList({ actionId: h.entityKey.acceptanceId }).then(({ data: l }) => {
+        m.value = l.results, g.value = (l.results || []).map((e) => ({
+          fileName: e.fileName,
+          fileId: e.fileId,
+          fileSort: "itsm"
+        }));
+      });
+    }
+    function te() {
+      v.value = typeof h.entityKey.membersId == "string" ? h.entityKey.membersId.split(",") || [] : [];
+    }
+    const ae = Object.keys(h.entityKey);
+    f(ae.length >= 1).value && (V.findById(h.entityKey).then(({ data: l }) => {
+      Object.assign(a, l);
+    }), te(), le());
+    function O() {
+      k.value = v.value.map((l) => {
+        const e = _.values.find(
+          (n) => n.key === l
+        );
+        return {
+          memberId: l,
+          memberName: (e == null ? void 0 : e.value) ?? ""
+        };
+      });
+    }
+    const oe = async () => {
+      var l;
+      await ((l = C.value) == null ? void 0 : l.validate((e) => {
+        if (e) {
+          if (v.value.length === 0) {
+            N.warning(w("itsmFlowAcceptance.membersRequired"));
+            return;
+          }
+          O(), V.save({
+            ...a,
+            members: k.value,
+            files: g.value
+          }).then((n) => {
+            n.status === 200 && (N({
+              message: w("common.submitSuccess"),
+              type: "success"
+            }), c.value && (c.value = !1), B("refresh", n.status === 200));
+          });
+        }
+      }));
+    }, ne = async () => {
+      var l;
+      await ((l = C.value) == null ? void 0 : l.validate((e) => {
+        if (e) {
+          if (v.value.length === 0) {
+            N.warning(w("itsmFlowAcceptance.membersRequired"));
+            return;
+          }
+          O(), V.submit({
+            ...a,
+            members: k.value,
+            files: g.value
+          }).then((n) => {
+            n.status === 200 && (N({
+              message: w("common.submitSuccess"),
+              type: "success"
+            }), c.value && (c.value = !1), B("refresh", n.status === 200));
+          });
+        }
+      }));
+    };
+    function z() {
+      c.value && (c.value = !1);
+    }
+    function se(l) {
+      const e = U.values.find(
+        (n) => n.key === l
+      );
+      a.contractName = (e == null ? void 0 : e.contractName) ?? "", a.contractNo = (e == null ? void 0 : e.contractNo) ?? "", a.serviceOrg = (e == null ? void 0 : e.serviceOrg) ?? "", a.entrustName = (e == null ? void 0 : e.entrustName) ?? "", a.serviceContent = (e == null ? void 0 : e.workContent) ?? "", a.entrustId = (e == null ? void 0 : e.entrustId) ?? "";
+    }
+    return (l, e) => {
+      const n = r("el-col"), p = r("el-input"), i = r("el-form-item"), q = r("jmash-select"), de = r("el-option"), ue = r("el-select"), I = r("el-button"), re = r("CircleClose"), ie = r("el-icon"), me = r("jmash-enum-radio"), M = r("el-row"), ce = r("el-form"), pe = r("jmash-multi-upload"), fe = r("el-dialog");
+      return y(), H(fe, {
+        modelValue: c.value,
+        "onUpdate:modelValue": e[12] || (e[12] = (s) => c.value = s),
+        onClose: z
+      }, {
+        footer: o(() => [
+          u("div", Ne, [
+            t(I, { onClick: z }, {
+              default: o(() => [
+                b(F(l.$t("common.cancel")), 1)
+              ]),
+              _: 1
+            }),
+            t(I, {
+              type: "primary",
+              onClick: oe
+            }, {
+              default: o(() => [
+                b(F(l.$t("itsmFlowEntrustUser.save")), 1)
+              ]),
+              _: 1
+            }),
+            t(I, {
+              type: "primary",
+              onClick: ne
+            }, {
+              default: o(() => [
+                b(F(l.$t("itsmFlowEntrustUser.submit")), 1)
+              ]),
+              _: 1
+            })
+          ])
+        ]),
+        default: o(() => [
+          t(n, { span: 24 }, {
+            default: o(() => e[13] || (e[13] = [
+              u("div", { class: "title" }, "山西云时代技术有限公司大数据中心分公司项目验收书", -1)
+            ])),
+            _: 1,
+            __: [13]
+          }),
+          t(ce, {
+            ref_key: "itsmFlowAcceptanceFormRef",
+            ref: C,
+            model: d(a),
+            "label-width": "150px",
+            rules: ee,
+            class: "custom-table-form custom-form"
+          }, {
+            default: o(() => [
+              t(M, null, {
+                default: o(() => [
+                  t(n, { span: 24 }, {
+                    default: o(() => [
+                      t(i, {
+                        label: l.$t("itsmFlowAcceptance.contractName"),
+                        prop: "contractName"
+                      }, {
+                        default: o(() => [
+                          t(p, {
+                            modelValue: d(a).contractName,
+                            "onUpdate:modelValue": e[0] || (e[0] = (s) => d(a).contractName = s),
+                            placeholder: l.$t("itsmFlowAcceptance.orderIdRequireds"),
+                            disabled: ""
+                          }, null, 8, ["modelValue", "placeholder"])
+                        ]),
+                        _: 1
+                      }, 8, ["label"])
+                    ]),
+                    _: 1
+                  }),
+                  t(n, { span: 24 }, {
+                    default: o(() => [
+                      t(i, {
+                        label: l.$t("itsmFlowAcceptance.contractNo"),
+                        prop: "contractNo"
+                      }, {
+                        default: o(() => [
+                          t(p, {
+                            modelValue: d(a).contractNo,
+                            "onUpdate:modelValue": e[1] || (e[1] = (s) => d(a).contractNo = s),
+                            placeholder: l.$t("itsmFlowAcceptance.orderIdRequireds"),
+                            disabled: ""
+                          }, null, 8, ["modelValue", "placeholder"])
+                        ]),
+                        _: 1
+                      }, 8, ["label"])
+                    ]),
+                    _: 1
+                  }),
+                  t(n, { span: 24 }, {
+                    default: o(() => [
+                      t(i, {
+                        label: l.$t("itsmFlowAcceptance.orderId"),
+                        prop: "orderNo"
+                      }, {
+                        default: o(() => [
+                          t(q, {
+                            modelValue: d(a).orderNo,
+                            "onUpdate:modelValue": e[2] || (e[2] = (s) => d(a).orderNo = s),
+                            placeholder: l.$t("itsmFlowAcceptance.orderIdRequired"),
+                            data: d(U).values,
+                            clearable: "",
+                            filterable: "",
+                            class: "w-full",
+                            onChange: se
+                          }, null, 8, ["modelValue", "placeholder", "data"])
+                        ]),
+                        _: 1
+                      }, 8, ["label"])
+                    ]),
+                    _: 1
+                  }),
+                  t(n, { span: 24 }, {
+                    default: o(() => [
+                      t(i, {
+                        label: l.$t("itsmFlowAcceptance.entrustName"),
+                        prop: "entrustName"
+                      }, {
+                        default: o(() => [
+                          t(ue, {
+                            modelValue: d(a).entrustName,
+                            "onUpdate:modelValue": e[3] || (e[3] = (s) => d(a).entrustName = s),
+                            placeholder: l.$t("itsmFlowAcceptance.orderIdRequireds"),
+                            disabled: "",
+                            class: "w-full"
+                          }, {
+                            default: o(() => [
+                              (y(!0), R(G, null, J(d(A).projectNameDict.values, (s) => (y(), H(de, {
+                                key: s.dictCode,
+                                label: s.dictName,
+                                value: s.dictCode
+                              }, null, 8, ["label", "value"]))), 128))
+                            ]),
+                            _: 1
+                          }, 8, ["modelValue", "placeholder"])
+                        ]),
+                        _: 1
+                      }, 8, ["label"])
+                    ]),
+                    _: 1
+                  }),
+                  t(n, { span: 12 }, {
+                    default: o(() => [
+                      t(i, {
+                        label: l.$t("itsmFlowAcceptance.serviceOrg"),
+                        prop: "serviceOrg"
+                      }, {
+                        default: o(() => [
+                          t(q, {
+                            modelValue: d(a).serviceOrg,
+                            "onUpdate:modelValue": e[4] || (e[4] = (s) => d(a).serviceOrg = s),
+                            placeholder: l.$t("itsmFlowAcceptance.orderIdRequireds"),
+                            data: d(A).orgIdBizDict.values,
+                            disabled: "",
+                            class: "w-full"
+                          }, null, 8, ["modelValue", "placeholder", "data"])
+                        ]),
+                        _: 1
+                      }, 8, ["label"])
+                    ]),
+                    _: 1
+                  }),
+                  t(n, { span: 12 }, {
+                    default: o(() => [
+                      t(i, {
+                        label: l.$t("itsmFlowAcceptance.stage"),
+                        prop: "stage"
+                      }, {
+                        default: o(() => [
+                          t(p, {
+                            modelValue: d(a).stage,
+                            "onUpdate:modelValue": e[5] || (e[5] = (s) => d(a).stage = s),
+                            placeholder: l.$t("itsmFlowAcceptance.stageRequired"),
+                            maxlength: "15",
+                            "show-word-limit": "",
+                            clearable: ""
+                          }, null, 8, ["modelValue", "placeholder"])
+                        ]),
+                        _: 1
+                      }, 8, ["label"])
+                    ]),
+                    _: 1
+                  }),
+                  t(n, { span: 12 }, {
+                    default: o(() => [
+                      t(i, {
+                        label: l.$t("itsmFlowAcceptance.headman"),
+                        prop: `headmanName\r
+`
+                      }, {
+                        default: o(() => [
+                          t(p, {
+                            modelValue: d(a).headmanName,
+                            "onUpdate:modelValue": e[6] || (e[6] = (s) => d(a).headmanName = s),
+                            placeholder: l.$t("itsmFlowAcceptance.headmanRequired"),
+                            disabled: ""
+                          }, null, 8, ["modelValue", "placeholder"])
+                        ]),
+                        _: 1
+                      }, 8, ["label"])
+                    ]),
+                    _: 1
+                  }),
+                  t(n, { span: 12 }, {
+                    default: o(() => [
+                      t(i, {
+                        label: l.$t("itsmFlowAcceptance.members")
+                      }, {
+                        default: o(() => [
+                          t(q, {
+                            modelValue: v.value,
+                            "onUpdate:modelValue": e[7] || (e[7] = (s) => v.value = s),
+                            placeholder: l.$t("itsmFlowAcceptance.membersRequired"),
+                            data: d(_).values,
+                            clearable: "",
+                            multiple: "",
+                            filterable: "",
+                            class: "w-full",
+                            onChange: X
+                          }, null, 8, ["modelValue", "placeholder", "data"])
+                        ]),
+                        _: 1
+                      }, 8, ["label"])
+                    ]),
+                    _: 1
+                  }),
+                  t(n, { span: 24 }, {
+                    default: o(() => [
+                      t(i, {
+                        label: l.$t("itsmFlowAcceptance.files"),
+                        prop: "files"
+                      }, {
+                        default: o(() => [
+                          t(I, {
+                            type: "primary",
+                            icon: d(ye),
+                            onClick: Y
+                          }, {
+                            default: o(() => [
+                              b(F(l.$t("common.uploadFiles")), 1)
+                            ]),
+                            _: 1
+                          }, 8, ["icon"])
+                        ]),
+                        _: 1
+                      }, 8, ["label"]),
+                      t(i, null, {
+                        default: o(() => [
+                          (y(!0), R(G, null, J(m.value, (s, K) => (y(), R("div", {
+                            key: K,
+                            class: "files-list"
+                          }, [
+                            b(F(s.fileName) + " ", 1),
+                            t(ie, {
+                              size: "16",
+                              class: "icon-right",
+                              onClick: (_e) => Z(K, s)
+                            }, {
+                              default: o(() => [
+                                t(re)
+                              ]),
+                              _: 2
+                            }, 1032, ["onClick"])
+                          ]))), 128))
+                        ]),
+                        _: 1
+                      })
+                    ]),
+                    _: 1
+                  }),
+                  t(n, { span: 24 }, {
+                    default: o(() => [
+                      t(i, {
+                        label: l.$t("itsmFlowAcceptance.serviceContent"),
+                        prop: "serviceContent"
+                      }, {
+                        default: o(() => [
+                          t(p, {
+                            modelValue: d(a).serviceContent,
+                            "onUpdate:modelValue": e[8] || (e[8] = (s) => d(a).serviceContent = s),
+                            placeholder: l.$t("itsmFlowAcceptance.orderIdRequireds"),
+                            maxlength: "500",
+                            rows: 4,
+                            type: "textarea",
+                            "show-word-limit": "",
+                            clearable: ""
+                          }, null, 8, ["modelValue", "placeholder"])
+                        ]),
+                        _: 1
+                      }, 8, ["label"])
+                    ]),
+                    _: 1
+                  }),
+                  t(n, { span: 12 }, {
+                    default: o(() => [
+                      t(i, {
+                        label: l.$t("itsmFlowAcceptance.result"),
+                        prop: "result"
+                      }, {
+                        default: o(() => [
+                          t(me, {
+                            modelValue: d(a).result,
+                            "onUpdate:modelValue": e[9] || (e[9] = (s) => d(a).result = s),
+                            data: d(A).isValuesDict.values,
+                            disabled: ""
+                          }, null, 8, ["modelValue", "data"])
+                        ]),
+                        _: 1
+                      }, 8, ["label"])
+                    ]),
+                    _: 1
+                  }),
+                  t(n, { span: 24 }, {
+                    default: o(() => [
+                      t(i, {
+                        label: l.$t("itsmFlowAcceptance.evaluate"),
+                        prop: "evaluate"
+                      }, {
+                        default: o(() => [
+                          t(p, {
+                            modelValue: d(a).evaluate,
+                            "onUpdate:modelValue": e[10] || (e[10] = (s) => d(a).evaluate = s),
+                            placeholder: l.$t("itsmFlowAcceptance.evaluateRequired"),
+                            maxlength: "500",
+                            rows: 4,
+                            type: "textarea",
+                            "show-word-limit": "",
+                            clearable: ""
+                          }, null, 8, ["modelValue", "placeholder"])
+                        ]),
+                        _: 1
+                      }, 8, ["label"])
+                    ]),
+                    _: 1
+                  })
+                ]),
+                _: 1
+              }),
+              t(M, { class: "bordered-row" }, {
+                default: o(() => [
+                  t(n, { span: 12 }, {
+                    default: o(() => e[14] || (e[14] = [
+                      u("div", { class: "content-box" }, [
+                        u("div", { class: "content-box-top" }, [
+                          u("div", null, "项目验收小组："),
+                          u("div", null, "单位(盖章):"),
+                          u("div", null, "负责人(签字):")
+                        ]),
+                        u("div", { class: "content-box-bottom" }, [
+                          b(" 日期: "),
+                          u("span", null, "年"),
+                          u("span", null, "月"),
+                          u("span", null, "日")
+                        ])
+                      ], -1)
+                    ])),
+                    _: 1,
+                    __: [14]
+                  }),
+                  t(n, {
+                    span: 12,
+                    class: "with-divider"
+                  }, {
+                    default: o(() => e[15] || (e[15] = [
+                      u("div", { class: "content-box" }, [
+                        u("div", { class: "content-box-top" }, [
+                          u("div", null, "服务人员所属单位："),
+                          u("div", null, "单位(盖章):"),
+                          u("div", null, "负责人(签字):")
+                        ]),
+                        u("div", { class: "content-box-bottom" }, [
+                          b(" 日期: "),
+                          u("span", null, "年"),
+                          u("span", null, "月"),
+                          u("span", null, "日")
+                        ])
+                      ], -1)
+                    ])),
+                    _: 1,
+                    __: [15]
+                  })
+                ]),
+                _: 1
+              })
+            ]),
+            _: 1
+          }, 8, ["model", "rules"]),
+          e[16] || (e[16] = u("div", { class: "with-end" }, "注：验收书编号在验收通过后自动生成。", -1)),
+          t(pe, {
+            ref_key: "uploadRef",
+            ref: D,
+            modelValue: $.value,
+            "onUpdate:modelValue": e[11] || (e[11] = (s) => $.value = s),
+            onUploadFileList: x
+          }, null, 8, ["modelValue"])
+        ]),
+        _: 1,
+        __: [16]
+      }, 8, ["modelValue"]);
+    };
+  }
+});
+export {
+  Ue as _
+};

package/dist/{el-message-So7u3ZRi.mjs → el-message-DweX1k3E.mjs}

@@ -1,5 +1,5 @@
 import { getCurrentInstance as z, inject as j, ref as _, computed as d, unref as l, readonly as yt, getCurrentScope as vt, onScopeDispose as ht, onMounted as Be, nextTick as ke, watch as Y, isRef as bt, warn as _t, provide as Ct, defineComponent as P, createElementBlock as J, openBlock as T, mergeProps as Ot, renderSlot as L, normalizeClass as N, createVNode as se, Transition as Le, withCtx as U, withDirectives as Ve, createElementVNode as re, normalizeStyle as Ke, createTextVNode as wt, toDisplayString as Re, vShow as He, shallowReactive as St, createBlock as B, createCommentVNode as G, resolveDynamicComponent as Tt, Fragment as Nt, withModifiers as Et, isVNode as Ge, render as he } from "vue";
-import { j as be, k as It, w as xt, s as Pt, l as $t } from "./index-C7wI2ALv.mjs";
+import { j as be, k as It, w as xt, s as Pt, l as $t } from "./index-CMpeLVvR.mjs";
 const Ue = Symbol(), Z = "el", jt = "is-", E = (e, t, n, o, r) => {
   let s = `${e}-${t}`;
   return n && (s += `-${n}`), o && (s += `__${o}`), r && (s += `--${r}`), s;