kllay 19 годин тому
батько
коміт
92ed3db6c6
1 змінених файлів з 9 додано та 9 видалено
  1. 9 9
      src/views/system/borrow/crud.tsx

+ 9 - 9
src/views/system/borrow/crud.tsx

@@ -76,7 +76,7 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 						show:compute( ({row})=>{
 							return row.status === 5 ||row.status==7;
 						}), 
-						text: '查看结算单',
+						text: '结算单',
 						click: ({ row }) => {
 							window.dispatchEvent(new CustomEvent('borrow-settlement', { detail: row }));
 						}
@@ -94,7 +94,7 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 					returnEquipment:{
 						order:3,
 						show:compute( ({row})=>{
-							return row.status === 5||row.status===6;
+							return row.status === 5||row.status===6||row.status===8;
 						}), 
 						text: '归还',
 						click: ({ row }) => {
@@ -104,7 +104,7 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 					renewdevice:{
 						order:3,
 						show:compute( ({row})=>{
-							return row.status === 5||row.status===6;
+							return row.status === 5||row.status===6||row.status===8;
 						}), 
 						text: '续借',
 						click: ({ row }) => {
@@ -146,7 +146,7 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 						rules: [{ required: true, message: '' }],
 					}
 				}},
-				borrower_type_label: { title: '借用人角色', column: { minWidth: 100 } },
+				borrower_type_label: { title: '借用人角色', column: { minWidth: 120,sortable: true } },
 				borrow_type_label: { search: { show: false },title: '借用性质', column: { minWidth: 100 } },
 				"borrower_info.user_code":{title:"学号/工号",search:{
 					show:true,		
@@ -177,20 +177,20 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 				team_members_count: { title: '团队人数', column: { show:false,minWidth: 80 }},
 				create_datetime: {
 					title: '创建时间',
-					column: { minWidth: 160, formatter: ({ value }: any) => (value ? dayjs(value).format('YYYY-MM-DD HH:mm:ss') : '') },
+					column: { minWidth: 160, sortable: true,formatter: ({ value }: any) => (value ? dayjs(value).format('YYYY-MM-DD HH:mm:ss') : '') },
 				},
-				status_label: { title: '当前状态', column: { minWidth: 80 } },
+				status_label: { title: '当前状态', column: { minWidth: 100, sortable: true} },
 				actual_start_time: {
 					title: '借出时间',
-					column: { minWidth: 140, formatter: ({ value }: any) => (value ? dayjs(value).format('YYYY-MM-DD HH:mm:ss') : '') },
+					column: { minWidth: 140,sortable: true, formatter: ({ value }: any) => (value ? dayjs(value).format('YYYY-MM-DD HH:mm:ss') : '') },
 				},
 				expected_end_time: {
 					title: '预计归还',
-					column: { minWidth: 140, formatter: ({ value }: any) => (value ? dayjs(value).format('YYYY-MM-DD') : '') },
+					column: { minWidth: 140, sortable: true,formatter: ({ value }: any) => (value ? dayjs(value).format('YYYY-MM-DD') : '') },
 				},
 				actual_end_time: {
 					title: '完结时间',
-					column: { minWidth: 140, formatter: ({ value }: any) => (value ? dayjs(value).format('YYYY-MM-DD HH:mm:ss') : '') },
+					column: { minWidth: 140,sortable: true, formatter: ({ value }: any) => (value ? dayjs(value).format('YYYY-MM-DD HH:mm:ss') : '') },
 				},
 				return_location: { title: '存放仓库', column: { minWidth: 120 } },