Skip to content

C
confucius
Commit 363be216 authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent 0a9efcf7
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 656 additions and 772 deletions
src/components/sale/sale-form.vue
View file @ 363be216
......@@ -49,6 +49,11 @@
.el-select-dropdown {
z-index: 9999 !important;
}
.CusTask_Date .el-input__inner {
background: transparent !important;
border: 0 !important;
}
</style>
<template>
<q-dialog v-model="persistent" content-class="bg-grey-1" persistent transition-show="scale">
......@@ -69,55 +74,40 @@
</div>
<div class="row wrap q-pb-lg">
<div class="col-6">
<q-input filled v-model="objOption.TaskStartTime" class="q-pr-lg" mask="date" label="开始时间">
<template v-slot:append>
<q-icon name="event" class="cursor-pointer">
<q-popup-proxy ref="qDateProxy1" cover transition-show="scale" transition-hide="scale">
<q-date v-model="objOption.TaskStartTime">
<div class="row items-center justify-end">
<q-btn v-close-popup label="Close" color="primary" flat />
</div>
</q-date>
</q-popup-proxy>
</q-icon>
</template>
</q-input>
<div class="CusTask_Date">
<q-field filled stack-label label="开始时间" class="col-6 q-pb-lg q-pr-lg">
 <template v-slot:control>
<el-date-picker v-model="objOption.TaskStartTime" value-format='yyyy-MM-dd HH:mm:ss' type="datetime"
size="small" clear-icon="iconfont icon-guanbi"></el-date-picker>    
</template>
</q-field>
</div>
</div>
<div class="col-6">
<q-input filled v-model="objOption.TaskEndTime" mask="date" label="结束时间">
<template v-slot:append>
<q-icon name="event" class="cursor-pointer">
<q-popup-proxy ref="qDateProxy2" cover transition-show="scale" transition-hide="scale">
<q-date v-model="objOption.TaskEndTime">
<div class="row items-center justify-end">
<q-btn v-close-popup label="Close" color="primary" flat />
</div>
</q-date>
</q-popup-proxy>
</q-icon>
</template>
</q-input>
<div class="CusTask_Date">
<q-field filled stack-label label="结束时间" class="col-6 q-pb-lg">
 <template v-slot:control>
<el-date-picker v-model="objOption.TaskEndTime" value-format='yyyy-MM-dd HH:mm:ss' type="datetime"
size="small" clear-icon="iconfont icon-guanbi"></el-date-picker>    
</template>
</q-field>
</div>
</div>
</div>
<div class="row wrap">
<div class="col-6">
<q-input filled v-model="objOption.ExchangeEndTime" class="q-pr-lg" mask="date" label="兑换截止日期">
<template v-slot:append>
<q-icon name="event" class="cursor-pointer">
<q-popup-proxy ref="ExchangeEndTime" cover transition-show="scale" transition-hide="scale">
<q-date v-model="objOption.ExchangeEndTime">
<div class="row items-center justify-end">
<q-btn v-close-popup label="Close" color="primary" flat />
</div>
</q-date>
</q-popup-proxy>
</q-icon>
</template>
</q-input>
<div class="CusTask_Date">
<q-field filled stack-label label="兑换截止日期" class="col-6 q-pb-lg q-pr-lg">
 <template v-slot:control>
