From 61088df534f0378be3f4e7e62fc7519ddca1dd83 Mon Sep 17 00:00:00 2001
From: 44673626 <44673626@qq.com>
Date: Tue, 22 Mar 2022 16:06:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E4=BC=97=E5=A4=87=E4=BB=B6=E3=80=81?=
 =?UTF-8?q?=E7=9C=8B=E6=9D=BF=E3=80=81=E7=BA=A2=E6=97=97=E7=AD=89=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E6=8A=A5=E8=A1=A8=E6=9D=A1=E4=BB=B6=E6=95=B4=E5=90=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vue/src/router/modules/wms_out_order.js       |  55 +-
 .../ux/billManage/KanbanUnSettled/index.vue   |  65 +-
 .../WMSOutputDetailDiffReport/index.vue       |   4 +-
 .../WMSOutputDetailWithCodeReport/index.vue   | 849 ++++++++++++++++++
 .../billManage/WMSOutputSumReport/index.vue   | 375 ++++----
 .../ux/billManage/kanBanWithCode/index.vue    |  19 +-
 .../views/ux/billManage/sparePart90/index.vue |  37 +-
 .../ux/vw/dataInput/hq_h_report/index.vue     | 109 +--
 .../ux/vw/dataInput/hq_h_sparepart/index.vue  |  50 +-
 .../ux/vw/dataInput/hq_y_report/index.vue     |  14 +-
 10 files changed, 1171 insertions(+), 406 deletions(-)
 create mode 100644 vue/src/views/ux/billManage/WMSOutputDetailWithCodeReport/index.vue

