From d6d81389b66bb42661c1b78f34432f56f6dabd84 Mon Sep 17 00:00:00 2001
From: 44673626 <44673626@qq.com>
Date: Wed, 29 Jun 2022 16:44:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=8F=E8=94=BD=E9=94=99=E8=AF=AF=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vue/src/components/ImportExcel-base/index.vue |   5 +-
 vue/src/router/modules/wms_out_order.js       |  11 +
 .../views/ux/billManage/ErrorBill/index.vue   | 531 ++++++++++++++++++
 .../ux/billManage/kanbanOutOrder/detail.vue   |   2 +-
 .../billManage/kanbanWithOutOrder/detail.vue  |   2 +-
 .../billManage/sparepartOutOrder/detail.vue   |   2 +-
 .../billManage/sparepartOutOrder90/detail.vue |   2 +-
 .../views/ux/billManage/vwOutOrder/detail.vue |   2 +-
 .../ux/billManage/wmsCusomerKanban/detail.vue |   2 +-
 .../ux/vw/dataInput/OnetimeSale/detail.vue    |   2 +-
 .../ux/vw/dataInput/hq_h_outorder/detail.vue  |   2 +-
 .../ux/vw/dataInput/hq_kb_output/detail.vue   |   2 +-
 vue/static/config.js                          |   8 +-
 vue/static/tableFieldForSearch.json           |  36 ++
 14 files changed, 595 insertions(+), 14 deletions(-)
 create mode 100644 vue/src/views/ux/billManage/ErrorBill/index.vue