<el-date-picker v-model="objOption.ExchangeEndTime" value-format='yyyy-MM-dd HH:mm:ss' type="datetime"
size="small" clear-icon="iconfont icon-guanbi"></el-date-picker>    
</template>
</q-field>
</div>
</div>
<div class="col-6">
<q-select filled stack-label option-value="Id" option-label="Name" v-model="objOption.TaskFinishType"
:options="finishTypeObj" label="请选择" dense emit-value map-options />
<q-select filled option-value="Id" option-label="Name" v-model="objOption.TaskFinishType"
:options="finishTypeObj" label="任务完成类型" emit-value map-options />
</div>
</div>
<div class="row wrap" style="margin-top:20px;">
......@@ -136,9 +126,8 @@
</el-upload>
</div>
</div>
<div class="q-pt-none scroll" style="max-height:60hv;margin-bottom:20px;">
<q-btn color="accent" size="sm" icon="add" style="margin-bottom:20px;" label="新增子任务" @click="addSubTask()" />
<q-btn color="accent" size="sm" icon="add" style="margin-bottom:20px;" label="新增完成条件" @click="addSubTask()" />
<template v-for="(sItem, sIndex) in objOption.DetailsList">
<div :key="sIndex" class="Details_List">
<q-input filled stack-label maxlength="20" style="width:523px;" dense v-model="sItem.DetailsName"
......@@ -199,7 +188,6 @@
@click="deleSubTask(index)" />
</div>
</template>
</div>
<div class="row wrap">
<div class="col-12">
......
src/components/sale/stopbill-form.vue
View file @ 363be216
This diff is collapsed.
src/pages/sale/commsionManagement.vue
View file @ 363be216
......@@ -81,6 +81,18 @@
field: 'PeopleNum',
align: 'left',
},
{
name: 'BalanceStateStr',
label: '返佣',
field: 'BalanceStateStr',
align: 'left',
},
{
name: 'RemitStr',
label: '提现',
field: 'RemitStr',
align: 'left',
},
{
name: 'UpdateTimeStr',
label: '更新时间',
......@@ -96,7 +108,7 @@
pageSize: 12,
rowsPerPage: 12,
RebateType: 1,
Description:"",
Description: "",
},
pageCount: 0,
taskOption: null,
......
src/pages/sale/happyPassbook.vue
View file @ 363be216
......@@ -45,101 +45,113 @@
data() {
return {
columns: [{
name: 'BalanceTypeStr',
label: '类型',
field: 'BalanceTypeStr',
align: 'left'
},
{
name: 'Money',
label: '变更金额',
align: 'left',
field: 'Money'
},
{
name: 'Description',
label: '变更详情',
field: 'Description',
align: 'left',
},
{
name: 'ClassName',
label: '班级信息',
field: 'ClassName',
align: 'left',
},
{
name: 'OrderId',
label: '订单编号',
field: 'OrderId',
align: 'left',
},
{
name: 'PeopleNum',
label: '订单人数',
field: 'PeopleNum',
align: 'left',
},
{
name: 'UpdateTimeStr',
label: '更新时间',
field: 'UpdateTimeStr',
align: 'left',
},
],
dataList: [],
loading: true,
msg: {
CustomerId: 0,
pageIndex: 1,
pageSize: 12,
rowsPerPage: 12,
RebateType: 2,
Description:"",
name: 'BalanceTypeStr',
label: '类型',
field: 'BalanceTypeStr',
align: 'left'
},
pageCount: 0,
taskOption: null,
isShowTask: false,
}
},
created() {
if (this.$route.query && this.$route.query.CustomerId) {
this.msg.CustomerId = this.$route.query.CustomerId
}
},
mounted() {
this.getList()
},
methods: {
resetSearch() {
this.loading = true;
this.msg.pageIndex = 1;
this.getList();
{
name: 'Money',
label: '变更金额',
align: 'left',
field: 'Money'
},
changePage(val) {
this.msg.pageIndex = val;
this.loading = true;
this.getList();
{
name: 'Description',
label: '变更详情',
field: 'Description',
align: 'left',
},
RefreshPage() {
this.getList()
{
name: 'ClassName',
label: '班级信息',
field: 'ClassName',
align: 'left',
},
//获取数据
getList() {
this.loading = true;
GetCustomerBalanceDetailPage(this.msg).then(res => {
this.loading = false;
if (res.Code == 1) {
this.dataList = res.Data.PageData;
this.pageCount = res.Data.PageCount;
}
}).catch(() => {
this.loading = false
})
}
{
name: 'OrderId',
label: '订单编号',
field: 'OrderId',
align: 'left',
},
{
name: 'PeopleNum',
label: '订单人数',
field: 'PeopleNum',
align: 'left',
},
{
name: 'BalanceStateStr',
label: '返佣',
field: 'BalanceStateStr',
align: 'left',
},
{
name: 'RemitStr',
label: '提现',
field: 'RemitStr',
align: 'left',
},
{
name: 'UpdateTimeStr',
label: '更新时间',
field: 'UpdateTimeStr',
align: 'left',
},
],
dataList: [],
loading: true,
msg: {
CustomerId: 0,
pageIndex: 1,
pageSize: 12,
rowsPerPage: 12,
RebateType: 2,
Description: "",
},
}
pageCount: 0,
taskOption: null,
isShowTask: false,
}
},
created() {
if (this.$route.query && this.$route.query.CustomerId) {
this.msg.CustomerId = this.$route.query.CustomerId
}
},
mounted() {
this.getList()
},
methods: {
resetSearch() {
this.loading = true;
this.msg.pageIndex = 1;
this.getList();
},
changePage(val) {
this.msg.pageIndex = val;
this.loading = true;
this.getList();
},
RefreshPage() {
this.getList()
},
//获取数据
getList() {
this.loading = true;
GetCustomerBalanceDetailPage(this.msg).then(res => {
this.loading = false;
if (res.Code == 1) {
this.dataList = res.Data.PageData;
this.pageCount = res.Data.PageCount;
}
}).catch(() => {
this.loading = false
})
}
},
}
</script>
<style lang="sass">
@import url('~assets/css/table.sass')
......
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