访客修改

apps/web-antd/src/views/property/businessManagement/workOrders/data.ts

@@ -24,6 +24,14 @@ export const querySchema: FormSchemaGetter = () => [
     fieldName: 'status',
     label: '状态',
   },
+  {
+    component: 'Select',
+    componentProps: {
+      options: getDictOptions('pro_processing_weight'),
+    },
+    fieldName: 'processingWeight',
+    label: '处理权重',
+  },
 ];
 
 export const columns: VxeGridProps['columns'] = [
@@ -148,6 +156,15 @@ export const modalSchema: FormSchemaGetter = () => [
     componentProps: {},
     rules: 'selectRequired',
   },
+  {
+    label: '处理权重',
+    fieldName: 'processingWeight',
+    component: 'Select',
+    componentProps: {
+      options: getDictOptions('pro_processing_weight'),
+    },
+    rules: 'selectRequired',
+  },
   // {
   //   label: '状态',
   //   fieldName: 'status',
@@ -216,9 +233,8 @@ export const modalSchema: FormSchemaGetter = () => [
   // },
   {
     label: '备注',
-    fieldName: 'remarkremark',
+    fieldName: 'remark',
     component: 'Textarea',
-    rules: 'required',
   },
   // {
   //   label: '是否超时',
@@ -230,6 +246,15 @@ export const modalSchema: FormSchemaGetter = () => [
   //   },
   //   rules: 'selectRequired',
   // },
+  {
+    label: '工单图片',
+    fieldName: 'orderImgUrl',
+    component: 'ImageUpload',
+    componentProps: {
+      maxCount: 1,
+    },
+    formItemClass: 'col-span-2',
+  },
 ];
 export const ordersModalSchema: FormSchemaGetter = () => [
   {

apps/web-antd/src/views/property/businessManagement/workOrders/work-orders-detail.vue

@@ -77,6 +77,11 @@ async function handleOpenChange(open: boolean) {
         <DescriptionsItem label="完成时间">
           {{ orderDetail.compleTime }}
         </DescriptionsItem>
+        <DescriptionsItem label="处理权重">
+          <component
+            :is="renderDict(orderDetail.processingWeight,'pro_processing_weight')"
+          />
+        </DescriptionsItem>
         <DescriptionsItem label="是否超时" v-if="orderDetail.isTimeOut!=null">
           <component
             :is="renderDict(orderDetail.isTimeOut,'wy_sf')"
@@ -91,6 +96,9 @@ async function handleOpenChange(open: boolean) {
         <DescriptionsItem label="评价图片" v-if="orderDetail.imgUrl" :span="2">
           {{ orderDetail.imgUrl }}
         </DescriptionsItem>
+        <DescriptionsItem label="工单图片" v-if="orderDetail.orderImgUrl" :span="2">
+          {{ orderDetail.orderImgUrl }}
+        </DescriptionsItem>
       </Descriptions>
       <Divider orientation="left" orientation-margin="0px">
         处理记录

apps/web-antd/src/views/property/businessManagement/workOrders/workOrders-modal.vue

@@ -62,7 +62,7 @@ const [BasicModal, modalApi] = useVbenModal({
     }
     modalApi.modalLoading(true);
     await queryPersonData()
-    await queryWorkOrdersType()
+
     const {id} = modalApi.getData() as { id?: number | string };
     isUpdate.value = !!id;
 
@@ -134,30 +134,6 @@ async function queryPersonData() {
     }])
 }
 
-async function queryWorkOrdersType() {
-  let params = {
-    pageSize: 1000,
-    pageNum: 1
-  }
-  const res = await workOrdersTypeList(params)
-  const options = res.rows.map((item) => ({
-    label: item.orderTypeName,
-    value: item.id,
-  }));
-  formApi.updateSchema([{
-    componentProps: () => ({
-      options: options,
-      filterOption: filterOption,
-      showSearch:true,
-    }),
-    fieldName: 'type',
-  }])
-}
-
-const filterOption = (input: string, option: any) => {
-  return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0;
-};
-
 </script>
 
 <template>

apps/web-antd/src/views/property/inspectionManagement/inspectionPoint/inspectionPoint-modal.vue

@@ -10,6 +10,7 @@ import { inspectionPointAdd, inspectionPointInfo, inspectionPointUpdate } from '
 import { defaultFormValueGetter, useBeforeCloseDiff } from '#/utils/popup';
 
 import { modalSchema } from './data';
+import {workOrdersTypeList} from "#/api/property/businessManagement/workOrdersType";
 
 const emit = defineEmits<{ reload: [] }>();
 
@@ -53,7 +54,7 @@ const [BasicModal, modalApi] = useVbenModal({
       return null;
     }
     modalApi.modalLoading(true);
-
+    await queryWorkOrdersType()
     const { id } = modalApi.getData() as { id?: number | string };
     isUpdate.value = !!id;
 
@@ -91,6 +92,31 @@ async function handleClosed() {
   await formApi.resetForm();
   resetInitialized();
 }
+
+
+async function queryWorkOrdersType() {
+  let params = {
+    pageSize: 1000,
+    pageNum: 1
+  }
+  const res = await workOrdersTypeList(params)
+  const options = res.rows.map((item) => ({
+    label: item.orderTypeName,
+    value: item.id,
+  }));
+  formApi.updateSchema([{
+    componentProps: () => ({
+      options: options,
+      filterOption: filterOption,
+      showSearch:true,
+    }),
+    fieldName: 'type',
+  }])
+}
+
+const filterOption = (input: string, option: any) => {
+  return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+};
 </script>
 
 <template>

apps/web-antd/src/views/property/inspectionManagement/inspectionRoute/data.ts

@@ -1,4 +1,4 @@
-import type { FormSchemaGetter } from '#/adapter/form';
+import {type FormSchemaGetter, z} from '#/adapter/form';
 import type { VxeGridProps } from '#/adapter/vxe-table';
 
 
@@ -61,6 +61,16 @@ export const modalSchema: FormSchemaGetter = () => [
     component: 'Input',
     rules: 'required',
   },
+  {
+    label: '巡检点',
+    fieldName: 'pointId',
+    component: 'ApiSelect',
+    componentProps:{
+      mode: 'multiple',
+    },
+    rules: z.array(z.string()).min(1, { message: '请选择' }),
+    formItemClass: 'col-span-2',
+  },
   {
     label: '备注',
     fieldName: 'remark',

apps/web-antd/src/views/property/inspectionManagement/inspectionRoute/inspectionRoute-modal.vue

@@ -1,14 +1,14 @@
 <script setup lang="ts">
 import { computed, ref } from 'vue';
-
 import { useVbenModal } from '@vben/common-ui';
 import { $t } from '@vben/locales';
 import { cloneDeep } from '@vben/utils';
-
 import { useVbenForm } from '#/adapter/form';
 import { inspectionRouteAdd, inspectionRouteInfo, inspectionRouteUpdate } from '#/api/property/inspectionManagement/inspectionRoute';
 import { defaultFormValueGetter, useBeforeCloseDiff } from '#/utils/popup';
-
+import {
+  inspectionPointList,
+} from '#/api/property/inspectionManagement/inspectionPoint';
 import { modalSchema } from './data';
 
 const emit = defineEmits<{ reload: [] }>();
@@ -21,7 +21,7 @@ const title = computed(() => {
 const [BasicForm, formApi] = useVbenForm({
   commonConfig: {
     // 默认占满两列
-    formItemClass: 'col-span-2',
+    formItemClass: 'col-span-1',
     // 默认label宽度 px
     labelWidth: 100,
     // 通用配置项 会影响到所有表单项
@@ -43,7 +43,7 @@ const { onBeforeClose, markInitialized, resetInitialized } = useBeforeCloseDiff(
 
 const [BasicModal, modalApi] = useVbenModal({
   // 在这里更改宽度
-  class: 'w-[550px]',
+  class: 'w-[60%]',
   fullscreenButton: false,
   onBeforeClose,
   onClosed: handleClosed,
@@ -53,12 +53,13 @@ const [BasicModal, modalApi] = useVbenModal({
       return null;
     }
     modalApi.modalLoading(true);
-
+    await queryWorkOrdersType()
     const { id } = modalApi.getData() as { id?: number | string };
     isUpdate.value = !!id;
 
     if (isUpdate.value && id) {
       const record = await inspectionRouteInfo(id);
+      record.pointId = record.pointId?.split(',')
       await formApi.setValues(record);
     }
     await markInitialized();
@@ -76,6 +77,7 @@ async function handleConfirm() {
     }
     // getValues获取为一个readonly的对象 需要修改必须先深拷贝一次
     const data = cloneDeep(await formApi.getValues());
+    data.pointId = data.pointId?.join(',')
     await (isUpdate.value ? inspectionRouteUpdate(data) : inspectionRouteAdd(data));
     resetInitialized();
     emit('reload');
@@ -91,6 +93,31 @@ async function handleClosed() {
   await formApi.resetForm();
   resetInitialized();
 }
+
+async function queryWorkOrdersType() {
+  let params = {
+    pageSize: 1000,
+    pageNum: 1
+  }
+  const res = await inspectionPointList(params)
+  const options = res.rows.map((item) => ({
+    label: item.pointName,
+    value: item.id,
+  }));
+  formApi.updateSchema([{
+    componentProps: () => ({
+      options: options,
+      showSearch: true,
+      filterOption: filterOption,
+      mode: 'multiple',
+    }),
+    fieldName: 'pointId',
+  }])
+}
+
+const filterOption = (input: string, option: any) => {
+  return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+};
 </script>
 
 <template>