From c7e0d7f56e315be01a35c90d1f831145afea731b Mon Sep 17 00:00:00 2001
From: 44673626 <44673626@qq.com>
Date: Sun, 20 Mar 2022 10:54:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=8D=95=E5=88=B0SAP?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BF=AE=E6=94=B9=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vue/src/views/ux/basedata/Invoice/index.vue   |   4 +-
 .../billManage/WMSOutputSumReport/index.vue   | 138 ++++++++++++------
 .../ux/vw/dataInput/hq_h_sparepart/index.vue  |  22 +--
 3 files changed, 100 insertions(+), 64 deletions(-)

diff --git a/vue/src/views/ux/basedata/Invoice/index.vue b/vue/src/views/ux/basedata/Invoice/index.vue
index 412f62e5..a9bf5f3c 100644
--- a/vue/src/views/ux/basedata/Invoice/index.vue
+++ b/vue/src/views/ux/basedata/Invoice/index.vue
@@ -37,9 +37,9 @@
           <el-dropdown-item command="excel" icon="el-icon-plus"
             >导出Excel</el-dropdown-item
           >
-          <el-dropdown-item command="csv" icon="el-icon-circle-plus"
+          <!-- <el-dropdown-item command="csv" icon="el-icon-circle-plus"
             >导出Csv</el-dropdown-item
-          >
+          > -->
         </el-dropdown-menu>
       </el-dropdown>
       <el-input
diff --git a/vue/src/views/ux/billManage/WMSOutputSumReport/index.vue b/vue/src/views/ux/billManage/WMSOutputSumReport/index.vue
index b2217960..8b1f9f61 100644
--- a/vue/src/views/ux/billManage/WMSOutputSumReport/index.vue
+++ b/vue/src/views/ux/billManage/WMSOutputSumReport/index.vue
@@ -22,7 +22,7 @@
         type="warning"
         icon="el-icon-plus"
         @click="handleCreate"
-        >生成出库数据
+        >生成出库
       </el-button>
       <el-button
         class="filter-item"
@@ -32,10 +32,10 @@
         @click="handleDownload()"
         >导出Excel
       </el-button>
-
+ <!-- @change="SelectType" -->
       <el-select
         v-model="selectType"
-        @change="SelectType"
+       
         placeholder="请选择出库类型"
         style="width: 200px; margin-left: 8px"
       >
@@ -62,24 +62,57 @@
           value="一轿手工出库(备件)"
         ></el-option>
       </el-select>
-
-      <!-- <el-select
+  <!-- @change="selectState" -->
+      <el-select
         v-model="listQuery.state"
-        @change="selectState"
-        placeholder="请选择过滤状态"
-        style="width: 200px; margin-left: 8px"
+        placeholder="选择状态"
+        style="width: 100px; margin-left: 8px"
       >
         <el-option label="新建" :value="0"></el-option>
         <el-option label="已申请" :value="1"></el-option>
         <el-option label="成功" :value="2"></el-option>
         <el-option label="失败" :value="3"></el-option>
-      </el-select> -->
+      </el-select>
+
+       <el-select
+        v-model="listQuery.client"
+        placeholder="选择客户"
+        style="width: 100px; margin-left: 8px"
+      >
+        <el-option label="大众" value="大众"></el-option>
+        <el-option label="红旗" value="红旗"></el-option>
+        <el-option label="一轿" value="一轿"></el-option>
+      </el-select>
+
+
+       <el-select
+          v-model="listQuery.materialGroup"
+                size="medium"
+                multiple
+                filterable
+                clearable
+                style="width: 280px; margin-right: 15px"
+                @change="valueChange"
+                placeholder="请选择"
+              >
+                <el-option
+                  v-for="item in materialGroupList"
+                  :key="item.value"
+                  :label="item.value"
+                  :value="item.value"
+                >
+                  <span style="float: left">{{ item.label }}</span>
+                  <span style="float: right; color: #8492a6; font-size: 13px">{{
+                    item.value
+                  }}</span>
+              </el-option>
+          </el-select>
 
       <el-input
         v-model="searchContent"
         clearable
         size="small"
