From 7298e6cff9ed3e0137398283a96156dadbeabf5b Mon Sep 17 00:00:00 2001
From: “dzb” <2632970487@qq.com>
Date: 星期三, 12 十月 2022 17:07:28 +0800
Subject: [PATCH] 修改bug
---
src/views/operate/disposal/casepool/pool/createUser/ill/index.vue | 187 +++++++++++++++++++++++++++++-----------------
1 files changed, 117 insertions(+), 70 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 0d4cc25..01e246f 100644
--- a/src/views/operate/disposal/casepool/pool/createUser/ill/index.vue
+++ b/src/views/operate/disposal/casepool/pool/createUser/ill/index.vue
@@ -8,45 +8,50 @@
<div class="input-form">
<el-form ref="user" label-width="160px" autoComplete="on" :model="ill" :rules="createillRules"
label-position="right">
- <!-- 闂绫诲瀷
- <el-form-item class="optionItem" label="闂绫诲瀷:" prop="category">
- <el-select v-model="ill.type" placeholder="杩濆缓">
- <el-option v-for="item in typeList" :key="item.name" :label="item.name" :value="item.value"
- :disabled="item.disabled">
- </el-option>
- </el-select>
- </el-form-item> -->
- <!-- 杩濆缓绫诲埆 -->
- <el-form-item class="optionItems" label="杩濆缓绫诲埆:" prop="categoryId">
- <el-select v-model="ill.categoryId" placeholder="璇烽�夋嫨杩濆缓绫诲埆" size="small">
- <el-option v-for="item in bigKindList" :key="item.id" :label="item.name" :value="item.id"
- :disabled="item.disabled">
- </el-option>
- </el-select>
- </el-form-item>
+ <div class="user-item">
+ <!-- 闂绫诲瀷 -->
+ <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"
+ :value="item.value" :disabled="item.disabled">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <!-- 杩濆缓绫诲埆 -->
+ <el-form-item class="optionItems" label="杩濆缓绫诲埆:" prop="categoryId">
+ <el-select v-model="ill.categoryId" placeholder="璇烽�夋嫨杩濆缓绫诲埆" size="small">
+ <el-option v-for="item in bigKindList" :key="item.id" :label="item.name"
+ :value="item.id" :disabled="item.disabled">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </div>
<!-- 褰撲簨浜哄鍚� -->
<el-form-item class="optionItems" label="褰撲簨浜哄鍚�:" prop="partyName">
<el-input placeholder="璇峰～鍐欏綋浜嬩汉濮撳悕" v-model="ill.partyName"></el-input>
</el-form-item>
<!-- 褰撲簨浜鸿韩浠借瘉鍙� -->
<el-form-item class="optionItems" label="褰撲簨浜鸿韩浠借瘉鍙�:" prop="partyIdCard">
- <el-input placeholder="璇峰～鍐欏綋浜嬩汉韬唤璇佸彿" v-model="ill.partyIdCard"></el-input>
+ <el-input placeholder="璇峰～鍐欏綋浜嬩汉韬唤璇佸彿" maxlength="18" v-model="ill.partyIdCard"></el-input>
</el-form-item>
<!-- 褰撲簨浜鸿仈绯荤數璇� -->
<el-form-item class="optionItem" label="褰撲簨浜鸿仈绯荤數璇�:" prop="partyPhone">
- <el-input v-model="ill.partyPhone" placeholder="璇峰～鍐欏綋浜嬩汉鑱旂郴鐢佃瘽"></el-input>
+ <el-input v-model="ill.partyPhone" maxlength="11" placeholder="璇峰～鍐欏綋浜嬩汉鑱旂郴鐢佃瘽"></el-input>
</el-form-item>
- <!-- 杩濆缓鍦扮偣 -->
- <el-form-item class="optionItems" label="杩濆缓鍦扮偣:" prop="site">
- <el-input placeholder="璇峰～鍐欒繚寤哄湴鐐�" v-model="ill.site"></el-input>
- </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>
- </el-select>
- </el-form-item>
+ <div class="user-item">
+ <!-- 杩濆缓鍦扮偣 -->
+ <el-form-item class="optionItems" label="杩濆缓鍦扮偣:" prop="site">
+ <el-input placeholder="璇峰～鍐欒繚寤哄湴鐐�" v-model="ill.site"></el-input>
+ </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>
+ </el-select>
+ </el-form-item>
+ </div>
<!-- 韬唤璇佹鍙嶉潰鐓х墖 -->
<el-form-item class="optionItems" label="韬唤璇佹鍙嶉潰鐓х墖:" prop="positive">
<template>
@@ -88,13 +93,17 @@
<el-form-item class="optionItems" label="杩濆缓鍏蜂綋浣嶇疆:" prop="position">
<el-input placeholder="璇峰～鍐欒繚寤哄叿浣撲綅缃�" v-model="ill.position"></el-input>
</el-form-item>
- <el-form-item class="optionItems" label="杩濇硶寤鸿闀裤�佸銆侀珮:" prop="buildingLength">
- <div class="area">
+ <div class="area">
+ <el-form-item class="optionItems" label="杩濇硶寤鸿闀裤�佸銆侀珮:" prop="buildingLength">
<el-input placeholder="鍗曚綅绫�" v-model="ill.buildingLength"></el-input>
+ </el-form-item>
+ <el-form-item class="optionItems" label-width='0px' prop="buildingWidth">
<el-input placeholder="鍗曚綅绫�" v-model="ill.buildingWidth"></el-input>
+ </el-form-item>
+ <el-form-item class="optionItems" label-width='0px' prop="buildingHigh">
<el-input placeholder="鍗曚綅绫�" v-model="ill.buildingHigh"></el-input>
- </div>
- </el-form-item>
+ </el-form-item>
+ </div>
<el-form-item class="optionItems" label="杩濇硶寤鸿闈㈢Н:" prop="buildingArea">
<el-input placeholder="璇峰～鍐欒繚娉曞缓璁鹃潰绉�" v-model="ill.buildingArea"></el-input>
</el-form-item>
@@ -105,7 +114,7 @@
</div>
<div class="input-footer">
<el-button type="primary" class="confirm" @click="handleUser">纭畾</el-button>
- <el-button class="back">杩斿洖</el-button>
+ <el-button class="back" @click="handleBack">杩斿洖</el-button>
</div>
</div>
<div class="map-area">
@@ -115,6 +124,7 @@
</template>
<script>
import MyMap from '@/components/map'
+import { validateName, validatePhone, validateCardId, validateNum } from '@/utils/validate'
export default {
components: {
MyMap
@@ -122,14 +132,14 @@
data() {
const checkArea = (rule, value, callback) => {
if (value) {
- callback();
+ validateNum(value) ? callback() : callback(new Error('璇疯緭鍏ユ纭殑杩濇硶寤鸿闈㈢Н'))
} else {
callback(new Error('杩濇硶寤鸿闈㈢Н涓嶈兘涓虹┖'))
}
}
const checkHigh = (rule, value, callback) => {
if (value) {
- callback();
+ validateNum(value) ? callback() : callback(new Error('璇疯緭鍏ユ纭殑杩濇硶寤鸿楂樺害'))
} else {
callback(new Error('杩濇硶寤鸿楂樺害涓嶈兘涓虹┖'));
@@ -137,7 +147,7 @@
}
const checkWidth = (rule, value, callback) => {
if (value) {
- callback();
+ validateNum(value) ? callback() : callback(new Error('璇疯緭鍏ユ纭殑杩濇硶寤鸿瀹藉害'))
} else {
callback(new Error('杩濇硶寤鸿瀹藉害涓嶈兘涓虹┖'));
@@ -145,7 +155,7 @@
}
const checkLength = (rule, value, callback) => {
if (value) {
- callback();
+ validateNum(value) ? callback() : callback(new Error('璇疯緭鍏ユ纭殑杩濇硶寤鸿闀垮害'))
} else {
callback(new Error('杩濇硶寤鸿闀垮害涓嶈兘涓虹┖'));
@@ -174,21 +184,21 @@
}
const checkIdCard = (rule, value, callback) => {
if (value) {
- callback();
+ validateCardId(value) ? callback() : callback(new Error('璇疯緭鍏ユ纭殑韬唤璇佸彿鐮�'))
} else {
callback(new Error('褰撲簨浜鸿韩浠借瘉鍙风爜涓嶈兘涓虹┖'));
}
}
const checkName = (rule, value, callback) => {
if (value) {
- callback();
+ validateName(value) ? callback() : callback(new Error('璇疯緭鍏ユ纭殑褰撲簨浜轰俊鎭�'))
} else {
callback(new Error('褰撲簨浜哄鍚嶄笉鑳戒负绌�'));
}
}
const checkPhone = (rule, value, callback) => {
if (value) {
- callback();
+ validatePhone(value) ? callback() : callback(new Error('璇疯緭鍏ユ纭殑鎵嬫満鍙风爜'))
} else {
callback(new Error('褰撲簨浜鸿仈绯荤數璇濅笉鑳戒负绌�'));
}
@@ -228,27 +238,27 @@
}
return {
ill: {
- buildingArea: 2.0,
- buildingHigh: 2.0,
- buildingLength: 2.0,
- buildingWidth: 1.0,
+ buildingArea: '',
+ buildingHigh: '',
+ buildingLength: '',
+ buildingWidth: '',
// category: '',
categoryId: '',
communityId: '',
- materials: "閽㈢瓔",
- partyIdCard: "511025184612310213",
- partyName: "鍗曟暟澶�",
- partyPhone: "17844631885",
- position: "鏂板湴鏂规柊浣庣偣",
+ materials: "",
+ partyIdCard: "",
+ partyName: "",
+ partyPhone: "",
+ position: "",
positive: "",
negative: "",
- site: "鏂板湴鏂�",
+ site: "",
alarmTime: '',
},
createillRules: {
buildingArea: [
{
- required: true, trigger: 'change', validator: checkArea
+ required: true, trigger: 'blur', validator: checkArea
}
],
buildingHigh: [
@@ -331,9 +341,10 @@
}
},
created() {
- const { getBigKind } = this;
+ const { getBigKind, getCommityList } = this;
// this.ill.category = this.mytype + 1;
getBigKind();
+ getCommityList();
},
methods: {
handleUser() {
@@ -380,9 +391,6 @@
}
})
},
- handleStop() {
- this.refresh();
- },
// 鑾峰彇澶х被鍒楄〃
getBigKind() {
this.$axios({
@@ -393,7 +401,6 @@
// console.log(res);
})
},
- // 鑾峰彇琛屾斂鍖哄煙
// 鑾峰彇token
getToken() {
const token = sessionStorage.getItem('token');
@@ -412,9 +419,40 @@
const baseUrl = 'http://140.143.152.226:8410/';
console.log(res);
this.ill.negative = baseUrl + res.data.url1;
+ },
+ // 鏌ヨ绀惧尯
+ getCommityList() {
+ this.$axios({
+ method: 'get',
+ url: 'sccg/dict/query_type?level=1&typeCode=' + '10'
+ })
+ .then(res => {
+ console.log(res);
+ })
+ },
+ handleBack(){
+ this.$emit('changeDialog', { flag: false });
}
},
- props: ['mytype', 'changeDialog','refresh']
+ watch: {
+ 'ill.buildingLength': {
+ handler(newVal, oldVal) {
+ if (newVal) {
+ this.ill.buildingWidth !== '' && validateNum(newVal) && validateNum(this.ill.buildingWidth) ? this.ill.buildingArea = newVal * this.ill.buildingWidth : '';
+ }
+ },
+ deep: true,
+ },
+ 'ill.buildingWidth': {
+ handler(newVal, oldVal) {
+ if (newVal) {
+ this.ill.buildingLength !== '' && validateNum(newVal) && validateNum(this.ill.buildingLength) ? this.ill.buildingArea = newVal * this.ill.buildingLength : '';
+ }
+ },
+ deep: true,
+ }
+ },
+ props: ['mytype', 'changeDialog', 'refresh']
}
</script>
<style lang="scss" scoped>
@@ -422,8 +460,12 @@
display: flex;
padding: 20px 50px;
+ .user-item {
+ display: flex;
+ }
+
.input-area {
- flex: 1;
+ flex: 3;
padding: 10px 20px;
.input-header {
@@ -439,19 +481,24 @@
line-height: 40px;
}
}
+ .el-form {
+ &::v-deep .el-form-item__label {
+ color: #4b9bb7;
+ }
+ &::v-deep .el-input__inner {
+ background-color: #09152f;
+ border: 1px solid #17324c;
+ }
+
+ &::v-deep .el-textarea__inner {
+ background-color: #09152f;
+ border: 1px solid #17324c;
+ }
+ }
.input-form {
- &::v-deep .el-input__inner {
- background-color: #09152f;
- border: 1px solid #17324c;
- }
-
- &::v-deep .el-textarea__inner {
- background-color: #09152f;
- border: 1px solid #17324c;
- }
-
+
.upload-demo {
position: relative;
@@ -488,7 +535,7 @@
}
.map-area {
- flex: 1;
+ flex: 2;
}
}
</style>
\ No newline at end of file
--
Gitblit v1.8.0