修改禅道问题

src/views/iosBasicData/financialManagement/finstlbills/components/pickedData.vue

@@ -488,18 +488,18 @@ export default {
             width: 80,
             overHidden: true,
           },
-          {
-            label: "发票CNY",
-            prop: "currentInvoiceAmountRMB",
-            width: 80,
-            overHidden: true,
-          },
-          {
-            label: "发票USD",
-            prop: "currentInvoiceAmountUSD",
-            width: 80,
-            overHidden: true,
-          },
+          // {
+          //   label: "发票CNY",
+          //   prop: "currentInvoiceAmountRMB",
+          //   width: 80,
+          //   overHidden: true,
+          // },
+          // {
+          //   label: "发票USD",
+          //   prop: "currentInvoiceAmountUSD",
+          //   width: 80,
+          //   overHidden: true,
+          // },
           {
             label: "箱型箱量",
             prop: "quantityCntrTypesDescr",
@@ -1252,19 +1252,23 @@ export default {
         this.allCRMBSum = 0;
         this.allCUSDSum = 0;
         this.allCSum = 0;
+        let DSUM=0;
+        let CSUM=0;
         if (oldValue.length) {
           oldValue.forEach((e) => {
             if (e.dc == "D") {
               this.allDRMBSum += Number(e.currentStlAmountRMB ? e.currentStlAmountRMB : 0);
               this.allDUSDSum += Number(e.currentStlAmountUSD ? e.currentStlAmountUSD : 0);
-              this.allDSum += this.allDRMBSum + this.allDUSDSum * e.currentStlExrate;
+              DSUM += this.allDUSDSum * e.currentStlExrate;
             }
             if (e.dc == "C") {
               this.allCRMBSum += Number(e.currentStlAmountRMB ? e.currentStlAmountRMB : 0);
               this.allCUSDSum += Number(e.currentStlAmountUSD ? e.currentStlAmountUSD : 0);
-              this.allCSum += this.allCRMBSum + this.allCUSDSum * e.currentStlExrate;
+              CSUM += this.allCUSDSum * e.currentStlExrate;
             }
           });
+          this.allDSum=this.allDRMBSum+DSUM
+          this.allCSum=this.allCRMBSum+CSUM
         }
       },
       deep: true, // 深度监听

src/views/iosBasicData/financialManagement/finstlbills/components/queryData.vue

@@ -711,7 +711,7 @@ export default {
         isSignfor: this.form.isSignfor, // 是否已签收（0 否 1是）
         dc: this.form.dc, // 收付 D=收 C=付
         curCode: this.form.curCode, // 币别
-        srcId: this.form.srcId, // 业务员id
+        srcCnName: this.form.srcId, // 业务员id
         isCleared: this.form.isCleared, // 是否销账（0 未销账 3 部分销账 9 销账）
         accBillNo: this.form.accountNo, // 账单编号  ACCT NO
         billNo: this.form.businessNo, // 单据编号  JOB NO
@@ -723,7 +723,7 @@ export default {
         invoiceStatus: this.form.isInvoice, // 发票状态 0 = 未开 9=已开 2 待开 3 不开
         vesselCnName: this.form.vesselCnName, // 中文船名
         invoiceNo: this.form.invoiceNo, // 发票号
-        bookingNo: this.form.bookingNo, // 订舱号 BKNO
+        bookingNo: this.form.bookingNumber, // 订舱号 BKNO
         createUserName: this.form.operatorId ? this.form.operatorId : "", // 操作员id
         voyageNo: this.form.voyageNo, // 航次
         businessDateStart: this.form.businessDateStart, // 业务开始日期

src/views/iosBasicData/financialManagement/finstlbills/detailsPage.vue

@@ -1197,7 +1197,7 @@ export default {
             item.customSelected = false;
             if (item.curCode == "CNY") {
               this.$set(item, "amountRMB", item.amount);
-              this.$set(item, "currentInvoiceAmountRMB", Number(item.appliedInvoiceAmount ? item.appliedInvoiceAmount : 0));
+              // this.$set(item, "currentInvoiceAmountRMB", Number(item.appliedInvoiceAmount ? item.appliedInvoiceAmount : 0));
               this.$set(item, "unsettledAmountRMB", Number(item.amount ? item.amount : 0));
               this.$set(item, "currentStlAmountRMB", Number(item.currentStlAmount ? item.currentStlAmount : 0));
               this.$set(item, "currentStlAmountUSD", Number(0));
@@ -1205,7 +1205,7 @@ export default {
               this.$set(item, "stlAmountDrUSD", Number(0));
             } else {
               this.$set(item, "amountUSD", item.amount);
-              this.$set(item, "currentInvoiceAmountUSD", Number(item.appliedInvoiceAmount ? item.appliedInvoiceAmount : 0));
+              // this.$set(item, "currentInvoiceAmountUSD", Number(item.appliedInvoiceAmount ? item.appliedInvoiceAmount : 0));
               this.$set(item, "unsettledAmountUSD", Number(item.amount ? item.amount : 0));
               this.$set(item, "currentStlAmountUSD", Number(item.currentStlAmount ? item.currentStlAmount : 0));
               this.$set(item, "currentStlAmountRMB", Number(0));

src/views/iosBasicData/fininvoicesApplyfor/assembly/fininvoicesitems.vue

@@ -46,16 +46,22 @@
         <span v-else>{{ row.currentAmountUSD }}</span>
       </tempalte>
       <template slot="reconciliationAmount" slot-scope="{ row }">
-        <el-popover trigger="click">
+        <el-popover trigger="click" v-if="Number(row.reconciliationAmount)">
           <avue-crud :data="rlaData" :option="rlaOption"></avue-crud>
-          <span style="color: #409eff; cursor: pointer" slot="reference" @click="viewRLA(row,'对账')">{{ row.reconciliationAmount }}</span>
+          <span style="color: #409eff; cursor: pointer" slot="reference" @click="viewRLA(row, '对账')">
+            {{ row.reconciliationAmount }}
+          </span>
         </el-popover>
+        <span v-else>{{ row.reconciliationAmount }}</span>
       </template>
       <template slot="reconciliationAmountUsd" slot-scope="{ row }">
-        <el-popover trigger="click">
+        <el-popover trigger="click" v-if="Number(row.reconciliationAmountUsd)">
           <avue-crud :data="rlaData" :option="rlaOption"></avue-crud>
-          <span style="color: #409eff; cursor: pointer" slot="reference" @click="viewRLA(row,'对账')">{{ row.reconciliationAmountUsd }}</span>
+          <span style="color: #409eff; cursor: pointer" slot="reference" @click="viewRLA(row, '对账')">
+            {{ row.reconciliationAmountUsd }}
+          </span>
         </el-popover>
+        <span v-else>{{ row.reconciliationAmountUsd }}</span>
       </template>
     </avue-crud>
   </div>
@@ -159,21 +165,21 @@ export default {
                 value: "C",
               },
             ],
-            sortable:true,
+            sortable: true,
             overHidden: true,
           },
           {
             label: "账单编号",
             prop: "accBillNo",
             width: 120,
-            sortable:true,
+            sortable: true,
             overHidden: true,
           },
           {
             label: "主单号",
             prop: "mblno",
             width: 100,
-            sortable:true,
+            sortable: true,
             overHidden: true,
           },
           {
@@ -290,7 +296,7 @@ export default {
         currentPage: 1,
         total: 0,
         pageSize: 200,
-        pageSizes: [20, 50, 100, 200, 500,'ALL'],
+        pageSizes: [20, 50, 100, 200, 500, "ALL"],
       },
       pageData: [],
     };
@@ -310,7 +316,7 @@ export default {
     },
     sizeChange(val) {
       this.page.currentPage = 1;
-      this.page.pageSize = val?val:this.queryData.length;
+      this.page.pageSize = val ? val : this.queryData.length;
       this.getList();
     },
     currentChange(val) {

src/views/iosBasicData/fininvoicesApplyfor/assembly/fininvoicesitems2.vue

@@ -33,16 +33,22 @@
         <span v-else>{{ row.currentAmountCNY }}</span>
       </tempalte>
       <template slot="reconciliationAmount" slot-scope="{ row }">
-        <el-popover trigger="click">
+        <el-popover trigger="click" v-if="Number(row.reconciliationAmount)">
           <avue-crud :data="rlaData" :option="rlaOption"></avue-crud>
-          <span style="color: #409eff; cursor: pointer" slot="reference" @click="viewRLA(row, '对账')">{{ row.reconciliationAmount }}</span>
+          <span style="color: #409eff; cursor: pointer" slot="reference" @click="viewRLA(row, '对账')">
+            {{ row.reconciliationAmount }}
+          </span>
         </el-popover>
+        <span v-else>{{ row.reconciliationAmount }}</span>
       </template>
       <template slot="reconciliationAmountUsd" slot-scope="{ row }">
-        <el-popover trigger="click">
+        <el-popover trigger="click" v-if="Number(row.reconciliationAmountUsd)">
           <avue-crud :data="rlaData" :option="rlaOption"></avue-crud>
-          <span style="color: #409eff; cursor: pointer" slot="reference" @click="viewRLA(row, '对账')">{{ row.reconciliationAmountUsd }}</span>
+          <span style="color: #409eff; cursor: pointer" slot="reference" @click="viewRLA(row, '对账')">
+            {{ row.reconciliationAmountUsd }}
+          </span>
         </el-popover>
+        <span v-else>{{ row.reconciliationAmountUsd }}</span>
       </template>
       <tempalte slot="currentAmountUSD" slot-scope="{ row }">
         <el-input-number