From e1ac04b42be89ca26ff5f94c17c4e2eebe52a0a2 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期二, 03 一月 2023 09:52:39 +0800
Subject: [PATCH] Merge branch 'dev1.0' of ssh://42.193.1.25:29418/sccg_ui into dev1.0
---
src/views/operate/disposal/casepool/pool/createUser/vio/index.vue | 268 +++++++++++++++++++++++------------------------------
1 files changed, 118 insertions(+), 150 deletions(-)
diff --git a/src/views/operate/disposal/casepool/pool/createUser/vio/index.vue b/src/views/operate/disposal/casepool/pool/createUser/vio/index.vue
index 7c84c25..deb2a40 100644
--- a/src/views/operate/disposal/casepool/pool/createUser/vio/index.vue
+++ b/src/views/operate/disposal/casepool/pool/createUser/vio/index.vue
@@ -28,7 +28,7 @@
</div>
<div class="user-item">
<!-- 灏忕被鍚嶇О -->
- <el-form-item class="optionItems" label="灏忕被鍚嶇О:" prop="typeId" >
+ <el-form-item class="optionItems" label="灏忕被鍚嶇О:" prop="typeId">
<el-select v-model="vio.typeId" placeholder="璇烽�夋嫨灏忕被鍚嶇О" @change="handleSmallKindChange">
<el-option v-for="item in smallKindList" :key="item.id" :label="item.name"
:value="item.id">
@@ -45,36 +45,26 @@
</el-form-item>
</div>
<!-- 妗堢敱 -->
- <el-form-item class="optionItem" label="妗堢敱:" prop="actionCause">
- <el-select v-model="vio.actionCause" placeholder="璇疯緭鍏ユ鐢�">
- <el-option v-for="item in anYouList" :key="item.id" :label="item.name"
- :value="item.id" >
- </el-option>
- </el-select>
- <!-- <el-input v-model="vio.actionCause" placeholder="璇疯緭鍏ユ鐢�"></el-input> -->
- </el-form-item>
- <!-- 鎵�灞炲尯鍘� -->
- <!-- <el-form-item class="optionItems" label="鎵�灞炲尯鍘�:" prop="status">
- <el-select v-model="vio.type" placeholder="璇烽�夋嫨鎵�灞炲尯鍘�">
- <el-option v-for="item in typeList" :key="item.name" :label="item.name" :value="item.value"
- :disabled="item.disabled">
+ <el-form-item class="optionItem anyou" label="妗堢敱:" prop="actionCause">
+ <el-select v-model="vio.actionCause" placeholder="璇疯緭鍏ユ鐢�" filterable @blur="selectBlur">
+ <el-option v-for="item in anYouList" :key="item.id" :label="item.name" :value="item.name">
</el-option>
</el-select>
- </el-form-item> -->
+ </el-form-item>
<div class="user-item">
<!-- 鎵�灞炶閬� -->
<el-form-item class="optionItems" label="鎵�灞炶閬�:" prop="streetId">
<el-select v-model="vio.streetId" placeholder="璇烽�夋嫨鎵�灞炶閬�" @change="handleStreet">
- <el-option v-for="item in streetList" :key="item.id" :label="item.name" :value="item.id"
- :disabled="item.disabled">
+ <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="vio.communityId" placeholder="璇烽�夋嫨鎵�灞炵ぞ鍖�">
- <el-option v-for="item in communityList" :key="item.id" :label="item.name"
- :value="item.id" :disabled="item.disabled">
+ <el-option v-for="item in communityList" :key="item.id" :label="item.regionName"
+ :value="item.id" >
</el-option>
</el-select>
</el-form-item>
@@ -93,8 +83,9 @@
</el-form-item>
<!-- 鍏宠仈鍟嗛摵鍚嶇О -->
<el-form-item class="optionItems" label="鍏宠仈鍟嗛摵鍚嶇О:" prop="shopName">
- <el-input placeholder="璇峰～鍐欏叧鑱斿晢閾哄悕绉�" v-model="vio.shopName"
- :disabled="vio.linkShop === 1 ?false : true"></el-input>
+ <el-select v-model="vio.shopName" :disabled="vio.linkShop === 0" placeholder="璇峰～鍐欏叧鑱斿晢閾哄悕绉�">
+ <el-option v-for="store in storeList" :key="store.id" :value="store.id" :label="store.storeName"></el-option>
+ </el-select>
</el-form-item>
</div>
<!-- 濉啓杞︾墝鍙� -->
@@ -107,11 +98,18 @@
v-model="vio.description">
</el-input>
</el-form-item>
- <!-- 鎶ヨ鏃堕棿 -->
- <el-form-item class="optionItems" label="鎶ヨ鏃堕棿:" prop="alarmTime">
- <el-date-picker v-model="vio.alarmTime" type="datetime" placeholder="閫夋嫨鎶ヨ鏃堕棿">
- </el-date-picker>
- </el-form-item>
+ <div class="user-item">
+ <!-- 鎶ヨ鏃堕棿 -->
+ <el-form-item class="optionItems" label="鎶ヨ鏃堕棿:" prop="alarmTime">
+ <el-date-picker v-model="vio.alarmTime" type="datetime" placeholder="閫夋嫨鎶ヨ鏃堕棿">
+ </el-date-picker>
+ </el-form-item>
+ <!-- 璋冨害鏃堕檺 -->
+ <el-form-item class="optionItems" label="璋冨害鏃堕檺:" prop="limitTime">
+ <el-date-picker v-model="vio.limitTime" type="datetime" placeholder="閫夋嫨璋冨害鏃堕檺">
+ </el-date-picker>
+ </el-form-item>
+ </div>
<!-- 濉啓鍙嶆槧浜轰俊鎭� -->
<el-form-item class="optionItems" label="濉啓鍙嶆槧浜轰俊鎭�">
</el-form-item>
@@ -141,7 +139,10 @@
</template>
<script>
import MyMap from '@/components/map'
-import { validateName, validatePhone, validateCarNum } from '@/utils/validate'
+import { validateName, validatePhone, validateCarNum, validateCardId } from '@/utils/validate'
+import { getTypeList } from '@/utils/helper'
+import { parseTime } from "@/utils/index"
+import { getStoreInfoList } from "@/api/operate/storeManagement";
export default {
components: {
MyMap
@@ -210,34 +211,23 @@
callback(new Error('鎶ヨ鏃堕棿涓嶈兘涓虹┖'))
}
}
- const checkCarNumber = (rule, value, callback) => {
- if (value) {
- if (validateCarNum(value)) {
- callback();
- } else {
- callback(new Error('璇疯緭鍏ユ纭殑杞︾墝鍙�'));
- }
- } else {
- callback(new Error("杞︾墝鍙蜂笉鑳戒负绌�"))
- }
- }
const checkName = (rule, value, callback) => {
if (value) {
- validateName(value) ? callback():callback(new Error('璇疯緭鍏ユ纭殑濮撳悕'))
+ validateName(value) ? callback() : callback(new Error('璇疯緭鍏ユ纭殑濮撳悕'))
} else {
callback()
}
}
const checkCardId = (rule, value, callback) => {
if (value) {
- callback();
+ validateCardId(value) ? callback() : callback(new Error('璇疯緭鍏ユ纭殑韬唤璇佸彿鐮�'))
} else {
callback()
}
}
const checkPhone = (rule, value, callback) => {
if (value) {
- validatePhone(value) ? callback():callback(new Error('璇疯緭鍏ユ纭殑鎵嬫満鍙�'));
+ validatePhone(value) ? callback() : callback(new Error('璇疯緭鍏ユ纭殑鎵嬫満鍙�'));
} else {
callback()
}
@@ -246,18 +236,24 @@
if (value) {
callback();
} else {
- if(this.vio.linkShop===1){
+ if (this.vio.linkShop === 1) {
callback(new Error('鍏宠仈鍟嗛摵鍚嶅瓧涓嶈兘涓虹┖'));
- }else{
+ } else {
callback();
}
+ }
+ }
+ const checkLimit = (rule, value, callback) => {
+ if (value) {
+ callback();
+ } else {
+ callback(new Error('璋冨害鏃堕檺鏃堕棿涓嶈兘涓虹┖'))
}
}
return {
vio: {
actionCause: "",//妗堢敱
carNumber: "",//杞︾墝鍙�
- // category:1,//1:杩濊2:杩濆缓
categoryId: '',//澶х被
communityId: '',//鎵�灞炵ぞ鍖�
description: '',//闂鎻忚堪
@@ -270,19 +266,14 @@
streetId: '',//鎵�灞炶閬�
typeId: '',//灏忕被
gradeId: '',//妗堜欢绛夌骇
- alarmTime: ''
+ alarmTime: '',
+ limitTime: '',//璋冨害鏃堕檺
},
createRoleRules: {
//妗堢敱
actionCause: [
{
required: true, trigger: 'blur', validator: checkCause,
- }
- ],
- //杞︾墝鍙�
- carNumber: [
- {
- required: true, trigger: 'blur', validator: checkCarNumber
}
],
//澶х被
@@ -303,23 +294,23 @@
required: true, trigger: 'blur', validator: checkDesc
}
],
- informant:[
+ informant: [
{
required: false, trigger: 'blur', validator: checkName
}
],
- informantIdCard:[
+ informantIdCard: [
{
required: false, trigger: 'blur', validator: checkCardId
}
],
- informantPhoneCode:[
+ informantPhoneCode: [
{
required: false, trigger: 'blur', validator: checkPhone
}
],
// linkShop:0,//鏄惁鍏宠仈鍟嗛摵(0鍚�1鏄�)
- shopName:[
+ shopName: [
{
required: false, trigger: 'blur', validator: checkLink
}
@@ -352,6 +343,11 @@
{
required: true, trigger: 'change', validator: checkDate
}
+ ],
+ limitTime: [
+ {
+ required: true, trigger: 'change', validator: checkLimit
+ }
]
},
@@ -370,43 +366,43 @@
],
streetList: [],
communityList: [],
- anYouList:[],
+ anYouList: [],
+ storeList: []
}
},
created() {
- const { setBigKindList,getStreetList,getEventLevel } = this;
- console.log(this.mytype);
+ const { setBigKindList, getStreetList, getEventLevel } = this;
this.vio.category = this.mytype + 1;
setBigKindList();
- getStreetList();
+ getStreetList(0);
getEventLevel();
+ this.getShopList();
},
methods: {
handleStop() {
this.refresh();
},
// 璁剧疆澶х被
- async setBigKindList(){
- this.bigKindList = await this.getBigKind();
+ async setBigKindList() {
+ this.bigKindList = await this.getBigKind();
},
// 璁剧疆灏忕被
- async setSmallKindList(id){
+ async setSmallKindList(id) {
let arr = await this.getSmallKind();
- this.smallKindList = arr.filter(item=>{
- if(item.parentId===id){
+ this.smallKindList = arr.filter(item => {
+ if (item.parentId === id) {
return item;
}
})
},
// 璁剧疆妗堢敱
- async setAnYouList(id){
+ async setAnYouList(id) {
let arr = await this.getAnYouList();
- this.anYouList = arr.filter(item=>{
- if(item.parentId===id){
+ this.anYouList = arr.filter(item => {
+ if (item.parentId === id) {
return item;
}
})
- console.log(this.anYouList);
},
// 鏌ヨ澶х被鍒楄〃
async getBigKind() {
@@ -433,14 +429,8 @@
return arr
},
// 鑾峰彇妗堜欢绛夌骇鍒楄〃
- getEventLevel() {
- this.$axios({
- method: 'get',
- url: 'sccg/violations/query/event_type'
- })
- .then(res => {
- this.eventLevelList = res.data;
- })
+ async getEventLevel() {
+ this.eventLevelList = await getTypeList(1, '02');
},
// 鏌ヨ鎵�灞炴鐢�
async getAnYouList() {
@@ -451,7 +441,6 @@
})
.then(res => {
arr = res.data;
- console.log(res);
})
return arr;
},
@@ -460,11 +449,14 @@
this.$refs.user.validate((valid) => {
if (valid) {
const { vio } = this;
- console.log(vio);
this.$axios({
method: 'post',
url: 'sccg/base_case/addition_violation',
- data: vio
+ data: {
+ ...vio,
+ alarmTime: parseTime(vio.alarmTime),
+ limitTime:parseTime(vio.limitTime),
+ }
})
.then(res => {
if (res.code === 200) {
@@ -491,22 +483,25 @@
this.$emit('changeDialog', { flag: false })
},
// 鑾峰彇琛楅亾淇℃伅
- getStreetList() {
- this.$axios({
- method: 'get',
- url: 'sccg/dict/query_Street_type'
+ async getStreetList(id) {
+ let arr
+ await this.$axios({
+ method:'get',
+ url:`sccg/sccg_region/getChildren/${id}`,
})
- .then(res => {
- this.streetList = res.data;
- })
+ .then(res=>{
+ if(res.code === 200){
+ arr = res.data;
+ }
+ })
+ this.streetList = arr;
},
// 琛楅亾鏇存敼
handleStreet(id) {
- console.log(id);
this.vio.communityId = '';
this.$axios({
method: 'get',
- url: 'sccg/dict/query_social_type?id=' + id
+ url: `sccg/sccg_region/getChildren/${id}`
})
.then(res => {
this.communityList = res.data;
@@ -517,16 +512,32 @@
value === 0 ? this.vio.shopName = '' : '';
},
// 澶х被閫変腑
- handleBigKindChange(id){
+ handleBigKindChange(id) {
this.vio.actionCause = '';
this.vio.typeId = '';
this.setSmallKindList(id);
},
// 灏忕被閫変腑
- handleSmallKindChange(id){
+ handleSmallKindChange(id) {
this.vio.actionCause = '';
this.setAnYouList(id);
- }
+ },
+ // 妗堢敱杈撳叆
+ selectBlur(e) {
+ if (e.target.value) {
+ this.vio.actionCause = e.target.value;
+ }
+ },
+
+ getShopList() {
+ getStoreInfoList({ current: 1, size: 100 })
+ .then(({ list }) => {
+ this.storeList = list;
+ })
+ .catch(err => {
+ this.$message.error(err)
+ })
+ }
},
props: ['mytype', 'changeDialog', 'refresh']
}
@@ -537,7 +548,7 @@
padding: 20px 10px 50px;
.input-area {
- flex: 1;
+ flex: 3;
padding: 10px 20px;
.input-header {
@@ -561,19 +572,19 @@
.input-form {
.el-form {
- &::v-deep .el-form-item__label {
- color: #4b9bb7;
- }
+ // &::v-deep .el-form-item__label {
+ // color: #4b9bb7;
+ // }
- &::v-deep .el-input__inner {
- background-color: #09152f;
- border: 1px solid #17324c;
- }
+ // &::v-deep .el-input__inner {
+ // // background-color: #09152f;
+ // border: 1px solid #17324c;
+ // }
- &::v-deep .el-textarea__inner {
- background-color: #09152f;
- border: 1px solid #17324c;
- }
+ // &::v-deep .el-textarea__inner {
+ // // background-color: #09152f;
+ // border: 1px solid #17324c;
+ // }
}
}
@@ -584,55 +595,12 @@
}
.map-area {
- flex: 1;
+ flex: 2;
}
- .not-need {
- color: #4b9bb7;
-
- .not-need__header {
- line-height: 40px;
- }
-
- .my-sp-item {
- display: flex;
-
- .not-item-left,
- .not-item-right {
- display: flex;
-
- .el-input {
- flex: 1;
- }
- }
- }
-
- .not-need-item {
- line-height: 40px;
- margin-bottom: 22px;
- display: flex;
-
- label {
- width: 100px;
- padding-right: 12px;
- text-align: right;
- }
-
- .el-input {
- flex: 1;
- }
-
- .not-need__inner {
- flex: 1;
- line-height: 40px;
- padding: 0 15px;
- border-radius: 4px;
- color: #fff;
- // outline: #409eff solid 1px;
- outline: none;
- background-color: #09152f;
- border: 1px solid #17324c;
- }
+ .anyou {
+ :deep(.el-select) {
+ display: block;
}
}
--
Gitblit v1.8.0