commit: 设备台账联调补充

gesilong
1 parent 09609131
Showing 9 changed files with 236 additions and 124 deletions
src/locales/lang/zh-CN/repair/order.ts
src/views/common/organizationIdTree/src/OrganizationIdTree.vue
src/views/equipment/ledger/components/modal/LedgerDrawer.vue
src/views/equipment/ledger/config/data.ts
src/views/repair/history/index.ts
src/views/repair/history/index.vue
src/views/repair/order/components/orderModal.vue
src/views/repair/order/index.ts
src/views/repair/order/index.vue
--- a/src/locales/lang/zh-CN/repair/order.ts
View file @c4f6325
+++ b/src/locales/lang/zh-CN/repair/order.ts
View file @c4f6325
 export default {
   listText: '工单列表',
   nameText: '方案名称',
+  situationImg: '图片',
   time: '报修时间',
   nameDetail: '方案明细',
   deviceNameText: '设备',
--- a/src/views/common/organizationIdTree/src/OrganizationIdTree.vue
View file @c4f6325
+++ b/src/views/common/organizationIdTree/src/OrganizationIdTree.vue
View file @c4f6325
@@ -61,7 +61,7 @@
     selectedKeys.value = [];
   }
-  const foldFlag = ref(false);
+  const foldFlag = ref(true);
   const handleFold = () => {
     foldFlag.value = !unref(foldFlag);
   };
