upp

后台管理/src/pages/A1Order/A1SetOrder/index.tsx

@@ -157,7 +157,7 @@ function A1SetOrder({ colseFu }: Props) {
 
   const row2ChangeFu = useCallback(
     (_: any, val: string, id: number) => {
-      if (row2.some((v) => v.time === val))
+      if (row2.some((v) => v.time === val) && val !== "")
         return MessageFu.warning("不可预约日期不能相同!");
       setRow2(
         row2.map((v) => ({
@@ -393,6 +393,7 @@ function A1SetOrder({ colseFu }: Props) {
                 {row2.map((v) => (
                   <div className="A1Srow2Del" key={v.id}>
                     <DatePicker
+                      // allowClear={false}
                       style={{ width: 130 }}
                       onChange={(_, val) => row2ChangeFu(_, val, v.id)}
                       value={v.time ? dayjs(v.time) : null}

后台管理/src/pages/A1Order/index.tsx

@@ -37,7 +37,7 @@ function A1Order() {
   const [fromData, setFromData] = useState({
     startTime: "",
     endTime: "",
-    exhibitionName: "",
+    exhibitionId: "",
     name: "",
     phone: "",
     bookDayStart: "",
@@ -123,7 +123,7 @@ function A1Order() {
     setFromData({
       startTime: "",
       endTime: "",
-      exhibitionName: "",
+      exhibitionId: "",
       name: "",
       phone: "",
       bookDayStart: "",
@@ -197,7 +197,7 @@ function A1Order() {
       },
       {
         title: "人数",
-        render: (item: A1TableType) => item.contact.split(",").length,
+        render: (item: A1TableType) => item.contact.split(",").length-1,
       },
       {
         title: "预约日期",
@@ -268,16 +268,16 @@ function A1Order() {
           });
         } else {
           // 后面修改的必须 至少有一个 预约人 和参观人
-          // 所以这段代码可以注释，以防万一 先留着
-          tepmArr.push({
-            ...v,
-            name1: resField(v.contact)[0],
-            phone1: resField(v.contact)[1],
-            name2: "暂无",
-            phone2: "暂无",
-            // IDCard: passDecodeFu(resField(v.contact)[2]),
-            IDCard: "暂无",
-          });
+          // 所以这段代码可以注释
+          // tepmArr.push({
+          //   ...v,
+          //   name1: resField(v.contact)[0],
+          //   phone1: resField(v.contact)[1],
+          //   name2: "暂无",
+          //   phone2: "暂无",
+          //   // IDCard: passDecodeFu(resField(v.contact)[2]),
+          //   IDCard: "暂无",
+          // });
         }
       });
 
@@ -346,9 +346,9 @@ function A1Order() {
           <Select
             placeholder="请选择"
             style={{ width: 240 }}
-            value={fromData.exhibitionName}
+            value={fromData.exhibitionId}
             onChange={(e) =>
-              setFromData({ ...fromData, exhibitionName: e, pageNum: 1 })
+              setFromData({ ...fromData, exhibitionId: e, pageNum: 1 })
             }
             options={select}
           />