From c4ab08953145215e4852bb5fab5d23f6fe9fa214 Mon Sep 17 00:00:00 2001
From: hyt <958868763@qq.com>
Date: Tue, 24 Sep 2024 13:33:26 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=8A=A5=E8=A1=A8=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82=E6=B7=BB=E5=8A=A0=EF=BC=88=E4=B8=BD=E7=9F=A5=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../u8positiveReports/TOBoutputWarehouse.vue  | 145 +++++++-------
 .../u8positiveReports/TOBreturnWarehouse.vue  | 181 +++++++++--------
 .../u8positiveReports/TOCoutputWarehouse.vue  | 187 +++++++++---------
 .../u8positiveReports/TOCreturnWarehouse.vue  | 180 ++++++++---------
 .../u8positiveReports/baseNewTable2/index.vue |   2 +-
 vue.config.js                                 |   3 +-
 6 files changed, 345 insertions(+), 353 deletions(-)

diff --git a/src/views/systemReports/u8positiveReports/TOBoutputWarehouse.vue b/src/views/systemReports/u8positiveReports/TOBoutputWarehouse.vue
index b136611..735d8cf 100644
--- a/src/views/systemReports/u8positiveReports/TOBoutputWarehouse.vue
+++ b/src/views/systemReports/u8positiveReports/TOBoutputWarehouse.vue
@@ -237,84 +237,6 @@ export default {
           tooltip: true,
           width: 150
         },
-        {
-          label: 'TOB库存-推送时间',
-          prop: 'newpushdate',
-          tooltip: true,
-          width: 200
-        },
-        {
-          label: 'TOB库存-报错详情',
-          prop: 'newtransmitinfo',
-          tooltip: true,
-          width: 200
-        },
-        {
-          label: 'TOB库存-推送状态',
-          prop: 'newstate',
-          tooltip: true,
-          width: 200
-        },
-        {
-          label: 'TOB确认收入-推送状态',
-          prop: 'newstate4',
-          tooltip: true,
-          width: 200
-        },
-        {
-          label: 'TOB库存-下游单号',
-          prop: 'newsystemnumber',
-          tooltip: true,
-          width: 200
-        },
-        {
-          label: 'TOB库存-下游主键',
-          prop: 'newsystemprimary',
-          tooltip: true,
-          width: 150
-        },
-        {
-          label: 'TOB库存-下游单号',
-          prop: 'newsystemnumber',
-          tooltip: true,
-          width: 150
-        },
-        {
-          label: 'TOB库存-下游主键',
-          prop: 'newsystemprimary',
-          tooltip: true,
-          width: 150
-        },
-        {
-          label: 'TOB确认收入-下游单号',
-          prop: 'newsystemnumber4',
-          tooltip: true,
-          width: 150
-        },
-        {
-          label: 'TOB确认收入-下游主键',
-          prop: 'newsystemprimary4',
-          tooltip: true,
-          width: 150
-        },
-        {
-          label: '业务类型',
-          prop: 'businesstype',
-          tooltip: true,
-          width: 150
-        },
-        {
-          label: 'TOB确认收入-推送时间',
-          prop: 'def5',
-          tooltip: true,
-          width: 150
-        },
-        {
-          label: 'TOB确认收入-报错详情',
-          prop: 'def6',
-          tooltip: true,
-          width: 150
-        },
         {
           label: '货主编码',
           prop: 'headCompanyCode',
@@ -345,7 +267,72 @@ export default {
           tooltip: true,
           width: 150
         },
-
+        {
+          label: 'TOB库存-推送时间',
+          prop: 'newpushdate',
+          tooltip: true,
+          width: 200
+        },
+        {
+          label: 'TOB库存-报错详情',
+          prop: 'newtransmitinfo',
+          tooltip: true,
+          width: 200
+        },
+        {
+          label: 'TOB库存-推送状态',
+          prop: 'newstate',
+          tooltip: true,
+          width: 200
+        },
+        {
+          label: 'TOB库存-下游单号',
+          prop: 'newsystemnumber',
+          tooltip: true,
+          width: 200
+        },
+        {
+          label: 'TOB库存-下游主键',
+          prop: 'newsystemprimary',
+          tooltip: true,
+          width: 150
+        },
+        {
+          label: 'TOB确认收入-推送时间',
+          prop: 'def5',
+          tooltip: true,
+          width: 150
+        },
+        {
+          label: 'TOB确认收入-报错详情',
+          prop: 'def6',
+          tooltip: true,
+          width: 150
+        },
+        {
+          label: 'TOB确认收入-推送状态',
+          prop: 'newstate4',
+          tooltip: true,
+          width: 200
+        },
+        {
+          label: 'TOB确认收入-下游单号',
+          prop: 'newsystemnumber4',
+          tooltip: true,
+          width: 150
+        },
+        {
+          label: 'TOB确认收入-下游主键',
+          prop: 'newsystemprimary4',
+          tooltip: true,
+          width: 150
+        },
+        {
+          label: '业务类型',
+          prop: 'businesstype',
+          tooltip: true,
+          width: 150
+        },
       ],
       //正常合并
       tableDataMergeList: [],
