yangg há 1 mês atrás
pai
commit
f0a8000b72

+ 3 - 0
src/views/system/borrow/component/CollectEquipment/SelectDeviceDialog/index.vue

@@ -78,6 +78,9 @@ async function fetchData(resetPage = false) {
             warehouse: `${warehouseMap.value[device.warehouse] || `ID:${device.warehouse}`} (${device.available_quantity})`
         }));
         
+        // 过滤掉可用数量为0的设备
+        devices = devices.filter(device => device.available_quantity > 0);
+        
         // 如果有deviceIds,只显示指定的设备
         if (props.deviceIds && props.deviceIds.length > 0) {
             devices = devices.filter(device => props.deviceIds?.includes(device.id));

+ 10 - 4
src/views/system/borrow/component/CollectEquipment/index.vue

@@ -144,7 +144,7 @@
                       :on-remove="handleRemoves"
                       :file-list="attachmentFileList"
                     >
-                      <i class="el-icon-plus"></i>
+                    <el-icon><Plus /></el-icon>
                     </el-upload>
                 </el-form>
                 <!-- 审批信息流程展示 -->
@@ -202,7 +202,7 @@
                         </div>
                         <el-table :data="deviceList" border style="width: 100%">
                             <el-table-column type="index" label="序号" width="60" align="center" />
-                            <el-table-column prop="device_no" label="设备编号" align="center" />
+                            <el-table-column prop="device_code" label="设备编号" align="center" />
                             <el-table-column prop="device_type" label="设备分类" align="center" />
                             <el-table-column prop="device_name" label="设备名称" align="center" />
                             <el-table-column prop="borrow_count" label="借用数量" align="center" width="150">
@@ -271,8 +271,8 @@
                         <el-table :data="returnDeviceList" border style="width: 100%" >
                             <!-- <el-table-column type="selection" width="55" align="center" />@selection-change="handleSelectionChange" -->
                             <el-table-column type="index" label="序号" width="60" align="center" />
-                            <el-table-column prop="device_no" label="设备编号" align="center" />
-                            <el-table-column prop="device_type" label="设备分类" align="center" />
+                            <el-table-column prop="device_code" label="设备编号" align="center" />
+                            <!-- <el-table-column prop="device_type" label="设备分类" align="center" /> -->
                             <el-table-column prop="device_name" label="设备名称" align="center" />
                             <el-table-column prop="borrow_count" label="借用数量" align="center" width="150">
                                 <template #default="{ row }">
@@ -738,6 +738,7 @@ const handleScanSearch = async () => {
                 // 添加新设备到列表
                 deviceList.value.push({
                     device_no: device.id,
+                    device_code: device.device_no,
                     device_type: device.category_name,
                     device_name: device.name || '',
                     borrow_count: 1,
@@ -784,6 +785,7 @@ const handleReturnScanSearch = async () => {
                 // 添加新设备到列表
                 returnDeviceList.value.push({
                     device_no: device.id,
+                    device_code: device.device_no,
                     device_type: device.category_name,
                     device_name: device.name || '',
                     borrow_count: 1,
@@ -793,6 +795,7 @@ const handleReturnScanSearch = async () => {
                     return_status:device.return_status,
                     return_time:device.return_times
                 });
+                console.log("returnDeviceList.value:::",returnDeviceList.value);
                 ElMessage.success('设备已添加到列表');
             }
         } else {
@@ -858,6 +861,7 @@ function onDeviceSelected(devices: Device[]) {
     form.value.items.push(
       ...devices.map((d) => ({
         device: d.id,
+        device_code: d.code,
         remark: d.category_name,
         quantity: 1,
         location: d.warehouse,
@@ -869,6 +873,7 @@ function onDeviceSelected(devices: Device[]) {
     deviceList.value.push(
       ...devices.map(d => ({
         device_no: d.id,
+        device_code: d.code,
         device_type: d.category_name,
         device_name: d.name || '',
         borrow_count: 1,
@@ -1060,6 +1065,7 @@ watch(() => props.modelValue, async (val) => {
                         .filter(item => item.device !== null)
                         .map(item => ({
                             device_no: item.device,
+                            device_code: item.device_code,
                             device_type: item.remark,
                             device_name: item.device_name,
                             borrow_count: item.quantity,

+ 12 - 11
src/views/system/device/crud.tsx

@@ -427,7 +427,7 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 					},
 					viewForm:{
 						component: { placeholder: '' },
-						rules: [{ required: true, message: '' }],
+						rules: [{ required: false, message: '' }],
 					},
 				},	
 				specification: {
@@ -440,7 +440,7 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 					},
 					viewForm:{
 						component: { placeholder: '' },
-						rules: [{ required: true, message: '' }],
+						rules: [{ required: false, message: '' }],
 					},
 				},
 				serial_number:{
@@ -452,7 +452,7 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 					},
 					viewForm:{
 						component: { placeholder: '' },
-						rules: [{ required: true, message: '' }],
+						rules: [{ required: false, message: '' }],
 					},
 				},
 				available_quantity:{
@@ -567,7 +567,7 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 					},
 					viewForm:{
 						component: { placeholder: '' },
-						rules: [{ required: true, message: '' }],
+						rules: [{ required: false, message: '' }],
 					}
 				},
 				purchase_date: {
@@ -584,7 +584,7 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 					},
 					viewForm:{
 						component: { placeholder: '' },
-						rules: [{ required: true, message: '' }],
+						rules: [{ required: false, message: '' }],
 					},
 					
 					valueResolve({ form, value }) {
@@ -612,7 +612,7 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 					},
 					viewForm:{
 						component: { placeholder: '' },
-						rules: [{ required: true, message: '' }],
+						rules: [{ required: false, message: '' }],
 					}
 				},
 				price: {
@@ -626,7 +626,7 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 					},
 					viewForm:{
 						component: { placeholder: '' },
-						rules: [{ required: true, message: '' }],
+						rules: [{ required: false, message: '' }],
 					}
 				},
 				warranty_expiration: {
@@ -657,7 +657,8 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 									);
 							},
 							showHtml: true,
-						}
+						},
+						rules: [{ required: false, message: '请选择质保到期' }]
 					},
 					form: {
 						component: { placeholder: '请选择质保到期' },
@@ -745,7 +746,7 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 					title: '设备标签',
 					search: { show: false },
 					type: 'dict-select',
-					column: { show: false,minWidth: 120 },
+					column: { show: true,minWidth: 120 },
 					dict: dict({
 						url: '/api/system/device_tags/?page=1&limit=100',
 						value: 'id', 
@@ -866,8 +867,8 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 						slots: {
 							label: (scope) => {
 							return (
-								<span style={{ color: scope.hasError ? "red" : "green" }}>
-									<fs-icon icon={"ion:checkmark-circle"} />
+								<span style={{ color: scope.hasError ? "red" : "#409eff" }}>
+									
 									基础信息
 								</span>
 							);

+ 2 - 2
src/views/system/messageCenter/crud.tsx

@@ -38,10 +38,10 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
 		crudOptions: {
 			toolbar:{
                 buttons:{
-                    search:{show:true},
+                    search:{show:false},
                     // 刷新按钮
                     refresh:{
-                        show:true},
+                        show:false},
                     // 紧凑模式
                     compact:{show:false},
                     // 导出按钮

+ 3 - 3
src/views/system/messageCenter/index.vue

@@ -2,10 +2,10 @@
 	<fs-page>
 		<fs-crud ref="crudRef" v-bind="crudBinding">
 			<template #header-middle>
-				<el-tabs v-model="tabActivted" @tab-click="onTabClick">
-					<!-- <el-tab-pane label="我的发布" name="send"></el-tab-pane> -->
+				<!-- <el-tabs v-model="tabActivted" @tab-click="onTabClick">
+					<el-tab-pane label="我的发布" name="send"></el-tab-pane>
 					<el-tab-pane label="我的接收" name="receive"></el-tab-pane>
-				</el-tabs>
+				</el-tabs> -->
 			</template>
 		</fs-crud>
 	</fs-page>

+ 3 - 1
src/views/system/organization/index.vue

@@ -166,7 +166,9 @@ const handleEdit = (data: any) => {
 const handleDelete = async (node: any, data: any) => {
   try {
     await ElMessageBox.confirm('确认删除该组织机构吗?', '提示', {
-      type: 'warning'
+      type: 'warning',
+      confirmButtonText: '确定',
+      cancelButtonText: '取消'
     })
     await DeleteOrganization(data.id)
     ElMessage.success('删除成功')