提交代码

src/views/contract/config/procurementContract.js

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

src/views/contract/detail/AESalesContract.vue

@@ -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
           )

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 }],
   },
   {

src/views/contract/procurementContract.vue

@@ -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="上刊附件"

src/views/contract/salesContract.vue

@@ -395,6 +395,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 }">
         <template v-if="record.serial != '合计'">
           <div class="table-column-child">
@@ -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,