From 25aace375476ad7f73089cac6bfed606828c5371 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 21 十一月 2024 09:04:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/project/components/OperaYwBuildingWindow.vue | 90 +++++++++++++++++++-------------------------
1 files changed, 39 insertions(+), 51 deletions(-)
diff --git a/admin/src/views/project/components/OperaYwBuildingWindow.vue b/admin/src/views/project/components/OperaYwBuildingWindow.vue
index e82f290..2b92f59 100644
--- a/admin/src/views/project/components/OperaYwBuildingWindow.vue
+++ b/admin/src/views/project/components/OperaYwBuildingWindow.vue
@@ -1,64 +1,37 @@
<template>
- <GlobalWindow
- :title="title"
- :visible.sync="visible"
- :confirm-working="isWorking"
- @confirm="confirm"
- >
+ <GlobalWindow :title="title" :visible.sync="visible" :confirm-working="isWorking" @confirm="confirm">
<el-form :model="form" ref="form" :rules="rules">
- <el-form-item label="鍒涘缓浜虹紪鐮�" prop="creator">
- <el-input v-model="form.creator" placeholder="璇疯緭鍏ュ垱寤轰汉缂栫爜" v-trim/>
+ <el-form-item label="鎵�灞為」鐩�" prop="projectId" clearable placeholder="璇烽�夋嫨椤圭洰">
+ <el-select v-model="form.projectId">
+ <el-option v-for="item in projectList" :key="item.id" :label="item.name" :value="item.id"></el-option>
+ </el-select>
</el-form-item>
- <el-form-item label="鍒涘缓鏃堕棿" prop="createDate">
- <el-date-picker v-model="form.createDate" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ュ垱寤烘椂闂�"></el-date-picker>
+ <el-form-item label="妤煎畤鍚嶇О" prop="name">
+ <el-input v-model="form.name" placeholder="璇疯緭鍏ユゼ瀹囧悕绉�" v-trim />
</el-form-item>
- <el-form-item label="鏇存柊浜虹紪鐮�" prop="editor">
- <el-input v-model="form.editor" placeholder="璇疯緭鍏ユ洿鏂颁汉缂栫爜" v-trim/>
+ <el-form-item label="妤煎畤缂栧彿" prop="code">
+ <el-input v-model="form.code" placeholder="璇疯緭鍏ユゼ瀹囩紪鍙�" v-trim />
</el-form-item>
- <el-form-item label="鏇存柊鏃堕棿" prop="editDate">
- <el-date-picker v-model="form.editDate" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ユ洿鏂版椂闂�"></el-date-picker>
+ <el-form-item label="璇︾粏鍦板潃" prop="addr">
+ <el-input v-model="form.addr" placeholder="璇疯緭鍏ヨ缁嗗湴鍧�" v-trim />
</el-form-item>
- <el-form-item label="鏄惁鍒犻櫎0鍚� 1鏄�" prop="isdeleted">
- <el-input v-model="form.isdeleted" placeholder="璇疯緭鍏ユ槸鍚﹀垹闄�0鍚� 1鏄�" v-trim/>
+ <el-form-item label="妤煎畤绠�浠�" prop="remark">
+ <el-input type="textarea" :rows="4" v-model="form.remark" placeholder="璇疯緭鍏�" />
</el-form-item>
- <el-form-item label="鍚嶇О" prop="name">
- <el-input v-model="form.name" placeholder="璇疯緭鍏ュ悕绉�" v-trim/>
+ <el-form-item label="寤虹瓚闈㈢Н(m虏)" prop="area">
+ <el-input v-model="form.area" placeholder="璇疯緭鍏ョ畝鐩撮潰绉�(m虏)" v-trim />
</el-form-item>
- <el-form-item label="澶囨敞" prop="remark">
- <el-input v-model="form.remark" placeholder="璇疯緭鍏ュ娉�" v-trim/>
+ <el-form-item label="浜ф潈闈㈢Н(m虏)" prop="cqArea">
+ <el-input v-model="form.cqArea" placeholder="璇疯緭鍏ヤ骇鏉冮潰绉�(m虏)" v-trim />
</el-form-item>
- <el-form-item label="鐘舵�� 0鍚敤 1绂佺敤" prop="status">
- <el-input v-model="form.status" placeholder="璇疯緭鍏ョ姸鎬� 0鍚敤 1绂佺敤" v-trim/>
- </el-form-item>
- <el-form-item label="鎺掑簭鐮�" prop="sortnum">
- <el-input v-model="form.sortnum" placeholder="璇疯緭鍏ユ帓搴忕爜" v-trim/>
- </el-form-item>
- <el-form-item label="鍥炬爣" prop="imgurl">
- <el-input v-model="form.imgurl" placeholder="璇疯緭鍏ュ浘鏍�" v-trim/>
- </el-form-item>
- <el-form-item label="缂栧彿" prop="code">
- <el-input v-model="form.code" placeholder="璇疯緭鍏ョ紪鍙�" v-trim/>
- </el-form-item>
- <el-form-item label="鍦板潃" prop="addr">
- <el-input v-model="form.addr" placeholder="璇疯緭鍏ュ湴鍧�" v-trim/>
- </el-form-item>
- <el-form-item label="闈㈢Н锛堝钩鏂圭背锛�" prop="area">
- <el-input v-model="form.area" placeholder="璇疯緭鍏ラ潰绉紙骞虫柟绫筹級" v-trim/>
- </el-form-item>
- <el-form-item label="浜ф潈闈㈢Н锛堝钩鏂圭背锛�" prop="cqArea">
- <el-input v-model="form.cqArea" placeholder="璇疯緭鍏ヤ骇鏉冮潰绉紙骞虫柟绫筹級" v-trim/>
- </el-form-item>
- <el-form-item label="鍙闈㈢Н锛堝钩鏂圭背锛�" prop="rentArea">
- <el-input v-model="form.rentArea" placeholder="璇疯緭鍏ュ彲绉熼潰绉紙骞虫柟绫筹級" v-trim/>
+ <el-form-item label="鍙闈㈢Н(m虏)" prop="rentArea">
+ <el-input v-model="form.rentArea" placeholder="璇疯緭鍏ュ彲绉熼潰绉�(m虏)" v-trim />
</el-form-item>
<el-form-item label="鍦颁笂灞傛暟" prop="onFloor">
- <el-input v-model="form.onFloor" placeholder="璇疯緭鍏ュ湴涓婂眰鏁�" v-trim/>
+ <el-input v-model="form.onFloor" placeholder="璇疯緭鍏ュ湴涓婂眰鏁�" v-trim />
</el-form-item>
<el-form-item label="鍦颁笅灞傛暟" prop="underFloor">
- <el-input v-model="form.underFloor" placeholder="璇疯緭鍏ュ湴涓嬪眰鏁�" v-trim/>
- </el-form-item>
- <el-form-item label="鎵�灞為」鐩紪鐮侊紙鍏宠仈yw_project)" prop="projectId">
- <el-input v-model="form.projectId" placeholder="璇疯緭鍏ユ墍灞為」鐩紪鐮侊紙鍏宠仈yw_project)" v-trim/>
+ <el-input v-model="form.underFloor" placeholder="璇疯緭鍏ュ湴涓嬪眰鏁�" v-trim />
</el-form-item>
</el-form>
</GlobalWindow>
@@ -67,11 +40,12 @@
<script>
import BaseOpera from '@/components/base/BaseOpera'
import GlobalWindow from '@/components/common/GlobalWindow'
+import { getProjectList } from '@/api/project/ywProject'
export default {
name: 'OperaYwBuildingWindow',
extends: BaseOpera,
components: { GlobalWindow },
- data () {
+ data() {
return {
// 琛ㄥ崟鏁版嵁
form: {
@@ -97,14 +71,28 @@
},
// 楠岃瘉瑙勫垯
rules: {
- }
+ },
+ projectList: [],
+ rules: {
+ projectId: [{ required: true, message: '璇烽�夋嫨椤圭洰鍚嶇О' }],
+ name: [{ required: true, message: '璇疯緭鍏ユゼ瀹囧悕绉�' }],
+ area: [{ required: true, message: '璇疯緭鍏ュ缓绛戦潰绉�' }],
+ cqArea: [{ required: true, message: '璇疯緭鍏ヤ骇鏉冮潰绉�' }],
+ },
}
},
- created () {
+ created() {
this.config({
api: '/project/ywBuilding',
'field.id': 'id'
})
+ },
+ methods: {
+ getProject() {
+ getProjectList({}).then(res => {
+ this.projectList = res || []
+ })
+ }
}
}
</script>
--
Gitblit v1.9.3