|
@@ -31,12 +31,19 @@
|
|
|
<div class='well' v-for='(detail) in item.data.slice(0,2)' :key='detail.meterbox'>
|
|
|
<div class='well-title'>{{detail.welldes}}</div>
|
|
|
<div class='meterbox'>
|
|
|
- <span class='well-left'>商铺电表箱:</span>
|
|
|
+ <span class='well-left'>商铺电表数:</span>
|
|
|
<span class='value'>{{detail.meterbox}}</span>
|
|
|
</div>
|
|
|
<div class='meterbox'>
|
|
|
- <span class='well-left'>商铺编号:</span>
|
|
|
- <span class='value'>{{detail.shopsnumList}}</span>
|
|
|
+ <span class='well-left'>商铺信息:</span>
|
|
|
+ <span class='value'>
|
|
|
+ <i v-for='(info,infoIndex) in detail.brandList' :key='infoIndex'>
|
|
|
+ {{ info.brandname || 'xxx' }}
|
|
|
+ -
|
|
|
+ {{ info.shopsnumList ?info.shopsnumList.replaceAll(',','、'): 'xxx' }}
|
|
|
+ {{infoIndex===detail.brandList.length-1? '':',' }}
|
|
|
+ </i>
|
|
|
+ </span>
|
|
|
</div>
|
|
|
</div>
|
|
|
|
|
@@ -45,12 +52,19 @@
|
|
|
<div class='well' v-for='(detail) in item.data.slice(2)' :key='detail.meterbox'>
|
|
|
<div class='well-title'>{{detail.welldes}}</div>
|
|
|
<div class='meterbox'>
|
|
|
- <span class='well-left'>商铺电表箱:</span>
|
|
|
+ <span class='well-left'>商铺电表数:</span>
|
|
|
<span class='value'>{{detail.meterbox}}</span>
|
|
|
</div>
|
|
|
<div class='meterbox'>
|
|
|
- <span class='well-left'>商铺编号:</span>
|
|
|
- <span class='value'>{{detail.shopsnumList}}</span>
|
|
|
+ <span class='well-left'>商铺信息:</span>
|
|
|
+ <span class='value'>
|
|
|
+ <i v-for='(info,infoIndex) in detail.brandList' :key='infoIndex'>
|
|
|
+ {{ info.brandname || 'xxx' }}
|
|
|
+ -
|
|
|
+ {{ info.shopsnumList ? info.shopsnumList.replaceAll(',','、') : 'xxx' }}
|
|
|
+ {{ infoIndex === detail.brandList.length - 1 ? '' : ',' }}
|
|
|
+ </i>
|
|
|
+ </span>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
@@ -109,7 +123,7 @@ import { NavBar, Search, List, Cell, Icon, Popup, Button, Empty } from 'vant'
|
|
|
Vue.use(NavBar).use(Search).use(List).use(Cell).use(Icon).use(Popup).use(Button).use(Empty)
|
|
|
import { mapGetters, mapMutations } from 'vuex'
|
|
|
|
|
|
-import { queryShops } from '@/api/equipmentList'
|
|
|
+import { queryShops, queryBrand } from '@/api/equipmentList'
|
|
|
import { sleep } from '@/utils/util'
|
|
|
import { cloneDeep } from 'lodash'
|
|
|
export default {
|
|
@@ -146,7 +160,7 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
computed: {
|
|
|
- ...mapGetters(['plazaId', 'smsxt', 'categoryId', 'floorsArr', 'oldSmsxt', 'oldCategoryId','isGlobal']),
|
|
|
+ ...mapGetters(['plazaId', 'smsxt', 'categoryId', 'floorsArr', 'oldSmsxt', 'oldCategoryId', 'isGlobal']),
|
|
|
},
|
|
|
components: {},
|
|
|
created() {
|
|
@@ -170,7 +184,7 @@ export default {
|
|
|
backPage() {
|
|
|
// 如果是全局搜索进入时,修改smsxt,categoryId为进入全局搜索之前的,
|
|
|
// 并将oldSmsxt, oldCategoryId设置为''
|
|
|
- if(this.isGlobal){
|
|
|
+ if (this.isGlobal) {
|
|
|
this.SETSMSXT(this.oldSmsxt)
|
|
|
this.SETCATEGORYID(this.oldCategoryId)
|
|
|
this.SETOLDCATEGORYID('')
|
|
@@ -197,7 +211,7 @@ export default {
|
|
|
}
|
|
|
// 输入框搜索关键字
|
|
|
if (this.keyword) {
|
|
|
- getParams.keyword = `${this.keyword}:welldes,meterbox,shopsnumList;`
|
|
|
+ getParams.keyword = `${this.keyword}:welldes,meterbox,shopsnumList,brandname;`
|
|
|
}
|
|
|
// 右侧弹窗 筛选楼层的类型
|
|
|
if (this.currentFloor && this.currentFloor !== '全部') {
|
|
@@ -208,7 +222,7 @@ export default {
|
|
|
getParams.keyword = getParams.keyword || ''
|
|
|
getParams.keyword += `${this.currentWellType}:welldes;`
|
|
|
}
|
|
|
- let resData = await queryShops({ getParams })
|
|
|
+ let resData = await queryBrand({ getParams })
|
|
|
if (!resData && !resData?.data) {
|
|
|
this.list = []
|
|
|
return false
|
|
@@ -426,8 +440,10 @@ export default {
|
|
|
.value {
|
|
|
flex: 1;
|
|
|
height: auto;
|
|
|
- word-wrap: break-word;
|
|
|
- word-break: break-all;
|
|
|
+ word-break: break-word;
|
|
|
+ i {
|
|
|
+ padding: 2px 0;
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|