Browse Source

no message

kllay 4 days ago
parent
commit
1984209f4a

+ 1 - 1
src/views/system/borrow/api.ts

@@ -20,7 +20,7 @@ export function GetObj(id: InfoReq) {
 
 export function AddObj(obj: AddReq) {
 	return request({
-		url: apiPrefix,
+		url: apiPrefix+ "/application/",
 		method: 'post',
 		data: obj
 	});

+ 31 - 7
src/views/system/borrow/component/CommonBorrow/SelectDeviceDialog/index.vue

@@ -1,14 +1,14 @@
 <template>
 	<el-dialog v-model="visible" title="选择设备" width="800px" :close-on-click-modal="false" @close="onCancel">
 		<div style="margin-bottom: 12px">
-			<el-input v-model="search" placeholder="输入关键字搜索" style="width: 240px; margin-right: 8px" @keyup.enter="fetchData" />
-			<el-button type="primary" @click="fetchData">搜索</el-button>
+			<el-input v-model="search" placeholder="输入关键字搜索" style="width: 240px; margin-right: 8px" @keyup.enter="fetchData(true)" />
+			<el-button type="primary" @click="fetchData(true)">搜索</el-button>
 		</div>
 		<el-table :data="tableData" border style="width: 100%" @selection-change="onSelectionChange" ref="tableRef">
 			<el-table-column type="selection" width="50" />
 			<el-table-column type="index" label="序号" width="60" />
-			<el-table-column prop="name" label="设备分类" />
-			<el-table-column prop="location" label="存放仓库" />
+			<el-table-column prop="category_name" label="设备分类" />
+			<el-table-column prop="warehouse" label="存放仓库" />
 		</el-table>
 		<el-pagination
 			style="margin-top: 12px; text-align: right"
@@ -27,6 +27,7 @@
 <script setup lang="ts">
 import { ref, watch, defineProps, defineEmits } from 'vue';
 import * as deviceApi from '../../../../device/api';
+import * as storeapi from '../../../../storelist/api';
 
 const props = defineProps<{ visible: boolean }>();
 const emit = defineEmits(['update:visible', 'confirm']);
@@ -43,10 +44,33 @@ const pageSize = ref(10);
 const total = ref(0);
 const tableData = ref([]);
 const selectedRows = ref([]);
+const warehouseMap = ref<Record<number, string>>({});
 
-function fetchData() {
-	deviceApi.GetList({ page: page.value, limit: pageSize.value, name: search.value }).then((res) => {
-		tableData.value = res.data;
+
+function fetchWarehouseMap() {
+    storeapi.GetPermission().then((res) => {
+        const map: Record<number, string> = {};
+        res.data.forEach((item) => {
+            map[item.id] = item.name;
+        });
+        warehouseMap.value = map;
+    });
+}
+
+
+async function fetchData(resetPage = false) {
+	if (resetPage) page.value = 1;
+	await fetchWarehouseMap(); // 先获取仓库映射表
+	deviceApi.GetList({ page: page.value, limit: pageSize.value, category_name: search.value })
+	.then((res) => {
+		// tableData.value = res.data;
+		// 替换 warehouse 字段为名称
+		const devices = res.data.map((device) => ({
+            ...device,
+            warehouse: warehouseMap.value[device.warehouse] || `ID:${device.warehouse}`
+        }));
+		tableData.value = devices;
+		// tableData.value = [...res.data];
 		total.value = res.total;
 	});
 }

+ 32 - 16
src/views/system/borrow/component/CommonBorrow/index.vue

@@ -17,13 +17,13 @@
 					</el-form-item>
 				</el-col>
 				<el-col :span="8">
-					<el-form-item label="借用人" prop="borrower_name">
-						<el-input v-model="form.borrower_name" placeholder="请输入借用人" disabled />
+					<el-form-item label="借用人" prop="emergency_contact">
+						<el-input v-model="form.emergency_contact" placeholder="请输入借用人" disabled />
 					</el-form-item>
 				</el-col>
 				<el-col :span="8">
-					<el-form-item label="学号/工号" prop="user_code">
-						<el-input v-model="form.user_code" placeholder="请输入学号/工号" disabled />
+					<el-form-item label="学号/工号" prop="app_user_borrower">
+						<el-input v-model="form.app_user_borrower" placeholder="请输入学号/工号" disabled />
 					</el-form-item>
 				</el-col>
 				<el-col :span="8">
@@ -49,12 +49,12 @@
 						</el-select>
 					</el-form-item>
 				</el-col>
-				<el-col :span="4">
+				<el-col :span="4" v-show="form.team_type===1">
 					<el-form-item label="团队人数" prop="team_members_count">
 						<el-input v-model="form.team_members_count" placeholder="请输入" />
 					</el-form-item>
 				</el-col>
-				<el-col :span="16">
+				<el-col :span="16" v-show="form.team_type===1">
 					<el-form-item label="团队其他人员名单" prop="team_members">
 						<el-input v-model="form.team_members" placeholder="请输入团队其他人员名单" />
 					</el-form-item>
@@ -66,8 +66,8 @@
 				</el-col>
 				<el-col :span="4">
 					<el-form-item label="审批人" prop="applicant_remark">
-						<el-select>
-							<el-option>请选择</el-option>
+						<el-select v-model="form.applicant_remark_type" placeholder="请选择">
+							<el-option label="管理员" value="1"/>
 						</el-select>
 					</el-form-item>
 				</el-col>
@@ -80,7 +80,7 @@
 			<div style="margin: 16px 0 8px 0; font-weight: bold">借用明细表</div>
 			<el-table :data="form.items" border style="width: 100%; margin-bottom: 12px">
 				<el-table-column type="index" label="序号" width="60" />
-				<el-table-column prop="device_name" label="设备分类" />
+				<el-table-column prop="remark" label="设备分类" />
 				<el-table-column prop="quantity" label="借用数量" />
 				<el-table-column prop="location" label="存放仓库" />
 				<el-table-column label="操作" width="80">
@@ -108,6 +108,13 @@
 <script setup lang="ts">
 import { ref, watch, defineProps, defineEmits, onMounted } from 'vue';
 import SelectDeviceDialog from './SelectDeviceDialog/index.vue';
+import dayjs from 'dayjs';
+
+const now = dayjs().format('YYYY-MM-DD HH:mm:ss');
+
+
+
+
 const props = defineProps<{ visible: boolean; modelValue?: any }>();
 const emit = defineEmits(['update:visible', 'update:modelValue', 'submit']);
 const visible = ref(props.visible);
@@ -115,18 +122,22 @@ const formRef = ref();
 
 const form = ref({
 	application_no: '',
-	borrower_name: '',
+	emergency_contact: '',
 	emergency_phone: '',
-	user_code: '',
+	app_user_borrower: 1,
 	team_type: 0,
-	team_members_count: '',
+	team_members_count: 1,
 	team_members: '',
+	expected_start_time:'',
 	expected_end_time: '',
 	borrower_dept: '',
 	purpose: '',
+	applicant_remark_type:'',
 	applicant_remark: '',
 	items: [],
 	accessory_info: '',
+	borrow_type: 0,
+	return_location:''
 });
 const showSelectDeviceDialog = ref(false);
 
@@ -135,8 +146,8 @@ onMounted(() => {
 	try {
 		const userInfo = JSON.parse(sessionStorage.getItem('userInfo') || '{}');
 		if (userInfo) {
-			form.value.borrower_name = userInfo.username || '';
-			form.value.user_code = userInfo.dept_info?.dept_id || '';
+			form.value.emergency_contact = userInfo.username || '';
+			form.value.app_user_borrower = Number(userInfo.dept_info?.dept_id )|| 1;
 			form.value.emergency_phone = userInfo.mobile || '';
 			form.value.borrower_dept = userInfo.dept_info?.dept_name || '';
 		}
@@ -164,9 +175,9 @@ function onDeviceSelected(devices) {
 	form.value.items.push(
 		...devices.map((d) => ({
 			device: d.id,
-			device_name: d.name,
+			remark: d.category_name,
 			quantity: 1,
-			location: d.location,
+			location: d.warehouse,
 		}))
 	);
 }
@@ -179,6 +190,11 @@ function onCancel() {
 function onSubmit() {
 	formRef.value.validate((valid: boolean) => {
 		if (valid) {
+			const firstLocation = form.value.items[0]?.location || '';
+            form.value.return_location = firstLocation;
+			form.value.expected_start_time = now;
+			form.value.expected_end_time = dayjs(form.value.expected_end_time).format('YYYY-MM-DD HH:mm:ss')|| now;
+			form.team_members_count=Number(form.team_members_count)||1;
 			emit('submit', { ...form.value });
 			emit('update:visible', false);
 		}

+ 94 - 0
src/views/system/borrow/component/SpecialBorrow/SelectDeviceDialog/index.vue

@@ -0,0 +1,94 @@
+<template>
+	<el-dialog v-model="visible" title="选择设备" width="800px" :close-on-click-modal="false" @close="onCancel">
+		<div style="margin-bottom: 12px">
+			<el-input v-model="search" placeholder="输入关键字搜索" style="width: 240px; margin-right: 8px" @keyup.enter="fetchData(true)" />
+			<el-button type="primary" @click="fetchData(true)">搜索</el-button>
+		</div>
+		<el-table :data="tableData" border style="width: 100%" @selection-change="onSelectionChange" ref="tableRef">
+			<el-table-column type="selection" width="50" />
+			<el-table-column type="index" label="序号" width="60" />
+			<el-table-column prop="category_name" label="设备分类" />
+			<el-table-column prop="warehouse" label="存放仓库" />
+		</el-table>
+		<el-pagination
+			style="margin-top: 12px; text-align: right"
+			:current-page="page"
+			:page-size="pageSize"
+			:total="total"
+			@current-change="onPageChange"
+		/>
+		<template #footer>
+			<el-button @click="onCancel">取消</el-button>
+			<el-button type="primary" @click="onConfirm">确定</el-button>
+		</template>
+	</el-dialog>
+</template>
+
+<script setup lang="ts">
+import { ref, watch, defineProps, defineEmits } from 'vue';
+import * as deviceApi from '../../../../device/api';
+import * as storeapi from '../../../../storelist/api';
+
+const props = defineProps<{ visible: boolean }>();
+const emit = defineEmits(['update:visible', 'confirm']);
+
+const visible = ref(props.visible);
+watch(
+	() => props.visible,
+	(v) => (visible.value = v)
+);
+
+const search = ref('');
+const page = ref(1);
+const pageSize = ref(10);
+const total = ref(0);
+const tableData = ref([]);
+const selectedRows = ref([]);
+const warehouseMap = ref<Record<number, string>>({});
+
+
+function fetchWarehouseMap() {
+    storeapi.GetPermission().then((res) => {
+        const map: Record<number, string> = {};
+        res.data.forEach((item) => {
+            map[item.id] = item.name;
+        });
+        warehouseMap.value = map;
+    });
+}
+
+
+async function fetchData(resetPage = false) {
+	if (resetPage) page.value = 1;
+	await fetchWarehouseMap(); // 先获取仓库映射表
+	deviceApi.GetList({ page: page.value, limit: pageSize.value, category_name: search.value })
+	.then((res) => {
+		// tableData.value = res.data;
+		// 替换 warehouse 字段为名称
+		const devices = res.data.map((device) => ({
+            ...device,
+            warehouse: warehouseMap.value[device.warehouse] || `ID:${device.warehouse}`
+        }));
+		tableData.value = devices;
+		// tableData.value = [...res.data];
+		total.value = res.total;
+	});
+}
+function onSelectionChange(val) {
+	selectedRows.value = val;
+}
+function onPageChange(val) {
+	page.value = val;
+	fetchData();
+}
+function onConfirm() {
+	emit('confirm', selectedRows.value);
+	emit('update:visible', false);
+}
+function onCancel() {
+	emit('update:visible', false);
+}
+watch([visible, page], (v) => {
+	if (visible.value) fetchData();
+});
+</script>

+ 173 - 0
src/views/system/borrow/component/SpecialBorrow/index-back.vue

@@ -0,0 +1,173 @@
+<template>
+	<el-dialog v-model="visible" title="特殊借用申请单" width="75%" :close-on-click-modal="false" @close="onCancel">
+		<el-form :model="form" label-width="110px" label-position="top" :rules="rules" ref="formRef">
+			<el-row :gutter="16">
+				<el-col :span="8">
+					<el-form-item label="借用单编号" prop="application_no">
+						<el-input v-model="form.application_no" placeholder="自动生成" disabled />
+					</el-form-item>
+				</el-col>
+				<el-col :span="8">
+					<el-form-item label="借用人" prop="borrower_name">
+						<el-input v-model="form.borrower_name" placeholder="请输入借用人" disabled />
+					</el-form-item>
+				</el-col>
+				<el-col :span="8">
+					<el-form-item label="学号/工号" prop="user_code">
+						<el-input v-model="form.user_code" placeholder="请输入学号/工号" disabled />
+					</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 />
+					</el-form-item>
+				</el-col>
+				<el-col :span="8">
+					<el-form-item label="借用部门" prop="borrower_dept">
+						<el-input v-model="form.borrower_dept" placeholder="请输入借用部门" disabled />
+					</el-form-item>
+				</el-col>
+				<el-col :span="8">
+					<el-form-item label="预计归还时间" prop="expected_end_time">
+						<el-date-picker v-model="form.expected_end_time" type="datetime" placeholder="请选择预计归还时间" style="width: 100%" />
+					</el-form-item>
+				</el-col>
+				<el-col :span="4">
+					<el-form-item label="个人/团队" prop="team_type">
+						<el-select v-model="form.team_type" placeholder="请选择">
+							<el-option label="个人" :value="0" />
+							<el-option label="团队" :value="1" />
+						</el-select>
+					</el-form-item>
+				</el-col>
+				<el-col :span="4">
+					<el-form-item label="团队人数" prop="team_members_count">
+						<el-input v-model="form.team_members_count" placeholder="请输入" />
+					</el-form-item>
+				</el-col>
+				<el-col :span="16">
+					<el-form-item label="团队其他人员名单" prop="team_members">
+						<el-input v-model="form.team_members" placeholder="请输入团队其他人员名单" />
+					</el-form-item>
+				</el-col>
+				<el-col :span="24">
+					<el-form-item label="借用原因" prop="purpose">
+						<el-input v-model="form.purpose" type="textarea" placeholder="请输入借用原因" />
+					</el-form-item>
+				</el-col>
+				<el-col :span="24">
+					<el-form-item label="备注" prop="applicant_remark">
+						<el-input v-model="form.applicant_remark" type="textarea" placeholder="请输入备注" />
+					</el-form-item>
+				</el-col>
+			</el-row>
+			<div style="margin: 16px 0 8px 0; font-weight: bold">借用列表</div>
+			<el-table :data="form.items" border style="width: 100%; margin-bottom: 12px">
+				<el-table-column type="index" label="序号" width="60" />
+				<el-table-column prop="device_name" label="设备分类" />
+				<el-table-column prop="quantity" label="借用数量">
+					<template #default="{ row }">
+						<el-input v-model="row.quantity" placeholder="请输入" />
+					</template>
+				</el-table-column>
+				<el-table-column prop="location" label="存放仓库" />
+				<el-table-column label="操作" width="80">
+					<template #default="{ row, $index }">
+						<el-button type="text" style="color: red" @click="removeItem($index)">移除</el-button>
+					</template>
+				</el-table-column>
+			</el-table>
+			<el-button type="primary" @click="addItem">添加设备</el-button>
+			<div style="margin: 16px 0 8px 0; font-weight: bold">配件信息</div>
+			<el-input v-model="form.accessory_info" placeholder="请输入配件信息" />
+			<div style="margin: 16px 0 8px 0; font-weight: bold">附件</div>
+			<el-upload action="#" list-type="text">
+				<el-button type="primary">点击或拖拽上传</el-button>
+			</el-upload>
+		</el-form>
+		<template #footer>
+			<el-button @click="onCancel">关闭</el-button>
+			<el-button type="primary" @click="onSubmit">提交</el-button>
+		</template>
+		<SelectDeviceDialog v-model:visible="showSelectDeviceDialog" @confirm="onDeviceSelected" />
+	</el-dialog>
+</template>
+
+<script setup lang="ts">
+import { ref, watch, defineProps, defineEmits, onMounted } from 'vue';
+import SelectDeviceDialog from '../CommonBorrow/SelectDeviceDialog/index.vue';
+const props = defineProps<{ visible: boolean; modelValue?: any }>();
+const emit = defineEmits(['update:visible', 'update:modelValue', 'submit']);
+const visible = ref(props.visible);
+const formRef = ref();
+
+const form = ref({
+	application_no: '',
+	borrower_name: '',
+	emergency_phone: '',
+	user_code: '',
+	borrower_dept: '',
+	expected_end_time: '',
+	team_type: 0,
+	team_members_count: '',
+	team_members: '',
+	purpose: '',
+	applicant_remark: '',
+	items: [],
+	accessory_info: '',
+});
+const showSelectDeviceDialog = ref(false);
+
+// 自动填充用户信息
+onMounted(() => {
+	try {
+		const userInfo = JSON.parse(sessionStorage.getItem('userInfo') || '{}');
+		if (userInfo) {
+			form.value.borrower_name = userInfo.username || '';
+			form.value.user_code = userInfo.dept_info?.dept_id || '';
+			form.value.emergency_phone = userInfo.mobile || '';
+			form.value.borrower_dept = userInfo.dept_info?.dept_name || '';
+		}
+	} catch (e) {}
+});
+
+watch(
+	() => props.visible,
+	(v) => (visible.value = v)
+);
+watch(
+	() => props.modelValue,
+	(v) => {
+		if (v) Object.assign(form.value, v);
+	}
+);
+
+function addItem() {
+	showSelectDeviceDialog.value = true;
+}
+function onDeviceSelected(devices) {
+	form.value.items.push(
+		...devices.map((d) => ({
+			device: d.id,
+			device_name: d.name,
+			quantity: 1,
+			location: d.location,
+		}))
+	);
+}
+function removeItem(index) {
+	form.value.items.splice(index, 1);
+}
+function onCancel() {
+	emit('update:visible', false);
+}
+function onSubmit() {
+	formRef.value.validate((valid) => {
+		if (valid) {
+			emit('submit', { ...form.value });
+			emit('update:visible', false);
+		}
+	});
+}
+const rules = {};
+</script>

+ 61 - 30
src/views/system/borrow/component/SpecialBorrow/index.vue

@@ -1,5 +1,14 @@
 <template>
-	<el-dialog v-model="visible" title="特殊借用申请单" width="75%" :close-on-click-modal="false" @close="onCancel">
+	<el-dialog v-model="visible" title="特殊借用" width="75%" :close-on-click-modal="false" @close="onCancel">
+		<!-- <div style="margin-bottom: 16px">
+			<ol style="padding: 10px 30px; margin-bottom: 20px; border: 1px solid #409eff; border-radius: 5px; background: #e6f7ff">
+				<h2>借用须知:</h2>
+				<li>1、申请借用设备时必须本人来办理,借用期间设备由借用人负责保管。禁止转借他人</li>
+				<li>2、如因人为操作不当造成的设备损坏或设备损失,应由借用人按规定赔偿。</li>
+				<li>3、设备需按时归还,如逾期归还,将限制借用资格。</li>
+				<li>4、设备借用一周以内由实验室管理办公室审核,设备借用一周以上或非我院师生借用时还需实验中心领导审核。</li>
+			</ol>
+		</div> -->
 		<el-form :model="form" label-width="110px" label-position="top" :rules="rules" ref="formRef">
 			<el-row :gutter="16">
 				<el-col :span="8">
@@ -8,13 +17,13 @@
 					</el-form-item>
 				</el-col>
 				<el-col :span="8">
-					<el-form-item label="借用人" prop="borrower_name">
-						<el-input v-model="form.borrower_name" placeholder="请输入借用人" disabled />
+					<el-form-item label="借用人" prop="emergency_contact">
+						<el-input v-model="form.emergency_contact" placeholder="请输入借用人" disabled />
 					</el-form-item>
 				</el-col>
 				<el-col :span="8">
-					<el-form-item label="学号/工号" prop="user_code">
-						<el-input v-model="form.user_code" placeholder="请输入学号/工号" disabled />
+					<el-form-item label="学号/工号" prop="app_user_borrower">
+						<el-input v-model="form.app_user_borrower" placeholder="请输入学号/工号" disabled />
 					</el-form-item>
 				</el-col>
 				<el-col :span="8">
@@ -40,12 +49,12 @@
 						</el-select>
 					</el-form-item>
 				</el-col>
-				<el-col :span="4">
+				<el-col :span="4" v-if="form.team_type===1">
 					<el-form-item label="团队人数" prop="team_members_count">
 						<el-input v-model="form.team_members_count" placeholder="请输入" />
 					</el-form-item>
 				</el-col>
-				<el-col :span="16">
+				<el-col :span="16" v-if="form.team_type===1">
 					<el-form-item label="团队其他人员名单" prop="team_members">
 						<el-input v-model="form.team_members" placeholder="请输入团队其他人员名单" />
 					</el-form-item>
@@ -55,21 +64,24 @@
 						<el-input v-model="form.purpose" type="textarea" placeholder="请输入借用原因" />
 					</el-form-item>
 				</el-col>
-				<el-col :span="24">
+				<el-col :span="4">
+					<el-form-item label="审批人" prop="applicant_remark">
+						<el-select v-model="form.applicant_remark_type" placeholder="请选择">
+							<el-option label="管理员" value="1"/>
+						</el-select>
+					</el-form-item>
+				</el-col>
+				<el-col :span="20">
 					<el-form-item label="备注" prop="applicant_remark">
-						<el-input v-model="form.applicant_remark" type="textarea" placeholder="请输入备注" />
+						<el-input v-model="form.applicant_remark" placeholder="请输入备注" />
 					</el-form-item>
 				</el-col>
 			</el-row>
-			<div style="margin: 16px 0 8px 0; font-weight: bold">借用列表</div>
+			<div style="margin: 16px 0 8px 0; font-weight: bold">借用明细表</div>
 			<el-table :data="form.items" border style="width: 100%; margin-bottom: 12px">
 				<el-table-column type="index" label="序号" width="60" />
-				<el-table-column prop="device_name" label="设备分类" />
-				<el-table-column prop="quantity" label="借用数量">
-					<template #default="{ row }">
-						<el-input v-model="row.quantity" placeholder="请输入" />
-					</template>
-				</el-table-column>
+				<el-table-column prop="remark" label="设备分类" />
+				<el-table-column prop="quantity" label="借用数量" />
 				<el-table-column prop="location" label="存放仓库" />
 				<el-table-column label="操作" width="80">
 					<template #default="{ row, $index }">
@@ -89,13 +101,20 @@
 			<el-button @click="onCancel">关闭</el-button>
 			<el-button type="primary" @click="onSubmit">提交</el-button>
 		</template>
-		<SelectDeviceDialog v-model:visible="showSelectDeviceDialog" @confirm="onDeviceSelected" />
 	</el-dialog>
+	<SelectDeviceDialog v-model:visible="showSelectDeviceDialog" @confirm="onDeviceSelected" />
 </template>
 
 <script setup lang="ts">
 import { ref, watch, defineProps, defineEmits, onMounted } from 'vue';
-import SelectDeviceDialog from '../CommonBorrow/SelectDeviceDialog/index.vue';
+import SelectDeviceDialog from './SelectDeviceDialog/index.vue';
+import dayjs from 'dayjs';
+
+const now = dayjs().format('YYYY-MM-DD HH:mm:ss');
+
+
+
+
 const props = defineProps<{ visible: boolean; modelValue?: any }>();
 const emit = defineEmits(['update:visible', 'update:modelValue', 'submit']);
 const visible = ref(props.visible);
@@ -103,18 +122,22 @@ const formRef = ref();
 
 const form = ref({
 	application_no: '',
-	borrower_name: '',
+	emergency_contact: '',
 	emergency_phone: '',
-	user_code: '',
-	borrower_dept: '',
-	expected_end_time: '',
+	app_user_borrower: 1,
 	team_type: 0,
-	team_members_count: '',
+	team_members_count: 1,
 	team_members: '',
+	expected_start_time:'',
+	expected_end_time: '',
+	borrower_dept: '',
 	purpose: '',
+	applicant_remark_type:'',
 	applicant_remark: '',
 	items: [],
 	accessory_info: '',
+	borrow_type: 2,
+	return_location:''
 });
 const showSelectDeviceDialog = ref(false);
 
@@ -123,12 +146,14 @@ onMounted(() => {
 	try {
 		const userInfo = JSON.parse(sessionStorage.getItem('userInfo') || '{}');
 		if (userInfo) {
-			form.value.borrower_name = userInfo.username || '';
-			form.value.user_code = userInfo.dept_info?.dept_id || '';
+			form.value.emergency_contact = userInfo.username || '';
+			form.value.app_user_borrower = Number(userInfo.dept_info?.dept_id )|| 1;
 			form.value.emergency_phone = userInfo.mobile || '';
 			form.value.borrower_dept = userInfo.dept_info?.dept_name || '';
 		}
-	} catch (e) {}
+	} catch (e) {
+		/* empty */
+	}
 });
 
 watch(
@@ -146,24 +171,30 @@ function addItem() {
 	showSelectDeviceDialog.value = true;
 }
 function onDeviceSelected(devices) {
+	// 假设 form.value.items 已存在
 	form.value.items.push(
 		...devices.map((d) => ({
 			device: d.id,
-			device_name: d.name,
+			remark: d.category_name,
 			quantity: 1,
-			location: d.location,
+			location: d.warehouse,
 		}))
 	);
 }
-function removeItem(index) {
+function removeItem(index: number) {
 	form.value.items.splice(index, 1);
 }
 function onCancel() {
 	emit('update:visible', false);
 }
 function onSubmit() {
-	formRef.value.validate((valid) => {
+	formRef.value.validate((valid: boolean) => {
 		if (valid) {
+			const firstLocation = form.value.items[0]?.location || '';
+            form.value.return_location = firstLocation;
+			form.value.expected_start_time = now;
+			form.value.expected_end_time = dayjs(form.value.expected_end_time).format('YYYY-MM-DD HH:mm:ss')|| now;
+			form.team_members_count=Number(form.team_members_count)||1;
 			emit('submit', { ...form.value });
 			emit('update:visible', false);
 		}

+ 5 - 1
src/views/system/borrow/index.vue

@@ -21,8 +21,9 @@ import { createCrudOptions } from './crud';
 import BorrowTypeSelect from './component/BorrowTypeSelect/index.vue';
 import CommonBorrow from './component/CommonBorrow/index.vue';
 import ClassroomBorrow from './component/ClassroomBorrow/index.vue';
-import SpecialBorrow from './component/SpecialBorrow/index.vue';
+import SpecialBorrow from './component/SpecialBorrow/index-back.vue';
 import * as api from './api';
+import { ElMessage } from 'element-plus';
 
 const { crudBinding, crudRef, crudExpose } = useFs({ createCrudOptions });
 const showBorrowTypeDialog = ref(false);
@@ -50,6 +51,9 @@ async function handleBorrowSubmit(formData: any) {
 		showCommonBorrowDialog.value = false;
 		// 刷新列表
 		crudRef.value && crudRef.value.doRefresh && crudRef.value.doRefresh();
+		ElMessage.success('保存成功');
+		crudExpose.doRefresh();
+
 	} catch (e) {
 		// 错误处理
 		console.error('提交失败', e);

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

@@ -414,8 +414,8 @@ async function onSave() {
 		step_order: 1,
 		step_type: String(selectedPassTypes),
 		description:"由指导老师进行初审",
-		approvers: [],  // 指定审核人ID列表,可选
-		approver_roles: [],  // 审核角色ID列表,可选
+		approvers: [1],  // 指定审核人ID列表,可选
+		approver_roles: [1],  // 审核角色ID列表,可选
 		approver_depts: [],  // 审核部门ID列表,可选
 		approval_conditions: {  // 审核条件,可以为空
 			required_fields: [],  // 必填字段