From 228b71558a566f955bfbb77e5583ec858bff6d18 Mon Sep 17 00:00:00 2001
From: 44673626 <44673626@qq.com>
Date: Mon, 14 Mar 2022 17:30:29 +0800
Subject: [PATCH] =?UTF-8?q?3.14=E5=89=8D=E7=AB=AF=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vue/src/components/ImportExcel-base/index.vue |   2 +-
 vue/src/router/index.js                       |   2 +
 vue/src/router/modules/hq_menu.js             | 184 +---
 vue/src/router/modules/hqcardata.js           |  45 +
 vue/src/router/modules/wms_out_order.js       |  13 +-
 .../ux/billManage/KanbanUnSettled/index.vue   |  20 +-
 .../WMSOutputDetailDiffReport/index.vue       | 849 ++++++++++++++++++
 .../billManage/WMSOutputSumReport/index.vue   | 195 +++-
 .../views/ux/vw/dataInput/r3-open/index.vue   |  49 +-
 vue/static/tableFieldForSearch.json           |  10 -
 10 files changed, 1122 insertions(+), 247 deletions(-)
 create mode 100644 vue/src/router/modules/hqcardata.js
 create mode 100644 vue/src/views/ux/billManage/WMSOutputDetailDiffReport/index.vue

diff --git a/vue/src/components/ImportExcel-base/index.vue b/vue/src/components/ImportExcel-base/index.vue
index b57ab088..fac4ea54 100644
--- a/vue/src/components/ImportExcel-base/index.vue
+++ b/vue/src/components/ImportExcel-base/index.vue
@@ -312,7 +312,7 @@ export default {
           sparepartoutorder: "大众备件出库单",
           sparepartoutorder90: "大众备件调整出库单",
           kanbanoutorder: "大众看板出库单",
-          HQ_H_OUTORDER: "红旗H平台出库单",
+          HQ_H_OUTORDER: "红旗批量出库单",
           HQ_M_OUTORDER: "红旗M平台出库单",
           HQ_Y_OUTORDER: "一汽轿车平台出库单",
           HQ_F_OUTORDER: "红旗F平台出库单",
diff --git a/vue/src/router/index.js b/vue/src/router/index.js
index 93cac310..cf4a7735 100644
--- a/vue/src/router/index.js
+++ b/vue/src/router/index.js
@@ -23,6 +23,7 @@ import vwOutOrderDataRouter from './modules/vw_out_order'
 import hqOutOrderDataRouter from './modules/hq_out_order'
 import vwsOutOrderDataRouter from './modules/wms_out_order'
 import onetimesaleDataRouter from './modules/onetimesale'
+import hqcarManagerDataRouter from './modules/hqcardata'
 import pgfis from './modules/fis'
 import pgfisPrint from './modules/fisprint'
 
@@ -180,6 +181,7 @@ export const asyncRoutes = [
   basedataRouter,//基础数据维护
   vwMenudataRouter,//大众
   hqMenudataRouter,//红旗
+  hqcarManagerDataRouter,//一汽轿车
   vwOutOrderDataRouter,
   hqOutOrderDataRouter,
   onetimesaleDataRouter,//一次性寄售销售
diff --git a/vue/src/router/modules/hq_menu.js b/vue/src/router/modules/hq_menu.js
index 25b9fee5..46159749 100644
--- a/vue/src/router/modules/hq_menu.js
+++ b/vue/src/router/modules/hq_menu.js
@@ -73,199 +73,41 @@ const hqMenudataRouter = {
                 icon: '未结算'
             }
         },
-        {
-            path: '/hqcar',
-            name: 'import-y-data',//命名路由-二级
-            component: () => import('@/views/ux/vw/dataInput/index'),
-            redirect: 'ux/vw/dataInput/index',
-            meta: {
-                title: '一汽轿车平台',
-                roles: ['SettleAccount.BT_Carlatform', 'SettleAccount.Reports'],
-                icon: '看板'
-            },
-            children: [
-                {
-                    path: 'hq-Y-platform',
-                    component: () => import('@/views/ux/vw/dataInput/hq_y'),
-                    name: 'ERPEI',//命名路由
-                    meta: {
-                        title: '一汽轿车平台导入',
-                        roles: ['SettleAccount.BT_Carlatform'],//控制页面角色（可以设置多个角色）
-                        icon: '单据导入'
-                    }
-                },
-                {
-                    path: 'hq-Y-report',
-                    component: () => import('@/views/ux/vw/dataInput/hq_y_report'),
-                    name: 'HQY',//命名路由
-                    meta: {
-                        title: '一汽轿车平台核对明细',
-                        roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色）
-                        icon: '业务'
-                    }
-                },
-            ]
-            
-        },
-
-
-
-
         // {
-        //     path: '/H',
-        //     name: 'import-h-data',//命名路由-二级
+        //     path: '/hqcar',
+        //     name: 'import-y-data',//命名路由-二级
         //     component: () => import('@/views/ux/vw/dataInput/index'),
         //     redirect: 'ux/vw/dataInput/index',
         //     meta: {
-        //         title: 'H平台',
-        //         roles: ['SettleAccount.HQ_HPlatform', 'SettleAccount.Reports'],
+        //         title: '一汽轿车平台',
+        //         roles: ['SettleAccount.BT_Carlatform', 'SettleAccount.Reports'],
         //         icon: '看板'
         //     },
         //     children: [
-               
         //         {
-        //             path: 'hq-H-platform',
-        //             component: () => import('@/views/ux/vw/dataInput/hq_h'),
+        //             path: 'hq-Y-platform',
+        //             component: () => import('@/views/ux/vw/dataInput/hq_y'),
         //             name: 'ERPEI',//命名路由
         //             meta: {
-        //                 title: '红旗H平台导入',
-        //                 roles: ['SettleAccount.HQ_HPlatform'],//控制页面角色（可以设置多个角色）
+        //                 title: '一汽轿车平台导入',
+        //                 roles: ['SettleAccount.BT_Carlatform'],//控制页面角色（可以设置多个角色）
         //                 icon: '单据导入'
         //             }
         //         },
         //         {
-        //             path: 'hq-H-report',
-        //             component: () => import('@/views/ux/vw/dataInput/hq_h_report'),
-        //             name: 'HQH',
+        //             path: 'hq-Y-report',
+        //             component: () => import('@/views/ux/vw/dataInput/hq_y_report'),
+        //             name: 'HQY',//命名路由
         //             meta: {
-        //                 title: 'H平台核对明细',
-        //                 roles: ['SettleAccount.Reports'],
+        //                 title: '一汽轿车平台核对明细',
+        //                 roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色）
         //                 icon: '业务'
         //             }
         //         },
-        //         {
-        //             path: 'hq-H-sparepart-export',
-        //             component: () => import('@/views/ux/vw/dataInput/hq_h_sparepart'),
-        //             name: 'HQH',
-        //             meta: {
-        //                 title: 'H平台备件明细',
-        //                 roles: ['SettleAccount.Reports'],
-        //                 icon: '文件'
-        //             }
-        //         }
         //     ]
             
         // },
 
-        // {
-        //     path: '/M',
-        //     component: () => import('@/views/ux/vw/dataInput/index'),
-        //     name: 'export-m-data',//命名路由
-        //     redirect: 'ux/vw/dataInput/index',
-        //     meta: {
-        //         title: 'M平台',
-        //         roles: ['SettleAccount.HQ_MPlatform', 'SettleAccount.Reports'],
-        //         icon: '看板'
-        //     },
-        //     children: [
-        //         {
-        //             path: 'hq-M-platform',
-        //             component: () => import('@/views/ux/vw/dataInput/hq_m'),
-        //             name: 'ERPEI',//命名路由
-        //             meta: {
-        //               title: '红旗M平台导入',
-        //               roles: ['SettleAccount.HQ_MPlatform'],//控制页面角色（可以设置多个角色）
-        //               icon: '单据导入'
-        //             }
-        //           },
-        //           {
-        //             path: 'hq-M-report',
-        //             component: () => import('@/views/ux/vw/dataInput/hq_m_report'),
-        //             name: 'HQM',
-        //             meta: {
-        //                 title: 'M平台核对明细',
-        //                 roles: ['SettleAccount.Reports'],
-        //                 icon: '业务'
-        //             }
-        //         },
-        //         {
-        //             path: 'hq-M-sparepart-export',
-        //             component: () => import('@/views/ux/vw/dataInput/hq_m_sparepart'),
-        //             name: 'HQM',
-        //             meta: {
-        //                 title: 'M平台备件明细',
-        //                 roles: ['SettleAccount.Reports'],
-        //                 icon: '文件'
-        //             }
-        //         },
-        //         // {
-        //         //     path: 'hq-M-platform-export',
-        //         //     component: () => import('@/views/ux/billManage/sparePart'),
-        //         //     name: 'SparePartReport',//命名路由
-        //         //     meta: {
-        //         //         title: 'M平台结算差异输出',
-        //         //         //roles: ['abpvnext_master.ProjectPeople'],//控制页面角色（可以设置多个角色）
-        //         //         icon: '二配'
-        //         //     }
-        //         // }
-        //     ]
-        // },
-        // {
-        //     path: '/F',
-        //     component: () => import('@/views/ux/vw/dataInput/index'),
-        //     name: 'export-f-data',//命名路由
-        //     redirect: 'ux/vw/dataInput/index',
-        //     meta: {
-        //         title: 'F平台',
-        //         roles: ['SettleAccount.HQ_FPlatform', 'SettleAccount.Reports'],
-        //         icon: '看板'
-        //     },
-        //     children: [
-        //         {
-        //             path: 'hq-F-platform',
-        //             component: () => import('@/views/ux/vw/dataInput/hq_f'),
-        //             name: 'ERPEI',//命名路由
-        //             meta: {
-        //               title: '红旗F平台导入',
-        //               roles: ['SettleAccount.HQ_FPlatform'],//控制页面角色（可以设置多个角色）
-        //               icon: '单据导入'
-        //             }
-        //           },
-
-        //           {
-        //             path: 'hq-F-platform-export',
-        //             component: () => import('@/views/ux/vw/dataInput/hq_f_report'),
-        //             name: 'HQF',
-        //             meta: {
-        //                 title: 'F平台核对明细',
-        //                 roles: ['SettleAccount.Reports'],
-        //                 icon: '业务'
-        //             }
-        //         },
-        //         {
-        //             path: 'hq-F-sparepart-export',
-        //             component: () => import('@/views/ux/vw/dataInput/hq_f_sparepart'),
-        //             name: 'HQF',
-        //             meta: {
-        //                 title: 'F平台备件明细',
-        //                 roles: ['SettleAccount.Reports'],
-        //                 icon: '文件'
-        //             }
-        //         },
-
-        //         // {
-        //         //     path: 'hq-F-platform-export',
-        //         //     component: () => import('@/views/ux/billManage/sparePart'),
-        //         //     name: 'SparePartReport',//命名路由
-        //         //     meta: {
-        //         //         title: 'F平台结算差异输出',
-        //         //         //roles: ['abpvnext_master.ProjectPeople'],//控制页面角色（可以设置多个角色）
-        //         //         icon: '二配'
-        //         //     }
-        //         // }
-        //     ],
-        // },
-
        
         
     ]
