f

src/pages/consume/index.jsx

@@ -7,7 +7,7 @@ import { queryTable, queryDict } from "@/utils/request";
 import { getSysUser } from "@/services/sysUser";
 import { getTaMemberCard } from "@/services/taMemberCard";
 
-const TaOrderList = queryTable(() => getTaOrder({ billType: 'consume' }));
+
 
 const TaSysUserList = queryDict(getSysUser, { labelKey: "userName", valueKey: "createdBy" });
 export default (props) => {
@@ -17,6 +17,7 @@ export default (props) => {
   const TaMemberCardLeftAmount = queryDict(getTaMemberCard, { labelKey: "leftAmount", valueKey: "cardId" });
 
   const actionRef = useRef();
+  const TaOrderList = queryTable(getTaOrder);
 
   const columns = [
     {
@@ -62,12 +63,13 @@ export default (props) => {
     {
       title: "核销日期",
       dataIndex: "createdAt",
+      render: (it) => (it == '-' ? '-' : moment(it).format("YYYY-MM-DD HH:mm:ss")),
       search: false
     },
     {
       title: "开卡日期",
       dataIndex: "orderDate",
-      // render: (it) => (it == '-' ? '-' : moment(it).format("YYYY-MM-DD HH:mm:ss")),
+      render: (it) => (it == '-' ? '-' : moment(it).format("YYYY-MM-DD HH:mm:ss")),
       search: false
     },
     {
@@ -95,6 +97,7 @@ export default (props) => {
       <ProTable
         cardBordered
         rowKey="orderId"
+        params={{ billType: 'consume' }}
         columns={columns}
         actionRef={actionRef}
         request={TaOrderList}

src/pages/member/components/ModalNewCard.jsx

@@ -40,10 +40,10 @@ export default (props) => {
         // 核销卡
         putTaMemberCardIdWrite(x.cardId)
           .then((result) => {
-          reload();
+            reload();
             setIsModalOpen(false);
           })
-          .catch((err) => {});
+          .catch((err) => { });
       } else {
         // 开卡
         postTaMemberCardIdActive(x).then((res) => {
@@ -66,6 +66,7 @@ export default (props) => {
         <ProFormSelect
           name="sex"
           label="性别"
+          rules={[{ required: true, message: "请选择性别" }]}
           options={[
             {
               value: 1,

src/pages/member/components/SelectCardModal.jsx

@@ -19,13 +19,14 @@ export default (props) => {
         // const dataNum = record.taMemberCardList.reduce((total, item) => {
         //   return (total += item.leftAmount);
         // }, 0);
+        console.log('------xiaofang--->', x?.expireTime < x?.bizDate);
         disabledNum += x.leftAmount;
-        console.log('xiaofang', disabledNum);
         return {
           ...x,
           value: x.cardId,
           label: packList[x.packageId],
-          disabled: !disabledNum,
+          //如果是次卡次数等于0就禁用，否则非次卡截至日期小于开卡日期就禁用
+          disabled: x.limitUnit == 'order' ? disabledNum == 0 : x?.expireTime < x?.bizDate
         };
       });
       setCardOptions(data);

src/pages/package/components/Package.jsx

@@ -25,7 +25,7 @@ export default (props) => {
   const onFinish = (values) => {
     console.log(values);
     if (!id) {
-      postTaPackage({ limitType: 1, ...values }).then(() => {
+      postTaPackage({ limitType: 0, ...values }).then(() => {
         navigate(-1);
       });
     } else {