提交 bb7e5f53 authored 作者: 刘旭's avatar 刘旭

更新代码

上级 e9c0d54f
...@@ -14,7 +14,7 @@ export const referReservation = (data: any) => { ...@@ -14,7 +14,7 @@ export const referReservation = (data: any) => {
}; };
/** /**
* @brief 查阅预约 * @brief 微信公众号推送
* @param data * @param data
* @return * @return
*/ */
......
...@@ -136,7 +136,6 @@ const props = defineProps({ ...@@ -136,7 +136,6 @@ const props = defineProps({
default: "", default: "",
}, },
}); });
console.log(props.prompt);
const emits = defineEmits(["change", "onConfirm"]); const emits = defineEmits(["change", "onConfirm"]);
......
...@@ -75,7 +75,9 @@ const data = reactive({ ...@@ -75,7 +75,9 @@ const data = reactive({
}, },
{ {
validator: (rule: any, value: any, callback: any) => { 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: "身份证号不正确", message: "身份证号不正确",
trigger: ["change", "blur"], trigger: ["change", "blur"],
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<script setup lang="ts"> <script setup lang="ts">
import { appointmentConfig } from "@/api/transfer"; import { appointmentConfig } from "@/api/transfer";
import { useGlobalStore } from "@/store/useStore"; import { useGlobalStore } from "@/store/useStore";
import { getUrlCode } from "@/utils/util"; import { formattedText, getUrlCode } from "@/utils/util";
import workGuide from "@/pages/workGuide/index.vue"; import workGuide from "@/pages/workGuide/index.vue";
import referForm from "./referForm.vue"; import referForm from "./referForm.vue";
......
...@@ -159,7 +159,9 @@ const state = reactive({ ...@@ -159,7 +159,9 @@ const state = reactive({
}, },
{ {
validator: (rule: any, value: any, callback: any) => { 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: "身份证号不正确", message: "身份证号不正确",
trigger: ["blur"], trigger: ["blur"],
...@@ -187,7 +189,9 @@ const state = reactive({ ...@@ -187,7 +189,9 @@ const state = reactive({
}, },
{ {
validator: (rule: any, value: any, callback: any) => { 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: "身份证号不正确", message: "身份证号不正确",
trigger: ["blur"], trigger: ["blur"],
...@@ -223,7 +227,9 @@ const state = reactive({ ...@@ -223,7 +227,9 @@ const state = reactive({
}, },
{ {
validator: (rule: any, value: any, callback: any) => { 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: "身份证号不正确", message: "身份证号不正确",
trigger: ["blur"], trigger: ["blur"],
...@@ -281,7 +287,8 @@ const state = reactive({ ...@@ -281,7 +287,8 @@ const state = reactive({
watch( watch(
() => state.parmeters.Model.FReservationQty, () => state.parmeters.Model.FReservationQty,
(val: any) => { (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"); // if (Number(val) > 2) toast("如需查阅多份档案,请与我们联系86218594");
else state.disabled = false; else state.disabled = false;
} }
...@@ -342,6 +349,7 @@ const submit = () => { ...@@ -342,6 +349,7 @@ const submit = () => {
const radioChange = (e: string) => { const radioChange = (e: string) => {
if (e === "本人查阅") { if (e === "本人查阅") {
state.disabled = false;
show.value = false; show.value = false;
state.parmeters.Model.FReservationQty = ""; state.parmeters.Model.FReservationQty = "";
} else show.value = true; } else show.value = true;
......
...@@ -68,7 +68,7 @@ const onConfirm = () => { ...@@ -68,7 +68,7 @@ const onConfirm = () => {
await pushMessaging(pushParams); await pushMessaging(pushParams);
appointmentTimeRef.value.FEntryID = null; appointmentTimeRef.value.FEntryID = null;
await init(); await init();
await toast("查阅预约成功"); // await toast("查阅预约成功");
} else if (res.code === 402) toast(res.msg); } else if (res.code === 402) toast(res.msg);
} }
}); });
......
...@@ -123,7 +123,9 @@ const data = reactive({ ...@@ -123,7 +123,9 @@ const data = reactive({
}, },
{ {
validator: (rule: any, value: any, callback: any) => { 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: "身份证号不正确", message: "身份证号不正确",
trigger: ["blur"], trigger: ["blur"],
...@@ -215,6 +217,9 @@ const start = () => { ...@@ -215,6 +217,9 @@ const start = () => {
}; };
const submit = () => { const submit = () => {
// Reflect.deleteProperty(data.parmeters.Model, "code");
// globalStore.setTransferData(data.parmeters);
// uni.navigateTo({ url: "/pages/transfer/reservation" });
form.value.validate(async (valid: boolean) => { form.value.validate(async (valid: boolean) => {
if (valid) { if (valid) {
if (!data.flag) return toast("验证码失效"); if (!data.flag) return toast("验证码失效");
......
...@@ -61,7 +61,7 @@ const appointmentTimeRef = ref(); ...@@ -61,7 +61,7 @@ const appointmentTimeRef = ref();
const uploadFile = () => { const uploadFile = () => {
uni.chooseFile({ uni.chooseFile({
count: 1, count: 9,
extension: ["xls", "xlsx"], extension: ["xls", "xlsx"],
success(res: any) { success(res: any) {
if (res.errMsg == "chooseFile:ok") { if (res.errMsg == "chooseFile:ok") {
...@@ -100,6 +100,7 @@ const upload = (type: number) => { ...@@ -100,6 +100,7 @@ const upload = (type: number) => {
type, type,
}, },
success: async (uploadFileRes: any) => { success: async (uploadFileRes: any) => {
try {
const res = JSON.parse(uploadFileRes.data); const res = JSON.parse(uploadFileRes.data);
if (res.code === 200) { if (res.code === 200) {
state.isReservation = true; state.isReservation = true;
...@@ -122,7 +123,7 @@ const upload = (type: number) => { ...@@ -122,7 +123,7 @@ const upload = (type: number) => {
appointmentTimeRef.value.FEntryID = null; appointmentTimeRef.value.FEntryID = null;
fileUrl.value = null; fileUrl.value = null;
await init(); await init();
await toast("移交预约成功"); // await toast("移交预约成功");
} else if (res.code === 402) { } else if (res.code === 402) {
zconfirm(res.msg, (e: boolean) => { zconfirm(res.msg, (e: boolean) => {
if (e) { if (e) {
...@@ -131,6 +132,10 @@ const upload = (type: number) => { ...@@ -131,6 +132,10 @@ const upload = (type: number) => {
}); });
} else toast(res.msg); } else toast(res.msg);
hLoading(); hLoading();
} catch (error) {
hLoading();
toast("预约失败,请检查上传文件格式或联系管理员");
}
}, },
}); });
}; };
...@@ -165,7 +170,7 @@ const init = async () => { ...@@ -165,7 +170,7 @@ const init = async () => {
list.value = []; list.value = [];
let flag = true; let flag = true;
let isCurrent = 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({ list.value.push({
active: flag && item.FISRESTDAYS === "0" && isFull(item.data), active: flag && item.FISRESTDAYS === "0" && isFull(item.data),
week: item.WeekdayName, week: item.WeekdayName,
......
...@@ -138,6 +138,7 @@ const downFileWindows = async (row: any) => { ...@@ -138,6 +138,7 @@ const downFileWindows = async (row: any) => {
height: 60rpx; height: 60rpx;
color: #05a8ff; color: #05a8ff;
border: 2rpx solid #05a8ff; border: 2rpx solid #05a8ff;
margin-top: 12rpx;
} }
} }
.guide-header { .guide-header {
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
<script setup lang="ts"> <script setup lang="ts">
import { appointmentConfig } from "@/api/transfer"; import { appointmentConfig } from "@/api/transfer";
import { formattedText } from "@/utils/util"; import { formattedText } from "@/utils/util";
import { baseUrl } from "../../utils/request.ts"; import { baseUrl } from "../../utils/request";
const data = reactive({ const data = reactive({
paramsData: {} as any, paramsData: {} as any,
......
...@@ -65,13 +65,10 @@ export default defineConfig({ ...@@ -65,13 +65,10 @@ export default defineConfig({
// secure: false, // secure: false,
// }, // },
"/K3Cloud": { "/K3Cloud": {
target: "http://192.168.1.168", target: "http://192.168.1.66",
// target: "http://192.168.1.61/", // target: "http://192.66.1.61/",
secure: false, secure: false,
}, },
"/XiBU": {
target: "http://192.168.1.12/",
},
}, },
}, },
}); });
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论