diff --git a/src/views/contract/config/procurementContract.js b/src/views/contract/config/procurementContract.js index 6e7713f..af951fe 100644 --- a/src/views/contract/config/procurementContract.js +++ b/src/views/contract/config/procurementContract.js @@ -295,7 +295,7 @@ export const tableColumns = [ width: [78, 102], }, { - title: "检测照片", + title: "监测照片", dataIndex: "detectPicAttr", dataIndexType: "ordinary", align: "center", diff --git a/src/views/contract/detail/AESalesContract.vue b/src/views/contract/detail/AESalesContract.vue index 54c4f72..a97105f 100644 --- a/src/views/contract/detail/AESalesContract.vue +++ b/src/views/contract/detail/AESalesContract.vue @@ -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 ) diff --git a/src/views/contract/detail/config/index.js b/src/views/contract/detail/config/index.js index ead6275..373befb 100644 --- a/src/views/contract/detail/config/index.js +++ b/src/views/contract/detail/config/index.js @@ -36,7 +36,7 @@ export const formGroup = [ items: [{ slot: true, prop: "contractAccess", span: 24 }], }, { - title: "检测照片", + title: "监测照片", items: [{ slot: true, prop: "detectPicAttr", span: 25 }], }, { diff --git a/src/views/contract/procurementContract.vue b/src/views/contract/procurementContract.vue index 10230b4..db0fc74 100644 --- a/src/views/contract/procurementContract.vue +++ b/src/views/contract/procurementContract.vue @@ -253,6 +253,16 @@ + + +