修改路径 添加字段

src/api/finance/kaihe/contrast.js

@@ -116,7 +116,7 @@ export function getExcel() {
 //kaihe-查看详情
 export function getExcelInfo(id) {
   return request({
-    url: '/shipping/financial/exportItems/'+id,
+    url: '/shipping/financial/export/financial/'+id,
     method:'get'
   })
 }

src/views/finance/charge/js/index.js

@@ -127,104 +127,111 @@ export const tableOption2 = [{
   },
   {
     surface: "4",
+    label: "goodName",
+    name: "货名",
+    checked: 0,
+    width: 100,
+  },
+  {
+    surface: "5",
     label: "fFeeUnitName",
     name: "计价单位",
     checked: 0,
     width: 100,
   },
   {
-    surface: "5",
+    surface: "6",
     label: "fQty",
     name: "数量",
     checked: 0,
     width: 100,
   },
   {
-    surface: "6",
+    surface: "7",
     label: "fUnitPrice",
     name: "单价",
     checked: 0,
     width: 100,
   },
   {
-    surface: "7",
+    surface: "8",
     label: "fAmtdr",
     name: "应收金额",
     checked: 0,
     width: 100,
   },
   {
-    surface: "8",
+    surface: "9",
     label: "fAmt",
     name: "实收金额",
     checked: 0,
     width: 120,
   },
   {
-    surface: "9",
+    surface: "10",
     label: "fvslName",
     name: "船名",
     checked: 0,
     width: 100,
   },
   {
-    surface: "10",
+    surface: "11",
     label: "fvoyName",
     name: "航次",
     checked: 0,
     width: 100,
   },
   {
-    surface: "11",
+    surface: "12",
     label: "fCntrCount",
     name: "箱量",
     checked: 0,
     width: 100,
   },
   {
-    surface: "12",
+    surface: "13",
     label: "cntrName",
     name: "箱型",
     checked: 0,
     width: 100,
   },
   {
-    surface: "13",
+    surface: "14",
     label: "fLoadPortName",
     name: "起运港",
     checked: 0,
     width: 100,
   },
   {
-    surface: "14",
+    surface: "15",
     label: "fDestPortName",
     name: "目的港",
     checked: 0,
     width: 100,
   },
   {
-    surface: "15",
+    surface: "16",
     label: "fBillStatusName",
     name: "状态",
     checked: 0,
     width: 100,
   },
   {
-    surface: "16",
+    surface: "17",
     label: "createBy",
     name: "制单人",
     checked: 0,
     width: 100,
   },
   {
-    surface: "17",
+    surface: "18",
     label: "createTime",
     name: "制单日期",
     checked: 0,
     width: 100,
   },
   {
-    surface: "18",
+    surface: "19",
     label: "fRemarks",
     name: "备注",
     checked: 0,

src/views/finance/charge/kaihe-detail.vue

@@ -347,6 +347,9 @@
           <span v-if="item.label == 'fFeeName'">
             {{ scope.row.fFeeName }}
           </span>
+          <span v-if="item.label == 'goodName'">
+            {{ scope.row.goodName }}
+          </span>
           <span v-if="item.label == 'fFeeUnitName'">
             {{ scope.row.fFeeUnitName }}
           </span>

src/views/finance/contrast/js/index.js

@@ -107,104 +107,111 @@ export const tableOption2 = [{
   },
   {
     surface: "4",
+    label: "goodName",
+    name: "货名",
+    checked: 0,
+    width: 100,
+  },
+  {
+    surface: "5",
     label: "fFeeUnitName",
     name: "计价单位",
     checked: 0,
     width: 100,
   },
   {
-    surface: "5",
+    surface: "6",
     label: "fQty",
     name: "数量",
     checked: 0,
     width: 100,
   },
   {
-    surface: "6",
+    surface: "7",
     label: "fUnitPrice",
     name: "单价",
     checked: 0,
     width: 100,
   },
   {
-    surface: "7",
+    surface: "8",
     label: "fAmtdr",
     name: "应收金额",
     checked: 0,
     width: 100,
   },
   {
-    surface: "8",
+    surface: "9",
     label: "fAmt",
     name: "实收金额",
     checked: 0,
     width: 120,
   },
   {
-    surface: "9",
+    surface: "10",
     label: "fvslName",
     name: "船名",
     checked: 0,
     width: 100,
   },
   {
-    surface: "10",
+    surface: "11",
     label: "fvoyName",
     name: "航次",
     checked: 0,
     width: 100,
   },
   {
-    surface: "11",
+    surface: "12",
     label: "fCntrCount",
     name: "箱量",
     checked: 0,
     width: 100,
   },
   {
-    surface: "12",
+    surface: "13",
     label: "cntrName",
     name: "箱型",
     checked: 0,
     width: 100,
   },
   {
-    surface: "13",
+    surface: "14",
     label: "fLoadPortName",
     name: "起运港",
     checked: 0,
     width: 100,
   },
   {
-    surface: "14",
+    surface: "15",
     label: "fDestPortName",
     name: "目的港",
     checked: 0,
     width: 100,
   },
   {
-    surface: "15",
+    surface: "16",
     label: "fBillStatusName",
     name: "状态",
     checked: 0,
     width: 100,
   },
   {
-    surface: "16",
+    surface: "17",
     label: "createBy",
     name: "制单人",
     checked: 0,
     width: 100,
   },
   {
-    surface: "17",
+    surface: "18",
     label: "createTime",
     name: "制单日期",
     checked: 0,
     width: 100,
   },
   {
-    surface: "18",
+    surface: "19",
     label: "fRemarks",
     name: "备注",
     checked: 0,

src/views/finance/contrast/kaihe-detail.vue

@@ -329,6 +329,9 @@
           <span v-if="item.label == 'fFeeName'">
             {{ scope.row.fFeeName }}
           </span>
+          <span v-if="item.label == 'goodName'">
+            {{ scope.row.goodName }}
+          </span>
           <span v-if="item.label == 'fFeeUnitName'">
             {{ scope.row.fFeeUnitName }}
           </span>

src/views/finance/payment/js/index.js

@@ -127,104 +127,111 @@ export const tableOption2 = [{
   },
   {
     surface: "4",
+    label: "goodName",
+    name: "货名",
+    checked: 0,
+    width: 100,
+  },
+  {
+    surface: "5",
     label: "fFeeUnitName",
     name: "计价单位",
     checked: 0,
     width: 100,
   },
   {
-    surface: "5",
+    surface: "6",
     label: "fQty",
     name: "数量",
     checked: 0,
     width: 100,
   },
   {
-    surface: "6",
+    surface: "7",
     label: "fUnitPrice",
     name: "单价",
     checked: 0,
     width: 100,
   },
   {
-    surface: "7",
+    surface: "8",
     label: "fAmtdr",
     name: "应收金额",
     checked: 0,
     width: 100,
   },
   {
-    surface: "8",
+    surface: "9",
     label: "fAmt",
     name: "实收金额",
     checked: 0,
     width: 120,
   },
   {
-    surface: "9",
+    surface: "10",
     label: "fvslName",
     name: "船名",
     checked: 0,
     width: 100,
   },
   {
-    surface: "10",
+    surface: "11",
     label: "fvoyName",
     name: "航次",
     checked: 0,
     width: 100,
   },
   {
-    surface: "11",
+    surface: "12",
     label: "fCntrCount",
     name: "箱量",
     checked: 0,
     width: 100,
   },
   {
-    surface: "12",
+    surface: "13",
     label: "cntrName",
     name: "箱型",
     checked: 0,
     width: 100,
   },
   {
-    surface: "13",
+    surface: "14",
     label: "fLoadPortName",
     name: "起运港",
     checked: 0,
     width: 100,
   },
   {
-    surface: "14",
+    surface: "15",
     label: "fDestPortName",
     name: "目的港",
     checked: 0,
     width: 100,
   },
   {
-    surface: "15",
+    surface: "16",
     label: "fBillStatusName",
     name: "状态",
     checked: 0,
     width: 100,
   },
   {
-    surface: "16",
+    surface: "17",
     label: "createBy",
     name: "制单人",
     checked: 0,
     width: 100,
   },
   {
-    surface: "17",
+    surface: "18",
     label: "createTime",
     name: "制单日期",
     checked: 0,
     width: 100,
   },
   {
-    surface: "18",
+    surface: "19",
     label: "fRemarks",
     name: "备注",
     checked: 0,

src/views/finance/payment/kaihe-detail.vue

@@ -347,6 +347,9 @@
           <span v-if="item.label == 'fFeeName'">
             {{ scope.row.fFeeName }}
           </span>
+          <span v-if="item.label == 'goodName'">
+            {{ scope.row.goodName }}
+          </span>
           <span v-if="item.label == 'fFeeUnitName'">
             {{ scope.row.fFeeUnitName }}
           </span>