From a52129f16bd78bceeae3ee901d3a15d8471b4845 Mon Sep 17 00:00:00 2001
From: odc.xiaohui <xiaohui@Q1>
Date: 星期六, 18 三月 2023 18:36:26 +0800
Subject: [PATCH] Merge branch 'dev1.0' of http://42.193.1.25:9521/r/sccg_ui into dev1.0
---
src/views/operate/disposal/casepool/pool/createUser/vio/index.vue | 78 +++++++++++++++++++-------------------
1 files changed, 39 insertions(+), 39 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 76f4ea6..6c812a8 100644
--- a/src/views/operate/disposal/casepool/pool/createUser/vio/index.vue
+++ b/src/views/operate/disposal/casepool/pool/createUser/vio/index.vue
@@ -37,11 +37,13 @@
</el-form-item>
<!-- 浜嬩欢绛夌骇 -->
<el-form-item class="optionItems" label="浜嬩欢绛夌骇:" prop="gradeId">
- <el-select v-model="vio.gradeId" placeholder="璇烽�夋嫨妗堜欢绛夌骇">
- <el-option v-for="item in eventLevelList" :key="item.id" :label="item.name"
- :value="item.id">
- </el-option>
- </el-select>
+ <el-cascader
+ :show-all-levels="false"
+ v-model="vio.gradeId"
+ :props="{ value: 'id',label: 'name',children: 'children',emitPath:false}"
+ :options="eventLevelList"
+ ></el-cascader>
+
</el-form-item>
</div>
<!-- 妗堢敱 -->
@@ -83,8 +85,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>
<!-- 濉啓杞︾墝鍙� -->
@@ -137,10 +140,12 @@
</div>
</template>
<script>
-import MyMap from '@/components/map'
+// import MyMap from "@/components/map";
+import MyMap from "@/components/map/leafletMap.vue";
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
@@ -209,17 +214,6 @@
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('璇疯緭鍏ユ纭殑濮撳悕'))
@@ -263,7 +257,6 @@
vio: {
actionCause: "",//妗堢敱
carNumber: "",//杞︾墝鍙�
- // category:1,//1:杩濊2:杩濆缓
categoryId: '',//澶х被
communityId: '',//鎵�灞炵ぞ鍖�
description: '',//闂鎻忚堪
@@ -286,12 +279,6 @@
required: true, trigger: 'blur', validator: checkCause,
}
],
- // //杞︾墝鍙�
- // carNumber: [
- // {
- // required: true, trigger: 'blur', validator: checkCarNumber
- // }
- // ],
//澶х被
categoryId: [
{
@@ -383,6 +370,7 @@
streetList: [],
communityList: [],
anYouList: [],
+ storeList: []
}
},
created() {
@@ -391,6 +379,7 @@
setBigKindList();
getStreetList(0);
getEventLevel();
+ this.getShopList();
},
methods: {
handleStop() {
@@ -460,6 +449,7 @@
},
// 鎻愪氦娉ㄥ唽淇℃伅
handleSubmit() {
+ console.log(this.vio)
this.$refs.user.validate((valid) => {
if (valid) {
const { vio } = this;
@@ -541,7 +531,17 @@
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']
}
@@ -576,19 +576,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;
+ // }
}
}
@@ -609,4 +609,4 @@
}
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.8.0