From a29e0df3c165dfe2ddd825bb340ed480a64865db Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 02 四月 2026 15:02:30 +0800
Subject: [PATCH] 解决冲突
---
admin/src/views/Inspection/components/OperaYwPatrolPointWindow.vue | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/admin/src/views/Inspection/components/OperaYwPatrolPointWindow.vue b/admin/src/views/Inspection/components/OperaYwPatrolPointWindow.vue
index d17b360..2f22cd9 100644
--- a/admin/src/views/Inspection/components/OperaYwPatrolPointWindow.vue
+++ b/admin/src/views/Inspection/components/OperaYwPatrolPointWindow.vue
@@ -1,8 +1,8 @@
<template>
<GlobalWindow :title="title" :visible.sync="visible" width="620px" :confirm-working="isWorking" @confirm="confirm">
<el-form :model="form" ref="form" :rules="rules">
- <el-form-item label="宸℃鐐圭紪鐮�" prop="code">
- <el-input v-model="form.code" placeholder="璇疯緭鍏ュ悕绉�" v-trim />
+ <el-form-item label="宸℃鐐圭紪鐮�" required >
+ <el-input v-model="form.code" disabled readonly placeholder="绯荤粺鑷姩鐢熸垚" v-trim />
</el-form-item>
<el-form-item label="宸℃鐐瑰悕绉�" prop="name">
<el-input v-model="form.name" placeholder="璇疯緭鍏ュ贰妫�鐐瑰悕绉�" v-trim />
@@ -67,7 +67,6 @@
// 楠岃瘉瑙勫垯
rules: {
name: [{ required: true, message: '璇疯緭鍏�' }],
- code: [{ required: true, message: '璇疯緭鍏�' }],
},
isUploading: false,
}
@@ -87,7 +86,7 @@
this.$nextTick(() => {
this.form = {
name: '',
- code: '',
+ // code: '',
content: '',
imgurl: '',
areaId: 0,
@@ -182,4 +181,4 @@
margin-bottom: 20px;
float: left;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3