diff --git a/src/views/systemReports/u8positiveReports/TOBreturnWarehouse.vue b/src/views/systemReports/u8positiveReports/TOBreturnWarehouse.vue
index f383342..1822eba 100644
--- a/src/views/systemReports/u8positiveReports/TOBreturnWarehouse.vue
+++ b/src/views/systemReports/u8positiveReports/TOBreturnWarehouse.vue
@@ -226,96 +226,6 @@ export default {
           tooltip: true,
           width: 150
         },
-        {
-          label: '来源单据主键',
-          prop: 'reforderdetailid',
-          tooltip: true,
-          width: 150
-        },
-        {
-          label: '货品sku',
-          prop: 'skucode',
-          tooltip: true,
-          width: 150
-        },
-        {
-          label: '货品名称',
-          prop: 'skuname',
-          tooltip: true,
-          width: 150
-        },
-        {
-          label: '实收数量',
-          prop: 'receivedqty',
-          tooltip: true,
-          width: 150
-        },
-        {
-          label: 'TOB销售-库存-报错详情',
-          prop: 'newtransmitinfo',
-          tooltip: true,
-          width: 200
-        },
-        {
-          label: 'TOB销售-库存-推送时间',
-          prop: 'newpushdate',
-          tooltip: true,
-          width: 200
-        },
-        {
-          label: 'TOB销售-库存-推送状态',
-          prop: 'newstate',
-          tooltip: true,
-          width: 200
-        },
-        {
-          label: 'TOB库存-下游单号',
-          prop: 'newsystemnumber',
-          tooltip: true,
-          width: 200
-        },
-        {
-          label: 'TOB库存-下游主键',
-          prop: 'newsystemprimary',
-          tooltip: true,
-          width: 150
-        },
-        {
-          label: 'TOB确认收入-报错详情',
-          prop: 'newtransmitinfo2',
-          tooltip: true,
-          width: 150
-        },
-        {
-          label: 'TOB销售-确认收入-推送时间',
-          prop: 'newpushdate2',
-          tooltip: true,
-          width: 150
-        },
-        {
-          label: 'TOB销售-确认收入红-推送状态',
-          prop: 'newstate2',
-          tooltip: true,
-          width: 150
-        },
-        {
-          label: 'TOB确认收入红-下游单号',
-          prop: 'newsystemnumber2',
-          tooltip: true,
-          width: 150
-        },
-        {
-          label: 'TOB确认收入红-下游主键',
-          prop: 'newsystemprimary2',
-          tooltip: true,
-          width: 150
-        },
-        {
-          label: '业务类型',
-          prop: 'businesstype',
-          tooltip: true,
-          width: 150
-        },
         {
           label: '货主编码',
           prop: 'headCompanyCode',
@@ -346,7 +256,96 @@ export default {
           tooltip: true,
           width: 150
         },
-
+        {
+          label: '来源单据主键',
+          prop: 'reforderdetailid',
+          tooltip: true,
+          width: 150
+        },
+        {
+          label: '货品sku',
+          prop: 'skucode',
+          tooltip: true,
+          width: 150
+        },
+        {
+          label: '货品名称',
+          prop: 'skuname',
+          tooltip: true,
+          width: 150
+        },
+        {
+          label: '实收数量',
+          prop: 'receivedqty',
+          tooltip: true,
+          width: 150
+        },
+        {
+          label: 'TOB销售-库存-推送时间',
+          prop: 'newpushdate',
+          tooltip: true,
+          width: 200
+        },
+        {
+          label: 'TOB销售-库存-报错详情',
+          prop: 'newtransmitinfo',
+          tooltip: true,
+          width: 200
+        },
+        {
+          label: 'TOB销售-库存-推送状态',
+          prop: 'newstate',
+          tooltip: true,
+          width: 200
+        },
+        {
+          label: 'TOB库存-下游单号',
+          prop: 'newsystemnumber',
+          tooltip: true,
+          width: 200
+        },
+        {
+          label: 'TOB库存-下游主键',
+          prop: 'newsystemprimary',
+          tooltip: true,
+          width: 150
+        },
+        {
+          label: 'TOB销售-确认收入-推送时间',
+          prop: 'newpushdate2',
+          tooltip: true,
+          width: 150
+        },
+        {
+          label: 'TOB确认收入-报错详情',
+          prop: 'newtransmitinfo2',
+          tooltip: true,
+          width: 150
+        },
+        {
+          label: 'TOB销售-确认收入红-推送状态',
+          prop: 'newstate2',
+          tooltip: true,
+          width: 150
+        },
+        {
+          label: 'TOB确认收入红-下游单号',
+          prop: 'newsystemnumber2',
+          tooltip: true,
+          width: 150
+        },
+        {
+          label: 'TOB确认收入红-下游主键',
+          prop: 'newsystemprimary2',
+          tooltip: true,
+          width: 150
+        },
+        {
+          label: '业务类型',
+          prop: 'businesstype',
+          tooltip: true,
+          width: 150
+        },
       ],
       //正常合并
       tableDataMergeList: [],