diff --git a/vue/src/router/modules/wms_out_order.js b/vue/src/router/modules/wms_out_order.js
index f0dea4ce..024089b7 100644
--- a/vue/src/router/modules/wms_out_order.js
+++ b/vue/src/router/modules/wms_out_order.js
@@ -17,26 +17,26 @@ const vwsOutOrderDataRouter = {
     keepAlive: false,
   },
   children: [
-    {
-      path: '/WmsOutputSum',
-      component: () => import('@/views/ux/billManage/WmsOutputSumExport'),
-      name: 'WmsOutputSumExport',//命名路由
-      meta: {
-        title: 'WMS统计汇总报表',
-        roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色）
-        icon: '零件'
-      }
-    },
-    {
-      path: '/erpSumOutput',
-      component: () => import('@/views/ux/billManage/ErpSumOutput'),
-      name: 'ErpSumOutput',//命名路由
-      meta: {
-        title: '结算汇总出库接口',
-        roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色）
-        icon: '零件'
-      }
-    },
+    // {
+    //   path: '/WmsOutputSum',
+    //   component: () => import('@/views/ux/billManage/WmsOutputSumExport'),
+    //   name: 'WmsOutputSumExport',//命名路由
+    //   meta: {
+    //     title: 'WMS统计汇总报表',
+    //     roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色）
+    //     icon: '零件'
+    //   }
+    // },
+    // {
+    //   path: '/erpSumOutput',
+    //   component: () => import('@/views/ux/billManage/ErpSumOutput'),
+    //   name: 'ErpSumOutput',//命名路由
+    //   meta: {
+    //     title: '结算汇总出库接口',
+    //     roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色）
+    //     icon: '零件'
+    //   }
+    // },
     {
       path: '/wmsOutputSumReport',
       component: () => import('@/views/ux/billManage/WMSOutputSumReport'),
@@ -49,11 +49,22 @@ const vwsOutOrderDataRouter = {
     },
 
     {
-      path: '/wms-OutputDetailDiffReport',
+      path: '/wms-OutputDetailDiff',
       component: () => import('@/views/ux/billManage/WMSOutputDetailDiffReport'),
       name: 'WMSOutputDetailDiffReport',//命名路由
       meta: {
-        title: '出库差异清单',
+        title: '全部出库差异',
+        roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色） 
+        icon: '零件'
+      }
+    },
+
+    {
+      path: '/wms-OutputDetailWithCode',
+      component: () => import('@/views/ux/billManage/WMSOutputDetailWithCodeReport'),
+      name: 'WMSOutputDetailWithCodeReport',//命名路由
+      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 c22a5872..c6aba184 100644
--- a/vue/src/views/ux/billManage/KanbanUnSettled/index.vue
+++ b/vue/src/views/ux/billManage/KanbanUnSettled/index.vue
@@ -307,52 +307,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <!--<el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="客户零件号" />
-          </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -80px">
-            <el-form-item prop="materialCode">
-              <el-input
-                type="textarea"
-                v-model="formCount.materialCode"
-                :rows="5"
-                style="width: 450px"
-                placeholder="多个客户零件号，请以回车换行形式添加！"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-         <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="看板号" />
-          </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -80px">
-            <el-form-item>
-              <el-input
-                type="textarea"
-                style="width: 170px"
-                v-model="formCount.kanBan"
-                :rows="5"
-                placeholder="多个看板号，请以回车换行形式添加！"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="客户零件号" />
-          </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -95px">
-            <el-form-item prop="materialCode">
-              <el-input
-                type="textarea"
-                v-model="formCount.materialCode"
-                :rows="5"
-                style="width: 170px"
-                placeholder="多个客户零件号，请以回车换行形式添加！"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row> -->
+
         <el-row>
           <el-col :md="4" :xs="24">
             <el-form-item label="厂内零件号" />
@@ -369,24 +324,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <!-- <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="客户零件号" />
-          </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -80px">
-            <el-form-item>
-              <el-input v-model="formCount.materialCode" />
-            </el-form-item>
-          </el-col>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="厂内零件号" />
-          </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -95px">
-            <el-form-item>
-              <el-input v-model="formCount.sapMaterialCode" />
-            </el-form-item>
-          </el-col>
-        </el-row> -->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <!-- <el-button type="text" @click="dialogFormVisible = false"
diff --git a/vue/src/views/ux/billManage/WMSOutputDetailDiffReport/index.vue b/vue/src/views/ux/billManage/WMSOutputDetailDiffReport/index.vue
index 94abbd58..e4971d49 100644
--- a/vue/src/views/ux/billManage/WMSOutputDetailDiffReport/index.vue
+++ b/vue/src/views/ux/billManage/WMSOutputDetailDiffReport/index.vue
@@ -61,14 +61,14 @@
         @click="handleFilter"
         >搜索
       </el-button>
-      <el-button
+      <!-- <el-button
         class="filter-item"
         size="mini"
         type="warning"
         icon="el-icon-upload2"
         @click="handleImportSap()"
         >同步到SAP
-      </el-button>
+      </el-button> -->
       <!--表格头组件，filter查询-->
       <c-r-m-table-head
         ref="crmTableHead"
diff --git a/vue/src/views/ux/billManage/WMSOutputDetailWithCodeReport/index.vue b/vue/src/views/ux/billManage/WMSOutputDetailWithCodeReport/index.vue
new file mode 100644
index 00000000..7482642d
--- /dev/null
+++ b/vue/src/views/ux/billManage/WMSOutputDetailWithCodeReport/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: "WMSOutputDetailWithCodeReport",
+  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: "wmsOutputDetailWithCodeReport",
+      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/WMSOutputDetailWithCodeReport/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/WMSOutputDetailWithCodeReport/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/WMSOutputDetailWithCodeReport/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/WMSOutputDetailWithCodeReport/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 8b1f9f61..e297bb7e 100644
--- a/vue/src/views/ux/billManage/WMSOutputSumReport/index.vue
+++ b/vue/src/views/ux/billManage/WMSOutputSumReport/index.vue
@@ -1,145 +1,165 @@
-<!--结算出库到SAP功能-->
+
 <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>
- <!-- @change="SelectType" -->
-      <el-select
-        v-model="selectType"
-       
-        placeholder="请选择出库类型"
-        style="width: 200px; margin-left: 8px"
+      <el-form
+        :model="listQuery"
+        ref="queryForm"
+        v-show="showSearch"
+        :inline="true"
       >
-        <el-option
-          label="大众备件汇总出库"
-          value="大众备件汇总出库"
-        ></el-option>
-        <el-option
-          label="大众备件条码出库"
-          value="大众备件条码出库"
-        ></el-option>
-        <el-option label="大众看板出库" value="大众看板出库"></el-option>
-        <el-option label="大众无看板出库" value="大众无看板出库"></el-option>
-        <el-option label="大众准时化出库" value="大众准时化出库"></el-option>
-        <el-option label="红旗手工出库" value="红旗手工出库"></el-option>
+        <el-form-item label="版本">
+          <JobSelectVerson
+            :options="JobVersionList"
+            style="width: 150px; margin-left: -10px"
+            class="search-container"
+            @value-change="JobVersionValue"
+          ></JobSelectVerson>
+        </el-form-item>
+        <el-form-item label="出库类型" prop="selectType">
+          <el-select
+            v-model="selectType"
+            clearable
+            @change="SelectType"
+            placeholder="请选择"
+            style="width: 200px; margin-left: 8px"
+          >
+            <el-option
+              label="大众备件汇总出库"
+              value="大众备件汇总出库"
+            ></el-option>
+            <el-option
+              label="大众备件条码出库"
+              value="大众备件条码出库"
+            ></el-option>
+            <el-option label="大众看板出库" value="大众看板出库"></el-option>
+            <el-option
+              label="大众无看板出库"
+              value="大众无看板出库"
+            ></el-option>
+            <el-option
+              label="大众准时化出库"
+              value="大众准时化出库"
+            ></el-option>
+            <el-option label="红旗手工出库" value="红旗手工出库"></el-option>
 
-        <el-option
-          label="红旗手工出库(备件)"
-          value="红旗手工出库(备件)"
-        ></el-option>
-        <el-option label="一轿手工出库" value="一轿手工出库"></el-option>
-        <el-option
-          label="一轿手工出库(备件)"
-          value="一轿手工出库(备件)"
-        ></el-option>
-      </el-select>
-  <!-- @change="selectState" -->
-      <el-select
-        v-model="listQuery.state"
-        placeholder="选择状态"
-        style="width: 100px; 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-option
+              label="红旗手工出库(备件)"
+              value="红旗手工出库(备件)"
+            ></el-option>
+            <el-option label="一轿手工出库" value="一轿手工出库"></el-option>
+            <el-option
+              label="一轿手工出库(备件)"
+              value="一轿手工出库(备件)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
 
-       <el-select
-        v-model="listQuery.client"
-        placeholder="选择客户"
-        style="width: 100px; margin-left: 8px"
-      >
-        <el-option label="大众" value="大众"></el-option>
-        <el-option label="红旗" value="红旗"></el-option>
-        <el-option label="一轿" value="一轿"></el-option>
-      </el-select>
+        <el-form-item prop="state">
+          <el-select
+            v-model="listQuery.state"
+            @change="selectState"
+            clearable
+            placeholder="状态"
+            style="width: 100px; margin-left: 8px"
+          >
+            <el-option label="全部" :value="4"></el-option>
+            <el-option label="新建" :value="0"></el-option>
+            <el-option label="成功" :value="1"></el-option>
+            <el-option label="失败" :value="2"></el-option>
+          </el-select>
+        </el-form-item>
 
+        <el-form-item prop="client">
+          <el-select
+            v-model="listQuery.client"
+            clearable
+            @change="SelectClient"
+            placeholder="客户"
+            style="width: 110px; margin-left: 8px"
+          >
+            <el-option label="大众" value="大众"></el-option>
+            <el-option label="红旗" value="红旗"></el-option>
+            <el-option label="一轿" value="一轿"></el-option>
+          </el-select>
+        </el-form-item>
 
-       <el-select
-          v-model="listQuery.materialGroup"
-                size="medium"
-                multiple
-                filterable
-                clearable
-                style="width: 280px; margin-right: 15px"
-                @change="valueChange"
-                placeholder="请选择"
-              >
-                <el-option
-                  v-for="item in materialGroupList"
-                  :key="item.value"
-                  :label="item.value"
-                  :value="item.value"
-                >
-                  <span style="float: left">{{ item.label }}</span>
-                  <span style="float: right; color: #8492a6; font-size: 13px">{{
-                    item.value
-                  }}</span>
-              </el-option>
+        <el-form-item label="物料组" prop="materialGroup">
+          <el-select
+            v-model="listQuery.materialGroup"
+            size="medium"
+            filterable
+            clearable
+            style="width: 280px; margin-right: 15px"
+            @change="valueChange"
+            placeholder="请选择"
+          >
+            <el-option
+              v-for="item in materialGroupList"
+              :key="item.value"
+              :label="item.value"
+              :value="item.value"
+            >
+              <span style="float: left">{{ item.label }}</span>
+              <span style="float: right; color: #8492a6; font-size: 13px">{{
+                item.value
+              }}</span>
+            </el-option>
           </el-select>
+        </el-form-item>
+        <el-form-item label="结算单号" prop="searchContent">
+          <el-input
+            v-model="searchContent"
+            clearable
+            size="small"
+            placeholder="结算单号"
+            style="width: 200px; margin-left: 8px"
+            class="search-container"
+            @keyup.enter.native="handleFilter"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button
+            icon="el-icon-refresh"
+            size="mini"
+            @click="resetQuery('queryForm')"
+            >重置</el-button
+          >
+          <el-button
+            size="mini"
+            type="success"
+            icon="el-icon-search"
+            @click="handleFilter"
+            >搜索
+          </el-button>
 
-      <el-input
-        v-model="searchContent"
-        clearable
-        size="small"
-        placeholder="结算单号"
-        style="width: 200px; margin-left: 8px"
-        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> -->
+          <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-button
+            class="filter-item"
+            size="mini"
+            type="warning"
+            icon="el-icon-upload2"
+            @click="handleImportSap()"
+            >同步到SAP
+          </el-button>
+        </el-form-item>
+      </el-form>
     </flexbox>
     <!--表格渲染-->
     <el-table
@@ -289,56 +309,6 @@
               />
             </el-form-item>
           </el-col>
-
-            <el-form-item label="出库类型" required />
-          </el-col>
-          <el-col :md="8" :xs="24">
-            <el-form-item prop="selectType">
-              <el-select
-                v-model="selectType"
-                placeholder="请选择出库类型"
-                style="width: 200px;"
-              >
-                <el-option
-                  label="大众备件汇总出库"
-                  value="大众备件汇总出库"
-                ></el-option>
-                <el-option
-                  label="大众备件条码出库"
-                  value="大众备件条码出库"
-                ></el-option>
-                <el-option
-                  label="大众看板出库"
-                  value="大众看板出库"
-                ></el-option>
-                <el-option
-                  label="大众无看板出库"
-                  value="大众无看板出库"
-                ></el-option>
-                <el-option
-                  label="大众准时化出库"
-                  value="大众准时化出库"
-                ></el-option>
-                <el-option
-                  label="红旗手工出库"
-                  value="红旗手工出库"
-                ></el-option>
-
-                <el-option
-                  label="红旗手工出库(备件)"
-                  value="红旗手工出库(备件)"
-                ></el-option>
-                <el-option
-                  label="一轿手工出库"
-                  value="一轿手工出库"
-                ></el-option>
-                <el-option
-                  label="一轿手工出库(备件)"
-                  value="一轿手工出库(备件)"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col> -->
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -389,6 +359,7 @@ export default {
   data() {
     return {
       crmType: "wmsOutputSumReport",
+      showSearch: true,
       versionValue: "",
       dataValue: "",
       selectType: "", //出库类型
@@ -443,12 +414,12 @@ export default {
         SkipCount: 0,
         MaxResultCount: 15,
         version: "",
-        state: undefined,
+        state: 4,
         accountDate: undefined,
-        type: "",
-        materialGroup: "",
-        client: "",
-        billNum: "",
+        type: undefined,
+        //materialGroup: undefined,
+        client: undefined,
+        billNum: undefined,
       },
       listExportQuery: {
         Filters: [
@@ -476,7 +447,7 @@ export default {
       formTitle: "",
       drawer: false,
       showExcelImport: false,
-      tableHeight: document.documentElement.clientHeight - 220,
+      tableHeight: document.documentElement.clientHeight - 300,
       isEdit: false,
     };
   },
@@ -484,7 +455,7 @@ export default {
     var self = this;
     window.onresize = function () {
       var offsetHei = document.documentElement.clientHeight;
-      self.tableHeight = offsetHei - 260;
+      self.tableHeight = offsetHei - 300;
     };
   },
   created() {
@@ -600,6 +571,11 @@ export default {
       this.listQuery.state = params;
       this.getList();
     },
+    SelectClient(params) {
+      //版本下拉选择
+      this.listQuery.client = params;
+      this.getList();
+    },
     SelectType(params) {
       //版本下拉选择
       this.listQuery.type = params;
@@ -719,8 +695,8 @@ export default {
       this.$refs.formCount.validate((valid) => {
         if (valid) {
           this.formLoading = true;
-          if (this.dataValue === "" || this.selectType === "") {
-            this.$message.error("必需选择过账日期和出库类型！");
+          if (this.dataValue === "") {
+            this.$message.error("必需选择过账日期！");
             this.formLoading = false;
             return;
           }
@@ -729,7 +705,7 @@ export default {
             this.listQuery.version = this.JobversionValue;
           }
           this.listQuery.accountDate = this.dataValue;
-          this.listQuery.type = this.selectType; //出库类型
+          //this.listQuery.type = this.selectType; //出库类型
           console.log("同步SAP传参：" + JSON.stringify(this.listQuery));
           this.$axios
             .posts(
@@ -939,7 +915,20 @@ export default {
         this.getList();
       }
     },
-    resetQuery() {},
+    /** 重置按钮操作 */
+    resetQuery(refName) {
+      if (this.$refs[refName] !== undefined) {
+        this.$refs[refName].resetFields();
+      }
+      this.searchContent = "";
+      this.getmaterialGroupValue = "";
+      this.selectType = "";
+      this.listQuery.type = undefined;
+      this.listQuery.client = undefined;
+      this.listQuery.state = undefined;
+
+      this.getList();
+    },
     sortChange(data) {
       const { prop, order } = data;
       if (!prop || !order) {
diff --git a/vue/src/views/ux/billManage/kanBanWithCode/index.vue b/vue/src/views/ux/billManage/kanBanWithCode/index.vue
index d16a3be2..2c5ab42f 100644
--- a/vue/src/views/ux/billManage/kanBanWithCode/index.vue
+++ b/vue/src/views/ux/billManage/kanBanWithCode/index.vue
@@ -514,24 +514,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <!-- <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="客户零件号" />
-          </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -80px">
-            <el-form-item>
-              <el-input v-model="formCount.materialCode" />
-            </el-form-item>
-          </el-col>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="厂内零件号" />
-          </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -95px">
-            <el-form-item>
-              <el-input v-model="formCount.sapMaterialCode" />
-            </el-form-item>
-          </el-col>
-        </el-row> -->
+
       </el-form>
       <div slot="footer" class="dialog-footer">
         <!-- <el-button type="text" @click="dialogFormVisible = false"
diff --git a/vue/src/views/ux/billManage/sparePart90/index.vue b/vue/src/views/ux/billManage/sparePart90/index.vue
index 01851965..2943a63f 100644
--- a/vue/src/views/ux/billManage/sparePart90/index.vue
+++ b/vue/src/views/ux/billManage/sparePart90/index.vue
@@ -256,20 +256,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <!-- <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="采购订单号" />
-          </el-col>
-          <el-col :md="20" :xs="24" style="margin-left: -80px">
-            <el-form-item prop="purchaseOrderNo">
-              <el-input
-                type="textarea"
-                v-model="formCount.purchaseOrderNo"
-                style="width: 450px"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row> -->
+
         <el-row>
           <el-col :md="4" :xs="24">
             <el-form-item label="订单日期：" />
@@ -304,6 +291,21 @@
           </el-col>
         </el-row>
 
+        <el-row>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="采购订单号" />
+          </el-col>
+          <el-col :md="20" :xs="24" style="margin-left: -80px">
+            <el-form-item prop="purchaseOrderNo">
+              <el-input
+                type="textarea"
+                v-model="formCount.purchaseOrderNo"
+                style="width: 450px"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
         <el-row>
           <el-col :md="4" :xs="24">
             <el-form-item label="厂内零件号" />
@@ -1037,9 +1039,10 @@ export default {
         if (valid) {
           this.formLoading = true;
           this.listExportQuery.version = this.formCount.versionValue; //版本
-          // if (this.formCount.purchaseOrderNo != "") {
-          //   this.listExportQuery.purchaseOrderNo = this.formCount.purchaseOrderNo; //采购订单号
-          // }
+          if (this.formCount.purchaseOrderNo != "") {
+            this.listExportQuery.purchaseOrderNo =
+              this.formCount.purchaseOrderNo; //采购订单号
+          }
           if (this.formCount.sapCode != "") {
             this.listExportQuery.sapCode = this.formCount.sapCode; //厂内物料号
           }
diff --git a/vue/src/views/ux/vw/dataInput/hq_h_report/index.vue b/vue/src/views/ux/vw/dataInput/hq_h_report/index.vue
index ad9e1053..461a3055 100644
--- a/vue/src/views/ux/vw/dataInput/hq_h_report/index.vue
+++ b/vue/src/views/ux/vw/dataInput/hq_h_report/index.vue
@@ -237,13 +237,13 @@
           <el-col :md="4" :xs="24">
             <el-form-item label="选择版本" required />
           </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -80px">
+          <el-col :md="20" :xs="24" style="margin-left: -80px">
             <el-form-item prop="versionValue">
               <el-select
                 v-model="formCount.versionValue"
                 size="medium"
                 clearable
-                style="width: 188px; margin-right: 15px"
+                style="width: 200px; margin-right: 15px"
                 placeholder="请选择"
               >
                 <el-option
@@ -255,7 +255,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :md="4" :xs="24">
+          <!-- <el-col :md="4" :xs="24">
             <el-form-item label="发货状态" style="margin-left: 10px" />
           </el-col>
           <el-col :md="10" :xs="24" style="margin-left: -110px">
@@ -270,8 +270,41 @@
                 <el-option label="已发货" :value="2"></el-option>
               </el-select>
             </el-form-item>
-          </el-col>
+          </el-col> -->
         </el-row>
+        <!-- <el-row>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="交货日期" />
+          </el-col>
+          <el-col :md="10" :xs="24" style="margin-left: -80px">
+            <el-form-item prop="startTime">
+              <el-date-picker
+                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"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :md="10" :xs="24" style="margin-left: -40px">
+            <el-form-item prop="endTime">
+              <el-date-picker
+                v-model="formCount.endTime"
+                type="datetime"
+                :picker-options="pickerOptions1"
+                size="small"
+                @change="getdateVal"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                default-time="23:59:59"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row> -->
         <el-row>
           <el-col :md="4" :xs="24">
             <el-form-item label="物料组(车型)" />
@@ -304,7 +337,7 @@
           </el-col>
         </el-row>
 
-        <el-row>
+        <!-- <el-row>
           <el-col :md="4" :xs="24">
             <el-form-item label="收货仓库描述" />
           </el-col>
@@ -319,41 +352,7 @@
               />
             </el-form-item>
           </el-col>
-        </el-row>
-
-        <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="交货日期" />
-          </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -80px">
-            <el-form-item prop="startTime">
-              <el-date-picker
-                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"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -40px">
-            <el-form-item prop="endTime">
-              <el-date-picker
-                v-model="formCount.endTime"
-                type="datetime"
-                :picker-options="pickerOptions1"
-                size="small"
-                @change="getdateVal"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                default-time="23:59:59"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-        </el-row>
+        </el-row> -->
 
         <el-collapse v-model="activeNames">
           <el-collapse-item name="1">
@@ -396,7 +395,7 @@
             </el-row>
 
             <el-row>
-              <el-col :md="4" :xs="24">
+              <!-- <el-col :md="4" :xs="24">
                 <el-form-item label="结算验收单号" />
               </el-col>
               <el-col :md="10" :xs="24" style="margin-left: -80px">
@@ -409,15 +408,15 @@
                     placeholder="多个结算验收单号，请以回车换行形式添加！"
                   />
                 </el-form-item>
-              </el-col>
+              </el-col> -->
               <el-col :md="4" :xs="24">
                 <el-form-item label="SAP编号" />
               </el-col>
-              <el-col :md="10" :xs="24" style="margin-left: -95px">
+              <el-col :md="20" :xs="24" style="margin-left: -80px">
                 <el-form-item prop="sapCode">
                   <el-input
                     v-model="formCount.sapCode"
-                    style="width: 170px"
+                    style="width: 450px"
                     type="textarea"
                     :rows="4"
                     placeholder="多个厂内零件号，请以回车换行形式添加！"
@@ -1244,16 +1243,18 @@ export default {
           if (this.formCount.sapCode != "") {
             this.listExportQuery.sapCode = this.formCount.sapCode; //3厂内物料号
           }
-          if (this.formCount.warehouseDesc != "") {
-            this.listExportQuery.warehouseDesc = this.formCount.warehouseDesc; //4收货仓库描述
-          }
-          this.listExportQuery.begin = this.startTime
-            ? this.startTime
-            : undefined;
-          this.listExportQuery.end = this.endTime ? this.endTime : undefined;
-          if (this.formCount.acceptNo != "") {
-            this.listExportQuery.acceptNo = this.formCount.acceptNo; //5结算验收单号
-          }
+          // if (this.formCount.warehouseDesc != "") {
+          //   this.listExportQuery.warehouseDesc = this.formCount.warehouseDesc; //4收货仓库描述
+          // }
+
+          // this.listExportQuery.begin = this.startTime
+          //   ? this.startTime
+          //   : undefined;
+          // this.listExportQuery.end = this.endTime ? this.endTime : undefined;
+
+          // if (this.formCount.acceptNo != "") {
+          //   this.listExportQuery.acceptNo = this.formCount.acceptNo; //5结算验收单号
+          // }
           if (this.formCount.kanban != "") {
             this.listExportQuery.kanban = this.formCount.kanban; //6订货看板编号
           }
diff --git a/vue/src/views/ux/vw/dataInput/hq_h_sparepart/index.vue b/vue/src/views/ux/vw/dataInput/hq_h_sparepart/index.vue
index 20d39957..a799a888 100644
--- a/vue/src/views/ux/vw/dataInput/hq_h_sparepart/index.vue
+++ b/vue/src/views/ux/vw/dataInput/hq_h_sparepart/index.vue
@@ -237,13 +237,13 @@
           <el-col :md="4" :xs="24">
             <el-form-item label="选择版本" required />
           </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -80px">
+          <el-col :md="20" :xs="24" style="margin-left: -80px">
             <el-form-item prop="versionValue">
               <el-select
                 v-model="formCount.versionValue"
                 size="medium"
                 clearable
-                style="width: 188px; margin-right: 15px"
+                style="width: 200px; margin-right: 15px"
                 placeholder="请选择"
               >
                 <el-option
@@ -255,7 +255,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :md="4" :xs="24">
+          <!-- <el-col :md="4" :xs="24">
             <el-form-item label="发货状态" style="margin-left: 10px" />
           </el-col>
           <el-col :md="10" :xs="24" style="margin-left: -110px">
@@ -270,7 +270,7 @@
                 <el-option label="已发货" :value="2"></el-option>
               </el-select>
             </el-form-item>
-          </el-col>
+          </el-col> -->
         </el-row>
         <el-row>
           <el-col :md="4" :xs="24">
@@ -304,7 +304,7 @@
           </el-col>
         </el-row>
 
-        <el-row>
+        <!-- <el-row>
           <el-col :md="4" :xs="24">
             <el-form-item label="收货仓库描述" />
           </el-col>
@@ -319,9 +319,9 @@
               />
             </el-form-item>
           </el-col>
-        </el-row>
+        </el-row> -->
 
-        <el-row>
+        <!-- <el-row>
           <el-col :md="4" :xs="24">
             <el-form-item label="交货日期" />
           </el-col>
@@ -353,7 +353,7 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-        </el-row>
+        </el-row> -->
 
         <el-collapse v-model="activeNames">
           <el-collapse-item name="1">
@@ -396,7 +396,7 @@
             </el-row>
 
             <el-row>
-              <el-col :md="4" :xs="24">
+              <!-- <el-col :md="4" :xs="24">
                 <el-form-item label="结算验收单号" />
               </el-col>
               <el-col :md="10" :xs="24" style="margin-left: -80px">
@@ -409,15 +409,15 @@
                     placeholder="多个结算验收单号，请以回车换行形式添加！"
                   />
                 </el-form-item>
-              </el-col>
+              </el-col> -->
               <el-col :md="4" :xs="24">
                 <el-form-item label="SAP编号" />
               </el-col>
-              <el-col :md="10" :xs="24" style="margin-left: -95px">
+              <el-col :md="10" :xs="24" style="margin-left: -80px">
                 <el-form-item prop="sapCode">
                   <el-input
                     v-model="formCount.sapCode"
-                    style="width: 170px"
+                    style="width: 450px"
                     type="textarea"
                     :rows="4"
                     placeholder="多个厂内零件号，请以回车换行形式添加！"
@@ -1199,16 +1199,20 @@ export default {
           if (this.formCount.sapCode != "") {
             this.listExportQuery.sapCode = this.formCount.sapCode; //3厂内物料号
           }
-          if (this.formCount.warehouseDesc != "") {
-            this.listExportQuery.warehouseDesc = this.formCount.warehouseDesc; //4收货仓库描述
-          }
-          this.listExportQuery.begin = this.startTime
-            ? this.startTime
-            : undefined;
-          this.listExportQuery.end = this.endTime ? this.endTime : undefined;
-          if (this.formCount.acceptNo != "") {
-            this.listExportQuery.acceptNo = this.formCount.acceptNo; //5结算验收单号
-          }
+          // if (this.formCount.warehouseDesc != "") {
+          //   this.listExportQuery.warehouseDesc = this.formCount.warehouseDesc; //4收货仓库描述
+          // }
+
+          // this.listExportQuery.begin = this.startTime
+          //   ? this.startTime
+          //   : undefined;
+          // this.listExportQuery.end = this.endTime ? this.endTime : undefined;
+
+
+          // if (this.formCount.acceptNo != "") {
+          //   this.listExportQuery.acceptNo = this.formCount.acceptNo; //5结算验收单号
+          // }
+
           if (this.formCount.kanban != "") {
             this.listExportQuery.kanban = this.formCount.kanban; //6订货看板编号
           }
@@ -1217,7 +1221,7 @@ export default {
           }
 
           console.log(
-            "H平台备件明细-导出条件：" + JSON.stringify(this.listExportQuery)
+            "红旗备件明细-导出条件：" + JSON.stringify(this.listExportQuery)
           );
           this.$axios
             .posts(
diff --git a/vue/src/views/ux/vw/dataInput/hq_y_report/index.vue b/vue/src/views/ux/vw/dataInput/hq_y_report/index.vue
index 646d156f..2f168ef3 100644
--- a/vue/src/views/ux/vw/dataInput/hq_y_report/index.vue
+++ b/vue/src/views/ux/vw/dataInput/hq_y_report/index.vue
@@ -1140,19 +1140,7 @@ export default {
           if (this.formCount.sapCode != "") {
             this.listExportQuery.sapCode = this.formCount.sapCode; //3厂内物料号
           }
-          if (this.formCount.warehouseDesc != "") {
-            this.listExportQuery.warehouseDesc = this.formCount.warehouseDesc; //4收货仓库描述
-          }
-          this.listExportQuery.begin = this.startTime
-            ? this.startTime
-            : undefined;
-          this.listExportQuery.end = this.endTime ? this.endTime : undefined;
-          if (this.formCount.acceptNo != "") {
-            this.listExportQuery.acceptNo = this.formCount.acceptNo; //5结算验收单号
-          }
-          if (this.formCount.kanban != "") {
-            this.listExportQuery.kanban = this.formCount.kanban; //6订货看板编号
-          }
+
           if (this.formCount.materialGroupValue != "") {
             this.listExportQuery.materialGroup = this.getmaterialGroupValue; //7物料组车型
           }