diff --git a/vue/src/router/modules/hqcardata.js b/vue/src/router/modules/hqcardata.js
new file mode 100644
index 00000000..68e2e211
--- /dev/null
+++ b/vue/src/router/modules/hqcardata.js
@@ -0,0 +1,45 @@
+//大众-FIS结算-路由
+import Layout from '@/layout'
+
+const hqcarManagerDataRouter = {
+  path: '/cpat-hq-car',
+  component: Layout,
+  redirect: 'pg',
+  name: '业务数据',
+  //hidden: true,
+  meta: {
+    //requiresAuth: true,
+    title: '一汽轿车平台',
+    index: 0,
+    type: 'crm',
+    icon: '看板',
+    roles: ['SettleAccount.BT_Carlatform', 'SettleAccount.Reports'],
+    keepAlive: false,
+  },
+  children: [
+    {
+        path: 'hq-Y-platform',
+        component: () => import('@/views/ux/vw/dataInput/hq_y'),
+        name: 'ERPEI',//命名路由
+        meta: {
+            title: '一汽轿车平台导入',
+            roles: ['SettleAccount.BT_Carlatform'],//控制页面角色（可以设置多个角色）
+            icon: '单据导入'
+        }
+    },
+    {
+        path: 'hq-Y-report',
+        component: () => import('@/views/ux/vw/dataInput/hq_y_report'),
+        name: 'HQY',//命名路由
+        meta: {
+            title: '一汽轿车平台核对明细',
+            roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色）
+            icon: '业务'
+        }
+    },
+
+  ]
+}
+
+export default hqcarManagerDataRouter
+
diff --git a/vue/src/router/modules/wms_out_order.js b/vue/src/router/modules/wms_out_order.js
index 766cdb21..39f20df2 100644
--- a/vue/src/router/modules/wms_out_order.js
+++ b/vue/src/router/modules/wms_out_order.js
@@ -43,7 +43,18 @@ const vwsOutOrderDataRouter = {
       name: 'WMSOutputSumReport',//命名路由
       meta: {
         title: '结算出库SAP接口',
-        roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色）
+        roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色） 
+        icon: '零件'
+      }
+    },
+
+    {
+      path: '/wms-OutputDetailDiffReport',
+      component: () => import('@/views/ux/billManage/WMSOutputDetailDiffReport'),
+      name: 'WMSOutputDetailDiffReport',//命名路由
+      meta: {
+        title: '结算单出库接口',
+        roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色） 
         icon: '零件'
       }
     },
