diff --git a/src/views/login/index.vue b/src/views/login/index.vue index bcbdce2..65466ab 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -83,7 +83,7 @@ formRules.value = { } onMounted(() => { - + // 清理登录信息 userStore.logout() getCaptcha() diff --git a/src/views/serviceMenu/serviceOrganization/index.vue b/src/views/serviceMenu/serviceOrganization/index.vue index 7b7d5fe..d77bb18 100644 --- a/src/views/serviceMenu/serviceOrganization/index.vue +++ b/src/views/serviceMenu/serviceOrganization/index.vue @@ -24,7 +24,7 @@ - {{ item.introduction }} @@ -263,37 +263,38 @@ function handleDetail(record) { // 启用/停用 function handleToggleStatus(record) { - const isEnable = record.status !== '2'; // 当前不是启用 → 要启用 - const actionText = isEnable ? '启用' : '停用'; - const confirmText = isEnable ? '确定要启用该组织吗?' : '确定要停用该组织吗?'; + console.log("==record===", record); - Modal.confirm({ - title: `${actionText}组织`, - content: confirmText, - okText: '确定', - cancelText: '取消', - okType: isEnable ? 'primary' : 'danger', - onOk: async () => { - try { - // ✅ 正确传参:id + { status: '1' 或 '2' } - const { success } = await apis.serviceMenu.enableOrDisable( - record.id, - { status: isEnable ? '1' : '2' } - ); + const isCurrentlyEnabled = record.status === '1'; // 假设 '1'=启用, '2'=停用 - if (success) { - message.success(`${actionText}成功`); - // 更新本地状态 - getList() - } else { - message.error(`${actionText}失败`); - } - } catch (error) { - console.error('操作异常:', error); - message.error('操作失败'); - } + const actionText = isCurrentlyEnabled ? '停用' : '启用'; + const confirmText = `确定要${actionText}该组织吗?`; + const newStatus = isCurrentlyEnabled ? '2' : '1'; // 切换状态 + + Modal.confirm({ + title: `${actionText}组织`, + content: confirmText, + okText: '确定', + cancelText: '取消', + okType: isCurrentlyEnabled ? 'danger' : 'primary', // 停用用红色,启用用蓝色 + onOk: async () => { + try { + const { success } = await apis.serviceMenu.enableOrDisable(record.id, { + status: newStatus, + }); + + if (success) { + message.success(`${actionText}成功`); + getList(); // 刷新列表 + } else { + message.error(`${actionText}失败`); } - }); + } catch (error) { + console.error('操作异常:', error); + message.error('操作失败'); + } + }, + }); } // 设备管理 diff --git a/src/views/serviceMenu/serviceSites/components/EditDialog.vue b/src/views/serviceMenu/serviceSites/components/EditDialog.vue index 88a8bb5..3d99d92 100644 --- a/src/views/serviceMenu/serviceSites/components/EditDialog.vue +++ b/src/views/serviceMenu/serviceSites/components/EditDialog.vue @@ -118,13 +118,14 @@ - -
- - -
+ + + +
+ + + @@ -198,11 +199,14 @@ import { useDicsStore } from '@/store' import AreaCascader from '@/components/AreaCascader/index.vue' import UploadInput from '@/components/Upload/UploadInput.vue' import { getBirthDate, spliceUrl } from '@/utils/util' +import dayjs from 'dayjs' +import { config } from '@/config' const emit = defineEmits(['ok']) const { t } = useI18n() const { modal, showModal, hideModal } = useModal() const { formData, formRef, resetForm } = useForm() + // 初始化表单数据 const initFormData = () => ({ id: undefined, @@ -240,6 +244,8 @@ const rules = { code: [{ required: true, message: '请输入机构代码', trigger: 'blur' }], type: [{ required: true, message: '请选择站点类型', trigger: 'change' }], manager: [{ required: true, message: '请输入负责人姓名', trigger: 'blur' }], + openAt: [{ required: true, message: '请选择营业开始时间', trigger: 'change' }], + closeAt: [{ required: true, message: '请选择营业结束时间', trigger: 'change' }], phone: [ { required: true, message: '请输入联系电话', trigger: 'blur' }, { pattern: /^1[3-9]\d{9}$/, message: '请输入正确的手机号', trigger: 'blur' }, @@ -337,8 +343,8 @@ async function loadRecord(id, forView = false) { buildTime: record.completionAt ? dayjs(record.completionAt) : null, area: record.area || 0, description: record.content || '', - openTime: record.openAt ? dayjs(`1970-01-01 ${record.openAt}`) : null, - closeTime: record.closeAt ? dayjs(`1970-01-01 ${record.closeAt}`) : null, + openAt: record.openAt ? dayjs(`1970-01-01 ${record.openAt}`) : null, + closeAt: record.closeAt ? dayjs(`1970-01-01 ${record.closeAt}`) : null, status: record.status || '', services: record.provideServices || [], @@ -388,8 +394,8 @@ async function handleOk() { CompletionAt: values.buildTime ? values.buildTime.toDate() : null, Area: values.area || 0, Content: values.description || '', - OpenAt: values.openTime ? values.openTime.format('HH:mm') : '', - CloseAt: values.closeTime ? values.closeTime.format('HH:mm') : '', + OpenAt: values.openAt ? values.openAt.format('HH:mm') : '', + CloseAt: values.closeAt ? values.closeAt.format('HH:mm') : '', Status: '1', ProvideServices: values.services?.length ? values.services : null, QualificationAttachment: values.qualificationFiles?.map(f => f.url || f.response?.url) || null, diff --git a/src/views/workorderMenu/visitHistory/index.vue b/src/views/workorderMenu/visitHistory/index.vue index 39236a1..50f85d1 100644 --- a/src/views/workorderMenu/visitHistory/index.vue +++ b/src/views/workorderMenu/visitHistory/index.vue @@ -88,7 +88,7 @@ - +