feat: 工单类型加部门名称

apps/web-antd/src/api/property/businessManagement/workOrdersType/model.d.ts

@@ -41,7 +41,10 @@ export interface WorkOrdersTypeVO {
    * 处理优先级
    */
   processingWeight: string;
-
+  /**
+   * 部门名称
+   */
+  deptName?: string;
 }
 
 export interface WorkOrdersTypeForm extends BaseEntity {

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

@@ -1,7 +1,7 @@
 import type { FormSchemaGetter } from '#/adapter/form';
 import type { VxeGridProps } from '#/adapter/vxe-table';
-import {renderDict} from "#/utils/render";
+import { renderDict } from '#/utils/render';
-import {getDictOptions} from "#/utils/dict";
+import { getDictOptions } from '#/utils/dict';
 
 export const querySchema: FormSchemaGetter = () => [
   // {
@@ -36,6 +36,11 @@ export const columns: VxeGridProps['columns'] = [
     treeNode: true,
     minWidth: 180,
   },
+  {
+    title: '部门名称',
+    field: 'deptName',
+    width: 180,
+  },
   {
     title: '运作模式',
     field: 'operationMode',
@@ -51,7 +56,9 @@ export const columns: VxeGridProps['columns'] = [
     field: 'processingWeight',
     slots: {
       default: ({ row }) => {
-        return row.processingWeight!=null?renderDict(row.processingWeight, 'pro_processing_weight'):'';
+        return row.processingWeight != null
+          ? renderDict(row.processingWeight, 'pro_processing_weight')
+          : '';
       },
     },
     width: 100,
@@ -101,6 +108,12 @@ export const modalSchema: FormSchemaGetter = () => [
     component: 'Input',
     rules: 'required',
   },
+  {
+    label: '部门名称',
+    fieldName: 'deptId',
+    component: 'TreeSelect',
+    rules: 'required',
+  },
   {
     label: '父级类型',
     fieldName: 'parentId',

apps/web-antd/src/views/property/businessManagement/workOrdersType/workOrdersType-detail.vue

@@ -4,7 +4,7 @@ import {shallowRef} from 'vue';
 import { useVbenModal } from '@vben/common-ui';
 import { Descriptions, DescriptionsItem, Rate } from 'ant-design-vue';
 import { workOrdersTypeInfo } from '#/api/property/businessManagement/workOrdersType';
-import {renderDict} from "#/utils/render";
+import { renderDict } from '#/utils/render';
 
 const [BasicModal, modalApi] = useVbenModal({
   onOpenChange: handleOpenChange,
@@ -28,23 +28,48 @@ async function handleOpenChange(open: boolean) {
 </script>
 
 <template>
-  <BasicModal :footer="false" :fullscreen-button="false" title="工单类型信息" class="w-[70%]">
+  <BasicModal
-    <Descriptions v-if="workOrdersTypeInfoDetail" size="small" :column="2" bordered
+    :footer="false"
-                  :labelStyle="{width:'120px'}">
+    :fullscreen-button="false"
+    title="工单类型信息"
+    class="w-[70%]"
+  >
+    <Descriptions
+      v-if="workOrdersTypeInfoDetail"
+      size="small"
+      :column="2"
+      bordered
+      :labelStyle="{ width: '120px' }"
+    >
       <!--      <DescriptionsItem label="工单类型编号">-->
       <!--        {{ workOrdersTypeInfoDetail.orderTypeNo }}-->
       <!--      </DescriptionsItem>-->
       <DescriptionsItem label="类型名称">
         {{ workOrdersTypeInfoDetail.orderTypeName }}
       </DescriptionsItem>
+      <DescriptionsItem label="部门名称">
+        {{ workOrdersTypeInfoDetail.deptName }}
+      </DescriptionsItem>
       <DescriptionsItem label="运作模式">
-        <component v-if="workOrdersTypeInfoDetail.operationMode!=null"
+        <component
-          :is="renderDict(workOrdersTypeInfoDetail.operationMode,'pro_operation_pattern')"
+          v-if="workOrdersTypeInfoDetail.operationMode != null"
+          :is="
+            renderDict(
+              workOrdersTypeInfoDetail.operationMode,
+              'pro_operation_pattern',
+            )
+          "
         />
       </DescriptionsItem>
       <DescriptionsItem label="处理优先级">
-        <component v-if="workOrdersTypeInfoDetail.processingWeight!=null"
+        <component
-          :is="renderDict(workOrdersTypeInfoDetail.processingWeight,'pro_processing_weight')"
+          v-if="workOrdersTypeInfoDetail.processingWeight != null"
+          :is="
+            renderDict(
+              workOrdersTypeInfoDetail.processingWeight,
+              'pro_processing_weight',
+            )
+          "
         />
       </DescriptionsItem>
       <DescriptionsItem label="排序值">
@@ -53,9 +78,17 @@ async function handleOpenChange(open: boolean) {
       <DescriptionsItem label="累计工单数量">
         {{ workOrdersTypeInfoDetail.number }}
       </DescriptionsItem>
-      <DescriptionsItem label="是否支持转单" v-if="workOrdersTypeInfoDetail.isTransfers!=null">
+      <DescriptionsItem
+        label="是否支持转单"
+        v-if="workOrdersTypeInfoDetail.isTransfers != null"
+      >
         <component
-          :is="renderDict(workOrdersTypeInfoDetail.isTransfers,'support_transferring_orders')"
+          :is="
+            renderDict(
+              workOrdersTypeInfoDetail.isTransfers,
+              'support_transferring_orders',
+            )
+          "
         />
       </DescriptionsItem>
     </Descriptions>

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

@@ -2,15 +2,17 @@
 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 {
   workOrdersTypeAdd,
-  workOrdersTypeInfo, workOrdersTypeListAll,
+  workOrdersTypeInfo,
-  workOrdersTypeUpdate
+  workOrdersTypeListAll,
+  workOrdersTypeUpdate,
 } from '#/api/property/businessManagement/workOrdersType';
 import { defaultFormValueGetter, useBeforeCloseDiff } from '#/utils/popup';
 import { modalSchema } from './data';
+import { addFullName, cloneDeep } from '@vben/utils';
+import { getDeptTree } from '#/api/system/user';
 
 const emit = defineEmits<{ reload: [] }>();
 const isUpdate = ref(false);
@@ -28,7 +30,7 @@ const [BasicForm, formApi] = useVbenForm({
     // 通用配置项 会影响到所有表单项
     componentProps: {
       class: 'w-full',
-    }
+    },
   },
   schema: modalSchema(),
   showDefaultActions: false,
@@ -56,7 +58,8 @@ const [BasicModal, modalApi] = useVbenModal({
     modalApi.modalLoading(true);
     const { id } = modalApi.getData() as { id?: number | string };
     isUpdate.value = !!id;
-    await initTypeOptions(id)
+    await initTypeOptions(id);
+    await setupDeptSelect();
     if (isUpdate.value && id) {
       const record = await workOrdersTypeInfo(id);
       record.operationMode = record.operationMode?.toString();
@@ -78,7 +81,9 @@ async function handleConfirm() {
     }
     // getValues获取为一个readonly的对象 需要修改必须先深拷贝一次
     const data = cloneDeep(await formApi.getValues());
-    await (isUpdate.value ? workOrdersTypeUpdate(data) : workOrdersTypeAdd(data));
+    await (isUpdate.value
+      ? workOrdersTypeUpdate(data)
+      : workOrdersTypeAdd(data));
     resetInitialized();
     emit('reload');
     modalApi.close();
@@ -97,10 +102,11 @@ async function handleClosed() {
 async function initTypeOptions(id: string) {
   let params = {
     excludeId: id,
-    filterSubNodes: true //过滤子级
+    filterSubNodes: true, //过滤子级
-  }
+  };
-  const typeList = await workOrdersTypeListAll(params)
+  const typeList = await workOrdersTypeListAll(params);
-  formApi.updateSchema([{
+  formApi.updateSchema([
+    {
       componentProps: () => ({
         options: typeList,
         showSearch: true,
@@ -112,6 +118,24 @@ async function initTypeOptions(id:string) {
     },
   ]);
 }
+async function setupDeptSelect() {
+  const deptTree = await getDeptTree();
+  // 选中后显示在输入框的值 即父节点 / 子节点
+  addFullName(deptTree, 'label', ' / ');
+  formApi.updateSchema([
+    {
+      componentProps: {
+        fieldNames: { label: 'label', value: 'id' },
+        treeData: deptTree,
+        treeDefaultExpandAll: true,
+        treeLine: { showLeafIcon: false },
+        // 选中后显示在输入框的值
+        treeNodeLabelProp: 'fullName',
+      },
+      fieldName: 'deptId',
+    },
+  ]);
+}
 </script>
 
 <template>
@@ -119,4 +143,3 @@ async function initTypeOptions(id:string) {
     <BasicForm />
   </BasicModal>
 </template>
-