2024-05-16修改

src/api/ecw/box.js

@@ -124,6 +124,15 @@ export function getCostList(params) {
     params,
   });
 }
+// 付款单主表 SELECT * from ecw_payment
+// 付款单费用明细 SELECT * from ecw_payable 
+// 根据明细获取主表ID
+export function getPaymentId(id) {
+  return request({
+    url: "/ecw/box-cost/getPaymentId?id="+id,
+    method: "get"
+  });
+}
 
 // 获得出货异常记录列表
 export function getAbnormalList(params) {

src/api/report/salesreport.js

@@ -48,8 +48,6 @@ export function getEChartData(query) {
   })
 }
 
-
-
 // 导出测试 Excel 2024-04-27
 export function exportTestExcel(query) {
   return request({

src/views/ecw/box/costForm.vue

@@ -94,6 +94,7 @@ export default {
     });
     const { costDetail } = this.$attrs;
     this.costObj = { ...costDetail };
+    //币种获取接口 lanbm 2024-05-16 添加注释
     getCurrencyList().then((res) => {
       this.currencyList = res.data ?? [];
     });

src/views/ecw/box/queryAir.vue

@@ -140,12 +140,30 @@
                 </template>
               </el-table-column>
               <el-table-column prop="price" :label="$t('金额')" align="center"></el-table-column>
+              <!--lanbm 2024-05-16 修改-->
+              <el-table-column prop="priceUnitName" :label="$t('币种')" align="center"></el-table-column>
               <el-table-column prop="payPrice" :label="$t('实付金额')" align="center"></el-table-column>
+              <el-table-column prop="payPriceBz" :label="$t('实付币种')" align="center"></el-table-column>
               <el-table-column prop="payTime" :label="$t('实付日期')" align="center">
                 <template slot-scope="scope">
                   <span v-if="scope.row.payTime">{{formatDate(scope.row.payTime)}}</span>
                 </template>
               </el-table-column>
+              <el-table-column prop="payableNo" :label="$t('付款单号')" align="center">
+                <template slot-scope="scope">
+                  <span
+                    style="color: #1890ff"
+                    @click="paymentDetail(scope.row)"
+                    >{{ scope.row.payableNo }}</span
+                  >
+                </template>
+              </el-table-column>
+              <el-table-column prop="creator" :label="$t('创建人')" align="center"></el-table-column>
+              <el-table-column prop="createTime" :label="$t('创建日期')" align="center"></el-table-column>
+              <el-table-column prop="updater" :label="$t('修改人')" align="center"></el-table-column>
+              <el-table-column prop="updateTime" :label="$t('修改日期')" align="center"></el-table-column>
+              <!--添加备注信息列 lanbm 2024-05-16 add-->
+              <el-table-column prop="remarks" :label="$t('备注')" align="center"></el-table-column>
               <el-table-column :label="$t('操作')" align="center">
                 <template slot-scope="scope">
                   <el-button type="primary" size="small" @click="editCostClick(scope.row)" style="marginRight:10px;" v-hasPermi="['ecw:box-cost:update']">{{$t('编辑')}}</el-button>
@@ -228,7 +246,7 @@ import {
   getCostList,
   getAbnormalList,
   deleteCost,
-  deletebox,
+  deletebox,getPaymentId
 } from "@/api/ecw/box";
 import { getChannelList } from "@/api/ecw/channel";
 import { getCabinetPage } from "@/api/ecw/cabinet";
@@ -368,6 +386,14 @@ export default {
     };
   },
   methods: {
+    paymentDetail(row) {
+      //lanbm 2024-05-16跳转到付款单详情页面
+      const id = row.payableId;
+      getPaymentId(id).then((r) => {
+        let sId = r.data;
+        this.$router.push("/financial/paymentDetail?id=" + sId);
+      });
+    },
     getregprocess(val) {
       var data = ''
       switch(val){
@@ -535,6 +561,7 @@ export default {
     },
     // 获取费用
     getCost() {
+      //空运费用 lanbm 2024-05-16 
       getCostList({ shipmentId: this.shipmentId }).then((res) => {
         this.costList = res.data;
       });

src/views/report/vz/index.vue

@@ -64,7 +64,7 @@
           type="primary"
           plain
           icon="el-icon-plus"
-          v-show="true"
+          v-show="false"
           size="mini"
           @click="TestFun"
         >