Ver código fonte

bug修改

master
yangpeilai 3 semanas atrás
pai
commit
65129c11cb

+ 1
- 1
src/views/onlineBusinessHall/productManagement/promoteAnd/components/afterSaleFees.vue Ver arquivo

}) })
let dataForms = computed({ let dataForms = computed({
get() { get() {
console.log(props.modelValue, 'props.modelValue')
// console.log(props.modelValue, 'props.modelValue')
return props.modelValue return props.modelValue
}, },
set(value: any) { set(value: any) {

+ 11
- 14
src/views/onlineBusinessHall/productManagement/promoteAnd/components/feeList.vue Ver arquivo

type: Array, type: Array,
default: () => [], default: () => [],
}, },
// merchantList: {
// type: Array,
// default: () => [],
// },
merchantList: {
type: Array,
default: () => [],
},
}) })
let dataForm = computed({ let dataForm = computed({
get() { get() {
console.log(props.modelValue, 'props.modelValue')
// console.log(props.modelValue, 'props.modelValue')
return props.modelValue return props.modelValue
}, },
set(value: any) { set(value: any) {
payProductType: item.payChannelType payProductType: item.payChannelType
} }
}) })
console.log(bizContent, 'getmerchantList', List)
} else {
ElMessage.error(res.message || res.errorMsg)
} }
}) })
} }
const onChange = (row: any, val: any, index: any) => { const onChange = (row: any, val: any, index: any) => {
console.log(props.merchantList, ' props. props. props.');
console.log(row, val, index, '-------------------')
console.log(dataForm.value, 'dataForm.valuedataForm.value');
const data = props.merchantList.filter(item => item.value === row.payConfigId);
console.log(data[0], 'payProductTypepayProductTypepayProductType');
dataForm.value[index].payProductType = data[0].payProductType
// console.log(' props. props. props.',props.merchantList );
// console.log( '-------------------', row, val, index)
// console.log( 'dataForm.valuedataForm.value', dataForm.value);
// const data = props.merchantList.filter(item => item.value === row.payConfigId);
// console.log('payProductTypepayProductTypepayProductType',data[0]);
// dataForm.value[index].payProductType = data[0].payProductType
} }
const validFun = (row, index, prop) => { const validFun = (row, index, prop) => {
return (rule: any, value: any, callback: any) => { return (rule: any, value: any, callback: any) => {

+ 25
- 18
src/views/onlineBusinessHall/productManagement/promoteAnd/index.vue Ver arquivo

</div> </div>
</template> </template>
<template #releaseIdSlot> <template #releaseIdSlot>
<el-select clearable v-model="crudRef.form.releaseId" style="width: 200px" placeholder="选择发行产品" :disabled="typeOption == 'edit'">
<el-select clearable v-model="crudRef.form.releaseId" style="width: 200px" placeholder="选择发行产品" :disabled="typeOption == 'edit'"
@change="handleReleaseIdChange" >
<el-option v-for="item in releaseIdIdList" :key="item.value" :label="item.label" :value="item.value" /> <el-option v-for="item in releaseIdIdList" :key="item.value" :label="item.label" :value="item.value" />
</el-select> </el-select>
</template> </template>
payProductType: item.payChannelType payProductType: item.payChannelType
} }
}) })
console.log(WEIXINPAY, 'WEIXINPAY', ALIPAY);
// console.log(WEIXINPAY, 'WEIXINPAY', ALIPAY);
} }


