From 41d96f921c93e7c760dcb7997556805c08235ba3 Mon Sep 17 00:00:00 2001
From: hyt <958868763@qq.com>
Date: Sat, 21 Sep 2024 17:39:54 +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  | 104 ++------------
 .../u8positiveReports/TOCoutputWarehouse.vue  | 132 +++++++-----------
 2 files changed, 60 insertions(+), 176 deletions(-)

diff --git a/src/views/systemReports/u8positiveReports/TOBoutputWarehouse.vue b/src/views/systemReports/u8positiveReports/TOBoutputWarehouse.vue
index e565ee6..3eb7b85 100644
--- a/src/views/systemReports/u8positiveReports/TOBoutputWarehouse.vue
+++ b/src/views/systemReports/u8positiveReports/TOBoutputWarehouse.vue
@@ -99,36 +99,6 @@
       <div class="chunk">
         <el-input v-model="queryCriteria.newSystemPrimary4" placeholder="TOB确认收入下游主键"></el-input>
       </div>
-      <!--      toc销售-库存 -->
-      <div class="chunk">
-        <el-date-picker
-          v-model="queryCriteria.newpushdate"
-          type="date"
-          placeholder="TOC库存推送时间"
-          value-format="yyyy-MM-dd"
-        >
-        </el-date-picker>
-      </div>
-      <div class="chunk">
-        <el-input v-model="queryCriteria.newtransmitinfo" placeholder="TOC库存推送详情"></el-input>
-      </div>
-      <div class="radio">
-        <el-select v-model="queryCriteria.newstate" placeholder="TOC出库同步成功">
-          <el-option
-            v-for="item in stateOptions"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          >
-          </el-option>
-        </el-select>
-      </div>
-      <div class="chunk">
-        <el-input v-model="queryCriteria.newsystemnumber" placeholder="TOC库存下游单号"></el-input>
-      </div>
-      <div class="chunk">
-        <el-input v-model="queryCriteria.newsystemprimary" placeholder="TOC库存下游主键"></el-input>
-      </div>
 
 
     </div>