diff --git a/vue/src/views/ux/billManage/KanbanUnSettled/index.vue b/vue/src/views/ux/billManage/KanbanUnSettled/index.vue
index 5a4aa18e..c22a5872 100644
--- a/vue/src/views/ux/billManage/KanbanUnSettled/index.vue
+++ b/vue/src/views/ux/billManage/KanbanUnSettled/index.vue
@@ -219,9 +219,9 @@
       >
         <el-row>
           <el-col :md="4" :xs="24">
-            <el-form-item label="选择版本" required />
+            <el-form-item label="当期版本" required />
           </el-col>
-          <el-col :md="20" :xs="24" style="margin-left: -80px">
+          <el-col :md="16" :xs="24" style="margin-left: -80px">
             <el-form-item prop="versionValue">
               <el-select
                 v-model="formCount.versionValue"
@@ -239,6 +239,11 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :md="4" :xs="24">
+            <el-checkbox style="margin-left: -120px" v-model="checked"
+              >是否过滤掉当期结算数据</el-checkbox
+            >
+          </el-col>
         </el-row>
         <el-row>
           <el-col :md="4" :xs="24">
@@ -281,7 +286,6 @@
                 v-model="formCount.startTime"
                 type="datetime"
                 size="small"
-                :picker-options="pickerOptions0"
                 @change="getdateValue"
                 value-format="yyyy-MM-dd HH:mm:ss"
                 default-time="00:00:00"
@@ -294,7 +298,6 @@
               <el-date-picker
                 v-model="formCount.endTime"
                 type="datetime"
-                :picker-options="pickerOptions1"
                 size="small"
                 @change="getdateVal"
                 value-format="yyyy-MM-dd HH:mm:ss"
@@ -462,6 +465,7 @@ export default {
         },
       },
       datetime5: [],
+      checked: true,
       datetime7: [],
       checkedCities: [0],
       JobVersionList: [],
