commit: 维修工单联调

@@ -32,4 +32,22 @@ export const deleteRepairOrder = (params) => {
     params,
     params,
   });
   });
 };
 };
+/**
+ * 更新状态
+ */
+export const updateStatus = (params) => {
+  return defHttp.post<any>({
+    url: `/repairOrder/updateStatus`,
+    params,
+  });
+};
+/**
+ * 维修
+ */
+export const saveRecord = (params) => {
+  return defHttp.post<any>({
+    url: `/repairRecord/save`,
+    params,
+  });
+};
 
 

@@ -51,6 +51,9 @@ export default {
   stopConfirmText: '确认停用当前维护计划吗？',
   stopConfirmText: '确认停用当前维护计划吗？',
   down: '完成',
   down: '完成',
   downConfirmText: '确认完成当前维护计划吗？',
   downConfirmText: '确认完成当前维护计划吗？',
+  maintenance: '维修',
+  checkOK: '验收通过',
+  checkFail: '验收失败',
 
 
 
 
   light: '亮色主题',
   light: '亮色主题',

@@ -86,7 +86,7 @@
       treeStyle.value.maxHeight = '100vh'
       treeStyle.value.maxHeight = '100vh'
     }
     }
     let api:any;
     let api:any;
-    if (attrs?.listType === 'equipment') {
+    if (props?.listType === 'equipment') {
       api = getAllCategory()
       api = getAllCategory()
     }else {
     }else {
       api = getOrganizationList()
       api = getOrganizationList()

@@ -144,7 +144,7 @@ const [
   clickToRowSelect: false,
   clickToRowSelect: false,
   rowKey: 'id',
   rowKey: 'id',
   actionColumn: {
   actionColumn: {
-    width: 230,
+    width: 360,
     title: t('common.actionText'),
     title: t('common.actionText'),
     slots: { customRender: 'action' },
     slots: { customRender: 'action' },
     fixed: 'right',
     fixed: 'right',

@@ -136,7 +136,7 @@
     clickToRowSelect: false,
     clickToRowSelect: false,
     rowKey: 'id',
     rowKey: 'id',
     actionColumn: {
     actionColumn: {
-      width: 230,
+      width: 360,
       title: t('common.actionText'),
       title: t('common.actionText'),
       slots: { customRender: 'action' },
       slots: { customRender: 'action' },
       fixed: 'right',
       fixed: 'right',

+<template>
+  <a-modal
+    v-model:visible="visible"
+    title="维修"
+    @ok="handleOk"
+    @cancel="handleCancel"
+  >
+    <a-form style="padding: 20px" :model="form" :label-col="{ span: 6 }" :wrapper-col="{ span: 14 }" :rules="rules">
+      <a-form-item label="维修人" name="repairByName">
+        <div style="display: flex">
+          <a-input
+            v-model:value="form.repairByName"
+            placeholder="请选择"
+            :disabled="true"
+          >
+          </a-input>
+          <a-button
+            type="primary"
+            @click="goChoose"
+            :disabled="isViewMode"
+          >
+            选人
+          </a-button>
+        </div>
+      </a-form-item>
+      <a-form-item label="维修时间" name="repairDate">
+        <a-date-picker
+          v-model:value="form.repairDate"
+          placeholder="请选择维修时间"
+          style="width: 100%"
+        />
+      </a-form-item>
+      <a-form-item label="维修情况说明" name="description">
+        <a-textarea v-model:value="form.description" placeholder="请输入维修情况说明" />
+      </a-form-item>
+      <a-form-item label="故障原因" name="malfunctionReasonId">
+        <a-select
+          v-model:value="form.malfunctionReasonId"
+          :options="reasonOptions"
+          placeholder="请选择"
+        />
+      </a-form-item>
+    </a-form>
+  </a-modal>
+  <a-modal
+    v-model:visible="userVisible"
+    :title="userModalTitle"
+    width="60vw"
+    height="50vh"
+    @ok="handleUserOk"
+    @cancel="handleUserCancel"
+  >
+    <div style="padding: 20px;display: flex">
+      <OrganizationIdTree @select="handleSelect" ref="organizationIdTreeRef" isOpen="true"/>
+      <div style="margin-top: 20px;margin-left: 30px">
+        <a-radio-group v-model:value="selectedItem">
+          <template v-for="item in Options" :key="`${item.id}`">
+            <a-radio :style="radioStyle" :value="item">{{ item.username }}</a-radio>
+          </template>
+        </a-radio-group>
+      </div>
+    </div>
+  </a-modal>
+</template>
+
+<script setup lang="ts">
+import {onMounted, reactive, ref, watch} from 'vue';
+import {OrganizationIdTree, useResetOrganizationTree} from "/@/views/common/organizationIdTree";
+import {getUserListByOrg} from "/@/api/equipment/ledger";
+import {useUserStore} from "/@/store/modules/user";
+import {useMessage} from "/@/hooks/web/useMessage";
+import {getEquipmentErrorList} from "/@/api/equipment/errorReason";
+
+const props = defineProps({
+  initialData: {
+    type: Object,
+    default: () => ({
+      form: {
+        orderId: '',
+        repairBy: '',
+        repairByName: '',
+        repairDate: '',
+        description: '',
+        malfunctionReasonId: '',
+      }
+    }),
+  },
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+});
+
+const visible = ref(props.visible);
+const emit = defineEmits(['update:visible', 'submit']);
+
+const searchInfo = reactive<Recordable>({});
+const { organizationIdTreeRef } = useResetOrganizationTree(searchInfo);
+const userVisible = ref(false);
+const userModalTitle = ref('选人');
+const selectedItem = ref<{ id: string; username: string } | null>(null);
+const radioStyle = reactive({
+  display: 'block',
+  height: '30px',
+  lineHeight: '30px',
+});
+const form = ref({
+  orderId: '',
+  repairBy: '',
+  repairByName: '',
+  repairDate: '',
+  description: '',
+  malfunctionReasonId: '',
+});
+const { createMessage } = useMessage();
+const userInfo = useUserStore();
+const rules = {
+  repairByName: [{ required: true, message: '请输入维修人', trigger: 'blur' }],
+  description: [{ required: true, message: '请输入维修情况说明', trigger: 'blur' }],
+  malfunctionReasonId: [{ required: true, message: '请输入故障原因', trigger: 'blur' }],
+};
+watch(
+  () => props.visible,
+  (newVal) => {
+    visible.value = newVal;
+  }
+);
+
+
+// 监听 visible 的变化并通知父组件
+watch(
+  () => visible.value,
+  (newVal) => {
+    emit('update:visible', newVal);
+  }
+);
+
+// 监听 initialData 的变化
+watch(
+  () => props.initialData,
+  (newVal) => {
+    form.value = { ...newVal.form };
+  },
+  { deep: true }
+);
+const reasonOptions = ref([]);
+const Options = ref([]);
+
+const handleOk = () => {
+  emit('submit', form.value);
+  resetForm();
+};
+
+// 清空表单和表格数据
+const resetForm = () => {
+  form.value = {
+    orderId: '',
+    repairBy: '',
+    repairByName: '',
+    repairDate: '',
+    description: '',
+    malfunctionReasonId: '',
+  };
+};
+
+const handleCancel = () => {
+  emit('update:visible', false); // 关闭模态框
+};
+
+
+const goChoose = () => {
+  userVisible.value = true;
+  selectedItem.value = null;
+}
+
+onMounted(() => {
+  fetchAgeOptions();
+});
+
+const fetchAgeOptions = async () => {
+  try {
+    const response = await getEquipmentErrorList({ page: 1, pageSize: 999 }); // 调用接口
+    reasonOptions.value = response.items?.map((item: any) => {
+      return {
+        value: item?.id,
+        label: item?.reason
+      }
+    });
+  } catch (error) {
+    console.error('失败:', error);
+  }
+};
+
+const handleSelect = async (organizationId: string) => {
+  searchInfo.organizationId = organizationId;
+  const _data = {
+    page: '1',
+    pageSize: '999',
+    tenantId: userInfo.getUserInfo.tenantId!,
+    organizationId: organizationId
+  }
+  const response = await getUserListByOrg(_data); // 调用接口
+  Options.value = response.items;
+
+};
+
+// 确认按钮的回调
+const handleUserOk = () => {
+  if (!selectedItem.value) {
+    createMessage.warning('请选择一个用户');
+    return;
+  }
+  form.value.repairBy = selectedItem.value.id
+  form.value.repairByName = selectedItem.value.username
+
+  userVisible.value = false; // 关闭弹框
+};
+
+const handleUserCancel = () => {
+  selectedItem.value = null;
+  userVisible.value = false;
+};
+
+</script>

 import orderModal from './orderModal.vue';
 import orderModal from './orderModal.vue';
+import RepairFormModal from './RepairFormModal.vue';
 
 
-export { orderModal };
+export { orderModal,RepairFormModal };

@@ -45,21 +45,26 @@
       <template #action="{ record }">
       <template #action="{ record }">
         <TableAction
         <TableAction
           :actions="[
           :actions="[
+             {
+              label: t('common.maintenance'),
+              auth: 'api:yt:order:update',
+              icon: 'ant-design:caret-right-outlined',
+              ifShow: () => record.status === 'SCHEDULING',
+              onClick:recordSave.bind(null,record)
+            },
             {
             {
-              label: t('common.editText'),
+              label: t('common.checkOK'),
               auth: 'api:yt:order:update',
               auth: 'api:yt:order:update',
-              icon: 'clarity:note-edit-line',
-              onClick: handleEdit.bind(null, record),
+              icon: 'ant-design:caret-right-outlined',
+              ifShow: () => record.status === 'REPAIRFINISH',
+              onClick:handleUpdateStatus.bind(null, record, 'ACCEPTANCEPASSED')
             },
             },
             {
             {
-              label: t('common.delText'),
-              auth: 'api:yt:order:delete',
-              icon: 'ant-design:delete-outlined',
-              color: 'error',
-              popConfirm: {
-                title: t('common.deleteConfirmText'),
-                confirm: handleDelete.bind(null, record),
-              },
+              label: t('common.checkFail'),
+              auth: 'api:yt:order:update',
+              icon: 'ant-design:caret-right-outlined',
+              ifShow: () => record.status === 'REPAIRFINISH',
+              onClick:handleUpdateStatus.bind(null, record, 'SCHEDULING')
             },
             },
           ]"
           ]"
         />
         />
@@ -69,13 +74,18 @@
     <FormDrawer
     <FormDrawer
       @register="registerApplicationApiFormDrawer"
       @register="registerApplicationApiFormDrawer"
     />
     />
+    <RepairFormModal
+      v-model:visible="modalVisible"
+      :initial-data="initialData"
+      @submit="handleSubmit"
+    />
   </div>
   </div>
 </template>
 </template>
 <script setup lang="ts">
 <script setup lang="ts">
-  import { orderModal } from "./components/index"
+  import { orderModal, RepairFormModal } from "./components/index"
   import { BasicTable, TableAction, TableImg } from '/@/components/Table';
   import { BasicTable, TableAction, TableImg } from '/@/components/Table';
   import { useTable } from '/@/components/Table';
   import { useTable } from '/@/components/Table';
-  import { getRepairOrderList } from '/@/api/repair/order';
+  import {getRepairOrderList, saveRecord, updateStatus} from '/@/api/repair/order';
   import { columns, searchFormSchema } from './index';
   import { columns, searchFormSchema } from './index';
   import { useI18n } from '/@/hooks/web/useI18n';
   import { useI18n } from '/@/hooks/web/useI18n';
   import { Button, Tag } from 'ant-design-vue';
   import { Button, Tag } from 'ant-design-vue';
@@ -85,11 +95,22 @@
   const [registerModal, { openModal }] = useModal();
   const [registerModal, { openModal }] = useModal();
   import {FormDrawer} from "./components/FormDrawer/index";
   import {FormDrawer} from "./components/FormDrawer/index";
   import {useDrawer} from "/@/components/Drawer";
   import {useDrawer} from "/@/components/Drawer";
-  import {deleteRepairOrder} from "/@/api/repair/order";
   import {useMessage} from "/@/hooks/web/useMessage";
   import {useMessage} from "/@/hooks/web/useMessage";
+  import {ref} from "vue";
+  import {dateFormat} from "/@/utils/common/compUtils";
+  const modalVisible = ref(false);
   const [registerApplicationApiFormDrawer, {  }] = useDrawer();
   const [registerApplicationApiFormDrawer, {  }] = useDrawer();
   const { createMessage } = useMessage();
   const { createMessage } = useMessage();
-
+  const initialData = ref({
+    form: {
+      orderId:'',
+      repairBy: '',
+      repairByName: '',
+      repairDate: '',
+      description: '',
+      malfunctionReasonId: '',
+    },
+  });
   const [
   const [
     registerTable,
     registerTable,
     { reload, setLoading,  setSelectedRowKeys },
     { reload, setLoading,  setSelectedRowKeys },
@@ -132,26 +153,54 @@
     });
     });
   };
   };
 
 
-  // 编辑
-  const handleEdit = (record?: any) => {
-    openModal(true, {
-      isUpdate: true,
-      record,
-    });
-  };
 
 
-  const handleDelete = async (record?: any) => {
+  const handleUpdateStatus = async (record?: any,value?: string) => {
+    console.log(record,'record')
+    console.log(value,'value')
     let id = record.id;
     let id = record.id;
+    let status = value;
+
     try {
     try {
       setLoading(true);
       setLoading(true);
-      await deleteRepairOrder({ id });
-      createMessage.success(t('common.deleteSuccessText'));
+      await updateStatus({ id,status });
+      createMessage.success(t('common.editSuccessText'));
       handleReload();
       handleReload();
     } catch (error) {
     } catch (error) {
       throw error;
       throw error;
     } finally {
     } finally {
       setLoading(false);
       setLoading(false);
     }
     }
-  };
+  }
 
 
+  const recordSave = async (record?: any) => {
+    modalVisible.value = true;
+    initialData.value = {
+      form: {
+        orderId: record?.id || '',
+        repairBy: '',
+        repairByName: '',
+        repairDate: '',
+        description: '',
+        malfunctionReasonId: '',
+      }
+    }
+  }
+  const handleSubmit = async (data) => {
+    const format = 'yyyy-MM-dd hh:mm:ss';
+    const _data = {
+      ...data,
+      repairDate: dateFormat(data?.repairDate, format),
+    }
+      try {
+        setLoading(true);
+        await saveRecord(_data); // 提交维修表单数据
+        createMessage.success(t('common.editSuccessText'));
+        handleReload();
+        modalVisible.value = false;
+      } catch (error) {
+        throw error;
+      } finally {
+        setLoading(false);
+      }
+  };
 </script>
 </script>