From dd6a43fdbadaaf6d646b3eb2ca0a63f58ed77ea4 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 29 十月 2025 15:56:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
admin/src/components/business/OperaJkCabinetWindow.vue | 39 +++++++++++++++++++++++++++++++++++----
1 files changed, 35 insertions(+), 4 deletions(-)
diff --git a/admin/src/components/business/OperaJkCabinetWindow.vue b/admin/src/components/business/OperaJkCabinetWindow.vue
index 4548467..4d2e072 100644
--- a/admin/src/components/business/OperaJkCabinetWindow.vue
+++ b/admin/src/components/business/OperaJkCabinetWindow.vue
@@ -64,8 +64,8 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="鎵�鍦ㄤ綅缃�" prop="lacation">
- <el-input v-model="form.lacation" placeholder="璇疯緭鍏ユ墍鍦ㄤ綅缃�" v-trim/>
+ <el-form-item label="鎵�鍦ㄤ綅缃�" prop="location">
+ <el-input v-model="form.location" placeholder="璇疯緭鍏ユ墍鍦ㄤ綅缃�" v-trim/>
</el-form-item>
<el-form-item label="缁忕含搴�" prop="jwd">
<div style="width: 100%; display: flex; align-items: center;">
@@ -95,7 +95,7 @@
</div>
</el-form-item>
<el-form-item label="缂栫爜" prop="noType">
- <el-radio-group v-model="form.noType" @change="changeNoType">
+ <el-radio-group v-model="form.noType" :disabled="form.id ? true : false" @change="changeNoType">
<el-radio :label="0">鑷姩缂栫爜</el-radio>
<el-radio :label="1">鎵嬪姩缂栫爜</el-radio>
</el-radio-group>
@@ -129,6 +129,13 @@
extends: BaseOpera,
components: { GlobalWindow },
data () {
+ var validate = (rule, value, callback) => {
+ if (this.form.noType === 1 && this.form.noLength === '' || this.form.noIndex === '') {
+ callback(new Error('浣嶆暟鍜岃捣濮嬬紪鍙蜂笉鑳戒负绌猴紒'));
+ } else {
+ callback();
+ }
+ };
return {
// 琛ㄥ崟鏁版嵁
form: {
@@ -141,6 +148,7 @@
status: 0,
port: '',
managerIdList: '',
+ location: '',
useTime: '',
doubleAuth: 0,
authMemberIdList: '',
@@ -184,7 +192,7 @@
{ required: true, message: '璇烽�夋嫨缂栫爜', trigger: 'blur' }
],
noPrefix: [
- { required: true, message: '璇疯緭鍏ュ墠缂�', trigger: 'blur' }
+ { required: true, validator: validate, trigger: 'blur' }
],
sortType: [
{ required: true, message: '璇疯緭鍏ユ帓鍒楅『搴�', trigger: 'blur' }
@@ -217,6 +225,29 @@
})
} else {
this.$nextTick(() => {
+ this.form = {
+ id: null,
+ code: '',
+ name: '',
+ devId: '',
+ serialNo: '',
+ linkAddr: '',
+ status: 0,
+ port: '',
+ managerIdList: '',
+ useTime: '',
+ doubleAuth: 0,
+ authMemberIdList: '',
+ rowNum: '',
+ columnNum: '',
+ jwd: '',
+ latitude: '',
+ noType: 0,
+ noPrefix: '',
+ noLength: '',
+ noIndex: '',
+ sortType: 0
+ }
this.$refs.form.resetFields()
this.form[this.configData['field.id']] = null
})
--
Gitblit v1.9.3