From b0363e2c04f6ef825f8dffc46e318af762941dac Mon Sep 17 00:00:00 2001
From: luobisheng <727299681@qq.com>
Date: 星期五, 09 十二月 2022 14:13:35 +0800
Subject: [PATCH] 关联商铺修改，社区街道参数修改
---
src/views/systemSetting/device/point/index.vue | 5 ++---
src/views/operate/disposal/casepool/pool/createUser/vio/index.vue | 38 +++++++++++++++++---------------------
src/views/video/index.vue | 4 ++--
src/views/layout/components/Header/index.vue | 5 +----
src/views/systemSetting/device/grid/components/main/index.vue | 2 --
5 files changed, 22 insertions(+), 32 deletions(-)
diff --git a/src/views/layout/components/Header/index.vue b/src/views/layout/components/Header/index.vue
index dde7c97..eb4f6c5 100644
--- a/src/views/layout/components/Header/index.vue
+++ b/src/views/layout/components/Header/index.vue
@@ -9,10 +9,7 @@
</div>
<!-- 鍙充晶鑿滃崟 -->
<div class="header-right">
- <!-- 鎼滅储妗� -->
- <div class="menu-right__item search">
- <el-input suffix-icon="el-icon-search" v-model="keyword" placeholder="璇疯緭鍏ユ悳绱㈠唴瀹�"></el-input>
- </div>
+ <div class="menu-right__item search"></div>
<!-- 鐧诲綍鐢ㄦ埛 -->
<div class="menu-right__item user" @mousemove="flag.user = true" @mouseleave="flag.user = false">
<el-avatar :size="20" :src="user.user.icon" v-if="user.user.icon"></el-avatar>
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..46aa84e 100644
--- a/src/views/operate/disposal/casepool/pool/createUser/vio/index.vue
+++ b/src/views/operate/disposal/casepool/pool/createUser/vio/index.vue
@@ -83,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>
<!-- 濉啓杞︾墝鍙� -->
@@ -141,6 +142,7 @@
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 +211,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 +254,6 @@
vio: {
actionCause: "",//妗堢敱
carNumber: "",//杞︾墝鍙�
- // category:1,//1:杩濊2:杩濆缓
categoryId: '',//澶х被
communityId: '',//鎵�灞炵ぞ鍖�
description: '',//闂鎻忚堪
@@ -286,12 +276,6 @@
required: true, trigger: 'blur', validator: checkCause,
}
],
- // //杞︾墝鍙�
- // carNumber: [
- // {
- // required: true, trigger: 'blur', validator: checkCarNumber
- // }
- // ],
//澶х被
categoryId: [
{
@@ -383,6 +367,7 @@
streetList: [],
communityList: [],
anYouList: [],
+ storeList: []
}
},
created() {
@@ -391,6 +376,7 @@
setBigKindList();
getStreetList(0);
getEventLevel();
+ this.getShopList();
},
methods: {
handleStop() {
@@ -541,7 +527,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']
}
diff --git a/src/views/systemSetting/device/grid/components/main/index.vue b/src/views/systemSetting/device/grid/components/main/index.vue
index 9317de6..77560a4 100644
--- a/src/views/systemSetting/device/grid/components/main/index.vue
+++ b/src/views/systemSetting/device/grid/components/main/index.vue
@@ -25,8 +25,6 @@
<span>{{filterRole(scope.row.roles)}}</span>
</template>
</el-table-column>
- <!-- <el-table-column prop="departName" label="鎵�灞為儴闂�" min-width="8">
- </el-table-column> -->
<el-table-column prop="jobTitle" label="鎵�灞炶亴鍔�" min-width="8">
</el-table-column>
<el-table-column prop="createTime" label="鍒涘缓鏃堕棿" min-width="10">
diff --git a/src/views/systemSetting/device/point/index.vue b/src/views/systemSetting/device/point/index.vue
index d97ee68..ec1b585 100644
--- a/src/views/systemSetting/device/point/index.vue
+++ b/src/views/systemSetting/device/point/index.vue
@@ -171,7 +171,6 @@
::v-deep .el-tree-node__label {
line-height: 30px;
font-size: 14px;
- // color: rgb(75, 155, 183);
}
</style>
<script>
@@ -196,8 +195,8 @@
getVideoPointList(data) {
let communityId, streetId;
if (data) {
- communityId = data.id;
- streetId = data.parentId;
+ communityId = data.parentId;
+ streetId = data.id;
}
videoPoint
.getVideoPointList({
diff --git a/src/views/video/index.vue b/src/views/video/index.vue
index 2d9e95c..371bd3b 100644
--- a/src/views/video/index.vue
+++ b/src/views/video/index.vue
@@ -157,8 +157,8 @@
getVideoPointList(data) {
let communityId, streetId;
if (data) {
- communityId = data.parentId;
- streetId = data.id;
+ communityId = data.id;
+ streetId = data.parentId;
}
videoPoint
.getVideoPointList({
--
Gitblit v1.8.0