更新代码

src/api/refer.ts

@@ -14,7 +14,7 @@ export const referReservation = (data: any) => {
 };
 
 /**
- * @brief 查阅预约
+ * @brief 微信公众号推送
  * @param  data
  * @return
  */

src/components/appointmentTime.vue

@@ -136,7 +136,6 @@ const props = defineProps({
     default: "",
   },
 });
-console.log(props.prompt);
 
 const emits = defineEmits(["change", "onConfirm"]);
 

src/pages/deposit/index.vue

@@ -75,7 +75,9 @@ const data = reactive({
       },
       {
         validator: (rule: any, value: any, callback: any) => {
-          return uniA.$u.test.idCard(value) || isXgIDCard(value);
+          if (!isNaN(parseInt(value.trim()[0])))
+            return uniA.$u.test.idCard(value);
+          else return true;
         },
         message: "身份证号不正确",
         trigger: ["change", "blur"],

src/pages/refer/index.vue

@@ -8,7 +8,7 @@
 <script setup lang="ts">
 import { appointmentConfig } from "@/api/transfer";
 import { useGlobalStore } from "@/store/useStore";
-import { getUrlCode } from "@/utils/util";
+import { formattedText, getUrlCode } from "@/utils/util";
 import workGuide from "@/pages/workGuide/index.vue";
 import referForm from "./referForm.vue";
 

src/pages/refer/referForm.vue

@@ -159,7 +159,9 @@ const state = reactive({
       },
       {
         validator: (rule: any, value: any, callback: any) => {
-          return uniA.$u.test.idCard(value) || isXgIDCard(value);
+          if (!isNaN(parseInt(value.trim()[0])))
+            return uniA.$u.test.idCard(value);
+          else return true;
         },
         message: "身份证号不正确",
         trigger: ["blur"],
@@ -187,7 +189,9 @@ const state = reactive({
       },
       {
         validator: (rule: any, value: any, callback: any) => {
-          return uniA.$u.test.idCard(value) || isXgIDCard(value);
+          if (!isNaN(parseInt(value.trim()[0])))
+            return uniA.$u.test.idCard(value);
+          else return true;
         },
         message: "身份证号不正确",
         trigger: ["blur"],
@@ -223,7 +227,9 @@ const state = reactive({
       },
       {
         validator: (rule: any, value: any, callback: any) => {
-          return uniA.$u.test.idCard(value) || isXgIDCard(value);
+          if (!isNaN(parseInt(value.trim()[0])))
+            return uniA.$u.test.idCard(value);
+          else return true;
         },
         message: "身份证号不正确",
         trigger: ["blur"],
@@ -281,7 +287,8 @@ const state = reactive({
 watch(
   () => state.parmeters.Model.FReservationQty,
   (val: any) => {
-    if (Number(val) <= 0 || Number(val) > 2) state.disabled = true;
+    if ((Number(val) <= 0 || Number(val) > 2) && val !== "")
+      state.disabled = true;
     // if (Number(val) > 2) toast("如需查阅多份档案，请与我们联系86218594");
     else state.disabled = false;
   }
@@ -342,6 +349,7 @@ const submit = () => {
 
 const radioChange = (e: string) => {
   if (e === "本人查阅") {
+    state.disabled = false;
     show.value = false;
     state.parmeters.Model.FReservationQty = "";
   } else show.value = true;

src/pages/refer/referReservation.vue

@@ -68,7 +68,7 @@ const onConfirm = () => {
         await pushMessaging(pushParams);
         appointmentTimeRef.value.FEntryID = null;
         await init();
-        await toast("查阅预约成功");
+        // await toast("查阅预约成功");
       } else if (res.code === 402) toast(res.msg);
     }
   });

src/pages/transfer/index.vue

@@ -123,7 +123,9 @@ const data = reactive({
       },
       {
         validator: (rule: any, value: any, callback: any) => {
-          return uniA.$u.test.idCard(value) || isXgIDCard(value);
+          if (!isNaN(parseInt(value.trim()[0])))
+            return uniA.$u.test.idCard(value);
+          else return true;
         },
         message: "身份证号不正确",
         trigger: ["blur"],
@@ -215,6 +217,9 @@ const start = () => {
 };
 
 const submit = () => {
+  // Reflect.deleteProperty(data.parmeters.Model, "code");
+  // globalStore.setTransferData(data.parmeters);
+  // uni.navigateTo({ url: "/pages/transfer/reservation" });
   form.value.validate(async (valid: boolean) => {
     if (valid) {
       if (!data.flag) return toast("验证码失效");

src/pages/transfer/reservation.vue

@@ -61,7 +61,7 @@ const appointmentTimeRef = ref();
 
 const uploadFile = () => {
   uni.chooseFile({
-    count: 1,
+    count: 9,
     extension: ["xls", "xlsx"],
     success(res: any) {
       if (res.errMsg == "chooseFile:ok") {
@@ -100,37 +100,42 @@ const upload = (type: number) => {
       type,
     },
     success: async (uploadFileRes: any) => {
-      const res = JSON.parse(uploadFileRes.data);
-      if (res.code === 200) {
-        state.isReservation = true;
-        let pushParams = {
-          Code: globalStore.code,
-          FDatetime: "", //预约时间
-          YYType: "档案移交", //预约类型：档案移交，档案查阅
-        };
-        list.value.map((item: any) => {
-          [...item.morning, ...item.afternoon].map((col: any) => {
-            if (col.FEntryID == state.fid) {
-              pushParams.FDatetime = item.date + " " + col.Time + ":00";
-              state.successDate = `${item.date.split("-")[0]}月${
-                item.date.split("-")[1]
-              }日${parseInt(col.Time?.split(":")[0], 10).toString()}点`;
+      try {
+        const res = JSON.parse(uploadFileRes.data);
+        if (res.code === 200) {
+          state.isReservation = true;
+          let pushParams = {
+            Code: globalStore.code,
+            FDatetime: "", //预约时间
+            YYType: "档案移交", //预约类型：档案移交，档案查阅
+          };
+          list.value.map((item: any) => {
+            [...item.morning, ...item.afternoon].map((col: any) => {
+              if (col.FEntryID == state.fid) {
+                pushParams.FDatetime = item.date + " " + col.Time + ":00";
+                state.successDate = `${item.date.split("-")[0]}月${
+                  item.date.split("-")[1]
+                }日${parseInt(col.Time?.split(":")[0], 10).toString()}点`;
+              }
+            });
+          });
+          await pushMessaging(pushParams);
+          appointmentTimeRef.value.FEntryID = null;
+          fileUrl.value = null;
+          await init();
+          // await toast("移交预约成功");
+        } else if (res.code === 402) {
+          zconfirm(res.msg, (e: boolean) => {
+            if (e) {
+              upload(1);
             }
           });
-        });
-        await pushMessaging(pushParams);
-        appointmentTimeRef.value.FEntryID = null;
-        fileUrl.value = null;
-        await init();
-        await toast("移交预约成功");
-      } else if (res.code === 402) {
-        zconfirm(res.msg, (e: boolean) => {
-          if (e) {
-            upload(1);
-          }
-        });
-      } else toast(res.msg);
-      hLoading();
+        } else toast(res.msg);
+        hLoading();
+      } catch (error) {
+        hLoading();
+        toast("预约失败，请检查上传文件格式或联系管理员");
+      }
     },
   });
 };
@@ -165,7 +170,7 @@ const init = async () => {
     list.value = [];
     let flag = true;
     let isCurrent = true;
-    res.data.slice(0, 7).map((item: any, i: any) => {
+    res.data?.slice(0, 7).map((item: any, i: any) => {
       list.value.push({
         active: flag && item.FISRESTDAYS === "0" && isFull(item.data),
         week: item.WeekdayName,

src/pages/workGuide/guide.vue

@@ -138,6 +138,7 @@ const downFileWindows = async (row: any) => {
       height: 60rpx;
       color: #05a8ff;
       border: 2rpx solid #05a8ff;
+      margin-top: 12rpx;
     }
   }
   .guide-header {

src/pages/workGuide/lookAttr.vue

@@ -23,7 +23,7 @@
       <view class="title">导航搜索:</view>
       <view class="detail">{{ data.paramsData?.DHSS?.FCONTENT }}</view>
     </view>
- 
+
     <map
       class="attr-map"
       :latitude="data.paramsData?.JWD?.FCONTENT.split(',')[0]"
@@ -37,7 +37,7 @@
 <script setup lang="ts">
 import { appointmentConfig } from "@/api/transfer";
 import { formattedText } from "@/utils/util";
-import { baseUrl } from "../../utils/request.ts";
+import { baseUrl } from "../../utils/request";
 
 const data = reactive({
   paramsData: {} as any,

vite.config.ts

@@ -65,13 +65,10 @@ export default defineConfig({
       //   secure: false,
       // },
       "/K3Cloud": {
-        target: "http://192.168.1.168",
-        // target: "http://192.168.1.61/",
+        target: "http://192.168.1.66",
+        // target: "http://192.66.1.61/",
         secure: false,
       },
-      "/XiBU": {
-        target: "http://192.168.1.12/",
-      },
     },
   },
 });