angelo
/
web-base-admin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(marketing): 营销管理 加购升级 

、报单赠送记录列表搜索条件优化
This commit is contained in:
woody 2025-10-23 09:49:28 +08:00
parent 2142466b86
commit 45e82a10bc
3 changed files with 28 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
src/views/marketing/declarationActivity/record.vue
View File

@ -10,11 +10,27 @@
<el-form <el-form
ref="select" ref="select"
:model="select" :model="select"
label-width="auto" label-width="90px"
> >
<el-row :gutter="40"> <el-row :gutter="40">
<el-col :span="4"> <el-col :span="4">
<el-form-item label="报单中心会员编号"> <el-form-item :label="'活动名称'">
<el-input
v-model="select.actName"
clearable
/>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item :label="'订单编号'">
<el-input
v-model="select.orderCode"
clearable
/>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label-width="130px" label="报单中心会员编号">
<el-input <el-input
v-model="select.referenceCode" v-model="select.referenceCode"
style="width:100%" style="width:100%"
@ -30,56 +46,7 @@
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4">
<el-form-item :label="'活动名称'">
<el-input
v-model="select.actName"
clearable
/>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item :label="'活动状态'">
<el-select
v-model="select.activityStatus"
clearable
:placeholder="'请选择'"
>
<el-option
v-for="item in actStatus"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="'开始日期'">
<el-date-picker
v-model="creationTime"
value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange"
:range-separator="'至'"
:start-placeholder="'开始日期'"
:end-placeholder="'结束日期'"
@change="changeTime"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="'结束日期'">
<el-date-picker
v-model="creationTime1"
value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange"
:range-separator="'至'"
:start-placeholder="'开始日期'"
:end-placeholder="'结束日期'"
@change="changeTime1"
/>
</el-form-item>
</el-col>
<!-- <el-col :span="8"> <!-- <el-col :span="8">
<el-form-item :label="'创建日期'"> <el-form-item :label="'创建日期'">
<el-date-picker <el-date-picker

43
src/views/marketing/declarationActivity/summary.vue
View File

@ -21,22 +21,6 @@
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4">
<el-form-item :label="'活动状态'">
<el-select
v-model="select.activityStatus"
clearable
:placeholder="'请选择'"
>
<el-option
v-for="item in actStatus"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="产品编号"> <el-form-item label="产品编号">
<el-input <el-input
@ -45,32 +29,7 @@
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8">
<el-form-item :label="'开始日期'">
<el-date-picker
v-model="creationTime"
value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange"
:range-separator="'至'"
:start-placeholder="'开始日期'"
:end-placeholder="'结束日期'"
@change="changeTime"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="'结束日期'">
<el-date-picker
v-model="creationTime1"
value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange"
:range-separator="'至'"
:start-placeholder="'开始日期'"
:end-placeholder="'结束日期'"
@change="changeTime1"
/>
</el-form-item>
</el-col>
<!-- <el-col :span="8"> <!-- <el-col :span="8">
<el-form-item :label="'创建日期'"> <el-form-item :label="'创建日期'">
<el-date-picker <el-date-picker

34
src/views/marketing/shoppingUpgrade/record.vue
View File

@ -23,23 +23,15 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="'活动状态'"> <el-form-item :label="'会员编号'">
<el-select <el-input
v-model="select.activityStatus" v-model="select.memberCode"
clearable clearable
:placeholder="'请选择'"
>
<el-option
v-for="item in actStatus"
:key="item.value"
:label="item.label"
:value="item.value"
/> />
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item :label="'开始日期'"> <el-form-item :label="'创建日期'">
<el-date-picker <el-date-picker
v-model="creationTime" v-model="creationTime"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
@ -51,19 +43,7 @@
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8">
<el-form-item :label="'结束日期'">
<el-date-picker
v-model="creationTime1"
value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange"
:range-separator="'至'"
:start-placeholder="'开始日期'"
:end-placeholder="'结束日期'"
@change="changeTime1"
/>
</el-form-item>
</el-col>
<!-- <el-col :span="8"> <!-- <el-col :span="8">
<el-form-item :label="'创建日期'"> <el-form-item :label="'创建日期'">
<el-date-picker <el-date-picker
@ -248,10 +228,10 @@ export default {
}, },
changeTime(val) { changeTime(val) {
this.select.startActStartDate = val ? val[0] : '' this.select.startActStartDate = val ? val[0] : ''
this.select.endActStartDate = val ? val[1] : '' this.select.startActEndDate = val ? val[1] : ''
}, },
changeTime1(val) { changeTime1(val) {
this.select.startActEndDate = val ? val[0] : '' this.select.endActStartDate = val ? val[0] : ''
this.select.endActEndDate = val ? val[1] : '' this.select.endActEndDate = val ? val[1] : ''
}, },
changeTime2(val) { changeTime2(val) {