提交代码

This commit is contained in:
wangchengming 2025-12-15 21:30:00 +08:00
parent 17d01a3aaa
commit 9f83f25214
5 changed files with 82 additions and 50 deletions

View File

@ -295,7 +295,7 @@ export const tableColumns = [
width: [78, 102], width: [78, 102],
}, },
{ {
title: "测照片", title: "测照片",
dataIndex: "detectPicAttr", dataIndex: "detectPicAttr",
dataIndexType: "ordinary", dataIndexType: "ordinary",
align: "center", align: "center",

View File

@ -785,13 +785,14 @@ export default {
? list.reduce( ? list.reduce(
( (
prev, prev,
{ mediaFee, productFee, competReverMoney, otherReverMoney } { mediaFee, productFee, competReverMoney, otherReverMoney, otherReverMoney2 }
) => ) =>
new BigNumber(prev) new BigNumber(prev)
.plus(mediaFee) .plus(mediaFee)
.plus(productFee) .plus(productFee)
.minus(competReverMoney) .minus(competReverMoney)
.minus(otherReverMoney) .minus(otherReverMoney)
.minus(otherReverMoney2)
.toNumber(), .toNumber(),
0 0
) )

View File

@ -36,7 +36,7 @@ export const formGroup = [
items: [{ slot: true, prop: "contractAccess", span: 24 }], items: [{ slot: true, prop: "contractAccess", span: 24 }],
}, },
{ {
title: "测照片", title: "测照片",
items: [{ slot: true, prop: "detectPicAttr", span: 25 }], items: [{ slot: true, prop: "detectPicAttr", span: 25 }],
}, },
{ {

View File

@ -253,6 +253,16 @@
</div> </div>
</div> </div>
</template> </template>
<template #table-printPriceUnit="{ text, record, index, align }">
<div class="table-column-child">
<div v-for="item in record.purchaseMediaVoList" :key="index + item.id" :title="item.printPriceUnit"
:style="align == 'center' ? 'text-align: right;' : align == 'left' ? 'text-align: left;' : align == 'center' ? 'text-align: center;' : ''">
{{
item.printPriceUnit
}}
</div>
</div>
</template>
<template #table-discount="{ text, record, index, align }"> <template #table-discount="{ text, record, index, align }">
<div class="table-column-child"> <div class="table-column-child">
<div v-for="item in record.purchaseMediaVoList" :key="index + item.id" :title="item.discount" <div v-for="item in record.purchaseMediaVoList" :key="index + item.id" :title="item.discount"
@ -276,6 +286,16 @@
<span :title="record.mediaFee">{{ record.mediaFee }}</span> <span :title="record.mediaFee">{{ record.mediaFee }}</span>
</template> </template>
</template> </template>
<template #table-mediaFeeUnit="{ text, record, index, align }">
<div class="table-column-child">
<div v-for="item in record.purchaseMediaVoList" :key="index + item.id" :title="item.mediaFeeUnit"
:style="align == 'center' ? 'text-align: right;' : align == 'left' ? 'text-align: left;' : align == 'center' ? 'text-align: center;' : ''">
{{
item.mediaFeeUnit
}}
</div>
</div>
</template>
<template #table-productFee="{ text, record, index, align }"> <template #table-productFee="{ text, record, index, align }">
<template v-if="record.serial != '合计'"> <template v-if="record.serial != '合计'">
<div class="table-column-child"> <div class="table-column-child">
@ -386,7 +406,7 @@
<Enclosure :fileList="enclosureObj.formModel.contractAccessList" title="合同附件" <Enclosure :fileList="enclosureObj.formModel.contractAccessList" title="合同附件"
v-if="enclosureObj.formModel.contractAccessList && enclosureObj.formModel.contractAccessList.length"> v-if="enclosureObj.formModel.contractAccessList && enclosureObj.formModel.contractAccessList.length">
</Enclosure> </Enclosure>
<Enclosure :fileList="enclosureObj.formModel.detectPicAttrList" title="测照片" <Enclosure :fileList="enclosureObj.formModel.detectPicAttrList" title="测照片"
v-if="enclosureObj.formModel.detectPicAttrList && enclosureObj.formModel.detectPicAttrList.length"> v-if="enclosureObj.formModel.detectPicAttrList && enclosureObj.formModel.detectPicAttrList.length">
</Enclosure> </Enclosure>
<Enclosure :fileList="enclosureObj.formModel.upPrintList" title="上刊附件" <Enclosure :fileList="enclosureObj.formModel.upPrintList" title="上刊附件"

View File

@ -179,12 +179,12 @@
<template #table-mediaPosition="{ text, record, index, align }"> <template #table-mediaPosition="{ text, record, index, align }">
<div class="table-column-child"> <div class="table-column-child">
<div v-for="item in record.conSaleMediaVoList" :key="index + item.id" :style="align == 'right' <div v-for="item in record.conSaleMediaVoList" :key="index + item.id" :style="align == 'right'
? 'text-align: right;' ? 'text-align: right;'
: align == 'left' : align == 'left'
? 'text-align: left;' ? 'text-align: left;'
: align == 'center' : align == 'center'
? 'text-align: center;' ? 'text-align: center;'
: '' : ''
" :title="item.mediaPosition"> " :title="item.mediaPosition">
{{ item.mediaPosition }} {{ item.mediaPosition }}
</div> </div>
@ -348,12 +348,12 @@
<template #table-upTime="{ text, record, index, align }"> <template #table-upTime="{ text, record, index, align }">
<div class="table-column-child"> <div class="table-column-child">
<div v-for="item in record.conSaleMediaVoList" :key="index + item.id" :style="align == 'right' <div v-for="item in record.conSaleMediaVoList" :key="index + item.id" :style="align == 'right'
? 'text-align: right;' ? 'text-align: right;'
: align == 'left' : align == 'left'
? 'text-align: left;' ? 'text-align: left;'
: align == 'center' : align == 'center'
? 'text-align: center;' ? 'text-align: center;'
: '' : ''
" :title="item.upTime"> " :title="item.upTime">
{{ item.upTime }} {{ item.upTime }}
</div> </div>
@ -362,12 +362,12 @@
<template #table-downTime="{ text, record, index, align }"> <template #table-downTime="{ text, record, index, align }">
<div class="table-column-child"> <div class="table-column-child">
<div v-for="item in record.conSaleMediaVoList" :key="index + item.id" :style="align == 'right' <div v-for="item in record.conSaleMediaVoList" :key="index + item.id" :style="align == 'right'
? 'text-align: right;' ? 'text-align: right;'
: align == 'left' : align == 'left'
? 'text-align: left;' ? 'text-align: left;'
: align == 'center' : align == 'center'
? 'text-align: center;' ? 'text-align: center;'
: '' : ''
" :title="item.downTime"> " :title="item.downTime">
{{ item.downTime }} {{ item.downTime }}
</div> </div>
@ -376,12 +376,12 @@
<template #table-period="{ text, record, index, align }"> <template #table-period="{ text, record, index, align }">
<div class="table-column-child"> <div class="table-column-child">
<div v-for="item in record.conSaleMediaVoList" :key="index + item.id" :style="align == 'right' <div v-for="item in record.conSaleMediaVoList" :key="index + item.id" :style="align == 'right'
? 'text-align: right;' ? 'text-align: right;'
: align == 'left' : align == 'left'
? 'text-align: left;' ? 'text-align: left;'
: align == 'center' : align == 'center'
? 'text-align: center;' ? 'text-align: center;'
: '' : ''
" :title="item.period"> " :title="item.period">
{{ item.period }} {{ item.period }}
</div> </div>
@ -395,16 +395,26 @@
</div> </div>
</div> </div>
</template> </template>
<template #table-printPriceUnit="{ text, record, index, align }">
<div class="table-column-child">
<div v-for="item in record.purchaseMediaVoList" :key="index + item.id" :title="item.printPriceUnit"
:style="align == 'center' ? 'text-align: right;' : align == 'left' ? 'text-align: left;' : align == 'center' ? 'text-align: center;' : ''">
{{
item.printPriceUnit
}}
</div>
</div>
</template>
<template #table-discount="{ text, record, index, align }"> <template #table-discount="{ text, record, index, align }">
<template v-if="record.serial != '合计'"> <template v-if="record.serial != '合计'">
<div class="table-column-child"> <div class="table-column-child">
<div v-for="item in record.conSaleMediaVoList" :key="index + item.id" :style="align == 'right' <div v-for="item in record.conSaleMediaVoList" :key="index + item.id" :style="align == 'right'
? 'text-align: right;' ? 'text-align: right;'
: align == 'left' : align == 'left'
? 'text-align: left;' ? 'text-align: left;'
: align == 'center' : align == 'center'
? 'text-align: center;' ? 'text-align: center;'
: '' : ''
" :title="item.discount"> " :title="item.discount">
{{ {{
item.discount item.discount
@ -420,12 +430,12 @@
<template v-if="record.serial != '合计'"> <template v-if="record.serial != '合计'">
<div class="table-column-child"> <div class="table-column-child">
<div v-for="item in record.conSaleMediaVoList" :key="index + item.id" :style="align == 'right' <div v-for="item in record.conSaleMediaVoList" :key="index + item.id" :style="align == 'right'
? 'text-align: right;' ? 'text-align: right;'
: align == 'left' : align == 'left'
? 'text-align: left;' ? 'text-align: left;'
: align == 'center' : align == 'center'
? 'text-align: center;' ? 'text-align: center;'
: '' : ''
" :title="formatNumber(item.mediaFee)"> " :title="formatNumber(item.mediaFee)">
{{ formatNumber(item.mediaFee) }} {{ formatNumber(item.mediaFee) }}
</div> </div>
@ -439,12 +449,12 @@
<template v-if="record.serial != '合计'"> <template v-if="record.serial != '合计'">
<div class="table-column-child"> <div class="table-column-child">
<div v-for="item in record.conSaleMediaVoList" :key="index + item.id" :style="align == 'right' <div v-for="item in record.conSaleMediaVoList" :key="index + item.id" :style="align == 'right'
? 'text-align: right;' ? 'text-align: right;'
: align == 'left' : align == 'left'
? 'text-align: left;' ? 'text-align: left;'
: align == 'center' : align == 'center'
? 'text-align: center;' ? 'text-align: center;'
: '' : ''
" :title="formatNumber(item.productFee)"> " :title="formatNumber(item.productFee)">
{{ formatNumber(item.productFee) }} {{ formatNumber(item.productFee) }}
</div> </div>
@ -579,7 +589,8 @@ export default {
data() { data() {
return { return {
importData: [], importData: [],
importUrl: process.env.VUE_APP_BASE_API + '/contract/sale/importData', // importUrl: process.env.VUE_APP_BASE_API + '/contract/sale/importData',
importUrl: process.env.VUE_APP_BASE_API + '/contract/sale/import',
fileList: [], fileList: [],
importHeaders: { Authorization: "Bearer " + getToken() }, importHeaders: { Authorization: "Bearer " + getToken() },
searchItems, searchItems,