kllay 15 時間 前
コミット
3313efd654

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

@@ -289,7 +289,7 @@ const rules = reactive({
 	is_active:[{ required: true, message: '请输选择是否启用', trigger: 'blur' }],
 	'condition.days': [{ required: true, message: '请输入借用天数', trigger: 'change' }],
 	'condition.roles': [{ required: true, message: '请选择用户角色', trigger: 'change' }],
-	'condition.equipment': [{ required: true, message: '请选择设备标签', trigger: 'change' }],
+	'condition.equipment': [{ required: false, message: '请选择设备标签', trigger: 'change' }],
 	'condition.borrow_types': [{ required: true, message: '请选择借用类型', trigger: 'change' }],
 	'condition.team_type': [{ required: true, message: '请选择借用方式', trigger: 'change' }],
 });

+ 53 - 2
src/views/system/devicemaintenance/crud.tsx

@@ -63,7 +63,7 @@ export const createCrudOptions = function ({ crudExpose,  dialogId,
 					},
 					updateStatus: {
 						text: '修改状态',
-						show: true,
+						show: false,
 						order: 99,
 						type: 'primary',
 						click({ row }) {
@@ -254,6 +254,13 @@ export const createCrudOptions = function ({ crudExpose,  dialogId,
 							return form && form.damage_type === 1;
 						})
 					},
+					editForm:{
+						show:true,
+						component: { placeholder: '请填写维修费用' },
+						rules: [{ required: compute(({ form }) => {
+							return form && form.status === 3;
+						}), message: '请填写维修费用' }],
+					},
 					addForm:{
 						show:false,
 					},
@@ -276,6 +283,13 @@ export const createCrudOptions = function ({ crudExpose,  dialogId,
 						component: { placeholder: '请填写维修人' },
 						rules: [{ required: false, message: '请填写维修人' }],
 					},
+					editForm:{
+						show:true,
+						component: { placeholder: '请填写维修人' },
+						rules: [{ required: compute(({ form }) => {
+							return form && form.status === 2;
+						}), message: '请填写维修人' }],
+					},
 					viewForm:{
 						component: { placeholder: '' },
 						rules: [{ required: true, message: '' }],
@@ -291,6 +305,13 @@ export const createCrudOptions = function ({ crudExpose,  dialogId,
 						component: { placeholder: '请填写维修人联系方式' },
 						rules: [{ required: false, message: '请填写维修人联系方式' }],
 					},
+					editForm:{
+						show:true,
+						component: { placeholder: '请填写维修人联系方式' },
+						rules: [{ required: compute(({ form }) => {
+							return form && form.status === 2;
+						}), message: '请填写维修人联系方式' }],
+					},
 					viewForm:{
 						component: { placeholder: '' },
 						rules: [{ required: true, message: '' }],
@@ -312,8 +333,38 @@ export const createCrudOptions = function ({ crudExpose,  dialogId,
 						rules: [{ required: true, message: '' }],
 					}
 				},
+				status:{
+					title: '维修状态',
+					type: 'dict-select',
+					column: {
+						show:false,
+						minWidth: 120,
+					},
+					dict: dict({
+						data: [
+							{ label: '待维修', value: 1 },
+							{ label: '维修中', value: 2 },
+							{ label: '维修完成', value: 3 },
+						],
+					}),
+					form: {
+						show:false,
+						component: { placeholder: '请选择维修状态' },
+						rules: [{ required: false, message: '请选择维修状态' }],
+					},
+					editForm:{
+						show:true,
+						component: { placeholder: '请选择维修状态' },
+						rules: [{ required: true, message: '请选择维修状态' }],
+					},
+					viewForm:{
+						show:true,
+						component: { placeholder: '' },
+						rules: [{ required: true, message: '' }],
+					}
+				},
 				status_display:{
-					title: '状态',
+					title: '维修状态',
 					type: 'input',
 					column: {
 						minWidth: 120,

+ 3 - 3
src/views/system/screenconsole/component/BorrowRankingList.vue

@@ -19,7 +19,7 @@
             @change="fetchRanking" />
         </el-col>
         <el-col :span="6">
-          <el-select multiple clearable v-model="deviceTagIds" placeholder="标签名" style="margin-left: 30%; width: 140px;"
+          <el-select multiple clearable v-model="deviceTagIds" placeholder="标签名" style="margin-left: 30%; width: 100px;"
             @change="fetchRanking">
             <el-option v-for="item in labelType" :key="item.id" :label="item.name" :value="item.id" >
               <template #default>
@@ -40,11 +40,11 @@
       max-height="500">
       <el-table-column type="index" label="排名" width="60" />
       <el-table-column prop="device_name" label="设备名" />
-      <el-table-column prop="device_name" label="标签名">
+      <!-- <el-table-column prop="device_name" label="标签名">
         <template #default="scope">
           <el-tag v-for="tag in scope.row.device_tags" :key="tag" :type="tag.type">{{ tag.name }}</el-tag>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column prop="device_code" label="设备编号" />
       <el-table-column prop="borrow_count" label="借用次数" />
       <!-- <el-table-column prop="total_quantity" label="累计借用册数" /> -->