kllay hai 1 semana
pai
achega
79070deae4

+ 3 - 0
src/views/system/borrow/approval/api.ts

@@ -23,6 +23,9 @@ export function AddObj(obj: AddReq) {
 		url: apiPrefix,
 		method: 'post',
 		data: obj,
+		// headers:{
+		// 	"Authorization":"JWT eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0b2tlbl90eXBlIjoiYWNjZXNzIiwiZXhwIjoxNzgzMjIyOTM2LCJpYXQiOjE3NTE2ODY5MzYsImp0aSI6ImMxNmQ4N2Y0NzdhMTQwN2FiN2Q3MmY3OTA2YzdhNmYwIiwidXNlcl9pZCI6MX0.NGSukWjyl_WlpMBAQ3VyGtc5O5ZRgdTlAjp0cEtgoLw"
+		// }
 	});
 }
 

+ 39 - 12
src/views/system/borrow/approval/curd.tsx

@@ -111,7 +111,7 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 						rules: [{ required: true, message: '请选择状态' }],
 					},
 				},
-				equipment_categories: {
+				'trigger_conditions.equipment_categories': {
 					title: '分类列表',
 					type: 'dict-select',
 					search: { show: false },
@@ -123,9 +123,17 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 						value: 'id', 
 						label: 'name'
 					}),
-					form: { component: { placeholder: '请选择分类列表' },},
+					form: { 
+						component: { placeholder: '请选择分类列表' },
+						valueResolve({ form, value }) {
+							form.trigger_conditions.equipment_categories =[value];
+						},
+						// valueBuilder({ form, value }) {
+						// 	form.trigger_conditions.equipment_categories =Array.from(value);
+						// },
+				},
 				},
-				borrow_types: {
+				'trigger_conditions.borrow_types': {
 					title: '借用类型',
 					type: 'dict-select',
 					search: { show: false },
@@ -136,31 +144,40 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 					},
 					dict: dict({
 						data: [
-							{ label: '常规借用', value: 0 },
-							{ label: '课堂借用', value: 1 },
-							{ label: '特殊借用', value: 2 },
+							{ label: '常规借用', value: "0" },
+							{ label: '课堂借用', value: '1' },
+							{ label: '特殊借用', value: '2' },
 						],
 					}),
 					form: { 
 						component: { placeholder: '请选择借用类型' },
+						valueResolve({ form, value }) {
+							form.trigger_conditions.borrow_types = [value];
+						},
+						// valueBuilder({ form, value }) {
+						// 	form.trigger_conditions.borrow_types=Array.from(value);
+						// },
 					},
 				},
-				team_type: {
+				'trigger_conditions.team_type': {
 					title: '借用方式',
 					type: 'dict-select',
 					search: { show: false },
 					column: { minWidth: 120 },
 					dict: dict({
 						data: [
-							{ label: '个人借用', value: 0 },
-							{ label: '团队借用', value: 1 },
+							{ label: '个人借用', value: '0' },
+							{ label: '团队借用', value: '1' },
 						],
 					}),
 					form: {
 						component: { placeholder: '请选择借用方式' },
+						valueResolve({ form, value }) {
+							form.trigger_conditions.team_type =[value];
+						},
 					},
 				},
-				user_types: {
+				'trigger_conditions.user_types': {
 					title: '用户类型',
 					type: 'dict-select',
 					search: { show: false },
@@ -173,12 +190,16 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 					}),
 					form: {
 						component: { placeholder: '请选择用户类型' },
+						valueResolve({ form, value }) {
+							form.trigger_conditions.user_types =[value];
+						},
 					},
 				},
 				tenant_id:{
 					title: '租户id',
 					type: 'dict-select',
 					column: {
+						show: false,
 						minWidth: 120,
 					},
 					dict: dict({
@@ -190,8 +211,14 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 						component: { placeholder: '请填租户id' },
 						rules: [{ required: false, message: '请填租户id' }],
 					},
-				}
-			},
+				},
+
+		
+			
+		
+		
+		
+		},
 		},
 	};
 };