소스 검색

修改仓储利润总账

caojunjie 2 년 전
부모
커밋
e667e17453

+ 14 - 0
src/views/reportManagement/generalLedgerCr/detail.vue

@@ -355,6 +355,20 @@ export default {
         },
         {
           surface: "7",
+          label: "fQty",
+          name: "数量",
+          checked: 0,
+          width: 130,
+        },
+        {
+          surface: "8",
+          label: "price",
+          name: "单价",
+          checked: 0,
+          width: 130,
+        },
+        {
+          surface: "8",
           label: "famount",
           name: "应付金额",
           checked: 0,

+ 14 - 0
src/views/reportManagement/generalLedgerDr/detail.vue

@@ -366,6 +366,20 @@ export default {
           width: 130,
         },
         {
+          surface: "7",
+          label: "fQty",
+          name: "数量",
+          checked: 0,
+          width: 130,
+        },
+        {
+          surface: "8",
+          label: "price",
+          name: "单价",
+          checked: 0,
+          width: 130,
+        },
+        {
           surface: "8",
           label: "fstlamount",
           name: "实收金额",

+ 20 - 41
src/views/reportManagement/profitGeneralLedger/detail.vue

@@ -298,98 +298,77 @@ export default {
         {
           surface: "2",
           label: "ffeesName",
-          name: "结算单位",
+          name: "客户",
           checked: 0,
           width: 130,
         },
         {
           surface: "3",
-          label: "fmblno",
-          name: "提单号",
+          label: "fBilltype",
+          name: "费用类别",
           checked: 0,
           width: 130,
         },
         {
           surface: "4",
-          label: "fproductName",
-          name: "货物名称",
+          label: "receivableFQty",
+          name: "重量",
           checked: 0,
           width: 130,
         },
         {
           surface: "5",
-          label: "fmarks",
-          name: "品牌",
+          label: "fBillingDays",
+          name: "天数",
           checked: 0,
           width: 130,
         },
         {
           surface: "6",
-          label: "fBilltype",
-          name: "业务类型",
+          label: "receivablePrice",
+          name: "单价",
           checked: 0,
           width: 130,
         },
         {
           surface: "7",
-          label: "fBstime",
-          name: "业务日期",
+          label: "receivableAmount",
+          name: "应收金额",
           checked: 0,
           width: 130,
         },
         {
           surface: "8",
-          label: "fReviewDate",
-          name: "审核日期",
+          label: "fBilltypeC",
+          name: "成本项目",
           checked: 0,
           width: 130,
         },
         {
           surface: "9",
-          label: "storageFee",
-          name: "仓储费金额",
+          label: "copeWithFQty",
+          name: "重量",
           checked: 0,
           width: 130,
         },
         {
           surface: "10",
-          label: "otherFee",
-          name: "其他金额",
+          label: "copeWithPrice",
+          name: "单价",
           checked: 0,
           width: 130,
         },
         {
           surface: "11",
-          label: "famount",
-          name: "应金额",
+          label: "copeWithAmount",
+          name: "应金额",
           checked: 0,
           width: 130,
         },
         {
           surface: "12",
-          label: "fstlamount",
-          name: "实收金额",
-          checked: 0,
-          width: 130,
-        },
-        {
-          surface: "13",
           label: "nnfinished",
-          name: "未收金额",
-          checked: 0,
-          width: 130,
-        },
-        {
-          surface: "14",
-          label: "faccamount",
-          name: "对账金额",
-          checked: 0,
-          width: 130,
-        },
-        {
-          surface: "15",
-          label: "finvamount",
-          name: "开票金额",
+          name: "利润总额",
           checked: 0,
           width: 130,
         }

+ 2 - 2
vue.config.js

@@ -35,7 +35,7 @@ module.exports = {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
         // target: `http://58.56.152.118:9010/prod-api/`,
-        // target: `http://192.168.1.120:9099/`,
+        target: `http://192.168.1.120:9099/`,
         // target: `http://192.168.1.111:9010/`,
         // target: `http://192.168.1.116:9012/`,
         // target: `http://192.168.1.116:9010/`,
@@ -57,7 +57,7 @@ module.exports = {
         // target: `https://hwc.tubaosoft.com/prod-api/`,
         // target: `https://zjxd.dhscs.net/prod-api/`,
         // target: `http://ck.huodaonar.com/prod-api/`,
-        target: `https://ck.hturing.com/prod-api/`,
+        // target: `https://ck.hturing.com/prod-api/`,
         // target: `https://jingang.re-king.cn//prod-api/`,
         // target: `https://wms.hadexpress.com/prod-api/`,
         // target: `https://jingrun.tubaosoft.com/prod-api/`,