3
0
Fork 0

feat(rechargeCard): 充值提货卡去签呈

This commit is contained in:
woody 2025-08-05 11:46:05 +08:00
parent c3878ef75f
commit f8be9c18fc
4 changed files with 247 additions and 161 deletions

View File

@ -333,7 +333,7 @@
</el-select>
</el-form-item>
</el-col>
<!-- <el-col :span="8">
<el-col :span="8">
<el-form-item label="上传盒数" prop="boxNum">
<el-input
v-model="form.boxNum"
@ -341,7 +341,7 @@
:placeholder="'请输入'"
/>
</el-form-item>
</el-col> -->
</el-col>
<el-col :span="24">
<el-form-item :label="'保证标签'">
<el-checkbox-group

View File

@ -295,7 +295,7 @@
</el-select>
</el-form-item>
</el-col>
<!-- <el-col :span="8">
<el-col :span="8">
<el-form-item label="上传盒数" prop="boxNum">
<el-input
v-model="form.boxNum"
@ -303,7 +303,7 @@
:placeholder="'请输入'"
/>
</el-form-item>
</el-col> -->
</el-col>
<el-col :span="24">
<el-form-item :label="'保证标签'">
<el-checkbox-group v-model="form.pkGuaranteeLabel">

View File

@ -30,8 +30,9 @@
<el-button
type="primary"
size="mini"
:disabled="addBtnDisabled"
@click="addNewGoods"
>{{'添加'}}
>添加
</el-button>
</th>
<th
@ -62,16 +63,16 @@
class="table_b"
>
<tr style="border-top:0">
<td colspan="2">{{ '会员编号' }}</td>
<td colspan="2">{{ '会员名称' }}</td>
<td colspan="4">{{'产品名称'}}</td>
<td colspan="4">{{'产品规格'}}</td>
<td colspan="2">{{'提货基数'}}</td>
<td colspan="2">会员编号</td>
<td colspan="2">会员名称</td>
<td colspan="4">产品名称</td>
<td colspan="4">产品规格</td>
<td colspan="2">提货基数</td>
<td colspan="2">可提数量</td>
<td colspan="2">增加数量</td>
<td colspan="2">{{ '截止日期' }}</td>
<td colspan="2">{{ '包邮类型' }}</td>
<td colspan="2">截止日期</td>
<td colspan="2">包邮类型</td>
<td colspan="2">提货来源</td>
</tr>
<tr
v-for="ctem,cndex in item.consumeRuleConfigList"
@ -120,7 +121,7 @@
v-show="ctem.waresGiftConfigList.length==0"
class="tableAddPro"
>
{{'添加产品'}}
{{ '添加产品' }}
<img
src="@/assets/images/iconadd.png"
alt=""
@ -128,33 +129,39 @@
>
</div>
</td>
<!-- 提货基数 -->
<td colspan="2" style="border-right: 1px solid #fff">
<el-input :disabled="deled" v-model="ctem.baseQuantity" />
<el-input
v-model="ctem.baseQuantity"
:disabled="deled || ctem.pickType == 8"
/>
</td>
<!-- 可提数量 -->
<td colspan="2" style="border-right: 1px solid #fff">
<el-input disabled v-model="ctem.usableQuantity" />
<el-input v-model="ctem.usableQuantity" disabled />
</td>
<!-- 增加数量 -->
<td colspan="2" style="border-right: 1px solid #fff">
<el-input :disabled="deled" v-model="ctem.quantity" />
<el-input v-model="ctem.quantity" :disabled="deled" />
</td>
<!-- 截止日期 -->
<td colspan="2" style="border-right: 1px solid #fff">
<!-- <el-input v-model="ctem.orderAchieve"></el-input>-->
<el-date-picker
:disabled="deled"
v-model="ctem.receiveTime"
:disabled="deled || (ctem.pickType == 8 && !addFlag)"
type="date"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
:placeholder="'请选择时间'"
/>
</td>
<!-- 包邮类型 -->
<td colspan="2">
<el-select
v-model="ctem.isFreeMail"
clearable
:disabled="deled"
:disabled="deled || (ctem.pickType == 8 && !addFlag)"
>
<el-option
v-for="item in postList"
@ -212,6 +219,15 @@
</el-checkbox-group>
</div>
</td>
<td colspan="2">
<el-select
v-model="ctem.pickType"
:disabled="disableds"
@change="(val) => pickTypeChange(val, ctem)"
>
<el-option v-for="item in pickTypeList" :key="item.val" :label="item.text" :value="item.val" />
</el-select>
</td>
</tr>
</table>
</div>
@ -233,18 +249,22 @@
>
<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>
<el-col :span="22"> <el-input
v-model="select.queryInfo"
clearable
:placeholder="'请输入'"
prefix-icon="el-icon-search"
@keyup.enter.native="getDataList"
/>
</el-col>
<el-col :span="2">
<el-button
type="primary"
size="small"
@click="getDataList"
> {{ '搜索' }}</el-button>
</el-col>
</el-row>
<div style="height:10px" />
<el-table
ref="multipleTable"
@ -264,10 +284,11 @@
prop="productName"
:label="'产品名称'"
/>
<el-table-column align="center"
prop="productCode"
:label="'产品编号'">
</el-table-column>
<el-table-column
align="center"
prop="productCode"
:label="'产品编号'"
/>
<el-table-column
align="center"
prop="productName"
@ -278,7 +299,7 @@
v-show="scope.row.selSkuNameList==''||scope.row.selSkuNameList==undefined"
class="blueCor"
@click="selSku(scope.row.pkId,scope.$index)"
>{{'选择规格'}}</div>
>{{ '选择规格' }}</div>
<div
v-show="scope.row.selSkuNameList!=''&&scope.row.selSkuNameList!=undefined"
class="blueCor"
@ -313,11 +334,11 @@
slot="footer"
class="dialog-footer"
>
<el-button @click="handleClose">{{'取消'}}</el-button>
<el-button @click="handleClose">{{ '取消' }}</el-button>
<el-button
type="primary"
@click="sureProduct"
>{{'确认'}}</el-button>
>{{ '确认' }}</el-button>
</span>
</el-dialog>
<el-dialog
@ -350,11 +371,11 @@
slot="footer"
class="dialog-footer"
>
<el-button @click="handleCloseGg">{{'取消'}}</el-button>
<el-button @click="handleCloseGg">{{ '取消' }}</el-button>
<el-button
type="primary"
@click="sureSku"
>{{'确认'}}</el-button>
>{{ '确认' }}</el-button>
</span>
</el-dialog>
</div>
@ -366,14 +387,14 @@
@click="cancelCz"
> {{ '取消' }}</el-button>
<el-button
v-if="!deled"
v-if="!deled"
type="primary"
class="thebtn"
style="margin-left:20px"
@click="saveDate"
> {{ '确认' }}</el-button>
<el-button
v-else
v-else
type="primary"
class="thebtn"
style="margin-left:20px"
@ -389,14 +410,11 @@ import * as api from '@/api/giftGoods.js'
import * as apis from '@/api/product.js'
import * as api_s from '@/api/financial.js'
import topBar from '@/components/topBar'
import ImageUpload from '@/components/ImageUpload'
import { getMemberName } from '@/api/financial'
import { getQueryString } from '@/utils'
import { pickDetail } from '@/api/manage'
import * as man from '@/api/manage'
export default {
components: {
topBar,
ImageUpload
topBar
},
data() {
return {
@ -424,7 +442,7 @@ export default {
plcz: {},
select: {}, //
dialogList: [], //
selectData: [], //
selectData: undefined, //
skuList: [], //
selSkuList: '',
selSkuNameList: '',
@ -449,9 +467,24 @@ export default {
text: '不包邮',
val: 1
}
],
pickTypeList: [
{
text: '提货产品',
val: 0
},
{
text: '法宝券',
val: 8
}
]
}
},
computed: {
addBtnDisabled() {
return this.allData.some(item => item.consumeRuleConfigList.length > 0)
}
},
mounted() {
const geturl = window.location.href
const getqyinfo = geturl.split('?')[1]
@ -464,13 +497,13 @@ export default {
this.disableds = true
this.addFlag = false
this.isArea = 1
}else if (type == 3) {
} else if (type == 3) {
this.getThDetails(pkId)
this.disableds = true
this.deled = true
this.addFlag = false
this.isArea = 1
} else {
} else {
this.getData()
}
},
@ -480,46 +513,47 @@ export default {
const that = this
pickDetail({ pkId: pkId }).then((res) => {
// console.error(res)
if(res.data.detailList){
if (res.data.detailList) {
that.allData = [{ 'consumeRuleConfigList': [{
memberName: res.data.memberName,
memberCode: res.data.memberCode,
pkId: res.data.pkId,
baseQuantity: res.data.baseQuantity,
receiveTime: res.data.receiveTime,
usableQuantity: res.data.usableQuantity,
quantity: 0,
isFreeMail: res.data.isFreeMail,
waresGiftConfigList: [
{
pkProduct: res.data.detailList[0].pkProduct,
productName: res.data.detailList[0].productName,
specsName: res.data.detailList[0].specsName,
specsNameId: res.data.detailList[0].specsNameId,
quantity: res.data.detailList[0].quantity
}
] }], 'orderType': 1 }]
}else{
memberName: res.data.memberName,
memberCode: res.data.memberCode,
pkId: res.data.pkId,
baseQuantity: res.data.baseQuantity,
receiveTime: res.data.receiveTime,
usableQuantity: res.data.usableQuantity,
quantity: 0,
isFreeMail: res.data.isFreeMail,
pickType: res.data.pickType,
waresGiftConfigList: [
{
pkProduct: res.data.detailList[0].pkProduct,
productName: res.data.detailList[0].productName,
specsName: res.data.detailList[0].specsName,
specsNameId: res.data.detailList[0].specsNameId,
quantity: res.data.detailList[0].quantity
}
] }], 'orderType': 1 }]
} else {
that.allData = [{ 'consumeRuleConfigList': [{
memberName: res.data.memberName,
memberCode: res.data.memberCode,
pkId: res.data.pkId,
baseQuantity: res.data.baseQuantity,
receiveTime: res.data.receiveTime,
usableQuantity: res.data.usableQuantity,
quantity: 0,
isFreeMail: res.data.isFreeMail,
waresGiftConfigList: [
{
pkProduct:'',
productName: '',
specsName: '',
specsNameId: '',
quantity: 0
}
] }], 'orderType': 1 }]
memberName: res.data.memberName,
memberCode: res.data.memberCode,
pkId: res.data.pkId,
baseQuantity: res.data.baseQuantity,
receiveTime: res.data.receiveTime,
usableQuantity: res.data.usableQuantity,
quantity: 0,
isFreeMail: res.data.isFreeMail,
pickType: res.data.pickType,
waresGiftConfigList: [
{
pkProduct: '',
productName: '',
specsName: '',
specsNameId: '',
quantity: 0
}
] }], 'orderType': 1 }]
}
})
this.$forceUpdate()
},
@ -551,14 +585,21 @@ export default {
},
saveDate() {
const dataList = []
this.allData[0].consumeRuleConfigList.forEach((res) => {
this.allData[0].consumeRuleConfigList.forEach((item) => {
dataList.push(
{ 'memberCode': res.memberCode, 'pkProduct': res.waresGiftConfigList[0].pkProduct, 'memberName': res.memberName,
'productName': res.waresGiftConfigList[0].productName + res.waresGiftConfigList[0].specsName,
'receiveTime': res.receiveTime,
'specsName': res.waresGiftConfigList[0].specsName, 'specsNameId': res.waresGiftConfigList[0].specsNameId,
'baseQuantity': res.baseQuantity, 'quantity': res.quantity, 'isFreeMail': res.isFreeMail, 'pkPostage': res.pkPostage,
"pkId":res.pkId?res.pkId:''
{ 'memberCode': item.memberCode,
'pkProduct': item.waresGiftConfigList[0].pkProduct,
'memberName': item.memberName,
'productName': item.waresGiftConfigList[0].productName + item.waresGiftConfigList[0].specsName,
'receiveTime': item.receiveTime,
'specsName': item.waresGiftConfigList[0].specsName,
'specsNameId': item.waresGiftConfigList[0].specsNameId,
'baseQuantity': item.baseQuantity,
'quantity': item.quantity,
'isFreeMail': item.isFreeMail,
'pkPostage': item.pkPostage,
'pkId': item.pkId ? item.pkId : '',
'pickType': item.pickType
}
)
})
@ -590,7 +631,7 @@ export default {
}
if (res.quantity === '' || res.quantity == undefined) {
this.flags = 3
return false
} else {
this.flags = 2
@ -619,20 +660,30 @@ export default {
})
} else if (this.flags == 3) {
this.$message({
message: '请输入增加数量',
type: 'warning'
})
}else {
this.$router.push({
path: 'rechargeQc',
query: {
data: JSON.stringify(dataList),
approvalBusiness: 700,
message: '请输入增加数量',
type: 'warning'
})
} else {
const params = {
detailList: dataList,
signType: 0, //
remark: '', //
fileList: [], // []
userIdList: [], // []
sendIdList: [] // []
}
man.rechargeConfirm(params).then((res) => {
if (res.code === 200) {
this.$message({
message: res.msg,
type: 'success'
})
this.$router.go(-1)
}
})
}
},
saveDate1(){
saveDate1() {
const dataList = []
this.allData[0].consumeRuleConfigList.forEach((res) => {
dataList.push(
@ -641,18 +692,30 @@ export default {
'receiveTime': res.receiveTime,
'specsName': res.waresGiftConfigList[0].specsName, 'specsNameId': res.waresGiftConfigList[0].specsNameId,
'baseQuantity': res.baseQuantity, 'quantity': res.quantity, 'isFreeMail': res.isFreeMail, 'pkPostage': res.pkPostage,
"pkId":res.pkId?res.pkId:''
'pkId': res.pkId ? res.pkId : ''
}
)
})
this.$router.push({
path: 'rechargeQc',
query: {
data: JSON.stringify(dataList),
approvalBusiness: 701,
type:this.deled
}
})
const params = {
detailList: dataList
}
man.rechargeDel(params).then((res) => {
if (res.code === 200) {
this.$message({
message: res.msg,
type: 'success'
})
this.$router.go(-1)
}
})
// this.$router.push({
// path: 'rechargeQc',
// query: {
// data: JSON.stringify(dataList),
// approvalBusiness: 701,
// type: this.deled
// }
// })
},
getPage(allData) {
this.allData = allData
@ -690,13 +753,19 @@ export default {
this.ggVisible = false
},
sureProduct() {
if (this.selectData.length == 0) {
if (!this.selectData) {
this.$message({
message: '请选择产品',
type: 'warning'
})
return false
} else {
if (!this.selectData.selSkuNameList || this.selectData.selSkuNameList.length === 0) {
this.$message({
message: '请选择产品规格',
type: 'warning'
})
return
}
this.allData.forEach((item) => {
if (this.isArea == item.orderType) {
item.consumeRuleConfigList[this.showCndex].waresGiftConfigList[
@ -758,7 +827,7 @@ export default {
this.isArea = val
},
handleClose() {
this.selectData = []
this.selectData = undefined
this.dialogVisible = false
},
handleCloseGg() {
@ -803,8 +872,10 @@ export default {
specsName: '',
specsNameId: '',
quantity: ''
}
]
],
pickType: 0
})
}
})
@ -838,7 +909,7 @@ export default {
},
getDataList() {
api
.getProductAll(Object.assign({isPutOn:0}, this.queryParams, this.select,{isExistSpecs:1}))
.getProductAll(Object.assign({ isPutOn: 0 }, this.queryParams, this.select, { isExistSpecs: 1 }))
.then((res) => {
res.rows.forEach((item) => {
item.quantity = 1
@ -872,18 +943,23 @@ export default {
},
selected(selection, row) {
//
if (selection.length === 0) {
this.selectData = undefined
} else {
this.selectData = row
}
this.$refs.multipleTable.clearSelection()
//
//
if (selection.length == 0) return
this.$refs.multipleTable.toggleRowSelection(row, true)
this.selectData = row
},
//
selectionChange(val) {
//
this.selectData = val
// //
// //
// this.$nextTick(() => {
// if (selection.length == 0) return
// this.$refs.multipleTable.toggleRowSelection(row, true)
// this.selectData = row
// })
},
tableRowClassName({ row, rowIndex }) {
if (rowIndex % 2 == 1) {
return 'warning-row'
@ -891,6 +967,11 @@ export default {
return 'success-row'
}
return ''
},
pickTypeChange(val, item) {
if (val === 8) {
this.$set(item, 'baseQuantity', '1')
}
}
}
}

View File

@ -111,22 +111,22 @@
<div class="main_a">
<div class="mainbtn">
<el-button
v-hasButtons="['cardAdd']"
size="small"
class="addBtn"
v-hasButtons="['cardAdd']"
@click="openDig"
>{{'添加'}}</el-button>
>{{ '添加' }}</el-button>
<el-button
v-hasButtons="['cardExport']"
size="small"
class="thebtn2"
v-hasButtons="['cardExport']"
@click="handleExport"
> {{ '导出' }}</el-button>
> 导出</el-button>
</div>
<div class="maintable">
<el-table
:data="tableData"
v-loading="loading"
:data="tableData"
style="width: 100%"
height="73vh"
:header-cell-style="{ background: '#EEEEEE' }"
@ -152,6 +152,7 @@
align="center"
prop=""
:label="'产品名称(规格)'"
min-width="230"
>
<template slot-scope="scope">
<div v-for="item in scope.row.detailList">
@ -184,8 +185,8 @@
/>
<el-table-column
align="center"
prop="usableQuantity"
:label="'可用兑换数量'"
prop="usableQuantity"
:label="'可用兑换数量'"
width="120"
/>
<el-table-column
@ -220,24 +221,28 @@
width="120"
>
<template slot-scope="scope">
<div class="btnHeng">
<div @click="toFixed(scope.row.pkId,2)"
type="text"
v-if="scope.row.pickType!=8"
v-hasButtons="['cardUpdata']"
style="color:#F3A900"
size="small">
{{ '修改' }}
<div class="btnHeng">
<div
v-hasButtons="['cardUpdata']"
type="text"
style="color:#F3A900"
size="small"
@click="toFixed(scope.row.pkId,2)"
>
{{ '修改' }}
</div>
<div
v-hasButtons="['cardDel']"
type="text"
size="small"
style="color: #C8161D"
@click="toDel(scope.row.pkId)"
>
{{ '删除' }}
</div>
</div>
<div @click="toDel(scope.row.pkId)"
type="text"
v-hasButtons="['cardDel']"
size="small"
style="color: #C8161D">
{{ '删除' }}
</div>
</div>
</template>
</el-table-column>
</el-table>
@ -257,19 +262,19 @@
<script>
import topBar from '@/components/topBar'
import * as api from '@/api/giftGoods.js'
import {tgtype} from "@/api/giftGoods.js";
import {getPickList} from "@/api/manage";
import { tgtype } from '@/api/giftGoods.js'
import { getPickList } from '@/api/manage'
export default {
name: 'Bzpz',
components: {
topBar
},
filters: {
isAgree(val) {
isAgree(val) {
if (!val) {
return '允许';
return '允许'
} else {
return '禁止';
return '禁止'
}
}
},
@ -288,7 +293,7 @@ export default {
total: 0,
dialogVisible: false,
tableData: [],
loading:false,
loading: false,
moren: 'RechargeCardList',
topList: [
{
@ -350,7 +355,7 @@ export default {
}
})
},
toDel(id){
toDel(id) {
this.$router.push({
name: 'addRechargeCard',
query: {
@ -416,7 +421,7 @@ export default {
//
getDataList() {
this.loading = true
getPickList(Object.assign({},this.queryParams,this.select))
getPickList(Object.assign({}, this.queryParams, this.select))
.then((res) => {
this.tableData = res.rows
this.total = res.total
@ -426,7 +431,7 @@ export default {
handleSelectionChange(val) {},
/** 导出按钮操作 */
handleExport() {
this.$confirm( '是否确认导出所有数据项?', '警告', {
this.$confirm('是否确认导出所有数据项?', '警告', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'