@@ -540,6 +544,7 @@ export default {
         estimateTypeDesc: undefined, //物料组车型
         begin: undefined,
         end: undefined,
+        isContainVersion: undefined,
       },
       listQuery: {
         taskId: "",
@@ -890,6 +895,11 @@ export default {
             ? this.startTime
             : undefined;
           this.listExportQuery.end = this.endTime ? this.endTime : undefined;
+          if (this.checked == true) {
+            this.listExportQuery.isContainVersion = "0";
+          } else {
+            this.listExportQuery.isContainVersion = "1";
+          }
           console.log(
             "大众看板未结明细-导出条件：" + JSON.stringify(this.listExportQuery)
           );
@@ -1044,7 +1054,7 @@ export default {
       this.listLoading = true;
       //导入界面中超链接过来的参数
       this.listQuery.name = "看板未结明细";
-       this.listQuery.type = this.JobversionValue;
+      this.listQuery.type = this.JobversionValue;
       this.$axios
         .posts("/api/settleaccount/Job/list", this.listQuery)
         .then((response) => {
diff --git a/vue/src/views/ux/billManage/WMSOutputDetailDiffReport/index.vue b/vue/src/views/ux/billManage/WMSOutputDetailDiffReport/index.vue
new file mode 100644
index 00000000..94abbd58
--- /dev/null
+++ b/vue/src/views/ux/billManage/WMSOutputDetailDiffReport/index.vue
@@ -0,0 +1,849 @@
+<!--结算出库单-->
+<template>
+  <div class="cr-body-content">
+    <flexbox class="content-header">
+      <JobSelectVerson
+        :options="JobVersionList"
+        style="width: 150px; margin-left: -10px"
+        class="search-container"
+        @value-change="JobVersionValue"
+      ></JobSelectVerson>
+      <!-- <el-button
+        class="filter-item"
+        size="mini"
+        type="warning"
+        icon="el-icon-upload2"
+        @click="handleImportExcel()"
+        >导入文件（Excel）
+      </el-button> -->
+      <el-button
+        class="filter-item"
+        size="mini"
+        type="warning"
+        icon="el-icon-plus"
+        @click="handleCreate"
+        >生成出库数据
+      </el-button>
+      <el-button
+        class="filter-item"
+        size="mini"
+        type="primary"
+        icon="el-icon-download"
+        @click="handleDownload()"
+        >导出Excel
+      </el-button>
+
+      <el-select
+        v-model="listQuery.state"
+        @change="selectState"
+        placeholder="请选择过滤状态"
+        style="width: 200px; margin-left: 8px"
+      >
+        <el-option label="新建" :value="0"></el-option>
+        <el-option label="已申请" :value="1"></el-option>
+        <el-option label="成功" :value="2"></el-option>
+        <el-option label="失败" :value="3"></el-option>
+      </el-select>
+
+      <el-input
+        v-model="searchContent"
+        clearable
+        size="small"
+        placeholder="按照结算单号搜索..."
+        style="width: 200px"
+        class="search-container"
+        @keyup.enter.native="handleFilter"
+      />
+      <el-button
+        size="mini"
+        type="success"
+        icon="el-icon-search"
+        @click="handleFilter"
+        >搜索
+      </el-button>
+      <el-button
+        class="filter-item"
+        size="mini"
+        type="warning"
+        icon="el-icon-upload2"
+        @click="handleImportSap()"
+        >同步到SAP
+      </el-button>
+      <!--表格头组件，filter查询-->
+      <c-r-m-table-head
+        ref="crmTableHead"
+        :crm-type="crmType"
+        @handle="handleHandle"
+        @filter="handleFilters"
+      >
+      </c-r-m-table-head>
+    </flexbox>
+    <!--表格渲染-->
+    <el-table
+      ref="multipleTable"
+      v-loading.fullscreen.lock="listLoading"
+      element-loading-text="拼命加载中..."
+      element-loading-spinner="el-icon-loading"
+      class="cr-table"
+      :data="list"
+      :height="tableHeight"
+      :cell-style="cellStyle"
+      :header-cell-style="headerRowStyle"
+      size="small"
+      stripe
+      border
+      highlight-current-row
+      style="width: 100%"
+      @sort-change="sortChange"
+      @selection-change="handleSelectionChange"
+      @row-click="handleRowClick"
+    >
+      <!-- <el-table-column type="selection" width="44px"></el-table-column> -->
+      <el-table-column
+        label="版本"
+        prop="version"
+        sortable="custom"
+        align="center"
+        width="100px"
+        fixed
+      >
+        <template slot-scope="scope">
+          <el-tooltip :content="scope.row.version" placement="top">
+            <span class="link-type">{{ scope.row.version }}</span>
+          </el-tooltip>
+        </template>
+      </el-table-column>
+      <el-table-column
+        v-for="(item, index) in getDefaultField"
+        :key="index"
+        :prop="item.prop"
+        :label="item.label"
+        :min-width="item.width"
+        :formatter="fieldFormatter"
+        sortable="custom"
+        show-overflow-tooltip
+        :gutter="0"
+      >
+        <template slot="header" slot-scope="scope">
+          {{ scope.column.label }}
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="table-footer">
+      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
+      <pagination
+        v-show="totalCount > 0"
+        :total="totalCount"
+        :page.sync="page"
+        :limit.sync="listQuery.MaxResultCount"
+        @pagination="getList"
+      />
+      <!-- 导入Excel组件 -->
+      <importExcel
+        ref="importexcel"
+        :show="showExcelImport"
+        :crmType="crmType"
+        @close="importExcelData"
+      />
+    </div>
+
+    <!--生成任务单渲染-->
+    <el-dialog
+      :visible.sync="dialogFormVisible"
+      :close-on-click-modal="false"
+      :title="formTitle"
+      append-to-body
+      width="680px"
+    >
+      <el-form
+        ref="formCount"
+        :inline="true"
+        :rules="rules"
+        :model="formCount"
+        size="mini"
+      >
+        <el-row>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="选择版本" required />
+          </el-col>
+          <el-col :md="20" :xs="24">
+            <el-form-item prop="versionValue">
+              <el-select
+                v-model="versionValue"
+                size="medium"
+                clearable
+                style="width: 188px; margin-right: 15px"
+                placeholder="请选择"
+              >
+                <el-option
+                  v-for="item in versionList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!-- <el-row>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="过账日期" required />
+          </el-col>
+          <el-col :md="20" :xs="24">
+            <el-form-item prop="dataValue">
+              <el-date-picker
+                v-model="dataValue"
+                style="width: 188px"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="选择日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row> -->
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="text" @click="dialogFormVisible = false"
+          >取消</el-button
+        >
+        <!-- <el-button @click="resetForm('formCount')">重置</el-button> -->
+        <el-button v-loading="formLoading" type="primary" @click="save"
+          >确认</el-button
+        >
+      </div>
+    </el-dialog>
+
+    <el-dialog
+      :visible.sync="dialogAccounDateVisible"
+      :close-on-click-modal="false"
+      :title="formTitle"
+      append-to-body
+      width="680px"
+    >
+      <el-form
+        ref="formCount"
+        :inline="true"
+        :rules="rules"
+        :model="formCount"
+        size="mini"
+      >
+        <el-row>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="过账日期" required />
+          </el-col>
+          <el-col :md="20" :xs="24">
+            <el-form-item prop="dataValue">
+              <el-date-picker
+                v-model="dataValue"
+                style="width: 188px"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="选择日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="text" @click="dialogAccounDateVisible = false"
+          >取消</el-button
+        >
+        <!-- <el-button @click="resetForm('formCount')">重置</el-button> -->
+        <el-button v-loading="formLoading" type="primary" @click="saveDate"
+          >确认</el-button
+        >
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
+import permission from "@/directive/permission/index.js";
+import importExcel from "@/components/ImportExcel-base";
+import CRMTableHead from "../../components/CRMTableHead";
+import moment from "moment";
+import Lockr from "lockr";
+import { downloadFile } from "@/utils/crmindex.js";
+import JobSelectVerson from "@/components/CreateCom/Job-Select.vue";
+
+export default {
+  name: "WMSOutputDetailDiffReport",
+  components: { Pagination, CRMTableHead, importExcel, JobSelectVerson },
+  directives: { permission },
+  filters: {
+    IsCustomerSignFilter(status) {
+      //翻译是否签字
+      const statusMap = {
+        true: "是",
+        false: "否",
+      };
+      return statusMap[status];
+    },
+  },
+  props: {
+    customerInfos: {
+      type: Array,
+      default: () => {
+        return [];
+      },
+    },
+  },
+  data() {
+    return {
+      crmType: "wmsOutputDetailDiffReport",
+      versionValue: "",
+      dataValue: "",
+      versionList: [], //版本列表
+      JobVersionList: [],
+      rules: {
+        //前端定义的规则，后端也有验证
+        erpMaterialCode: [
+          { required: true, message: "必须输入！", trigger: "blur" },
+        ],
+      },
+      searchContent: "", // 输入内容
+      customerInfo: {
+        settleAccountId: "",
+      },
+      form: {
+        dicDetailID: "",
+        customerId: "",
+        projectId: "",
+      },
+      JobversionValue: "",
+      JobversionValueVerson: "",
+      list: null,
+      totalCount: 0,
+      listLoading: true,
+      formLoading: false,
+      formCount: {
+        version: undefined,
+        accountDate: undefined,
+      },
+      // 高级搜索
+      filterObj: {
+        type: Object,
+        default: () => {
+          return {};
+        },
+      },
+      listVersionQuery: {
+        SkipCount: 0,
+        MaxResultCount: 15,
+      },
+      listQuery: {
+        Filters: [
+          {
+            logic: 0,
+            column: "Enabled",
+            action: 0,
+            value: "true",
+          }, //默认查询可用的
+        ],
+        //OrgID:"",
+        SkipCount: 0,
+        MaxResultCount: 15,
+        version: "",
+        state: undefined,
+      },
+      listExportQuery: {
+        Filters: [
+          {
+            logic: 0,
+            column: "Enabled",
+            action: 0,
+            value: "true",
+          }, //默认查询可用的
+        ],
+        //OrgID:"",
+        SkipCount: 0,
+        MaxResultCount: 15,
+        version: "",
+        fileType: 0,
+        userId: "",
+        accountDate: undefined,
+      },
+      page: 1,
+      dialogFormVisible: false,
+      dialogAccounDateVisible: false,
+      multipleSelection: [],
+      formTitle: "",
+      drawer: false,
+      showExcelImport: false,
+      tableHeight: document.documentElement.clientHeight - 220,
+      isEdit: false,
+    };
+  },
+  mounted() {
+    var self = this;
+    window.onresize = function () {
+      var offsetHei = document.documentElement.clientHeight;
+      self.tableHeight = offsetHei - 260;
+    };
+  },
+  created() {
+    //生成出库单时选择版本，从期间管理获得
+    this.getAllVersionList();
+    this.getJobVersionInfo();
+    if (this.versionList == []) {
+      this.getList();
+    }
+  },
+  computed: {
+    /** 列表字段 */
+    getDefaultField() {
+      var tempsTabs = [];
+      tempsTabs.push({ label: "状态", prop: "state", width: 180 });
+      tempsTabs.push({ label: "行号", prop: "lineNumber", width: 100 });
+      tempsTabs.push({ label: "版本号", prop: "version", width: 150 });
+      tempsTabs.push({
+        label: "客户",
+        prop: "client",
+        width: 120,
+      });
+      tempsTabs.push({
+        label: "出库类型",
+        prop: "type",
+        width: 150,
+      });
+      tempsTabs.push({
+        label: "结算编码",
+        prop: "settleCode",
+        width: 150,
+      });
+      tempsTabs.push({ label: "销售渠道", prop: "saleCode", width: 120 });
+      tempsTabs.push({ label: "客户代码", prop: "clientCode", width: 120 });
+      tempsTabs.push({ label: "结算单", prop: "billNum", width: 150 });
+      tempsTabs.push({
+        label: "物料号",
+        prop: "materialCode",
+        width: 150,
+      });
+      tempsTabs.push({ label: "结算数量", prop: "qty", width: 150 });
+      tempsTabs.push({ label: "实际出库数量", prop: "outputQty", width: 180 });
+      tempsTabs.push({ label: "差异数量", prop: "diffQty", width: 120 });
+
+      tempsTabs.push({
+        label: "开票单价",
+        prop: "price",
+        width: 150,
+      });
+      tempsTabs.push({
+        label: "结算金额",
+        prop: "amt",
+        width: 120,
+      });
+      tempsTabs.push({ label: "已出库金额", prop: "outPutAmt", width: 150 });
+      tempsTabs.push({ label: "WMS待出库金额", prop: "diffAmt", width: 180 });
+      tempsTabs.push({
+        label: "物料组编码",
+        prop: "materialGroupCode",
+        width: 150,
+      });
+      tempsTabs.push({
+        label: "物料组(车型)",
+        prop: "materialGroup",
+        width: 320,
+      });
+      tempsTabs.push({ label: "物料组描述", prop: "materialDesc", width: 420 });
+      tempsTabs.push({ label: "备注", prop: "remark1", width: 220 });
+
+      return tempsTabs;
+    },
+  },
+  methods: {
+    //版本下拉列表选择项
+    JobVersionValue(params) {
+      //版本下拉选择
+      this.JobversionValue = params.value;
+      this.getList();
+    },
+    selectState(params) {
+      //版本下拉选择
+      this.listQuery.state = params;
+      this.getList();
+    },
+    //从期间管理中获取版本数据，生成结算出库用
+    getAllVersionList() {
+      this.$axios
+        .posts("/api/settleaccount/CentralizedControl/openlist")
+        .then((response) => {
+          this.versionList = [];
+          response.forEach((element) => {
+            let options = {};
+            options.value = element.version;
+            options.label = element.version;
+            this.versionList.push(options);
+          });
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    //取业务版本列表信息
+    getJobVersionInfo() {
+      //this.listLoading = true;
+      this.listQuery.SkipCount = (this.page - 1) * 1000;
+      this.$axios
+        .posts("/api/settleaccount/Job/versionlist", this.listQuery)
+        .then((response) => {
+          let res = response.reverse(); //降序排列
+          this.JobVersionList = [];
+          res.forEach((element, index) => {
+            let options = {};
+            options.value = element;
+            options.label = element;
+            this.JobVersionList.push(options);
+          });
+          if (JSON.stringify(this.JobVersionList) != "[]") {
+            //因版本下拉有默认值，所以详表要自动绑定子表数据
+            this.JobversionValue = this.JobVersionList[0].value;
+            this.JobversionValueVerson = this.JobVersionList[0].label;
+            this.getList();
+          }
+        })
+        .catch(() => {
+          //this.listLoading = false;
+        });
+    },
+    handleCreate() {
+      // this.$nextTick(() => {
+      //   this.$refs["formCount"].resetFields();
+      // });
+      this.JobversionValue = "";
+      this.formTitle = "生成结算出库数据";
+      this.isEdit = false;
+      this.form = {};
+      this.dialogFormVisible = true;
+    },
+
+    handleImportSap() {
+      // this.$nextTick(() => {
+      //   this.$refs["formCount"].resetFields();
+      // });
+      this.dataValue = "";
+      this.formTitle = "同步";
+      this.isEdit = false;
+      this.form = {};
+      this.dialogAccounDateVisible = true;
+    },
+    //生成出库单数据
+    save() {
+      this.$refs.formCount.validate((valid) => {
+        if (valid) {
+          this.formLoading = true;
+          if (this.versionValue === "") {
+            this.$message.error("必需选择版本！");
+            this.formLoading = false;
+            return;
+          }
+          this.listExportQuery.version = this.versionValue; //版本
+          //this.listExportQuery.accountDate = this.dataValue; //过账日期
+          console.log(
+            "生成出库数据-保存条件：" + JSON.stringify(this.listExportQuery)
+          );
+          this.$axios
+            .gets(
+              "/api/settleaccount/WMSOutputDetailDiffReport/Make",
+              this.listExportQuery
+            )
+            .then((res) => {
+              if (res == "Success") {
+                this.$notify({
+                  title: "成功",
+                  message: "数据生成成功！",
+                  type: "success",
+                  duration: 2000,
+                });
+                this.getList();
+              } else {
+                this.$message({
+                  message: "数据生成失败！",
+                  type: "warning",
+                });
+              }
+              this.formLoading = false;
+              this.dialogFormVisible = false;
+            })
+            .catch(() => {
+              this.formLoading = false;
+              this.dialogFormVisible = false;
+            });
+        }
+      });
+    },
+    //同步到SAP
+    saveDate() {
+      this.$refs.formCount.validate((valid) => {
+        if (valid) {
+          this.formLoading = true;
+          if (this.dataValue === "") {
+            this.$message.error("必需选择过账日期！");
+            this.formLoading = false;
+            return;
+          }
+          console.log("日期传值：" + this.dataValue);
+          this.$axios
+            .posts("/api/settleaccount/WMSOutputDetailDiffReport/Sync", {
+              accountDate: this.dataValue,
+            })
+            .then((res) => {
+              if (res == true) {
+                this.$notify({
+                  title: "成功",
+                  message: "数据同步成功！",
+                  type: "success",
+                  duration: 2000,
+                });
+                this.getList();
+                this.formLoading = false;
+                this.dialogAccounDateVisible = false;
+              } else {
+                this.$message({
+                  message: "数据同步失败！",
+                  type: "warning",
+                });
+              }
+            })
+            .catch(() => {
+              this.formLoading = false;
+              this.dialogAccounDateVisible = false;
+            });
+        }
+      });
+    },
+    //导出功能
+    async handleDownload() {
+      this.listLoading = true;
+      // if (this.versionValue === "") {
+      //   this.$message.error("必需选择版本！");
+      //   this.listLoading = false;
+      //   return;
+      // }
+      // if (this.versionValue != "") {
+      //   this.listQuery.version = this.versionValue;
+      // }
+      console.log("结算出库单个导出：" + JSON.stringify(this.listQuery));
+      this.$axios
+        .posts("/api/settleaccount/WMSOutputDetailDiffReport/Export", this.listQuery)
+        .then((res) => {
+          let fileNameOfProject = res;
+          this.$axios
+            .BolbGets(
+              "/api/settleaccount/getblobfile/download/" + fileNameOfProject
+            )
+            .then((response) => {
+              if (fileNameOfProject.indexOf("_") != -1) {
+                let downName =
+                  fileNameOfProject.slice(
+                    0,
+                    fileNameOfProject.lastIndexOf("_")
+                  ) +
+                  fileNameOfProject.slice(fileNameOfProject.lastIndexOf("."));
+                downloadFile(response, downName);
+                this.$notify({
+                  title: "成功",
+                  message: "数据-导出成功！",
+                  type: "success",
+                  duration: 2000,
+                });
+              } else {
+                downloadFile(response, fileNameOfProject);
+                this.$notify({
+                  title: "成功",
+                  message: "数据-导出成功！",
+                  type: "success",
+                  duration: 2000,
+                });
+              }
+              this.listLoading = false;
+            });
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    selectOptionsChange(item) {
+      this.getList();
+    },
+
+    // handleImportExcel() {
+    //   //导入
+    //   this.showExcelImport = true;
+    //   this.$refs.importexcel.handleImportExcelClick();
+    // },
+    /** 刷新列表 */
+    handleHandle(data) {
+      if (data.type !== "edit") {
+        this.getList();
+      }
+    },
+    /** 格式化字段 */
+    fieldFormatter(row, column) {
+      if (column.property === "state") {
+        return { 0: "新建", 1: "已申请", 2: "成功", 3: "失败" }[
+          row[column.property]
+        ];
+      }
+      if (
+        column.property == "settleInputDate" ||
+        column.property == "settleDate"
+      ) {
+        var date = row[column.property];
+        if (date == undefined) {
+          return "";
+        }
+        return moment(date).format("YYYY-MM-DD HH:mm:ss");
+      }
+      return row[column.property] || "--";
+    },
+    importExcelData() {
+      //this.getVersionInfo();
+      this.listLoading = false;
+      //关闭导入窗体时调用
+      this.showExcelImport = false;
+    },
+
+    getList(data) {
+      this.listLoading = true;
+      //this.listQuery.SkipCount = (this.page - 1) * 10;
+       if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
+      if (this.JobversionValue != "") {
+        this.listQuery.version = this.JobversionValue;
+      }
+      console.log("列表查询条件：" + JSON.stringify(this.listQuery));
+      this.$axios
+        .posts(
+          "/api/settleaccount/WMSOutputDetailDiffReport​/WmsDetailReport",
+          this.listQuery
+        )
+        .then((response) => {
+          this.list = response.items;
+          this.totalCount = response.totalCount;
+          setTimeout(() => {
+            //大数据量加载时
+            this.listLoading = false;
+          }, 500);
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    /** 筛选操作 */
+    handleFilter() {
+      this.page = 1;
+      this.getList();
+      this.listQuery.Filters = [];
+      if (this.searchContent != "") {
+        var column = "billNum";
+        let filter = {
+          logic: 0,
+          column: column,
+          action: 0,
+          value: this.searchContent,
+        };
+        this.listQuery.Filters.push(filter);
+      }
+      this.getList();
+    },
+    /** 多项筛选操作 */
+    /** 筛选操作 */
+    handleFilters(data) {
+      if (data === null) {
+        this.listQuery.Filters = [];
+        this.getList(); //查询所有
+      } else {
+        this.filterObj = data;
+        console.log("筛选" + JSON.stringify(data));
+        var offsetHei = document.documentElement.clientHeight;
+        var removeHeight = Object.keys(this.filterObj).length > 0 ? 310 : 240;
+        this.tableHeight = offsetHei - removeHeight;
+        this.currentPage = 1;
+        let Filter = [];
+        data.forEach((item) => {
+          let filter = {};
+          if (item.formType === "datetime" || item.formType === "datetime") {
+            //日期类型的过滤条件是 (datetime >= a and  datetime <=b)
+            filter["Column"] = item.fieldName;
+            filter["Logic"] = 0;
+            filter["Value"] = item.value[0];
+            filter["Action"] = item.action;
+            Filter.push(filter);
+
+            if (item.value[1] != null) {
+              filter["Value"] = item.value[1];
+              filter["Action"] = 5;
+              Filter.push(filter);
+            }
+          } else {
+            filter["Column"] = item.fieldName;
+            filter["Value"] = item.value;
+            filter["Logic"] = 0;
+            filter["Action"] = item.action;
+            Filter.push(filter);
+          }
+        });
+        console.log("筛选条件" + JSON.stringify(Filter));
+        this.listQuery.Filters = Filter;
+        this.getList();
+      }
+    },
+    resetQuery() {},
+    sortChange(data) {
+      const { prop, order } = data;
+      if (!prop || !order) {
+        this.handleFilter();
+        return;
+      }
+      this.listQuery.Sorting = prop + " " + order;
+      console.log(this.listQuery.Sorting);
+      this.handleFilter();
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    /** 通过回调控制style */
+    cellStyle({ row, column, rowIndex, columnIndex }) {
+      if (
+        column.property === "qty" ||
+        column.property === "outputQty" ||
+        column.property === "diffQty"
+      ) {
+        return { textAlign: "right" };
+      } else {
+        return { textAlign: "left" };
+      }
+      return { textAlign: "left" };
+    },
+    /** 通过回调控制表头style */
+    headerRowStyle({ row, column, rowIndex, columnIndex }) {
+      if (column.property === "qty") {
+        return { textAlign: "right", background: "#FAFAFA" };
+      } else {
+        return { textAlign: "left", background: "#FAFAFA" };
+      }
+    },
+    handleRowClick(row, column, event) {
+      this.$refs.multipleTable.clearSelection();
+      this.$refs.multipleTable.toggleRowSelection(row);
+    },
+  },
+};
+</script>
+
+
+<style lang="scss" scoped>
+@import "../../styles/crmtable.scss";
+</style>
+<style lang="scss">
+.el-table .cell.el-tooltip {
+  white-space: pre-wrap;
+}
+</style>
+
+
diff --git a/vue/src/views/ux/billManage/WMSOutputSumReport/index.vue b/vue/src/views/ux/billManage/WMSOutputSumReport/index.vue
index 4be2e7a8..54a8e86c 100644
--- a/vue/src/views/ux/billManage/WMSOutputSumReport/index.vue
+++ b/vue/src/views/ux/billManage/WMSOutputSumReport/index.vue
@@ -33,6 +33,18 @@
         >导出Excel
       </el-button>
 
+      <el-select
+        v-model="listQuery.state"
+        @change="selectState"
+        placeholder="请选择过滤状态"
+        style="width: 200px; margin-left: 8px"
+      >
+        <el-option label="新建" :value="0"></el-option>
+        <el-option label="已申请" :value="1"></el-option>
+        <el-option label="成功" :value="2"></el-option>
+        <el-option label="失败" :value="3"></el-option>
+      </el-select>
+
       <el-input
         v-model="searchContent"
         clearable
@@ -54,7 +66,7 @@
         size="mini"
         type="warning"
         icon="el-icon-upload2"
-        @click="handleImportExcel()"
+        @click="handleImportSap()"
         >同步到SAP
       </el-button>
       <!--表格头组件，filter查询-->
@@ -173,6 +185,48 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <!-- <el-row>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="过账日期" required />
+          </el-col>
+          <el-col :md="20" :xs="24">
+            <el-form-item prop="dataValue">
+              <el-date-picker
+                v-model="dataValue"
+                style="width: 188px"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="选择日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row> -->
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="text" @click="dialogFormVisible = false"
+          >取消</el-button
+        >
+        <!-- <el-button @click="resetForm('formCount')">重置</el-button> -->
+        <el-button v-loading="formLoading" type="primary" @click="save"
+          >确认</el-button
+        >
+      </div>
+    </el-dialog>
+
+    <el-dialog
+      :visible.sync="dialogAccounDateVisible"
+      :close-on-click-modal="false"
+      :title="formTitle"
+      append-to-body
+      width="680px"
+    >
+      <el-form
+        ref="formCount"
+        :inline="true"
+        :rules="rules"
+        :model="formCount"
+        size="mini"
+      >
         <el-row>
           <el-col :md="4" :xs="24">
             <el-form-item label="过账日期" required />
@@ -191,11 +245,11 @@
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <!-- <el-button type="text" @click="dialogFormVisible = false"
+        <el-button type="text" @click="dialogAccounDateVisible = false"
           >取消</el-button
-        > -->
-        <el-button @click="resetForm('formCount')">重置</el-button>
-        <el-button v-loading="formLoading" type="primary" @click="save"
+        >
+        <!-- <el-button @click="resetForm('formCount')">重置</el-button> -->
+        <el-button v-loading="formLoading" type="primary" @click="saveDate"
           >确认</el-button
         >
       </div>
@@ -257,6 +311,8 @@ export default {
         customerId: "",
         projectId: "",
       },
+      JobversionValue: "",
+      JobversionValueVerson: "",
       list: null,
       totalCount: 0,
       listLoading: true,
@@ -280,15 +336,16 @@ export default {
         Filters: [
           {
             logic: 0,
-            column: "Extend",
+            column: "Enabled",
             action: 0,
-            value: "not90",
+            value: "true",
           }, //默认查询可用的
         ],
         //OrgID:"",
         SkipCount: 0,
         MaxResultCount: 15,
         version: "",
+        state: undefined,
       },
       listExportQuery: {
         Filters: [
@@ -309,6 +366,7 @@ export default {
       },
       page: 1,
       dialogFormVisible: false,
+      dialogAccounDateVisible: false,
       multipleSelection: [],
       formTitle: "",
       drawer: false,
@@ -336,6 +394,7 @@ export default {
     /** 列表字段 */
     getDefaultField() {
       var tempsTabs = [];
+      tempsTabs.push({ label: "状态", prop: "state", width: 180 });
       tempsTabs.push({ label: "行号", prop: "lineNumber", width: 100 });
       tempsTabs.push({ label: "版本号", prop: "version", width: 150 });
       tempsTabs.push({
@@ -385,15 +444,26 @@ export default {
       tempsTabs.push({
         label: "物料组(车型)",
         prop: "materialGroup",
-        width: 150,
+        width: 320,
       });
-      tempsTabs.push({ label: "物料组描述", prop: "materialDesc", width: 180 });
+      tempsTabs.push({ label: "物料组描述", prop: "materialDesc", width: 420 });
       tempsTabs.push({ label: "备注", prop: "remark1", width: 220 });
-      tempsTabs.push({ label: "状态", prop: "state", width: 180 });
+
       return tempsTabs;
     },
   },
   methods: {
+    //版本下拉列表选择项
+    JobVersionValue(params) {
+      //版本下拉选择
+      this.JobversionValue = params.value;
+      this.getList();
+    },
+    selectState(params) {
+      //版本下拉选择
+      this.listQuery.state = params;
+      this.getList();
+    },
     //从期间管理中获取版本数据，生成结算出库用
     getAllVersionList() {
       this.$axios
@@ -441,22 +511,35 @@ export default {
       // this.$nextTick(() => {
       //   this.$refs["formCount"].resetFields();
       // });
+      this.JobversionValue = "";
       this.formTitle = "生成结算出库数据";
       this.isEdit = false;
       this.form = {};
       this.dialogFormVisible = true;
     },
+
+    handleImportSap() {
+      // this.$nextTick(() => {
+      //   this.$refs["formCount"].resetFields();
+      // });
+      this.dataValue = "";
+      this.formTitle = "同步SAP";
+      this.isEdit = false;
+      this.form = {};
+      this.dialogAccounDateVisible = true;
+    },
+    //生成出库单数据
     save() {
       this.$refs.formCount.validate((valid) => {
         if (valid) {
           this.formLoading = true;
-          if (this.versionValue === "" || this.dataValue == "") {
-            this.$message.error("必需选择版本和过账日期！");
+          if (this.versionValue === "") {
+            this.$message.error("必需选择版本！");
             this.formLoading = false;
             return;
           }
           this.listExportQuery.version = this.versionValue; //版本
-          this.listExportQuery.accountDate = this.dataValue; //过账日期
+          //this.listExportQuery.accountDate = this.dataValue; //过账日期
           console.log(
             "生成出库数据-保存条件：" + JSON.stringify(this.listExportQuery)
           );
@@ -474,14 +557,14 @@ export default {
                   duration: 2000,
                 });
                 this.getList();
-                this.formLoading = false;
-                this.dialogFormVisible = false;
               } else {
                 this.$message({
                   message: "数据生成失败！",
                   type: "warning",
                 });
               }
+              this.formLoading = false;
+              this.dialogFormVisible = false;
             })
             .catch(() => {
               this.formLoading = false;
@@ -490,6 +573,46 @@ export default {
         }
       });
     },
+    //同步到SAP
+    saveDate() {
+      this.$refs.formCount.validate((valid) => {
+        if (valid) {
+          this.formLoading = true;
+          if (this.dataValue === "") {
+            this.$message.error("必需选择过账日期！");
+            this.formLoading = false;
+            return;
+          }
+          console.log("日期传值：" + this.dataValue);
+          this.$axios
+            .posts("/api/settleaccount/WMSOutputSumReport/SyncSap", {
+              accountDate: this.dataValue,
+            })
+            .then((res) => {
+              if (res == true) {
+                this.$notify({
+                  title: "成功",
+                  message: "数据同步成功！",
+                  type: "success",
+                  duration: 2000,
+                });
+                this.getList();
+                this.formLoading = false;
+                this.dialogAccounDateVisible = false;
+              } else {
+                this.$message({
+                  message: "数据同步失败！",
+                  type: "warning",
+                });
+              }
+            })
+            .catch(() => {
+              this.formLoading = false;
+              this.dialogAccounDateVisible = false;
+            });
+        }
+      });
+    },
     //导出功能
     async handleDownload() {
       this.listLoading = true;
@@ -498,10 +621,10 @@ export default {
       //   this.listLoading = false;
       //   return;
       // }
-      if (this.versionValue != "") {
-        this.listQuery.version = this.versionValue;
-      }
-      console.log("大众看板导出：" + JSON.stringify(this.listQuery));
+      // if (this.versionValue != "") {
+      //   this.listQuery.version = this.versionValue;
+      // }
+      console.log("结算出库SAP接口导出：" + JSON.stringify(this.listQuery));
       this.$axios
         .posts("/api/settleaccount/WMSOutputSumReport/Export", this.listQuery)
         .then((res) => {
@@ -536,13 +659,11 @@ export default {
               }
               this.listLoading = false;
             });
+        })
+        .catch(() => {
+          this.listLoading = false;
         });
     },
-    selectValue(params) {
-      //版本下拉选择
-      this.versionValue = params.value;
-      this.getList();
-    },
     selectOptionsChange(item) {
       this.getList();
     },
@@ -560,9 +681,11 @@ export default {
     },
     /** 格式化字段 */
     fieldFormatter(row, column) {
-      // if (column.property === "state") {
-      //   return { 0: "其他", 2: "已结" }[row[column.property]];
-      // }
+      if (column.property === "state") {
+        return { 0: "新建", 1: "已申请", 2: "成功", 3: "失败" }[
+          row[column.property]
+        ];
+      }
       if (
         column.property == "settleInputDate" ||
         column.property == "settleDate"
@@ -585,8 +708,8 @@ export default {
     getList() {
       this.listLoading = true;
       this.listQuery.SkipCount = (this.page - 1) * 10;
-      if (this.versionValue != "") {
-        this.listQuery.version = this.versionValue;
+      if (this.JobversionValue != "") {
+        this.listQuery.version = this.JobversionValue;
       }
       console.log("列表查询条件：" + JSON.stringify(this.listQuery));
       this.$axios
@@ -681,11 +804,15 @@ export default {
     },
     /** 通过回调控制style */
     cellStyle({ row, column, rowIndex, columnIndex }) {
-      // if (column.property === "qty") {
-      //   return { textAlign: "right" };
-      // } else {
-      //   return { textAlign: "left" };
-      // }
+      if (
+        column.property === "qty" ||
+        column.property === "outputQty" ||
+        column.property === "diffQty"
+      ) {
+        return { textAlign: "right" };
+      } else {
+        return { textAlign: "left" };
+      }
       return { textAlign: "left" };
     },
     /** 通过回调控制表头style */
diff --git a/vue/src/views/ux/vw/dataInput/r3-open/index.vue b/vue/src/views/ux/vw/dataInput/r3-open/index.vue
index 3fa74589..fa5aa795 100644
--- a/vue/src/views/ux/vw/dataInput/r3-open/index.vue
+++ b/vue/src/views/ux/vw/dataInput/r3-open/index.vue
@@ -2,12 +2,12 @@
 <template>
   <div class="cr-body-content">
     <flexbox class="content-header">
-      <XhJSSelect
+      <XhJSSelectVerson
         :options="versionList"
         style="width: 150px; margin-left: -10px"
         class="search-container"
-        @value-change="selectValue"
-      ></XhJSSelect>
+        @value-change="selectValueVerson"
+      ></XhJSSelectVerson>
       <el-button
         class="filter-item"
         size="mini"
@@ -150,7 +150,7 @@ import CRMTableHead from "../../../components/CRMTableHead";
 import moment from "moment";
 import Lockr from "lockr";
 import { downloadFile } from "@/utils/crmindex.js";
-import XhJSSelect from "@/components/CreateCom/Xh-JS-Select.vue";
+// import XhJSSelect from "@/components/CreateCom/Xh-JS-Select.vue";
 import XhJSSelectVerson from "@/components/CreateCom/Xh-JS-Select-Label.vue";
 
 export default {
@@ -159,7 +159,7 @@ export default {
     Pagination,
     CRMTableHead,
     importExcel,
-    XhJSSelect,
+    //XhJSSelect,
     XhJSSelectVerson,
   },
   directives: { permission },
@@ -230,7 +230,7 @@ export default {
         //OrgID:"",
         SkipCount: 0,
         MaxResultCount: 15,
-        ParentId: "",
+        version: "",
         fileType: 0,
         userId: "00000000-0000-0000-0000-000000000000",
       },
@@ -246,7 +246,7 @@ export default {
         //OrgID:"",
         SkipCount: 0,
         MaxResultCount: 15,
-        ParentId: "",
+        version: "",
         fileType: 0,
         userId: "",
       },
@@ -317,14 +317,15 @@ export default {
     // },
   },
   methods: {
-    selectValue(params) {
-      //版本下拉选择
-      this.versionValue = params.value;
-      this.getList();
-    },
+    // selectValue(params) {
+    //   //版本下拉选择
+    //   this.versionValue = params.value;
+    //   this.getList();
+    // },
     selectValueVerson(params) {
       //版本下拉选择
       this.versionValueVerson = params.value;
+      this.getList();
     },
     handleTypeDrop(command, params = {}) {},
     selectOptionsChange(item) {
@@ -348,6 +349,7 @@ export default {
             //因版本下拉有默认值，所以详表要自动绑定子表数据
             this.versionValue = this.versionList[0].value;
             this.versionValueVerson = this.versionList[0].label;
+            console.log(JSON.stringify(this.versionValueVerson))
             this.getList();
           }
         })
@@ -405,16 +407,14 @@ export default {
         this.listLoading = false;
         return;
       }
-      //根据ParentId条件导出
-      if (this.versionValue != "") {
-        this.listQuery.ParentId = this.versionValue;
-      } else {
-        this.listQuery.ParentId = "00000000-0000-0000-0000-000000000000";
-      }
-      console.log("R3未结导出：" + JSON.stringify(this.listQuery.ParentId));
+      //根据版本条件导出
+      if (this.versionValueVerson != "") {
+        this.listQuery.version = this.versionValueVerson;
+      } 
+      console.log("R3未结导出：" + JSON.stringify(this.listQuery));
       this.$axios
         .posts("/api/settleaccount/UnSettleAccount/Export", {
-          parentId: this.listQuery.ParentId,
+          version: this.listQuery.version,
         })
         .then((res) => {
           let fileNameOfProject = res;
@@ -456,11 +456,10 @@ export default {
     getList() {
       this.listLoading = true;
       this.listQuery.SkipCount = (this.page - 1) * 10;
-      if (this.versionValue != "") {
-        this.listQuery.ParentId = this.versionValue;
-      } else {
-        this.listQuery.ParentId = "00000000-0000-0000-0000-000000000000";
-      }
+      if (this.versionValueVerson != "") {
+        this.listQuery.version = this.versionValueVerson;
+      } 
+      console.log("传入条件："+JSON.stringify(this.listQuery))
       this.$axios
         .posts("/api/settleaccount/UnSettleAccount/list", this.listQuery)
         .then((response) => {
diff --git a/vue/static/tableFieldForSearch.json b/vue/static/tableFieldForSearch.json
index 1f3cd826..9a1d3cea 100644
--- a/vue/static/tableFieldForSearch.json
+++ b/vue/static/tableFieldForSearch.json
@@ -3003,16 +3003,6 @@
         "fieldType": 1,
         "fieldName": "materialGroup",
         "setting": []
-      },
-      {
-        "fieldId": 5,
-        "formType": "text",
-        "name": "状态",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "state",
-        "setting": []
       }
     ]
   },