lzq
/
njzscloud-dispose-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

字段校验bug处理

master
wangjunjie 2026-01-04 09:29:12 +08:00
parent bf6fa31e22
commit dacedfdf17
14 changed files with 169 additions and 175 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/dts/components.d.ts vendored
View File

@ -33,7 +33,6 @@ declare module 'vue' {
ElHeader: typeof import('element-plus/es')['ElHeader']
ElIcon: typeof import('element-plus/es')['ElIcon']
ElIconPicture: typeof import('@element-plus/icons-vue')['Picture']
ElIconTimer: typeof import('@element-plus/icons-vue')['Timer']
ElImage: typeof import('element-plus/es')['ElImage']
ElInput: typeof import('element-plus/es')['ElInput']
ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
@ -86,7 +85,6 @@ declare global {
const ElHeader: typeof import('element-plus/es')['ElHeader']
const ElIcon: typeof import('element-plus/es')['ElIcon']
const ElIconPicture: typeof import('@element-plus/icons-vue')['Picture']
const ElIconTimer: typeof import('@element-plus/icons-vue')['Timer']
const ElImage: typeof import('element-plus/es')['ElImage']
const ElInput: typeof import('element-plus/es')['ElInput']
const ElInputNumber: typeof import('element-plus/es')['ElInputNumber']

2
src/pages/a-frame/AAside.tsx
View File

@ -47,7 +47,7 @@ export default defineComponent(
() => {
const router = useRouter()
const appSettingStore = useAppSettingStore()
const defaultActive = ref('')
const defaultActive = ref<any>('')
const isCollapse = ref(false)
onMounted(() => {

8
src/pages/cst/driver/Driver.vue
View File

@ -95,11 +95,11 @@ const searchForm = ref<DriverTypes.SearchDriverParam>({
const searching = ref(false);
const deling = ref(false);
const showSearchForm = ref(true);
const driverFormIns = useTemplateRef<InstanceType<typeof DriverForm>>("driverForm");
// const driverFormIns = useTemplateRef<InstanceType<typeof DriverForm>>("driverForm");
function showDialog(data?: DriverTypes.SearchDriverResult) {
driverFormIns.value?.open(data);
}
// function showDialog(data?: DriverTypes.SearchDriverResult) {
// driverFormIns.value?.open(data);
// }
function delHandler({ row }: { row: DriverTypes.SearchDriverResult }) {
deling.value = true;

102
src/pages/cst/driver/DriverDetail.vue
View File

@ -36,70 +36,70 @@
<script lang="ts" setup>
import DriverApi from '@/pages/cst/driver/driver-api.ts'
import Strings from '@/common/utils/strings.ts'
import FormUtil from '@/common/utils/formUtil.ts'
import {
ElMessage,
type FormInstance,
type FormRules,
} from 'element-plus'
// import FormUtil from '@/common/utils/formUtil.ts'
// import {
// ElMessage,
// type FormInstance,
// type FormRules,
// } from 'element-plus'
import AppApi from '@/common/app/app-api.ts'
const emits = defineEmits(["editSucc"]);
const showDialog = ref(false);
const submiting = ref(false);
// const submiting = ref(false);
const status = ref<"add" | "view" | "modify">("add");
const driverFormIns = useTemplateRef<FormInstance>("driverForm");
// const driverFormIns = useTemplateRef<FormInstance>("driverForm");
const formData = ref<DriverTypes.SearchDriverResult>({});
const rules = reactive<FormRules<DriverTypes.SearchDriverResult>>({
id: [{ required: true, message: "请填写Id", trigger: "blur" }],
userId: [{ required: true, message: "请填写归属用户 Id；sys_user.id", trigger: "blur" }],
customerId: [{ required: true, message: "请填写归属客户 Id；cst_customer.id", trigger: "blur" }],
orgId: [{ required: true, message: "请填写归属公司 Id；cst_org.id", trigger: "blur" }],
drivingLicenceNo: [{ required: true, message: "请填写驾驶证编号", trigger: "blur" }],
driverName: [{ required: true, message: "请填写司机姓名", trigger: "blur" }],
phone: [{ required: true, message: "请填写手机号", trigger: "blur" }],
drivingLicence: [{ required: true, message: "请填写驾驶证图片", trigger: "blur" }],
licenceStartTime: [{ required: true, message: "请填写驾驶证有效期", trigger: "blur" }],
licenceEndTime: [{ required: true, message: "请填写驾驶证有效期", trigger: "blur" }],
busy: [{ required: true, message: "请填写忙碌中", trigger: "blur" }],
creatorId: [{ required: true, message: "请填写创建人 Id；sys_user.id", trigger: "blur" }],
modifierId: [{ required: true, message: "请填写修改人 Id； sys_user.id", trigger: "blur" }],
createTime: [{ required: true, message: "请填写创建时间", trigger: "blur" }],
modifyTime: [{ required: true, message: "请填写修改时间", trigger: "blur" }],
deleted: [{ required: true, message: "请填写是否删除； 0-->未删除、1-->已删除", trigger: "blur" }],
});
// const rules = reactive<FormRules<DriverTypes.SearchDriverResult>>({
// id: [{ required: true, message: "请填写Id", trigger: "blur" }],
// userId: [{ required: true, message: "请填写归属用户 Id；sys_user.id", trigger: "blur" }],
// customerId: [{ required: true, message: "请填写归属客户 Id；cst_customer.id", trigger: "blur" }],
// orgId: [{ required: true, message: "请填写归属公司 Id；cst_org.id", trigger: "blur" }],
// drivingLicenceNo: [{ required: true, message: "请填写驾驶证编号", trigger: "blur" }],
// driverName: [{ required: true, message: "请填写司机姓名", trigger: "blur" }],
// phone: [{ required: true, message: "请填写手机号", trigger: "blur" }],
// drivingLicence: [{ required: true, message: "请填写驾驶证图片", trigger: "blur" }],
// licenceStartTime: [{ required: true, message: "请填写驾驶证有效期", trigger: "blur" }],
// licenceEndTime: [{ required: true, message: "请填写驾驶证有效期", trigger: "blur" }],
// busy: [{ required: true, message: "请填写忙碌中", trigger: "blur" }],
// creatorId: [{ required: true, message: "请填写创建人 Id；sys_user.id", trigger: "blur" }],
// modifierId: [{ required: true, message: "请填写修改人 Id； sys_user.id", trigger: "blur" }],
// createTime: [{ required: true, message: "请填写创建时间", trigger: "blur" }],
// modifyTime: [{ required: true, message: "请填写修改时间", trigger: "blur" }],
// deleted: [{ required: true, message: "请填写是否删除； 0-->未删除、1-->已删除", trigger: "blur" }],
// });
function dialogCloseHandler() {
formData.value = {};
}
function submitHandler() {
if (status.value === "view") return;
submiting.value = true;
if (formData.value.id != null) {
FormUtil.submit(driverFormIns, () => DriverApi.modify(formData.value))
.then(() => {
ElMessage.success("修改成功");
emits("editSucc");
showDialog.value = false;
})
.finally(() => {
submiting.value = false;
});
} else {
FormUtil.submit(driverFormIns, () => DriverApi.add(formData.value))
.then(() => {
ElMessage.success("添加成功");
emits("editSucc");
showDialog.value = false;
})
.finally(() => {
submiting.value = false;
});
}
}
// function submitHandler() {
// if (status.value === "view") return;
// submiting.value = true;
// if (formData.value.id != null) {
// FormUtil.submit(driverFormIns, () => DriverApi.modify(formData.value))
// .then(() => {
// ElMessage.success("修改成功");
// emits("editSucc");
// showDialog.value = false;
// })
// .finally(() => {
// submiting.value = false;
// });
// } else {
// FormUtil.submit(driverFormIns, () => DriverApi.add(formData.value))
// .then(() => {
// ElMessage.success("添加成功");
// emits("editSucc");
// showDialog.value = false;
// })
// .finally(() => {
// submiting.value = false;
// });
// }
// }
defineExpose({
open(data: DriverTypes.SearchDriverResult = {}) {

12
src/pages/cst/driver/DriverForm.vue
View File

@ -69,12 +69,12 @@
:disabled="status === 'view'"
placeholder="驾驶证有效期"/>
</ElFormItem>
<ElFormItem label="忙碌中" prop="busy">
<!-- <ElFormItem label="忙碌中" prop="busy">
<ElInput
v-model="formData.busy"
:disabled="status === 'view'"
placeholder="忙碌中"/>
</ElFormItem>
</ElFormItem> -->
<ElFormItem label="创建人 Id；sys_user.id" prop="creatorId">
<ElInput
v-model="formData.creatorId"
@ -99,12 +99,12 @@
:disabled="status === 'view'"
placeholder="修改时间"/>
</ElFormItem>
<ElFormItem label="是否删除； 0-->未删除、1-->已删除" prop="deleted">
<!-- <ElFormItem label="是否删除" prop="deleted">
<ElInput
v-model="formData.deleted"
:disabled="status === 'view'"
placeholder="是否删除； 0-->未删除、1-->已删除"/>
</ElFormItem>
placeholder="是否删除"/>
</ElFormItem> -->
</ElForm>
<template #footer>
<ElButton @click="showDialog = false">{{ status === 'view' ? '关闭' : '取消' }}</ElButton>
@ -147,7 +147,7 @@ creatorId: [{ required: true, message: '请填写创建人 Id；sys_user.id', tr
modifierId: [{ required: true, message: '请填写修改人 Id； sys_user.id', trigger: 'blur' }],
createTime: [{ required: true, message: '请填写创建时间', trigger: 'blur' }],
modifyTime: [{ required: true, message: '请填写修改时间', trigger: 'blur' }],
deleted: [{ required: true, message: '请填写是否删除； 0-->未删除、1-->已删除', trigger: 'blur' }],
deleted: [{ required: true, message: '请填写是否删除', trigger: 'blur' }],
})
function dialogCloseHandler() {

4
src/pages/cst/org/OrgForm.vue
View File

@ -209,7 +209,7 @@ const status = ref<'add' | 'view' | 'modify'>('add')
const orgFormIns = useTemplateRef<FormInstance>('orgForm')
const formData = Utils.resetAble(reactive<OrgTypes.SearchOrgResult>({}))
const formData = Utils.resetAble(reactive<any>({}))
const rules = reactive<FormRules<OrgTypes.SearchOrgResult>>({
id: [{ required: true, message: '请填写Id', trigger: 'blur' }],
orgCategory: [{ required: true, message: '请填写主体类型，GeTiHu-->个体户、QiYe-->企业', trigger: 'blur' }],
@ -273,7 +273,7 @@ function submitHandler() {
}
defineExpose({
open(data: OrgTypes.SearchOrgResult = {}) {
open(data: any = {}) {
showDialog.value = true
if (!Strings.isBlank(data.id)) {
status.value = 'modify'

64
src/pages/cst/project/ProjectDetail.vue
View File

@ -51,19 +51,19 @@
<script lang="ts" setup>
import ProjectApi from '@/pages/cst/project/project-api.ts'
import Strings from '@/common/utils/strings.ts'
import FormUtil from '@/common/utils/formUtil.ts'
// import FormUtil from '@/common/utils/formUtil.ts'
import AppApi from '@/common/app/app-api.ts'
import {
ElMessage,
type FormInstance,
} from 'element-plus'
// import {
// ElMessage,
// type FormInstance,
// } from 'element-plus'
const emits = defineEmits(["editSucc"]);
const showDialog = ref(false);
const submiting = ref(false);
// const submiting = ref(false);
const status = ref<"add" | "view" | "modify">("add");
const projectDetailIns = useTemplateRef<FormInstance>("projectDetail");
// const projectDetailIns = useTemplateRef<FormInstance>("projectDetail");
const formData = ref<any>({});
@ -71,31 +71,31 @@ function dialogCloseHandler() {
formData.value = {};
}
function submitHandler() {
if (status.value === "view") return;
submiting.value = true;
if (formData.value.id != null) {
FormUtil.submit(projectDetailIns, () => ProjectApi.modify(formData.value))
.then(() => {
ElMessage.success("修改成功");
emits("editSucc");
showDialog.value = false;
})
.finally(() => {
submiting.value = false;
});
} else {
FormUtil.submit(projectDetailIns, () => ProjectApi.add(formData.value))
.then(() => {
ElMessage.success("添加成功");
emits("editSucc");
showDialog.value = false;
})
.finally(() => {
submiting.value = false;
});
}
}
// function submitHandler() {
// if (status.value === "view") return;
// submiting.value = true;
// if (formData.value.id != null) {
// FormUtil.submit(projectDetailIns, () => ProjectApi.modify(formData.value))
// .then(() => {
// ElMessage.success("修改成功");
// emits("editSucc");
// showDialog.value = false;
// })
// .finally(() => {
// submiting.value = false;
// });
// } else {
// FormUtil.submit(projectDetailIns, () => ProjectApi.add(formData.value))
// .then(() => {
// ElMessage.success("添加成功");
// emits("editSucc");
// showDialog.value = false;
// })
// .finally(() => {
// submiting.value = false;
// });
// }
// }
defineExpose({
open(data: ProjectTypes.SearchProjectResult = {}) {

8
src/pages/cst/truck/Truck.vue
View File

@ -103,12 +103,12 @@ const searchForm = ref<TruckTypes.SearchTruckParam>({
const searching = ref(false);
const deling = ref(false);
const showSearchForm = ref(true);
const truckFormIns = useTemplateRef<InstanceType<typeof TruckForm>>("truckForm");
// const truckFormIns = useTemplateRef<InstanceType<typeof TruckForm>>("truckForm");
const truckDetailIns = useTemplateRef<InstanceType<typeof TruckDetail>>("truckDetail");
function showDialog(data?: TruckTypes.SearchTruckResult) {
truckDetailIns.value?.open(data);
}
// function showDialog(data?: TruckTypes.SearchTruckResult) {
// truckDetailIns.value?.open(data);
// }
function delHandler({ row }: { row: TruckTypes.SearchTruckResult }) {
deling.value = true;

112
src/pages/cst/truck/TruckDetail.vue
View File

@ -56,75 +56,75 @@
<script lang="ts" setup>
import TruckApi from '@/pages/cst/truck/truck-api.ts'
import Strings from '@/common/utils/strings.ts'
import FormUtil from '@/common/utils/formUtil.ts'
import {
ElMessage,
type FormInstance,
type FormRules,
} from 'element-plus'
// import FormUtil from '@/common/utils/formUtil.ts'
// import {
// ElMessage,
// type FormInstance,
// type FormRules,
// } from 'element-plus'
import AppApi from '@/common/app/app-api.ts'
const emits = defineEmits(["editSucc"]);
const showDialog = ref(false);
const submiting = ref(false);
// const submiting = ref(false);
const status = ref<"add" | "view" | "modify">("add");
const truckFormIns = useTemplateRef<FormInstance>("truckForm");
// const truckFormIns = useTemplateRef<FormInstance>("truckForm");
const formData = ref<TruckTypes.SearchTruckResult>({});
const rules = reactive<FormRules<TruckTypes.SearchTruckResult>>({
id: [{ required: true, message: "请填写Id", trigger: "blur" }],
customerId: [{ required: true, message: "请填写归属客户 Id；cst_customer.id", trigger: "blur" }],
orgId: [{ required: true, message: "请填写归属组织", trigger: "blur" }],
licensePlate: [{ required: true, message: "请填写车牌", trigger: "blur" }],
truckLicense: [{ required: true, message: "请填写行驶证图片", trigger: "blur" }],
vnCode: [{ required: true, message: "请填写车架号", trigger: "blur" }],
qualification: [{ required: true, message: "请填写合格证图片", trigger: "blur" }],
carryingCapacity: [{ required: true, message: "请填写最大载重；单位：千克", trigger: "blur" }],
tareWeight: [{ required: true, message: "请填写皮重；单位：千克", trigger: "blur" }],
licenseStartDate: [{ required: true, message: "请填写行驶证有效期", trigger: "blur" }],
licenseEndDate: [{ required: true, message: "请填写行驶证有效期", trigger: "blur" }],
qualificationStartDate: [{ required: true, message: "请填写合格证有效期", trigger: "blur" }],
qualificationEndDate: [{ required: true, message: "请填写合格证有效期", trigger: "blur" }],
truckCategory: [{ required: true, message: "请填写车辆类型", trigger: "blur" }],
picture: [{ required: true, message: "请填写车辆图片", trigger: "blur" }],
busy: [{ required: true, message: "请填写忙碌中", trigger: "blur" }],
creatorId: [{ required: true, message: "请填写创建人 Id； sys_user.id", trigger: "blur" }],
modifierId: [{ required: true, message: "请填写修改人 Id； sys_user.id", trigger: "blur" }],
createTime: [{ required: true, message: "请填写创建时间", trigger: "blur" }],
modifyTime: [{ required: true, message: "请填写修改时间", trigger: "blur" }],
deleted: [{ required: true, message: "请填写是否删除； 0-->未删除、1-->已删除", trigger: "blur" }],
});
// const rules = reactive<FormRules<TruckTypes.SearchTruckResult>>({
// id: [{ required: true, message: "请填写Id", trigger: "blur" }],
// customerId: [{ required: true, message: "请填写归属客户 Id；cst_customer.id", trigger: "blur" }],
// orgId: [{ required: true, message: "请填写归属组织", trigger: "blur" }],
// licensePlate: [{ required: true, message: "请填写车牌", trigger: "blur" }],
// truckLicense: [{ required: true, message: "请填写行驶证图片", trigger: "blur" }],
// vnCode: [{ required: true, message: "请填写车架号", trigger: "blur" }],
// qualification: [{ required: true, message: "请填写合格证图片", trigger: "blur" }],
// carryingCapacity: [{ required: true, message: "请填写最大载重；单位：千克", trigger: "blur" }],
// tareWeight: [{ required: true, message: "请填写皮重；单位：千克", trigger: "blur" }],
// licenseStartDate: [{ required: true, message: "请填写行驶证有效期", trigger: "blur" }],
// licenseEndDate: [{ required: true, message: "请填写行驶证有效期", trigger: "blur" }],
// qualificationStartDate: [{ required: true, message: "请填写合格证有效期", trigger: "blur" }],
// qualificationEndDate: [{ required: true, message: "请填写合格证有效期", trigger: "blur" }],
// truckCategory: [{ required: true, message: "请填写车辆类型", trigger: "blur" }],
// picture: [{ required: true, message: "请填写车辆图片", trigger: "blur" }],
// busy: [{ required: true, message: "请填写忙碌中", trigger: "blur" }],
// creatorId: [{ required: true, message: "请填写创建人 Id； sys_user.id", trigger: "blur" }],
// modifierId: [{ required: true, message: "请填写修改人 Id； sys_user.id", trigger: "blur" }],
// createTime: [{ required: true, message: "请填写创建时间", trigger: "blur" }],
// modifyTime: [{ required: true, message: "请填写修改时间", trigger: "blur" }],
// deleted: [{ required: true, message: "请填写是否删除； 0-->未删除、1-->已删除", trigger: "blur" }],
// });
function dialogCloseHandler() {
formData.value = {};
}
function submitHandler() {
if (status.value === "view") return;
submiting.value = true;
if (formData.value.id != null) {
FormUtil.submit(truckFormIns, () => TruckApi.modify(formData.value))
.then(() => {
ElMessage.success("修改成功");
emits("editSucc");
showDialog.value = false;
})
.finally(() => {
submiting.value = false;
});
} else {
FormUtil.submit(truckFormIns, () => TruckApi.add(formData.value))
.then(() => {
ElMessage.success("添加成功");
emits("editSucc");
showDialog.value = false;
})
.finally(() => {
submiting.value = false;
});
}
}
// function submitHandler() {
// if (status.value === "view") return;
// submiting.value = true;
// if (formData.value.id != null) {
// FormUtil.submit(truckFormIns, () => TruckApi.modify(formData.value))
// .then(() => {
// ElMessage.success("修改成功");
// emits("editSucc");
// showDialog.value = false;
// })
// .finally(() => {
// submiting.value = false;
// });
// } else {
// FormUtil.submit(truckFormIns, () => TruckApi.add(formData.value))
// .then(() => {
// ElMessage.success("添加成功");
// emits("editSucc");
// showDialog.value = false;
// })
// .finally(() => {
// submiting.value = false;
// });
// }
// }
defineExpose({
open(data: TruckTypes.SearchTruckResult = {}) {

12
src/pages/cst/truck/TruckForm.vue
View File

@ -99,12 +99,12 @@
:disabled="status === 'view'"
placeholder="车辆图片"/>
</ElFormItem>
<ElFormItem label="忙碌中" prop="busy">
<!-- <ElFormItem label="忙碌中" prop="busy">
<ElInput
v-model="formData.busy"
:disabled="status === 'view'"
placeholder="忙碌中"/>
</ElFormItem>
</ElFormItem> -->
<ElFormItem label="创建人 Id； sys_user.id" prop="creatorId">
<ElInput
v-model="formData.creatorId"
@ -129,12 +129,6 @@
:disabled="status === 'view'"
placeholder="修改时间"/>
</ElFormItem>
<ElFormItem label="是否删除； 0-->未删除、1-->已删除" prop="deleted">
<ElInput
v-model="formData.deleted"
:disabled="status === 'view'"
placeholder="是否删除； 0-->未删除、1-->已删除"/>
</ElFormItem>
</ElForm>
<template #footer>
<ElButton @click="showDialog = false">{{ status === 'view' ? '关闭' : '取消' }}</ElButton>
@ -182,7 +176,7 @@ creatorId: [{ required: true, message: '请填写创建人 Id； sys_user.id', t
modifierId: [{ required: true, message: '请填写修改人 Id； sys_user.id', trigger: 'blur' }],
createTime: [{ required: true, message: '请填写创建时间', trigger: 'blur' }],
modifyTime: [{ required: true, message: '请填写修改时间', trigger: 'blur' }],
deleted: [{ required: true, message: '请填写是否删除； 0-->未删除、1-->已删除', trigger: 'blur' }],
deleted: [{ required: true, message: '请填写是否删除', trigger: 'blur' }],
})
function dialogCloseHandler() {

4
src/pages/gds/goods-category/GoodsCategoryForm.vue
View File

@ -66,7 +66,7 @@ const bizList = [
},
];
const formData = Utils.resetAble(reactive<GoodsCategoryTypes.SearchGoodsCategoryResult>({}));
const formData = Utils.resetAble(reactive<any>({}));
const rules = reactive<FormRules<GoodsCategoryTypes.SearchGoodsCategoryResult>>({
id: [{ required: true, message: "请填写Id", trigger: "blur" }],
bizType: [{ required: true, message: "请填写业务类型", trigger: "blur" }],
@ -111,7 +111,7 @@ function submitHandler() {
}
defineExpose({
open(data: GoodsCategoryTypes.SearchGoodsCategoryResult = {}) {
open(data: any = {}) {
showDialog.value = true;
if (!Strings.isBlank(data.id)) {
status.value = "modify";

6
src/pages/order/book-order/Order.vue
View File

@ -253,9 +253,9 @@ function delHandler({ row }: { row: OrderTypes.SearchOrderResult }) {
});
}
function modifyHandler({ row }: { row: OrderTypes.SearchOrderResult }) {
showDialog(row);
}
// function modifyHandler({ row }: { row: OrderTypes.SearchOrderResult }) {
// showDialog(row);
// }
function addHandler() {
showDialog();

2
src/pages/sys/dict/DictItem.vue
View File

@ -80,7 +80,7 @@ const deling = ref(false)
const currentDict = reactive<DictTypes.SearchDictResult>({})
const dictItemFormIns = useTemplateRef<InstanceType<typeof DictItemForm>>('dictItemForm')
function showDialog(data?: DictItemTypes.SearchDictItemResult) {
function showDialog(data?: any) {
dictItemFormIns.value?.open(data)
}

6
src/pages/sys/dict/DictItemForm.vue
View File

@ -49,7 +49,8 @@ const emits = defineEmits([ 'editSucc' ])
const showDialog = ref(false)
const submiting = ref(false)
const status = ref<'add' | 'view' | 'modify'>('add')
const dictItemFormData = ref<DictItemTypes.SearchDictItemResult>({})
// const dictItemFormData = ref<DictItemTypes.SearchDictItemResult>({})
const dictItemFormData = ref<any>({})
function dialogCloseHandler() {
dictItemFormData.value = {}
@ -86,7 +87,8 @@ function submitHandler() {
}
defineExpose({
open(data: DictItemTypes.SearchDictItemResult = {}) {
// open(data: DictItemTypes.SearchDictItemResult = {}) {
open(data: any = {}) {
showDialog.value = true
if (!Strings.isBlank(data.id)) {
status.value = 'modify'