From 1f3c19c80aa81f80379409eb910abc4fb3eb6add Mon Sep 17 00:00:00 2001
From: 44673626 <44673626@qq.com>
Date: Tue, 8 Mar 2022 17:56:23 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BA=A2=E6=97=97=E6=9C=AA=E7=BB=93=E6=A0=B8?=
 =?UTF-8?q?=E5=AF=B9=E7=AD=89=E5=89=8D=E7=AB=AF=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 |    3 +-
 vue/src/router/index.js                       |    2 +
 vue/src/router/modules/hq_menu.js             |   18 +-
 vue/src/router/modules/hq_out_order.js        |   20 +-
 vue/src/router/modules/onetimesale.js         |   34 +
 vue/src/router/modules/wms_out_order.js       |   20 +-
 .../ux/billManage/FisUpdateExport/index.vue   |    2 +-
 .../views/ux/vw/dataInput/hq_open/index.vue   |    7 +-
 .../dataInput/hq_unsettle_factory/index.vue   | 1161 +++++++++++++++++
 vue/static/tableFieldForSearch.json           |   45 +
 10 files changed, 1283 insertions(+), 29 deletions(-)
 create mode 100644 vue/src/router/modules/onetimesale.js
 create mode 100644 vue/src/views/ux/vw/dataInput/hq_unsettle_factory/index.vue

diff --git a/vue/src/components/ImportExcel-base/index.vue b/vue/src/components/ImportExcel-base/index.vue
index 7677396d..b57ab088 100644
--- a/vue/src/components/ImportExcel-base/index.vue
+++ b/vue/src/components/ImportExcel-base/index.vue
@@ -338,7 +338,7 @@ export default {
           Wms_HqKB_Output: "红旗数据调整",
           Wms_onetimesale_Output: "一次性寄售销售",
           wmsOutputSum: "WMS未结出库单",
-          
+          unHQSettle: "红旗未结明细",
         }[this.crmType] || ""
       );
     },
@@ -400,6 +400,7 @@ export default {
           Wms_onetimesale_Output:
             "/api/settleaccount/WmsOneTimeSaleOutput/ExcelImport", //红旗数据调整导入
           wmsOutputSum: "/api/settleaccount/WmsOneTimeSaleOutput/ExcelImport", //WMS未结出库单
+          unHQSettle: "/api/settleaccount/UnHQSettle/ExcelImport", //红旗未结明细
         
           //HQ_Y_CHECKOUT: "/api/settleaccount//ExcelImport", //一汽轿车平台备件出库单导入
         }[this.crmType] || ""
diff --git a/vue/src/router/index.js b/vue/src/router/index.js
index 1830bf2b..93cac310 100644
--- a/vue/src/router/index.js
+++ b/vue/src/router/index.js
@@ -22,6 +22,7 @@ import btcarDataRouter from './modules/bt_menu'
 import vwOutOrderDataRouter from './modules/vw_out_order'
 import hqOutOrderDataRouter from './modules/hq_out_order'
 import vwsOutOrderDataRouter from './modules/wms_out_order'
+import onetimesaleDataRouter from './modules/onetimesale'
 import pgfis from './modules/fis'
 import pgfisPrint from './modules/fisprint'
 
