|
|
@@ -14,15 +14,16 @@
|
|
|
<div class="selectFilter" v-if="tabVal == 1">
|
|
|
<van-dropdown-menu>
|
|
|
<van-dropdown-item
|
|
|
- v-model="storeType"
|
|
|
+ v-model="approvalStatus"
|
|
|
:title="storeTypeTitle"
|
|
|
:options="typeOption"
|
|
|
@change="storeTypeChange" />
|
|
|
<van-dropdown-item
|
|
|
- v-model="storeStatus"
|
|
|
+ v-model="processApprovalStatus"
|
|
|
:title="storeStatusTitle"
|
|
|
:options="statusOption"
|
|
|
- @change="storeStatusChange" />
|
|
|
+ @change="storeStatusChange"
|
|
|
+ :disabled="approvalStatus == 1" />
|
|
|
</van-dropdown-menu>
|
|
|
</div>
|
|
|
<div class="searchDiv">
|
|
|
@@ -76,7 +77,7 @@
|
|
|
"
|
|
|
>临</span
|
|
|
>
|
|
|
- <!-- "approvalStatus": "1", 结案状态（0=未 结案， -->
|
|
|
+ <!-- "approvalStatus": 1:已结案;0:未结案， -->
|
|
|
<!-- "processApprovalStatus": "1" 审批状态（0=未提交，1=已提交待审核，2=审批通过，3=审批拒绝） -->
|
|
|
<template v-if="item.approvalStatus == 0 && item.validFlag == 0">
|
|
|
<span class="statusIcon submit" v-if="item.processApprovalStatus == 1"
|
|
|
@@ -368,23 +369,23 @@ export default {
|
|
|
district: '',
|
|
|
timeData: '',
|
|
|
},
|
|
|
- storeType: 0,
|
|
|
- storeStatus: 0,
|
|
|
+ approvalStatus: '',
|
|
|
+ processApprovalStatus: '',
|
|
|
typeOption: [
|
|
|
- { text: '全部门店', value: 0 },
|
|
|
+ { text: '全部门店', value: '' },
|
|
|
{ text: '已结案', value: 1 },
|
|
|
- { text: '未结案', value: 2 },
|
|
|
+ { text: '未结案', value: 0 },
|
|
|
],
|
|
|
statusOption: [
|
|
|
- { text: '全部状态', value: 0 },
|
|
|
+ { text: '全部状态', value: '' },
|
|
|
{ text: '已提交', value: 1 },
|
|
|
- { text: '未提交', value: 2 },
|
|
|
+ { text: '未提交', value: 0 },
|
|
|
],
|
|
|
storeTypeTitle: '门店类型',
|
|
|
storeStatusTitle: '门店状态',
|
|
|
};
|
|
|
},
|
|
|
- created() {
|
|
|
+ activated() {
|
|
|
this.tabVal = '1';
|
|
|
if (localStorage.getItem('postType') == 'JZ' || localStorage.getItem('postType') == 'GZ') {
|
|
|
this.mapShows = false;
|
|
|
@@ -396,6 +397,8 @@ export default {
|
|
|
this.getStreetQuery();
|
|
|
this.getMonth();
|
|
|
},
|
|
|
+ // created() {
|
|
|
+ // },
|
|
|
watch: {
|
|
|
$route(to, from) {
|
|
|
if (to.path == '/storemanagement/index' && from.path == '/storeAdd') {
|
|
|
@@ -751,9 +754,11 @@ export default {
|
|
|
},
|
|
|
getUserMyStoreList() {
|
|
|
if (this.refreshing) {
|
|
|
- this.list = [];
|
|
|
this.refreshing = false;
|
|
|
}
|
|
|
+ if (this.pageNum == 1) {
|
|
|
+ this.list = [];
|
|
|
+ }
|
|
|
let loading1 = this.$toast.loading({
|
|
|
duration: 0,
|
|
|
message: '加载中...',
|
|
|
@@ -763,9 +768,13 @@ export default {
|
|
|
fromValue.pageNum = this.pageNum;
|
|
|
fromValue.pageSize = this.pageSize;
|
|
|
fromValue.storeName = this.fromValue.storeName.trim();
|
|
|
- // fromValue.storeType = this.storeType //门店类型
|
|
|
- // fromValue.storeStatus = this.storeStatus //门店状态
|
|
|
- storeMyList(fromValue).then((res) => {
|
|
|
+ // fromValue.approvalStatus = this.approvalStatus; //门店结案类型
|
|
|
+ // fromValue.processApprovalStatus = this.processApprovalStatus; //门店审批状态
|
|
|
+ storeMyList({
|
|
|
+ ...fromValue,
|
|
|
+ approvalStatus: this.approvalStatus,
|
|
|
+ processApprovalStatus: this.processApprovalStatus,
|
|
|
+ }).then((res) => {
|
|
|
loading1.clear();
|
|
|
this.disabled = false;
|
|
|
if (res.code == 200) {
|
|
|
@@ -839,13 +848,17 @@ export default {
|
|
|
let storeTypeItem = this.typeOption.find((item) => item.value == value);
|
|
|
this.storeTypeTitle = storeTypeItem ? storeTypeItem.title : '门店类型';
|
|
|
// 门店每次切换 门店状态重置
|
|
|
- this.storeStatus = 0;
|
|
|
+ this.processApprovalStatus = '';
|
|
|
this.storeStatusTitle = '门店状态';
|
|
|
+ this.pageNum = 1;
|
|
|
+ this.getUserMyStoreList();
|
|
|
},
|
|
|
// 门店状态下拉选change
|
|
|
storeStatusChange(value) {
|
|
|
let storeStatusItem = this.statusOption.find((item) => item.value == value);
|
|
|
this.storeStatusTitle = storeStatusItem ? storeStatusItem.title : '门店状态';
|
|
|
+ this.pageNum = 1;
|
|
|
+ this.getUserMyStoreList();
|
|
|
},
|
|
|
},
|
|
|
};
|
