@@ -298,24 +246,24 @@ export default {
const list = this.AEform.formModel.purchaseMediaBoList;
return list
? list.reduce(
- (prev, { mediaFee, productFee }) =>
- new BigNumber(prev).plus(mediaFee).plus(productFee).toNumber(),
- 0
- )
+ (prev, { mediaFee, productFee }) =>
+ new BigNumber(prev).plus(mediaFee).plus(productFee).toNumber(),
+ 0
+ )
: 0;
},
},
methods: {
// 获取详情
- async getDetailData () {
+ async getDetailData() {
const res = await getAction(`/system/purchase/${this.$route.query.id}`)
- console.log('%c [ res ]-213', 'font-size:13px; background:pink; color:#bf2c9f;', res)
+ console.log('采购合同详情', res)
if (res.data.purchaseMediaVoList) {
res.data.purchaseMediaBoList = res.data.purchaseMediaVoList
console.log(this.cityList, 'this.cityList')
// cityIds
res.data.purchaseMediaBoList = res.data.purchaseMediaBoList.map(item => {
- return { ...item, cityIds: item.cityIds ? item.cityIds.split(',').map((item) => Number(item)) : item.cityIds };
+ return { ...item, cityIds: item.cityIds ? item.cityIds.split(',').map((item) => Number(item)) : item.cityIds };
});
}
if (res.data.conPurchasePaymentVo) {
@@ -325,6 +273,9 @@ export default {
if (res.data.contractAccessList) {
this.$refs.contractAccess.setFileList(res.data.contractAccessList)
}
+ if (res.data.detectPicAttrList) {
+ this.$refs.detectPicAttr.setFileList(res.data.detectPicAttrList)
+ }
if (res.data.upPrintList) {
this.$refs.upPrint.setFileList(res.data.upPrintList)
}
@@ -353,7 +304,7 @@ export default {
this.AEform.formModel.purchaseMediaBoList = newItems
},
- updateItemsPurchasePaymentBoList (newItems) {
+ updateItemsPurchasePaymentBoList(newItems) {
this.AEform.formModel.purchasePaymentBoList = newItems
},
@@ -540,7 +491,7 @@ export default {
const sums = [];
columns.forEach((column, index) => {
let total = "N/A";
- if (![11,12].includes(index)) {
+ if (![11, 12].includes(index)) {
return;
}
const values = data.map((item) => Number(item[column.property]));
@@ -574,7 +525,7 @@ export default {
const sums = [];
columns.forEach((column, index) => {
let total = "N/A";
- if (![2,4].includes(index)) {
+ if (![2, 4].includes(index)) {
return;
}
const values = data.map((item) => Number(item[column.property]));
@@ -603,18 +554,18 @@ export default {
return sums;
},
formatNumber(num) {
- if (num) {
- // 保留两位小数并转换为字符串
- let [integer, decimal] = num.toFixed(2).split(".");
+ if (num) {
+ // 保留两位小数并转换为字符串
+ let [integer, decimal] = num.toFixed(2).split(".");
- // 正则表达式添加千位分隔符
- integer = integer.replace(/\B(?=(\d{3})+(?!\d))/g, ",");
+ // 正则表达式添加千位分隔符
+ integer = integer.replace(/\B(?=(\d{3})+(?!\d))/g, ",");
- return `${integer}.${decimal}`;
- } else {
- return '0.00'
- }
- },
+ return `${integer}.${decimal}`;
+ } else {
+ return '0.00'
+ }
+ },
//计算逾期天数
delayDate(record) {
@@ -633,101 +584,117 @@ export default {
return "";
}
const diff = dayjs(downTime || new Date()).diff(upTime, "d");
- return diff <= 0 ? "" : diff + 1 + "天";
+ return diff <= 0 ? "" : diff + 1 + "天";
},
// 去除附件中的逗号
removeLeadingAndTrailingCommas(str) {
- // 检查并去掉第一个字符的逗号
- if (str.charAt(0) === ',') {
- str = str.substring(1);
- }
+ // 检查并去掉第一个字符的逗号
+ if (str.charAt(0) === ',') {
+ str = str.substring(1);
+ }
- // 检查并去掉最后一个字符的逗号
- if (str.charAt(str.length - 1) === ',') {
- str = str.substring(0, str.length - 1);
- }
+ // 检查并去掉最后一个字符的逗号
+ if (str.charAt(str.length - 1) === ',') {
+ str = str.substring(0, str.length - 1);
+ }
- return str;
+ return str;
},
// 附件处理
annexFunc() {
// 合同附件
- var contractAccess = []
- for (const i in this.$refs.contractAccess.getFileList()) {
- contractAccess.push(this.$refs.contractAccess.getFileList()[i].md5)
+ var contractAccess = []
+ for (const i in this.$refs.contractAccess.getFileList()) {
+ contractAccess.push(this.$refs.contractAccess.getFileList()[i].md5)
+ }
+ var contractAccess2 = []
+ if (this.AEform.formModel.contractAccessList && this.AEform.formModel.contractAccessList.length) {
+ for (const i in this.AEform.formModel.contractAccessList) {
+ contractAccess2.push(this.AEform.formModel.contractAccessList[i].identifier)
}
- var contractAccess2 = []
- if (this.AEform.formModel.contractAccessList && this.AEform.formModel.contractAccessList.length) {
- for (const i in this.AEform.formModel.contractAccessList) {
- contractAccess2.push(this.AEform.formModel.contractAccessList[i].identifier)
- }
- }
- var contractAccess3 = [...contractAccess, ...contractAccess2]
- contractAccess3 = Array.from(new Set(contractAccess3))
- this.AEform.formModel.contractAccess = contractAccess3.toString()
- this.AEform.formModel.contractAccess = this.removeLeadingAndTrailingCommas(this.AEform.formModel.contractAccess)
+ }
+ var contractAccess3 = [...contractAccess, ...contractAccess2]
+ contractAccess3 = Array.from(new Set(contractAccess3))
+ this.AEform.formModel.contractAccess = contractAccess3.toString()
+ this.AEform.formModel.contractAccess = this.removeLeadingAndTrailingCommas(this.AEform.formModel.contractAccess)
- // 上刊附件
- var upPrint = []
- for (const i in this.$refs.upPrint.getFileList()) {
- upPrint.push(this.$refs.upPrint.getFileList()[i].md5)
+ // 监测照片附件
+ var detectPicAttr = []
+ for (const i in this.$refs.detectPicAttr.getFileList()) {
+ detectPicAttr.push(this.$refs.detectPicAttr.getFileList()[i].md5)
+ }
+ var detectPicAttr2 = []
+ if (this.AEform.formModel.detectPicAttrList && this.AEform.formModel.detectPicAttrList.length) {
+ for (const i in this.AEform.formModel.detectPicAttrList) {
+ detectPicAttr2.push(this.AEform.formModel.detectPicAttrList[i].identifier)
}
- var upPrint2 = []
- if (this.AEform.formModel.upPrintList && this.AEform.formModel.upPrintList.length) {
- for (const i in this.AEform.formModel.upPrintList) {
- upPrint2.push(this.AEform.formModel.upPrintList[i].identifier)
- }
+ }
+ var detectPicAttr3 = [...detectPicAttr, ...detectPicAttr2]
+ detectPicAttr3 = Array.from(new Set(detectPicAttr3))
+ this.AEform.formModel.detectPicAttr = detectPicAttr3.toString()
+ this.AEform.formModel.detectPicAttr = this.removeLeadingAndTrailingCommas(this.AEform.formModel.detectPicAttr)
+
+ // 上刊附件
+ var upPrint = []
+ for (const i in this.$refs.upPrint.getFileList()) {
+ upPrint.push(this.$refs.upPrint.getFileList()[i].md5)
+ }
+ var upPrint2 = []
+ if (this.AEform.formModel.upPrintList && this.AEform.formModel.upPrintList.length) {
+ for (const i in this.AEform.formModel.upPrintList) {
+ upPrint2.push(this.AEform.formModel.upPrintList[i].identifier)
}
- var upPrint3 = [...upPrint, ...upPrint2]
- upPrint3 = Array.from(new Set(upPrint3))
- this.AEform.formModel.upPrint = upPrint3.toString()
- this.AEform.formModel.upPrint = this.removeLeadingAndTrailingCommas(this.AEform.formModel.upPrint)
- // 下刊附件
- var nextPrint = []
- for (const i in this.$refs.nextPrint.getFileList()) {
- nextPrint.push(this.$refs.nextPrint.getFileList()[i].md5)
+ }
+ var upPrint3 = [...upPrint, ...upPrint2]
+ upPrint3 = Array.from(new Set(upPrint3))
+ this.AEform.formModel.upPrint = upPrint3.toString()
+ this.AEform.formModel.upPrint = this.removeLeadingAndTrailingCommas(this.AEform.formModel.upPrint)
+ // 下刊附件
+ var nextPrint = []
+ for (const i in this.$refs.nextPrint.getFileList()) {
+ nextPrint.push(this.$refs.nextPrint.getFileList()[i].md5)
+ }
+ var nextPrint2 = []
+ if (this.AEform.formModel.nextPrintList && this.AEform.formModel.nextPrintList.length) {
+ for (const i in this.AEform.formModel.nextPrintList) {
+ nextPrint2.push(this.AEform.formModel.nextPrintList[i].identifier)
}
- var nextPrint2 = []
- if (this.AEform.formModel.nextPrintList && this.AEform.formModel.nextPrintList.length) {
- for (const i in this.AEform.formModel.nextPrintList) {
- nextPrint2.push(this.AEform.formModel.nextPrintList[i].identifier)
- }
+ }
+ var nextPrint3 = [...nextPrint, ...nextPrint2]
+ nextPrint3 = Array.from(new Set(nextPrint3))
+ this.AEform.formModel.nextPrint = nextPrint3.toString()
+ this.AEform.formModel.nextPrint = this.removeLeadingAndTrailingCommas(this.AEform.formModel.nextPrint)
+ // 换刊附件
+ var exchangePrint = []
+ for (const i in this.$refs.exchangePrint.getFileList()) {
+ exchangePrint.push(this.$refs.exchangePrint.getFileList()[i].md5)
+ }
+ var exchangePrint2 = []
+ if (this.AEform.formModel.exchangePrintList && this.AEform.formModel.exchangePrintList.length) {
+ for (const i in this.AEform.formModel.exchangePrintList) {
+ exchangePrint2.push(this.AEform.formModel.exchangePrintList[i].identifier)
}
- var nextPrint3 = [...nextPrint, ...nextPrint2]
- nextPrint3 = Array.from(new Set(nextPrint3))
- this.AEform.formModel.nextPrint = nextPrint3.toString()
- this.AEform.formModel.nextPrint = this.removeLeadingAndTrailingCommas(this.AEform.formModel.nextPrint)
- // 换刊附件
- var exchangePrint = []
- for (const i in this.$refs.exchangePrint.getFileList()) {
- exchangePrint.push(this.$refs.exchangePrint.getFileList()[i].md5)
+ }
+ var exchangePrint3 = [...exchangePrint, ...exchangePrint2]
+ exchangePrint3 = Array.from(new Set(exchangePrint3))
+ this.AEform.formModel.exchangePrint = exchangePrint3.toString()
+ this.AEform.formModel.exchangePrint = this.removeLeadingAndTrailingCommas(this.AEform.formModel.exchangePrint)
+ // 媒体链条附件
+ var mediaLink = []
+ for (const i in this.$refs.mediaLink.getFileList()) {
+ mediaLink.push(this.$refs.mediaLink.getFileList()[i].md5)
+ }
+ var mediaLink2 = []
+ if (this.AEform.formModel.mediaLinkList && this.AEform.formModel.mediaLinkList.length) {
+ for (const i in this.AEform.formModel.mediaLinkList) {
+ mediaLink2.push(this.AEform.formModel.mediaLinkList[i].identifier)
}
- var exchangePrint2 = []
- if (this.AEform.formModel.exchangePrintList && this.AEform.formModel.exchangePrintList.length) {
- for (const i in this.AEform.formModel.exchangePrintList) {
- exchangePrint2.push(this.AEform.formModel.exchangePrintList[i].identifier)
- }
- }
- var exchangePrint3 = [...exchangePrint, ...exchangePrint2]
- exchangePrint3 = Array.from(new Set(exchangePrint3))
- this.AEform.formModel.exchangePrint = exchangePrint3.toString()
- this.AEform.formModel.exchangePrint = this.removeLeadingAndTrailingCommas(this.AEform.formModel.exchangePrint)
- // 媒体链条附件
- var mediaLink = []
- for (const i in this.$refs.mediaLink.getFileList()) {
- mediaLink.push(this.$refs.mediaLink.getFileList()[i].md5)
- }
- var mediaLink2 = []
- if (this.AEform.formModel.mediaLinkList && this.AEform.formModel.mediaLinkList.length) {
- for (const i in this.AEform.formModel.mediaLinkList) {
- mediaLink2.push(this.AEform.formModel.mediaLinkList[i].identifier)
- }
- }
- var mediaLink3 = [...mediaLink, ...mediaLink2]
- mediaLink3 = Array.from(new Set(mediaLink3))
- this.AEform.formModel.mediaLink = mediaLink3.toString()
- this.AEform.formModel.mediaLink = this.removeLeadingAndTrailingCommas(this.AEform.formModel.mediaLink)
+ }
+ var mediaLink3 = [...mediaLink, ...mediaLink2]
+ mediaLink3 = Array.from(new Set(mediaLink3))
+ this.AEform.formModel.mediaLink = mediaLink3.toString()
+ this.AEform.formModel.mediaLink = this.removeLeadingAndTrailingCommas(this.AEform.formModel.mediaLink)
},
verification(tableList, columns) {
@@ -783,6 +750,7 @@ export default {
});
}
await this.$refs.formRef.validate();
+ console.log('this.AEform.formModel', this.AEform.formModel)
if (this.AEform.formModel.id) {
const res = await putAction(`/system/purchase/edit`, { ...this.AEform.formModel })
console.log('%c [ res ]-361', 'font-size:13px; background:pink; color:#bf2c9f;', res)
@@ -829,7 +797,8 @@ export default {
.el-group-form {
::v-deep {
- > .el-card {
+ >.el-card {
+
&:nth-child(3),
&:nth-child(4) {
.el-card__body {
@@ -847,6 +816,7 @@ export default {
::v-deep {
.media-summary {
+
&-title,
&-value {
font-family: Microsoft YaHei;
diff --git a/src/views/contract/detail/config/index.js b/src/views/contract/detail/config/index.js
index 84af533..cdfef57 100644
--- a/src/views/contract/detail/config/index.js
+++ b/src/views/contract/detail/config/index.js
@@ -35,13 +35,17 @@ export const formGroup = [
title: "合同附件",
items: [{ slot: true, prop: "contractAccess", span: 24 }],
},
+ {
+ title: "检测照片",
+ items: [{ slot: true, prop: "detectPicAttr", span: 25 }],
+ },
{
title: "监测报告附件",
- items: [{ slot: true, prop: "reportAttachment", span: 24 }],
+ items: [{ slot: true, prop: "reportAttachment", span: 26 }],
},
{
title: "媒体链条附件",
- items: [{ slot: true, prop: "mediaLink", span: 24 }],
+ items: [{ slot: true, prop: "mediaLink", span: 27 }],
},
];
// 采购合同媒体信息表格配置
@@ -421,7 +425,7 @@ export const SalesContractMediaColumns = [
required: true,
},
{
- title: "其他返点",
+ title: "其他返点1",
dataIndex: "otherReverPoit",
width: 120,
attrs: { min: 0 },
@@ -429,7 +433,7 @@ export const SalesContractMediaColumns = [
required: true,
},
{
- title: "其他返点金额",
+ title: "其他返点金额1",
dataIndex: "otherReverMoney",
width: 220,
attrs: { min: 0 },
@@ -437,6 +441,23 @@ export const SalesContractMediaColumns = [
type: "number",
required: true,
},
+ {
+ title: "其他返点2",
+ dataIndex: "otherReverPoit2",
+ width: 120,
+ attrs: { min: 0 },
+ align: "center",
+ required: true,
+ },
+ {
+ title: "其他返点金额2",
+ dataIndex: "otherReverMoney2",
+ width: 220,
+ attrs: { min: 0 },
+ align: "right",
+ type: "number",
+ required: true,
+ },
{
title: "备注",
dataIndex: "remark",
diff --git a/src/views/contract/salesContract.vue b/src/views/contract/salesContract.vue
index 5f7c140..ba97acd 100644
--- a/src/views/contract/salesContract.vue
+++ b/src/views/contract/salesContract.vue
@@ -1,33 +1,16 @@
-
+
-
+
@@ -35,110 +18,70 @@
-
-
+
+
$refs.tableRef.queryParams.clientId = undefined">✖
+ @click="() => $refs.tableRef.queryParams.clientId = undefined">✖
-
-
+
+
$refs.tableRef.queryParams.mediaId = undefined">✖
+ @click="() => $refs.tableRef.queryParams.mediaId = undefined">✖
$refs.tableRef.queryParams.cityIds = undefined"/>
+ @click="() => $refs.tableRef.queryParams.cityIds = undefined" />
-
+
-
-
+
+
$refs.tableRef.queryParams.firstId = undefined">✖
+ @click="() => $refs.tableRef.queryParams.firstId = undefined">✖
-
+ @change="handleSearch">
+
$refs.tableRef.queryParams.isOverdue = undefined">✖
+ @click="() => $refs.tableRef.queryParams.isOverdue = undefined">✖
-
+ @change="handleSearch">
+
$refs.tableRef.queryParams.isCompet = undefined">✖
+ @click="() => $refs.tableRef.queryParams.isCompet = undefined">✖
@@ -162,19 +105,14 @@
-->
-
+
导入
下载导入模板
导出
取消
+ v-if="showColumnBtn">取消
确认导出
下载记录
@@ -187,22 +125,13 @@
-
+
展开
-
+
折叠
-
+
@@ -234,7 +163,7 @@
+ :style="align == 'right' ? 'text-align: right;' : align == 'left' ? 'text-align: left;' : align == 'center' ? 'text-align: center;' : ''">
{{ item.cityName }}
@@ -242,27 +171,21 @@
+ :style="align == 'right' ? 'text-align: right;' : align == 'left' ? 'text-align: left;' : align == 'center' ? 'text-align: center;' : ''">
{{ item.mediaName }}
-
+ ? 'text-align: center;'
+ : ''
+ " :title="item.mediaPosition">
{{ item.mediaPosition }}
@@ -272,8 +195,8 @@
+ :style="align == 'right' ? 'text-align: right;' : align == 'left' ? 'text-align: left;' : align == 'center' ? 'text-align: center;' : ''"
+ :title="item.accountNumber">
{{ item.accountNumber }}
@@ -286,8 +209,8 @@
+ :style="align == 'right' ? 'text-align: right;' : align == 'left' ? 'text-align: left;' : align == 'center' ? 'text-align: center;' : ''"
+ :title="item.releaseFrequency">
{{ item.releaseFrequency }}
@@ -302,8 +225,8 @@
+ :style="align == 'right' ? 'text-align: right;' : align == 'left' ? 'text-align: left;' : align == 'center' ? 'text-align: center;' : ''"
+ :title="item.releaseFrequency">
是
否
@@ -324,8 +247,8 @@
+ :style="align == 'right' ? 'text-align: right;' : align == 'left' ? 'text-align: left;' : align == 'center' ? 'text-align: center;' : ''"
+ :title="item.releaseFrequency">
{{ item.competReverPoit }}
@@ -341,8 +264,8 @@
+ :style="align == 'right' ? 'text-align: right;' : align == 'left' ? 'text-align: left;' : align == 'center' ? 'text-align: center;' : ''"
+ :title="item.releaseFrequency">
{{ formatNumber(item.competReverMoney) }}
@@ -354,13 +277,13 @@
-
+
+ :style="align == 'right' ? 'text-align: right;' : align == 'left' ? 'text-align: left;' : align == 'center' ? 'text-align: center;' : ''"
+ :title="item.releaseFrequency">
{{ item.otherReverPoit }}
@@ -369,15 +292,15 @@
{{ record.otherReverPoit }}
-
+
-
+
+ :style="align == 'right' ? 'text-align: right;' : align == 'left' ? 'text-align: left;' : align == 'center' ? 'text-align: center;' : ''"
+ :title="item.releaseFrequency">
{{ formatNumber(item.otherReverMoney) }}
@@ -386,63 +309,80 @@
{{ record.otherReverMoney }}
-
+
+
+
+
+
+
+
+ {{ item.otherReverPoit2 }}
+
+
+
+
+ {{ record.otherReverPoit2 }}
+
+
+
+
+
+
+
+
+
+ {{ formatNumber(item.otherReverMoney2) }}
+
+
+
+
+ {{ record.otherReverMoney2 }}
+
+
+
+
-
+ ? 'text-align: center;'
+ : ''
+ " :title="item.upTime">
{{ item.upTime }}
-
+ ? 'text-align: center;'
+ : ''
+ " :title="item.downTime">
{{ item.downTime }}
-
+ ? 'text-align: center;'
+ : ''
+ " :title="item.period">
{{ item.period }}
@@ -450,7 +390,7 @@
+ :style="align == 'right' ? 'text-align: right;' : align == 'left' ? 'text-align: left;' : align == 'center' ? 'text-align: center;' : ''">
{{ formatNumber(item.printPrice) }}
@@ -458,20 +398,14 @@
-
+ ? 'text-align: center;'
+ : ''
+ " :title="item.discount">
{{
item.discount
}}
@@ -485,19 +419,14 @@
-
+ ? 'text-align: center;'
+ : ''
+ " :title="formatNumber(item.mediaFee)">
{{ formatNumber(item.mediaFee) }}
@@ -509,19 +438,14 @@
-
+ ? 'text-align: center;'
+ : ''
+ " :title="formatNumber(item.productFee)">
{{ formatNumber(item.productFee) }}
@@ -538,41 +462,41 @@
+ :title="record.contractAccessList.map(item => item.realName).join('\n')"
+ v-if="record.contractAccessList && record.contractAccessList.length > 0" @click="handleDown(record)"
+ style="width: 22px; height: 27px;" />
+ :title="record.upPrintList.map(item => item.realName).join('\n')"
+ v-if="record.upPrintList && record.upPrintList.length > 0" @click="handleDown(record)"
+ style="width: 22px; height: 27px;" />
+ :title="record.exchangePrintList.map(item => item.realName).join('\n')"
+ v-if="record.exchangePrintList && record.exchangePrintList.length > 0" @click="handleDown(record)"
+ style="width: 22px; height: 27px;" />
+ :title="record.nextPrintList.map(item => item.realName).join('\n')"
+ v-if="record.nextPrintList && record.nextPrintList.length > 0" @click="handleDown(record)"
+ style="width: 22px; height: 27px;" />
+ :title="record.mediaLinkList.map(item => item.realName).join('\n')"
+ v-if="record.mediaLinkList && record.mediaLinkList.length > 0" @click="handleDown(record)"
+ style="width: 22px; height: 27px;" />
@@ -583,18 +507,12 @@
-
+
-
+
查看
|
@@ -603,11 +521,7 @@
回款管理
|
下载
- |
+ |
作废
恢复
@@ -619,20 +533,16 @@
-
+
+ v-if="enclosureObj.formModel.contractAccessList && enclosureObj.formModel.contractAccessList.length">
+
+ v-if="enclosureObj.formModel.mediaLinkList && enclosureObj.formModel.mediaLinkList.length">
@@ -642,7 +552,7 @@