From fad1e3ee704cb66e6f84986fcf96907d89f3fdc5 Mon Sep 17 00:00:00 2001
From: 44673626 <44673626@qq.com>
Date: Sat, 8 Jan 2022 18:32:23 +0800
Subject: [PATCH] =?UTF-8?q?H=E5=B9=B3=E5=8F=B0=20=E5=87=BA=E5=BA=93?=
 =?UTF-8?q?=E4=B8=80=E5=A5=97=E4=BB=A3=E7=A0=81?=
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             |   12 +-
 vue/src/router/modules/hq_out_order.js        |   64 +
 vue/src/views/ux/vw/dataInput/hq_f/index.vue  |    3 +-
 vue/src/views/ux/vw/dataInput/hq_h/index.vue  |    3 +-
 .../ux/vw/dataInput/hq_h_outorder/detail.vue  |  621 ++++++++
 .../ux/vw/dataInput/hq_h_outorder/index.vue   |  340 +++++
 .../ux/vw/dataInput/hq_h_report/index.vue     |  198 +--
 .../ux/vw/dataInput/hq_h_sparepart/index.vue  | 1316 +++++++++++++++++
 vue/src/views/ux/vw/dataInput/hq_m/index.vue  |    3 +-
 vue/src/views/ux/vw/dataInput/hq_y/index.vue  |    5 +-
 vue/static/tableFieldForSearch.json           |  133 +-
 13 files changed, 2540 insertions(+), 162 deletions(-)
 create mode 100644 vue/src/router/modules/hq_out_order.js
 create mode 100644 vue/src/views/ux/vw/dataInput/hq_h_outorder/detail.vue
 create mode 100644 vue/src/views/ux/vw/dataInput/hq_h_outorder/index.vue
 create mode 100644 vue/src/views/ux/vw/dataInput/hq_h_sparepart/index.vue

