kllay hace 1 día
padre
commit
f4e4696b1f

+ 16 - 2
src/views/system/borrow/crud.tsx

@@ -255,11 +255,25 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 						component: { placeholder: '' },
 					}
 				},
-				accessories: {
-					title: '扫设备编码',
+				status: {
+					title: '当前状态',
+					type: 'dict-select',
 					search:{
 						show:true,		
 					},
+					dict: dict({
+						data: [
+							{ label: '待审批', value: 1 },
+							{ label: '已批准', value:2},
+							{ label: '已拒绝', value: 3 },
+							{ label: '已取消', value: 4},
+							{ label: '已借出', value: 5},
+							// { label: '有损坏和逾期', value: 6},
+							{ label: '已归还', value: 7},
+							{ label: '已逾期', value: 8},
+							{ label: '续借待审批', value: 9},
+						],
+					}),
 					column: {
 						show:false,
 						minWidth: 100,

+ 2 - 1
src/views/system/borrow/workflow/WorkflowDialog/index.vue

@@ -469,7 +469,8 @@ async function onSave() {
 			step_order: stepOrder,
 			step_type: stepType,
 			description: `由${roleNames.join(',')}进行审批`,
-			approvers: leaderIds.length > 0 ? leaderIds : [1],  // 可选:你可以根据需要填入具体 ID
+			approvers: [1], 
+			app_approvers:leaderIds.length > 0 ? leaderIds : [],
 			approver_roles: approverRoles,
 			approver_depts: [],
 			approval_conditions: {

+ 12 - 2
src/views/system/suppliermanage/crud.tsx

@@ -214,9 +214,19 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 				},
 				credit_rating: {
 					title: '信用评级',
-					search: { show: false },
-					type: 'input',
+					search: { show: true },
+					type: 'dict-select',
 					column: { minWidth: 100 },
+					dict: dict({
+						data: [
+							{ label: 'A', value: 'A' },
+							{ label: 'B', value: 'B' },
+							{ label: 'C', value: 'C' },
+							{ label: 'D', value: 'D' },
+							{ label: 'E', value: 'E' },
+							{ label: 'F', value: 'F' },
+						],
+					}),
 					form: {
 						component: { placeholder: '请输入信用评级' },
 						rules: [{ required: false, message: '请输入信用评级' }],