commit: bug修复1

@@ -177,7 +177,7 @@ const handleSwitch = async (e: any, record: any) => {
     switchLoading.value = false;
     switchLoading.value = false;
   }, 1500);
   }, 1500);
   createMessage.success(
   createMessage.success(
-    `${!e ? t('common.disableText') : t('common.enableText')}${t('common.successText')}`
+    `${e !== 'ENABLE' ? t('common.disableText') : t('common.enableText')}${t('common.successText')}`
   );
   );
   handleReload();
   handleReload();
 };
 };

@@ -5,7 +5,7 @@
     showFooter
     showFooter
     width="35%"
     width="35%"
     :maskClosable="true"
     :maskClosable="true"
-    :title="businessText"
+    :title="titleText"
     @register="registerDrawer"
     @register="registerDrawer"
     wrapClassName="report-drawer"
     wrapClassName="report-drawer"
     @ok="handleSubmit"
     @ok="handleSubmit"
@@ -14,8 +14,8 @@
     <BasicForm @register="registerForm">
     <BasicForm @register="registerForm">
     </BasicForm>
     </BasicForm>
     <div style="display: flex;width: 70%;margin-left: 70px">
     <div style="display: flex;width: 70%;margin-left: 70px">
-      <div style="width: 122px;text-align: center">
-        报修人
+      <div style="width: 115px;align-content: center;display: flex;justify-content: center;" class="inputTitle">
+        负责人
       </div>
       </div>
       <a-input
       <a-input
         placeholder="请选择"
         placeholder="请选择"
@@ -62,7 +62,6 @@ import { useResetOrganizationTree, OrganizationIdTree } from '/@/views/common/or
 const {
 const {
   setDefaultTime,
   setDefaultTime,
   disableCustomWeekly,
   disableCustomWeekly,
-  setPropsForModal,
   removeFields,
   removeFields,
 } = useHooks();
 } = useHooks();
 const userInfo = useUserStore();
 const userInfo = useUserStore();
@@ -104,12 +103,14 @@ const [registerForm, { validate, resetFields, setFieldsValue, updateSchema }] =
   }
   }
 );
 );
 
 