diff --git a/vue/src/components/ImportExcel-base/index.vue b/vue/src/components/ImportExcel-base/index.vue
index 8538df45..9a305b0f 100644
--- a/vue/src/components/ImportExcel-base/index.vue
+++ b/vue/src/components/ImportExcel-base/index.vue
@@ -308,6 +308,7 @@ export default {
           vwoutorder: "准时化出库单",
           sparepartoutorder: "大众备件出库单",
           kanbanoutorder: "大众看板出库单",
+          HQ_H_OUTORDER:"红旗H平台出库单",
           bomdatabase: "产品结构BOM",
           prebatch: "预批量",
           secondaryPriceRatio: "二配结算价格比例",
@@ -339,6 +340,7 @@ export default {
           hqYPlatform: "/api/settleaccount/BT_Carlatform/ExcelImport", //一汽轿车平台导入
           vwoutorder: "/api/settleaccount/wmsjitoutput/ExcelImport", //准时化出库单导入
           kanbanoutorder: "/api/settleaccount/wmskanbanoutput/ExcelImport", //大众看板出库单导入
+          HQ_H_OUTORDER: "/api/settleaccount/WmsHQHKanbanoutput/ExcelImport", //红旗H平台出库单导入
           sparepartoutorder:
             "/api/settleaccount/wmsSharePartoutput/ExcelImport", //大众备件出库单导入
           bomdatabase: "/api/settleaccount/bom/ExcelImport",
diff --git a/vue/src/router/index.js b/vue/src/router/index.js
index a1bc2d5a..311c25df 100644
--- a/vue/src/router/index.js
+++ b/vue/src/router/index.js
@@ -20,6 +20,7 @@ import vwMenudataRouter from './modules/vw_menu'
 import hqMenudataRouter from './modules/hq_menu'
 import btcarDataRouter from './modules/bt_menu'
 import vwOutOrderDataRouter from './modules/vw_out_order'
+import hqOutOrderDataRouter from './modules/hq_out_order'
 //import newjitRouter from './modules/newjit-basedata'
 import pgfis from './modules/fis'
 import pgfisPrint from './modules/fisprint'
@@ -178,6 +179,7 @@ export const asyncRoutes = [
   vwMenudataRouter,//大众
   hqMenudataRouter,//红旗
   vwOutOrderDataRouter,
+  hqOutOrderDataRouter,
   //btcarDataRouter,//一汽轿车
   //vwFisDataRouter,//结算与开票数据导入
   //billdataRouter,//销售结算与开票报表
diff --git a/vue/src/router/modules/hq_menu.js b/vue/src/router/modules/hq_menu.js
index a9e76a13..8575e230 100644
--- a/vue/src/router/modules/hq_menu.js
+++ b/vue/src/router/modules/hq_menu.js
@@ -39,7 +39,17 @@ const hqMenudataRouter = {
                     component: () => import('@/views/ux/vw/dataInput/hq_h_report'),
                     name: 'HQH',
                     meta: {
-                        title: 'H平台结算差异输出',
+                        title: 'H平台核对明细',
+                        //roles: ['SettleAccount.FISs'],
+                        icon: '文件'
+                    }
+                },
+                {
+                    path: 'hq-H-sparepart-export',
+                    component: () => import('@/views/ux/vw/dataInput/hq_h_sparepart'),
+                    name: 'HQH',
+                    meta: {
+                        title: 'H平台备件明细',
                         //roles: ['SettleAccount.FISs'],
                         icon: '文件'
                     }
diff --git a/vue/src/router/modules/hq_out_order.js b/vue/src/router/modules/hq_out_order.js
new file mode 100644
index 00000000..f2700825
--- /dev/null
+++ b/vue/src/router/modules/hq_out_order.js
@@ -0,0 +1,64 @@
+//大众-FIS结算-路由
+import Layout from '@/layout'
+
+const hqOutOrderDataRouter = {
+  path: '/cpat-order',
+  component: Layout,
+  redirect: 'pg',
+  name: '业务数据',
+  //hidden: true,
+  meta: {
+    //requiresAuth: true,
+    title: '红旗出库单管理',
+    index: 0,
+    type: 'crm',
+    icon: '单据导入',
+    keepAlive: false,
+  },
+  children: [
+    {
+      path: 'hq-h-outorder',
+      component: () => import('@/views/ux/vw/dataInput/hq_h_outorder'),
+      name: 'SettleAccount',//命名路由
+      meta: {
+        title: '红旗H平台出库单',
+        roles: ['SettleAccount.SettleAccounts'],//控制页面角色（可以设置多个角色）
+        icon: '结算'
+      }
+    },
+    // {
+    //   path: 'hq-m-outorder',
+    //   component: () => import('@/views/ux/billManage/kanbanOutOrder/index'),
+    //   name: 'SettleAccount',//命名路由
+    //   meta: {
+    //     title: '大众看板出库单',
+    //     roles: ['SettleAccount.SettleAccounts'],//控制页面角色（可以设置多个角色）
+    //     icon: '结算'
+    //   }
+    // },
+    // {
+    //   path: 'hq-f-withoutorder',
+    //   component: () => import('@/views/ux/billManage/kanbanWithOutOrder/index'),
+    //   name: 'SettleAccount',//命名路由
+    //   meta: {
+    //     title: '大众无条码看板出库单',
+    //     roles: ['SettleAccount.SettleAccounts'],//控制页面角色（可以设置多个角色）
+    //     icon: '结算'
+    //   }
+    // },
+    // {
+    //   path: 'hq-car-outorder',
+    //   component: () => import('@/views/ux/billManage/sparepartOutOrder/index'),
+    //   name: 'Invoices',//命名路由
+    //   meta: {
+    //     title: '大众备件出库单',
+    //     roles: ['SettleAccount.Invoices'],
+    //     icon: '对比'
+    //   }
+    // },
+
+  ]
+}
+
+export default hqOutOrderDataRouter
+
diff --git a/vue/src/views/ux/vw/dataInput/hq_f/index.vue b/vue/src/views/ux/vw/dataInput/hq_f/index.vue
index ff358a34..1247756e 100644
--- a/vue/src/views/ux/vw/dataInput/hq_f/index.vue
+++ b/vue/src/views/ux/vw/dataInput/hq_f/index.vue
@@ -291,7 +291,8 @@ export default {
         prop: "acceptanceDate",
         width: 170,
       });
-      tempsTabs.push({ label: "数量", prop: "price", width: 100 });
+      tempsTabs.push({ label: "数量", prop: "qty", width: 100 });
+      tempsTabs.push({ label: "单价", prop: "price", width: 100 });
       tempsTabs.push({ label: "金额", prop: "amt", width: 100 });
       tempsTabs.push({ label: "供应商", prop: "supplier", width: 120 });
       tempsTabs.push({
diff --git a/vue/src/views/ux/vw/dataInput/hq_h/index.vue b/vue/src/views/ux/vw/dataInput/hq_h/index.vue
index 5c981f11..66cbe312 100644
--- a/vue/src/views/ux/vw/dataInput/hq_h/index.vue
+++ b/vue/src/views/ux/vw/dataInput/hq_h/index.vue
@@ -291,7 +291,8 @@ export default {
         prop: "acceptanceDate",
         width: 170,
       });
-      tempsTabs.push({ label: "数量", prop: "price", width: 100 });
+      tempsTabs.push({ label: "数量", prop: "qty", width: 100 });
+      tempsTabs.push({ label: "单价", prop: "price", width: 100 });
       tempsTabs.push({ label: "金额", prop: "amt", width: 100 });
       tempsTabs.push({ label: "供应商", prop: "supplier", width: 120 });
       tempsTabs.push({
diff --git a/vue/src/views/ux/vw/dataInput/hq_h_outorder/detail.vue b/vue/src/views/ux/vw/dataInput/hq_h_outorder/detail.vue
new file mode 100644
index 00000000..b0a4b4c2
--- /dev/null
+++ b/vue/src/views/ux/vw/dataInput/hq_h_outorder/detail.vue
@@ -0,0 +1,621 @@
+<!--红旗H平台出库单-明细数据-->
+<template>
+  <div class="cr-body-content">
+    <flexbox class="content-header">
+      <!-- <el-button
+        class="filter-item"
+        size="mini"
+        type="info"
+        icon="el-icon-download"
+        @click="handleDownload()"
+        >导出全部
+      </el-button> -->
+      <JobSelectVerson
+        :options="JobVersionList"
+        style="width: 150px; margin-left: -10px"
+        class="search-container"
+        @value-change="JobVersionValue"
+      ></JobSelectVerson>
+      <el-button
+        class="filter-item"
+        type="success"
+        icon="el-icon-check"
+        size="mini"
+        @click="handleCreateBills()"
+        >确认出库单(支持批量)</el-button
+      >
+      <el-button
+        class="filter-item"
+        size="mini"
+        type="warning"
+        icon="el-icon-download"
+        @click="handleCancelBills()"
+        >取消出库(支持批量)
+      </el-button>
+      <el-input
+        v-model="searchContent"
+        clearable
+        size="small"
+        placeholder="按照零件号搜索..."
+        style="width: 230px"
+        class="search-container"
+        @keyup.enter.native="handleFilter"
+      />
+      <el-button
+        size="mini"
+        type="success"
+        icon="el-icon-search"
+        @click="handleFilter"
+        >搜索
+      </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="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
+        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"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
+import permission from "@/directive/permission/index.js";
+import CRMTableHead from "../../../components/CRMTableHead";
+import { downloadFile } from "@/utils/crmindex.js";
+import JobSelectVerson from "@/components/CreateCom/Job-Select.vue";
+
+export default {
+  name: "sendUnsettledDiffReport",
+  components: { Pagination, CRMTableHead, CRMTableHead, JobSelectVerson },
+  directives: { permission },
+  props: {
+    customerInfos: {
+      type: Array,
+      default: () => {
+        return [];
+      },
+    },
+  },
+  data() {
+    return {
+      crmType: "hq-h-OutOrder",
+      rules: {
+        //前端定义的规则，后端也有验证
+        erpMaterialCode: [
+          { required: true, message: "必须输入！", trigger: "blur" },
+        ],
+      },
+      searchContent: "", // 输入内容
+      customerInfo: {
+        parentId: "",
+        version: "",
+      },
+      form: {
+        dicDetailID: "",
+        customerId: "",
+        projectId: "",
+      },
+      list: null,
+      totalCount: 0,
+      listLoading: true,
+      formLoading: false,
+      JobVersionList: [
+        { value: "0", label: "未处理" },
+        { value: "1", label: "申请出库" },
+        { value: "2", label: "确认出库" },
+        { value: "3", label: "不能出库" },
+        { value: "4", label: "取消出库" },
+      ],
+      // 高级搜索
+      filterObj: {
+        type: Object,
+        default: () => {
+          return {};
+        },
+      },
+      listQuery: {
+        Filters: [
+          {
+            logic: 0,
+            column: "Enabled",
+            action: 0,
+            value: "true",
+          }, //默认查询可用的
+        ],
+        SkipCount: 0,
+        MaxResultCount: 15,
+        billNum: "",
+      },
+      listOutPutQuery: {
+        version: "",
+        guids: "",
+        billNum: "",
+      },
+      page: 1,
+      JobversionValue: "",
+      JobversionValueVerson: "",
+      dialogFormVisible: false,
+      multipleSelection: [],
+      formTitle: "",
+      drawer: false,
+      showExcelImport: false,
+      tableHeight: document.documentElement.clientHeight - 230,
+      isEdit: false,
+    };
+  },
+  mounted() {
+    var self = this;
+    window.onresize = function () {
+      var offsetHei = document.documentElement.clientHeight;
+      self.tableHeight = offsetHei - 190;
+    };
+  },
+  created() {
+    this.getList();
+  },
+  watch: {
+    customerInfos: {
+      handler(newVal) {
+        if (newVal == "" || newVal == "undefined") {
+          //TODO
+        } else {
+          newVal.forEach((element) => {
+            this.customerInfo.parentId = element.ParentId;
+            this.customerInfo.version = element.Version;
+          });
+          if (this.customerInfo.parentId != "") {
+            this.getList();
+          }
+        }
+      },
+      immediate: true,
+    },
+  },
+  computed: {
+    /** 列表字段 */
+    getDefaultField() {
+      var tempsTabs = [];
+
+      tempsTabs.push({
+        label: "版本",
+        prop: "version",
+        width: 110,
+      });
+      tempsTabs.push({
+        label: "订货看板编号",
+        prop: "kanban",
+        width: 150,
+      });
+      tempsTabs.push({ label: "交货单号", prop: "wmsBillNum", width: 110 });
+      tempsTabs.push({ label: "Sap编码", prop: "materialCode", width: 150 });
+      tempsTabs.push({
+        label: "物料组(车型)",
+        prop: "materialGroup",
+        width: 220,
+      });
+      tempsTabs.push({ label: "发货零件号", prop: "extend1", width: 220 });
+      tempsTabs.push({ label: "收货仓库", prop: "extend2", width: 120 });
+      tempsTabs.push({ label: "结算数量", prop: "qty", width: 100 });
+
+      return tempsTabs;
+    },
+  },
+  methods: {
+    //版本下拉列表选择项
+    JobVersionValue(params) {
+      //版本下拉选择
+      this.listQuery.Filters = [];
+      var column = "state";
+      let filter = {
+        logic: 0,
+        column: column,
+        action: 0,
+        value: params.value,
+      };
+      this.listQuery.Filters.push(filter);
+      this.getList();
+    },
+    //取消出库单
+    handleCancelBills(row) {
+      if (this.multipleSelection.length == 0) {
+        this.$message({
+          message: "至少选择一行！",
+          type: "warning",
+        });
+        return;
+      }
+      var params = [];
+      let myalert = ""; //声明变量，其变量必须在此声明后使用
+      if (row) {
+        //单行
+        params.push(row.id);
+        myalert = row.name;
+      } else {
+        //多选
+        this.multipleSelection.forEach((element) => {
+          let id = element.id;
+          params.push(id);
+        });
+        myalert = "选中项";
+      }
+      this.listOutPutQuery.version = this.customerInfo.version;
+      this.listOutPutQuery.guids = params;
+      this.listOutPutQuery.billNum = this.customerInfo.parentId;
+      console.log("取消出库条件：" + JSON.stringify(this.listOutPutQuery));
+
+      this.$confirm("是否确认取消出库" + myalert + "?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.$axios
+            .posts(
+              "/api/settleaccount/WmsHQHKanbanoutput/WmsHQHKanbanOutPut-Cancel",
+              this.listOutPutQuery
+            )
+            .then((response) => {
+              const index = this.list.indexOf(row);
+              this.$notify({
+                title: "成功",
+                message: "操作成功",
+                type: "success",
+                duration: 2000,
+              });
+              this.getList();
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消操作",
+          });
+        });
+    },
+    //出库单
+    handleCreateBills(row) {
+      if (this.multipleSelection.length == 0) {
+        this.listLoading = true;
+        this.listOutPutQuery.guids = [];
+        this.listOutPutQuery.version = this.customerInfo.version;
+        this.listOutPutQuery.billNum = this.customerInfo.parentId;
+        console.log(
+          "未选择时全部确认出库条件：" + JSON.stringify(this.listOutPutQuery)
+        );
+        this.$confirm("是否全部确认出库?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            this.$axios
+              .posts(
+                "/api/settleaccount/WmsHQHKanbanoutput/WmsHQHKanbanOutPut-Pass",
+                this.listOutPutQuery
+              )
+              .then((response) => {
+                const index = this.list.indexOf(row);
+                this.$notify({
+                  title: "成功",
+                  message: "生成成功",
+                  type: "success",
+                  duration: 2000,
+                });
+                this.getList();
+                this.listLoading = false;
+              });
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "已取消操作",
+            });
+            this.listLoading = false;
+          });
+      } else {
+        this.listLoading = true;
+        var params = [];
+        let myalert = ""; //声明变量，其变量必须在此声明后使用
+        if (row) {
+          //单行
+          params.push(row.id);
+          myalert = row.name;
+        } else {
+          //多选
+          this.multipleSelection.forEach((element) => {
+            let id = element.id;
+            params.push(id);
+          });
+          myalert = "选中项";
+        }
+        this.listOutPutQuery.version = this.customerInfo.version;
+        this.listOutPutQuery.guids = params;
+        this.listOutPutQuery.billNum = this.customerInfo.parentId;
+        console.log(
+          "部分选择时确认出库条件：" + JSON.stringify(this.listOutPutQuery)
+        );
+        this.$confirm("是否确认将选中的出库" + myalert + "?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            this.$axios
+              .posts(
+                "/api/settleaccount/WmsHQHKanbanoutput/WmsHQHKanbanOutPut-Pass",
+                this.listOutPutQuery
+              )
+              .then((response) => {
+                const index = this.list.indexOf(row);
+                this.$notify({
+                  title: "成功",
+                  message: "生成成功",
+                  type: "success",
+                  duration: 2000,
+                });
+                this.getList();
+                this.listLoading = false;
+              });
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "已取消操作",
+            });
+            this.listLoading = false;
+          });
+      }
+    },
+    /** 刷新列表 */
+    handleHandle(data) {
+      if (data.type !== "edit") {
+        this.getList();
+      }
+    },
+    /** 格式化字段 */
+    fieldFormatter(row, column) {
+      if (column.property == "state") {
+        return {
+          0: "未处理",
+          1: "申请出库",
+          2: "确认出库",
+          3: "不能出库",
+          4: "取消出库",
+        }[row[column.property]];
+      }
+      return row[column.property] || "--";
+    },
+    importExcelData() {
+      //关闭导入窗体时调用
+      this.showExcelImport = false;
+      this.getList();
+    },
+    async handleDownload() {
+      //await this.getDownBoms();
+      this.listLoading = true;
+      this.$axios
+        .gets(
+          "/api/settleaccount/bt-kb-not-consign/export/" +
+            this.customerInfo.parentId
+        )
+        .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;
+            });
+        });
+    },
+    getList(data) {
+      this.listLoading = true;
+      if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
+      this.listQuery.billNum = this.customerInfo.parentId;
+      console.log("查询条件：" + JSON.stringify(this.listQuery));
+      this.$axios
+        .posts(
+          "/api/settleaccount/WmsHQHKanbanoutput/WmsHQHKanbanDetailList",
+          this.listQuery
+        )
+        .then((response) => {
+          this.list = response.items;
+          //alert(JSON.stringify(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 = "materialCode";
+        let filter = {
+          logic: 0,
+          column: column,
+          action: 6,
+          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;
+      this.handleFilter();
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    /** 通过回调控制style */
+    cellStyle({ row, column, rowIndex, columnIndex }) {
+      if (
+        column.property === "fisQty" ||
+        column.property === "diffQty" ||
+        column.property === "stockQty"
+      ) {
+        return { textAlign: "right" };
+      } else {
+        return { textAlign: "left" };
+      }
+    },
+    /** 通过回调控制表头style */
+    headerRowStyle({ row, column, rowIndex, columnIndex }) {
+      if (
+        column.property === "fisQty" ||
+        column.property === "diffQty" ||
+        column.property === "stockQty"
+      ) {
+        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>
+
diff --git a/vue/src/views/ux/vw/dataInput/hq_h_outorder/index.vue b/vue/src/views/ux/vw/dataInput/hq_h_outorder/index.vue
new file mode 100644
index 00000000..b37bd9e8
--- /dev/null
+++ b/vue/src/views/ux/vw/dataInput/hq_h_outorder/index.vue
@@ -0,0 +1,340 @@
+<!--红旗H平台出库单-->
+<template>
+  <div class="cr-body-content">
+    <flexbox class="content-header">
+      <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="handleImportExcel()"
+        >导入文件（Excel）
+      </el-button>
+    </flexbox>
+    <!--表格渲染-->
+    <el-table
+      ref="multipleTable"
+      v-loading="listLoading"
+      element-loading-text="拼命加载中..."
+      element-loading-spinner="el-icon-loading"
+      class="cr-table"
+      :data="list"
+      :height="tableHeight"
+      :cell-style="cellStyle"
+      size="small"
+      stripe
+      border
+      highlight-current-row
+      style="width: 100%"
+      @sort-change="sortChange"
+      @selection-change="handleSelectionChange"
+      @row-click="handleRowClick"
+    >
+      <el-table-column
+        label="单据号"
+        prop="billNum"
+        sortable="custom"
+        align="center"
+        width="250px"
+      >
+        <template slot-scope="scope">
+          <el-tooltip :content="scope.row.billNum" placement="bottom-end">
+            <span class="link-type" @click="handleDrawerOpen(scope.row)">{{
+              scope.row.billNum
+            }}</span>
+          </el-tooltip>
+        </template>
+      </el-table-column>
+      <!-- <el-table-column type="selection" width="44px"></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"
+      />
+      <!-- 抽屉控件 -->
+      <el-drawer
+        title="信息详细页"
+        size="75%"
+        direction="rtl"
+        :visible.sync="drawer"
+        :before-close="handleDrawerClose"
+      >
+        <div>
+          <Detail
+            v-bind:customerInfos="customerInfos"
+            style="margin-top: -35px"
+          ></Detail>
+        </div>
+      </el-drawer>
+    </div>
+  </div>
+</template>
+
+<script>
+import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
+import permission from "@/directive/permission/index.js";
+import Detail from "./detail";
+import moment from "moment";
+import importExcel from "@/components/ImportExcel-base";
+import { formatTimeToTimestamp } from "@/utils/index";
+
+export default {
+  name: "HQH_OUTORDER",
+  components: { Pagination, Detail,importExcel },
+  directives: { permission },
+  data() {
+    return {
+      crmType: "HQ_H_OUTORDER",
+      rules: {
+        // version: [{ required: true, message: "必须输入！", trigger: "change" }],
+        // beginTime: [{ required: true, message: "选择日期！", trigger: "change" }],
+        // endTime: [{ required: true, message: "选择日期！", trigger: "change" }],
+      },
+      customerInfos: [],
+      searchContent: "", // 输入内容
+      drawer: false,
+      form: {
+        version: "",
+        customerCode: "",
+        customerName: "",
+        beginTime: "",
+        endTime: "",
+      },
+      versionValue: "",
+      versionList: [],
+      startTimeVale: "",
+      endTimeVale: "",
+      list: null,
+      totalCount: 0,
+      listLoading: true,
+      formLoading: false,
+      // 高级搜索
+      filterObj: {
+        type: Object,
+        default: () => {
+          return {};
+        },
+      },
+      listQuery: {
+        Filters: [
+          {
+            logic: 0,
+            column: "Enabled",
+            action: 0,
+            value: "true",
+          }, //默认查询可用的
+        ],
+        //OrgID:"",
+        SkipCount: 0,
+        MaxResultCount: 15,
+      },
+      page: 1,
+      dialogFormVisible: false,
+      multipleSelection: [],
+      formTitle: "",
+      drawer: false,
+      showExcelImport: false,
+      tableHeight: document.documentElement.clientHeight - 200,
+      isEdit: false,
+    };
+  },
+  mounted() {
+    var self = this;
+    window.onresize = function () {
+      var offsetHei = document.documentElement.clientHeight;
+      self.tableHeight = offsetHei - 200;
+    };
+  },
+  created() {
+    this.getList();
+    //this.getVersionInfo();
+  },
+  computed: {
+    /** 列表字段 */
+    getDefaultField() {
+      var tempsTabs = [];
+      tempsTabs.push({
+        label: "版本",
+        prop: "version",
+        width: 120,
+      });
+      //tempsTabs.push({ label: "单据号", prop: "billNum", width: 150 });
+      tempsTabs.push({ label: "创建人", prop: "creator", width: 160 });
+      tempsTabs.push({ label: "创建时间", prop: "creationTime", width: 160 });
+      tempsTabs.push({ label: "备注", prop: "remark", width: 120 });
+      return tempsTabs;
+    },
+  },
+  methods: {
+    handleImportExcel() {
+      //导入
+      this.showExcelImport = true;
+      this.$refs.importexcel.handleImportExcelClick();
+    },
+    getVersionInfo() {
+      //取版本列表信息
+      this.listLoading = true;
+      this.listQuery.SkipCount = (this.page - 1) * 1000;
+      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;
+        });
+    },
+    //抽屉
+    handleDrawerOpen(param) {
+      this.drawer = true;
+      var parentId = param.billNum; //单据号
+      var version = param.version; //版本
+      this.customerInfos = [
+        {
+          ParentId: parentId,
+          Version: version,
+        },
+      ];
+    },
+    handleDrawerClose(done) {
+      done();
+    },
+    /** 格式化字段 */
+    fieldFormatter(row, column) {
+      if (column.property == "creationTime") {
+        var date = row[column.property];
+        if (date == undefined) {
+          return "";
+        }
+        return moment(date).format("YYYY-MM-DD HH:mm:ss");
+      }
+      if (column.property == "state") {
+        return { 0: "已提交", 1: "已出库", 2: "不能出库" }[
+          row[column.property]
+        ];
+      }
+      return row[column.property] || "--";
+    },
+    importExcelData() {
+      //关闭导入窗体时调用
+      this.showExcelImport = false;
+      this.getList();
+    },
+    getList(data) {
+      this.listLoading = true;
+      if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
+      this.$axios
+        .posts("/api/settleaccount/WmsHQHKanbanoutput/WmsHQHKanbanList", this.listQuery)
+        .then((response) => {
+          this.list = response.items;
+          //alert(JSON.stringify(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 = "version";
+        let filter = {
+          logic: 0,
+          column: column,
+          action: 0,
+          value: this.searchContent,
+        };
+        this.listQuery.Filters.push(filter);
+      }
+      this.getList();
+    },
+    resetQuery() {},
+    sortChange(data) {
+      const { prop, order } = data;
+      if (!prop || !order) {
+        this.handleFilter();
+        return;
+      }
+      this.listQuery.Sorting = prop + " " + order;
+      this.handleFilter();
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    /** 通过回调控制style */
+    cellStyle({ row, column, rowIndex, columnIndex }) {
+      return { textAlign: "left" };
+    },
+    handleRowClick(row, column, event) {
+      this.$refs.multipleTable.clearSelection();
+      this.$refs.multipleTable.toggleRowSelection(row);
+    },
+  },
+};
+</script>
+
+
+<style lang="scss" scoped>
+@import "../../../styles/crmtable.scss";
+</style>
+
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 6e1f5941..53ea0196 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
@@ -269,37 +269,24 @@
             </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="materialGroupValue">
-              <el-select
-                v-model="formCount.materialGroupValue"
-                size="medium"
-                multiple
-                filterable
-                clearable
-                style="width: 450px; 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 prop="warehouseDesc">
+              <el-input
+                v-model="formCount.warehouseDesc"
+                style="width: 450px"
+                type="textarea"
+                :rows="4"
+                placeholder="多个收货仓库描述，请以回车换行形式添加！"
+              />
             </el-form-item>
           </el-col>
         </el-row>
+
         <el-row>
           <el-col :md="4" :xs="24">
             <el-form-item label="交货日期" />
@@ -348,10 +335,10 @@
                 <el-form-item label="订货看板编号" />
               </el-col>
               <el-col :md="10" :xs="24" style="margin-left: -80px">
-                <el-form-item prop="kennCode">
+                <el-form-item prop="kanban">
                   <el-input
                     type="textarea"
-                    v-model="formCount.kennCode"
+                    v-model="formCount.kanban"
                     style="width: 170px"
                     :rows="4"
                     placeholder="多个订货看板编号，请以回车换行形式添加！"
@@ -362,9 +349,9 @@
                 <el-form-item label="发货零件号" />
               </el-col>
               <el-col :md="10" :xs="24" style="margin-left: -95px">
-                <el-form-item prop="chassisNumber">
+                <el-form-item prop="materialCode">
                   <el-input
-                    v-model="formCount.chassisNumber"
+                    v-model="formCount.materialCode"
                     style="width: 170px"
                     type="textarea"
                     :rows="4"
@@ -379,9 +366,9 @@
                 <el-form-item label="结算验收单号" />
               </el-col>
               <el-col :md="10" :xs="24" style="margin-left: -80px">
-                <el-form-item prop="materialCode">
+                <el-form-item prop="acceptNo">
                   <el-input
-                    v-model="formCount.materialCode"
+                    v-model="formCount.acceptNo"
                     style="width: 170px"
                     type="textarea"
                     :rows="4"
@@ -390,7 +377,7 @@
                 </el-form-item>
               </el-col>
               <el-col :md="4" :xs="24">
-                <el-form-item label="结算零件号" />
+                <el-form-item label="SAP编号" />
               </el-col>
               <el-col :md="10" :xs="24" style="margin-left: -95px">
                 <el-form-item prop="sapCode">
@@ -399,23 +386,6 @@
                     style="width: 170px"
                     type="textarea"
                     :rows="4"
-                    placeholder="多个结算零件号，请以回车换行形式添加！"
-                  />
-                </el-form-item>
-              </el-col>
-            </el-row>
-
-            <el-row>
-              <el-col :md="4" :xs="24">
-                <el-form-item label="SAP编号" />
-              </el-col>
-              <el-col :md="10" :xs="24" style="margin-left: -80px">
-                <el-form-item prop="sapCode">
-                  <el-input
-                    v-model="formCount.sapCode"
-                    style="width: 450px"
-                    type="textarea"
-                    :rows="4"
                     placeholder="多个厂内零件号，请以回车换行形式添加！"
                   />
                 </el-form-item>
@@ -434,36 +404,6 @@
         >
       </div>
     </el-dialog>
-
-    <el-dialog
-      title="批量录入KEEN号"
-      :visible.sync="showModal"
-      width="400px"
-      height="500px"
-      append-to-body
-    >
-      <flexbox class="content">
-        <div>
-          <el-input
-            type="textarea"
-            v-model="paster"
-            @paste.native="pasteMe"
-            :rows="6"
-          />
-          <el-table :data="tableData" max-height="400">
-            <el-table-column
-              prop="name"
-              label="说明：只支持从Excel上粘贴复制，不支持手输！"
-              width="300"
-            >
-            </el-table-column>
-          </el-table>
-        </div>
-      </flexbox>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submiteBillNo">确定录入</el-button>
-      </div>
-    </el-dialog>
   </div>
 </template>
 
@@ -483,7 +423,7 @@ export default {
 
   data() {
     return {
-      crmType: "backJob",
+      crmType: "hq-h-backJob",
       activeNames: ["1"],
       tableData: [
         {
@@ -575,15 +515,26 @@ export default {
       searchContent: "", // 输入内容
       form: {},
       formCount: {
+        version: undefined,
         startTime: "",
         endTime: "",
-        // name: "未结算对比",
-        // settledate: "",
-        // materialCode: "",
-        // sapMaterialCode: "",
-        // chassisNumber: "",
-        // kennCode: "",
-        // version: "",
+        materialCode: undefined,
+        materialGroup: undefined,
+        sapCode: undefined,
+        warehouseDesc: undefined,
+        acceptNo: undefined,
+        kanban: undefined,
+      },
+      listExportQuery: {
+        version: "",
+        materialCode: undefined,
+        begin: undefined,
+        end: undefined,
+        materialGroup: undefined,
+        sapCode: undefined,
+        warehouseDesc: undefined,
+        acceptNo: undefined,
+        kanban: undefined,
       },
       dataKenCode: "",
       datachassisNumber: "",
@@ -601,18 +552,7 @@ export default {
           return {};
         },
       },
-      listExportQuery: {
-        version: "",
-        materialCode: undefined,
-        sapCode: undefined,
-        cp7Begin: undefined,
-        cp7End: undefined,
-        kenncode: undefined,
-        chassisNumber: undefined,
-        materialGroup: undefined,
-        begin: undefined,
-        end: undefined,
-      },
+
       listQuery: {
         taskId: "",
         name: "",
@@ -796,7 +736,7 @@ export default {
           .then(() => {
             this.$axios
               .posts(
-                "/api/settleaccount/wmsjitoutput/WmsJitOutPutAudit",
+                "/api/settleaccount/WmsHQHKanbanoutput/WmsHQHKanbanOutPutAudit",
                 params
               )
               .then((response) => {
@@ -873,7 +813,7 @@ export default {
             this.formLoading = true;
             this.$axios
               .posts(
-                "/api/settleaccount/wmsjitoutput/WmsJitOutPut",
+                "/api/settleaccount/WmsHQHKanbanoutput/WmsHQHKanbanOutPut",
                 this.listBillQuery
               )
               .then((response) => {
@@ -1156,38 +1096,37 @@ export default {
       this.$refs.formCount.validate((valid) => {
         if (valid) {
           this.formLoading = true;
-          this.listExportQuery.version = this.formCount.versionValue; //版本
+          this.listExportQuery.version = this.formCount.versionValue; //1版本
           if (this.formCount.materialCode != "") {
-            this.listExportQuery.materialCode = this.formCount.materialCode; //物料号
+            this.listExportQuery.materialCode = this.formCount.materialCode; //2发货零件号
           }
           if (this.formCount.sapCode != "") {
-            this.listExportQuery.sapCode = this.formCount.sapCode; //厂内物料号
+            this.listExportQuery.sapCode = this.formCount.sapCode; //3厂内物料号
           }
-          if (this.formCount.kennCode != "") {
-            this.listExportQuery.kenncode = this.formCount.kennCode; //KEEN号
+          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.chassisNumber != "") {
-            this.listExportQuery.chassisNumber = this.formCount.chassisNumber; //底盘号
+          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.formCount.materialGroupValue+'"'; //物料组车型
-          // }
           if (this.formCount.materialGroupValue != "") {
-            this.listExportQuery.materialGroup = this.getmaterialGroupValue; //物料组车型
+            this.listExportQuery.materialGroup = this.getmaterialGroupValue; //7物料组车型
           }
 
           console.log(
-            "大众发票与结算核对明细表-导出条件：" +
+            "H平台核对明细-导出条件：" +
               JSON.stringify(this.listExportQuery)
           );
           this.$axios
             .posts(
-              "/api/settleaccount/ReportMakeService/InvoiceSettledDetailDiff-Make",
+              "/api/settleaccount/ReportMakeService/HQHSettledDetailDiffExportService",
               this.listExportQuery
             )
             .then((res) => {
@@ -1218,7 +1157,6 @@ export default {
       this.formTitle = "报表统计";
       this.isEdit = false;
       this.form = {};
-      this.datetime5 = [];
       this.startTime = "";
       this.endTime = "";
       this.dialogFormVisible = true;
@@ -1236,28 +1174,6 @@ export default {
       const property = column["property"];
       return row[property] === value;
     },
-    /* 任务详细信息 */
-    handleView(row) {
-      this.listQuery.taskId = row.taskId;
-      this.$axios
-        .posts("/api/settleaccount/Job/list", this.listQuery)
-        .then((response) => {
-          this.form = response[0];
-          switch (response[0].stateName) {
-            case "Succeeded":
-            case "Failed":
-              this.activeIndex = 3;
-              break;
-            case "Processing":
-              this.activeIndex = 2;
-              break;
-            case "Enqueued":
-              this.activeIndex = 1;
-              break;
-          }
-          this.openView = true;
-        });
-    },
     /*  刷新  */
     refresh() {
       this.list = [];
@@ -1344,7 +1260,7 @@ export default {
     getList() {
       this.listLoading = true;
       //导入界面中超链接过来的参数
-      this.listQuery.name = "准时化结算核对明细";
+      this.listQuery.name = "H平台核对明细";
       this.listQuery.type = this.JobversionValue;
       this.$axios
         .posts("/api/settleaccount/Job/list", this.listQuery)
@@ -1359,14 +1275,6 @@ export default {
           this.listLoading = false;
         });
     },
-    // fetchData(id) {
-    //   //循环动态，取客户名称
-    //   this.$axios
-    //     .gets("/api/settleaccount/MaterialRelationship/" + id)
-    //     .then((response) => {
-    //       this.form = response;
-    //     });
-    // },
     resetQuery() {},
     /** 通过回调控制style */
     cellStyle({ row, column, rowIndex, columnIndex }) {
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
new file mode 100644
index 00000000..53ea0196
--- /dev/null
+++ b/vue/src/views/ux/vw/dataInput/hq_h_sparepart/index.vue
@@ -0,0 +1,1316 @@
+<!--发票与结算核对明细-->
+<template>
+  <div class="cr-body-content">
+    <!--功能栏-->
+    <!-- 搜索 -->
+    <div style="float: left">
+      <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="primary"
+          icon="el-icon-plus"
+          @click="handleCreate"
+          >统计明细
+        </el-button>
+        <el-button
+          class="filter-item"
+          type="danger"
+          icon="el-icon-delete"
+          size="mini"
+          @click="handleDelete()"
+          >删除(支持批量)</el-button
+        >
+        <el-button
+          class="filter-item"
+          type="success"
+          icon="el-icon-check"
+          size="mini"
+          @click="handleConfirm()"
+          >已确认(支持批量)</el-button
+        >
+        <el-button
+          class="filter-item"
+          type="warning"
+          icon="el-icon-edit"
+          size="mini"
+          v-loading="formLoading"
+          @click="handleCreateBills()"
+          >生成出库单(支持批量)</el-button
+        >
+      </flexbox>
+    </div>
+    <!-- 刷新 -->
+    <div style="float: right">
+      <flexbox class="content-header">
+        <el-tooltip
+          class="item"
+          effect="dark"
+          content="手动刷新"
+          placement="top"
+        >
+          <el-button
+            size="mini"
+            circle
+            icon="el-icon-refresh"
+            @click="refresh()"
+          />
+        </el-tooltip>
+
+        <span style="margin-left: 10px; color: #ff5640; float: right"
+          >说明：每间隔3分钟进行自动刷新！</span
+        >
+      </flexbox>
+    </div>
+
+    <!--主页面表格渲染-->
+    <el-table
+      ref="multipleTable"
+      v-loading="listLoading"
+      element-loading-text="拼命加载中..."
+      element-loading-spinner="el-icon-loading"
+      class="cr-table"
+      :data="list"
+      :height="tableHeight"
+      :cell-style="cellStyle"
+      size="small"
+      stripe
+      border
+      highlight-current-row
+      style="width: 100%"
+      @sort-change="sortChange"
+      @row-click="handleRowClick"
+      @selection-change="handleSelectionChange"
+      @filter-change="filterChange"
+    >
+      <el-table-column type="selection" width="44px"></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
+        show-overflow-tooltip
+        :gutter="0"
+      >
+        <template slot="header" slot-scope="scope">
+          {{ scope.column.label }}
+        </template>
+      </el-table-column>
+
+      <el-table-column
+        prop="stateName"
+        label="状态(单击箭头过滤)"
+        width="165"
+        column-key="stateName"
+        align="center"
+        :filters="[
+          { text: '执行完成(任务成功)', value: 'Succeeded' },
+          { text: '执行完成(任务失败)', value: 'Failed' },
+          { text: '执行中', value: 'Processing' },
+          { text: '等待执行', value: 'Scheduled' },
+        ]"
+        filter-placement="bottom-end"
+        :filter-method="filterHandler"
+      >
+        <template slot-scope="scope">
+          <el-tag
+            v-for="(item, index) in stateNameCateMap"
+            v-show="scope.row.stateName == item.value"
+            :key="index"
+            :type="item.cssName"
+          >
+            {{ item.label }}
+          </el-tag>
+        </template>
+      </el-table-column>
+      <!-- 操作 -->
+      <el-table-column label="操作" align="center" width="250">
+        <template slot-scope="scope">
+          <div align="center">
+            <!-- <el-button
+              v-if="scope.row.actionName == '导出'"
+              size="mini"
+              type="text"
+              @click="handleDownload(scope.row)"
+              icon="el-icon-edit"
+              >下载</el-button
+            > -->
+            <el-button
+              v-if="
+                scope.row.actionName == '导出' &&
+                scope.row.stateName == 'Succeeded' &&
+                scope.row.downFileName != ''
+              "
+              size="mini"
+              type="text"
+              @click="handleDownload(scope.row)"
+              icon="el-icon-edit"
+              >下载</el-button
+            >
+            <el-button
+              v-if="
+                scope.row.actionName == '导出' &&
+                scope.row.error != '' &&
+                scope.row.stateName == 'Succeeded'
+              "
+              size="mini"
+              type="text"
+              @click="handleDownload(scope.row)"
+              icon="el-icon-edit"
+              >检验失败，下载</el-button
+            >
+          </div>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
+    <div class="table-footer">
+      <pagination
+        v-show="totalCount > 0"
+        :total="totalCount"
+        :page.sync="page"
+        :limit.sync="listQuery.MaxResultCount"
+        @pagination="getList"
+      />
+    </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="10" :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"
+                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-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">
+            <el-form-item prop="BillStatus">
+              <el-select
+                size="medium"
+                v-model="formCount.BillStatus"
+                placeholder="请选择"
+                style="width: 188px; margin-right: 25px"
+              >
+                <el-option label="未发货" :value="1"></el-option>
+                <el-option label="已发货" :value="2"></el-option>
+              </el-select>
+            </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="materialGroupValue">
+              <el-select
+                v-model="formCount.materialGroupValue"
+                size="medium"
+                multiple
+                filterable
+                clearable
+                style="width: 450px; 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-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="warehouseDesc">
+              <el-input
+                v-model="formCount.warehouseDesc"
+                style="width: 450px"
+                type="textarea"
+                :rows="4"
+                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 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-collapse v-model="activeNames">
+          <el-collapse-item name="1">
+            <template slot="title">
+              其他搜索条件(单击折叠或展开)<i
+                class="header-icon el-icon-info"
+                style="color: #37b328"
+              ></i>
+            </template>
+
+            <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="kanban">
+                  <el-input
+                    type="textarea"
+                    v-model="formCount.kanban"
+                    style="width: 170px"
+                    :rows="4"
+                    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
+                    v-model="formCount.materialCode"
+                    style="width: 170px"
+                    type="textarea"
+                    :rows="4"
+                    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 prop="acceptNo">
+                  <el-input
+                    v-model="formCount.acceptNo"
+                    style="width: 170px"
+                    type="textarea"
+                    :rows="4"
+                    placeholder="多个结算验收单号，请以回车换行形式添加！"
+                  />
+                </el-form-item>
+              </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-form-item prop="sapCode">
+                  <el-input
+                    v-model="formCount.sapCode"
+                    style="width: 170px"
+                    type="textarea"
+                    :rows="4"
+                    placeholder="多个厂内零件号，请以回车换行形式添加！"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-collapse-item>
+        </el-collapse>
+      </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>
+  </div>
+</template>
+
+<script>
+import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
+import permission from "@/directive/permission/index.js";
+import { downloadFile } from "@/utils/crmindex.js";
+import CRMTableHead from "../../../components/CRMTableHead";
+import moment from "moment";
+import PasteExcel from "@/components/PasteExcel/index.vue";
+import JobSelectVerson from "@/components/CreateCom/Job-Select.vue";
+
+export default {
+  name: "HQH",
+  components: { Pagination, CRMTableHead, PasteExcel, JobSelectVerson },
+  directives: { permission },
+
+  data() {
+    return {
+      crmType: "hq-h-backJob",
+      activeNames: ["1"],
+      tableData: [
+        {
+          name: "KEEN号",
+        },
+      ],
+      paster: "",
+      pasterValue: "",
+      JobVersionList: [],
+      rules: {
+        versionValue: [
+          { required: true, message: "必须输入！", trigger: "change" },
+        ],
+      },
+      showModal: false,
+      pickerOptionsCp5: {
+        disabledDate: (time) => {
+          let now = new Date();
+          let monthEndDate = new Date(now.getFullYear(), now.getMonth() + 1, 0);
+          let timeEnd = Date.parse(monthEndDate);
+          if (timeEnd) {
+            return (
+              time.getTime() > time.getTime() > timeEnd - 8.64e7 ||
+              time.getTime() > timeEnd + 60 * 60 * 24 * 1000
+            ); //能选上最后一天
+          }
+        },
+      },
+      pickerOptions0: {
+        disabledDate: (time) => {
+          //if (this.endTime != "") {
+          //return  time.getTime() >= new Date(this.endTime).getTime();
+          return time.getTime() > new Date(this.endTime).getTime();
+          //}
+        },
+      },
+      pickerOptions1: {
+        disabledDate: (time) => {
+          //return time.getTime() <= new Date(this.startTime).getTime() || time.getTime() > Date.now();
+          return time.getTime() <= new Date(this.startTime).getTime();
+        },
+      },
+      pickerOptionsCp7: {
+        disabledDate: (time) => {
+          let now = new Date();
+          let monthEndDate = new Date(now.getFullYear(), now.getMonth() + 1, 0);
+          let timeEnd = Date.parse(monthEndDate);
+          if (timeEnd) {
+            return (
+              time.getTime() > time.getTime() > timeEnd - 8.64e7 ||
+              time.getTime() > timeEnd + 60 * 60 * 24 * 1000
+            ); //能选上最后一天
+          }
+        },
+      },
+      datetime5: [],
+      checkedCities: [0],
+      selectValue: "",
+      selectNameValue: "",
+      radio: "0", //结算状态：0未结 1部分结算
+      versionList: [],
+      materialGroupList: [],
+      // 是否显示详细弹出层
+      openView: false,
+      versionValue: "",
+      materialGroupValue: [],
+      formTitle: "",
+      timer: null, //定时器名称
+      //当前位置
+      activeIndex: 1,
+      //默认显示基本信息
+      activeName: "first",
+      //步骤条步数
+      stepList: [
+        {
+          title: "等待执行",
+          icon: "el-icon-sort",
+        },
+        {
+          title: "执行中",
+          icon: "el-icon-refresh",
+        },
+        {
+          title: "执行完成",
+          icon: "el-icon-check",
+        },
+      ],
+      customerInfos: "",
+      searchContent: "", // 输入内容
+      form: {},
+      formCount: {
+        version: undefined,
+        startTime: "",
+        endTime: "",
+        materialCode: undefined,
+        materialGroup: undefined,
+        sapCode: undefined,
+        warehouseDesc: undefined,
+        acceptNo: undefined,
+        kanban: undefined,
+      },
+      listExportQuery: {
+        version: "",
+        materialCode: undefined,
+        begin: undefined,
+        end: undefined,
+        materialGroup: undefined,
+        sapCode: undefined,
+        warehouseDesc: undefined,
+        acceptNo: undefined,
+        kanban: undefined,
+      },
+      dataKenCode: "",
+      datachassisNumber: "",
+      datamaterialCode: "",
+      datasapCode: "",
+      getmaterialGroupValue: "",
+      list: null,
+      totalCount: 0,
+      listLoading: true,
+      formLoading: false,
+      // 高级搜索
+      filterObj: {
+        type: Object,
+        default: () => {
+          return {};
+        },
+      },
+
+      listQuery: {
+        taskId: "",
+        name: "",
+        type: "",
+      },
+      listBillQuery: {
+        version: "",
+        guids: [],
+      },
+      page: 1,
+      JobversionValue: "",
+      JobversionValueVerson: "",
+      dialogFormVisible: false,
+      multipleSelection: [],
+      tableHeight: document.documentElement.clientHeight - 260,
+      isEdit: false,
+      menuCateMap: [
+        { label: "导出", value: "导出", cssName: "warning" },
+        { label: "消息", value: "消息", cssName: "info" },
+      ],
+      stateNameCateMap: [
+        { label: "执行完成(任务成功)", value: "Succeeded", cssName: "success" },
+        { label: "执行中...", value: "Processing", cssName: "primary" },
+        { label: "执行完成(任务失败)", value: "Failed", cssName: "danger" },
+        { label: "等待执行", value: "Scheduled", cssName: "primary" },
+      ],
+    };
+  },
+  mounted() {
+    var self = this;
+    window.onresize = function () {
+      var offsetHei = document.documentElement.clientHeight;
+      self.tableHeight = offsetHei - 190;
+    };
+    this.timer = setInterval(() => {
+      this.listQuery.taskId = "";
+      this.listQuery.stateName = "";
+      setTimeout(this.getList, 0);
+    }, 1000 * 180); //30秒刷新一次页面
+    // 通过$once来监听定时器，在beforeDestroy钩子可以被清除。
+    this.$once("hook:beforeDestroy", () => {
+      clearInterval(timer);
+    });
+    //this.disabledDateCp5();
+  },
+  created() {
+    this.getAllVersionList();
+    this.getMaterialGroup();
+    this.getList();
+    this.getJobVersionInfo();
+    // this.getCurrentMonthFirst();
+    // this.getCurrentMonthLast();
+  },
+  beforeDestroy() {
+    clearInterval(this.timer);
+    this.timer = null;
+  },
+  computed: {
+    /* 主表头 */
+    getDefaultField() {
+      var tempsTabs = [];
+      tempsTabs.push({
+        label: "版本号",
+        prop: "type",
+        width: 85,
+      });
+      tempsTabs.push({
+        label: "单据流水号",
+        prop: "taskId",
+        width: 120,
+      });
+      // tempsTabs.push({
+      //   label: "模块名称",
+      //   prop: "name",
+      //   width: 180,
+      // });
+      tempsTabs.push({
+        label: "创建人",
+        prop: "email",
+        width: 150,
+      });
+      tempsTabs.push({
+        label: "创建时间",
+        prop: "createdAt",
+        width: 150,
+      });
+      tempsTabs.push({
+        label: "说明",
+        prop: "remark",
+        width: 350,
+      });
+      tempsTabs.push({
+        label: "审批状态",
+        prop: "fileName",
+        width: 350,
+      });
+      return tempsTabs;
+    },
+  },
+  methods: {
+    sortChange(data) {
+      const { prop, order } = data;
+      if (!prop || !order) {
+        this.handleFilter();
+        return;
+      }
+      this.listQuery.Sorting = prop + " " + order;
+      console.log(this.listQuery.Sorting);
+      this.handleFilter();
+    },
+    /** 筛选操作 */
+    handleFilter() {
+      this.page = 1;
+      this.getList();
+      this.listQuery.Filters = [];
+      if (this.searchContent != "") {
+        var column = "taskId";
+        let filter = {
+          logic: 0,
+          column: column,
+          action: 0,
+          value: this.searchContent,
+        };
+        this.listQuery.Filters.push(filter);
+      }
+      this.getList();
+    },
+    handleSelectionChange(val) {
+      this.isEdit = false;
+      this.multipleSelection = [];
+      this.multipleSelection = val;
+    },
+    //已确认
+    handleConfirm(row) {
+      this.isEdit = false;
+      if (this.multipleSelection.length == 0) {
+        this.$message({
+          message: "至少选择一行！",
+          type: "warning",
+        });
+        return;
+      } else {
+        var getbillNum = "";
+        //判断已经生成出库单的不能再生成出库操作
+        this.multipleSelection.forEach((element) => {
+          let state = element.fileName;
+          if (state != "" && state != "已确认") {
+            this.isEdit = true;
+            getbillNum += state + ",";
+          }
+        });
+      }
+      if (this.isEdit == true) {
+        this.$message({
+          message:
+            "已经生成出库单的不能再确认！单号：" +
+            getbillNum.substr(0, getbillNum.length - 1),
+          type: "warning",
+        });
+        return;
+      } else {
+        var params = [];
+        let myalert = ""; //声明变量，其变量必须在此声明后使用
+        if (row) {
+          //单行
+          params.push(row.id);
+          myalert = row.name;
+        } else {
+          //多选
+          this.multipleSelection.forEach((element) => {
+            let id = element.id;
+            params.push(id);
+          });
+          myalert = "选中项";
+        }
+        this.$confirm("是否确认" + myalert + "?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            this.$axios
+              .posts(
+                "/api/settleaccount/WmsHQHKanbanoutput/WmsHQHKanbanOutPutAudit",
+                params
+              )
+              .then((response) => {
+                const index = this.list.indexOf(row);
+                this.$notify({
+                  title: "成功",
+                  message: "操作成功",
+                  type: "success",
+                  duration: 2000,
+                });
+                this.getList();
+              });
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "已取消操作",
+            });
+          });
+      }
+    },
+    //出库单
+    handleCreateBills(row) {
+      this.isEdit = false;
+      if (this.multipleSelection.length == 0) {
+        this.$message({
+          message: "至少选择一行！",
+          type: "warning",
+        });
+        return;
+      } else {
+        var getbillNum = "";
+        //判断已经生成出库单的不能再生成出库操作
+        this.multipleSelection.forEach((element) => {
+          let state = element.fileName;
+          if (state != "" && state != "已确认") {
+            this.isEdit = true;
+            getbillNum += state + ",";
+          }
+        });
+      }
+      if (this.isEdit == true) {
+        this.$message({
+          message:
+            "已经生成出库单的不能再重新生成！单号：" +
+            getbillNum.substr(0, getbillNum.length - 1),
+          type: "warning",
+        });
+        return;
+      } else {
+        var params = [];
+        let myalert = ""; //声明变量，其变量必须在此声明后使用
+        if (row) {
+          //单行
+          params.push(row.id);
+          myalert = row.name;
+        } else {
+          //多选
+          this.multipleSelection.forEach((element) => {
+            let id = element.id;
+            params.push(id);
+          });
+          myalert = "选中项";
+        }
+        this.listBillQuery.guids = params;
+        this.listBillQuery.version = this.JobversionValue;
+        console.log("出库单条件：" + JSON.stringify(this.listBillQuery));
+        this.$confirm("是否确认出库" + myalert + "?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            this.formLoading = true;
+            this.$axios
+              .posts(
+                "/api/settleaccount/WmsHQHKanbanoutput/WmsHQHKanbanOutPut",
+                this.listBillQuery
+              )
+              .then((response) => {
+                const index = this.list.indexOf(row);
+                this.$notify({
+                  title: "成功",
+                  message: "生成成功",
+                  type: "success",
+                  duration: 2000,
+                });
+
+                this.getList();
+                this.formLoading = false;
+              })
+              .catch(() => {
+                this.formLoading = false;
+              });
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "已取消操作",
+            });
+          });
+      }
+    },
+    //批量删除
+    handleDelete(row) {
+      this.isEdit = false;
+      if (this.multipleSelection.length == 0) {
+        this.$message({
+          message: "至少选择一行！",
+          type: "warning",
+        });
+        return;
+      } else {
+        var getbillNum = "";
+        //判断已经生成出库单的不能执行删除操作
+        this.multipleSelection.forEach((element) => {
+          let state = element.fileName;
+          if (state != "" && state != "已确认") {
+            this.isEdit = true;
+            getbillNum += state + ",";
+          }
+        });
+      }
+      if (this.isEdit == true) {
+        this.$message({
+          message:
+            "已经生成出库单的不能删除！单号：" +
+            getbillNum.substr(0, getbillNum.length - 1),
+          type: "warning",
+        });
+        return;
+      } else {
+        var params = [];
+        let myalert = ""; //声明变量，其变量必须在此声明后使用
+        if (row) {
+          //单行
+          params.push(row.id);
+          myalert = row.name;
+        } else {
+          //多选
+          this.multipleSelection.forEach((element) => {
+            let id = element.id;
+            params.push(id);
+          });
+          myalert = "选中项";
+        }
+        this.$confirm("是否删除" + myalert + "?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            this.$axios
+              .posts("/api/settleaccount/Job/delete", params)
+              .then((response) => {
+                const index = this.list.indexOf(row);
+                this.$notify({
+                  title: "成功",
+                  message: "删除成功",
+                  type: "success",
+                  duration: 2000,
+                });
+                this.getList();
+              });
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "已取消操作",
+            });
+          });
+      }
+    },
+    //版本下拉列表选择项
+    JobVersionValue(params) {
+      //版本下拉选择
+      this.JobversionValue = params.value;
+      this.getList();
+    },
+    getJobVersionInfo() {
+      //取版本列表信息
+      //this.listLoading = true;
+      this.listQuery.SkipCount = (this.page - 1) * 1000;
+      this.$axios
+        .posts("/api/settleaccount/Job/versionlist", this.listQuery)
+        .then((response) => {
+          this.JobVersionList = [];
+          response.forEach((element) => {
+            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;
+        });
+    },
+    submiteBillNo() {
+      var getkeenCodeNo = this.pasterValue.substring(
+        0,
+        this.pasterValue.length - 1
+      );
+      this.dataKenCode = getkeenCodeNo;
+      this.formCount.kennCode = this.dataKenCode;
+      this.showModal = false;
+    },
+    pasteMe(e) {
+      let source = e.clipboardData.getData("Text");
+      // 首先对源头进行解析
+      let rows = source.split("\r\n"); // 拆成很多行
+      this.pasterValue = "";
+      for (let i = 0; i < rows.length; i++) {
+        if (rows[i] != "") {
+          // 如果某一行不是空，再按列拆分
+          let columns = rows[i].split("\t"); // 已经按列划分
+          let dataone = {}; // 声明一行数组
+          for (let j = 0; j < columns.length; j++) {
+            // 读取tableData里的第j对应的key值
+            let keys = Object.keys(this.tableData[j]); // key的名
+            dataone[keys[j]] = columns[j];
+            this.pasterValue += columns[j] + ",";
+          }
+          this.tableData.push(dataone);
+          console.log(this.tableData);
+        }
+      }
+    },
+    //如果是要获得粘贴excel的内容，需要把粘贴的内容转换成二维数组
+    // pasteExcelToKennCode(e) {
+    //   let source = e.clipboardData.getData("Text");
+    //   // 首先对源头进行解析
+    //   let rows = source.split("\r\n"); // 拆成很多行
+    //   this.dataKenCode = "";
+    //   for (let i = 0; i < rows.length; i++) {
+    //     if (rows[i] != "") {
+    //       // 如果某一行不是空，再按列拆分
+    //       let columns = rows[i].split("\t"); // 已经按列划分
+
+    //       for (let j = 0; j < columns.length; j++) {
+    //         this.dataKenCode += columns[j] + ",";
+    //       }
+    //     }
+    //   }
+    // },
+    valueChange(data) {
+      this.getmaterialGroupValue = "";
+      this.getmaterialGroupValue += data + ",";
+      this.getmaterialGroupValue = this.getmaterialGroupValue.substring(
+        0,
+        this.getmaterialGroupValue.length - 1
+      );
+    },
+    getdateValue(val) {
+      this.startTime = val;
+      this.getbalanceIndexData();
+    },
+    getdateVal(val) {
+      this.endTime = val;
+      this.getbalanceIndexData();
+    },
+
+    getCurrentMonthFirst() {
+      var date = new Date();
+      date.setDate(1);
+      var month = parseInt(date.getMonth() + 1);
+      var day = date.getDate();
+      if (month < 10) month = "0" + month;
+      if (day < 10) day = "0" + day;
+      this.startTime = date.getFullYear() + "-" + month + "-" + day;
+    },
+    getCurrentMonthLast() {
+      var date = new Date();
+      var year = date.getFullYear();
+      var month = date.getMonth() + 1;
+      month = month < 10 ? "0" + month : month;
+      var day = new Date(year, month, 0);
+      this.endTime = year + "-" + month + "-" + day.getDate();
+    },
+    handleCheckedCitiesChange(value) {
+      alert(value);
+    },
+
+    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;
+        });
+    },
+    //获取物料组车型
+    // getMaterialGroup() {
+    //   this.$axios
+    //     .posts("/api/settleaccount/CodeSetting/list", {
+    //       project: "物料组",
+    //       maxResultCount: 1000,
+    //       skipCount: 0,
+    //     })
+    //     .then((response) => {
+    //       this.materialGroupList = [];
+    //       response.items.forEach((element) => {
+    //         let options = {};
+    //         options.value = element.description;
+    //         options.label = element.value;
+    //         this.materialGroupList.push(options);
+    //       });
+    //     })
+    //     .catch(() => {
+    //       this.listLoading = false;
+    //     });
+    // },
+    //获取物料组车型
+    getMaterialGroup() {
+      this.$axios
+        .posts("/api/settleaccount/CodeSetting/list", {
+          project: "物料组",
+          maxResultCount: 1000,
+          skipCount: 0,
+          sorting: "value ascending",
+        })
+        .then((response) => {
+          this.materialGroupList = [];
+          response.items.forEach((element) => {
+            let options = {};
+            options.value = element.description;
+            options.label = element.value;
+            this.materialGroupList.push(options);
+          });
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    /* 重置 */
+    resetForm(formName) {
+      this.formCount = {};
+      this.datetime5 = [];
+      this.startTime = "";
+      this.endTime = "";
+    },
+    save() {
+      this.$refs.formCount.validate((valid) => {
+        if (valid) {
+          this.formLoading = true;
+          this.listExportQuery.version = this.formCount.versionValue; //1版本
+          if (this.formCount.materialCode != "") {
+            this.listExportQuery.materialCode = this.formCount.materialCode; //2发货零件号
+          }
+          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物料组车型
+          }
+
+          console.log(
+            "H平台核对明细-导出条件：" +
+              JSON.stringify(this.listExportQuery)
+          );
+          this.$axios
+            .posts(
+              "/api/settleaccount/ReportMakeService/HQHSettledDetailDiffExportService",
+              this.listExportQuery
+            )
+            .then((res) => {
+              let taskid = res;
+              if (Number.isInteger(taskid)) {
+                this.$notify({
+                  title: "成功",
+                  message: "任务生成成功！任务号:" + taskid,
+                  type: "success",
+                  duration: 2000,
+                });
+              }
+              this.getList();
+              this.formLoading = false;
+              this.dialogFormVisible = false;
+            })
+            .catch(() => {
+              this.formLoading = false;
+              this.dialogFormVisible = false;
+            });
+        }
+      });
+    },
+    handleCreate() {
+      this.$nextTick(() => {
+        this.$refs["formCount"].resetFields();
+      });
+      this.formTitle = "报表统计";
+      this.isEdit = false;
+      this.form = {};
+      this.startTime = "";
+      this.endTime = "";
+      this.dialogFormVisible = true;
+    },
+    kennBtn() {
+      this.paster = "";
+      this.showModal = true;
+      this.tableData = [
+        {
+          name: "KEEN号",
+        },
+      ];
+    },
+    filterHandler(value, row, column) {
+      const property = column["property"];
+      return row[property] === value;
+    },
+    /*  刷新  */
+    refresh() {
+      this.list = [];
+      this.listQuery.taskId = "";
+      this.listQuery.name = "";
+      this.getList();
+    },
+    // 监听筛选项的变化
+    filterChange(filterObj) {
+      console.log(filterObj.actionName);
+      if (filterObj.actionName.length > 0) {
+        console.log("点击筛选");
+      } else {
+        console.log("点击重置");
+      }
+    },
+    /* 导出类型的文件 */
+    downloadErrData(param) {
+      this.listLoading = true;
+      let fileNameOfProject = param;
+      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((error) => {
+          this.listLoading = false;
+        });
+    },
+    /* 刷新列表 */
+    handleHandle(data) {
+      if (data.type !== "edit") {
+        this.getList();
+      }
+    },
+    /* 格式化字段 */
+    fieldFormatter(row, column) {
+      if (column.property === "stateName") {
+        return {
+          Succeeded: "执行完成(成功)",
+          Processing: "执行中...",
+          Failed: "执行完成(失败)",
+          Enqueued: "等待执行",
+        }[row[column.property]];
+      }
+      if (column.property == "createdAt") {
+        var date = row[column.property];
+        if (date == undefined) {
+          return "";
+        }
+        return moment(date).format("YYYY-MM-DD HH:mm:ss");
+      }
+      return row[column.property] || "--";
+    },
+    handleDownload(row) {
+      if (row.stateName == "Succeeded") {
+        this.downloadErrData(row.downFileName);
+      } else if (row.stateName == "Failed") {
+        this.downloadErrData(row.error);
+      }
+    },
+    getList() {
+      this.listLoading = true;
+      //导入界面中超链接过来的参数
+      this.listQuery.name = "H平台核对明细";
+      this.listQuery.type = this.JobversionValue;
+      this.$axios
+        .posts("/api/settleaccount/Job/list", this.listQuery)
+        .then((response) => {
+          this.list = response;
+          setTimeout(() => {
+            //大数据量加载时
+            this.listLoading = false;
+          }, 500);
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    resetQuery() {},
+    /** 通过回调控制style */
+    cellStyle({ row, column, rowIndex, columnIndex }) {
+      var item = this.list[rowIndex];
+      if (column.property === "fileName") {
+        if (item.fileName === "已确认") {
+          return { color: "#13CE66", cursor: "pointer", fontWeight: 700 };
+        } else {
+          return { color: "#FFBA00", cursor: "pointer", fontWeight: 800 };
+        }
+      }
+      return { textAlign: "left" };
+      //}
+    },
+    headerRowStyle({ row, column, rowIndex, columnIndex }) {
+      if (column.property === "stateName") {
+        return { textAlign: "center" };
+      }
+      return { textAlign: "center" };
+    },
+    handleRowClick(row, column, event) {
+      this.$refs.multipleTable.clearSelection();
+      this.$refs.multipleTable.toggleRowSelection(row);
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+@import "../../../styles/crmtable.scss";
+@import "../../../styles/steps.scss";
+
+/deep/ .el-checkbox input:focus {
+  outline: none !important;
+  border-color: gray;
+  border: 0px;
+  box-shadow: none !important;
+}
+</style>
\ No newline at end of file
diff --git a/vue/src/views/ux/vw/dataInput/hq_m/index.vue b/vue/src/views/ux/vw/dataInput/hq_m/index.vue
index 8ebbf02b..29c7df3e 100644
--- a/vue/src/views/ux/vw/dataInput/hq_m/index.vue
+++ b/vue/src/views/ux/vw/dataInput/hq_m/index.vue
@@ -291,7 +291,8 @@ export default {
         prop: "acceptanceDate",
         width: 170,
       });
-      tempsTabs.push({ label: "数量", prop: "price", width: 100 });
+      tempsTabs.push({ label: "数量", prop: "qty", width: 100 });
+      tempsTabs.push({ label: "单价", prop: "price", width: 100 });
       tempsTabs.push({ label: "金额", prop: "amt", width: 100 });
       tempsTabs.push({ label: "供应商", prop: "supplier", width: 120 });
       tempsTabs.push({
diff --git a/vue/src/views/ux/vw/dataInput/hq_y/index.vue b/vue/src/views/ux/vw/dataInput/hq_y/index.vue
index cfcc0f30..97e7a101 100644
--- a/vue/src/views/ux/vw/dataInput/hq_y/index.vue
+++ b/vue/src/views/ux/vw/dataInput/hq_y/index.vue
@@ -262,7 +262,7 @@ export default {
   },
   computed: {
     /** 列表字段 */
-     getDefaultField() {
+    getDefaultField() {
       var tempsTabs = [];
       tempsTabs.push({
         label: "看板号",
@@ -291,7 +291,8 @@ export default {
         prop: "acceptanceDate",
         width: 170,
       });
-      tempsTabs.push({ label: "数量", prop: "price", width: 100 });
+      tempsTabs.push({ label: "数量", prop: "qty", width: 100 });
+      tempsTabs.push({ label: "单价", prop: "price", width: 100 });
       tempsTabs.push({ label: "金额", prop: "amt", width: 100 });
       tempsTabs.push({ label: "供应商", prop: "supplier", width: 120 });
       tempsTabs.push({
diff --git a/vue/static/tableFieldForSearch.json b/vue/static/tableFieldForSearch.json
index 51f5ea6e..2ae0c1f1 100644
--- a/vue/static/tableFieldForSearch.json
+++ b/vue/static/tableFieldForSearch.json
@@ -2815,17 +2815,17 @@
       {
         "fieldId": 3,
         "formType": "text",
-        "name": "采购订单号",
+        "name": "看板号",
         "type": 1,
         "value": "",
         "fieldType": 1,
-        "fieldName": "purchaseOrderNo",
+        "fieldName": "hqmKanBan",
         "setting": []
       },
       {
         "fieldId": 5,
         "formType": "text",
-        "name": "物料代码",
+        "name": "物料号",
         "type": 1,
         "value": "",
         "fieldType": 1,
@@ -2835,41 +2835,81 @@
       {
         "fieldId": 5,
         "formType": "text",
-        "name": "科目号",
+        "name": "存储地点描述",
         "type": 1,
         "value": "",
         "fieldType": 1,
-        "fieldName": "accountNum",
+        "fieldName": "storageLocationDesc",
+        "setting": []
+      }
+    ]
+  },
+  "hqFPlatform": {
+    "id": "36",
+    "data": [
+      {
+        "fieldId": 3,
+        "formType": "text",
+        "name": "看板号",
+        "type": 1,
+        "value": "",
+        "fieldType": 1,
+        "fieldName": "hqhKanBan",
         "setting": []
       },
       {
         "fieldId": 5,
         "formType": "text",
-        "name": "交货单号",
+        "name": "物料号",
         "type": 1,
         "value": "",
         "fieldType": 1,
-        "fieldName": "deliveryOrderNo",
+        "fieldName": "materialCode",
         "setting": []
       },
       {
         "fieldId": 5,
         "formType": "text",
-        "name": "工厂",
+        "name": "存储地点描述",
         "type": 1,
         "value": "",
         "fieldType": 1,
-        "fieldName": "factory",
+        "fieldName": "storageLocationDesc",
+        "setting": []
+      }
+    ]
+  },
+  "hqYPlatform": {
+    "id": "36",
+    "data": [
+      {
+        "fieldId": 3,
+        "formType": "text",
+        "name": "看板号",
+        "type": 1,
+        "value": "",
+        "fieldType": 1,
+        "fieldName": "btCarKanBan",
         "setting": []
       },
       {
         "fieldId": 5,
         "formType": "text",
-        "name": "工厂名称",
+        "name": "物料号",
         "type": 1,
         "value": "",
         "fieldType": 1,
-        "fieldName": "factoryName",
+        "fieldName": "materialCode",
+        "setting": []
+      },
+      {
+        "fieldId": 5,
+        "formType": "text",
+        "name": "存储地点描述",
+        "type": 1,
+        "value": "",
+        "fieldType": 1,
+        "fieldName": "storageLocationDesc",
         "setting": []
       }
     ]
@@ -3002,5 +3042,76 @@
         ]
       }
     ]
+  },
+  "hq-h-OutOrder": {
+    "id": "36",
+    "data": [
+      {
+        "fieldId": 3,
+        "formType": "text",
+        "name": "订货看板编号",
+        "type": 1,
+        "value": "",
+        "fieldType": 1,
+        "fieldName": "kanban",
+        "setting": []
+      },
+      {
+        "fieldId": 5,
+        "formType": "text",
+        "name": "交货单号",
+        "type": 1,
+        "value": "",
+        "fieldType": 1,
+        "fieldName": "wmsBillNum",
+        "setting": []
+      },
+      {
+        "fieldId": 5,
+        "formType": "text",
+        "name": "Sap编码",
+        "type": 1,
+        "value": "",
+        "fieldType": 1,
+        "fieldName": "materialCode",
+        "setting": []
+      },
+      {
+        "fieldId": 5,
+        "formType": "text",
+        "name": "物料组(车型)",
+        "type": 1,
+        "value": "",
+        "fieldType": 1,
+        "fieldName": "materialGroup",
+        "setting": []
+      },
+      {
+        "fieldId": 5,
+        "formType": "text",
+        "name": "发货零件号",
+        "type": 1,
+        "value": "",
+        "fieldType": 1,
+        "fieldName": "extend1",
+        "setting": []
+      },
+      {
+        "fieldId": 5,
+        "formType": "text",
+        "name": "收货仓库",
+        "type": 1,
+        "value": "",
+        "fieldType": 1,
+        "fieldName": "extend2",
+        "setting": []
+      }
+    ]
   }
+
+
+
+
+
+
 }
\ No newline at end of file