commit：增加组织选择

gesilong
1 parent b1c263d8
Showing 9 changed files with 84 additions and 2 deletions
src/store/modules/user.ts
src/views/equipment/category/index.ts
src/views/equipment/checkPlan/index.ts
src/views/equipment/errorReason/index.ts
src/views/equipment/ledger/config/data.ts
src/views/equipment/supplier/index.ts
src/views/inspection/inspectionPlan/components/insPlanModal.vue
src/views/inspection/servicePlan/components/servicePlanModal.vue
src/views/repair/order/index.ts
--- a/src/store/modules/user.ts
View file @be1d717
+++ b/src/store/modules/user.ts
View file @be1d717
@@ -31,7 +31,7 @@ import { getEntitiesId } from '/@/api/dashboard/index';
 import { useRole } from '/@/hooks/business/useRole';
 import { useLocaleStore } from './locale';
-export const TARGET_TENANT_ID = '0414df80-f01d-11f0-9cb8-e3376d1e7978';
+export const TARGET_TENANT_ID = 'bdae06d0-bceb-11ef-8689-8dadda196010';
 export function isTargetTenantId(tenantId?: string | null) {
   return tenantId === TARGET_TENANT_ID;
--- a/src/views/equipment/category/index.ts
View file @be1d717
+++ b/src/views/equipment/category/index.ts
View file @be1d717
 import { useI18n } from '/@/hooks/web/useI18n';
 const { t } = useI18n();
-import { FormSchema } from '/@/components/Table';
+import { FormSchema, useComponentRegister } from '/@/components/Form';
+import { OrgTreeSelect } from '/@/views/common/OrgTreeSelect';
+
+useComponentRegister('OrgTreeSelect', OrgTreeSelect);
 //表单字段
 export const schemas: FormSchema[] = [
@@ -13,6 +16,13 @@ export const schemas: FormSchema[] = [
     colProps: { span: 18 },
   },
   {
+    field: 'organizationId',
+    label: t('business.affiliatedOrganizationText'),
+    component: 'OrgTreeSelect',
+    required: true,
+    colProps: { span: 18 },
+  },
+  {
     field: 'cagegoryOrder',
     label: t('equipment.category.orderText'),
     component: 'Input',
--- a/src/views/equipment/checkPlan/index.ts
View file @be1d717
+++ b/src/views/equipment/checkPlan/index.ts
View file @be1d717
 import {FormSchema} from "/@/components/Form";
 import {useI18n} from "/@/hooks/web/useI18n";
 import {BasicColumn} from "/@/components/Table";
+import { useComponentRegister } from '/@/components/Form';
+import { OrgTreeSelect } from '/@/views/common/OrgTreeSelect';
 const { t } = useI18n();
+useComponentRegister('OrgTreeSelect', OrgTreeSelect);
 const statusOptions = [
   { label: t('equipment.checkPlan.enableText'), value: 'ENABLE' },
@@ -91,6 +94,13 @@ export const schemas: FormSchema[] = [
     },
   },
   {
+    field: 'organizationId',
+    label: t('business.affiliatedOrganizationText'),
+    component: 'OrgTreeSelect',
+    colProps: { span: 21 },
+    required: true,
+  },
+  {
     field: 'type',
     label: t('equipment.checkPlan.typeText'),
     component: 'RadioButtonGroup',
--- a/src/views/equipment/errorReason/index.ts
View file @be1d717
+++ b/src/views/equipment/errorReason/index.ts
View file @be1d717
 import {FormSchema} from "/@/components/Form";
 import {useI18n} from "/@/hooks/web/useI18n";
 import {BasicColumn} from "/@/components/Table";
+import { useComponentRegister } from '/@/components/Form';
+import { OrgTreeSelect } from '/@/views/common/OrgTreeSelect';
 const { t } = useI18n();
+
+useComponentRegister('OrgTreeSelect', OrgTreeSelect);
 const statusOptions = [
   { label: t('equipment.errorReason.enableText'), value: 'ENABLE' },
   { label: t('equipment.errorReason.disabledText'), value: 'DISABLE' },
@@ -64,6 +68,13 @@ export const schemas: FormSchema[] = [
     },
   },
   {
+    field: 'organizationId',
+    label: t('business.affiliatedOrganizationText'),
+    component: 'OrgTreeSelect',
+    colProps: { span: 21 },
+    required: true,
+  },
+  {
     field: 'status',
     label: t('equipment.errorReason.statusText'),
     component: 'RadioButtonGroup',
--- a/src/views/equipment/ledger/config/data.ts
View file @be1d717
+++ b/src/views/equipment/ledger/config/data.ts
View file @be1d717
@@ -72,6 +72,13 @@ export function getFormSchema(isTargetTenant: boolean): BFormSchema[] {
       },
     },
     {
+      field: 'organizationId',
+      label: t('business.affiliatedOrganizationText'),
+      component: 'OrgTreeSelect',
+      colProps: { span: 24 },
+      required: true,
+    },
+    {
       field: 'categoryId',
       label: t('equipment.category.categoryText'),
       colProps: { span: 24 },
--- a/src/views/equipment/supplier/index.ts
View file @be1d717
+++ b/src/views/equipment/supplier/index.ts
View file @be1d717
 import {FormSchema} from "/@/components/Form";
 import {useI18n} from "/@/hooks/web/useI18n";
 import {BasicColumn} from "/@/components/Table";
+import { useComponentRegister } from '/@/components/Form';
+import { OrgTreeSelect } from '/@/views/common/OrgTreeSelect';
 const { t } = useI18n();
+
+useComponentRegister('OrgTreeSelect', OrgTreeSelect);
 export const searchFormSchema: FormSchema[] = [
   {
     field: 'name',
@@ -59,6 +63,13 @@ export const schemas: FormSchema[] = [
     },
   },
   {
+    field: 'organizationId',
+    label: t('business.affiliatedOrganizationText'),
+    component: 'OrgTreeSelect',
+    colProps: { span: 21 },
+    required: true,
+  },
+  {
     field: 'contacts',
     label: t('equipment.supplier.contactsName'),
     component: 'Input',
--- a/src/views/inspection/inspectionPlan/components/insPlanModal.vue
View file @be1d717
+++ b/src/views/inspection/inspectionPlan/components/insPlanModal.vue
View file @be1d717
@@ -58,6 +58,15 @@
             </a-select>
           </a-form-item>
         </a-col>
+        <a-col :span="12">
+          <a-form-item label="所属组织" name="organizationId">
+            <OrgTreeSelect
+              :value="form.organizationId"
+              @change="(value) => (form.organizationId = value)"
+              :disabled="isViewMode"
+            />
+          </a-form-item>
+        </a-col>
       </a-row>
       <a-row :gutter="16">
         <a-col :span="24">
@@ -169,6 +178,7 @@
 import {onMounted, ref, watch, reactive} from "vue";
 import {getLedgerList} from "/@/api/equipment/ledger";
 import {getPlanList} from "/@/api/equipment/chenkPlan";
+import { OrgTreeSelect } from '/@/views/common/OrgTreeSelect';
 import { useUserStore } from '/@/store/modules/user';
 import { BasicTable, useTable } from '/@/components/Table';
 const Options = ref([]);
@@ -185,6 +195,7 @@ const props = defineProps({
         enabled: '',
         startTime: '',
         endTime: '',
+        organizationId: '',
         remark: '',
       },
       tableData: [],
@@ -247,6 +258,7 @@ const rules = {
     { required: true, message: '请输入', trigger: 'blur' },
   ],
   status: [{ required: true, message: '请选择', trigger: 'change' }],
+  organizationId: [{ required: true, message: '请选择', trigger: 'change' }],
 };
 const visible = ref(props.visible);
 const isViewMode = ref(props.isViewMode);
@@ -404,6 +416,7 @@ const resetForm = () => {
     enabled: '',
     startTime: '',
     endTime: '',
+    organizationId: '',
     remark: '',
   };
   tableData.value = [];
--- a/src/views/inspection/servicePlan/components/servicePlanModal.vue
View file @be1d717
+++ b/src/views/inspection/servicePlan/components/servicePlanModal.vue
View file @be1d717
@@ -42,6 +42,15 @@
             <a-input v-model:value="form.frequency" :disabled="isViewMode" />
           </a-form-item>
         </a-col>
+        <a-col :span="12">
+          <a-form-item label="所属组织" name="organizationId">
+            <OrgTreeSelect
+              :value="form.organizationId"
+              @change="(value) => (form.organizationId = value)"
+              :disabled="isViewMode"
+            />
+          </a-form-item>
+        </a-col>
       </a-row>
       <a-form-item
         label="保养明细"
@@ -147,6 +156,7 @@ import { getPlanList } from "/@/api/equipment/chenkPlan";
 import { useI18n } from "/@/hooks/web/useI18n";
 import { useUserStore } from '/@/store/modules/user';
 import { BasicTable, useTable } from '/@/components/Table';
+import { OrgTreeSelect } from '/@/views/common/OrgTreeSelect';
 const Options = ref([]);
 const planOptions = ref([]);
@@ -163,6 +173,7 @@ const props = defineProps({
         status: '',
         times: '',
         frequency: '',
+        organizationId: '',
       },
       tableData: [],
     }),
@@ -199,6 +210,7 @@ const rules = {
     { required: true, message: '请输入', trigger: 'blur' },
   ],
   status: [{ required: true, message: '请选择', trigger: 'change' }],
+  organizationId: [{ required: true, message: '请选择', trigger: 'change' }],
   preserveDetailList: [{ required: true, message: '请选择', trigger: 'change' }],
 };
@@ -400,6 +412,7 @@ const resetForm = () => {
     status: '',
     times: '',
     frequency: '',
+    organizationId: '',
 };
   tableData.value = [];
   isViewMode.value = false;
--- a/src/views/repair/order/index.ts
View file @be1d717
+++ b/src/views/repair/order/index.ts
View file @be1d717
@@ -189,6 +189,13 @@ export const schemas: FormSchema[] = [
     },
   },
   {
+    field: 'organizationId',
+    label: t('business.affiliatedOrganizationText'),
+    component: 'OrgTreeSelect',
+    colProps: { span: 21 },
+    required: true,
+  },
+  {
     field: 'reportDate',
     label: t('repair.order.time'),
     component: 'DatePicker',