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

Merge branch 'bd-dev' of 47.94.45.65:angelo/web-base-admin into bd-test

This commit is contained in:
woody 2025-09-23 16:57:50 +08:00
parent 5f4a1159ca b1ec67cfac
commit 69e6ea1c9d
5 changed files with 358 additions and 677 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/giftGoods.js
View File

@ -354,7 +354,7 @@ export function lotteryRuleConfigSubmit(data) {
// 直推赠送 // 直推赠送
export function directRuleConfigSubmit(data) { export function directRuleConfigSubmit(data) {
return request({ return request({
url: '/sale/manage/recommend/submit', url: '/sale/manage/recommend/directPushUpgrade',
method: 'post', method: 'post',
data data
}) })

10
src/router/index.js
View File

@ -2004,15 +2004,15 @@ export const constantRoutes = [
}, },
{ {
path: 'directGifts', path: 'directUpgrade',
name: 'DirectGifts', name: 'DirectUpgrade',
component: ParentView, component: ParentView,
children: [ children: [
{ {
path: 'directGiftsList', path: 'directUpgradeList',
name: 'DirectGiftsList', name: 'DirectUpgradeList',
component: () => import('@/views/marketing/directGifts/index'), component: () => import('@/views/marketing/directGifts/index'),
meta: { title: '直推赠送' } meta: { title: '直推升级' }
}, },
{ {
path: 'addDirect', path: 'addDirect',

101
src/views/marketing/directGifts/addDirect.vue
View File

@ -68,69 +68,6 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row>
<el-col :span="24">
<el-form-item :label="'目标用户群体'" required>
<div class="flexed">
<el-checkbox
v-model="ruleForm.checked1"
class="flexed_l"
:disabled="lookOver"
@change="getCheckTit($event, 1)"
>{{ '注册等级' }}</el-checkbox>
<el-checkbox-group
v-model="ruleForm.levelList"
:disabled="lookOver"
@change="getCheck"
>
<el-checkbox
v-for="item in gradeList"
:key="item.pkId"
:label="item.pkId"
>{{ item.gradeName }}</el-checkbox>
</el-checkbox-group>
</div>
<div class="flexed">
<el-checkbox
v-model="ruleForm.checked2"
class="flexed_l"
:disabled="lookOver"
@change="getCheckTit($event, 2)"
>{{ '真实奖衔' }}</el-checkbox>
<el-checkbox-group
v-model="ruleForm.realList"
:disabled="lookOver"
@change="getCheck"
>
<el-checkbox
v-for="item in awardsList"
:key="item.pkId"
:label="item.pkId"
>{{ item.awardsName }}</el-checkbox>
</el-checkbox-group>
</div>
<div class="flexed">
<el-checkbox
v-model="ruleForm.checked3"
class="flexed_l"
:disabled="lookOver"
@change="getCheckTit($event, 3)"
>{{ '权限中心' }}</el-checkbox>
<el-checkbox-group
v-model="ruleForm.centerList"
:disabled="lookOver"
@change="getCheck"
>
<el-checkbox
v-for="item in registList"
:key="item.value"
:label="item.value"
>{{ item.label }}</el-checkbox>
</el-checkbox-group>
</div>
</el-form-item>
</el-col>
</el-row>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item :label="'活动时间'" prop="ruleFormTime"> <el-form-item :label="'活动时间'" prop="ruleFormTime">
@ -166,12 +103,8 @@
</el-form> </el-form>
</div> </div>
<repurchQuan v-show="tabActive == 1" ref="repurchQuan" />
<directUpdata v-show="tabActive == 2" ref="directUpdata" /> <directUpdata v-show="tabActive == 2" ref="directUpdata" />
<directAverage
v-show="tabActive == 3"
ref="directAverage"
/>
</div> </div>
<div v-show="controlType != 4" class="footer"> <div v-show="controlType != 4" class="footer">
<el-button size="small" class="cancelBtn" @click="$router.back()"> <el-button size="small" class="cancelBtn" @click="$router.back()">
@ -189,17 +122,12 @@ import Editor from '@/components/Editor'
import * as api from '@/api/giftGoods.js' import * as api from '@/api/giftGoods.js'
import topBar from '@/components/topBar' import topBar from '@/components/topBar'
import ImageUpload from '@/components/ImageUpload' import ImageUpload from '@/components/ImageUpload'
import repurchQuan from '@/views/marketing/directGifts/repurchQuan'
import directUpdata from '@/views/marketing/directGifts/directUpdata' import directUpdata from '@/views/marketing/directGifts/directUpdata'
import directAverage from '@/views/marketing/directGifts/directAverage'
export default { export default {
name: 'GiftGoodsList', name: 'AddDirectPushUpgrade',
components: { components: {
topBar,
ImageUpload, ImageUpload,
repurchQuan,
directUpdata, directUpdata,
directAverage,
Editor Editor
}, },
data() { data() {
@ -210,17 +138,9 @@ export default {
name: '基本信息', name: '基本信息',
id: 0 id: 0
}, },
{
name: '复购券',
id: 1
},
{ {
name: '直推升级', name: '直推升级',
id: 2 id: 2
},
{
name: '复购券均分',
id: 3
} }
], ],
uploadImgUrl: process.env.VUE_APP_BASE_API + '/system/upload', uploadImgUrl: process.env.VUE_APP_BASE_API + '/system/upload',
@ -245,9 +165,6 @@ export default {
actCover: [ actCover: [
{ required: true, message: '请上传活动封面', trigger: 'change' } { required: true, message: '请上传活动封面', trigger: 'change' }
], ],
goalMemberConfigList: [
{ required: true, message: '请选择目标用户群体', trigger: 'change' }
],
ruleFormTime: [ ruleFormTime: [
{ required: true, message: '请选择活动时间', trigger: 'change' } { required: true, message: '请选择活动时间', trigger: 'change' }
], ],
@ -330,16 +247,10 @@ export default {
this.$set(this.ruleForm, 'realList', arr2) this.$set(this.ruleForm, 'realList', arr2)
this.$set(this.ruleForm, 'centerList', arr3) this.$set(this.ruleForm, 'centerList', arr3)
this.$refs.repurchQuan.getPage(
this.addData.repurchaseCouponsShowList || ''
)
this.$refs.directUpdata.getPage( this.$refs.directUpdata.getPage(
this.addData.recommendUpgradeList || '' this.addData.recommendUpgradeList || ''
) )
this.$refs.directUpdata.getPages(this.addData.authorityList || '') this.$refs.directUpdata.getPages(this.addData.authorityList || '')
this.$refs.directAverage.getPage(
this.addData.acRecommendSharVO || ''
)
const that = this const that = this
setTimeout(() => { setTimeout(() => {
@ -379,12 +290,8 @@ export default {
this.$set(this.ruleForm, 'realList', arr2) this.$set(this.ruleForm, 'realList', arr2)
this.$set(this.ruleForm, 'centerList', arr3) this.$set(this.ruleForm, 'centerList', arr3)
this.$refs.repurchQuan.getPage(
this.addData.repurchaseCouponsShowList || ''
)
this.$refs.directUpdata.getPage(this.addData.recommendUpgradeList || '') this.$refs.directUpdata.getPage(this.addData.recommendUpgradeList || '')
this.$refs.directUpdata.getPages(this.addData.authorityList || '') this.$refs.directUpdata.getPages(this.addData.authorityList || '')
this.$refs.directAverage.getPage(this.addData.acRecommendSharVO || '')
const that = this const that = this
setTimeout(() => { setTimeout(() => {
@ -494,11 +401,9 @@ export default {
{ {
controlType: this.controlType, controlType: this.controlType,
activityParam: this.ruleForm, activityParam: this.ruleForm,
repurchaseCouponsShowList: this.$refs.repurchQuan.allData,
recommendUpgradeList: recommendUpgradeList:
this.$refs.directUpdata.recommendUpgradeList, this.$refs.directUpdata.recommendUpgradeList,
authorityList: this.$refs.directUpdata.form.waresAuthorityList, authorityList: this.$refs.directUpdata.form.waresAuthorityList
acRecommendSharVO: this.$refs.directAverage.allData?.[0] || ''
} }
) )
api.directRuleConfigSubmit(obj).then((res) => { api.directRuleConfigSubmit(obj).then((res) => {

590
src/views/marketing/directGifts/directUpdata.vue
View File

@ -7,19 +7,22 @@
<template> <template>
<div class=""> <div class="">
<div class="tit">{{ '直推升级' }}</div> <div class="tit">{{ '直推升级' }}</div>
<div class="xian"></div> <div class="xian" />
<div class="table"> <div class="table">
<!-- 批量操作 --> <!-- 批量操作 -->
<table> <table>
<tr> <tr>
<th colspan="1" class="tableLeft"> <th colspan="1" class="tableLeft">
<el-button type="primary" @click="addNewGoods" size="mini" <el-button
type="primary"
size="mini"
@click="addNewGoods"
>{{ '添加' }} >{{ '添加' }}
</el-button> </el-button>
</th> </th>
<th colspan="2" style="padding-bottom: 0; border: 0"> <th colspan="2" style="padding-bottom: 0; border: 0">
<div class="tableFlex"> <div class="tableFlex">
<div class="tableFlex_i"></div> <div class="tableFlex_i" />
</div> </div>
</th> </th>
<th colspan="6" style="padding-bottom: 0; border: 0"> <th colspan="6" style="padding-bottom: 0; border: 0">
@ -35,16 +38,15 @@
:key="item.pkId" :key="item.pkId"
:label="item.gradeName" :label="item.gradeName"
:value="item.pkId" :value="item.pkId"
> />
</el-option>
</el-select> </el-select>
</div> </div>
<div class="tableFlex_i"> <div class="tableFlex_i">
<el-input <el-input
v-model="plcz.recommendNumber"
:placeholder="'推荐数量'" :placeholder="'推荐数量'"
size="medium" size="medium"
v-model="plcz.recommendNumber" />
></el-input>
</div> </div>
<div class="tableFlex_i"> <div class="tableFlex_i">
<el-select <el-select
@ -57,37 +59,35 @@
:key="item.pkId" :key="item.pkId"
:label="item.gradeName" :label="item.gradeName"
:value="item.pkId" :value="item.pkId"
> />
</el-option>
</el-select> </el-select>
</div> </div>
</div> </div>
</th> </th>
<th colspan="7" style="padding-bottom: 0; border-left: 0"> <th colspan="7" style="padding-bottom: 0; border-left: 0">
<div class="tableFlex"> <div class="tableFlex">
<div class="tableFlex_i"></div> <div class="tableFlex_i" />
<div class="tableFlex_i"></div> <div class="tableFlex_i" />
<div class="tableFlex_i"> <div class="tableFlex_i">
<el-input <el-input
v-model="plcz.quantity"
:placeholder="'赠送数量'" :placeholder="'赠送数量'"
size="medium" size="medium"
v-model="plcz.quantity" />
></el-input>
</div> </div>
<div class="tableAdd"></div> <div class="tableAdd" />
</div> </div>
</th> </th>
<th colspan="2" style="padding-bottom: 0"> <th colspan="2" style="padding-bottom: 0">
<div class="tableFlex"> <div class="tableFlex">
<div class="tableFlex_i"> <div class="tableFlex_i">
<el-button type="primary" @click="toPlcz" size="mini">{{ <el-button type="primary" size="mini" @click="toPlcz">{{
'批量操作' '批量操作'
}}</el-button> }}</el-button>
</div> </div>
<div class="tableFlex_i"> <div class="tableFlex_i">
<el-button size="mini" @click="reset"> <el-button size="mini" @click="reset">
{{ '重置' }}</el-button {{ '重置' }}</el-button>
>
</div> </div>
</div> </div>
</th> </th>
@ -95,7 +95,7 @@
</table> </table>
<table class="table_b"> <table class="table_b">
<tr style="border-top: 0"> <tr style="border-top: 0">
<td style="border: 0"></td> <td style="border: 0" />
<td colspan="2">{{ '结算等级' }}</td> <td colspan="2">{{ '结算等级' }}</td>
<td colspan="6" style="padding-bottom: 0"> <td colspan="6" style="padding-bottom: 0">
<div class="tableFlex"> <div class="tableFlex">
@ -105,18 +105,18 @@
<div class="tableFlex_i">{{ '升级等级' }}</div> <div class="tableFlex_i">{{ '升级等级' }}</div>
</div> </div>
</td> </td>
<td colspan="7" style="padding-bottom: 0"> <!-- <td colspan="7" style="padding-bottom: 0">
<div class="tableFlex"> <div class="tableFlex">
<div class="tableFlex_i">{{ '赠送产品' }}</div> <div class="tableFlex_i">{{ '赠送产品' }}</div>
<div class="tableFlex_i">{{ '产品规格' }}</div> <div class="tableFlex_i">{{ '产品规格' }}</div>
<div class="tableFlex_i">{{ '赠送数量' }}</div> <div class="tableFlex_i">{{ '赠送数量' }}</div>
<div class="tableAdd"></div> <div class="tableAdd" />
</div> </div>
</td> </td> -->
<td colspan="2" style="border: 0"></td> <td colspan="2" style="border: 0" />
</tr> </tr>
<tr v-for="(item, index) in recommendUpgradeList" :key="index"> <tr v-for="(item, index) in recommendUpgradeList" :key="index">
<td style="border: 0"></td> <td style="border: 0" />
<td colspan="2" style="padding-bottom: 0"> <td colspan="2" style="padding-bottom: 0">
<div class="tableFlex"> <div class="tableFlex">
<div class="tableFlex_i"> <div class="tableFlex_i">
@ -130,8 +130,7 @@
:key="item.pkId" :key="item.pkId"
:label="item.gradeName" :label="item.gradeName"
:value="item.pkId" :value="item.pkId"
> />
</el-option>
</el-select> </el-select>
</div> </div>
</div> </div>
@ -160,16 +159,15 @@
:key="item.pkId" :key="item.pkId"
:label="item.gradeName" :label="item.gradeName"
:value="item.pkId" :value="item.pkId"
> />
</el-option>
</el-select> </el-select>
</div> </div>
<div class="tableFlex_i"> <div class="tableFlex_i">
<el-input <el-input
v-model="item.recommendNumber"
:placeholder="'推荐数量'" :placeholder="'推荐数量'"
size="medium" size="medium"
v-model="item.recommendNumber" />
></el-input>
</div> </div>
<div class="tableFlex_i"> <div class="tableFlex_i">
<el-select <el-select
@ -182,291 +180,29 @@
:key="item.pkId" :key="item.pkId"
:label="item.gradeName" :label="item.gradeName"
:value="item.pkId" :value="item.pkId"
> />
</el-option>
</el-select> </el-select>
</div> </div>
</div> </div>
</td> </td>
<td colspan="7" style="padding-bottom: 0">
<div <td colspan="2" style="border: 0" />
class="tableFlex"
v-for="(ctem, cndex) in item.giftConfigList"
:key="cndex"
>
<div class="tableFlex_i">
<el-input
:placeholder="'请选择赠送产品'"
v-model="ctem.productName"
@focus="getProduct(index, cndex)"
></el-input>
</div>
<div class="tableFlex_i">
<el-input
disabled
size="medium"
v-model="ctem.specsName"
></el-input>
</div>
<div class="tableFlex_i">
<el-input size="medium" v-model="ctem.quantity"></el-input>
</div>
<div class="tableAdd">
<img
src="@/assets/images/iconpop.png"
@click="reduceProduct(index, cndex)"
alt=""
/>
<img
v-if="cndex == item.giftConfigList.length - 1"
src="@/assets/images/iconadd.png"
@click="addProduct(index)"
alt=""
/>
</div>
</div>
<div class="tableAddPro" v-show="item.giftConfigList.length == 0">
{{ '添加产品' }}
<img
src="@/assets/images/iconadd.png"
@click="addProduct(index)"
alt=""
/>
</div>
</td>
<td colspan="2" style="border: 0"></td>
</tr> </tr>
</table> </table>
</div> </div>
<div class="teamPz">
<div class="tit">{{ '团队配置' }}</div>
<div class="xian"></div>
<el-form
ref="team"
:model="form"
style="width: 1200px; padding: 0 20px"
label-width="120px"
>
<el-row
:gutter="20"
v-for="(item, index) in form.waresAuthorityList"
:key="index"
>
<el-col :span="10">
<el-form-item :label="'可见类型'">
<el-select
clearable
v-model="item.authorityType"
@change="getTeamList(item.authorityType)"
>
<el-option
v-for="cld in xyList"
v-show="!(index > 0 && cld.value == 5)"
:key="cld.value"
:label="cld.label"
:value="cld.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col
:span="10"
v-if="form.waresAuthorityList[index].authorityType != 5"
>
<el-form-item :label="'团队编号'">
<el-input
clearable
v-model="item.memberCode"
:placeholder="'请输入'"
></el-input>
</el-form-item>
</el-col>
<el-col
v-if="
form.waresAuthorityList[index].authorityType != 5 &&
index !== form.waresAuthorityList.length - 1
"
:span="4"
>
<i
class="el-icon-remove-outline addIcon"
@click="removeTeamPz(index)"
></i>
</el-col>
<el-col
v-if="
form.waresAuthorityList[index].authorityType != 5 &&
index == form.waresAuthorityList.length - 1
"
:span="4"
>
<i
class="el-icon-circle-plus-outline addIcon"
@click="addTeamPz"
></i>
</el-col>
</el-row>
</el-form>
<!-- <Ggmx ref="ggmxed"></Ggmx> -->
</div>
<!-- <div class="footer">
<el-button size="small"
class="thebtn2"> {{ '取消' }}</el-button>
<el-button size="small"
@click="submit"
class="thebtn1"> {{ '确认' }}</el-button>
</div> -->
<el-dialog
:title="'添加'"
:visible.sync="dialogVisible"
:close-on-click-modal="false"
width="40%"
center
:before-close="handleClose"
>
<div class="cpHeight">
<el-row>
<el-col :span="22">
<el-input
v-model="select.queryInfo"
clearable
:placeholder="'请输入'"
@keyup.enter.native="getDataList"
prefix-icon="el-icon-search"
></el-input>
</el-col>
<el-col :span="2">
<el-button type="primary" size="small" @click="getDataList">
{{ '搜索' }}</el-button
>
</el-col>
</el-row>
<div style="height: 10px"></div>
<el-table
:data="dialogList"
ref="multipleTable"
style="width: 100%"
@select-all="onSelectAll"
@select="selected"
:header-cell-style="{ background: '#EEEEEE' }"
:row-class-name="tableRowClassName"
>
<el-table-column type="selection" width="55"> </el-table-column>
<el-table-column
align="center"
prop="productName"
:label="'产品名称'"
>
</el-table-column>
<el-table-column
align="center"
prop="productCode"
:label="'产品编号'"
>
</el-table-column>
<el-table-column
align="center"
prop="productName"
:label="'规格'"
>
<template slot-scope="scope">
<div
class="blueCor"
v-show="
scope.row.selSkuNameList == '' ||
scope.row.selSkuNameList == undefined
"
@click="selSku(scope.row.pkId, scope.$index)"
>
{{ '选择规格' }}
</div>
<div
class="blueCor"
v-show="
scope.row.selSkuNameList != '' &&
scope.row.selSkuNameList != undefined
"
@click="selSku(scope.row.pkId, scope.$index)"
>
{{ scope.row.selSkuNameList }}
</div>
</template>
</el-table-column>
<el-table-column
align="center"
prop="productName"
:label="'商品数量'"
>
<template slot-scope="scope">
<el-input-number
size="mini"
v-model="scope.row.quantity"
:min="1"
></el-input-number>
</template>
</el-table-column>
</el-table>
</div>
<pagination
v-show="total > 0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getDataList"
/>
<span slot="footer" class="dialog-footer">
<el-button @click="handleClose">{{ '取消' }}</el-button>
<el-button type="primary" @click="sureProduct">{{
'确认'
}}</el-button>
</span>
</el-dialog>
<el-dialog
:title="'规格'"
:visible.sync="ggVisible"
:close-on-click-modal="false"
width="40%"
center
:before-close="handleCloseGg"
>
<div>
<el-form>
<el-form-item
:label="item.typeName"
v-for="(item, index) in skuList"
:key="index"
>
<el-radio-group v-model="item.pkProductSku">
<el-radio
v-for="(ctem, cndex) in item.specsList"
@change="getCheckBox(item.pkId, item.specsName)"
:key="ctem.pkId"
:label="ctem.pkId"
>{{ ctem.specsName }}</el-radio
>
</el-radio-group>
</el-form-item>
</el-form>
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="handleCloseGg">{{ '取消' }}</el-button>
<el-button type="primary" @click="sureSku">{{
'确认'
}}</el-button>
</span>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
import * as api from "@/api/giftGoods.js"; import * as api from '@/api/giftGoods.js'
import * as pro from "@/api/product.js"; import * as pro from '@/api/product.js'
import topBar from "@/components/topBar"; import topBar from '@/components/topBar'
import ImageUpload from "@/components/ImageUpload"; import ImageUpload from '@/components/ImageUpload'
export default { export default {
components: { components: {
topBar, topBar,
ImageUpload, ImageUpload
}, },
data() { data() {
return { return {
@ -474,247 +210,247 @@ export default {
ggVisible: false, ggVisible: false,
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 50, pageSize: 50
}, },
form: { form: {
waresAuthorityList: [ waresAuthorityList: [
{ {
authorityType: 5, authorityType: 5,
memberCode: "", memberCode: ''
}, }
], ]
}, },
total: 0, total: 0,
moren: "setGiftGoodsInfo", moren: 'setGiftGoodsInfo',
allData: [], // 全部数据 allData: [], // 全部数据
areaList: [], // 全部专区 areaList: [], // 全部专区
isArea: "", isArea: '',
plcz: {}, plcz: {},
select: {}, // 产品筛选 select: {}, // 产品筛选
dialogList: [], // 产品数组 dialogList: [], // 产品数组
selectData: [], // 选中 selectData: [], // 选中
skuList: [], // 规格数组 skuList: [], // 规格数组
gradeList: [], // 规格数组 gradeList: [], // 规格数组
selSkuList: "", selSkuList: '',
selSkuNameList: "", selSkuNameList: '',
selIndex: "", selIndex: '',
showCndex: "", showCndex: '',
showIndex: "", showIndex: '',
pageData: {}, pageData: {},
recommendUpgradeList: [], recommendUpgradeList: [],
xyList: [], xyList: []
}; }
}, },
mounted() { mounted() {
this.getData(); this.getData()
// 血缘关系 // 血缘关系
this.getXYList(); this.getXYList()
}, },
methods: { methods: {
addTeamPz() { addTeamPz() {
this.form.waresAuthorityList.push({ this.form.waresAuthorityList.push({
kjlx: "", kjlx: '',
teamOrder: "", teamOrder: ''
}); })
}, },
removeTeamPz(index) { removeTeamPz(index) {
this.form.waresAuthorityList.splice(index, 1); this.form.waresAuthorityList.splice(index, 1)
}, },
getXYList() { getXYList() {
pro.getEWaresPermissionTypeList().then((res) => { pro.getEWaresPermissionTypeList().then((res) => {
console.log( console.log(
"%c [ res ]-451", '%c [ res ]-451',
"font-size:13px; background:#73d160; color:#b7ffa4;", 'font-size:13px; background:#73d160; color:#b7ffa4;',
res res
); )
this.xyList = res.data; this.xyList = res.data
}); })
}, },
getTeamList(val) { getTeamList(val) {
if (val == 5) { if (val == 5) {
this.form.waresAuthorityList = [ this.form.waresAuthorityList = [
{ {
authorityType: 5, authorityType: 5,
memberCode: "", memberCode: ''
}, }
]; ]
} }
}, },
getPages(allData) { getPages(allData) {
if (allData != "") { if (allData != '') {
this.form.waresAuthorityList = allData; this.form.waresAuthorityList = allData
} }
}, },
getPage(allData) { getPage(allData) {
if (allData != "") { if (allData != '') {
allData.forEach((item) => { allData.forEach((item) => {
if (!item.giftConfigList) { if (!item.giftConfigList) {
item.giftConfigList = []; item.giftConfigList = []
} }
}); })
this.recommendUpgradeList = allData; this.recommendUpgradeList = allData
console.log( console.log(
"%c [ this.recommendUpgradeList ]-382", '%c [ this.recommendUpgradeList ]-382',
"font-size:13px; background:#5c5250; color:#a09694;", 'font-size:13px; background:#5c5250; color:#a09694;',
this.recommendUpgradeList this.recommendUpgradeList
); )
} }
}, },
getData() { getData() {
api.gradeList().then((res) => { api.gradeList().then((res) => {
this.gradeList = res.rows; this.gradeList = res.rows
}); })
}, },
sureSku() { sureSku() {
this.$set(this.dialogList[this.selIndex], "selSkuList", this.selSkuList); this.$set(this.dialogList[this.selIndex], 'selSkuList', this.selSkuList)
this.$set( this.$set(
this.dialogList[this.selIndex], this.dialogList[this.selIndex],
"selSkuNameList", 'selSkuNameList',
this.selSkuNameList this.selSkuNameList
); )
this.ggVisible = false; this.ggVisible = false
}, },
sureProduct() { sureProduct() {
if (this.selectData.length == 0) { if (this.selectData.length == 0) {
this.$message({ this.$message({
message: '请选择产品', message: '请选择产品',
type: "warning", type: 'warning'
}); })
return false; return false
} else { } else {
this.recommendUpgradeList[this.showIndex].giftConfigList[ this.recommendUpgradeList[this.showIndex].giftConfigList[
this.showCndex this.showCndex
].pkProduct = this.selectData.pkId; ].pkProduct = this.selectData.pkId
this.recommendUpgradeList[this.showIndex].giftConfigList[ this.recommendUpgradeList[this.showIndex].giftConfigList[
this.showCndex this.showCndex
].productName = this.selectData.productName; ].productName = this.selectData.productName
this.recommendUpgradeList[this.showIndex].giftConfigList[ this.recommendUpgradeList[this.showIndex].giftConfigList[
this.showCndex this.showCndex
].specsName = this.selectData.selSkuNameList; ].specsName = this.selectData.selSkuNameList
this.recommendUpgradeList[this.showIndex].giftConfigList[ this.recommendUpgradeList[this.showIndex].giftConfigList[
this.showCndex this.showCndex
].specsNameId = this.selectData.selSkuList; ].specsNameId = this.selectData.selSkuList
this.recommendUpgradeList[this.showIndex].giftConfigList[ this.recommendUpgradeList[this.showIndex].giftConfigList[
this.showCndex this.showCndex
].quantity = this.selectData.quantity; ].quantity = this.selectData.quantity
this.handleClose(); this.handleClose()
this.$forceUpdate(); this.$forceUpdate()
} }
}, },
toPlcz() { toPlcz() {
this.recommendUpgradeList.forEach((stem) => { this.recommendUpgradeList.forEach((stem) => {
stem.giftConfigList.forEach((ctem) => { stem.giftConfigList.forEach((ctem) => {
ctem.quantity = this.plcz.quantity; ctem.quantity = this.plcz.quantity
stem.pkRecommendGrade = this.plcz.pkRecommendGrade; stem.pkRecommendGrade = this.plcz.pkRecommendGrade
stem.recommendNumber = this.plcz.recommendNumber; stem.recommendNumber = this.plcz.recommendNumber
stem.pkUpgradeGrade = this.plcz.pkUpgradeGrade; stem.pkUpgradeGrade = this.plcz.pkUpgradeGrade
}); })
}); })
}, },
reset() { reset() {
this.plcz = {}; this.plcz = {}
}, },
getCheckBox() { getCheckBox() {
let arr1 = [], const arr1 = []
arr2 = []; const arr2 = []
this.skuList.forEach((item) => { this.skuList.forEach((item) => {
item.specsList.forEach((ctem) => { item.specsList.forEach((ctem) => {
if (ctem.pkId == item.pkProductSku) { if (ctem.pkId == item.pkProductSku) {
arr1.push(ctem.pkId); arr1.push(ctem.pkId)
arr2.push(ctem.specsName); arr2.push(ctem.specsName)
} }
}); })
}); })
this.selSkuList = arr1.join(","); this.selSkuList = arr1.join(',')
this.selSkuNameList = arr2.join(","); this.selSkuNameList = arr2.join(',')
}, },
setArea(val) { setArea(val) {
this.isArea = val; this.isArea = val
}, },
handleClose() { handleClose() {
this.selectData = []; this.selectData = []
this.dialogVisible = false; this.dialogVisible = false
}, },
handleCloseGg() { handleCloseGg() {
this.ggVisible = false; this.ggVisible = false
}, },
getProduct(index, cndex) { getProduct(index, cndex) {
this.showIndex = index; this.showIndex = index
this.showCndex = cndex; this.showCndex = cndex
this.getDataList(); this.getDataList()
this.dialogVisible = true; this.dialogVisible = true
}, },
addProduct(index, sndex) { addProduct(index, sndex) {
this.recommendUpgradeList[index].giftConfigList.push({ this.recommendUpgradeList[index].giftConfigList.push({
pkProduct: "", pkProduct: '',
productName: "", productName: '',
specsName: "", specsName: '',
specsNameId: "", specsNameId: '',
quantity: "", quantity: ''
}); })
this.$forceUpdate(); this.$forceUpdate()
}, },
reduceProduct(index, cndex) { reduceProduct(index, cndex) {
this.recommendUpgradeList[index].giftConfigList.splice(cndex, 1); this.recommendUpgradeList[index].giftConfigList.splice(cndex, 1)
this.$forceUpdate(); this.$forceUpdate()
}, },
addNewGoods() { addNewGoods() {
this.recommendUpgradeList.push({ this.recommendUpgradeList.push({
pkSettleGrade: "", pkSettleGrade: '',
pkRecommendGrade: "", pkRecommendGrade: '',
recommendNumber: "", recommendNumber: '',
pkUpgradeGrade: "", pkUpgradeGrade: '',
giftConfigList: [ giftConfigList: [
{ {
pkProduct: "", pkProduct: '',
productName: "", productName: '',
specsName: "", specsName: '',
specsNameId: "", specsNameId: '',
quantity: "", quantity: ''
}, }
], ]
}); })
}, },
selSku(pkId, index) { selSku(pkId, index) {
this.selIndex = index; this.selIndex = index
api api
.getProductSpecs({ .getProductSpecs({
pkProduct: pkId, pkProduct: pkId
}) })
.then((res) => { .then((res) => {
let arr1 = [], const arr1 = []
arr2 = []; const arr2 = []
res.data.forEach((item) => { res.data.forEach((item) => {
item.pkProductSku = item.specsList[0].pkId; item.pkProductSku = item.specsList[0].pkId
arr1.push(item.specsList[0].pkId); arr1.push(item.specsList[0].pkId)
arr2.push(item.specsList[0].specsName); arr2.push(item.specsList[0].specsName)
}); })
this.selSkuList = arr1.join(","); this.selSkuList = arr1.join(',')
this.selSkuNameList = arr2.join(","); this.selSkuNameList = arr2.join(',')
this.skuList = res.data; this.skuList = res.data
this.ggVisible = true; this.ggVisible = true
}); })
}, },
getDataList() { getDataList() {
api api
.getProductAll( .getProductAll(
Object.assign({ isPutOn: 0 }, this.queryParams, this.select, { Object.assign({ isPutOn: 0 }, this.queryParams, this.select, {
isExistSpecs: 1, isExistSpecs: 1
}) })
) )
.then((res) => { .then((res) => {
res.rows.forEach((item) => { res.rows.forEach((item) => {
item.quantity = 1; item.quantity = 1
}); })
this.dialogList = res.rows; this.dialogList = res.rows
this.total = res.total; this.total = res.total
}); })
}, },
// submit() { // submit() {
// let obj = Object.assign({}, this.pageData, { // let obj = Object.assign({}, this.pageData, {
@ -737,32 +473,32 @@ export default {
// }) // })
// }, // },
onSelectAll() { onSelectAll() {
this.$refs.multipleTable.clearSelection(); this.$refs.multipleTable.clearSelection()
}, },
selected(selection, row) { selected(selection, row) {
// 清除 所有勾选项 // 清除 所有勾选项
this.$refs.multipleTable.clearSelection(); this.$refs.multipleTable.clearSelection()
// 当表格数据都没有被勾选的时候 就返回 // 当表格数据都没有被勾选的时候 就返回
// 主要用于将当前勾选的表格状态清除 // 主要用于将当前勾选的表格状态清除
if (selection.length == 0) return; if (selection.length == 0) return
this.$refs.multipleTable.toggleRowSelection(row, true); this.$refs.multipleTable.toggleRowSelection(row, true)
this.selectData = row; this.selectData = row
}, },
// 表格的选中 可以获得当前选中的数据 // 表格的选中 可以获得当前选中的数据
selectionChange(val) { selectionChange(val) {
// 将选中的数据存储起来 // 将选中的数据存储起来
this.selectData = val; this.selectData = val
}, },
tableRowClassName({ row, rowIndex }) { tableRowClassName({ row, rowIndex }) {
if (rowIndex % 2 == 1) { if (rowIndex % 2 == 1) {
return "warning-row"; return 'warning-row'
} else if (rowIndex % 2 == 0) { } else if (rowIndex % 2 == 0) {
return "success-row"; return 'success-row'
}
return ''
}
}
} }
return "";
},
},
};
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>

222
src/views/marketing/directGifts/index.vue
View File

@ -6,147 +6,185 @@
--> -->
<template> <template>
<div class="page"> <div class="page">
<topBar v-if="topList.length > 0" <topBar
:topList="topList" v-if="topList.length > 0"
:moren="moren"></topBar> :top-list="topList"
:moren="moren"
/>
<div class="main"> <div class="main">
<div class="form_all"> <div class="form_all">
<el-form ref="select" <el-form
ref="select"
:model="select" :model="select"
label-width="auto"> label-width="auto"
>
<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 clearable <el-input
v-model="select.actName"></el-input> v-model="select.actName"
clearable
/>
</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 clearable <el-select
v-model="select.activityStatus"
clearable
:placeholder="'请选择'" :placeholder="'请选择'"
v-model="select.activityStatus"> >
<el-option v-for="item in actStatus" <el-option
v-for="item in actStatus"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value"></el-option> :value="item.value"
/>
</el-select> </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 v-model="creationTime" <el-date-picker
@change="changeTime" v-model="creationTime"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange" type="datetimerange"
:range-separator="'至'" :range-separator="'至'"
:start-placeholder="'开始日期'" :start-placeholder="'开始日期'"
:end-placeholder="'结束日期'"> :end-placeholder="'结束日期'"
</el-date-picker> @change="changeTime"
/>
</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 v-model="creationTime1" <el-date-picker
@change="changeTime1" v-model="creationTime1"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange" type="datetimerange"
:range-separator="'至'" :range-separator="'至'"
:start-placeholder="'开始日期'" :start-placeholder="'开始日期'"
:end-placeholder="'结束日期'"> :end-placeholder="'结束日期'"
</el-date-picker> @change="changeTime1"
/>
</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 v-model="creationTime2" <el-date-picker
@change="changeTime2" v-model="creationTime2"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange" type="datetimerange"
:range-separator="'至'" :range-separator="'至'"
:start-placeholder="'开始日期'" :start-placeholder="'开始日期'"
:end-placeholder="'结束日期'"> :end-placeholder="'结束日期'"
</el-date-picker> @change="changeTime2"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-button type="primary" <el-button
type="primary"
size="small"
@click="getDataList"
> {{ '搜索' }}</el-button>
<el-button
size="small" size="small"
@click="getDataList"> {{ '搜索' }}</el-button>
<el-button size="small"
class="resetBtn" class="resetBtn"
@click="reset"> {{ '重置' }}</el-button> @click="reset"
> {{ '重置' }}</el-button>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
</div> </div>
<div class="main_a"> <div class="main_a">
<div class="mainbtn"> <div class="mainbtn">
<el-button size="small" <el-button
@click="openDig"
v-hasButtons="['directAdd']" v-hasButtons="['directAdd']"
class="addBtn">{{'添加'}}</el-button> size="small"
<el-button size="small" class="addBtn"
@click="handleExport" @click="openDig"
>{{ '添加' }}</el-button>
<el-button
v-hasButtons="['directExport']" v-hasButtons="['directExport']"
class="exportBtn"> {{ '导出' }}</el-button> size="small"
class="exportBtn"
@click="handleExport"
> {{ '导出' }}</el-button>
</div> </div>
<div class="maintable"> <div class="maintable">
<el-table :data="tableData" <el-table
v-loading="loading" v-loading="loading"
:data="tableData"
style="width: 100%" style="width: 100%"
height="710px" height="710px"
:header-cell-style="{ background: '#EEEEEE' }" :header-cell-style="{ background: '#EEEEEE' }"
:row-class-name="tableRowClassName" :row-class-name="tableRowClassName"
@selection-change="handleSelectionChange"> @selection-change="handleSelectionChange"
<el-table-column type="selection" >
width="55"> </el-table-column> <el-table-column
<el-table-column align="center" type="selection"
width="55"
/>
<el-table-column
align="center"
prop="actName" prop="actName"
:label="'活动名称'"> :label="'活动名称'"
</el-table-column> />
<el-table-column align="center" <el-table-column
align="center"
prop="actStartDate" prop="actStartDate"
:label="'开始日期'"> :label="'开始日期'"
</el-table-column> />
<el-table-column align="center" <el-table-column
align="center"
prop="actEndDate" prop="actEndDate"
:label="'结束日期'"> :label="'结束日期'"
</el-table-column> />
<el-table-column align="center" <el-table-column
align="center"
prop="status" prop="status"
:label="'活动状态'"> :label="'活动状态'"
</el-table-column> />
<el-table-column align="center" <el-table-column
align="center"
prop="creationTime" prop="creationTime"
:label="'创建日期'"> :label="'创建日期'"
</el-table-column> />
<el-table-column align="center" <el-table-column
align="center"
prop="time" prop="time"
:label="'操作'" :label="'操作'"
fixed="right"> fixed="right"
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-button @click="toFixed(scope.row.pkId, 4)" <el-button
type="text"
v-hasButtons="['directSee']" v-hasButtons="['directSee']"
type="text"
style="color: #48B2FD;" style="color: #48B2FD;"
size="small"> size="small"
@click="toFixed(scope.row.pkId, 4)"
>
{{ '查看' }} {{ '查看' }}
</el-button> </el-button>
<el-button @click="toFixed(scope.row.pkId, 2)" <el-button
type="text"
v-hasButtons="['directUpdata']" v-hasButtons="['directUpdata']"
type="text"
style="color: #F3A900;" style="color: #F3A900;"
size="small"> size="small"
@click="toFixed(scope.row.pkId, 2)"
>
{{ '修改' }} {{ '修改' }}
</el-button> </el-button>
<el-button @click="toFixed(scope.row.pkId,3)" <el-button
v-hasButtons="['directDel']"
type="text" type="text"
size="small" size="small"
v-hasButtons="['directDel']" style="color: #C8161D"
style="color: #C8161D"> @click="toFixed(scope.row.pkId,3)"
>
{{ '删除' }} {{ '删除' }}
</el-button> </el-button>
</template> </template>
@ -155,11 +193,13 @@
</div> </div>
</div> </div>
</div> </div>
<pagination v-show="total > 0" <pagination
v-show="total > 0"
:total="total" :total="total"
:page.sync="queryParams.pageNum" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" :limit.sync="queryParams.pageSize"
@pagination="getDataList" /> @pagination="getDataList"
/>
</div> </div>
</template> </template>
@ -169,16 +209,16 @@ import * as api from '@/api/giftGoods.js'
export default { export default {
name: 'Bzpz', name: 'Bzpz',
components: { components: {
topBar, topBar
}, },
filters: { filters: {
isAgree(val) { isAgree(val) {
if (!val) { if (!val) {
return '允许'; return '允许'
} else { } else {
return '禁止'; return '禁止'
}
} }
},
}, },
data() { data() {
return { return {
@ -189,7 +229,7 @@ export default {
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 50, pageSize: 50
}, },
addOrEdit: '', addOrEdit: '',
total: 0, total: 0,
@ -200,16 +240,16 @@ export default {
topList: [ topList: [
{ {
name: '直推赠送', name: '直推赠送',
path: 'directGiftsList', path: 'directGiftsList'
}, }
], ],
form: { form: {
name: '', name: ''
}, },
rules: { rules: {
name: [{ required: true, message: '请输入规格类型', trigger: 'blur' }], name: [{ required: true, message: '请输入规格类型', trigger: 'blur' }]
}, },
actStatus: [], actStatus: []
} }
}, },
mounted() { mounted() {
@ -233,16 +273,16 @@ 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.endActStartDate = val ? val[1] : ''
}, },
changeTime1(val) { changeTime1(val) {
this.select.startActEndDate = val ? val[0] : ""; this.select.startActEndDate = val ? val[0] : ''
this.select.endActEndDate = val ? val[1] : ""; this.select.endActEndDate = val ? val[1] : ''
}, },
changeTime2(val) { changeTime2(val) {
this.select.startCreationTime = val ? val[0] : ""; this.select.startCreationTime = val ? val[0] : ''
this.select.endCreationTime = val ? val[1] : ""; this.select.endCreationTime = val ? val[1] : ''
}, },
// 点击修改 // 点击修改
toFixed(id, index) { toFixed(id, index) {
@ -252,9 +292,9 @@ export default {
path: 'addDirect', path: 'addDirect',
query: { query: {
pkId: id, pkId: id,
controlType: index, controlType: index
// functionType:this.select.functionType // functionType:this.select.functionType
}, }
}) })
}, },
// 删除 // 删除
@ -262,7 +302,7 @@ export default {
this.$confirm('确认删除?', '提示', { this.$confirm('确认删除?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning', type: 'warning'
}).then(() => { }).then(() => {
api.activityRemove(id).then((res) => { api.activityRemove(id).then((res) => {
this.getDataList() this.getDataList()
@ -282,7 +322,7 @@ export default {
if (res.code == 200) { if (res.code == 200) {
this.$message({ this.$message({
message: res.msg, message: res.msg,
type: 'success', type: 'success'
}) })
this.dialogVisible = false this.dialogVisible = false
// 充值数据 // 充值数据
@ -305,8 +345,8 @@ export default {
this.$router.push({ this.$router.push({
path: 'addDirect', path: 'addDirect',
query: { query: {
controlType: 1, controlType: 1
}, }
}) })
}, },
@ -315,7 +355,7 @@ export default {
this.loading = true this.loading = true
api api
.directList( .directList(
Object.assign({}, this.queryParams, this.select, { actType: 13 }) Object.assign({}, this.queryParams, this.select, { actType: 30 })
) )
.then((res) => { .then((res) => {
this.tableData = res.rows this.tableData = res.rows
@ -329,7 +369,7 @@ export default {
this.$confirm('是否确认导出所有数据项?', '警告', { this.$confirm('是否确认导出所有数据项?', '警告', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning', type: 'warning'
}).then((_) => { }).then((_) => {
this.download( this.download(
'activity/manage/recommend/export', 'activity/manage/recommend/export',
@ -345,8 +385,8 @@ export default {
return 'success-row' return 'success-row'
} }
return '' return ''
}, }
}, }
} }
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">