diff --git a/src/views/systemReports/u8positiveReports/TOCoutputWarehouse.vue b/src/views/systemReports/u8positiveReports/TOCoutputWarehouse.vue
index 85fa6ef..906488c 100644
--- a/src/views/systemReports/u8positiveReports/TOCoutputWarehouse.vue
+++ b/src/views/systemReports/u8positiveReports/TOCoutputWarehouse.vue
@@ -248,96 +248,6 @@ export default {
           tooltip: true,
           width: 150
         },
-        {
-          label: 'TOC销售-库存-推送状态',
-          prop: 'newstate',
-          tooltip: true,
-          width: 200
-        },
-        {
-          label: 'TOC销售-库存-报错详情',
-          prop: 'newtransmitinfo',
-          tooltip: true,
-          width: 200
-        },
-        {
-          label: 'TOC销售-确认收入红-推送状态',
-          prop: 'newstate2',
-          tooltip: true,
-          width: 200
-        },
-        {
-          label: 'TOC销售-确认收入蓝-推送状态',
-          prop: 'newstate3',
-          tooltip: true,
-          width: 200
-        },
-        {
-          label: 'TOC库存-下游单号',
-          prop: 'newsystemnumber',
-          tooltip: true,
-          width: 200
-        },
-        {
-          label: 'TOC库存-下游主键',
-          prop: 'newsystemprimary',
-          tooltip: true,
-          width: 150
-        },
-        {
-          label: 'TOC确认收入红-下游单号',
-          prop: 'newsystemnumber2',
-          tooltip: true,
-          width: 150
-        },
-        {
-          label: 'TOC确认收入红-下游主键',
-          prop: 'newsystemprimary2',
-          tooltip: true,
-          width: 150
-        },
-        {
-          label: 'TOC确认收入蓝-下游单号',
-          prop: 'newsystemnumber3',
-          tooltip: true,
-          width: 150
-        },
-        {
-          label: 'TOC确认收入蓝-下游主键',
-          prop: 'newsystemprimary3',
-          tooltip: true,
-          width: 150
-        },
-        {
-          label: 'TOC销售-确认收入红-推送时间',
-          prop: 'def1',
-          tooltip: true,
-          width: 150
-        },
-        {
-          label: '业务类型',
-          prop: 'businesstype',
-          tooltip: true,
-          width: 150
-        },
-        {
-          label: 'TOC销售-确认收入红-报错详情',
-          prop: 'def2',
-          tooltip: true,
-          width: 150
-        },
-        {
-          label: 'TOC销售-确认收入蓝-推送时间',
-          prop: 'def3',
-          tooltip: true,
-          width: 150
-        },
-        {
-          label: 'TOC销售-确认收入蓝-报错详情',
-          prop: 'def4',
-          tooltip: true,
-          width: 150
-        },
         {
           label: '货主编码',
           prop: 'headCompanyCode',
@@ -368,7 +278,102 @@ export default {
           tooltip: true,
           width: 150
         },
-
+        {
+          label: 'TOC销售-库存-推送时间',
+          prop: 'newpushdate',
+          tooltip: true,
+          width: 200
+        },
+        {
+          label: 'TOC销售-库存-报错详情',
+          prop: 'newtransmitinfo',
+          tooltip: true,
+          width: 200
+        },
+        {
+          label: 'TOC销售-库存-推送状态',
+          prop: 'newstate',
+          tooltip: true,
+          width: 200
+        },
+        {
+          label: 'TOC库存-下游单号',
+          prop: 'newsystemnumber',
+          tooltip: true,
+          width: 200
+        },
+        {
+          label: 'TOC库存-下游主键',
+          prop: 'newsystemprimary',
+          tooltip: true,
+          width: 150
+        },
+        {
+          label: 'TOC销售-确认收入红-推送时间',
+          prop: 'def1',
+          tooltip: true,
+          width: 150
+        },
+        {
+          label: 'TOC销售-确认收入红-报错详情',
+          prop: 'def2',
+          tooltip: true,
+          width: 150
+        },
+        {
+          label: 'TOC销售-确认收入红-推送状态',
+          prop: 'newstate2',
+          tooltip: true,
+          width: 200
+        },
+        {
+          label: 'TOC确认收入红-下游单号',
+          prop: 'newsystemnumber2',
+          tooltip: true,
+          width: 150
+        },
+        {
+          label: 'TOC确认收入红-下游主键',
+          prop: 'newsystemprimary2',
+          tooltip: true,
+          width: 150
+        },
+        {
+          label: 'TOC销售-确认收入蓝-推送时间',
+          prop: 'def3',
+          tooltip: true,
+          width: 150
+        },
+        {
+          label: 'TOC销售-确认收入蓝-报错详情',
+          prop: 'def4',
+          tooltip: true,
+          width: 150
+        },
+        {
+          label: 'TOC销售-确认收入蓝-推送状态',
+          prop: 'newstate3',
+          tooltip: true,
+          width: 200
+        },
+        {
+          label: 'TOC确认收入蓝-下游单号',
+          prop: 'newsystemnumber3',
+          tooltip: true,
+          width: 150
+        },
+        {
+          label: 'TOC确认收入蓝-下游主键',
+          prop: 'newsystemprimary3',
+          tooltip: true,
+          width: 150
+        },
+        {
+          label: '业务类型',
+          prop: 'businesstype',
+          tooltip: true,
+          width: 150
+        },
       ],
       //正常合并
       tableDataMergeList: [],
