qk-pc-ui 3.4.6 → 3.4.8

package/dist/qk-pc-ui.mjs

@@ -15598,7 +15598,7 @@ const _hoisted_1$g = { style: { display: "inline-block", width: "100px" } }, _ho
           return S.colspan == "0" || S.rowspan == "0" ? "" : `<td rowspan="${S.rowspan > 1 ? S.rowspan : ""}" colspan="${S.colspan > 1 ? S.colspan : ""}">${o(H, C.title)}</td>`;
         }).join("")}</tr>`
       ).join(""), O = "";
-      return t.columnArray.filter((H) => H.isSummary).length > 0 && (O = `<tr>${d().map((H) => `<td>${H}</td>`)}</tr>`), `
+      return t.columnArray.filter((H) => H.isSummary).length > 0 && (O = `<tr>${d().map((H) => `<td>${H}</td>`).join(",")}</tr>`), `
 		<style type="text/css">
 		    td, th {
 		        border: 1px solid black;
@@ -15656,8 +15656,8 @@ const _hoisted_1$g = { style: { display: "inline-block", width: "100px" } }, _ho
           if (I.src && I.src.IgnoreSummary) return;
           let k = I[u.title];
           !m && _.test(k) && (m = !0);
-          let O = Number(I[u.title]);
-          Number.isNaN(O) || (k += O);
+          let O = Number(k);
+          Number.isNaN(O) || (A += O);
         }), m ? A.toFixed(2) : A;
       });
     };
@@ -16725,7 +16725,8 @@ const SafeCall$1 = async (e, r) => {
           let G = { IgnoreSummary: !0, Rows: O }, C = !0, D = O[0];
           for (let S in D) G[S] = D[S];
           for (let S = 0; S < o.columnArray.length; S++)
-            if (C && o.columnArray[S].isHeBing) G[o.columnArray[S].dataKey] = O[0][o.columnArray[S].dataKey];
+            if (C && o.columnArray[S].isHeBing)
+              G[o.columnArray[S].dataKey] = O[0][o.columnArray[S].dataKey];
             else {
               if (C) {
                 C = !1, G[o.columnArray[S].dataKey] = "合计";
@@ -16835,7 +16836,7 @@ const SafeCall$1 = async (e, r) => {
       }, null, 8, ["data", "tabName", "toolWidth", "columnArray", "commandArray", "printOption"]))
     ]));
   }
-}, reportIndex = /* @__PURE__ */ _export_sfc(_sfc_main$j, [["__scopeId", "data-v-f7f579b7"]]), _sfc_main$i = {
+}, reportIndex = /* @__PURE__ */ _export_sfc(_sfc_main$j, [["__scopeId", "data-v-f81f822b"]]), _sfc_main$i = {
   __name: "byDatePicker",
   props: {
     BeginTime: { type: [String, void 0], default: "" },
@@ -18093,8 +18094,47 @@ const _hoisted_1$c = { style: "width: 100%;height:100%;border:1px solid #ccc" },
     console.log(r.message || r.resultcontent);
   }
   staticData.isUpdateing = !1;
+}, onUseCard = async (e, r, t) => {
+  if (e.HasPassWord == 1) {
+    let a = null;
+    try {
+      a = await ElMessageBox.prompt("请输入卡密码", "卡密码", {
+        cancelButtonText: "取消",
+        confirmButtonText: "确定",
+        closeOnClickModal: !1,
+        closeOnPressEscape: !1,
+        closeOnHashChange: !1,
+        inputType: "password"
+      });
+    } catch (n) {
+      if (n == "cancel") return;
+    }
+    a = await MemberApi("/OrganApi/GetMemberCardIdentityCode", { CardId: e.Id, PassWord: a.value, ValidityMinute: 5 }), t.PayCode = a.RCardCode, t.UseTimes = r, await CallApiConfirmOrder(t);
+  } else
+    t.UseTimes = r, await CallApiConfirmOrder(t);
+}, onUse = async (e, r) => {
+  if (e.CardTypeClass == CardTypeClassEnum.计次卡) {
+    let t = null;
+    try {
+      t = await ElMessageBox.prompt("注意：当前使用的是【计次卡】，请根据消费的产品输入需要扣取的次数。默认每张票扣1次！", "计次卡扣费", {
+        cancelButtonText: "取消",
+        confirmButtonText: "确定",
+        closeOnClickModal: !1,
+        closeOnPressEscape: !1,
+        closeOnHashChange: !1,
+        inputPlaceholder: "请输入需要扣取的次数",
+        inputValue: "1"
+      });
+    } catch (a) {
+      if (a == "cancel") return;
+    }
+    await onUseCard(e, t.value, r);
+  } else if (e.CardTypeClass == CardTypeClassEnum.周期卡) {
+    if (!confirm("注意：当前使用的是【周期卡】，将不会扣除余额，请确认是否继续？", "注意"))
+      return;
+    await onUseCard(e, 0, r);
+  } else e.CardTypeClass == CardTypeClassEnum.储值卡 && await onUseCard(e, 0, r);
 }, ConfirmOrder = async (e) => {
-  let r = e.GetMethod;
   switch (e.GetMethod) {
     case "现金":
       {
@@ -18107,20 +18147,30 @@ const _hoisted_1$c = { style: "width: 100%;height:100%;border:1px solid #ccc" },
       {
         if (!e.PayCode) return ElMessageBox.alert("请输入会员凭证");
         if (isPayCode(e.PayCode))
-          return ElMessage({ message: "检测到付款码输入！自动切换至网络支付" }), e.GetMethod = "扫码收款", ConfirmOrder(e);
-        e.PayType = "512", r = "会员收款";
+          return ElMessageBox.alert("检测到付款码输入，请切换到网络支付再扫码付款");
+        if (e.PayType = "512", e.GetMethod = "会员收款", e.chkMember) {
+          let r = null;
+          try {
+            r = await MemberApi("/OrganApi/MemberRelCardSearch", { SearchType: 1, CardNo: e.PayCode });
+          } catch {
+          }
+          if (r != null) {
+            await onUse(r, e);
+            return;
+          }
+        }
       }
       break;
     case "扫码收款":
       {
         if (!e.PayCode) return ElMessageBox.alert("请输入正确的支付宝或者微信付款码");
         if (e.PayType = getPayCodeType(e.PayCode), e.PayType == 0) return ElMessageBox.alert("请输入正确的支付宝或者微信付款码");
-        r = "网络收款";
+        e.GetMethod = "网络收款";
       }
       break;
   }
-  if (e.PayType == "65536" && r == "网络收款")
-    return ElMessageBox.alert("特殊情况，请切图然后联系技术人员");
+  return e.PayType == "65536" && e.GetMethod == "网络收款" ? ElMessageBox.alert("特殊情况，请切图然后联系技术人员") : await CallApiConfirmOrder(e);
+}, CallApiConfirmOrder = async (e) => {
   (await AjaxCallWeb(e.Api.ConfirmOrder, {
     OrderId: e.OrderId,
     OrderCode: e.OrderCode,
@@ -18131,12 +18181,12 @@ const _hoisted_1$c = { style: "width: 100%;height:100%;border:1px solid #ccc" },
     Telephone: e.Telephone,
     RebateAmount: e.RebateAmount * 100,
     Remarks: e.Remarks,
-    GetMethod: r
+    GetMethod: e.GetMethod
   })).DataType == "3" ? (staticData.loading = ElLoading.service({
     lock: !0,
     text: "等待用户完成支付",
     background: "rgba(0, 0, 0, 0.7)"
-  }), staticData.confirmOrderInfo = e, staticData.timerId = setInterval(() => UpdateOrderStatus(), 1e3)) : (sessionStorage.getItem("DevicePlatform") == "1" && r == "现金" && setTimeout(async () => {
+  }), staticData.confirmOrderInfo = e, staticData.timerId = setInterval(() => UpdateOrderStatus(), 1e3)) : (sessionStorage.getItem("DevicePlatform") == "1" && e.GetMethod == "现金" && setTimeout(async () => {
     await AndroidApi("/print/sunmiOpenDrawer");
   }, 500), e.PaySuccess());
 }, SafeConfirmOrder = async (e) => {
@@ -18206,9 +18256,12 @@ const _hoisted_1$c = { style: "width: 100%;height:100%;border:1px solid #ccc" },
       ckCardPassword: "不检测",
       ckTsCardUse: "不支持",
       payTime: 0,
-      managerInfo: {}
+      managerInfo: {},
+      chkMember: !0
     }), f = () => {
-      i.value.LoadData(o.Telephone), o.isMemberBox = !0;
+      o.isMemberBox = !1, nextTick(() => {
+        i.value.LoadData(o.Telephone), o.isMemberBox = !0;
+      });
     };
     watch(
       () => o.GetMethod,
@@ -18222,7 +18275,7 @@ const _hoisted_1$c = { style: "width: 100%;height:100%;border:1px solid #ccc" },
     watch(
       () => t.modelValue,
       (u) => {
-        u ? (o.PayCode = "", o.PayAmount = "", o.RebateAmount = 0, o.numOfTimes = "", o.Remarks = "", o.Telephone = "", t.makreter && o.managerInfo.Telephone && (o.MakreterTel = o.managerInfo.Telephone), o.IsConfirming = !1, o.payTime = 0, setTimeout(() => {
+        u ? (o.chkMember = !0, o.PayCode = "", o.PayAmount = "", o.RebateAmount = 0, o.numOfTimes = "", o.Remarks = "", o.Telephone = "", t.makreter && o.managerInfo.Telephone && (o.MakreterTel = o.managerInfo.Telephone), o.IsConfirming = !1, o.payTime = 0, setTimeout(() => {
           t.memberInfo && t.memberInfo.Id && (o.GetMethod = "会员收款", o.Telephone = t.memberInfo.Telephone, f());
         }, 100), c(o.GetMethod)) : (o.timerId != null && (clearInterval(o.timerId), o.timerId = null), o.loading != null && (o.loading.close(), o.loading = null));
       }
@@ -18235,7 +18288,7 @@ const _hoisted_1$c = { style: "width: 100%;height:100%;border:1px solid #ccc" },
         o.Remarks = u;
       });
     }, _ = (u, p) => {
-      o.PayCode = u, o.PayType = "512", o.numOfTimes = p, o.isMemberBox = !1, nextTick(() => d());
+      o.PayCode = u, o.PayType = "512", o.numOfTimes = p, o.isMemberBox = !1, o.chkMember = !1, nextTick(() => d());
     }, d = async () => {
       if (o.IsConfirming) return;
       o.IsConfirming = !0;
@@ -18249,6 +18302,7 @@ const _hoisted_1$c = { style: "width: 100%;height:100%;border:1px solid #ccc" },
         PayAmount: o.PayAmount,
         PayCode: o.PayCode,
         OrderId: t.orderInfo.Id,
+        chkMember: o.chkMember,
         OrderCode: t.orderInfo.OrderCode,
         PayType: o.PayType,
         UseTimes: o.numOfTimes,
@@ -18564,7 +18618,7 @@ const _hoisted_1$c = { style: "width: 100%;height:100%;border:1px solid #ccc" },
       _: 1
     }, 8, ["modelValue"]));
   }
-}, byConfirmOrder = /* @__PURE__ */ _export_sfc(_sfc_main$5, [["__scopeId", "data-v-2598641c"]]), _hoisted_1$1 = { name: "selectIco" }, _hoisted_2 = { style: { padding: "5px", float: "left", border: "1px solid #e2e2e2", overflow: "hidden" } }, _hoisted_3 = {
+}, byConfirmOrder = /* @__PURE__ */ _export_sfc(_sfc_main$5, [["__scopeId", "data-v-c3517d06"]]), _hoisted_1$1 = { name: "selectIco" }, _hoisted_2 = { style: { padding: "5px", float: "left", border: "1px solid #e2e2e2", overflow: "hidden" } }, _hoisted_3 = {
   class: "icon",
   "aria-hidden": "true",
   style: { "font-size": "60px" }