From a3bc3dac5cc0fea2e9d15ab892e70ab650427c49 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Mon, 12 Jun 2023 15:38:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=A6=E7=A5=A8=E5=87=BA=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86=20=E6=B7=BB=E5=8A=A0=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inventory/supInoutSearchOrder.vue | 52 ++++++++++++++++++++-
 1 file changed, 51 insertions(+), 1 deletion(-)

diff --git a/src/views/inventory/supInoutSearchOrder.vue b/src/views/inventory/supInoutSearchOrder.vue
index 618e72c2..0ba6c12e 100644
--- a/src/views/inventory/supInoutSearchOrder.vue
+++ b/src/views/inventory/supInoutSearchOrder.vue
@@ -66,12 +66,43 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="6">
+            <el-form-item class="query-form-item" label="出入库类型:">
+              <el-select v-model="filterQuery.mainAction" placeholder="请选择出入库类型" style="width: 90%">
+                <el-option label="全部" value=""></el-option>
+                <el-option label="入库" value="WareHouseIn"></el-option>
+                <el-option label="出库" value="WareHouseOut"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6">
+            <el-form-item prop="action" label="单据类型:">
+              <el-select
+                v-model="filterQuery.action"
+                placeholder="请选择单据类型"
+                style="width: 90%"
+              >
+                <el-option
+                  v-for="item in busTypeOptions"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.action"
+                >
+                  <span style="float: left">{{ item.name }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+        </el-row>
       </el-form>
       <div class="top-right-btn">
         <el-button-group>
           <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
           <el-button type="primary" icon="el-icon-refresh" @click="optinPrint">选入打印</el-button>
-          <el-button type="primary" icon="el-icon-refresh" @click="selectPrint">查询打印</el-button>
+          <el-button type="primary" icon="el-icon-refresh" @click="selectPrint">查询结果打印</el-button>
           <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
           <el-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
         </el-button-group>
@@ -82,6 +113,7 @@
         <el-table-column type="selection" width="55"></el-table-column>
         <el-table-column label="序号" type="index"></el-table-column>
         <el-table-column label="供应商" prop="fromCorpName" width="160" v-if="showSup"></el-table-column>
+        <el-table-column label="往来单位" prop="fromName" width="160"></el-table-column>
         <el-table-column label="出入库单号" prop="orderIdFk" width="160"></el-table-column>
         <el-table-column label="DI/物资编码" prop="nameCode" width="160"></el-table-column>
         <el-table-column label="物资名称" prop="coName" width="160" show-overflow-tooltip></el-table-column>
@@ -111,6 +143,7 @@
 
 <script>
 import {getResultDetailList, getResultOrderList, verifyTemplateFile, printOrder} from '@/api/inout/orderDetailResult'
+import {findByInvUser, getLocalJoinByUser} from "@/api/basic/busType";
 
 export default {
   name: "supInoutSearchOrder",
@@ -118,6 +151,7 @@ export default {
     return {
       showSearch: true,
       list: {},
+      busTypeOptions:[],
       filterQuery: {
         id: "",
         orderIdFk: null,
@@ -214,6 +248,21 @@ export default {
     hideSearch() {
       this.showSearch = !this.showSearch;
     },
+
+    //根据仓库,用户获取单据类型
+    getBusTypeByInv() {
+      let query = {
+        code: this.$store.getters.locInvCode,
+        enabled: true,
+      };
+      getLocalJoinByUser(query)
+        .then((response) => {
+          this.busTypeOptions = response.data.list || [];
+        })
+        .catch(() => {
+        });
+    },
+
     getList() {
       this.loading = true;
       this.filterQuery.actionType = this.actionType;
@@ -322,6 +371,7 @@ export default {
     }
     this.actionType = this.$route.query.name;
     this.getList();
+    this.getBusTypeByInv();
   }
   ,
 }