diff --git a/vue/src/router/modules/basedata.js b/vue/src/router/modules/basedata.js
index ac1945e3..b9e3606a 100644
--- a/vue/src/router/modules/basedata.js
+++ b/vue/src/router/modules/basedata.js
@@ -60,6 +60,16 @@ const basedataRouter = {
         icon: '结算'
       }
     },
+    {
+      path: '/bom-diffPrice',
+      component: () => import('@/views/ux/billManage/BomDiffPrice'),
+      name: 'BomDiffPrice',//命名路由
+      meta: {
+          title: 'Bom定价明细',
+          roles: ['SettleAccount.PriceLists'],//控制页面角色（可以设置多个角色）
+          icon: '看板'
+      }
+  }
     //   {
     //     path: 'wms-kanban',
     //     component: () => import('@/views/ux/vw/dataInput/wmsKanban'),
diff --git a/vue/src/router/modules/hq_menu.js b/vue/src/router/modules/hq_menu.js
index 46159749..ac389b55 100644
--- a/vue/src/router/modules/hq_menu.js
+++ b/vue/src/router/modules/hq_menu.js
@@ -9,7 +9,7 @@ const hqMenudataRouter = {
     meta: {
         title: '红旗工厂',
         icon: '红旗',
-        roles: ['SettleAccount.WMSHQ','SettleAccount.HQ_HPlatform', 'SettleAccount.HQ_MPlatform','SettleAccount.HQ_FPlatform','SettleAccount.BT_Carlatform','SettleAccount.Reports'],
+        roles: ['SettleAccount.WMSHQ','SettleAccount.HQ_HPlatform', 'SettleAccount.HQ_MPlatform','SettleAccount.BT_Carlatform','SettleAccount.Reports'],
         keepAlive: false,
     },
     children: [
diff --git a/vue/src/router/modules/jobtimedata.js b/vue/src/router/modules/jobtimedata.js
index 1cbcd5f1..a1061d9d 100644
--- a/vue/src/router/modules/jobtimedata.js
+++ b/vue/src/router/modules/jobtimedata.js
@@ -23,7 +23,7 @@ const JobTimeDataRouter = {
             meta: {
               
                 title: '后台作业监控',
-                roles: ['SettleAccount.Reports'],
+                roles: ['SettleAccount.HQ_FPlatform'],
                 icon: '结算对比'
             }
         }
diff --git a/vue/src/router/modules/vw_menu.js b/vue/src/router/modules/vw_menu.js
index a586da5e..6a14b0c1 100644
--- a/vue/src/router/modules/vw_menu.js
+++ b/vue/src/router/modules/vw_menu.js
@@ -226,17 +226,17 @@ const vwMenudataRouter = {
                         roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色）
                         icon: '工厂'
                     }
-                },
-                {
-                    path: '/bom-diffPrice',
-                    component: () => import('@/views/ux/billManage/BomDiffPrice'),
-                    name: 'BomDiffPrice',//命名路由
-                    meta: {
-                        title: 'Bom定价明细',
-                        roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色）
-                        icon: '看板'
-                    }
                 }
+                // {
+                //     path: '/bom-diffPrice',
+                //     component: () => import('@/views/ux/billManage/BomDiffPrice'),
+                //     name: 'BomDiffPrice',//命名路由
+                //     meta: {
+                //         title: 'Bom定价明细',
+                //         roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色）
+                //         icon: '看板'
+                //     }
+                // }
 
             ]
         }
