Commit 48f3b815 authored by 黄奎's avatar 黄奎

页面修改

parent e8e5068a
...@@ -115,6 +115,8 @@ ...@@ -115,6 +115,8 @@
</q-input> </q-input>
</div> </div>
<div class="col-6"> <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 />
</div> </div>
</div> </div>
<div class="row wrap" style="margin-top:20px;"> <div class="row wrap" style="margin-top:20px;">
...@@ -161,8 +163,7 @@ ...@@ -161,8 +163,7 @@
</el-select> </el-select>
</div> </div>
<div class="col-2 q-pr-lg" style="width:19%"> <div class="col-2 q-pr-lg" style="width:19%">
<q-select filled stack-label option-value="Id" option-label="Name" v-model="sItem.TaskFinishType"
:options="finishTypeObj" label="请选择" dense emit-value map-options />
</div> </div>
<div class="col-2" style="width:14%"> <div class="col-2" style="width:14%">
<q-input filled stack-label maxlength="20" @keyup.native="checkInteger(sItem,'TaskFinishValue')" dense <q-input filled stack-label maxlength="20" @keyup.native="checkInteger(sItem,'TaskFinishValue')" dense
...@@ -250,6 +251,7 @@ ...@@ -250,6 +251,7 @@
TaskEndTime: "", //任务结束时间 TaskEndTime: "", //任务结束时间
DetailsList: [], //任务详情 DetailsList: [], //任务详情
ExchangeEndTime: "", //兑换截止时间 ExchangeEndTime: "", //兑换截止时间
TaskFinishType:1,//任务完成类
}, },
optionTitle: '', optionTitle: '',
CourseList: [], CourseList: [],
...@@ -294,6 +296,7 @@ ...@@ -294,6 +296,7 @@
this.objOption.TaskImageList = tempData.TaskImageList; this.objOption.TaskImageList = tempData.TaskImageList;
this.objOption.TaskDesc = tempData.TaskDesc; this.objOption.TaskDesc = tempData.TaskDesc;
this.objOption.ExchangeEndTime = tempData.ExchangeEndTimeStr; this.objOption.ExchangeEndTime = tempData.ExchangeEndTimeStr;
this.objOption.TaskFinishType=tempData.TaskFinishType;
} }
}) })
this.optionTitle = "修改客户任务" this.optionTitle = "修改客户任务"
...@@ -307,13 +310,13 @@ ...@@ -307,13 +310,13 @@
this.objOption.TaskEndTime = ''; this.objOption.TaskEndTime = '';
this.objOption.DetailsList = []; this.objOption.DetailsList = [];
this.objOption.ExchangeEndTime = ""; this.objOption.ExchangeEndTime = "";
this.objOption.TaskFinishType=0;
this.optionTitle = "新增客户任务" this.optionTitle = "新增客户任务"
} }
}, },
//保存 //保存
saveCustom() { saveCustom() {
this.$refs.TaskName.validate(); this.$refs.TaskName.validate();
//this.$refs.TaskKudo.validate();
if (!this.$refs.TaskName.hasError) { if (!this.$refs.TaskName.hasError) {
var oDate1 = new Date(this.objOption.TaskStartTime); var oDate1 = new Date(this.objOption.TaskStartTime);
var oDate2 = new Date(this.objOption.TaskEndTime); var oDate2 = new Date(this.objOption.TaskEndTime);
...@@ -357,7 +360,6 @@ ...@@ -357,7 +360,6 @@
DetailsName: "", //任务条件名称 DetailsName: "", //任务条件名称
TaskType: 1, //任务类型(见枚举) TaskType: 1, //任务类型(见枚举)
TargetId: "", //目标编号 TargetId: "", //目标编号
TaskFinishType: 1, //完成类型(1-人数,2-固定金额)
TaskFinishValue: '', //完成值 TaskFinishValue: '', //完成值
TaskKudo: "", //奖品名称 TaskKudo: "", //奖品名称
TaskKudoImgList: [], //奖品图片 TaskKudoImgList: [], //奖品图片
......
...@@ -25,6 +25,11 @@ ...@@ -25,6 +25,11 @@
</div> </div>
</q-td> </q-td>
</template> </template>
<template v-slot:body-cell-TaskFinishType="props">
<q-td :props="props" style="padding-right: 0px">
{{props.row.TaskFinishType==1?"人数":"销售金额"}}
</q-td>
</template>
<template v-slot:body-cell-TaskType="props"> <template v-slot:body-cell-TaskType="props">
<q-td :props="props" style="padding-right: 0px"> <q-td :props="props" style="padding-right: 0px">
<div v-for="(x,index) in props.value" :key="index"> <div v-for="(x,index) in props.value" :key="index">
...@@ -69,15 +74,7 @@ ...@@ -69,15 +74,7 @@
</div> </div>
</q-td> </q-td>
</template> </template>
<template v-slot:body-cell-CompleteType="props">
<q-td :props="props" style="padding-right: 0px">
<div v-for="(x,index) in props.value" :key="index">
<div class="border-bottom">
{{ x.TaskFinishType==1?'人数':'成交金额' }}
</div>
</div>
</q-td>
</template>
<template v-slot:body-cell-CompleteValue="props"> <template v-slot:body-cell-CompleteValue="props">
<q-td :props="props" style="padding-right: 0px"> <q-td :props="props" style="padding-right: 0px">
<div v-for="(x,index) in props.value" :key="index"> <div v-for="(x,index) in props.value" :key="index">
...@@ -136,6 +133,12 @@ ...@@ -136,6 +133,12 @@
field: 'TaskStartTimeStr', field: 'TaskStartTimeStr',
align: 'left', align: 'left',
}, },
{
name: 'TaskFinishType',
label: '任务完成类型',
align: "left",
field: 'TaskFinishType',
},
{ {
name: 'TaskType', name: 'TaskType',
label: '任务类型', label: '任务类型',
...@@ -150,13 +153,6 @@ ...@@ -150,13 +153,6 @@
align: "left", align: "left",
field: (row) => row.DetailsList field: (row) => row.DetailsList
}, },
{
name: 'CompleteType',
label: '完成类型',
required: true,
align: "left",
field: (row) => row.DetailsList
},
{ {
name: 'CompleteValue', name: 'CompleteValue',
label: '完成值', label: '完成值',
...@@ -254,7 +250,7 @@ ...@@ -254,7 +250,7 @@
} }
this.isShowTask = true this.isShowTask = true
}, },
iShowEdit(obj){ iShowEdit(obj) {
if (obj) { if (obj) {
this.taskOption = obj; this.taskOption = obj;
} else { } else {
...@@ -281,12 +277,10 @@ ...@@ -281,12 +277,10 @@
} }
}, },
} }
</script> </script>
<style lang="sass"> <style lang="sass">
@import url('~assets/css/table.sass') @import url('~assets/css/table.sass')
</style> </style>
<style lang="scss"> <style lang="scss">
.otherTask { .otherTask {
...@@ -319,5 +313,4 @@ ...@@ -319,5 +313,4 @@
padding-bottom: 5px; padding-bottom: 5px;
margin-bottom: 5px; margin-bottom: 5px;
} }
</style> </style>
\ No newline at end of file
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