+const titleText = ref('');
 const businessText = ref('');
 const businessText = ref('');
 const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
 const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
   try {
   try {
     await nextTick();
     await nextTick();
     handleClose();
     handleClose();
     businessText.value = data.text;
     businessText.value = data.text;
+    titleText.value = data.text === 'add' ? '创建台账' : data.text === 'edit' ? '编辑台账' : '查看台账';
     if (!selectedItem.value) {
     if (!selectedItem.value) {
       selectedItem.value = { id: '', username: '' };
       selectedItem.value = { id: '', username: '' };
     }
     }
@@ -117,7 +118,6 @@ const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (
     selectedItem.value.id = data?.record?.directorId || '';
     selectedItem.value.id = data?.record?.directorId || '';
     setFieldsValue(setDefaultTime());
     setFieldsValue(setDefaultTime());
     updateSchema(disableCustomWeekly(0));
     updateSchema(disableCustomWeekly(0));
-    setDrawerProps(setPropsForModal(businessText.value));
     if (businessText.value === 'add') return;
     if (businessText.value === 'add') return;
     const rest = await ledgerEditDetailPage({id: data.record?.id});
     const rest = await ledgerEditDetailPage({id: data.record?.id});
     restData.data = rest ?? {};
     restData.data = rest ?? {};
@@ -139,6 +139,11 @@ const resetValue = () => {
 };
 };
 
 
 const handleSubmit = () => {
 const handleSubmit = () => {
+  if (businessText.value === 'view') {
+    closeDrawer();
+    handleClose();
+    return;
+  }
   useThrottle();
   useThrottle();
 };
 };
 
 
@@ -151,6 +156,10 @@ const getValue = async () => {
     setDrawerProps({ confirmLoading: true });
     setDrawerProps({ confirmLoading: true });
     const values = await validate();
     const values = await validate();
     if (!values) return;
     if (!values) return;
+    if (!selectedItem?.value?.id) {
+      createMessage.warning('请选择负责人');
+      return;
+    }
     const data = {
     const data = {
       ...values,
       ...values,
       buyDate: values.buyDate?.format('YYYY-MM-DD hh:mm:ss'),
       buyDate: values.buyDate?.format('YYYY-MM-DD hh:mm:ss'),
@@ -211,3 +220,14 @@ const handleSelect = async (organizationId: string) => {
 };
 };
 
 
 </script>
 </script>
+<style scoped>
+.inputTitle::before {
+  display: inline-block;
+  margin-right: 4px;
+  color: #ff4d4f;
+  font-size: 14px;
+  font-family: SimSun, sans-serif;
+  line-height: 1;
+  content: '*';
+}
+</style>

@@ -27,13 +27,13 @@ export const searchFormSchema: FormSchema[] = [
     },
     },
   },
   },
   {
   {
-    field: 'startTime',
+    field: 'startTimeStart',
     label: t('inspection.inspectionPlan.startTimeText'),
     label: t('inspection.inspectionPlan.startTimeText'),
     component: 'DatePicker',
     component: 'DatePicker',
     colProps: { span: 6 },
     colProps: { span: 6 },
   },
   },
   {
   {
-    field: 'endTime',
+    field: 'endTimeEnd',
     label: t('inspection.inspectionPlan.endTimeText'),
     label: t('inspection.inspectionPlan.endTimeText'),
     component: 'DatePicker',
     component: 'DatePicker',
     colProps: { span: 6 },
     colProps: { span: 6 },

@@ -72,12 +72,12 @@
       </a-row>
       </a-row>
       <a-form-item label="巡检明细" name="tkInspectionDetailsDTOList">
       <a-form-item label="巡检明细" name="tkInspectionDetailsDTOList">
         <a-table bordered :data-source="tableData" :columns="columns">
         <a-table bordered :data-source="tableData" :columns="columns">
-          <template #tkDeviceAccountDTO="{ text, record, index }">
+          <template #tkDeviceAccountDTO="{record}">
             <div>
             <div>
               {{record?.tkDeviceAccountDTO?.name}}
               {{record?.tkDeviceAccountDTO?.name}}
             </div>
             </div>
           </template>
           </template>
-          <template #recordResult="{ text, record, index }">
+          <template #recordResult="{ record }">
             <div>
             <div>
               <a-select
               <a-select
                 v-model:value="record.recordResult"
                 v-model:value="record.recordResult"
@@ -87,7 +87,7 @@
               />
               />
             </div>
             </div>
           </template>
           </template>
-          <template #operation="{ text, record, index }">
+          <template #operation="{ index }">
             <div>
             <div>
               <a-button type="link" @click="handleDelete(index)" :disabled="isViewMode">删除</a-button>
               <a-button type="link" @click="handleDelete(index)" :disabled="isViewMode">删除</a-button>
             </div>
             </div>
@@ -119,7 +119,6 @@
 <script setup lang="ts">
 <script setup lang="ts">
 import {computed, onMounted, reactive, ref, unref, watch} from "vue";
 import {computed, onMounted, reactive, ref, unref, watch} from "vue";
 import {getInspectionPlanList, getInsPlanDetail} from "/@/api/inspection/inspectionPlan";
 import {getInspectionPlanList, getInsPlanDetail} from "/@/api/inspection/inspectionPlan";
-import { ApiTreeSelect } from '/@/components/Form';
 import {OrganizationListItem} from "/@/api/system/model/systemModel";
 import {OrganizationListItem} from "/@/api/system/model/systemModel";
 import {getOrganizationList} from "/@/api/system/system";
 import {getOrganizationList} from "/@/api/system/system";
 import {getUserListByOrg} from "/@/api/equipment/ledger";
 import {getUserListByOrg} from "/@/api/equipment/ledger";
@@ -211,7 +210,7 @@ const needReload = ref(true);
 const { createMessage } = useMessage();
 const { createMessage } = useMessage();
 
 
 const searchInfo = reactive<Recordable>({});
 const searchInfo = reactive<Recordable>({});
-const { organizationIdTreeRef, resetFn } = useResetOrganizationTree(searchInfo);
+const { organizationIdTreeRef } = useResetOrganizationTree(searchInfo);
 const userVisible = ref(false);
 const userVisible = ref(false);
 const userModalTitle = ref('选人');
 const userModalTitle = ref('选人');
 const selectedItem = ref<{ id: number; username: string } | null>(null);
 const selectedItem = ref<{ id: number; username: string } | null>(null);
@@ -300,8 +299,9 @@ onMounted(() => {
 
 
 const fetchAgeOptions = async () => {
 const fetchAgeOptions = async () => {
   try {
   try {
-    const response = await getInspectionPlanList({ page: 1, pageSize: 999 }); // 调用接口
-    planOptions.value = response.items?.map((item: any) => {
+    const _response = await getInspectionPlanList({ page: 1, pageSize: 999}); // 调用接口
+    const response = _response.items?.filter(item => item.status !== 'STOP');
+    planOptions.value = response?.map((item: any) => {
       return {
       return {
         value: item?.id,
         value: item?.id,
         label: item?.name
         label: item?.name
@@ -312,49 +312,6 @@ const fetchAgeOptions = async () => {
   }
   }
 };
 };
 
 
-const getBindProps = computed<Recordable>(() => {
-  const params = {}
-  return {
-    replaceFields: { children: 'children', key: 'id', title: 'name', value: 'id' },
-    getPopupContainer: () => document.body,
-    placeholder: t('deviceManagement.device.organizationPlaceholderText'),
-    maxLength: 250,
-    value: form.orgId,
-    dropdownStyle: { maxHeight: '300px' },
-    api: async (params: OrganizationListItem) => {
-      try {
-        const result = ((await getOrganizationList(params)) as unknown as Recordable[]) || [];
-        orgList.value = result;
-        needReload.value = false;
-        return result;
-      } catch (error) {
-        return unref(orgList);
-      }
-    },
-    params: {
-      ...params,
-      _t: unref(timespan),
-    },
-    onChange: async (...args: any[]) => {
-      const _data = {
-        page: '1',
-        pageSize: '999',
-        tenantId: userInfo.getUserInfo.tenantId!,
-        organizationId: args?.[0]
-      }
-      const response = await getUserListByOrg(_data); // 调用接口
-      Options.value = response.items?.map((item: any) => {
-        return {
-          label: item.username,
-          value: item.id,
-        }
-      });
-      form.orgId.value = args?.[0]
-
-    },
-  };
-});
-
 const handleChange = async (value: Value) => {
 const handleChange = async (value: Value) => {
   const res = await getInsPlanDetail({id:value})
   const res = await getInsPlanDetail({id:value})
   form.value.code = res.code
   form.value.code = res.code
@@ -362,7 +319,7 @@ const handleChange = async (value: Value) => {
     return {
     return {
       checkDeviceId: item?.checkDeviceId || '',
       checkDeviceId: item?.checkDeviceId || '',
       recordResult: true,
       recordResult: true,
-      planDetails: item?.checkDeviceId || '',
+      planDetails: item?.planDetails || '',
       tkDeviceAccountDTO: item?.tkDeviceAccountDTO
       tkDeviceAccountDTO: item?.tkDeviceAccountDTO
     }
     }
   }) || []
   }) || []

@@ -164,14 +164,14 @@
   const handleViewDetail = async (record?: any) => {
   const handleViewDetail = async (record?: any) => {
     let id = record.id;
     let id = record.id;
     modalTitle.value = '查看';
     modalTitle.value = '查看';
+    modalVisible.value = true; // 打开弹框
+    isViewMode.value = true;
     try {
     try {
       const response = await getInsRecordDetail({id})
       const response = await getInsRecordDetail({id})
       initialData.value = {
       initialData.value = {
         form: response, // 表单数据
         form: response, // 表单数据
         tableData: response.tkInspectionDetailsDTOList, // 表格数据
         tableData: response.tkInspectionDetailsDTOList, // 表格数据
       };
       };
-      modalVisible.value = true; // 打开弹框
-      isViewMode.value = true;
     }catch (error) {
     }catch (error) {
       throw error;
       throw error;
     }finally {
     }finally {

@@ -57,7 +57,7 @@ export const columns: BasicColumn[] = [
   },
   },
   {
   {
     title: t('inspection.serviceRecord.createTimeText'),
     title: t('inspection.serviceRecord.createTimeText'),
-    dataIndex: 'createTime',
+    dataIndex: 'preserveDate',
   },
   },
   {
   {
     title: t('inspection.serviceRecord.preserveByName'),
     title: t('inspection.serviceRecord.preserveByName'),

@@ -16,7 +16,7 @@ export const columns: BasicColumn[] = [
   },
   },
   {
   {
     title: t('repair.history.orderText'),
     title: t('repair.history.orderText'),
-    dataIndex: 'tkRepairOrderDTO',
+    dataIndex: 'orderCode',
     format: (text, record) => {
     format: (text, record) => {
       return record.tkRepairOrderDTO?.orderCode || '-' || text;
       return record.tkRepairOrderDTO?.orderCode || '-' || text;
     },
     },
@@ -27,7 +27,7 @@ export const columns: BasicColumn[] = [
   },
   },
   {
   {
     title: t('repair.history.time'),
     title: t('repair.history.time'),
-    dataIndex: 'tkRepairOrderDTO',
+    dataIndex: 'reportDate',
     format: (text, record) => {
     format: (text, record) => {
       return record.tkRepairOrderDTO?.reportDate || '-' || text;
       return record.tkRepairOrderDTO?.reportDate || '-' || text;
     },
     },

@@ -12,7 +12,9 @@
       <div>
       <div>
         <BasicForm @register="registerForm" />
         <BasicForm @register="registerForm" />
         <div style="display: flex; width: 70%; margin-left: 70px">
         <div style="display: flex; width: 70%; margin-left: 70px">
-          <div style="width: 122px; text-align: center"> 报修人 </div>
+          <div style="display: flex;width: 115px;align-content: center;justify-content: center;" class="inputTitle">
+            报修人
+          </div>
           <a-input placeholder="请选择" :disabled="true" v-model:value="selectedUsername" />
           <a-input placeholder="请选择" :disabled="true" v-model:value="selectedUsername" />
           <a-button type="primary" @click="goChoose">选人</a-button>
           <a-button type="primary" @click="goChoose">选人</a-button>
         </div>
         </div>
@@ -152,6 +154,10 @@
   const handleOk = async () => {
   const handleOk = async () => {
     await validate();
     await validate();
     let values = getFieldsValue();
     let values = getFieldsValue();
+    if (!selectedItem?.value?.id) {
+      createMessage.warning('请选择报修人');
+      return;
+    }
     if (unref(isUpdate)) {
     if (unref(isUpdate)) {
       values = {
       values = {
         ...values,
         ...values,
@@ -204,3 +210,14 @@
     Options.value = response.items;
     Options.value = response.items;
   };
   };
 </script>
 </script>
+<style scoped>
+.inputTitle::before {
+  display: inline-block;
+  margin-right: 4px;
+  color: #ff4d4f;
+  font-size: 14px;
+  font-family: SimSun, sans-serif;
+  line-height: 1;
+  content: '*';
+}
+</style>