提交代码
This commit is contained in:
parent
17d01a3aaa
commit
9f83f25214
|
|
@ -295,7 +295,7 @@ export const tableColumns = [
|
|||
width: [78, 102],
|
||||
},
|
||||
{
|
||||
title: "检测照片",
|
||||
title: "监测照片",
|
||||
dataIndex: "detectPicAttr",
|
||||
dataIndexType: "ordinary",
|
||||
align: "center",
|
||||
|
|
|
|||
|
|
@ -352,7 +352,7 @@ export default {
|
|||
|
||||
// 将el-edit-table组件中的数据实施更新回来
|
||||
updateItemsPurchaseMediaBoList(newItems) {
|
||||
this.AEform.formModel.conSaleMediaBoList = newItems
|
||||
this.AEform.formModel.conSaleMediaBoList = newItems
|
||||
},
|
||||
|
||||
updateItemsConSaleCollectBoList (newItems) {
|
||||
|
|
@ -785,13 +785,14 @@ export default {
|
|||
? list.reduce(
|
||||
(
|
||||
prev,
|
||||
{ mediaFee, productFee, competReverMoney, otherReverMoney }
|
||||
{ mediaFee, productFee, competReverMoney, otherReverMoney, otherReverMoney2 }
|
||||
) =>
|
||||
new BigNumber(prev)
|
||||
.plus(mediaFee)
|
||||
.plus(productFee)
|
||||
.minus(competReverMoney)
|
||||
.minus(otherReverMoney)
|
||||
.minus(otherReverMoney2)
|
||||
.toNumber(),
|
||||
0
|
||||
)
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ export const formGroup = [
|
|||
items: [{ slot: true, prop: "contractAccess", span: 24 }],
|
||||
},
|
||||
{
|
||||
title: "检测照片",
|
||||
title: "监测照片",
|
||||
items: [{ slot: true, prop: "detectPicAttr", span: 25 }],
|
||||
},
|
||||
{
|
||||
|
|
|
|||
|
|
@ -253,6 +253,16 @@
|
|||
</div>
|
||||
</div>
|
||||
</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 }">
|
||||
<div class="table-column-child">
|
||||
<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>
|
||||
</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 v-if="record.serial != '合计'">
|
||||
<div class="table-column-child">
|
||||
|
|
@ -386,7 +406,7 @@
|
|||
<Enclosure :fileList="enclosureObj.formModel.contractAccessList" title="合同附件"
|
||||
v-if="enclosureObj.formModel.contractAccessList && enclosureObj.formModel.contractAccessList.length">
|
||||
</Enclosure>
|
||||
<Enclosure :fileList="enclosureObj.formModel.detectPicAttrList" title="检测照片"
|
||||
<Enclosure :fileList="enclosureObj.formModel.detectPicAttrList" title="监测照片"
|
||||
v-if="enclosureObj.formModel.detectPicAttrList && enclosureObj.formModel.detectPicAttrList.length">
|
||||
</Enclosure>
|
||||
<Enclosure :fileList="enclosureObj.formModel.upPrintList" title="上刊附件"
|
||||
|
|
|
|||
|
|
@ -153,7 +153,7 @@
|
|||
<template v-if="record.serial != '合计'">
|
||||
<span :title="record.clientName">{{ record.clientName }}</span>
|
||||
</template>
|
||||
</template>
|
||||
</template>
|
||||
<template #table-mediaDeptId="{ text, record, index }">
|
||||
<template v-if="record.serial != '合计'">
|
||||
<span :title="record.mediaDeptName">{{ record.mediaDeptName }}</span>
|
||||
|
|
@ -179,12 +179,12 @@
|
|||
<template #table-mediaPosition="{ text, record, index, align }">
|
||||
<div class="table-column-child">
|
||||
<div v-for="item in record.conSaleMediaVoList" :key="index + item.id" :style="align == 'right'
|
||||
? 'text-align: right;'
|
||||
: align == 'left'
|
||||
? 'text-align: left;'
|
||||
: align == 'center'
|
||||
? 'text-align: center;'
|
||||
: ''
|
||||
? 'text-align: right;'
|
||||
: align == 'left'
|
||||
? 'text-align: left;'
|
||||
: align == 'center'
|
||||
? 'text-align: center;'
|
||||
: ''
|
||||
" :title="item.mediaPosition">
|
||||
{{ item.mediaPosition }}
|
||||
</div>
|
||||
|
|
@ -344,16 +344,16 @@
|
|||
</template>
|
||||
</template>
|
||||
<!-- 其他返点金额结束2 -->
|
||||
|
||||
|
||||
<template #table-upTime="{ text, record, index, align }">
|
||||
<div class="table-column-child">
|
||||
<div v-for="item in record.conSaleMediaVoList" :key="index + item.id" :style="align == 'right'
|
||||
? 'text-align: right;'
|
||||
: align == 'left'
|
||||
? 'text-align: left;'
|
||||
: align == 'center'
|
||||
? 'text-align: center;'
|
||||
: ''
|
||||
? 'text-align: right;'
|
||||
: align == 'left'
|
||||
? 'text-align: left;'
|
||||
: align == 'center'
|
||||
? 'text-align: center;'
|
||||
: ''
|
||||
" :title="item.upTime">
|
||||
{{ item.upTime }}
|
||||
</div>
|
||||
|
|
@ -362,12 +362,12 @@
|
|||
<template #table-downTime="{ text, record, index, align }">
|
||||
<div class="table-column-child">
|
||||
<div v-for="item in record.conSaleMediaVoList" :key="index + item.id" :style="align == 'right'
|
||||
? 'text-align: right;'
|
||||
: align == 'left'
|
||||
? 'text-align: left;'
|
||||
: align == 'center'
|
||||
? 'text-align: center;'
|
||||
: ''
|
||||
? 'text-align: right;'
|
||||
: align == 'left'
|
||||
? 'text-align: left;'
|
||||
: align == 'center'
|
||||
? 'text-align: center;'
|
||||
: ''
|
||||
" :title="item.downTime">
|
||||
{{ item.downTime }}
|
||||
</div>
|
||||
|
|
@ -376,12 +376,12 @@
|
|||
<template #table-period="{ text, record, index, align }">
|
||||
<div class="table-column-child">
|
||||
<div v-for="item in record.conSaleMediaVoList" :key="index + item.id" :style="align == 'right'
|
||||
? 'text-align: right;'
|
||||
: align == 'left'
|
||||
? 'text-align: left;'
|
||||
: align == 'center'
|
||||
? 'text-align: center;'
|
||||
: ''
|
||||
? 'text-align: right;'
|
||||
: align == 'left'
|
||||
? 'text-align: left;'
|
||||
: align == 'center'
|
||||
? 'text-align: center;'
|
||||
: ''
|
||||
" :title="item.period">
|
||||
{{ item.period }}
|
||||
</div>
|
||||
|
|
@ -395,16 +395,26 @@
|
|||
</div>
|
||||
</div>
|
||||
</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 v-if="record.serial != '合计'">
|
||||
<div class="table-column-child">
|
||||
<div v-for="item in record.conSaleMediaVoList" :key="index + item.id" :style="align == 'right'
|
||||
? 'text-align: right;'
|
||||
: align == 'left'
|
||||
? 'text-align: left;'
|
||||
: align == 'center'
|
||||
? 'text-align: center;'
|
||||
: ''
|
||||
? 'text-align: right;'
|
||||
: align == 'left'
|
||||
? 'text-align: left;'
|
||||
: align == 'center'
|
||||
? 'text-align: center;'
|
||||
: ''
|
||||
" :title="item.discount">
|
||||
{{
|
||||
item.discount
|
||||
|
|
@ -420,12 +430,12 @@
|
|||
<template v-if="record.serial != '合计'">
|
||||
<div class="table-column-child">
|
||||
<div v-for="item in record.conSaleMediaVoList" :key="index + item.id" :style="align == 'right'
|
||||
? 'text-align: right;'
|
||||
: align == 'left'
|
||||
? 'text-align: left;'
|
||||
: align == 'center'
|
||||
? 'text-align: center;'
|
||||
: ''
|
||||
? 'text-align: right;'
|
||||
: align == 'left'
|
||||
? 'text-align: left;'
|
||||
: align == 'center'
|
||||
? 'text-align: center;'
|
||||
: ''
|
||||
" :title="formatNumber(item.mediaFee)">
|
||||
{{ formatNumber(item.mediaFee) }}
|
||||
</div>
|
||||
|
|
@ -439,12 +449,12 @@
|
|||
<template v-if="record.serial != '合计'">
|
||||
<div class="table-column-child">
|
||||
<div v-for="item in record.conSaleMediaVoList" :key="index + item.id" :style="align == 'right'
|
||||
? 'text-align: right;'
|
||||
: align == 'left'
|
||||
? 'text-align: left;'
|
||||
: align == 'center'
|
||||
? 'text-align: center;'
|
||||
: ''
|
||||
? 'text-align: right;'
|
||||
: align == 'left'
|
||||
? 'text-align: left;'
|
||||
: align == 'center'
|
||||
? 'text-align: center;'
|
||||
: ''
|
||||
" :title="formatNumber(item.productFee)">
|
||||
{{ formatNumber(item.productFee) }}
|
||||
</div>
|
||||
|
|
@ -579,7 +589,8 @@ export default {
|
|||
data() {
|
||||
return {
|
||||
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: [],
|
||||
importHeaders: { Authorization: "Bearer " + getToken() },
|
||||
searchItems,
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user