diff --git a/vue/src/views/ux/billManage/BomDiffPrice/index.vue b/vue/src/views/ux/billManage/BomDiffPrice/index.vue
index 3f360c97..c1411f70 100644
--- a/vue/src/views/ux/billManage/BomDiffPrice/index.vue
+++ b/vue/src/views/ux/billManage/BomDiffPrice/index.vue
@@ -377,7 +377,7 @@ export default {
   created() {
     this.getAllVersionList();
     this.getList();
-    this.getJobVersionInfo();
+    //this.getJobVersionInfo();
   },
   beforeDestroy() {
     clearInterval(this.timer);
@@ -546,32 +546,32 @@ export default {
       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;
-        });
-    },
+    // 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;
+    //     });
+    // },
 
     handleCheckedCitiesChange(value) {
       alert(value);
@@ -606,7 +606,7 @@ export default {
       this.formLoading = true;
       this.$axios
         .gets(
-          "/api/settleaccount/ReportMakeService/BomDiffPrice-Make",
+          "/api/settleaccount/PriceList/BomDiffPrice-Make",
           this.listExportQuery
         )
         .then((res) => {
@@ -634,7 +634,7 @@ export default {
           this.formLoading = true;
           this.$axios
             .gets(
-              "/api/settleaccount/ReportMakeService/BomDiffPrice-Make",
+              "/api/settleaccount/PriceList/BomDiffPrice-Make",
               this.listExportQuery
             )
             .then((res) => {
@@ -787,7 +787,7 @@ export default {
       this.listQuery.name = "Bom定价差异明细";
       //this.listQuery.type = this.JobversionValue;
       this.$axios
-        .posts("/api/settleaccount/Job/list", this.listQuery)
+        .posts("/api/settleaccount/PriceList/job/list", this.listQuery)
         .then((response) => {
           this.list = response;
           //动态加一个是否编辑的标识
diff --git a/vue/src/views/ux/billManage/UnSettledSum/index.vue b/vue/src/views/ux/billManage/UnSettledSum/index.vue
index 10f1d90c..5499db57 100644
--- a/vue/src/views/ux/billManage/UnSettledSum/index.vue
+++ b/vue/src/views/ux/billManage/UnSettledSum/index.vue
@@ -623,7 +623,7 @@ export default {
           this.listExportQuery.version = this.formCount.versionValue; //版本
 
           console.log(
-            "结算未结寄售核对表-导出条件：" + JSON.stringify(this.listExportQuery)
+            "结算未结寄售核对表-条件：" + JSON.stringify(this.listExportQuery)
           );
           this.$axios
             .posts(
@@ -711,6 +711,7 @@ export default {
     downloadErrData(param) {
       this.listLoading = true;
       let fileNameOfProject = param;
+      console.log("下载文件名："+JSON.stringify(fileNameOfProject))
       this.$axios
         .BolbGets(
           "/api/settleaccount/getblobfile/download/" + fileNameOfProject
@@ -769,6 +770,7 @@ export default {
     },
     handleDownload(row) {
       if (row.stateName == "Succeeded") {
+        console.log("文件名："+JSON.stringify(row.downFileName))
         this.downloadErrData(row.downFileName);
       } else if (row.stateName == "Failed") {
         this.downloadErrData(row.error);
diff --git a/vue/src/views/ux/billManage/kanbanOutOrder/index.vue b/vue/src/views/ux/billManage/kanbanOutOrder/index.vue
index 82f20508..f7f15999 100644
--- a/vue/src/views/ux/billManage/kanbanOutOrder/index.vue
+++ b/vue/src/views/ux/billManage/kanbanOutOrder/index.vue
@@ -11,6 +11,15 @@
         class="search-container"
         @keyup.enter.native="handleFilter"
       />
+      <el-input
+        v-model="searchVersion"
+        clearable
+        size="small"
+        placeholder="按照版本号搜索..."
+        style="width: 200px"
+        class="search-container"
+        @keyup.enter.native="handleFilter"
+      />
       <el-button
         size="mini"
         type="success"
@@ -18,6 +27,9 @@
         @click="handleFilter"
         >搜索
       </el-button>
+      <el-button icon="el-icon-refresh" size="mini" @click="resetQuery()"
+        >重置</el-button
+      >
       <el-button
         class="filter-item"
         size="mini"
@@ -157,7 +169,7 @@ import { formatTimeToTimestamp } from "@/utils/index";
 
 export default {
   name: "sendUnsettledDiffReport",
-  components: { Pagination, Detail,importExcel },
+  components: { Pagination, Detail, importExcel },
   directives: { permission },
   data() {
     return {
@@ -169,6 +181,7 @@ export default {
       },
       customerInfos: [],
       searchContent: "", // 输入内容
+      searchVersion: "", // 输入内容
       drawer: false,
       form: {
         version: "",
@@ -243,7 +256,7 @@ export default {
     },
   },
   methods: {
-     dblhandleCurrentChange(row, column, cell, event) {
+    dblhandleCurrentChange(row, column, cell, event) {
       if (column.label === "备注") {
         row.isEditCell = true;
         this.$set(row, "isEditCell", true);
@@ -363,12 +376,15 @@ export default {
         this.listQuery.SkipCount = (this.page - 1) * 15;
       }
       this.$axios
-        .posts("/api/settleaccount/wmskanbanoutput/WmsKanbanList", this.listQuery)
+        .posts(
+          "/api/settleaccount/wmskanbanoutput/WmsKanbanList",
+          this.listQuery
+        )
         .then((response) => {
           this.list = response.items;
           //alert(JSON.stringify(response.Items))
           this.totalCount = response.totalCount;
-           //动态加一个是否编辑的标识
+          //动态加一个是否编辑的标识
           this.list.forEach((element) => {
             element["isEditCell"] = false;
           });
@@ -382,10 +398,28 @@ export default {
         });
     },
     /** 筛选操作 */
+    // handleFilter() {
+    //   this.page = 1;
+    //   this.getList();
+    //   this.listQuery.Filters = [];
+    //   if (this.searchContent != "") {
+    //     var column = "billNum";
+    //     let filter = {
+    //       logic: 0,
+    //       column: column,
+    //       action: 6,
+    //       value: this.searchContent,
+    //     };
+    //     this.listQuery.Filters.push(filter);
+    //   }
+    //   this.getList();
+    // },
+    //resetQuery() {},
+    /** 筛选操作 */
     handleFilter() {
       this.page = 1;
       this.getList();
-      this.listQuery.Filters = [];
+      let Filter = [];
       if (this.searchContent != "") {
         var column = "billNum";
         let filter = {
@@ -394,11 +428,30 @@ export default {
           action: 6,
           value: this.searchContent,
         };
-        this.listQuery.Filters.push(filter);
+        Filter.push(filter);
       }
+      if (this.searchVersion != "") {
+        var column = "version";
+        let filter = {
+          logic: 0,
+          column: column,
+          action: 6,
+          value: this.searchVersion,
+        };
+        Filter.push(filter);
+      }
+      console.log("筛选条件" + JSON.stringify(Filter));
+      this.listQuery.Filters = Filter;
+
+      this.getList();
+    },
+    resetQuery() {
+      this.searchContent = "";
+      this.searchVersion = "";
+      this.listQuery.Filters = [];
+      this.listQuery.SkipCount = 1;
       this.getList();
     },
-    resetQuery() {},
     sortChange(data) {
       const { prop, order } = data;
       if (!prop || !order) {
diff --git a/vue/src/views/ux/billManage/kanbanWithOutOrder/index.vue b/vue/src/views/ux/billManage/kanbanWithOutOrder/index.vue
index a540fd58..be060bbc 100644
--- a/vue/src/views/ux/billManage/kanbanWithOutOrder/index.vue
+++ b/vue/src/views/ux/billManage/kanbanWithOutOrder/index.vue
@@ -11,6 +11,15 @@
         class="search-container"
         @keyup.enter.native="handleFilter"
       />
+      <el-input
+        v-model="searchVersion"
+        clearable
+        size="small"
+        placeholder="按照版本号搜索..."
+        style="width: 200px"
+        class="search-container"
+        @keyup.enter.native="handleFilter"
+      />
       <el-button
         size="mini"
         type="success"
@@ -18,6 +27,9 @@
         @click="handleFilter"
         >搜索
       </el-button>
+      <el-button icon="el-icon-refresh" size="mini" @click="resetQuery()"
+        >重置</el-button
+      >
       <el-button
         class="filter-item"
         size="mini"
@@ -226,6 +238,7 @@ export default {
       },
       customerInfos: [],
       searchContent: "", // 输入内容
+      searchVersion: "", // 输入内容
       drawer: false,
       form: {
         version: "",
@@ -498,11 +511,29 @@ export default {
           this.listLoading = false;
         });
     },
+    // /** 筛选操作 */
+    // handleFilter() {
+    //   this.page = 1;
+    //   this.getList();
+    //   this.listQuery.Filters = [];
+    //   if (this.searchContent != "") {
+    //     var column = "billNum";
+    //     let filter = {
+    //       logic: 0,
+    //       column: column,
+    //       action: 6,
+    //       value: this.searchContent,
+    //     };
+    //     this.listQuery.Filters.push(filter);
+    //   }
+    //   this.getList();
+    // },
+    // resetQuery() {},
     /** 筛选操作 */
     handleFilter() {
       this.page = 1;
       this.getList();
-      this.listQuery.Filters = [];
+      let Filter = [];
       if (this.searchContent != "") {
         var column = "billNum";
         let filter = {
@@ -511,11 +542,30 @@ export default {
           action: 6,
           value: this.searchContent,
         };
-        this.listQuery.Filters.push(filter);
+        Filter.push(filter);
       }
+      if (this.searchVersion != "") {
+        var column = "version";
+        let filter = {
+          logic: 0,
+          column: column,
+          action: 6,
+          value: this.searchVersion,
+        };
+        Filter.push(filter);
+      }
+      console.log("筛选条件" + JSON.stringify(Filter));
+      this.listQuery.Filters = Filter;
+
+      this.getList();
+    },
+    resetQuery() {
+      this.searchContent = "";
+      this.searchVersion = "";
+      this.listQuery.Filters = [];
+      this.listQuery.SkipCount = 1;
       this.getList();
     },
-    resetQuery() {},
     sortChange(data) {
       const { prop, order } = data;
       if (!prop || !order) {
diff --git a/vue/src/views/ux/billManage/sparepartOutOrder/index.vue b/vue/src/views/ux/billManage/sparepartOutOrder/index.vue
index 2e403167..f8ea1bfc 100644
--- a/vue/src/views/ux/billManage/sparepartOutOrder/index.vue
+++ b/vue/src/views/ux/billManage/sparepartOutOrder/index.vue
@@ -18,6 +18,18 @@
         @click="handleFilter"
         >搜索
       </el-button>
+      <el-button icon="el-icon-refresh" size="mini" @click="resetQuery()"
+        >重置</el-button
+      >
+      <el-input
+        v-model="searchVersion"
+        clearable
+        size="small"
+        placeholder="按照版本号搜索..."
+        style="width: 200px"
+        class="search-container"
+        @keyup.enter.native="handleFilter"
+      />
       <el-button
         class="filter-item"
         size="mini"
@@ -168,6 +180,7 @@ export default {
       },
       customerInfos: [],
       searchContent: "", // 输入内容
+      searchVersion: "", // 输入内容
       drawer: false,
       form: {
         version: "",
@@ -384,10 +397,28 @@ export default {
         });
     },
     /** 筛选操作 */
+    // handleFilter() {
+    //   this.page = 1;
+    //   this.getList();
+    //   this.listQuery.Filters = [];
+    //   if (this.searchContent != "") {
+    //     var column = "billNum";
+    //     let filter = {
+    //       logic: 0,
+    //       column: column,
+    //       action: 6,
+    //       value: this.searchContent,
+    //     };
+    //     this.listQuery.Filters.push(filter);
+    //   }
+    //   this.getList();
+    // },
+    // resetQuery() {},
+    /** 筛选操作 */
     handleFilter() {
       this.page = 1;
       this.getList();
-      this.listQuery.Filters = [];
+      let Filter = [];
       if (this.searchContent != "") {
         var column = "billNum";
         let filter = {
@@ -396,11 +427,30 @@ export default {
           action: 6,
           value: this.searchContent,
         };
-        this.listQuery.Filters.push(filter);
+        Filter.push(filter);
       }
+      if (this.searchVersion != "") {
+        var column = "version";
+        let filter = {
+          logic: 0,
+          column: column,
+          action: 6,
+          value: this.searchVersion,
+        };
+        Filter.push(filter);
+      }
+      console.log("筛选条件" + JSON.stringify(Filter));
+      this.listQuery.Filters = Filter;
+
+      this.getList();
+    },
+    resetQuery() {
+      this.searchContent = "";
+      this.searchVersion = "";
+      this.listQuery.Filters = [];
+      this.listQuery.SkipCount = 1;
       this.getList();
     },
-    resetQuery() {},
     sortChange(data) {
       const { prop, order } = data;
       if (!prop || !order) {
diff --git a/vue/src/views/ux/billManage/sparepartOutOrder90/index.vue b/vue/src/views/ux/billManage/sparepartOutOrder90/index.vue
index 19bfa616..1c95c2df 100644
--- a/vue/src/views/ux/billManage/sparepartOutOrder90/index.vue
+++ b/vue/src/views/ux/billManage/sparepartOutOrder90/index.vue
@@ -11,6 +11,15 @@
         class="search-container"
         @keyup.enter.native="handleFilter"
       />
+      <el-input
+        v-model="searchVersion"
+        clearable
+        size="small"
+        placeholder="按照版本号搜索..."
+        style="width: 200px"
+        class="search-container"
+        @keyup.enter.native="handleFilter"
+      />
       <el-button
         size="mini"
         type="success"
@@ -18,6 +27,9 @@
         @click="handleFilter"
         >搜索
       </el-button>
+      <el-button icon="el-icon-refresh" size="mini" @click="resetQuery()"
+        >重置</el-button
+      >
       <el-button
         class="filter-item"
         size="mini"
@@ -168,6 +180,7 @@ export default {
       },
       customerInfos: [],
       searchContent: "", // 输入内容
+      searchVersion: "", // 输入内容
       drawer: false,
       form: {
         version: "",
@@ -384,10 +397,28 @@ export default {
         });
     },
     /** 筛选操作 */
+    // handleFilter() {
+    //   this.page = 1;
+    //   this.getList();
+    //   this.listQuery.Filters = [];
+    //   if (this.searchContent != "") {
+    //     var column = "billNum";
+    //     let filter = {
+    //       logic: 0,
+    //       column: column,
+    //       action: 6,
+    //       value: this.searchContent,
+    //     };
+    //     this.listQuery.Filters.push(filter);
+    //   }
+    //   this.getList();
+    // },
+    // resetQuery() {},
+    /** 筛选操作 */
     handleFilter() {
       this.page = 1;
       this.getList();
-      this.listQuery.Filters = [];
+      let Filter = [];
       if (this.searchContent != "") {
         var column = "billNum";
         let filter = {
@@ -396,11 +427,30 @@ export default {
           action: 6,
           value: this.searchContent,
         };
-        this.listQuery.Filters.push(filter);
+        Filter.push(filter);
       }
+      if (this.searchVersion != "") {
+        var column = "version";
+        let filter = {
+          logic: 0,
+          column: column,
+          action: 6,
+          value: this.searchVersion,
+        };
+        Filter.push(filter);
+      }
+      console.log("筛选条件" + JSON.stringify(Filter));
+      this.listQuery.Filters = Filter;
+
+      this.getList();
+    },
+    resetQuery() {
+      this.searchContent = "";
+      this.searchVersion = "";
+      this.listQuery.Filters = [];
+      this.listQuery.SkipCount = 1;
       this.getList();
     },
-    resetQuery() {},
     sortChange(data) {
       const { prop, order } = data;
       if (!prop || !order) {
diff --git a/vue/src/views/ux/billManage/vwOutOrder/index.vue b/vue/src/views/ux/billManage/vwOutOrder/index.vue
index 42e445f5..80eae55c 100644
--- a/vue/src/views/ux/billManage/vwOutOrder/index.vue
+++ b/vue/src/views/ux/billManage/vwOutOrder/index.vue
@@ -1,7 +1,13 @@
-<!--轿车看板-发出未结算-->
+<!--准时化出库单-->
 <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
@@ -11,6 +17,15 @@
         class="search-container"
         @keyup.enter.native="handleFilter"
       />
+      <el-input
+        v-model="searchVersion"
+        clearable
+        size="small"
+        placeholder="按照版本号搜索..."
+        style="width: 200px"
+        class="search-container"
+        @keyup.enter.native="handleFilter"
+      />
       <el-button
         size="mini"
         type="success"
@@ -18,6 +33,9 @@
         @click="handleFilter"
         >搜索
       </el-button>
+      <el-button icon="el-icon-refresh" size="mini" @click="resetQuery()"
+        >重置</el-button
+      >
       <el-button
         class="filter-item"
         size="mini"
@@ -154,10 +172,11 @@ import Detail from "./detail";
 import moment from "moment";
 import importExcel from "@/components/ImportExcel-base";
 import { formatTimeToTimestamp } from "@/utils/index";
+import XhJSSelect from "@/components/CreateCom/Xh-JS-Select-Label.vue";
 
 export default {
   name: "sendUnsettledDiffReport",
-  components: { Pagination, Detail, importExcel },
+  components: { Pagination, Detail, importExcel, XhJSSelect },
   directives: { permission },
   data() {
     return {
@@ -169,6 +188,7 @@ export default {
       },
       customerInfos: [],
       searchContent: "", // 输入内容
+      searchVersion: "", // 输入内容
       drawer: false,
       form: {
         version: "",
@@ -243,6 +263,11 @@ export default {
     },
   },
   methods: {
+    selectValue(params) {
+      //版本下拉选择
+      this.versionValue = params.value;
+      this.getList();
+    },
     dblhandleCurrentChange(row, column, cell, event) {
       if (column.label === "备注") {
         row.isEditCell = true;
@@ -300,20 +325,44 @@ export default {
       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;
+    //     });
+    // },
     getVersionInfo() {
       //取版本列表信息
       this.listLoading = true;
       this.listQuery.SkipCount = (this.page - 1) * 1000;
       this.$axios
-        .posts("/api/settleaccount/CentralizedControl/openlist")
+        .posts("/api/settleaccount/wmsjitoutput/WmsJitList", this.listQuery)
         .then((response) => {
           this.versionList = [];
-          response.forEach((element) => {
+          response.items.forEach((element) => {
             let options = {};
-            options.value = element.version;
+            options.value = element.id;
             options.label = element.version;
             this.versionList.push(options);
           });
+          if (JSON.stringify(this.versionList) != "[]") {
+            //因版本下拉有默认值，所以详表要自动绑定子表数据
+            this.versionValueVerson = this.versionList[0].label;
+            this.getList();
+          }
         })
         .catch(() => {
           this.listLoading = false;
@@ -386,7 +435,7 @@ export default {
     handleFilter() {
       this.page = 1;
       this.getList();
-      this.listQuery.Filters = [];
+      let Filter = [];
       if (this.searchContent != "") {
         var column = "billNum";
         let filter = {
@@ -395,11 +444,30 @@ export default {
           action: 6,
           value: this.searchContent,
         };
-        this.listQuery.Filters.push(filter);
+        Filter.push(filter);
       }
+      if (this.searchVersion != "") {
+        var column = "version";
+        let filter = {
+          logic: 0,
+          column: column,
+          action: 6,
+          value: this.searchVersion,
+        };
+        Filter.push(filter);
+      }
+      console.log("筛选条件" + JSON.stringify(Filter));
+      this.listQuery.Filters = Filter;
+
+      this.getList();
+    },
+    resetQuery() {
+      this.searchContent = "";
+      this.searchVersion = "";
+      this.listQuery.Filters = [];
+      this.listQuery.SkipCount = 1;
       this.getList();
     },
-    resetQuery() {},
     sortChange(data) {
       const { prop, order } = data;
       if (!prop || !order) {
diff --git a/vue/src/views/ux/billManage/wmsCusomerKanban/index.vue b/vue/src/views/ux/billManage/wmsCusomerKanban/index.vue
index d183fdc2..b040373f 100644
--- a/vue/src/views/ux/billManage/wmsCusomerKanban/index.vue
+++ b/vue/src/views/ux/billManage/wmsCusomerKanban/index.vue
@@ -11,6 +11,15 @@
         class="search-container"
         @keyup.enter.native="handleFilter"
       />
+      <el-input
+        v-model="searchVersion"
+        clearable
+        size="small"
+        placeholder="按照版本号搜索..."
+        style="width: 200px"
+        class="search-container"
+        @keyup.enter.native="handleFilter"
+      />
       <el-button
         size="mini"
         type="success"
@@ -18,6 +27,9 @@
         @click="handleFilter"
         >搜索
       </el-button>
+      <el-button icon="el-icon-refresh" size="mini" @click="resetQuery()"
+        >重置</el-button
+      >
       <el-button
         class="filter-item"
         size="mini"
@@ -157,7 +169,7 @@ import { formatTimeToTimestamp } from "@/utils/index";
 
 export default {
   name: "WMSCusomerKanban",
-  components: { Pagination, Detail,importExcel },
+  components: { Pagination, Detail, importExcel },
   directives: { permission },
   data() {
     return {
@@ -169,6 +181,7 @@ export default {
       },
       customerInfos: [],
       searchContent: "", // 输入内容
+      searchVersion: "", // 输入内容
       drawer: false,
       form: {
         version: "",
@@ -243,7 +256,7 @@ export default {
     },
   },
   methods: {
-     dblhandleCurrentChange(row, column, cell, event) {
+    dblhandleCurrentChange(row, column, cell, event) {
       if (column.label === "备注") {
         row.isEditCell = true;
         this.$set(row, "isEditCell", true);
@@ -363,12 +376,15 @@ export default {
         this.listQuery.SkipCount = (this.page - 1) * 15;
       }
       this.$axios
-        .posts("/api/settleaccount/WMSCusomerKanbanoutput/WmsCustomerKanbanList", this.listQuery)
+        .posts(
+          "/api/settleaccount/WMSCusomerKanbanoutput/WmsCustomerKanbanList",
+          this.listQuery
+        )
         .then((response) => {
           this.list = response.items;
           //alert(JSON.stringify(response.Items))
           this.totalCount = response.totalCount;
-           //动态加一个是否编辑的标识
+          //动态加一个是否编辑的标识
           this.list.forEach((element) => {
             element["isEditCell"] = false;
           });
@@ -385,7 +401,7 @@ export default {
     handleFilter() {
       this.page = 1;
       this.getList();
-      this.listQuery.Filters = [];
+      let Filter = [];
       if (this.searchContent != "") {
         var column = "billNum";
         let filter = {
@@ -394,11 +410,30 @@ export default {
           action: 6,
           value: this.searchContent,
         };
-        this.listQuery.Filters.push(filter);
+        Filter.push(filter);
       }
+      if (this.searchVersion != "") {
+        var column = "version";
+        let filter = {
+          logic: 0,
+          column: column,
+          action: 6,
+          value: this.searchVersion,
+        };
+        Filter.push(filter);
+      }
+      console.log("筛选条件" + JSON.stringify(Filter));
+      this.listQuery.Filters = Filter;
+
+      this.getList();
+    },
+    resetQuery() {
+      this.searchContent = "";
+      this.searchVersion = "";
+      this.listQuery.Filters = [];
+      this.listQuery.SkipCount = 1;
       this.getList();
     },
-    resetQuery() {},
     sortChange(data) {
       const { prop, order } = data;
       if (!prop || !order) {
diff --git a/vue/src/views/ux/vw/dataInput/OnetimeSale/index.vue b/vue/src/views/ux/vw/dataInput/OnetimeSale/index.vue
index c859e0a6..25e463ce 100644
--- a/vue/src/views/ux/vw/dataInput/OnetimeSale/index.vue
+++ b/vue/src/views/ux/vw/dataInput/OnetimeSale/index.vue
@@ -11,6 +11,15 @@
         class="search-container"
         @keyup.enter.native="handleFilter"
       />
+      <el-input
+        v-model="searchVersion"
+        clearable
+        size="small"
+        placeholder="按照版本号搜索..."
+        style="width: 200px"
+        class="search-container"
+        @keyup.enter.native="handleFilter"
+      />
       <el-button
         size="mini"
         type="success"
@@ -18,6 +27,9 @@
         @click="handleFilter"
         >搜索
       </el-button>
+      <el-button icon="el-icon-refresh" size="mini" @click="resetQuery()"
+        >重置</el-button
+      >
       <el-button
         class="filter-item"
         size="mini"
@@ -169,6 +181,7 @@ export default {
       },
       customerInfos: [],
       searchContent: "", // 输入内容
+      searchVersion: "", // 输入内容
       drawer: false,
       form: {
         version: "",
@@ -363,7 +376,10 @@ export default {
         this.listQuery.SkipCount = (this.page - 1) * 15;
       }
       this.$axios
-        .posts("/api/settleaccount/WmsOneTimeSaleOutput/WmsKanbanList", this.listQuery)
+        .posts(
+          "/api/settleaccount/WmsOneTimeSaleOutput/WmsKanbanList",
+          this.listQuery
+        )
         .then((response) => {
           this.list = response.items;
           //alert(JSON.stringify(response.Items))
@@ -385,7 +401,7 @@ export default {
     handleFilter() {
       this.page = 1;
       this.getList();
-      this.listQuery.Filters = [];
+      let Filter = [];
       if (this.searchContent != "") {
         var column = "billNum";
         let filter = {
@@ -394,11 +410,30 @@ export default {
           action: 6,
           value: this.searchContent,
         };
-        this.listQuery.Filters.push(filter);
+        Filter.push(filter);
       }
+      if (this.searchVersion != "") {
+        var column = "version";
+        let filter = {
+          logic: 0,
+          column: column,
+          action: 6,
+          value: this.searchVersion,
+        };
+        Filter.push(filter);
+      }
+      console.log("筛选条件" + JSON.stringify(Filter));
+      this.listQuery.Filters = Filter;
+
+      this.getList();
+    },
+    resetQuery() {
+      this.searchContent = "";
+      this.searchVersion = "";
+      this.listQuery.Filters = [];
+      this.listQuery.SkipCount = 1;
       this.getList();
     },
-    resetQuery() {},
     sortChange(data) {
       const { prop, order } = data;
       if (!prop || !order) {
diff --git a/vue/src/views/ux/vw/dataInput/hq_h_checkout/index.vue b/vue/src/views/ux/vw/dataInput/hq_h_checkout/index.vue
index 98a71421..e0cb1642 100644
--- a/vue/src/views/ux/vw/dataInput/hq_h_checkout/index.vue
+++ b/vue/src/views/ux/vw/dataInput/hq_h_checkout/index.vue
@@ -11,6 +11,15 @@
         class="search-container"
         @keyup.enter.native="handleFilter"
       />
+      <el-input
+        v-model="searchVersion"
+        clearable
+        size="small"
+        placeholder="按照版本号搜索..."
+        style="width: 200px"
+        class="search-container"
+        @keyup.enter.native="handleFilter"
+      />
       <el-button
         size="mini"
         type="success"
@@ -18,6 +27,9 @@
         @click="handleFilter"
         >搜索
       </el-button>
+      <el-button icon="el-icon-refresh" size="mini" @click="resetQuery()"
+        >重置</el-button
+      >
       <el-button
         class="filter-item"
         size="mini"
@@ -169,6 +181,7 @@ export default {
       },
       customerInfos: [],
       searchContent: "", // 输入内容
+      searchVersion: "", // 输入内容
       drawer: false,
       form: {
         version: "",
@@ -384,11 +397,29 @@ export default {
           this.listLoading = false;
         });
     },
+    // /** 筛选操作 */
+    // handleFilter() {
+    //   this.page = 1;
+    //   this.getList();
+    //   this.listQuery.Filters = [];
+    //   if (this.searchContent != "") {
+    //     var column = "billNum";
+    //     let filter = {
+    //       logic: 0,
+    //       column: column,
+    //       action: 6,
+    //       value: this.searchContent,
+    //     };
+    //     this.listQuery.Filters.push(filter);
+    //   }
+    //   this.getList();
+    // },
+    // resetQuery() {},
     /** 筛选操作 */
     handleFilter() {
       this.page = 1;
       this.getList();
-      this.listQuery.Filters = [];
+      let Filter = [];
       if (this.searchContent != "") {
         var column = "billNum";
         let filter = {
@@ -397,11 +428,30 @@ export default {
           action: 6,
           value: this.searchContent,
         };
-        this.listQuery.Filters.push(filter);
+        Filter.push(filter);
       }
+      if (this.searchVersion != "") {
+        var column = "version";
+        let filter = {
+          logic: 0,
+          column: column,
+          action: 6,
+          value: this.searchVersion,
+        };
+        Filter.push(filter);
+      }
+      console.log("筛选条件" + JSON.stringify(Filter));
+      this.listQuery.Filters = Filter;
+
+      this.getList();
+    },
+    resetQuery() {
+      this.searchContent = "";
+      this.searchVersion = "";
+      this.listQuery.Filters = [];
+      this.listQuery.SkipCount = 1;
       this.getList();
     },
-    resetQuery() {},
     sortChange(data) {
       const { prop, order } = data;
       if (!prop || !order) {
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
index 7f27e497..744c9f11 100644
--- a/vue/src/views/ux/vw/dataInput/hq_h_outorder/index.vue
+++ b/vue/src/views/ux/vw/dataInput/hq_h_outorder/index.vue
@@ -11,6 +11,15 @@
         class="search-container"
         @keyup.enter.native="handleFilter"
       />
+      <el-input
+        v-model="searchVersion"
+        clearable
+        size="small"
+        placeholder="按照版本号搜索..."
+        style="width: 200px"
+        class="search-container"
+        @keyup.enter.native="handleFilter"
+      />
       <el-button
         size="mini"
         type="success"
@@ -18,6 +27,9 @@
         @click="handleFilter"
         >搜索
       </el-button>
+      <el-button icon="el-icon-refresh" size="mini" @click="resetQuery()"
+        >重置</el-button
+      >
       <el-button
         class="filter-item"
         size="mini"
@@ -78,7 +90,7 @@
           {{ scope.column.label }}
         </template>
       </el-table-column>
-      
+
       <el-table-column label="备注" width="400" align="center">
         <template slot-scope="scope">
           <el-input
@@ -169,6 +181,7 @@ export default {
       },
       customerInfos: [],
       searchContent: "", // 输入内容
+      searchVersion: "", // 输入内容
       drawer: false,
       form: {
         version: "",
@@ -384,11 +397,29 @@ export default {
           this.listLoading = false;
         });
     },
+    // /** 筛选操作 */
+    // handleFilter() {
+    //   this.page = 1;
+    //   this.getList();
+    //   this.listQuery.Filters = [];
+    //   if (this.searchContent != "") {
+    //     var column = "billNum";
+    //     let filter = {
+    //       logic: 0,
+    //       column: column,
+    //       action: 6,
+    //       value: this.searchContent,
+    //     };
+    //     this.listQuery.Filters.push(filter);
+    //   }
+    //   this.getList();
+    // },
+    // resetQuery() {},
     /** 筛选操作 */
     handleFilter() {
       this.page = 1;
       this.getList();
-      this.listQuery.Filters = [];
+      let Filter = [];
       if (this.searchContent != "") {
         var column = "billNum";
         let filter = {
@@ -397,11 +428,30 @@ export default {
           action: 6,
           value: this.searchContent,
         };
-        this.listQuery.Filters.push(filter);
+        Filter.push(filter);
       }
+      if (this.searchVersion != "") {
+        var column = "version";
+        let filter = {
+          logic: 0,
+          column: column,
+          action: 6,
+          value: this.searchVersion,
+        };
+        Filter.push(filter);
+      }
+      console.log("筛选条件" + JSON.stringify(Filter));
+      this.listQuery.Filters = Filter;
+
+      this.getList();
+    },
+    resetQuery() {
+      this.searchContent = "";
+      this.searchVersion = "";
+      this.listQuery.Filters = [];
+      this.listQuery.SkipCount = 1;
       this.getList();
     },
-    resetQuery() {},
     sortChange(data) {
       const { prop, order } = data;
       if (!prop || !order) {
diff --git a/vue/src/views/ux/vw/dataInput/hq_kb_output/index.vue b/vue/src/views/ux/vw/dataInput/hq_kb_output/index.vue
index 3a53d124..95f82c36 100644
--- a/vue/src/views/ux/vw/dataInput/hq_kb_output/index.vue
+++ b/vue/src/views/ux/vw/dataInput/hq_kb_output/index.vue
@@ -11,6 +11,15 @@
         class="search-container"
         @keyup.enter.native="handleFilter"
       />
+      <el-input
+        v-model="searchVersion"
+        clearable
+        size="small"
+        placeholder="按照版本号搜索..."
+        style="width: 200px"
+        class="search-container"
+        @keyup.enter.native="handleFilter"
+      />
       <el-button
         size="mini"
         type="success"
@@ -18,6 +27,9 @@
         @click="handleFilter"
         >搜索
       </el-button>
+      <el-button icon="el-icon-refresh" size="mini" @click="resetQuery()"
+        >重置</el-button
+      >
       <el-button
         class="filter-item"
         size="mini"
@@ -169,6 +181,7 @@ export default {
       },
       customerInfos: [],
       searchContent: "", // 输入内容
+      searchVersion: "", // 输入内容
       drawer: false,
       form: {
         version: "",
@@ -385,7 +398,7 @@ export default {
     handleFilter() {
       this.page = 1;
       this.getList();
-      this.listQuery.Filters = [];
+      let Filter = [];
       if (this.searchContent != "") {
         var column = "billNum";
         let filter = {
@@ -394,11 +407,30 @@ export default {
           action: 6,
           value: this.searchContent,
         };
-        this.listQuery.Filters.push(filter);
+        Filter.push(filter);
       }
+      if (this.searchVersion != "") {
+        var column = "version";
+        let filter = {
+          logic: 0,
+          column: column,
+          action: 6,
+          value: this.searchVersion,
+        };
+        Filter.push(filter);
+      }
+      console.log("筛选条件" + JSON.stringify(Filter));
+      this.listQuery.Filters = Filter;
+
+      this.getList();
+    },
+    resetQuery() {
+      this.searchContent = "";
+      this.searchVersion = "";
+      this.listQuery.Filters = [];
+      this.listQuery.SkipCount = 1;
       this.getList();
     },
-    resetQuery() {},
     sortChange(data) {
       const { prop, order } = data;
       if (!prop || !order) {
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
index a6aaebc8..ad1cd6e1 100644
--- a/vue/src/views/ux/vw/dataInput/hq_unsettle_factory/index.vue
+++ b/vue/src/views/ux/vw/dataInput/hq_unsettle_factory/index.vue
@@ -951,9 +951,9 @@ export default {
           }
 
           if (this.checked == true) {
-            this.listExportQuery.isContainVersion = "0";
+            this.listExportQuery.isContainVersion = "0";//默认选择中
           } else {
-            this.listExportQuery.isContainVersion = "1";
+            this.listExportQuery.isContainVersion = "1";//去掉勾选
           }
 
           this.listExportQuery.begin = this.startTime
diff --git a/vue/src/views/ux/vw/dataInput/hq_y_outorder/index.vue b/vue/src/views/ux/vw/dataInput/hq_y_outorder/index.vue
index 02c4b4b7..4760c058 100644
--- a/vue/src/views/ux/vw/dataInput/hq_y_outorder/index.vue
+++ b/vue/src/views/ux/vw/dataInput/hq_y_outorder/index.vue
@@ -11,6 +11,15 @@
         class="search-container"
         @keyup.enter.native="handleFilter"
       />
+      <el-input
+        v-model="searchVersion"
+        clearable
+        size="small"
+        placeholder="按照版本号搜索..."
+        style="width: 200px"
+        class="search-container"
+        @keyup.enter.native="handleFilter"
+      />
       <el-button
         size="mini"
         type="success"
@@ -18,6 +27,9 @@
         @click="handleFilter"
         >搜索
       </el-button>
+      <el-button icon="el-icon-refresh" size="mini" @click="resetQuery()"
+        >重置</el-button
+      >
       <el-button
         class="filter-item"
         size="mini"
@@ -169,6 +181,7 @@ export default {
       },
       customerInfos: [],
       searchContent: "", // 输入内容
+      searchVersion: "", // 输入内容
       drawer: false,
       form: {
         version: "",
@@ -388,7 +401,7 @@ export default {
     handleFilter() {
       this.page = 1;
       this.getList();
-      this.listQuery.Filters = [];
+      let Filter = [];
       if (this.searchContent != "") {
         var column = "billNum";
         let filter = {
@@ -397,11 +410,30 @@ export default {
           action: 6,
           value: this.searchContent,
         };
-        this.listQuery.Filters.push(filter);
+        Filter.push(filter);
       }
+      if (this.searchVersion != "") {
+        var column = "version";
+        let filter = {
+          logic: 0,
+          column: column,
+          action: 6,
+          value: this.searchVersion,
+        };
+        Filter.push(filter);
+      }
+      console.log("筛选条件" + JSON.stringify(Filter));
+      this.listQuery.Filters = Filter;
+
+      this.getList();
+    },
+    resetQuery() {
+      this.searchContent = "";
+      this.searchVersion = "";
+      this.listQuery.Filters = [];
+      this.listQuery.SkipCount = 1;
       this.getList();
     },
-    resetQuery() {},
     sortChange(data) {
       const { prop, order } = data;
       if (!prop || !order) {
diff --git a/vue/static/config.js b/vue/static/config.js
index 9df2870c..b9188ddc 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',
@@ -40,8 +40,9 @@ if (process.env.NODE_ENV === 'development') {
       ip: 'http://192.168.0.67',
       //ip: 'http://192.168.0.140',
       //ip: 'http://149.223.116.5',
-      //ip: 'http://114.116.225.148',
+      //ip: 'http://124.220.28.250',
       //ip: 'http://10.123.148.162',
+      //ip: 'http://121.36.30.37',
       auth_port: '8066',
       public_port: '8092',
       backend_port: '8092'