yangg 10 uur geleden
bovenliggende
commit
2400638fe9

+ 8 - 2
src/views/system/allusers/crud.tsx

@@ -130,10 +130,13 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 					},
 					form: {
 						component: { placeholder: '请填写密码' },
-						rules: [{ required: true, message: '请填写密码' }],
+						
 					},
+					addForm:{ 
+						component:{placeholder: '请填写密码'} ,
+						rules: [{ required: true, message: '请填写密码' }],}, 
 					editForm:{
-						show:false,
+						show:true,
 					},
 					viewForm:{
 						show:false,
@@ -190,6 +193,9 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 				user_type:{
 					title: '用户类型',
 					type: 'dict-select',
+					search:{
+						show:true
+					},
 					column: {
 						minWidth: 120,
 					},

+ 1 - 1
src/views/system/allusers/index.vue

@@ -2,7 +2,7 @@
 	<fs-page>
 		<fs-crud ref="crudRef" v-bind="crudBinding"> 
 			<template #actionbar-right>
-				<el-button type="primary" @click="handleBatchImport">批量导入</el-button>
+				<el-button type="primary" style="margin-left: 12px;" @click="handleBatchImport">批量导入</el-button>
 				<el-button type="primary"  @click="handleDownloadTemplate">下载模板</el-button>
 			</template>
 

+ 1 - 0
src/views/system/borrow/crud.tsx

@@ -6,6 +6,7 @@ const { compute } = useCompute();
 
 export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOptionsRet {
 	const pageRequest = async (query: UserPageQuery) => {
+		console.log(query);
 		return await api.GetList(query);
 	};
 		

+ 8 - 2
src/views/system/borrow/index.vue

@@ -37,6 +37,8 @@ import CollectEquipmentDialog from './component/CollectEquipment/index.vue';
 import SettlementDialog from './component/CollectEquipment/SettlementDialog.vue';
 import * as api from './api';
 import { ElMessage } from 'element-plus';
+import { useRoute } from 'vue-router';
+const route = useRoute();
 
 const { crudBinding, crudRef, crudExpose } = useFs({ createCrudOptions });
 const showBorrowTypeDialog = ref(false);
@@ -169,7 +171,7 @@ onMounted(() => {
 	//重置crudBinding
 	// resetCrudOptions(newOptions);
 	// 刷新
-	crudExpose.doRefresh();
+	/* crudExpose.doRefresh(); */
 	// window.addEventListener('borrow-add', () => {
 	// 	showBorrowTypeDialog.value = true
 	// });
@@ -212,7 +214,11 @@ onMounted(() => {
 		obs.disconnect();
 	});
 	observer.observe(fsActionbar, { childList: true });
-
+	crudExpose.doSearch({
+			form: {
+				status: Number(route.query.status) || ''
+			}
+		});
 
 });
 onBeforeUnmount(() => {

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

@@ -174,11 +174,11 @@
 									<el-icon><Minus /></el-icon> 删除角色
 								</el-button>
 							</div>
-							<div class="addRole" style="width: 100%; display: flex; justify-content: center">
+							<!-- <div class="addRole" style="width: 100%; display: flex; justify-content: center">
 								<el-button type="primary" size="small" @click="addRole(idx)"  :disabled="step.roles.length >= 5" v-if="props.mode !== 'view'">
 									<el-icon><Plus /></el-icon> 添加角色
 								</el-button>
-							</div>
+							</div> -->
 						</div>
 					</el-card>
 					<div class="step-line"></div>

+ 1 - 1
src/views/system/device/crud.tsx

@@ -254,7 +254,7 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 							minWidth: 100,
 							formatter: ({ row }) => {
 								const isBorrowed = row.borrowed_quantity > 0;
-								const label = isBorrowed ? '在借' : '空闲';
+								const label = isBorrowed ? row.total_quantity==0?'不可借':'在借' : row.total_quantity==0?'不可借':'空闲';
 								const color = isBorrowed ? '#FFA500' : '#4CAF50';
 								return h(
 									'span',

+ 1 - 0
src/views/system/deviceclass/crud.tsx

@@ -136,6 +136,7 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 						minWidth: 120,
 					},
 					form: {
+						show:false,
 						component: { placeholder: '请填写设备父级' },
 						rules: [{ required: false, message: '请填写设备父级' }],
 					},

+ 4 - 4
src/views/system/home/index.vue

@@ -31,9 +31,9 @@
 										<div class="wraptit">
 											<span>排名</span><span>设备名称</span><span>设备编号</span><span>借用时长</span>
 										</div>
-										<div class="wrap" style="height: 85%">
+										<div class="wrap" :style="isFullscreen?'height: 85%':'height: 70%'">
 											<ul>
-												<li v-for="(hero, index) in heroData" :key="index" style="width: 100%;">
+												<li v-for="(hero, index) in heroData" :key="index" style="width: 100%;padding:5px 0 ;border-bottom: 1px solid #232e63 ;">
 													<div
 														style="display: flex;justify-content: space-between; width: 100%;">
 														<span>{{ index + 1 }}</span>
@@ -177,9 +177,9 @@
 										<div class="wraptit">
 											<span>排名</span><span>用户名</span><span>学号/工号</span><span>总借用次数</span>
 										</div>
-										<div class="wrap" style="height:85%;">
+										<div class="wrap" :style="isFullscreen?'height: 85%':'height: 61%'">
 											<ul>
-												<li v-for="(hero, index) in userList" :key="index" style="width: 100%;">
+												<li v-for="(hero, index) in userList" :key="index" style="width: 100%;padding:5px 0 ;border-bottom: 1px solid #232e63 ;">
 													<div
 														style="display: flex;justify-content: space-between; width: 100%;">
 														<span>{{ index + 1 }}</span>

+ 6 - 6
src/views/system/screenconsole/component/StatusCards.vue

@@ -12,9 +12,9 @@
           v-for="(item, index) in statusList"
           :key="index"
           :xs="24"
-          :sm="8"
-          :md="8"
-          :lg="8"
+          :sm="12"
+          :md="12"
+          :lg="12"
         >
           <div class="card" @click="handleClick(item)">
             <el-icon :size="40" class="card-icon" :style="{ color: item.color }">
@@ -59,14 +59,14 @@ const router = useRouter()
       case '待审批':
         router.push('/borrow/approval')
         break
-      case '待归还':
-        router.push('/borrow/list')
+      case '已借出':
+        router.push('/borrow/list?status=5')
         break
       case '待维修':
         router.push('/devicemaintenance')
         break
       case '已逾期':
-        router.push('/device/list')
+        router.push('/borrow/list?status=8')
         break
       default:
         console.warn('未知状态:', item.label)

+ 13 - 5
src/views/system/teacherInfor/crud.tsx

@@ -118,10 +118,13 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 					},
 					form: {
 						component: { placeholder: '请填写密码' },
-						rules: [{ required: true, message: '请填写密码' }],
+						
 					},
+					addForm:{ 
+						component:{placeholder: '请填写密码'} ,
+						rules: [{ required: true, message: '请填写密码' }],}, 
 					editForm:{
-						show:false,
+						show:true,
 					},
 					viewForm:{
 						show:false,
@@ -181,12 +184,15 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 				user_type:{
 					title: '用户类型',
 					type: 'dict-select',
+					search: {
+						show: true,
+					},
 					column: {
 						minWidth: 120,
 					},
 					dict: dict({
 						data: [
-							{ label: '学生', value: 0 },
+							/* { label: '学生', value: 0 }, */
 							{ label: '教师', value: 1 },
 							{ label: '校外团体', value: 2 },
 							{ label: '学院领导', value: 3 },
@@ -194,8 +200,8 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 					}),
 					form: {
 						value:1,
-						component: { placeholder: '请填写租户' },
-						rules: [{ required: false, message: '请填写租户' }],
+						component: { placeholder: '请选择用户类型' },
+						rules: [{ required: false, message: '请选择用户类型' }],
 					},
 				},
 				organization:{
@@ -236,6 +242,7 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 						minWidth: 120,
 					},
 					form: {
+						show:false,
 						component: { placeholder: '请填写年级' },
 						rules: [{ required: false, message: '请填写年级' }],
 					},
@@ -251,6 +258,7 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 						minWidth: 120,
 					},
 					form: {
+						show: false,
 						component: { placeholder: '请填写班级' },
 						rules: [{ required: false, message: '请填写班级' }],
 					},