@@ -78,11 +78,12 @@
   };
   onMounted(async () => {
+    console.log(attrs,'attrs')
     if (attrs?.isOpen) {
       foldFlag.value = false;
-      treeStyle.value.height = '50vh'
+      treeStyle.value.maxHeight = '50vh'
     }else {
-      treeStyle.value.height = '100vh'
+      treeStyle.value.maxHeight = '100vh'
     }
     let api:any;
     if (attrs?.listType === 'equipment') {
--- a/src/views/equipment/ledger/components/modal/LedgerDrawer.vue
View file @c4f6325
+++ b/src/views/equipment/ledger/components/modal/LedgerDrawer.vue
View file @c4f6325
@@ -12,12 +12,42 @@
     @close="handleClose"
   >
     <BasicForm @register="registerForm">
-
     </BasicForm>
+    <div style="display: flex;width: 70%;margin-left: 70px">
+      <div style="width: 122px;text-align: center">
+        报修人
+      </div>
+      <a-input
+        placeholder="请选择"
+        :disabled="true"
+        v-model:value="selectedUsername"
+      >
+      </a-input>
+      <a-button type="primary" @click="goChoose">选人</a-button>
+    </div>
+    <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>
   </BasicDrawer>
 </template>
 <script setup lang="ts">
-import {nextTick, reactive, ref} from "vue";
+import {computed, nextTick, reactive, ref} from "vue";
 import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
 import { SchemaFiled} from "../../config/enum";
 import {BasicForm,useForm} from "/@/components/Form";
@@ -28,6 +58,7 @@ import {useUserStore} from "/@/store/modules/user";
 import {useThrottleFn} from "@vueuse/shared/index";
 import {useMessage} from "/@/hooks/web/useMessage";
 import {useI18n} from "/@/hooks/web/useI18n";
+import { useResetOrganizationTree, OrganizationIdTree } from '/@/views/common/organizationIdTree';
 const {
   setDefaultTime,
   disableCustomWeekly,
@@ -40,6 +71,29 @@ const restData = reactive({
 });
 const { createMessage } = useMessage();
 const { t } = useI18n();
+
+// 定义人员选项
+const Options = ref([]);
+const searchInfo = reactive<Recordable>({});
+const { organizationIdTreeRef, resetFn } = 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 selectedUsername = computed({
+  get: () => selectedItem.value?.username || '',
+  set: (value) => {
+    if (selectedItem.value) {
+      selectedItem.value.username = value;
+    }
+  },
+});
+
 const emits = defineEmits(['success', 'register']);
 const [registerForm, { validate, resetFields, setFieldsValue, updateSchema, setProps }] = useForm(
   {
@@ -49,42 +103,6 @@ const [registerForm, { validate, resetFields, setFieldsValue, updateSchema, setP
     fieldMapToTime: [[SchemaFiled.DATE_RANGE, [SchemaFiled.START_TS, SchemaFiled.END_TS]]],
   }
 );
-// 定义人员选项
-const userOptions = ref<any[]>([]);
-
-// 监听 org 字段的变化
-const handleOrgChange = async (orgId: string) => {
-  if (!orgId) {
-    userOptions.value = []; // 清空人员选项
-    updateSchema({
-      field: 'directorId',
-      componentProps: { options: [] },
-    });
-    return;
-  }
-  const _data = {
-    page: '1',
-    pageSize: '999',
-    tenantId: userInfo.getUserInfo.tenantId!,
-    organizationId: orgId
-  }
-  // 调用接口 B 获取人员数据
-  const userList = await getUserListByOrg(_data);
-  console.log(userList,'userList')
-  userOptions.value = userList?.items.map(user => ({
-    label: user.username,
-    value: user.id,
-  }));
-
-  // 更新 user 字段的选项
-  updateSchema({
-    field: 'directorId',
-    componentProps: { options: userOptions.value },
-  });
-};
-
-
-
 const businessText = ref('');
 const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
@@ -92,13 +110,11 @@ const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (
     await nextTick();
     handleClose();
     businessText.value = data.text;
-    // 更新 formSchema 中的 org 字段，绑定 change 事件
-    updateSchema({
-      field: 'org',
-      componentProps: {
-        onChange: handleOrgChange,
-      },
-    });
+    if (!selectedItem.value) {
+      selectedItem.value = { id: '', username: '' };
+    }
+    selectedItem.value.username = data?.record?.reportByName || '';
+    selectedItem.value.id = data?.record?.reportBy || '';
     setFieldsValue(setDefaultTime());
     updateSchema(disableCustomWeekly(0));
     setDrawerProps(setPropsForModal(businessText.value));
@@ -141,6 +157,7 @@ const getValue = async () => {
       productDate: values.productDate?.format('YYYY-MM-DD hh:mm:ss'),
       receiveDate: values.receiveDate?.format('YYYY-MM-DD hh:mm:ss'),
       registeDate: values.registeDate?.format('YYYY-MM-DD hh:mm:ss'),
+      directorId: selectedItem.value?.id || '',
     };
     removeFields.forEach((item) => {
       Reflect.deleteProperty(data, item);
@@ -160,5 +177,37 @@ const getValue = async () => {
     setDrawerProps({ confirmLoading: false });
   }
 };
+const goChoose = () => {
+  userVisible.value = true;
+  selectedItem.value = null;
+}
+
+// 确认按钮的回调
+const handleUserOk = () => {
+  if (!selectedItem.value) {
+    createMessage.warning('请选择一个用户');
+    return;
+  }
+
+  userVisible.value = false; // 关闭弹框
+};
+
+const handleUserCancel = () => {
+  selectedItem.value = null;
+  userVisible.value = false;
+};
+
+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;
+
+};
 </script>
--- a/src/views/equipment/ledger/config/data.ts
View file @c4f6325
+++ b/src/views/equipment/ledger/config/data.ts
View file @c4f6325
@@ -50,31 +50,6 @@ export const formSchema: BFormSchema[] = [
     },
   },
   {
-    field: 'org',
-    component: 'OrgTreeSelect',
-    label: '负责人组织',
-    required: true,
-    colProps: { span: 24 },
-    componentProps: {
-      // 添加 change 事件
-      onChange: (value: string) => {
-        // 这里需要触发加载人员数据的逻辑
-        console.log(value,'value')
-      },
-    },
-  },
-  {
-    field: 'directorId',
-    component: 'Select',
-    label: '负责人',
-    required: true,
-    colProps: { span: 24 },
-    componentProps: {
-      // 动态加载的选项
-      options: [], // 初始为空，后续动态加载
-    },
-  },
-  {
     field: 'isOnline',
     component: 'Select',
     label: '是否联网',
--- a/src/views/repair/history/index.ts
View file @c4f6325
+++ b/src/views/repair/history/index.ts
View file @c4f6325
@@ -6,6 +6,11 @@ const { t } = useI18n();
 export const columns: BasicColumn[] = [
   {
+    title: t('repair.history.photo'),
+    dataIndex: 'situationImg',
+    slots: { customRender: 'situationImg' },
+  },
+  {
     title: t('repair.history.orderCode'),
     dataIndex: 'code',
   },
@@ -34,13 +39,7 @@ export const columns: BasicColumn[] = [
       return record.tkRepairOrderDTO?.reportByName || '-' || text;
     },
   },
-  {
-    title: t('repair.history.photo'),
-    dataIndex: 'tkRepairOrderDTO',
-    format: (text, record) => {
-      return record.tkRepairOrderDTO?.situationImg || '-' || text;
-    },
-  },
+
   {
     title: t('repair.history.description'),
     dataIndex: 'description',
--- a/src/views/repair/history/index.vue
View file @c4f6325
+++ b/src/views/repair/history/index.vue
View file @c4f6325
 <template>
   <div>
     <BasicTable style="flex: auto" @register="registerTable">
-      <template #toolbar> </template>
+      <template #situationImg="{ record }">
+        <TableImg
+          :size="30"
+          :showBadge="false"
+          :simpleShow="true"
+          :imgList="
+            typeof record?.tkRepairOrderDTO?.situationImg !== 'undefined' && record?.tkRepairOrderDTO?.situationImg !== '' && record?.tkRepairOrderDTO?.situationImg != null
+              ? [record?.tkRepairOrderDTO?.situationImg]
+              : null
+          "
+        />
+      </template>
     </BasicTable>
   </div>
 </template>
 <script setup lang="ts">
-  import { BasicTable, useTable } from '/@/components/Table';
+  import { BasicTable, useTable, TableImg } from '/@/components/Table';
   import { getRepairHistoryList } from '/@/api/repair/history';
-  import { columns, searchFormSchema } from './index';
+  import { columns, searchFormSchema } from "./index"
   import { useI18n } from '/@/hooks/web/useI18n';
   const { t } = useI18n();
   const [
--- a/src/views/repair/order/components/orderModal.vue
View file @c4f6325
+++ b/src/views/repair/order/components/orderModal.vue
View file @c4f6325
@@ -11,28 +11,81 @@
     >
       <div>
         <BasicForm @register="registerForm" />
+        <div style="display: flex;width: 70%;margin-left: 70px">
+          <div style="width: 122px;text-align: center">
+            报修人
+          </div>
+          <a-input
+            placeholder="请选择"
+            :disabled="true"
+            v-model:value="selectedUsername"
+          >
+          </a-input>
+          <a-button type="primary" @click="goChoose">选人</a-button>
+        </div>
       </div>
+      <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>
     </BasicModal>
   </div>
 </template>
 <script setup lang="ts">
 import {BasicModal, useModalInner} from "/@/components/Modal";
 import {BasicForm, useForm} from "/@/components/Form";
-import {computed, ref, unref} from "vue";
+import {computed, reactive, ref, unref} from "vue";
 import {useI18n} from "/@/hooks/web/useI18n";
 import {schemas} from "../index";
 import {getUserListByOrg} from "/@/api/equipment/ledger";
 import {useUserStore} from "/@/store/modules/user";
 import {saveOrder} from "/@/api/repair/order";
 import {useMessage} from "/@/hooks/web/useMessage";
+import { useResetOrganizationTree, OrganizationIdTree } from '/@/views/common/organizationIdTree';
 const { t } = useI18n();
 const isUpdate = ref<Boolean>(false);
 const recordInfo = ref<any>({});
 // 定义人员选项
-const userOptions = ref<any[]>([]);
 const userInfo = useUserStore();
 const { createMessage } = useMessage();
+const userOptions = ref([]);
+const Options = ref([]);
+const searchInfo = reactive<Recordable>({});
+const { organizationIdTreeRef, resetFn } = 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 selectedUsername = computed({
+  get: () => selectedItem.value?.username || '',
+  set: (value) => {
+    if (selectedItem.value) {
+      selectedItem.value.username = value;
+    }
+  },
+});
+
 const emit = defineEmits(['handleReload', 'register']);
 const getTitle = computed(() =>
@@ -54,9 +107,13 @@ const [register, { closeModal, setModalProps }] = useModalInner(async (data) => 
   setModalProps({ confirmLoading: false, loading: true });
   isUpdate.value = data?.isUpdate;
   recordInfo.value = data?.record;
-  // 更新 formSchema 中的 org 字段，绑定 change 事件
+  if (!selectedItem.value) {
+    selectedItem.value = { id: '', username: '' };
+  }
+  selectedItem.value.username = data?.record?.reportByName || '';
+  selectedItem.value.id = data?.record?.reportBy || '';
   updateSchema({
-    field: 'org',
+    field: 'situationImg',
     componentProps: {
       onChange: handleOrgChange,
     },
@@ -67,12 +124,13 @@ const [register, { closeModal, setModalProps }] = useModalInner(async (data) => 
   setModalProps({ loading: false });
 });
+
 // 监听 org 字段的变化
 const handleOrgChange = async (orgId: string) => {
   if (!orgId) {
     userOptions.value = []; // 清空人员选项
     updateSchema({
-      field: 'reportBy',
+      field: 'report',
       componentProps: { options: [] },
     });
     return;
@@ -92,12 +150,11 @@ const handleOrgChange = async (orgId: string) => {
   // 更新 user 字段的选项
   updateSchema({
-    field: 'reportBy',
+    field: 'report',
     componentProps: { options: userOptions.value },
   });
 };
-
 const handleCancel = () => {
   closeModal();
 };
@@ -106,9 +163,9 @@ const handleOk = async () => {
   await validate();
   let values = getFieldsValue();
   if (unref(isUpdate)) {
-    values = { ...values, id: unref(recordInfo).id,  situationImg: values.situationImg?.[0]?.url};
+    values = { ...values, id: unref(recordInfo).id,  situationImg: values.situationImg?.[0]?.url, reportBy: selectedItem.value?.id || ''};
   }else {
-    values = { ...values,  situationImg: values.situationImg?.[0]?.url};
+    values = { ...values,  situationImg: values.situationImg?.[0]?.url, reportBy: selectedItem.value?.id || ''};
   }
   await saveOrder(values);
   createMessage.success(t('common.operationSuccessText'));
@@ -116,4 +173,37 @@ const handleOk = async () => {
   handleCancel();
 };
+const goChoose = () => {
+  userVisible.value = true;
+  selectedItem.value = null;
+}
+
+// 确认按钮的回调
+const handleUserOk = () => {
+  if (!selectedItem.value) {
+    createMessage.warning('请选择一个用户');
+    return;
+  }
+
+  userVisible.value = false; // 关闭弹框
+};
+
+const handleUserCancel = () => {
+  selectedItem.value = null;
+  userVisible.value = false;
+};
+
+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;
+
+};
+
 </script>
--- a/src/views/repair/order/index.ts
View file @c4f6325
+++ b/src/views/repair/order/index.ts
View file @c4f6325
@@ -20,6 +20,11 @@ const emergencyOptions = [
 export const columns: BasicColumn[] = [
   {
+    title: t('repair.order.situationImg'),
+    dataIndex: 'situationImg',
+    slots: { customRender: 'situationImg' },
+  },
+  {
     title: t('repair.order.nameCode'),
     dataIndex: 'orderCode',
   },
@@ -143,31 +148,6 @@ export const schemas: FormSchema[] = [
     },
   },
   {
-    field: 'org',
-    component: 'OrgTreeSelect',
-    label: '报修人组织',
-    required: true,
-    colProps: { span: 24 },
-    componentProps: {
-      // 添加 change 事件
-      onChange: (value: string) => {
-        // 这里需要触发加载人员数据的逻辑
-        console.log(value,'value')
-      },
-    },
-  },
-  {
-    field: 'reportBy',
-    component: 'Select',
-    label: '报修人',
-    required: true,
-    colProps: { span: 21 },
-    componentProps: {
-      // 动态加载的选项
-      options: [], // 初始为空，后续动态加载
-    },
-  },
-  {
     field: 'reportDate',
     label: t('repair.order.time'),
     component: 'DatePicker',
--- a/src/views/repair/order/index.vue
View file @c4f6325
+++ b/src/views/repair/order/index.vue
View file @c4f6325
@@ -8,6 +8,18 @@
           </Button>
         </Authority>
       </template>
+      <template #situationImg="{ record }">
+        <TableImg
+          :size="30"
+          :showBadge="false"
+          :simpleShow="true"
+          :imgList="
+            typeof record.situationImg !== 'undefined' && record.situationImg !== '' && record.situationImg != null
+              ? [record.situationImg]
+              : null
+          "
+        />
+      </template>
       <template #deviceId="{ record }">
         <span>{{ record?.deviceInfo?.name }}</span>
       </template>
@@ -33,12 +45,6 @@
       <template #action="{ record }">
         <TableAction
           :actions="[
-            // {
-            //   label: t('common.detailText'),
-            //   icon: 'ant-design:eye-outlined',
-            //   auth: 'api:yt:product:category:get',
-            //   onClick: handleDetail.bind(null, record),
-            // },
             {
               label: t('common.editText'),
               auth: 'api:yt:product:category:update',
@@ -67,7 +73,7 @@
 </template>
 <script setup lang="ts">
   import { orderModal } from "./components/index"
-  import { BasicTable, TableAction } from '/@/components/Table';
+  import { BasicTable, TableAction, TableImg } from '/@/components/Table';
   import { useTable } from '/@/components/Table';
   import { getRepairOrderList } from '/@/api/repair/order';
   import { columns, searchFormSchema } from './index';