onBeforeMount(() => { onBeforeMount(() => {
getAgencyqueryAll() getAgencyqueryAll()
typeOption.value = 'edit' typeOption.value = 'edit'
crudRef.value.form.changeReason = '' crudRef.value.form.changeReason = ''
console.log(row, 'rowrow')
// console.log(row, 'rowrow')
if (row.useFeeList) { if (row.useFeeList) {
isFeeListType.value = 1 isFeeListType.value = 1
feeListData.value = row.useFeeList feeListData.value = row.useFeeList
//切换按钮 ENABLE 启用 DISABLE 停用 //切换按钮 ENABLE 启用 DISABLE 停用
function handleBeforeChange(value, arg1) { function handleBeforeChange(value, arg1) {
if (arg1.examine != 0) return if (arg1.examine != 0) return
console.log(value, arg1, '启用停用')
// console.log(value, arg1, '启用停用')
let text = value == 'ENABLE' ? '停用' : '启用' let text = value == 'ENABLE' ? '停用' : '启用'
msgConfirm(`确认是否 ${text} ?`, typeTy.warning).then( msgConfirm(`确认是否 ${text} ?`, typeTy.warning).then(
() => { () => {
} }
function assignment(datas, row) { function assignment(datas, row) {
Object.assign(datas, row) Object.assign(datas, row)
console.log(datas, row, 'datas')
// console.log(datas, row, 'datas')
for (let key in datas) { for (let key in datas) {
if (typeof datas[key] === 'number') { if (typeof datas[key] === 'number') {
datas[key] = JSON.stringify(datas[key]) datas[key] = JSON.stringify(datas[key])
const feeListRef = ref() const feeListRef = ref()
//编辑与添加提交 //编辑与添加提交
function submit(data: any) { function submit(data: any) {
console.log(feeListData.value, 'feeListData.value')
// console.log(feeListData.value, 'feeListData.value')
let text = isFeeListType.value === 1 ? '办理费' : '使用费' let text = isFeeListType.value === 1 ? '办理费' : '使用费'
feeListRef.value.ruleFormRef.validate(async (valid: any, fields: any) => { feeListRef.value.ruleFormRef.validate(async (valid: any, fields: any) => {
if (!valid) return ElMessage.error(`${text} 存在必填项为空!`) if (!valid) return ElMessage.error(`${text} 存在必填项为空!`)
datas.afterSaleFees.forEach((item) => { datas.afterSaleFees.forEach((item) => {
item.fee = item.fee * 100 item.fee = item.fee * 100
}) })
console.log(data, datas, '修改新增请求')
// console.log(data, datas, '修改新增请求')
datas.issueScope = data.issueScope datas.issueScope = data.issueScope
let items = deepConvertDotNotationToNested(datas); let items = deepConvertDotNotationToNested(datas);
if (items.cancelDefault) { if (items.cancelDefault) {
BaseService.post('/managew/api/product/promotion/page', params).then( BaseService.post('/managew/api/product/promotion/page', params).then(
(res: any) => { (res: any) => {
if (res && res.statusCode === 0) { if (res && res.statusCode === 0) {
console.log('getList获取的数据', res)
// console.log('getList获取的数据', res)
//数据转换 //数据转换
let bizContent = res.data let bizContent = res.data
let data = bizContent.result || [] let data = bizContent.result || []


//选择组件变化监听 //选择组件变化监听
function customSelectorSelection(value, title, form?, dataItem?) { function customSelectorSelection(value, title, form?, dataItem?) {
console.log(value, title, form, dataItem, '数据变化监听')
// console.log(value, title, form, dataItem, '数据变化监听')


if (title == validityFormat) { if (title == validityFormat) {
let item = {} let item = {}
} }


if (title == 'releaseId') { if (title == 'releaseId') {
console.log(form, dataItem, 'releaseIdreleaseId')
// console.log(form, dataItem, 'releaseIdreleaseId')
// 发行产品变化查询发行产品全量详情 // 发行产品变化查询发行产品全量详情
if (typeOption.value === 'add') { if (typeOption.value === 'add') {
getFeeListData(value, form) getFeeListData(value, form)
} }
// 处理扣款渠道变化数据变化 // 处理扣款渠道变化数据变化
const handleKou = (title, value, form) => { const handleKou = (title, value, form) => {
console.log(koukuan, title, value, '------=====扣款渠道变化数据变化======------', !Object.keys(koukuan).includes(title));
// console.log(koukuan, title, value, '------=====扣款渠道变化数据变化======------', !Object.keys(koukuan).includes(title));
if (title == 'passFee.chargeMethod' || title == 'passDefault.chargeMethod' || title == 'cancelDefault.chargeMethod') { if (title == 'passFee.chargeMethod' || title == 'passDefault.chargeMethod' || title == 'cancelDefault.chargeMethod') {
let keys = '' let keys = ''
if (title == 'cancelDefault.chargeMethod') { if (title == 'cancelDefault.chargeMethod') {
const arr = Object.values(koukuan) const arr = Object.values(koukuan)
field.value.dialogArray.forEach((item: any) => { field.value.dialogArray.forEach((item: any) => {
if (arr.includes(item.prop)) { if (arr.includes(item.prop)) {
console.log(item.prop, arr, data[item.prop], data, '扣款商户号')
// console.log(item.prop, arr, data[item.prop], data, '扣款商户号')
if (data[item.prop]) { if (data[item.prop]) {
item.form.hideEdit = false item.form.hideEdit = false
} else { } else {
}) })
} }
afterSaleFeesList.value = data.afterSaleFees afterSaleFeesList.value = data.afterSaleFees
console.log(feeListData.value, releaseList.value, 'getFeeListData')
// console.log(feeListData.value, releaseList.value, 'getFeeListData')
} else { } else {
ElMessage.error(res.message || res.errorMsg) ElMessage.error(res.message || res.errorMsg)
} }
addMenu(data.afterSaleFees) addMenu(data.afterSaleFees)
crudRef.value.form = restoreDotNotationFromNested(data) crudRef.value.form = restoreDotNotationFromNested(data)
console.log(feeListData.value, releaseList.value, 'getFeeListData', restoreDotNotationFromNested(data),data.afterSaleFees)
// console.log(feeListData.value, releaseList.value, 'getFeeListData', restoreDotNotationFromNested(data),data.afterSaleFees)
afterSaleFeesList.value = data.afterSaleFees afterSaleFeesList.value = data.afterSaleFees
} else { } else {
ElMessage.error(res.message || res.errorMsg) ElMessage.error(res.message || res.errorMsg)
value: itemData.agencyId, value: itemData.agencyId,
} }
}) })
console.log(agencyqueryallList.value, 'getAgencyqueryAll')
// console.log(agencyqueryallList.value, 'getAgencyqueryAll')
} else { } else {
ElMessage.error(res.message || res.errorMsg) ElMessage.error(res.message || res.errorMsg)
} }
) )
} }
const selectAll = ref([]) const selectAll = ref([])
function handleReleaseIdChange(){
let releaseId = crudRef.value.form.releaseId;
console.log("====>>",releaseId)
getFeeListData(releaseId, crudRef.value.form)
}

function getReaseList() { function getReaseList() {
BaseService.post( BaseService.post(
'/managew/api/product/promotion/allProductKv', '/managew/api/product/promotion/allProductKv',
value: item.releaseId, value: item.releaseId,
} }
}) })
console.log(bizContent, 'getReaseList')
// console.log(bizContent, 'getReaseList')
} else { } else {
ElMessage.error(res.message || res.errorMsg) ElMessage.error(res.message || res.errorMsg)
} }
payProductType: item.payChannelType payProductType: item.payChannelType
} }
}) })
console.log(bizContent, 'getmerchantList')
// console.log(bizContent, 'getmerchantList')
} else { } else {
ElMessage.error(res.message || res.errorMsg) ElMessage.error(res.message || res.errorMsg)
} }
} }
}) })


console.log(bizContent, 'getmerchantListTx')
// console.log(bizContent, 'getmerchantListTx')
} else { } else {
ElMessage.error(res.message || res.errorMsg) ElMessage.error(res.message || res.errorMsg)
} }

Carregando…
Cancelar
Salvar