Browse Source

no message

kllay 18 hours ago
parent
commit
ae1692e7f4

+ 16 - 3
src/views/system/borrow/approval/curd.tsx

@@ -200,13 +200,24 @@ export const createCrudOptions = function ({ crudExpose ,context, showRejectDial
 					title: '借用人',
 					search: { show: true },
 					type: 'input',
-					column: { minWidth: 120 },
+					column: { show:true, minWidth: 120 },
 					form: {
 						show: true,
 						component: { placeholder: '请输入借用人' },
 						rules: [{ required: false, message: '请输入借用人' }],
 					},
 				},
+				emergency_contact: {
+					title: '借用人',
+					search: { show: true },
+					type: 'input',
+					column: { show:false, minWidth: 120 },
+					form: {
+						show: false,
+						component: { placeholder: '请输入借用人' },
+						rules: [{ required: false, message: '请输入借用人' }],
+					},
+				},
 				emergency_phone: {
 					title: '联系方式',
 					search: { show: false },
@@ -277,8 +288,9 @@ export const createCrudOptions = function ({ crudExpose ,context, showRejectDial
 				approve_time: {
 					title: '审批时间',
 					column: { show:false,minWidth: 140, formatter: ({ value }: any) => (value ? dayjs(value).format('YYYY-MM-DD HH:mm') : '') },
+					from:{show:false}
 				},
-				approve_remark: { title: '审批备注', column: {show:false, minWidth: 120 } },
+				approve_remark: { title: '审批备注', column: {show:false, minWidth: 120 } ,from:{show:false}},
 				total_items: { title: '设备数量', column: { show:false,minWidth: 80 } },
 				
 				
@@ -287,6 +299,7 @@ export const createCrudOptions = function ({ crudExpose ,context, showRejectDial
 				update_datetime: {
 					title: '更新时间',
 					column: { show:false,minWidth: 160, formatter: ({ value }: any) => (value ? dayjs(value).format('YYYY-MM-DD HH:mm:ss') : '') },
+					
 				},
 				
 
@@ -296,7 +309,7 @@ export const createCrudOptions = function ({ crudExpose ,context, showRejectDial
 					type: 'input',
 					column: { minWidth: 120 },
 					form: {
-						show: true,
+						show: false,
 						component: { placeholder: '请输入当前审批人' },
 						rules: [{ required: false, message: '请输入当前审批人' }],
 					},

+ 18 - 12
src/views/system/borrow/component/ClassroomBorrow/index.vue

@@ -27,8 +27,8 @@
 					</el-form-item>
 				</el-col>
 				<el-col :span="8">
-					<el-form-item label="借用人" prop="emergency_contact">
-						<el-input v-model="form.emergency_contact" placeholder="请输入借用人"  />
+					<el-form-item label="借用人" prop="external_borrower_name">
+						<el-input v-model="form.external_borrower_name" placeholder="请输入借用人"  />
 					</el-form-item>
 				</el-col>
 				<el-col :span="8">
@@ -37,8 +37,8 @@
 					</el-form-item>
 				</el-col>
 				<el-col :span="8">
-					<el-form-item label="联系电话" prop="emergency_phone">
-						<el-input v-model="form.emergency_phone" placeholder="请输入联系电话"  />
+					<el-form-item label="联系电话" prop="external_borrower_phone">
+						<el-input v-model="form.external_borrower_phone" placeholder="请输入联系电话"  />
 					</el-form-item>
 				</el-col>
 				<el-col :span="8">
@@ -254,9 +254,12 @@ function getStartTime(time: number): string {
 
 const form = ref({
 	application_no: '',
-	emergency_contact: '',
+	borrower_type:0,
+	external_borrower_name:"",
+	external_borrower_phone:"",
 	purpose:'',
-	emergency_phone: '',
+	emergency_contact: '111',
+	emergency_phone: '1111',
 	app_user_borrower: 1,
 	borrower_dept: '',
 	team_type: 1,
@@ -277,13 +280,13 @@ const isViewMode = computed(() => props.modelValue?.mode === 'view');
 
 
 const rules = {
-  emergency_contact: [
+	external_borrower_name: [
     { required: true, message: '请输入借用人', trigger: 'change' },
   ],
   app_user_borrower: [
     { required: true, message: '请输入学号或工号', trigger: 'change' },
   ],
-  emergency_phone: [
+  external_borrower_phone: [
     { required: true, message: '请输入联系电话', trigger: 'change' },
   ],
   team_members_count: [
@@ -323,9 +326,9 @@ onMounted(() => {
 	try {
 		const userInfo = JSON.parse(sessionStorage.getItem('userInfo') || '{}');
 		if (userInfo) {
-			form.value.emergency_contact = userInfo.username || '';
+			form.value.external_borrower_name = userInfo.username || '';
 			form.value.app_user_borrower = Number(userInfo.dept_info?.dept_id )|| 1;
-			form.value.emergency_phone = userInfo.mobile || '';
+			form.value.external_borrower_phone = userInfo.mobile || '';
 			form.value.borrower_dept = userInfo.dept_info?.dept_name || '';
 		}
 	} catch (e) {console.error(e)}
@@ -337,9 +340,12 @@ onMounted(() => {
 function resetForm() {
   form.value = {
     application_no: '',
-    emergency_contact: '',
+	borrower_type:0,
+	external_borrower_name:"",
+	external_borrower_phone:"",
+    emergency_contact: '111',
     purpose: '',
-    emergency_phone: '',
+    emergency_phone: '1111',
     app_user_borrower: 1,
     borrower_dept: '',
     team_type: 1,

+ 14 - 11
src/views/system/borrow/component/SpecialBorrow/index.vue

@@ -8,8 +8,8 @@
 					</el-form-item>
 				</el-col>
 				<el-col :span="8">
-					<el-form-item label="借用人" prop="emergency_contact">
-						<el-input v-model="form.emergency_contact" placeholder="请输入借用人" :disabled="isView" />
+					<el-form-item label="借用人" prop="external_borrower_name">
+						<el-input v-model="form.external_borrower_name" placeholder="请输入借用人" :disabled="isView" />
 					</el-form-item>
 				</el-col>
 				<el-col :span="8">
@@ -18,8 +18,8 @@
 					</el-form-item>
 				</el-col>
 				<el-col :span="8">
-					<el-form-item label="联系电话" prop="emergency_phone">
-						<el-input v-model="form.emergency_phone" placeholder="请输入联系电话" :disabled="isView" />
+					<el-form-item label="联系电话" prop="external_borrower_phone">
+						<el-input v-model="form.external_borrower_phone" placeholder="请输入联系电话" :disabled="isView" />
 					</el-form-item>
 				</el-col>
 				<el-col :span="8">
@@ -249,9 +249,12 @@ function buildSteps(data: any) {
 
 
 const form = ref({
+	borrower_type: 1,
 	application_no: '',
-	emergency_contact: '',
-	emergency_phone: '',
+	external_borrower_name:"",
+	external_borrower_phone:"",
+	emergency_contact: '111',
+	emergency_phone: '11111',
 	app_user_borrower: 1,
 	team_type: 0,
 	team_members_count: 2,
@@ -272,13 +275,13 @@ const showSelectDeviceDialog = ref(false);
 
 
 const rules = {
-  emergency_contact: [
+   external_borrower_name: [
     { required: true, message: '请输入借用人', trigger: 'change' },
   ],
   app_user_borrower: [
     { required: true, message: '请输入学号或工号', trigger: 'change' },
   ],
-  emergency_phone: [
+  external_borrower_phone: [
     { required: true, message: '请输入联系电话', trigger: 'change' },
   ],
   borrower_dept: [
@@ -307,9 +310,9 @@ onMounted(() => {
 	try {
 		const userInfo = JSON.parse(sessionStorage.getItem('userInfo') || '{}');
 		if (userInfo) {
-			form.value.emergency_contact = userInfo.username || '';
+			form.value.external_borrower_name = userInfo.username || '';
 			form.value.app_user_borrower = Number(userInfo.dept_info?.dept_id )|| 1;
-			form.value.emergency_phone = userInfo.mobile || '';
+			form.value.external_borrower_phone = userInfo.mobile || '';
 			form.value.borrower_dept = userInfo.dept_info?.dept_name || '';
 		}
 	} catch (e) {
@@ -395,7 +398,7 @@ function onSubmit() {
 			form.value.mode = isEdit.value ? 'edit' : 'add';
 			emit('submit', { ...form.value });
 			emit('update:visible', false);
-			ElMessage.success("添加成功!");
+			// ElMessage.success("添加成功!");
 		}
 	});
 	

+ 3 - 8
src/views/system/borrow/crud.tsx

@@ -121,22 +121,17 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 				borrower_type_label: { title: '借用人角色', column: { minWidth: 100 } },
 				borrow_type_label: { search: { show: true },title: '借用性质', column: { minWidth: 100 } },
 				"borrower_info.user_code":{title:"学号/工号",column: { minWidth: 100 }},
-				borrower_info: {
+				"borrower_info.name": {
 					title: '借用人',
 					search:{
 						show:true,
 					},
 					column: {
+						show:true,
 						minWidth: 100,
-						formatter: ({ row }: any) => row.borrower_info?.name || '',
-					},
-					form: {
-						component: {
-							render: ({ value }: any) => value?.name || '',
-						},
 					},
 				},
-				emergency_contact: { title: '紧急联系人', column: { show:false, minWidth: 100 } },
+				emergency_contact: { title: '借用人', column: { show:false, minWidth: 100 } },
 				emergency_phone: { title: '联系方式', column: { minWidth: 120 } },
 				team_type_label: { title: '个人/团队', column: { minWidth: 80 } },
 				team_members: { title: '团队成员', column: { show:false,minWidth: 120 } },