Merge branch 'dev' of 47.94.45.65:angelo/web-retail-admin into test
This commit is contained in:
commit
433b6427f1
|
@ -9,7 +9,7 @@
|
||||||
<div class="thetopbox">
|
<div class="thetopbox">
|
||||||
<el-form ref="form" :model="queryParams" label-width="100px">
|
<el-form ref="form" :model="queryParams" label-width="100px">
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-col :span="4" style="margin-left: -30px">
|
<!-- <el-col :span="4" style="margin-left: -30px">
|
||||||
<el-form-item :label="'位置'" prop="status">
|
<el-form-item :label="'位置'" prop="status">
|
||||||
<el-select v-model="queryParams.sendType" clearable placeholder="">
|
<el-select v-model="queryParams.sendType" clearable placeholder="">
|
||||||
<el-option
|
<el-option
|
||||||
|
@ -20,6 +20,21 @@
|
||||||
/>
|
/>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
</el-col> -->
|
||||||
|
<el-col :span="4" style="margin-left: -30px">
|
||||||
|
<el-form-item
|
||||||
|
label="隶属体系"
|
||||||
|
prop="status"
|
||||||
|
>
|
||||||
|
<el-select v-model="queryParams.pkVertex" clearable placeholder="">
|
||||||
|
<el-option
|
||||||
|
v-for="item in vertexList"
|
||||||
|
:key="item.pkId"
|
||||||
|
:label="item.vertexName"
|
||||||
|
:value="item.pkId"
|
||||||
|
/>
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
<el-form-item :label="'发送时间'" prop="creationTime">
|
<el-form-item :label="'发送时间'" prop="creationTime">
|
||||||
|
@ -35,7 +50,7 @@
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
<el-form-item :label="'生效日期'" prop="creationTime">
|
<el-form-item :label="'创建时间'" prop="creationTime">
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
v-model="modifiedTime1"
|
v-model="modifiedTime1"
|
||||||
value-format="yyyy-MM-dd"
|
value-format="yyyy-MM-dd"
|
||||||
|
@ -49,7 +64,7 @@
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="4">
|
<el-col :span="4">
|
||||||
<div class="searchbox">
|
<div class="searchbox">
|
||||||
<el-button class="my_search" @click="research()" style="margin-left: 40px"> {{ '搜索' }}</el-button>
|
<el-button class="my_search" style="margin-left: 40px" @click="research()"> {{ '搜索' }}</el-button>
|
||||||
<el-button class="my_reset" @click="reChongzhi"> {{ '重置' }}</el-button>
|
<el-button class="my_reset" @click="reChongzhi"> {{ '重置' }}</el-button>
|
||||||
</div>
|
</div>
|
||||||
</el-col>
|
</el-col>
|
||||||
|
@ -59,13 +74,13 @@
|
||||||
<div class="main">
|
<div class="main">
|
||||||
<div class="maintop">
|
<div class="maintop">
|
||||||
<div class="mainbtn">
|
<div class="mainbtn">
|
||||||
<el-button size="small" style="background-color: #48B2FD" class="thebtn1" @click="addRules">{{'添加'}}</el-button>
|
<el-button size="small" style="background-color: #48B2FD" class="thebtn1" @click="addRules">{{ '添加' }}</el-button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="maintable">
|
<div class="maintable">
|
||||||
<el-table
|
<el-table
|
||||||
:data="tableData"
|
|
||||||
v-loading="loading"
|
v-loading="loading"
|
||||||
|
:data="tableData"
|
||||||
height="730px"
|
height="730px"
|
||||||
style="width: 100%"
|
style="width: 100%"
|
||||||
:header-cell-style="{ background: '#EEEEEE' }"
|
:header-cell-style="{ background: '#EEEEEE' }"
|
||||||
|
@ -75,25 +90,26 @@
|
||||||
>
|
>
|
||||||
<el-table-column type="selection" width="55" />
|
<el-table-column type="selection" width="55" />
|
||||||
<el-table-column align="center" prop="sort" :label="'排序'" />
|
<el-table-column align="center" prop="sort" :label="'排序'" />
|
||||||
<el-table-column align="center" prop="phone" :label="'图片'" >
|
<el-table-column align="center" prop="phone" :label="'图片'">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<img :src="scope.row.picture" style="width: 44px;height: 44px;border-radius: 8px" />
|
<img :src="scope.row.picture" style="width: 44px;height: 44px;border-radius: 8px">
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column align="center" prop="positionVal" :label="'位置'" />
|
<!-- <el-table-column align="center" prop="positionVal" :label="'位置'" /> -->
|
||||||
|
<el-table-column align="center" prop="vertexName" label="隶属体系" />
|
||||||
<el-table-column align="center" prop="link" :label="'链接'" />
|
<el-table-column align="center" prop="link" :label="'链接'" />
|
||||||
<el-table-column align="center" prop="creationTime" :label="'创建日期'" />
|
<el-table-column align="center" prop="creationTime" :label="'创建日期'" />
|
||||||
<el-table-column align="center" prop="effectiveDate" :label="'生效日期'" />
|
<el-table-column align="center" prop="effectiveDate" :label="'生效日期'" />
|
||||||
<el-table-column align="center" :label="'操作'" width="150">
|
<el-table-column align="center" :label="'操作'" width="150">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-button
|
<!-- <el-button
|
||||||
class="colors"
|
class="colors"
|
||||||
type="text"
|
type="text"
|
||||||
style="color: #108EE9"
|
style="color: #108EE9"
|
||||||
size="small"
|
size="small"
|
||||||
@click.native.prevent="moveUp(scope.row)"
|
@click.native.prevent="moveUp(scope.row)"
|
||||||
>
|
>
|
||||||
{{'上移'}}
|
{{ '上移' }}
|
||||||
</el-button>
|
</el-button>
|
||||||
<el-button
|
<el-button
|
||||||
class="colors"
|
class="colors"
|
||||||
|
@ -102,7 +118,7 @@
|
||||||
style="color: #108EE9"
|
style="color: #108EE9"
|
||||||
@click.native.prevent="moveDown(scope.row)"
|
@click.native.prevent="moveDown(scope.row)"
|
||||||
>
|
>
|
||||||
{{'下移'}}
|
{{ '下移' }}
|
||||||
</el-button>
|
</el-button>
|
||||||
<el-button
|
<el-button
|
||||||
class="colors"
|
class="colors"
|
||||||
|
@ -111,8 +127,8 @@
|
||||||
style="color: #009B58"
|
style="color: #009B58"
|
||||||
@click.native.prevent="updateTop(scope.row)"
|
@click.native.prevent="updateTop(scope.row)"
|
||||||
>
|
>
|
||||||
{{'置顶'}}
|
{{ '置顶' }}
|
||||||
</el-button>
|
</el-button> -->
|
||||||
<el-button
|
<el-button
|
||||||
class="colors"
|
class="colors"
|
||||||
type="text"
|
type="text"
|
||||||
|
@ -120,7 +136,7 @@
|
||||||
style="color: #FFAD41"
|
style="color: #FFAD41"
|
||||||
@click.native.prevent="updateShow(scope.row)"
|
@click.native.prevent="updateShow(scope.row)"
|
||||||
>
|
>
|
||||||
{{ '查看' }}
|
{{ '编辑' }}
|
||||||
</el-button>
|
</el-button>
|
||||||
<el-button
|
<el-button
|
||||||
class="colors"
|
class="colors"
|
||||||
|
@ -170,6 +186,16 @@
|
||||||
:placeholder="'请输入'"
|
:placeholder="'请输入'"
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
<el-form-item label="隶属体系" prop="pkVertex">
|
||||||
|
<el-select v-model="table.pkVertex" clearable placeholder="">
|
||||||
|
<el-option
|
||||||
|
v-for="item in vertexList"
|
||||||
|
:key="item.pkId"
|
||||||
|
:label="item.vertexName"
|
||||||
|
:value="item.pkId"
|
||||||
|
/>
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
<el-form-item :label="'生效日期'" prop="effectiveDate">
|
<el-form-item :label="'生效日期'" prop="effectiveDate">
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
v-model="table.effectiveDate"
|
v-model="table.effectiveDate"
|
||||||
|
@ -201,12 +227,21 @@
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import topBar from '@/components/topBar'
|
import topBar from '@/components/topBar'
|
||||||
import { getbdmenuList, getPubenumsList } from '@/api/system'
|
import { getPubenumsList } from '@/api/system'
|
||||||
import { getgradeRanglist, getAwardsListChiose } from '@/api/level'
|
import { getgradeRanglist, getAwardsListChiose } from '@/api/level'
|
||||||
import * as api from '@/api/sms.js'
|
import * as api from '@/api/sms.js'
|
||||||
import { Message } from 'element-ui'
|
import { Message } from 'element-ui'
|
||||||
import { deleteAgreement } from '@/api/configManage'
|
|
||||||
import ImageUpload from '@/components/ImageUpload'
|
import ImageUpload from '@/components/ImageUpload'
|
||||||
|
import { getvertexValue } from '@/api/member'
|
||||||
|
|
||||||
|
const initForm = {
|
||||||
|
position: 1,
|
||||||
|
picture: '',
|
||||||
|
sort: '',
|
||||||
|
effectiveDate: '',
|
||||||
|
link: '',
|
||||||
|
pkVertex: ''
|
||||||
|
}
|
||||||
export default {
|
export default {
|
||||||
name: 'Qxpz',
|
name: 'Qxpz',
|
||||||
components: {
|
components: {
|
||||||
|
@ -215,8 +250,8 @@ export default {
|
||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
modifiedTime:[],
|
modifiedTime: [],
|
||||||
modifiedTime1:[],
|
modifiedTime1: [],
|
||||||
title: '添加',
|
title: '添加',
|
||||||
forms: '',
|
forms: '',
|
||||||
rules: {
|
rules: {
|
||||||
|
@ -236,7 +271,9 @@ export default {
|
||||||
{ required: true, message: '请输入链接', trigger: 'blur' }
|
{ required: true, message: '请输入链接', trigger: 'blur' }
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
table: { position: '', picture: '', sort: '', effectiveDate: '', link: '' },
|
table: {
|
||||||
|
...initForm
|
||||||
|
},
|
||||||
ruleShow: false,
|
ruleShow: false,
|
||||||
moren: 'advertisementBanner',
|
moren: 'advertisementBanner',
|
||||||
topList: [
|
topList: [
|
||||||
|
@ -260,20 +297,26 @@ export default {
|
||||||
statusList: [{ 'name': '立即发送', 'id': '1' }, { 'name': '定时发送', 'id': '2' }],
|
statusList: [{ 'name': '立即发送', 'id': '1' }, { 'name': '定时发送', 'id': '2' }],
|
||||||
statusList1: [{ 'name': '未发送', 'id': '0' }, { 'name': '已发送', 'id': '1' }],
|
statusList1: [{ 'name': '未发送', 'id': '0' }, { 'name': '已发送', 'id': '1' }],
|
||||||
menuOptions: [],
|
menuOptions: [],
|
||||||
loading:false,
|
loading: false,
|
||||||
tableData: [],
|
tableData: [],
|
||||||
total: 0,
|
total: 0,
|
||||||
types: '',
|
types: '',
|
||||||
formId: '',
|
formId: '',
|
||||||
getPostionList: []
|
getPostionList: [],
|
||||||
|
vertexList: []
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
created() {
|
created() {
|
||||||
this.research()
|
this.research()
|
||||||
this.getPostion()
|
this.getPostion()
|
||||||
|
this.getvertexValue()
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
// 置顶
|
getvertexValue() {
|
||||||
|
getvertexValue().then((res) => {
|
||||||
|
this.vertexList = res.data
|
||||||
|
})
|
||||||
|
},
|
||||||
updateTop(item) {
|
updateTop(item) {
|
||||||
api.getPostion({ 'pkId': item.pkId }).then((res) => {
|
api.getPostion({ 'pkId': item.pkId }).then((res) => {
|
||||||
if (res.code == '200') {
|
if (res.code == '200') {
|
||||||
|
@ -332,8 +375,7 @@ export default {
|
||||||
api.getBannerDetails(item.pkId).then((res) => {
|
api.getBannerDetails(item.pkId).then((res) => {
|
||||||
if (res.code === 200) {
|
if (res.code === 200) {
|
||||||
this.ruleShow = true
|
this.ruleShow = true
|
||||||
this.table = { position: res.data.position, picture: res.data.picture,
|
this.table = res.data
|
||||||
sort: res.data.sort, effectiveDate: res.data.effectiveDate, link: res.data.link }
|
|
||||||
} else {
|
} else {
|
||||||
Message({
|
Message({
|
||||||
message: res.msg,
|
message: res.msg,
|
||||||
|
@ -381,7 +423,7 @@ export default {
|
||||||
type: 'success'
|
type: 'success'
|
||||||
})
|
})
|
||||||
that.ruleShow = false
|
that.ruleShow = false
|
||||||
that.table = { position: '', picture: '', sort: '', effectiveDate: '', link: '' }
|
that.table = { ...initForm }
|
||||||
that.research()
|
that.research()
|
||||||
} else {
|
} else {
|
||||||
Message({
|
Message({
|
||||||
|
@ -400,7 +442,7 @@ export default {
|
||||||
type: 'success'
|
type: 'success'
|
||||||
})
|
})
|
||||||
that.ruleShow = false
|
that.ruleShow = false
|
||||||
that.table = { position: '', picture: '', sort: '', effectiveDate: '', link: '' }
|
that.table = { ...initForm }
|
||||||
that.research()
|
that.research()
|
||||||
} else {
|
} else {
|
||||||
Message({
|
Message({
|
||||||
|
|
Loading…
Reference in New Issue