From 5841a771d4455d25adb185b8a0637c9ba498aab2 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期二, 21 十月 2025 15:37:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
admin/src/components/business/OperaJkCabinetWindow.vue | 42 +++++++++++++++++++++++-------------------
1 files changed, 23 insertions(+), 19 deletions(-)
diff --git a/admin/src/components/business/OperaJkCabinetWindow.vue b/admin/src/components/business/OperaJkCabinetWindow.vue
index fe508bb..4548467 100644
--- a/admin/src/components/business/OperaJkCabinetWindow.vue
+++ b/admin/src/components/business/OperaJkCabinetWindow.vue
@@ -32,7 +32,7 @@
v-for="item in memberList"
:key="item.id"
:label="item.name+'-'+item.companyName"
- :value="item.id">
+ :value="Number(item.id)">
</el-option>
</el-select>
</el-form-item>
@@ -60,16 +60,16 @@
v-for="item in memberList"
:key="item.id"
:label="item.name+'-'+item.companyName"
- :value="item.id">
+ :value="Number(item.id)">
</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>
- <el-form-item label="缁忕含搴�" prop="longitude">
+ <el-form-item label="缁忕含搴�" prop="jwd">
<div style="width: 100%; display: flex; align-items: center;">
- <el-input v-model="form.longitude" placeholder="璇疯緭鍏ョ粡绾害" v-trim/>
+ <el-input v-model="form.jwd" placeholder="璇疯緭鍏ョ粡绾害" v-trim/>
<a style="margin-left: 20px; flex-shrink: 0;" href="https://lbs.amap.com/tools/picker" target="_blank">缁忕含搴﹀湪绾挎嬀鍙栧湴鍧�</a>
</div>
</el-form-item>
@@ -85,11 +85,11 @@
<h3 style="margin: 20px 0;">鏌滅粍淇℃伅</h3>
<el-form-item label="鎺掑垪" prop="rowNum">
<div style="width: 100%; display: flex; align-items: center;">
- <el-input v-model="form.rowNum" :disabled="form.id" type="number" placeholder="璇疯緭鍏ユ帓鏁�" v-trim>
+ <el-input v-model="form.rowNum" :disabled="form.id ? true : false" type="number" placeholder="璇疯緭鍏ユ帓鏁�" v-trim>
<template slot="append">鎺�</template>
</el-input>
<span style="margin: 0 20px;">x</span>
- <el-input v-model="form.columnNum" :disabled="form.id" type="number" placeholder="璇疯緭鍏ュ垪鏁�" v-trim>
+ <el-input v-model="form.columnNum" :disabled="form.id ? true : false" type="number" placeholder="璇疯緭鍏ュ垪鏁�" v-trim>
<template slot="append">鍒�</template>
</el-input>
</div>
@@ -110,7 +110,7 @@
</div>
</el-form-item>
<el-form-item label="鎺掑垪椤哄簭" prop="sortType" v-if="form.noType === 1">
- <el-radio-group v-model="form.sortType" :disabled="form.id">
+ <el-radio-group v-model="form.sortType" :disabled="form.id ? true : false">
<el-radio :label="0">浠庡乏寰�鍙�</el-radio>
<el-radio :label="1">浠庝笂鍚戜笅</el-radio>
</el-radio-group>
@@ -123,6 +123,7 @@
import BaseOpera from '@/components/base/BaseOpera'
import GlobalWindow from '@/components/common/GlobalWindow'
import { allList } from '@/api/business/member'
+import { getInfoById } from '@/api/business/jkCabinet'
export default {
name: 'OperaJkCabinetWindow',
extends: BaseOpera,
@@ -145,8 +146,7 @@
authMemberIdList: '',
rowNum: '',
columnNum: '',
- lacation: '',
- longitude: '',
+ jwd: '',
latitude: '',
noType: 0,
noPrefix: '',
@@ -203,21 +203,25 @@
open (title, target) {
this.title = title
this.loadMember()
- this.visible = true
- // 鏂板缓
- if (target == null) {
+ if (target) {
+ getInfoById(target.id)
+ .then(res => {
+ res.managerIdList = res.managerIdList.map(item => Number(item))
+ res.authMemberIdList = res.authMemberIdList.map(item => Number(item))
+ this.$nextTick(() => {
+ for (const key in this.form) {
+ this.form[key] = res[key]
+ }
+ this.visible = true
+ })
+ })
+ } else {
this.$nextTick(() => {
this.$refs.form.resetFields()
this.form[this.configData['field.id']] = null
})
- return
+ this.visible = true
}
- // 缂栬緫
- this.$nextTick(() => {
- for (const key in this.form) {
- this.form[key] = target[key]
- }
- })
},
loadMember () {
allList({
--
Gitblit v1.9.3