Commit 25547efa authored by 张伯涛's avatar 张伯涛

所属商家取值修改

parent aeea39f0
...@@ -564,10 +564,8 @@ export default { ...@@ -564,10 +564,8 @@ export default {
queryParams: { queryParams: {
page: 1, page: 1,
rows: 10, rows: 10,
username: '',
name: '', name: '',
flag: '', phone: '',
identity: '',
deptId: '' deptId: ''
}, },
// 表单校验 // 表单校验
...@@ -836,15 +834,10 @@ export default { ...@@ -836,15 +834,10 @@ export default {
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.queryParams = { this.queryParams.page = 1,
page: 1, this.queryParams.rows = 10,
rows: 10, this.queryParams.name = '',
username: '', this.queryParams.phone = '',
name: '',
flag: '',
identity: '',
deptId: ''
}
this.roleFunction() this.roleFunction()
this.handleQuery() this.handleQuery()
}, },
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div class="app-container"> <div class="app-container">
<el-form ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true"> <el-form ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true">
<el-form-item label="所属商家:" prop="unitId"> <el-form-item label="所属商家:" prop="unitId">
<el-select v-model="queryParams.unitId" filterable placeholder="请选择所属商家" style="width: 100%"> <el-select v-model="queryParams.unitId" filterable placeholder="请选择所属商家" style="width: 100%">
<el-option <el-option
v-for="(item,index) in deptList" v-for="(item,index) in deptList"
:key="index" :key="index"
...@@ -287,12 +287,8 @@ export default { ...@@ -287,12 +287,8 @@ export default {
queryParams: { queryParams: {
page: 1, page: 1,
rows: 10, rows: 10,
bannerPicture: undefined, bannerName: '',
bannerName: undefined, linkUrl: '',
type: undefined,
weight: undefined,
linkUrl: undefined,
flag: '',
unitId: '' unitId: ''
}, },
showImg: false, showImg: false,
...@@ -366,6 +362,11 @@ export default { ...@@ -366,6 +362,11 @@ export default {
listAllShop().then(res => { listAllShop().then(res => {
if (res.code === 200) { if (res.code === 200) {
this.deptList = res.data this.deptList = res.data
if (res.data && res.data.length > 0) {
this.queryParams.unitId = res.data[0].businessId
} else {
this.queryParams.unitId = ''
}
} }
}) })
}, },
...@@ -382,7 +383,7 @@ export default { ...@@ -382,7 +383,7 @@ export default {
if (this.roles[0].roleKey !== 'admin') { if (this.roles[0].roleKey !== 'admin') {
console.log('this.roles', this.roles) console.log('this.roles', this.roles)
this.queryShop = false this.queryShop = false
this.queryParams.unitId = this.deptId // this.queryParams.unitId = this.deptId
} }
}, },
// 封面图片预览 // 封面图片预览
...@@ -477,17 +478,10 @@ export default { ...@@ -477,17 +478,10 @@ export default {
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.queryParams = { this.queryParams.page = 1,
page: 1, this.queryParams.rows = 10,
rows: 10, this.queryParams.bannerName = '',
bannerPicture: undefined, this.queryParams.linkUrl = '',
bannerName: undefined,
type: undefined,
weight: undefined,
linkUrl: undefined,
flag: '',
unitId: ''
}
this.roleFunction() this.roleFunction()
this.handleQuery() this.handleQuery()
}, },
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<div class="search" style="border-bottom: 14px solid #f4f4f4"> <div class="search" style="border-bottom: 14px solid #f4f4f4">
<el-form ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true"> <el-form ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true">
<el-form-item label="所属商家:" prop="unitId"> <el-form-item label="所属商家:" prop="unitId">
<el-select v-model="queryParams.unitId" clearable filterable placeholder="请选择所属商家" style="width: 100%"> <el-select v-model="queryParams.unitId" clearable filterable placeholder="请选择所属商家" style="width: 100%">
<el-option <el-option
v-for="(item,index) in deptList" v-for="(item,index) in deptList"
:key="index" :key="index"
...@@ -952,6 +952,11 @@ export default { ...@@ -952,6 +952,11 @@ export default {
listAllShop().then(res => { listAllShop().then(res => {
if (res.code === 200) { if (res.code === 200) {
this.deptList = res.data this.deptList = res.data
if (res.data && res.data.length > 0) {
this.queryParams.unitId = res.data[0].businessId
} else {
this.queryParams.unitId = ''
}
} }
}) })
}, },
...@@ -959,7 +964,7 @@ export default { ...@@ -959,7 +964,7 @@ export default {
if (this.roles[0].roleKey !== 'admin') { if (this.roles[0].roleKey !== 'admin') {
console.log('this.roles', this.roles) console.log('this.roles', this.roles)
this.queryShop = false this.queryShop = false
this.queryParams.unitId = this.deptId // this.queryParams.unitId = this.deptId
} }
}, },
/** 取消按钮操作 */ /** 取消按钮操作 */
...@@ -1352,12 +1357,9 @@ export default { ...@@ -1352,12 +1357,9 @@ export default {
resetQuery() { resetQuery() {
this.dateRangeBegin = [] this.dateRangeBegin = []
this.dateRangeEnd = [] this.dateRangeEnd = []
this.queryParams = { this.queryParams.page = 1,
page: 1, this.queryParams.rows = 10,
rows: 10, this.queryParams.title = '',
unitId: '',
title: ''
}
this.roleFunction() this.roleFunction()
this.loadData() this.loadData()
}, },
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<div class="search" style="border-bottom: 14px solid #f4f4f4"> <div class="search" style="border-bottom: 14px solid #f4f4f4">
<el-form ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true"> <el-form ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true">
<el-form-item label="所属商家:" prop="unitId"> <el-form-item label="所属商家:" prop="unitId">
<el-select v-model="queryParams.unitId" filterable placeholder="请选择所属商家" style="width: 100%"> <el-select v-model="queryParams.unitId" filterable placeholder="请选择所属商家" style="width: 100%">
<el-option <el-option
v-for="(item,index) in deptList" v-for="(item,index) in deptList"
:key="index" :key="index"
...@@ -383,7 +383,6 @@ export default { ...@@ -383,7 +383,6 @@ export default {
queryParams: { queryParams: {
page: 1, page: 1,
rows: 10, rows: 10,
flag: '',
unitId: '', unitId: '',
title: '' title: ''
}, },
...@@ -520,7 +519,7 @@ export default { ...@@ -520,7 +519,7 @@ export default {
if (this.roles[0].roleKey !== 'admin') { if (this.roles[0].roleKey !== 'admin') {
console.log('this.roles', this.roles) console.log('this.roles', this.roles)
this.queryShop = false this.queryShop = false
this.queryParams.unitId = this.deptId // this.queryParams.unitId = this.deptId
} }
}, },
// 获取所有 部门信息 // 获取所有 部门信息
...@@ -528,6 +527,11 @@ export default { ...@@ -528,6 +527,11 @@ export default {
listAllShop().then(res => { listAllShop().then(res => {
if (res.code === 200) { if (res.code === 200) {
this.deptList = res.data this.deptList = res.data
if (res.data && res.data.length > 0) {
this.queryParams.unitId = res.data[0].businessId
} else {
this.queryParams.unitId = ''
}
} }
}) })
}, },
...@@ -570,14 +574,9 @@ export default { ...@@ -570,14 +574,9 @@ export default {
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.queryParams = { this.queryParams.page = 1,
page: 1, this.queryParams.rows = 10,
rows: 10, this.queryParams.title = '',
flag: '',
unitId: '',
title: ''
}
this.dateRange = [] this.dateRange = []
this.roleFunction() this.roleFunction()
this.loadData() this.loadData()
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<div class="search" style="border-bottom: 14px solid #f4f4f4"> <div class="search" style="border-bottom: 14px solid #f4f4f4">
<el-form ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true"> <el-form ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true">
<el-form-item label="所属商家:" prop="unitId"> <el-form-item label="所属商家:" prop="unitId">
<el-select v-model="queryParams.unitId" filterable placeholder="请选择所属商家" style="width: 100%"> <el-select v-model="queryParams.unitId" filterable placeholder="请选择所属商家" style="width: 100%">
<el-option <el-option
v-for="(item,index) in deptList" v-for="(item,index) in deptList"
:key="index" :key="index"
...@@ -385,7 +385,7 @@ export default { ...@@ -385,7 +385,7 @@ export default {
if (this.roles[0].roleKey !== 'admin') { if (this.roles[0].roleKey !== 'admin') {
console.log('this.roles', this.roles) console.log('this.roles', this.roles)
this.queryShop = false this.queryShop = false
this.queryParams.unitId = this.deptId // this.queryParams.unitId = this.deptId
} }
}, },
// 获取所有部门信息 // 获取所有部门信息
...@@ -393,6 +393,11 @@ export default { ...@@ -393,6 +393,11 @@ export default {
listAllShop().then(res => { listAllShop().then(res => {
if (res.code === 200) { if (res.code === 200) {
this.deptList = res.data this.deptList = res.data
if (res.data && res.data.length > 0) {
this.queryParams.unitId = res.data[0].businessId
} else {
this.queryParams.unitId = ''
}
} }
}) })
}, },
...@@ -435,14 +440,9 @@ export default { ...@@ -435,14 +440,9 @@ export default {
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.queryParams = { this.queryParams.page = 1,
page: 1, this.queryParams.rows = 10,
rows: 10, this.queryParams.videoTitle = '',
flag: '',
unitId: '',
videoTitle: ''
}
this.dateRange = [] this.dateRange = []
this.roleFunction() this.roleFunction()
this.loadData() this.loadData()
......
...@@ -61,7 +61,7 @@ module.exports = { ...@@ -61,7 +61,7 @@ module.exports = {
[process.env.VUE_APP_BASE_API]: { [process.env.VUE_APP_BASE_API]: {
// target: `http://106.3.99.36:20081/`, // target: `http://106.3.99.36:20081/`,
// target: `http://192.168.1.23:8090/`, // 飞龙后端 // target: `http://192.168.1.23:8090/`, // 飞龙后端
target: `http://192.168.10.10:8099/`, // 奕霖后端 target: `http://192.168.10.10:8099/`,
pathRewrite: { pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: '' ['^' + process.env.VUE_APP_BASE_API]: ''
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment