固定资产代码

src/api/eam/basic/fixedAssets/index.ts

@@ -1,4 +1,6 @@
 import request from '@/config/axios'
+import { getStrDictOptions } from '@/utils/dict'
+import { useUserStore } from '@/store/modules/user'
 
 export interface FixedAssetsVO {
   number: string
@@ -19,8 +21,20 @@ export interface FixedAssetsVO {
   concurrencyStamp: number
 }
 
-// 查询固定资产列表
 export const getFixedAssetsPage = async (params) => {
+  const userStore = useUserStore() // 用户信息
+  const deviceMoldTypeList = getStrDictOptions(DICT_TYPE.SPECIAL_DEPT_ROLE)
+  
+  // 查找第一个同时存在于userStore.roles和deviceMoldTypeList中的值
+  const matchingRole = userStore.roles.find(role => 
+    deviceMoldTypeList.some(deviceMold => deviceMold.value === role)
+  );
+
+  // 如果找到了匹配的角色，将它作为manageDept的值加入到params中
+  if (matchingRole) {
+    params.manageDept = matchingRole; // 这里只添加第一个匹配的角色
+  }
+
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}

src/utils/dict.ts

@@ -305,6 +305,7 @@ export enum DICT_TYPE {
   TURN_TYPE = 'turn_type', //转移类型
   ORDER_COMPLETE_RESULT = 'order_complete_result', //维修工单完成结果
   FACTORY_TYPE = 'factory_type',//厂区类别
-  EQUIPMENT_INDEX_NAME = 'equipment_index_name'//设备年度目标指标名称分类字段
+  EQUIPMENT_INDEX_NAME = 'equipment_index_name',//设备年度目标指标名称分类字段
+  SPECIAL_DEPT_ROLE = 'special_dept_role'
   
 }

src/views/eam/basic/fixedAssets/fixedAssets.data.ts

@@ -38,6 +38,7 @@ export const FixedAssetsRules = reactive({
     { validator:validateNumDot, message: '请输入数字格式', trigger: 'blur'}
   ],
   manageDept: [
+    required,
     { max: 20, message: '不得超过20个字符', trigger: 'blur' },
   ],
   unit: [
@@ -108,8 +109,8 @@ export const FixedAssets = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '购买时间',
-    field: 'purchaseDate',
+    label: '投入使用时间',
+    field: 'beginUseDate',
     sort: 'custom',
     table: {
       width: '150',
@@ -123,14 +124,6 @@ export const FixedAssets = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
-    label: '采购部门',
-    field: 'purchaseDept',
-    sort: 'custom',
-    table: {
-      width: '150',
-    },
-  },
   {
     label: '供应商',
     field: 'supplierNumber',
@@ -170,33 +163,54 @@ export const FixedAssets = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  // {
+  //   label: '管理部门',
+  //   field: 'manageDept',
+  //   sort: 'custom',
+  //   table: {
+  //     width: '150',
+  //   },
+  //   form: {
+  //     componentProps: {
+  //       disabled: true
+  //     }
+  //   }
+  // },
   {
-    label: '购买价格',
-    field: 'purchasePrice',
+    label: '单位',
+    field: 'unit',
     sort: 'custom',
     table: {
       width: '150',
     },
   },
   {
-    label: '管理部门',
-    field: 'manageDept',
+    label: '数量',
+    field: 'qty',
     sort: 'custom',
     table: {
       width: '150',
     },
   },
   {
-    label: '单位',
-    field: 'unit',
+    label: '期间费用科目描述',
+    field: 'costSubjectDesc',
     sort: 'custom',
     table: {
       width: '150',
     },
   },
   {
-    label: '数量',
-    field: 'qty',
+    label: '使用人',
+    field: 'user',
+    sort: 'custom',
+    table: {
+      width: '150',
+    },
+  },
+  {
+    label: '状态',
+    field: 'status',
     sort: 'custom',
     table: {
       width: '150',

src/views/eam/basic/fixedAssets/index.vue

@@ -58,14 +58,15 @@
 </template>
 
 <script setup lang="ts">
+import { useUserStore } from '@/store/modules/user'
+import { getStrDictOptions } from '@/utils/dict'
 import download from '@/utils/download'
 import { FixedAssets,FixedAssetsRules } from './fixedAssets.data'
 import * as FixedAssetsApi from '@/api/eam/basic/fixedAssets'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-import TableHead from '@/components/TableHead/src/TableHead.vue'
-import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
-import Detail from '@/components/Detail/src/Detail.vue'
-
+// import TableHead from '@/components/TableHead/src/TableHead.vue'
+// import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+// import Detail from '@/components/Detail/src/Detail.vue'
 defineOptions({ name: 'FixedAssets' })
 
 const message = useMessage() // 消息弹窗
@@ -149,6 +150,9 @@ const buttonTableClick = async (val, row) => {
 /** 添加/修改操作 */
 const basicFormRef = ref()
 const openForm = (type: string, row?: any) => {
+  
+
+  
   basicFormRef.value.open(type, row)
 }
 
@@ -165,10 +169,19 @@ const formsSuccess = async (formType,data) => {
   }
   if(data.activeTime==0)data.activeTime = null;
   if(data.expireTime==0)data.expireTime = null;
+  const userStore = useUserStore() // 用户信息
+    const deviceMoldTypeList = getStrDictOptions(DICT_TYPE.SPECIAL_DEPT_ROLE)
+    // 查找第一个同时存在于userStore.roles和deviceMoldTypeList中的值
+    const matchingRole = userStore.roles.find(role => 
+      deviceMoldTypeList.some(deviceMold => deviceMold.value === role)
+    );
   if (formType === 'create') {
+    data.manageDept = matchingRole
     await FixedAssetsApi.createFixedAssets(data)
+
     message.success(t('common.createSuccess'))
   } else {
+    data.manageDept = matchingRole
     await FixedAssetsApi.updateFixedAssets(data)
     message.success(t('common.updateSuccess'))
   }