upp

后台管理/src/pages/A1Order/A1Look/index.module.scss

@@ -23,6 +23,13 @@
 
         .infoP {
           margin-bottom: 10px;
+          position: relative;
+
+          .canguanTit {
+            position: absolute;
+            left: -75px;
+            top: 0px;
+          }
         }
       }
     }

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

@@ -58,7 +58,7 @@ function A1Look({ data, closeModelFu }: Props) {
       </div>
 
       <div className="A1MBox">
-        <div className="A1MBoxL">所在处室：</div>
+        <div className="A1MBoxL">所在部门：</div>
         <div className="A1MBoxR">
           <p>{data.division}</p>
         </div>
@@ -69,6 +69,9 @@ function A1Look({ data, closeModelFu }: Props) {
         <div className="A1MBoxR">
           {infoArr.map((v: any, i: number) => (
             <div className="infoP" key={i}>
+              {/* 参观人 */}
+              {i === 1 ? <div className="canguanTit">参观人：</div> : null}
+
               <p>{v.name}</p>
               <p>{passDecodeFu(v.zheng)}</p>
             </div>
@@ -84,7 +87,7 @@ function A1Look({ data, closeModelFu }: Props) {
       </div>
 
       <div className="A1MBox">
-        <div className="A1MBoxL">所在时段：</div>
+        <div className="A1MBoxL">入馆时段：</div>
         <div className="A1MBoxR">
           <p>{data.bootTimeScope}</p>
         </div>

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

@@ -23,7 +23,7 @@ import { A1_APIOgetInfo, A1_APIOsave } from "@/store/action/A1Order";
 import TextArea from "antd/es/input/TextArea";
 
 const tabArr = [
-  { id: 118, name: "南京市博物总管" },
+  { id: 118, name: "南京博物院" },
   { id: 114, name: "扬州中国大运河博物馆" },
 ];
 

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

@@ -27,9 +27,8 @@ const { RangePicker } = DatePicker;
 // 获取展馆下拉信息
 const select = [
   { value: "", label: "全部" },
-  { value: "南京博物院", label: "南京博物院" },
-  { value: "中国大运河博物馆", label: "中国大运河博物馆" },
-  { value: "苏州博物馆", label: "苏州博物馆" },
+  { value: 118, label: "南京博物院" },
+  { value: 114, label: "扬州中国大运河博物馆" },
 ];
 
 function A1Order() {
@@ -184,7 +183,7 @@ function A1Order() {
           item.unitName ? item.unitName : "（空）",
       },
       {
-        title: "所在处室",
+        title: "所在部门",
         render: (item: A1TableType) =>
           item.division ? item.division : "（空）",
       },
@@ -205,7 +204,7 @@ function A1Order() {
         render: (item: A1TableType) => (item.bookDay ? item.bookDay : "（空）"),
       },
       {
-        title: "预约时段",
+        title: "入馆时段",
         render: (item: A1TableType) =>
           item.bootTimeScope ? item.bootTimeScope : "（空）",
       },
@@ -253,22 +252,31 @@ function A1Order() {
         if (v.contact && v.contact.includes(",")) {
           const arrAll = v.contact.split(",");
 
-          arrAll.forEach((v2: any) => {
+          arrAll.forEach((v2: any, i2: number) => {
             const arr1 = v2.split("-");
 
-            tepmArr.push({
-              ...v,
-              name: arr1[0] || "暂无",
-              phone: arr1[1] || "暂无",
-              IDCard: passDecodeFu(arr1[2]) || "暂无",
-            });
+            if (i2 !== 0) {
+              tepmArr.push({
+                ...v,
+                name1: resField(v.contact)[0],
+                phone1: resField(v.contact)[1],
+                name2: arr1[0] || "暂无",
+                phone2: arr1[1] || "暂无",
+                IDCard: passDecodeFu(arr1[2]) || "暂无",
+              });
+            }
           });
         } else {
+          // 后面修改的必须 至少有一个 预约人 和参观人
+          // 所以这段代码可以注释，以防万一 先留着
           tepmArr.push({
             ...v,
-            name: resField(v.contact)[0],
-            phone: resField(v.contact)[1],
-            IDCard: passDecodeFu(resField(v.contact)[2]),
+            name1: resField(v.contact)[0],
+            phone1: resField(v.contact)[1],
+            name2: "暂无",
+            phone2: "暂无",
+            // IDCard: passDecodeFu(resField(v.contact)[2]),
+            IDCard: "暂无",
           });
         }
       });
@@ -284,8 +292,12 @@ function A1Order() {
               "exhibitionName",
               "unitName",
               "division",
-              "name",
-              "phone",
+
+              "name1",
+              "phone1",
+              "name2",
+              "phone2",
+
               "IDCard",
               "bookDay",
               "bootTimeScope",
@@ -294,14 +306,18 @@ function A1Order() {
               "申请时间",
               "参观展馆",
               "所在单位",
-              "所在处室",
-              "姓名",
-              "联系电话",
+              "所在部门",
+
+              "预约人姓名",
+              "预约人联系电话",
+              "参观人姓名",
+              "参观人联系电话",
+
               "身份证",
               "预约日期",
-              "预约时段",
+              "入馆时段",
             ],
-            columnWidths: [10, 10, 10, 10, 10, 10, 10, 10, 10],
+            columnWidths: [10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10],
           },
         ],
       };