-        placeholder="按照结算单号搜索..."
+        placeholder="结算单号"
         style="width: 200px; margin-left: 8px"
         class="search-container"
         @keyup.enter.native="handleFilter"
@@ -100,13 +133,13 @@
         >同步到SAP
       </el-button>
       <!--表格头组件，filter查询-->
-      <c-r-m-table-head
+      <!-- <c-r-m-table-head
         ref="crmTableHead"
         :crm-type="crmType"
         @handle="handleHandle"
         @filter="handleFilters"
       >
-      </c-r-m-table-head>
+      </c-r-m-table-head> -->
     </flexbox>
     <!--表格渲染-->
     <el-table
@@ -215,22 +248,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <!-- <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="过账日期" required />
-          </el-col>
-          <el-col :md="20" :xs="24">
-            <el-form-item prop="dataValue">
-              <el-date-picker
-                v-model="dataValue"
-                style="width: 188px"
-                type="date"
-                value-format="yyyy-MM-dd"
-                placeholder="选择日期"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row> -->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="text" @click="dialogFormVisible = false"
@@ -272,7 +289,7 @@
               />
             </el-form-item>
           </el-col>
-          <!-- <el-col :md="4" :xs="24">
+
             <el-form-item label="出库类型" required />
           </el-col>
           <el-col :md="8" :xs="24">
@@ -429,6 +446,9 @@ export default {
         state: undefined,
         accountDate: undefined,
         type: "",
+        materialGroup: "",
+        client: "",
+        billNum: "",
       },
       listExportQuery: {
         Filters: [
@@ -447,6 +467,8 @@ export default {
         userId: "",
         accountDate: undefined,
       },
+      materialGroupList: [],
+      getmaterialGroupValue: "",
       page: 1,
       dialogFormVisible: false,
       dialogAccounDateVisible: false,
@@ -469,6 +491,7 @@ export default {
     //生成出库单时选择版本，从期间管理获得
     this.getAllVersionList();
     this.getJobVersionInfo();
+    this.getMaterialGroup();
     if (this.versionList == []) {
       this.getList();
     }
@@ -536,6 +559,36 @@ export default {
     },
   },
   methods: {
+    valueChange(data) {
+      this.getmaterialGroupValue = "";
+      this.getmaterialGroupValue += data + ",";
+      this.getmaterialGroupValue = this.getmaterialGroupValue.substring(
+        0,
+        this.getmaterialGroupValue.length - 1
+      );
+    },
+    //获取物料组车型
+    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;
+        });
+    },
     //版本下拉列表选择项
     JobVersionValue(params) {
       //版本下拉选择
@@ -827,18 +880,21 @@ export default {
     /** 筛选操作 */
     handleFilter() {
       this.page = 1;
-      this.getList();
-      this.listQuery.Filters = [];
-      if (this.searchContent != "") {
-        var column = "billNum";
-        let filter = {
-          logic: 0,
-          column: column,
-          action: 0,
-          value: this.searchContent,
-        };
-        this.listQuery.Filters.push(filter);
-      }
+      // this.getList();
+      // this.listQuery.Filters = [];
+      // if (this.searchContent != "") {
+      //   var column = "billNum";
+      //   let filter = {
+      //     logic: 0,
+      //     column: column,
+      //     action: 0,
+      //     value: this.searchContent,
+      //   };
+      //   this.listQuery.Filters.push(filter);
+      // }
+      this.listQuery.billNum = this.searchContent; //结算单号
+      this.listQuery.materialGroup = this.getmaterialGroupValue; //7物料组车型
+      this.listQuery.type = this.selectType; //出库类型
       this.getList();
     },
     /** 多项筛选操作 */
diff --git a/vue/src/views/ux/vw/dataInput/hq_h_sparepart/index.vue b/vue/src/views/ux/vw/dataInput/hq_h_sparepart/index.vue
index c6a5f7a1..20d39957 100644
--- a/vue/src/views/ux/vw/dataInput/hq_h_sparepart/index.vue
+++ b/vue/src/views/ux/vw/dataInput/hq_h_sparepart/index.vue
@@ -1158,27 +1158,7 @@ export default {
           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