diff --git a/vue/src/components/ImportExcel-base/index.vue b/vue/src/components/ImportExcel-base/index.vue
index 5af0197d..f95e3aab 100644
--- a/vue/src/components/ImportExcel-base/index.vue
+++ b/vue/src/components/ImportExcel-base/index.vue
@@ -289,6 +289,7 @@ export default {
         {
           invoice: "大众发票汇总",
           priceList: "标准价格单",
+          errorBill:"异常信息",
           spareparts: "备件价格单",
           vWKanBan: "大众看板结算明细",
           scrapClaims: "CP7报废和索赔",
@@ -338,6 +339,7 @@ export default {
         {
           invoice: "/api/settleaccount/Invoices/ExcelImport", //大众发票导入
           priceList: "/api/settleaccount/PriceList/ExcelImport-Map", //标准价格单
+          errorBill:"/api/settleaccount/ErrorBill/ExcelImport", //异常信息
           spareparts: "/api/SettleAccount/PriceListBJ/ExcelImport-Map", //备件价格单
           vWKanBan: "/api/settleaccount/VWKanBan/ExcelImport", //大众看板结算明细导入
           scrapClaims: "/api/settleaccount/ScrapClaims/ExcelImport", //CP7报废和索赔导入
@@ -477,6 +479,7 @@ export default {
       if (
         this.crmType == "priceList" ||
         this.crmType == "spareparts" ||
+        this.crmType == "errorBill" ||
         this.crmType == "wmsOutputSum"
       ) {
         //只状态可用
@@ -548,7 +551,7 @@ export default {
     },
     //执行按钮
     sureClick() {
-      if (this.crmType != "priceList" && this.crmType != "spareparts") {
+      if (this.crmType != "priceList" && this.crmType != "spareparts" && this.crmType != "errorBill") {
         if (this.versionValue == "") {
           this.$message.error("必须选择版本！");
           return false;
diff --git a/vue/src/router/modules/wms_out_order.js b/vue/src/router/modules/wms_out_order.js
index a892b0f0..75aff07b 100644
--- a/vue/src/router/modules/wms_out_order.js
+++ b/vue/src/router/modules/wms_out_order.js
@@ -91,6 +91,17 @@ const vwsOutOrderDataRouter = {
       }
     },
 
+    {
+      path: '/wms-errbill',
+      component: () => import('@/views/ux/billManage/ErrorBill'),
+      name: 'ErrorBill',//命名路由
+      meta: {
+        title: '屏蔽异常数据',
+        roles: ['SettleAccount.WMSJIT'],//控制页面角色（可以设置多个角色） 
+        icon: '零件'
+      }
+    },
+
 
 
   ]
diff --git a/vue/src/views/ux/billManage/ErrorBill/index.vue b/vue/src/views/ux/billManage/ErrorBill/index.vue
new file mode 100644
index 00000000..72554afc
--- /dev/null
+++ b/vue/src/views/ux/billManage/ErrorBill/index.vue
@@ -0,0 +1,531 @@
+<!--异常信息汇总-->
+<template>
+  <div class="cr-body-content">
+    <flexbox class="content-header">
+      <!-- <XhJSSelect
+        :options="versionList"
+        style="width: 200px"
+        class="search-container"
+        @value-change="selectValue"
+      ></XhJSSelect> -->
+
+      <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>
+      <el-button
+        class="filter-item"
+        size="mini"
+        type="info"
+        icon="el-icon-bottom"
+        @click="handleCommand()"
+        >导出Excel
+      </el-button>
+      <el-button
+        class="filter-item"
+        type="danger"
+        icon="el-icon-delete"
+        size="mini"
+        @click="handleDelete()"
+        >批量删除
+      </el-button>
+      <!--表格头组件，filter查询   v-permission="['SettleAccount.PriceLists.Create']"-->
+      <c-r-m-table-head
+        ref="crmTableHead"
+        :crm-type="crmType"
+        @handle="handleHandle"
+        @filter="handleFilters"
+      >
+      </c-r-m-table-head>
+
+      <!-- <el-dropdown size="small" class="filter-item" @command="handleCommand">
+        <span class="el-dropdown-link">
+          导出数据<i class="el-icon-arrow-down el-icon--right"></i>
+        </span>
+        <el-dropdown-menu slot="dropdown">
+          <el-dropdown-item command="excel" icon="el-icon-plus"
+            >导出Excel</el-dropdown-item
+          >
+          <el-dropdown-item command="csv" icon="el-icon-circle-plus"
+            >导出Csv</el-dropdown-item
+          >
+        </el-dropdown-menu>
+      </el-dropdown> -->
+    </flexbox>
+    <div class="l-table">
+      <!--表格渲染-->
+      <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>
+
+    <div class="table-footer">
+      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
+      <pagination
+        v-show="totalCount > 0"
+        :total="totalCount"
+        :page.sync="page"
+        :limit.sync="listQuery.MaxResultCount"
+        @pagination="getList"
+      />
+      <!-- 导入Excel组件 -->
+      <importExcel
+        ref="importexcel"
+        :show="showExcelImport"
+        :crmType="crmType"
+        @close="importExcelData"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+import Pagination from "@/components/Pagination";
+import permission from "@/directive/permission/index.js";
+import CRMTableHead from "../../components/CRMTableHead";
+import importExcel from "@/components/ImportExcel-base";
+import Lockr from "lockr";
+import { downloadFile } from "@/utils/crmindex.js";
+import XhJSSelect from "@/components/CreateCom/Xh-JS-Select.vue";
+import moment from "moment";
+
+export default {
+  name: "ErrorBill",
+  components: { Pagination, CRMTableHead, importExcel, XhJSSelect },
+  directives: { permission },
+  filters: {
+    IsCustomerSignFilter(status) {
+      //翻译是否签字
+      const statusMap = {
+        true: "是",
+        false: "否",
+      };
+      return statusMap[status];
+    },
+  },
+  props: {
+    customerInfos: {
+      type: Array,
+      default: () => {
+        return [];
+      },
+    },
+  },
+  data() {
+    return {
+      crmType: "errorBill",
+      versionValue: "",
+      versionList: [], //版本列表
+      searchContent: "", // 输入内容
+      showExcelImport: false,
+      form: {},
+      drawer: false,
+      list: null,
+      totalCount: 0,
+      listLoading: true,
+      customerInfo: {
+        bomId: "",
+      },
+      // 高级搜索
+      filterObj: {
+        type: Object,
+        default: () => {
+          return {};
+        },
+      },
+      // listQuery: {
+      //    Filters: [
+      //    {
+      //         "logic": 0,
+      //         "column": "enabled",
+      //         "action": 0,
+      //         "value": "true"
+      //       }//默认查询可用的
+      //     ],
+      //     //OrgID:"",
+      //     "SkipCount": 0,
+      //     "MaxResultCount": 15
+      // },
+      listQuery: {
+        Filters: [
+          {
+            logic: 0,
+            column: "enabled",
+            action: 0,
+            value: "true",
+          }, //默认查询可用的
+        ],
+        SkipCount: 0,
+        MaxResultCount: 15,
+        ParentId: null,
+        fileType: 0,
+        userId: "00000000-0000-0000-0000-000000000000",
+      },
+      listVersionQuery: {
+        SkipCount: 0,
+        MaxResultCount: 15,
+        fileType: 0,
+      },
+      // listVersionQuery: {
+
+      //   SkipCount: 0,
+      //   MaxResultCount: 15,
+      //   ParentId: null,
+      //   fileType: 0,
+      //   userId: "00000000-0000-0000-0000-000000000000",
+      // },
+      page: 1,
+      multipleSelection: [],
+      drawer: false,
+      tableHeight: document.documentElement.clientHeight - 260,
+    };
+  },
+  mounted() {
+    var self = this;
+    window.onresize = function () {
+      var offsetHei = document.documentElement.clientHeight;
+      self.tableHeight = offsetHei - 190;
+    };
+  },
+  created() {
+    this.getList();
+  },
+
+  computed: {
+    getDefaultField() {
+      var tempsTabs = [];
+      //tempsTabs.push({ label: "版本", prop: "version", width: 120 });
+      tempsTabs.push({
+        label: "底盘|看板号|订单号",
+        prop: "billNum",
+        width: 230,
+      });
+      tempsTabs.push({
+        label: "厂内物料号",
+        prop: "materialCode",
+        width: 100,
+      });
+      tempsTabs.push({
+        label: "客户物料号",
+        prop: "customerMaterialCode",
+        width: 120,
+      });
+      tempsTabs.push({
+        label: "交货单号",
+        prop: "wmsBillNum",
+        width: 120,
+      });
+      tempsTabs.push({ label: "物料描述", prop: "materialDesc", width: 220 });
+
+      return tempsTabs;
+    },
+  },
+  methods: {
+    selectValue(params) {
+      //版本下拉选择
+      this.versionValue = params.value;
+      this.getList();
+    },
+    handleDelete(row) {
+      //批量删除
+      var params = [];
+      let myalert = ""; //声明变量，其变量必须在此声明后使用
+      if (row) {
+        //单行
+        params.push(row.id);
+        myalert = row.name;
+      } else {
+        if (this.multipleSelection.length === 0) {
+          this.$message({
+            message: "未选择",
+            type: "warning",
+          });
+          return;
+        }
+        //多选
+        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/ErrorBill/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: "已取消删除",
+          });
+        });
+    },
+    handleCommand(command) {
+      this.listLoading = true;
+
+      console.log("导出：" + JSON.stringify(this.listQuery));
+      this.$axios
+        .posts("/api/settleaccount/ErrorBill/Export", this.listQuery)
+        .then((res) => {
+          let fileNameOfProject = res;
+          this.$axios
+            .BolbGets(
+              "/api/settleaccount/getblobfile/download/" + fileNameOfProject
+            )
+            .then((response) => {
+              if (fileNameOfProject.indexOf("_") != -1) {
+                let downName =
+                  fileNameOfProject.slice(
+                    0,
+                    fileNameOfProject.lastIndexOf("_")
+                  ) +
+                  fileNameOfProject.slice(fileNameOfProject.lastIndexOf("."));
+                downloadFile(response, downName);
+                this.$notify({
+                  title: "成功",
+                  message: "数据-导出成功！",
+                  type: "success",
+                  duration: 2000,
+                });
+              } else {
+                downloadFile(response, fileNameOfProject);
+                this.$notify({
+                  title: "成功",
+                  message: "数据-导出成功！",
+                  type: "success",
+                  duration: 2000,
+                });
+              }
+              this.listLoading = false;
+            });
+        });
+    },
+    selectOptionsChange(item) {
+      this.getList();
+    },
+    importExcelData() {
+      //关闭导入窗体时调用
+      this.showExcelImport = false;
+      this.getList();
+    },
+
+    handleImportExcel() {
+      //导入
+      this.showExcelImport = true;
+      this.$refs.importexcel.handleImportExcelClick();
+    },
+    /** 刷新列表 */
+    handleHandle(data) {
+      if (data.type !== "edit") {
+        this.getList();
+      }
+    },
+    /** 格式化字段 */
+    fieldFormatter(row, column) {
+      if (column.property === "projectRole") {
+        return { 0: "是", 1: "否" }[row[column.property]];
+      }
+      if (column.property == "beginDate" || column.property == "endDate") {
+        var date = row[column.property];
+        if (date == undefined) {
+          return "";
+        }
+        return moment(date).format("YYYY-MM-DD HH:mm:ss");
+      }
+      return row[column.property] || "--";
+    },
+    roleFilter(type) {
+      return projectTypeKeyValue[type];
+    },
+    getList() {
+      this.listLoading = true;
+      this.listQuery.SkipCount = (this.page - 1) * 10;
+      if (this.listQuery.Sorting === "") {
+        this.listQuery.Sorting = "materialCode ascending";
+      }
+
+      this.$axios
+        .posts("/api/settleaccount/ErrorBill/list", this.listQuery)
+        .then((response) => {
+          this.list = response.items;
+          this.totalCount = response.totalCount;
+          this.listQuery.Sorting = "";
+          setTimeout(() => {
+            //大数据量加载时
+            this.listLoading = false;
+          }, 500);
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+
+    /** 多项筛选操作 */
+    /** 筛选操作 */
+    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();
+      }
+    },
+    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();
+    },
+    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 === "qty") {
+        return { textAlign: "right" };
+      } else {
+        return { textAlign: "left" };
+      }
+    },
+    /** 通过回调控制表头style */
+    headerRowStyle({ row, column, rowIndex, columnIndex }) {
+      if (column.property === "qty") {
+        return { textAlign: "right", background: "#FAFAFA" };
+      } else {
+        return { textAlign: "left", background: "#FAFAFA" };
+      }
+    },
+    handleRowClick(row, column, event) {
+      this.$refs.multipleTable.clearSelection();
+      this.$refs.multipleTable.toggleRowSelection(row);
+    },
+  },
+};
+</script>
+
+
+<style lang="scss" scoped>
+@import "../../styles/crmtable.scss";
+</style>
+
diff --git a/vue/src/views/ux/billManage/kanbanOutOrder/detail.vue b/vue/src/views/ux/billManage/kanbanOutOrder/detail.vue
index 303f89d7..e6a96c7d 100644
--- a/vue/src/views/ux/billManage/kanbanOutOrder/detail.vue
+++ b/vue/src/views/ux/billManage/kanbanOutOrder/detail.vue
@@ -10,7 +10,7 @@
       ></JobSelectVerson>
 
       <el-button
-        v-if="this.selectJobVersionValue == 0"
+        v-if="this.selectJobVersionValue == 0 || this.selectJobVersionValue == 3"
         class="filter-item"
         type="success"
         icon="el-icon-check"
diff --git a/vue/src/views/ux/billManage/kanbanWithOutOrder/detail.vue b/vue/src/views/ux/billManage/kanbanWithOutOrder/detail.vue
index 4f3c8d09..955526b4 100644
--- a/vue/src/views/ux/billManage/kanbanWithOutOrder/detail.vue
+++ b/vue/src/views/ux/billManage/kanbanWithOutOrder/detail.vue
@@ -22,7 +22,7 @@
         ></el-option>
       </el-select> -->
       <el-button
-        v-if="this.selectJobVersionValue == 0"
+        v-if="this.selectJobVersionValue == 0 || this.selectJobVersionValue == 3"
         class="filter-item"
         type="success"
         icon="el-icon-check"
diff --git a/vue/src/views/ux/billManage/sparepartOutOrder/detail.vue b/vue/src/views/ux/billManage/sparepartOutOrder/detail.vue
index cc758b13..6144eb18 100644
--- a/vue/src/views/ux/billManage/sparepartOutOrder/detail.vue
+++ b/vue/src/views/ux/billManage/sparepartOutOrder/detail.vue
@@ -18,7 +18,7 @@
       ></JobSelectVerson>
 
       <el-button
-        v-if="this.selectJobVersionValue == 0"
+       v-if="this.selectJobVersionValue == 0 || this.selectJobVersionValue == 3"
         class="filter-item"
         type="success"
         icon="el-icon-check"
diff --git a/vue/src/views/ux/billManage/sparepartOutOrder90/detail.vue b/vue/src/views/ux/billManage/sparepartOutOrder90/detail.vue
index aad7410a..61cb9a01 100644
--- a/vue/src/views/ux/billManage/sparepartOutOrder90/detail.vue
+++ b/vue/src/views/ux/billManage/sparepartOutOrder90/detail.vue
@@ -17,7 +17,7 @@
         @value-change="JobVersionValue"
       ></JobSelectVerson>
       <el-button
-        v-if="this.selectJobVersionValue == 0"
+       v-if="this.selectJobVersionValue == 0 || this.selectJobVersionValue == 3"
         class="filter-item"
         type="success"
         icon="el-icon-check"
diff --git a/vue/src/views/ux/billManage/vwOutOrder/detail.vue b/vue/src/views/ux/billManage/vwOutOrder/detail.vue
index e4ca510d..2e3fb6ca 100644
--- a/vue/src/views/ux/billManage/vwOutOrder/detail.vue
+++ b/vue/src/views/ux/billManage/vwOutOrder/detail.vue
@@ -17,7 +17,7 @@
         >确认出库单</el-button
       > -->
       <el-button
-        v-if="this.selectJobVersionValue == 0"
+        v-if="this.selectJobVersionValue == 0 || this.selectJobVersionValue == 3"
         class="filter-item"
         type="success"
         icon="el-icon-check"
diff --git a/vue/src/views/ux/billManage/wmsCusomerKanban/detail.vue b/vue/src/views/ux/billManage/wmsCusomerKanban/detail.vue
index ab781969..5b3c9646 100644
--- a/vue/src/views/ux/billManage/wmsCusomerKanban/detail.vue
+++ b/vue/src/views/ux/billManage/wmsCusomerKanban/detail.vue
@@ -9,7 +9,7 @@
         @value-change="JobVersionValue"
       ></JobSelectVerson>
       <el-button
-        v-if="this.selectJobVersionValue == 0"
+        v-if="this.selectJobVersionValue == 0 || this.selectJobVersionValue == 3"
         class="filter-item"
         type="success"
         icon="el-icon-check"
diff --git a/vue/src/views/ux/vw/dataInput/OnetimeSale/detail.vue b/vue/src/views/ux/vw/dataInput/OnetimeSale/detail.vue
index 898e612e..87852a20 100644
--- a/vue/src/views/ux/vw/dataInput/OnetimeSale/detail.vue
+++ b/vue/src/views/ux/vw/dataInput/OnetimeSale/detail.vue
@@ -10,7 +10,7 @@
       ></JobSelectVerson>
 
       <el-button
-        v-if="this.selectJobVersionValue == 0"
+        v-if="this.selectJobVersionValue == 0 || this.selectJobVersionValue == 3"
         class="filter-item"
         type="success"
         icon="el-icon-check"
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
index 1671078c..601d33d0 100644
--- a/vue/src/views/ux/vw/dataInput/hq_h_outorder/detail.vue
+++ b/vue/src/views/ux/vw/dataInput/hq_h_outorder/detail.vue
@@ -9,7 +9,7 @@
         @value-change="JobVersionValue"
       ></JobSelectVerson>
       <el-button
-        v-if="this.selectJobVersionValue == 0"
+        v-if="this.selectJobVersionValue == 0 || this.selectJobVersionValue == 3"
         class="filter-item"
         type="success"
         icon="el-icon-check"
diff --git a/vue/src/views/ux/vw/dataInput/hq_kb_output/detail.vue b/vue/src/views/ux/vw/dataInput/hq_kb_output/detail.vue
index f15c5066..614b674a 100644
--- a/vue/src/views/ux/vw/dataInput/hq_kb_output/detail.vue
+++ b/vue/src/views/ux/vw/dataInput/hq_kb_output/detail.vue
@@ -10,7 +10,7 @@
       ></JobSelectVerson>
 
       <el-button
-        v-if="this.selectJobVersionValue == 0"
+        v-if="this.selectJobVersionValue == 0 || this.selectJobVersionValue == 3"
         class="filter-item"
         type="success"
         icon="el-icon-check"
diff --git a/vue/static/config.js b/vue/static/config.js
index 8dcc8836..6757964e 100644
--- a/vue/static/config.js
+++ b/vue/static/config.js
@@ -2,8 +2,8 @@ let configJSON
 if (process.env.NODE_ENV === 'development') {
   configJSON = {
     base: {
-			ip: 'http://192.168.0.67',
-      //ip: 'http://192.168.0.140',
+			//ip: 'http://192.168.0.67',
+      ip: 'http://192.168.0.140',
       //ip: 'http://149.223.116.5',
       auth_port: '8066',
       public_port: '8092',
@@ -37,8 +37,8 @@ if (process.env.NODE_ENV === 'development') {
   configJSON = {
     base: {
       
-      ip: 'http://192.168.0.67',
-      //ip: 'http://192.168.0.140',
+      //ip: 'http://192.168.0.67',
+      ip: 'http://192.168.0.140',
       //ip: 'http://149.223.116.5',
       //ip: 'http://124.220.28.250',
       //ip: 'http://10.123.148.162',
diff --git a/vue/static/tableFieldForSearch.json b/vue/static/tableFieldForSearch.json
index 99c44898..8d0beca3 100644
--- a/vue/static/tableFieldForSearch.json
+++ b/vue/static/tableFieldForSearch.json
@@ -3693,5 +3693,41 @@
         "setting": []
       }
     ]
+  },
+  "errorBill": {
+    "id": "36",
+    "data": [
+     
+      {
+        "fieldId": 5,
+        "formType": "text",
+        "name": "底盘|看板号|订单号",
+        "type": 1,
+        "value": "",
+        "fieldType": 1,
+        "fieldName": "billNum",
+        "setting": []
+      },
+      {
+        "fieldId": 5,
+        "formType": "text",
+        "name": "交货单号",
+        "type": 1,
+        "value": "",
+        "fieldType": 1,
+        "fieldName": "wmsBillNum",
+        "setting": []
+      },
+      {
+        "fieldId": 5,
+        "formType": "text",
+        "name": "客户物料号",
+        "type": 1,
+        "value": "",
+        "fieldType": 1,
+        "fieldName": "customerMaterialCode",
+        "setting": []
+      }
+    ]
   }
 }
\ No newline at end of file