diff --git a/src/views/systemReports/u8positiveReports/TOCreturnWarehouse.vue b/src/views/systemReports/u8positiveReports/TOCreturnWarehouse.vue
index f06db6e..0e928ec 100644
--- a/src/views/systemReports/u8positiveReports/TOCreturnWarehouse.vue
+++ b/src/views/systemReports/u8positiveReports/TOCreturnWarehouse.vue
@@ -253,96 +253,6 @@ export default {
           tooltip: true,
           width: 150,
         },
-        {
-          label: "来源单据主键",
-          prop: "reforderdetailid",
-          tooltip: true,
-          width: 150,
-        },
-        {
-          label: "货品sku",
-          prop: "skucode",
-          tooltip: true,
-          width: 150,
-        },
-        {
-          label: "货品名称",
-          prop: "skuname",
-          tooltip: true,
-          width: 150,
-        },
-        {
-          label: "实收数量",
-          prop: "receivedqty",
-          tooltip: true,
-          width: 150,
-        },
-        {
-          label: "TOB销售-库存-报错详情",
-          prop: "newtransmitinfo",
-          tooltip: true,
-          width: 200,
-        },
-        {
-          label: "TOB销售-库存-推送时间",
-          prop: "newpushdate",
-          tooltip: true,
-          width: 200,
-        },
-        {
-          label: "TOB销售-库存-推送状态",
-          prop: "newstate",
-          tooltip: true,
-          width: 200,
-        },
-        {
-          label: "TOB库存-下游单号",
-          prop: "newsystemnumber",
-          tooltip: true,
-          width: 200,
-        },
-        {
-          label: "TOB库存-下游主键",
-          prop: "newsystemprimary",
-          tooltip: true,
-          width: 150,
-        },
-        {
-          label: "TOB确认收入-报错详情",
-          prop: "newtransmitinfo2",
-          tooltip: true,
-          width: 150,
-        },
-        {
-          label: "TOB销售-确认收入-推送时间",
-          prop: "newpushdate2",
-          tooltip: true,
-          width: 150,
-        },
-        {
-          label: "TOB销售-确认收入红-推送状态",
-          prop: "newstate2",
-          tooltip: true,
-          width: 150,
-        },
-        {
-          label: "TOB确认收入红-下游单号",
-          prop: "newsystemnumber2",
-          tooltip: true,
-          width: 150,
-        },
-        {
-          label: "TOB确认收入红-下游主键",
-          prop: "newsystemprimary2",
-          tooltip: true,
-          width: 150,
-        },
-        {
-          label: "业务类型",
-          prop: "businesstype",
-          tooltip: true,
-          width: 150,
-        },
         {
           label: "货主编码",
           prop: "headCompanyCode",
@@ -373,6 +283,96 @@ export default {
           tooltip: true,
           width: 150,
         },
+        {
+          label: "来源单据主键",
+          prop: "reforderdetailid",
+          tooltip: true,
+          width: 150,
+        },
+        {
+          label: "货品sku",
+          prop: "skucode",
+          tooltip: true,
+          width: 150,
+        },
+        {
+          label: "货品名称",
+          prop: "skuname",
+          tooltip: true,
+          width: 150,
+        },
+        {
+          label: "实收数量",
+          prop: "receivedqty",
+          tooltip: true,
+          width: 150,
+        },
+        {
+          label: "TOB销售-库存-推送时间",
+          prop: "newpushdate",
+          tooltip: true,
+          width: 200,
+        },
+        {
+          label: "TOB销售-库存-报错详情",
+          prop: "newtransmitinfo",
+          tooltip: true,
+          width: 200,
+        },
+        {
+          label: "TOB销售-库存-推送状态",
+          prop: "newstate",
+          tooltip: true,
+          width: 200,
+        },
+        {
+          label: "TOB库存-下游单号",
+          prop: "newsystemnumber",
+          tooltip: true,
+          width: 200,
+        },
+        {
+          label: "TOB库存-下游主键",
+          prop: "newsystemprimary",
+          tooltip: true,
+          width: 150,
+        },
+        {
+          label: "TOB销售-确认收入-推送时间",
+          prop: "newpushdate2",
+          tooltip: true,
+          width: 150,
+        },
+        {
+          label: "TOB确认收入-报错详情",
+          prop: "newtransmitinfo2",
+          tooltip: true,
+          width: 150,
+        },
+        {
+          label: "TOB销售-确认收入红-推送状态",
+          prop: "newstate2",
+          tooltip: true,
+          width: 150,
+        },
+        {
+          label: "TOB确认收入红-下游单号",
+          prop: "newsystemnumber2",
+          tooltip: true,
+          width: 150,
+        },
+        {
+          label: "TOB确认收入红-下游主键",
+          prop: "newsystemprimary2",
+          tooltip: true,
+          width: 150,
+        },
+        {
+          label: "业务类型",
+          prop: "businesstype",
+          tooltip: true,
+          width: 150,
+        },
       ],
       //正常合并
       tableDataMergeList: [],
diff --git a/src/views/systemReports/u8positiveReports/baseNewTable2/index.vue b/src/views/systemReports/u8positiveReports/baseNewTable2/index.vue
index 2957a43..90c631a 100644
--- a/src/views/systemReports/u8positiveReports/baseNewTable2/index.vue
+++ b/src/views/systemReports/u8positiveReports/baseNewTable2/index.vue
@@ -35,7 +35,7 @@
         :tableData="tableData"
         :tableColumn="tableColumn"
         :tableDataMergeList="tableDataMergeList"
-        tableHeight="calc(100vh - 440px)"
+        tableHeight="calc(100vh - 370px)"
         id="mainTable"
       >
         <template #new_state="{row}">
diff --git a/vue.config.js b/vue.config.js
index 6c5679e..3d181b9 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -47,8 +47,9 @@ module.exports = {
         // target: `http://192.168.2.78:8080`,
         // target: `http://192.168.2.78:10086`,
         // target: `http://192.168.2.185:9999`,
-        target: `http://192.168.2.86:9999`,
+        // target: `http://192.168.2.86:9999`,
         // target:'http://127.0.0.1:9999/',
+        target: 'http://39.170.109.90:8081/',
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''