@@ -193,34 +163,7 @@ export default {
       ],
       //搜索框内容
       queryCriteria: {
-        newPushDate: '',
-        newTransmitInfo: '',
-        newstate: '',
-        newsystemnumber: '',
-        newsystemprimary: '',
-        def5: '',
-        def6: '',
-        newState4: '',
-        newSystemNumber4: '',
-        newSystemPrimary4: '',
-        newpushdate: '',
-        newtransmitinfo: '',
-        def1: '',
-        def2: '',
-        newstate2: '',
-        newsystemnumber2: '',
-        newsystemprimary2: '',
-        def3: '',
-        def4: '',
-        newstate3: '',
-        newsystemnumber3: '',
-        newsystemprimary3: '',
-        businessType: 'TOB_ORDER',
-        businessDate_start: '',
-        businessDate_end: '',
-        successfulTradeDate_start: '',
-        successfulTradeDate_end: ''
-
+        businessType: 'TOB_ORDER'
       },
       pageModel: {
         'pageSize': 100,
@@ -327,12 +270,6 @@ export default {
           tooltip: true,
           width: 150
         },
-        {
-          label: 'TOB确认收入-推送状态',
-          prop: 'newstate4',
-          tooltip: true,
-          width: 150
-        },
         {
           label: 'TOB库存-下游单号',
           prop: 'newsystemnumber',
@@ -402,7 +339,12 @@ export default {
 
       ],
       //正常合并
-      tableDataMergeList: []
+      tableDataMergeList: [],
+      dist_state: {
+        Y: '成功',
+        N: '失败'
+
+      }
     }
   },
   methods: {
@@ -447,33 +389,7 @@ export default {
     reset() {
       this.pageModel.pageNum = 1
       this.queryCriteria = {
-        newPushDate: '',
-        newTransmitInfo: '',
-        newstate: '',
-        newsystemnumber: '',
-        newsystemprimary: '',
-        def5: '',
-        def6: '',
-        newState4: '',
-        newSystemNumber4: '',
-        newSystemPrimary4: '',
-        newpushdate: '',
-        newtransmitinfo: '',
-        def1: '',
-        def2: '',
-        newstate2: '',
-        newsystemnumber2: '',
-        newsystemprimary2: '',
-        def3: '',
-        def4: '',
-        newstate3: '',
-        newsystemnumber3: '',
-        newsystemprimary3: '',
-        businessType: 'TOB_ORDER',
-        businessDate_start: '',
-        businessDate_end: '',
-        successfulTradeDate_start: '',
-        successfulTradeDate_end: ''
+        businessType: 'TOB_ORDER'
       }
     },
     //limit改变
@@ -624,6 +540,10 @@ export default {
       const res = await authApi('tocofsSaleoutServiceImplReport', 'tocofsSaleoutServiceImplReport', 'queryToCSalesReport', '', params)
       console.log(res, '初始化res')
       this.pageModel.pageTotal = res.attribute.total
+      res.attribute.list.forEach(item => {
+        item.newstate = this.dist_state[item.newstate]
+        item.newstate4 = this.dist_state[item.newstate4]
+      })
       this.mainTableData = this.dataDispose(
         res.attribute.list,
         this.tableDataMergeList
diff --git a/src/views/systemReports/u8positiveReports/TOCoutputWarehouse.vue b/src/views/systemReports/u8positiveReports/TOCoutputWarehouse.vue
index 8f1a261..33a7309 100644
--- a/src/views/systemReports/u8positiveReports/TOCoutputWarehouse.vue
+++ b/src/views/systemReports/u8positiveReports/TOCoutputWarehouse.vue
@@ -178,33 +178,7 @@ export default {
       ],
       //搜索框内容
       queryCriteria: {
-        newPushDate:"",
-        newTransmitInfo:"",
-        newstate:"",
-        newsystemnumber:"",
-        newsystemprimary:"",
-        def5:"",
-        def6:"",
-        newState4:"",
-        newSystemNumber4:"",
-        newSystemPrimary4:"",
-        newpushdate:"",
-        newtransmitinfo:"",
-        def1:"",
-        def2:"",
-        newstate2:"",
-        newsystemnumber2:"",
-        newsystemprimary2:"",
-        def3:"",
-        def4:"",
-        newstate3:"",
-        newsystemnumber3:"",
-        newsystemprimary3:"",
         businessType:"TOC_ORDER",
-        businessDate_start: '',
-        businessDate_end: '',
-        successfulTradeDate_start: '',
-        successfulTradeDate_end: ''
       },
       pageModel: {
         'pageSize': 100,
@@ -276,68 +250,68 @@ export default {
           width: 150
         },
         {
-          label: 'TOB库存-推送时间',
-          prop: 'newpushdate',
-          tooltip: true,
-          width: 200
-        },
-        {
-          label: 'TOB库存-报错详情',
-          prop: 'newtransmitinfo',
-          tooltip: true,
-          width: 200
-        },
-        {
-          label: 'TOB库存-推送状态',
+          label: 'TOC销售-库存-推送状态',
           prop: 'newstate',
           tooltip: true,
           width: 200
         },
         {
-          label: 'TOB确认收入-推送状态',
-          prop: 'newstate4',
+          label: 'TOC销售-库存-报错详情',
+          prop: 'newtransmitinfo',
           tooltip: true,
           width: 200
         },
         {
-          label: 'TOB库存-下游单号',
+          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: 'TOB库存-下游主键',
+          label: 'TOC库存-下游主键',
           prop: 'newsystemprimary',
           tooltip: true,
           width: 150
         },
         {
-          label: 'TOB确认收入-推送状态',
-          prop: 'newstate4',
+          label: 'TOC确认收入红-下游单号',
+          prop: 'newsystemnumber2',
           tooltip: true,
           width: 150
         },
         {
-          label: 'TOB库存-下游单号',
-          prop: 'newsystemnumber',
+          label: 'TOC确认收入红-下游主键',
+          prop: 'newsystemprimary2',
           tooltip: true,
           width: 150
         },
         {
-          label: 'TOB库存-下游主键',
-          prop: 'newsystemprimary',
+          label: 'TOC确认收入蓝-下游单号',
+          prop: 'newsystemnumber3',
           tooltip: true,
           width: 150
         },
         {
-          label: 'TOB确认收入-下游单号',
-          prop: 'newsystemnumber4',
+          label: 'TOC确认收入蓝-下游主键',
+          prop: 'newsystemprimary3',
           tooltip: true,
           width: 150
         },
         {
-          label: 'TOB确认收入-下游主键',
-          prop: 'newsystemprimary4',
+          label: 'TOC销售-确认收入红-推送时间',
+          prop: 'def1',
           tooltip: true,
           width: 150
         },
@@ -348,14 +322,20 @@ export default {
           width: 150
         },
         {
-          label: 'TOB确认收入-推送时间',
-          prop: 'def5',
+          label: 'TOC销售-确认收入红-报错详情',
+          prop: 'def2',
           tooltip: true,
           width: 150
         },
         {
-          label: 'TOB确认收入-报错详情',
-          prop: 'def6',
+          label: 'TOC销售-确认收入蓝-推送时间',
+          prop: 'def3',
+          tooltip: true,
+          width: 150
+        },
+        {
+          label: 'TOC销售-确认收入蓝-报错详情',
+          prop: 'def4',
           tooltip: true,
           width: 150
         },
@@ -386,7 +366,12 @@ export default {
 
       ],
       //正常合并
-      tableDataMergeList: []
+      tableDataMergeList: [],
+      dist_state: {
+        Y: '成功',
+        N: '失败'
+
+      }
     }
   },
   methods: {
@@ -431,33 +416,7 @@ export default {
     reset() {
       this.pageModel.pageNum = 1
       this.queryCriteria = {
-        newPushDate:"",
-        newTransmitInfo:"",
-        newstate:"",
-        newsystemnumber:"",
-        newsystemprimary:"",
-        def5:"",
-        def6:"",
-        newState4:"",
-        newSystemNumber4:"",
-        newSystemPrimary4:"",
-        newpushdate:"",
-        newtransmitinfo:"",
-        def1:"",
-        def2:"",
-        newstate2:"",
-        newsystemnumber2:"",
-        newsystemprimary2:"",
-        def3:"",
-        def4:"",
-        newstate3:"",
-        newsystemnumber3:"",
-        newsystemprimary3:"",
         businessType:"TOC_ORDER",
-        businessDate_start: '',
-        businessDate_end: '',
-        successfulTradeDate_start: '',
-        successfulTradeDate_end: ''
       }
     },
     //limit改变
@@ -608,6 +567,11 @@ export default {
       const res = await authApi('tocofsSaleoutServiceImplReport', 'tocofsSaleoutServiceImplReport', 'queryToCSalesReport', '', params)
       console.log(res, '初始化res')
       this.pageModel.pageTotal = res.attribute.total
+      res.attribute.list.forEach(item => {
+        item.newstate = this.dist_state[item.newstate]
+        item.newstate2 = this.dist_state[item.newstate2]
+        item.newstate3 = this.dist_state[item.newstate3]
+      })
       this.mainTableData = this.dataDispose(
         res.attribute.list,
         this.tableDataMergeList