kllay 1 долоо хоног өмнө
parent
commit
e1ade526ec

+ 12 - 2
src/views/system/borrow/approval/api.ts

@@ -1,7 +1,7 @@
+import { AddReq, DelReq, EditReq, InfoReq, UserPageQuery } from '@fast-crud/fast-crud';
 import { request } from '/@/utils/service';
-import { UserPageQuery, AddReq, DelReq, EditReq, InfoReq } from '@fast-crud/fast-crud';
 
-export const apiPrefix = '/api/system/approval/';
+export const apiPrefix = '/api/system/approval/workflow/';
 
 export function GetList(query: UserPageQuery) {
 	return request({
@@ -41,3 +41,13 @@ export function DelObj(id: DelReq) {
 		data: { id },
 	});
 }
+
+
+
+export function switchspost(tenant_id:number) {
+	return request({
+		url: '/api/system/tenant/switch/',
+		method: 'post',
+		data: {tenant_id},
+	});
+}

+ 96 - 25
src/views/system/borrow/approval/curd.tsx

@@ -1,6 +1,6 @@
+import { AddReq, CreateCrudOptionsProps, CreateCrudOptionsRet, DelReq, dict, EditReq, UserPageQuery } from '@fast-crud/fast-crud';
 import * as api from './api';
-import { UserPageQuery, AddReq, DelReq, EditReq, CreateCrudOptionsProps, CreateCrudOptionsRet, dict } from '@fast-crud/fast-crud';
-import dayjs from 'dayjs';
+import { switchspost } from './api';
 
 export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOptionsRet {
 	const pageRequest = async (query: UserPageQuery) => {
@@ -30,10 +30,13 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 	const addRequest = async ({ form }: AddReq) => {
 		return await api.AddObj(form);
 	};
+	//切换合作商
+	const res = switchspost(1);		;
 
 	return {
 		crudOptions: {
 			request: {
+				// switchspost,
 				pageRequest,
 				addRequest,
 				editRequest,
@@ -64,25 +67,42 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 						rules: [{ required: true, message: '请输入审批单名称' }],
 					},
 				},
-				code: {
-					title: '审批单编号',
+				workflow_type: {
+					title: '流程类型',
 					search: { show: true },
+					type: 'dict-select',
+					column: { minWidth: 120 },
+					dict: dict({
+						data: [
+							{ label: '设备借用申请', value: 0 },
+							{ label: '设备维修申请', value: 1 },
+							{ label: '设备采购申请', value: 2 },
+							{ label: '其他申请', value: 3 },
+						],
+					}),
+					form: {
+						component: { placeholder: '请选择流程类型' },
+						rules: [{ required: true, message: '请选择流程类型' }],
+					},
+				},
+				description: {
+					title: '流程描述',
+					search: { show: false },
 					type: 'input',
 					column: { minWidth: 120 },
 					form: {
-						component: { placeholder: '请输入审批单编号' },
-						rules: [{ required: true, message: '请输入审批单编号' }],
+						component: { placeholder: '请输入流程描述' },
+						rules: [{ required: false, message: '请输入流程描述' }],
 					},
 				},
-				status: {
+				is_active: {
 					title: '状态',
 					type: 'dict-select',
-					search: { show: true },
+					search: { show: false },
 					dict: dict({
 						data: [
-							{ label: '待审批', value: 0 },
-							{ label: '已通过', value: 1 },
-							{ label: '已拒绝', value: 2 },
+							{ label: '启用', value: true },
+							{ label: '禁用', value: false },
 						],
 					}),
 					column: { minWidth: 100 },
@@ -91,35 +111,86 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 						rules: [{ required: true, message: '请选择状态' }],
 					},
 				},
-				create_datetime: {
-					title: '创建时间',
-					type: 'datetime',
+				equipment_categories: {
+					title: '分类列表',
+					type: 'dict-select',
 					search: { show: false },
 					column: {
 						minWidth: 160,
-						formatter: ({ value }) => (value ? dayjs(value).format('YYYY-MM-DD HH:mm:ss') : ''),
 					},
-					form: { show: false },
+					dict: dict({
+						url: '/api/system/device/category/',
+						value: 'id', 
+						label: 'name'
+					}),
+					form: { component: { placeholder: '请选择分类列表' },},
 				},
-				update_datetime: {
-					title: '更新时间',
-					type: 'datetime',
+				borrow_types: {
+					title: '借用类型',
+					type: 'dict-select',
 					search: { show: false },
+					
 					column: {
 						minWidth: 160,
-						formatter: ({ value }) => (value ? dayjs(value).format('YYYY-MM-DD HH:mm:ss') : ''),
+						// formatter: ({ value }) => (value ? dayjs(value).format('YYYY-MM-DD HH:mm:ss') : '')
+					},
+					dict: dict({
+						data: [
+							{ label: '常规借用', value: 0 },
+							{ label: '课堂借用', value: 1 },
+							{ label: '特殊借用', value: 2 },
+						],
+					}),
+					form: { 
+						component: { placeholder: '请选择借用类型' },
 					},
-					form: { show: false },
 				},
-				remark: {
-					title: '备注',
-					type: 'text',
+				team_type: {
+					title: '借用方式',
+					type: 'dict-select',
+					search: { show: false },
+					column: { minWidth: 120 },
+					dict: dict({
+						data: [
+							{ label: '个人借用', value: 0 },
+							{ label: '团队借用', value: 1 },
+						],
+					}),
+					form: {
+						component: { placeholder: '请选择借用方式' },
+					},
+				},
+				user_types: {
+					title: '用户类型',
+					type: 'dict-select',
 					search: { show: false },
 					column: { minWidth: 120 },
+					dict: dict({
+						data: [
+							{ label: '学生', value: 'student' },
+							{ label: '老师', value: 'teacher' },
+						],
+					}),
 					form: {
-						component: { placeholder: '请输入备注信息' },
+						component: { placeholder: '请选择用户类型' },
 					},
 				},
+				tenant_id:{
+					title: '租户id',
+					type: 'dict-select',
+					column: {
+						minWidth: 120,
+					},
+					dict: dict({
+						url: '/api/system/tenant/list/',
+						value: 'id', 
+						label: 'name'
+					}),
+					form: {
+						component: { placeholder: '请填租户id' },
+						rules: [{ required: false, message: '请填租户id' }],
+					},
+				}
 			},
 		},
 	};