src/views/login/index.vue

@@ -83,7 +83,7 @@ formRules.value = {
 }
 
 onMounted(() => {
-    
+   
     // 清理登录信息
     userStore.logout()
     getCaptcha()

src/views/serviceMenu/serviceOrganization/index.vue

@@ -24,7 +24,7 @@
                     <a-col v-bind="colSpan">
                         <a-form-item label="等级" name="level">
                             <a-select v-model:value="searchFormData.orgLv">
-                                <a-select-option v-for="item in dicsStore.dictOptions.Level" :key="item.dval"
+                                <a-select-option v-for="item in dicsStore.dictOptions.level" :key="item.dval"
                                     :value="item.dval">
                                     {{ item.introduction }}
                                 </a-select-option>
@@ -263,38 +263,37 @@ function handleDetail(record) {
 
 // 启用/停用
 function handleToggleStatus(record) {
-  console.log("==record===", record);
+    const isEnable = record.status !== '2'; // 当前不是启用 → 要启用
+    const actionText = isEnable ? '启用' : '停用';
+    const confirmText = isEnable ? '确定要启用该组织吗？' : '确定要停用该组织吗？';
 
-  const isCurrentlyEnabled = record.status === '1'; // 假设 '1'=启用, '2'=停用
+    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 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}失败`);
+                if (success) {
+                    message.success(`${actionText}成功`);
+                    // 更新本地状态
+                    getList()
+                } else {
+                    message.error(`${actionText}失败`);
+                }
+            } catch (error) {
+                console.error('操作异常:', error);
+                message.error('操作失败');
+            }
         }
-      } catch (error) {
-        console.error('操作异常:', error);
-        message.error('操作失败');
-      }
-    },
-  });
+    });
 }
 
 // 设备管理

src/views/serviceMenu/serviceSites/components/EditDialog.vue

@@ -118,14 +118,13 @@
       <a-card class="mb-4" title="服务信息" style="margin-top: 20px">
         <a-row :gutter="16">
           <a-col :span="12">
-            <a-form-item label="营业开始时间" name="openAt" required>
-              <a-time-picker v-model:value="formData.openAt" format="HH:mm" placeholder="开始时间" :disabled="isViewMode" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="营业结束时间" name="closeAt" required>
-              <a-time-picker v-model:value="formData.closeAt" format="HH:mm" placeholder="结束时间"
-                :disabled="isViewMode" />
+            <a-form-item label="营业时间" name="openTime">
+              <div style="display: flex; gap: 8px">
+                <a-time-picker v-model:value="formData.openTime" format="HH:mm" placeholder="开始时间"
+                  :disabled="isViewMode" />
+                <a-time-picker v-model:value="formData.closeTime" format="HH:mm" placeholder="结束时间"
+                  :disabled="isViewMode" />
+              </div>
             </a-form-item>
           </a-col>
 
@@ -199,14 +198,11 @@ 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,
@@ -244,8 +240,6 @@ 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' },
@@ -343,8 +337,8 @@ async function loadRecord(id, forView = false) {
       buildTime: record.completionAt ? dayjs(record.completionAt) : null,
       area: record.area || 0,
       description: record.content || '',
-      openAt: record.openAt ? dayjs(`1970-01-01 ${record.openAt}`) : null,
-      closeAt: record.closeAt ? dayjs(`1970-01-01 ${record.closeAt}`) : null,
+      openTime: record.openAt ? dayjs(`1970-01-01 ${record.openAt}`) : null,
+      closeTime: record.closeAt ? dayjs(`1970-01-01 ${record.closeAt}`) : null,
 
       status: record.status || '',
       services: record.provideServices || [],
@@ -394,8 +388,8 @@ async function handleOk() {
           CompletionAt: values.buildTime ? values.buildTime.toDate() : null,
           Area: values.area || 0,
           Content: values.description || '',
-          OpenAt: values.openAt ? values.openAt.format('HH:mm') : '',
-          CloseAt: values.closeAt ? values.closeAt.format('HH:mm') : '',
+          OpenAt: values.openTime ? values.openTime.format('HH:mm') : '',
+          CloseAt: values.closeTime ? values.closeTime.format('HH:mm') : '',
           Status: '1',
           ProvideServices: values.services?.length ? values.services : null,
           QualificationAttachment: values.qualificationFiles?.map(f => f.url || f.response?.url) || null,

src/views/workorderMenu/visitHistory/index.vue

@@ -88,7 +88,7 @@
     </x-search-bar>
     <a-row :gutter="8" :wrap="false">
         <a-col flex="auto">
-            <a-card title="回访记录列表">
+            <a-card title="服务人员列表">
                 <div style="margin-bottom: 20px;">
                     <a-space>
                         <!-- <a-button type="primary" @click="$refs.editDialogRef.handleCreate(record)">新建</a-button> -->