@@ -181,6 +182,7 @@ export const asyncRoutes = [
   hqMenudataRouter,//红旗
   vwOutOrderDataRouter,
   hqOutOrderDataRouter,
+  onetimesaleDataRouter,//一次性寄售销售
   vwsOutOrderDataRouter,//wms相关操作
   //btcarDataRouter,//一汽轿车
   //vwFisDataRouter,//结算与开票数据导入
diff --git a/vue/src/router/modules/hq_menu.js b/vue/src/router/modules/hq_menu.js
index 8331ad3b..25b9fee5 100644
--- a/vue/src/router/modules/hq_menu.js
+++ b/vue/src/router/modules/hq_menu.js
@@ -18,7 +18,7 @@ const hqMenudataRouter = {
             component: () => import('@/views/ux/vw/dataInput/hq_open'),
             name: 'ERPEI',//命名路由
             meta: {
-                title: '红旗工厂未结明细',
+                title: '红旗未结导入',
                 roles: ['SettleAccount.HQ_HPlatform'],//控制页面角色（可以设置多个角色）
                 icon: '单据导入'
             }
@@ -28,7 +28,7 @@ const hqMenudataRouter = {
             component: () => import('@/views/ux/vw/dataInput/hq_h'),
             name: 'ERPEI',//命名路由
             meta: {
-                title: '红旗工厂平台导入',
+                title: '红旗结算导入',
                 roles: ['SettleAccount.HQ_HPlatform'],//控制页面角色（可以设置多个角色）
                 icon: '单据导入'
             }
@@ -58,9 +58,19 @@ const hqMenudataRouter = {
             component: () => import('@/views/ux/vw/dataInput/hq_unsettle_report'),
             name: 'HQUnSettle',
             meta: {
-                title: '红旗看板未结明细',
+                title: '红旗未结明细',
                 roles: ['SettleAccount.Reports'],
-                icon: '文件'
+                icon: '期间'
+            }
+        },
+        {
+            path: 'hq_unsettle_factory',
+            component: () => import('@/views/ux/vw/dataInput/hq_unsettle_factory'),
+            name: 'HQUnSettle',
+            meta: {
+                title: '红旗未结核对',
+                roles: ['SettleAccount.Reports'],
+                icon: '未结算'
             }
         },
         {
diff --git a/vue/src/router/modules/hq_out_order.js b/vue/src/router/modules/hq_out_order.js
index c6d03cd1..b9b124b6 100644
--- a/vue/src/router/modules/hq_out_order.js
+++ b/vue/src/router/modules/hq_out_order.js
@@ -98,16 +98,16 @@ const hqOutOrderDataRouter = {
       }
     },
 
-    {
-      path: 'onetime-sale-outorder',
-      component: () => import('@/views/ux/vw/dataInput/OnetimeSale'),
-      name: 'WmsHQKBOutput',//命名路由
-      meta: {
-        title: '一次性寄售销售结算',
-        roles: ['SettleAccount.WMSHQ'],//控制页面角色（可以设置多个角色）
-        icon: '客户'
-      }
-    },
+    // {
+    //   path: 'onetime-sale-outorder',
+    //   component: () => import('@/views/ux/vw/dataInput/OnetimeSale'),
+    //   name: 'WmsHQKBOutput',//命名路由
+    //   meta: {
+    //     title: '一次性寄售销售结算',
+    //     roles: ['SettleAccount.WMSHQ'],//控制页面角色（可以设置多个角色）
+    //     icon: '客户'
+    //   }
+    // },
 
 
 
diff --git a/vue/src/router/modules/onetimesale.js b/vue/src/router/modules/onetimesale.js
new file mode 100644
index 00000000..e77b5b5b
--- /dev/null
+++ b/vue/src/router/modules/onetimesale.js
@@ -0,0 +1,34 @@
+//大众-FIS结算-路由
+import Layout from '@/layout'
+
+const onetimesaleDataRouter = {
+  path: '/cpat-order-onetimesale',
+  component: Layout,
+  redirect: 'pg',
+  name: '业务数据',
+  //hidden: true,
+  meta: {
+    //requiresAuth: true,
+    title: '一次性寄售销售',
+    index: 0,
+    type: 'crm',
+    icon: '红旗',
+    roles: ['SettleAccount.WMSHQ'],//控制页面角色（可以设置多个角色）
+    keepAlive: false,
+  },
+  children: [
+    {
+      path: 'onetime-sale-outorder',
+      component: () => import('@/views/ux/vw/dataInput/OnetimeSale'),
+      name: 'WmsOneTimeSaleOutput',//命名路由
+      meta: {
+        title: '一次性寄售销售结算',
+        roles: ['SettleAccount.WMSHQ'],//控制页面角色（可以设置多个角色）
+        icon: '客户'
+      }
+    }
+
+  ]
+}
+
+export default onetimesaleDataRouter
\ No newline at end of file
diff --git a/vue/src/router/modules/wms_out_order.js b/vue/src/router/modules/wms_out_order.js
index e452091f..271dde15 100644
--- a/vue/src/router/modules/wms_out_order.js
+++ b/vue/src/router/modules/wms_out_order.js
@@ -37,16 +37,16 @@ const vwsOutOrderDataRouter = {
         icon: '零件'
       }
     },
-    {
-      path: '/nonDeliveryList',
-      component: () => import('@/views/ux/billManage/NonDeliveryList'),
-      name: 'NonDeliveryList',//命名路由
-      meta: {
-        title: 'WMS未出库清单',
-        roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色）
-        icon: '零件'
-      }
-    },
+    // {
+    //   path: '/nonDeliveryList',
+    //   component: () => import('@/views/ux/billManage/NonDeliveryList'),
+    //   name: 'NonDeliveryList',//命名路由
+    //   meta: {
+    //     title: 'WMS未出库清单',
+    //     roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色）
+    //     icon: '零件'
+    //   }
+    // },
 
 
 
diff --git a/vue/src/views/ux/billManage/FisUpdateExport/index.vue b/vue/src/views/ux/billManage/FisUpdateExport/index.vue
index fcbe43b9..47523f02 100644
--- a/vue/src/views/ux/billManage/FisUpdateExport/index.vue
+++ b/vue/src/views/ux/billManage/FisUpdateExport/index.vue
@@ -854,7 +854,7 @@ export default {
     getList() {
       this.listLoading = true;
       //导入界面中超链接过来的参数
-      this.listQuery.name = "准时化未结差异比对输出";
+      this.listQuery.name = "Fis发货数据更新状态";
       this.listQuery.type = this.JobversionValue;
       this.$axios
         .posts("/api/settleaccount/Job/list", this.listQuery)
diff --git a/vue/src/views/ux/vw/dataInput/hq_open/index.vue b/vue/src/views/ux/vw/dataInput/hq_open/index.vue
index 3e4a38eb..9c44a1fc 100644
--- a/vue/src/views/ux/vw/dataInput/hq_open/index.vue
+++ b/vue/src/views/ux/vw/dataInput/hq_open/index.vue
@@ -294,8 +294,8 @@ export default {
         width: 170,
       });
       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: "price", width: 100 });
+      // tempsTabs.push({ label: "金额", prop: "amt", width: 100 });
       tempsTabs.push({ label: "供应商", prop: "supplier", width: 120 });
       tempsTabs.push({
         label: "存储地点",
@@ -429,7 +429,8 @@ export default {
         if (date == undefined) {
           return "";
         }
-        return moment(date).format("YYYY-MM-DD HH:mm:ss");
+        return moment(date).format("YYYY-MM-DD");
+        //return moment(date).format("YYYY-MM-DD HH:mm:ss");
       }
       return row[column.property] || "--";
     },
diff --git a/vue/src/views/ux/vw/dataInput/hq_unsettle_factory/index.vue b/vue/src/views/ux/vw/dataInput/hq_unsettle_factory/index.vue
new file mode 100644
index 00000000..20601d3e
--- /dev/null
+++ b/vue/src/views/ux/vw/dataInput/hq_unsettle_factory/index.vue
@@ -0,0 +1,1161 @@
+<!--红旗明细核对-->
+<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
+        >
+      </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"
+      @cell-dblclick="dblhandleCurrentChange"
+    >
+      <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 label="说明" width="400" align="center">
+        <template slot-scope="scope">
+          <el-input
+            ref="inputRef"
+            v-if="scope.row.isEditCell"
+            v-model="scope.row.remark"
+            class="el-input"
+            v-focus
+            @blur="cellBlur(scope.row, scope.column)"
+          />
+          <span v-else>{{ scope.row.remark }}</span>
+          <el-button
+            style="margin-left: 5px"
+            v-if="scope.row.isEditCell"
+            type="success"
+            icon="el-icon-check"
+            size="small"
+            circle
+            @click="submitName(scope.row)"
+          ></el-button>
+          <el-button
+            v-show="scope.row.isEditCell"
+            class="cancel-btn"
+            size="mini"
+            icon="el-icon-refresh"
+            type="warning"
+            @click.native.prevent="handleCancel(scope.row)"
+          >
+            cancel
+          </el-button>
+        </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="20" :xs="24" style="margin-left: -80px">
+            <el-form-item prop="versionValue">
+              <el-select
+                v-model="formCount.versionValue"
+                size="medium"
+                clearable
+                style="width: 188px; margin-right: 15px"
+                placeholder="请选择"
+              >
+                <el-option
+                  v-for="item in versionList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="交货日期" />  
+          </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"
+               
+                @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"
+               
+                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="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: 380px; 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="materialCode">
+                  <el-input
+                    v-model="formCount.materialCode"
+                    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="SAP编号" />
+              </el-col>
+              <el-col :md="20" :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>
+              </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: "HQUnSettle",
+  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: "",
+        stateName: "",
+      },
+
+      page: 1,
+      JobversionValue: "",
+      JobversionValueVerson: "",
+      dialogFormVisible: false,
+      multipleSelection: [],
+      tableHeight: document.documentElement.clientHeight - 260,
+      isEdit: false,
+      isTaskSuccess: 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,
+      });
+
+      return tempsTabs;
+    },
+  },
+  methods: {
+    dblhandleCurrentChange(row, column, cell, event) {
+      if (column.label === "说明") {
+        row.isEditCell = true;
+        this.$set(row, "isEditCell", true);
+        this.$nextTick(() => {
+          //自动获取焦点 element组件autofocus失效
+          //this.$refs.inputRef.focus();
+          this.$refs["inputRef"].focus();
+        });
+      }
+      this.list = this.list.filter((item) => {
+        return item;
+      });
+    },
+    // 可以编辑框失去焦点
+    cellBlur(row, column) {
+      row.isEditCell = false;
+      this.$set(row, "isEditCell", false);
+    },
+    // 在线编辑中提交
+    submitName(row) {
+      let getguid = row.id;
+      let getremark = row.remark;
+      this.$axios
+        .gets("/api/settleaccount/Job/updateRemark", {
+          p_id: getguid,
+          remark: getremark,
+        })
+        .then((response) => {
+          if (response == true) {
+            this.$notify({
+              title: "成功",
+              message: "更新成功",
+              type: "success",
+              duration: 2000,
+            });
+            this.getList();
+          }
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    // 取消
+    handleCancel(row) {
+      row.isEditCell = false;
+      //row.stockQty = row.originalstockQty;
+      this.$set(row, "isEditCell", false);
+      // this.$message({
+      //   message: "取消后，恢复当前原值！",
+      //   type: "warning",
+      // });
+      this.getList();
+    },
+    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;
+    },
+
+    //批量删除
+    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) => {
+          let res = response.reverse(); //降序排列
+          this.JobVersionList = [];
+          res.forEach((element, index) => {
+            let options = {};
+            options.value = element;
+            options.label = element;
+            this.JobVersionList.push(options);
+          });
+          if (JSON.stringify(this.JobVersionList) != "[]") {
+            //因版本下拉有默认值，所以详表要自动绑定子表数据
+            this.JobversionValue = this.JobVersionList[0].value;
+            this.JobversionValueVerson = this.JobVersionList[0].label;
+            this.getList();
+          }
+        })
+        .catch(() => {
+          //this.listLoading = false;
+        });
+    },
+
+    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; //物料号
+          }
+          if (this.formCount.sapCode != "") {
+            this.listExportQuery.sapCode = this.formCount.sapCode; //3厂内物料号
+          }
+
+          this.listExportQuery.begin = this.startTime
+            ? this.startTime
+            : undefined;
+          this.listExportQuery.end = this.endTime ? this.endTime : undefined;
+
+          console.log(
+            "红旗未结核对-导出条件：" + JSON.stringify(this.listExportQuery)
+          );
+          this.$axios
+            .posts(
+              "/api/settleaccount/ReportMakeService/HQFactoryUnSettledDetailDiffExportService",
+              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();
+      // });
+      if (this.$refs["formCount"] !== undefined) {
+        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 = "红旗未结核对";
+      this.listQuery.type = this.JobversionValue;
+      this.$axios
+        .posts("/api/settleaccount/Job/list", this.listQuery)
+        .then((response) => {
+          this.list = response;
+          //动态加一个是否编辑的标识
+          this.list.forEach((element) => {
+            element["isEditCell"] = false;
+          });
+          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/static/tableFieldForSearch.json b/vue/static/tableFieldForSearch.json
index e9a6a87d..e9f1e4f9 100644
--- a/vue/static/tableFieldForSearch.json
+++ b/vue/static/tableFieldForSearch.json
@@ -2926,6 +2926,51 @@
       }
     ]
   },
+  "unHQSettle": {
+    "id": "36",
+    "data": [
+      {
+        "fieldId": 3,
+        "formType": "text",
+        "name": "工厂",
+        "type": 1,
+        "value": "",
+        "fieldType": 1,
+        "fieldName": "factory",
+        "setting": []
+      },
+      {
+        "fieldId": 3,
+        "formType": "text",
+        "name": "看板号",
+        "type": 1,
+        "value": "",
+        "fieldType": 1,
+        "fieldName": "hqhKanBan",
+        "setting": []
+      },
+      {
+        "fieldId": 5,
+        "formType": "text",
+        "name": "物料号",
+        "type": 1,
+        "value": "",
+        "fieldType": 1,
+        "fieldName": "materialCode",
+        "setting": []
+      },
+      {
+        "fieldId": 5,
+        "formType": "text",
+        "name": "存储地点描述",
+        "type": 1,
+        "value": "",
+        "fieldType": 1,
+        "fieldName": "storageLocationDesc",
+        "setting": []
+      }
+    ]
+  },
   "hqMPlatform": {
     "id": "36",
     "data": [