From eda46bf83619297600436e5015fd8977e9974219 Mon Sep 17 00:00:00 2001
From: luobisheng <727299681@qq.com>
Date: 星期五, 04 十一月 2022 15:50:31 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui
---
src/views/operate/disposal/casepool/pool/createUser/ill/index.vue | 89 ++++++++++++++++++++++++++++++++++----------
1 files changed, 69 insertions(+), 20 deletions(-)
diff --git a/src/views/operate/disposal/casepool/pool/createUser/ill/index.vue b/src/views/operate/disposal/casepool/pool/createUser/ill/index.vue
index d9902e3..78e13a9 100644
--- a/src/views/operate/disposal/casepool/pool/createUser/ill/index.vue
+++ b/src/views/operate/disposal/casepool/pool/createUser/ill/index.vue
@@ -12,7 +12,7 @@
<!-- 闂绫诲瀷 -->
<el-form-item class="optionItem" label="闂绫诲瀷:" prop="category">
<el-select v-model="ill.type" placeholder="杩濆缓" disabled>
- <el-option v-for="item in typeList" :key="item.name" :label="item.name"
+ <el-option v-for="item in communityList" :key="item.name" :label="item.name"
:value="item.value" :disabled="item.disabled">
</el-option>
</el-select>
@@ -43,21 +43,31 @@
<el-form-item class="optionItems" label="杩濆缓鍦扮偣:" prop="site">
<el-input placeholder="璇峰～鍐欒繚寤哄湴鐐�" v-model="ill.site"></el-input>
</el-form-item>
+ </div>
+ <div class="user-item">
+ <!-- 鎵�灞炶閬� -->
+ <el-form-item class="optionItems" label="鎵�灞炶閬�:" prop="streetId">
+ <el-select v-model="ill.streetId" placeholder="璇烽�夋嫨鎵�灞炶閬�" @change="handleStreet">
+ <el-option v-for="item in streetList" :key="item.id" :label="item.regionName" :value="item.id"
+ >
+ </el-option>
+ </el-select>
+ </el-form-item>
<!-- 鎵�灞炵ぞ鍖� -->
<el-form-item class="optionItems" label="鎵�灞炵ぞ鍖�:" prop="communityId">
<el-select v-model="ill.communityId" placeholder="璇烽�夋嫨鎵�灞炵ぞ鍖�">
- <el-option v-for="item in typeList" :key="item.name" :label="item.name"
- :value="item.value">
+ <el-option v-for="item in communityList" :key="item.id" :label="item.regionName"
+ :value="item.id">
</el-option>
</el-select>
</el-form-item>
</div>
<!-- 韬唤璇佹鍙嶉潰鐓х墖 -->
- <el-form-item class="optionItems" label="韬唤璇佹鍙嶉潰鐓х墖:" prop="positive">
+ <el-form-item class="optionItems" label="韬唤璇佹銆佸弽闈㈢収鐗�:" prop="positive">
<template>
<div class="idcard">
<el-upload class="upload-demo" :show-file-list="false"
- action="http://42.193.1.25:8082/sccg/file/medias" :headers="getToken()" multiple
+ action="/sccg/file/medias" :headers="getToken()" multiple
:limit="50" :on-success="handleSuccess">
<img v-if="ill.positive === ''"
src="https://axure-file.lanhuapp.com/90466432-c999-4bf0-80b8-ee3f96a2099e__15f765432d579a14b8f6591c100d30e3.svg"
@@ -66,7 +76,7 @@
<img :src="ill.positive" alt="" class="img" v-else>
</el-upload>
<el-upload class="upload-demo" :show-file-list="false"
- action="http://42.193.1.25:8082/sccg/file/medias" :headers="getToken()" multiple
+ action="/sccg/file/medias" :headers="getToken()" multiple
:limit="50" :on-success="handleSuccess2">
<img v-if="ill.negative === '' "
src="https://axure-file.lanhuapp.com/90466432-c999-4bf0-80b8-ee3f96a2099e__15f765432d579a14b8f6591c100d30e3.svg"
@@ -124,6 +134,7 @@
</template>
<script>
import MyMap from '@/components/map'
+import {parseTime} from '@/utils/index'
import { validateName, validatePhone, validateCardId, validateNum } from '@/utils/validate'
export default {
components: {
@@ -236,6 +247,13 @@
callback(new Error('鎶ヨ鏃堕棿涓嶈兘涓虹┖'))
}
}
+ const checkStreet=(rule, value, callback) => {
+ if (value) {
+ callback();
+ } else {
+ callback(new Error('鎵�灞炶閬撲笉鑳戒负绌�'))
+ }
+ }
return {
ill: {
buildingArea: '',
@@ -325,23 +343,23 @@
{
required: true, trigger: 'change', validator: checkDate
}
- ]
+ ],
+ streetId: [
+ {
+ required: true, trigger: 'change', validator: checkStreet
+ }
+ ],
},
bigKindList: [],
- typeList: [
- {
- name: '绀惧尯1',
- value: 1,
- },
- {
- name: '绀惧尯2',
- value: 2,
- }
+ communityList: [
],
+ streetList: [],
}
},
created() {
- const { getBigKind, getCommityList } = this;
+ const { getBigKind, getCommityList,getStreetList } = this;
+ getStreetList(0);
+
// this.ill.category = this.mytype + 1;
getBigKind();
getCommityList();
@@ -365,7 +383,10 @@
that.$axios({
method: 'post',
url: 'sccg/base_case/addition_illegal_building',
- data: ill,
+ data: {
+ ...ill,
+ alarmTime:parseTime(ill.alarmTime)
+ },
})
.then(res => {
if (res.code === 200) {
@@ -433,6 +454,34 @@
console.log(res);
})
},
+ // 鑾峰彇琛楅亾淇℃伅
+ async getStreetList(id) {
+ let arr
+ await this.$axios({
+ method:'get',
+ url:`sccg/sccg_region/getChildren/${id}`,
+ })
+ .then(res=>{
+ if(res.code === 200){
+ arr = res.data;
+ }
+ })
+ this.streetList = arr;
+ },
+ // 琛楅亾鏇存敼
+ handleStreet(id) {
+ console.log(id);
+ this.ill.communityId = '';
+ // this.communityList = getcommunityList(1,'11')
+ this.$axios({
+ method: 'get',
+ url: `sccg/sccg_region/getChildren/${id}`
+ })
+ .then(res => {
+ console.log(res.data)
+ this.communityList = res.data;
+ })
+ },
handleBack(){
this.$emit('changeDialog', { flag: false });
}
@@ -461,7 +510,7 @@
<style lang="scss" scoped>
.ill {
display: flex;
- padding: 20px 50px;
+ padding: 20px 10px 50px;
.user-item {
display: flex;
@@ -504,7 +553,7 @@
.upload-demo {
position: relative;
-
+ margin-right: 20px;
.text {
position: absolute;
top: 22%;
--
Gitblit v1.8.0