From b71bf526947a2c297eaf39a8a563f3926901e5c4 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Mon, 27 Nov 2023 09:31:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=9F=A5=E8=AF=A2=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/basic/busType.js                    |  9 +++
 src/views/inventory/supInoutSearchOrder.vue | 74 +++++++++++----------
 2 files changed, 49 insertions(+), 34 deletions(-)

diff --git a/src/api/basic/busType.js b/src/api/basic/busType.js
index 982a4d58..68741052 100644
--- a/src/api/basic/busType.js
+++ b/src/api/basic/busType.js
@@ -19,6 +19,15 @@ export function getLocalJoinByUser(params) {
 }
 
 
+export function getOrderDetailBus(params) {
+  return axios({
+    url: "/udiwms/orderDetail/busTypes",
+    method: "get",
+    params: params
+  });
+}
+
+
 export function insertBusType(data) {
   return axios({
     url: "/udiwms/bussinessType/insert",
diff --git a/src/views/inventory/supInoutSearchOrder.vue b/src/views/inventory/supInoutSearchOrder.vue
index 7d16ad1c..50ced752 100644
--- a/src/views/inventory/supInoutSearchOrder.vue
+++ b/src/views/inventory/supInoutSearchOrder.vue
@@ -1,81 +1,61 @@
 <template>
   <div>
     <el-card class="el-card">
-      <el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
+      <el-form :model="filterQuery" size="mini" label-width="100px" v-show="showSearch">
         <el-row>
           <el-col :span="6">
-            <el-form-item class="query-form-item" label="出入库单号:">
+            <el-form-item label="出入库单号:">
               <el-input v-model="filterQuery.orderIdFk" placeholder="请输入出入库单号" style="width: 90%"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item class="query-form-item" label="DI/物资编码:">
+            <el-form-item label="DI/物资编码:">
               <el-input v-model="filterQuery.nameCode" placeholder="请输入DI/物资编码" style="width: 90%"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item class="query-form-item" label="物资名称:">
+            <el-form-item label="物资名称:">
               <el-input v-model="filterQuery.coName" placeholder="请输入物资名称" style="width: 90%"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item class="query-form-item" label="规格型号:">
+            <el-form-item label="规格型号:">
               <el-input v-model="filterQuery.spec" placeholder="请输入规格型号" style="width: 90%"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="6">
-            <el-form-item class="query-form-item" label="批次号:">
+            <el-form-item label="批次号:">
               <el-input v-model="filterQuery.batchNo" placeholder="请输入批次号" style="width: 90%"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item class="query-form-item" label="注册/备案号:">
+            <el-form-item label="注册/备案号:">
               <el-input v-model="filterQuery.zczbhhzbapzbh" placeholder="注册/备案号"
                         style="width: 90%"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item class="query-form-item" label="生产企业:">
+            <el-form-item label="生产企业:">
               <el-input v-model="filterQuery.manufacturer" placeholder="生产企业"
                         style="width: 90%"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item class="query-form-item" label="出入库时间:">
-              <el-date-picker
-                :picker-options="pickerOptions"
-                v-model="actDateRange"
-                type="daterange"
-                format="yyyy 年 MM 月 dd 日"
-                value-format="yyyy-MM-dd"
-                range-separator="至"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
-                style="width: 90%"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="6">
-            <el-form-item class="query-form-item" label="往来单位:">
+            <el-form-item label="往来单位:">
               <el-input v-model="filterQuery.keyWords" placeholder="请选择往来单位"
                         style="width: 90%"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item class="query-form-item" label="出入库类型:">
+            <el-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>
@@ -83,7 +63,6 @@
               </el-select>
             </el-form-item>
           </el-col>
-
           <el-col :span="6">
             <el-form-item prop="action" label="单据类型:">
               <el-select
@@ -102,7 +81,31 @@
               </el-select>
             </el-form-item>
           </el-col>
-
+          <el-col :span="6">
+            <el-form-item label="打印状态:">
+              <el-select v-model="filterQuery.inoutPrintStatus" placeholder="请选择打印状态" style="width: 90%">
+                <el-option label="全部" value=""></el-option>
+                <el-option label="未打印" :value="0"></el-option>
+                <el-option label="已打印" :value="1"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出入库时间:">
+              <el-date-picker
+                :picker-options="pickerOptions"
+                v-model="actDateRange"
+                type="daterange"
+                format="yyyy 年 MM 月 dd 日"
+                value-format="yyyy-MM-dd"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                style="width: 90%"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <div class="top-right-btn">
@@ -168,7 +171,7 @@ import {
   printOrder,
   excelInoutImport, postExcelInoutImport
 } from '@/api/inout/orderDetailResult'
-import {findByInvUser, getLocalJoinByUser} from "@/api/basic/busType";
+import {findByInvUser, getLocalJoinByUser, getOrderDetailBus} from "@/api/basic/busType";
 import {getCorrespondence} from "@/api/basic/basicUnitMaintain";
 import {excelImport} from "@/api/inout/statData";
 
@@ -193,6 +196,8 @@ export default {
         actionType: null,
         fromCorp: null,
         keyWords: null,
+        inoutPrintStatus: null,
+
       },
 
       printMap: {
@@ -302,8 +307,9 @@ export default {
       let query = {
         code: this.$store.getters.locInvCode,
         enabled: true,
+        detailType: this.actionType
       };
-      getLocalJoinByUser(query)
+      getOrderDetailBus(query)
         .then((response) => {
           this.busTypeOptions = response.data.list || [];
         })