From ef0d3f626dfc2d1645a3433b2949922ccbe9a465 Mon Sep 17 00:00:00 2001
From: Amjacks <1932302177@qq.com>
Date: Thu, 10 Apr 2025 20:08:32 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=88=B0=E8=B4=A7=E5=8D=95=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/stockIn/StockInByCharge/index.vue | 2 +-
 src/views/stockIn/delivery/drawer.vue       | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/stockIn/StockInByCharge/index.vue b/src/views/stockIn/StockInByCharge/index.vue
index 6ca037e..efa248d 100644
--- a/src/views/stockIn/StockInByCharge/index.vue
+++ b/src/views/stockIn/StockInByCharge/index.vue
@@ -3,7 +3,7 @@
     <el-row class="page-search" justify="space-between" align="middle">
       <el-form ref="queryFormRef" :model="queryParams" :inline="true">
         <el-row :gutter="20">
-          <el-col :span="5">
+          <el-col :span="10">
             <el-form-item label="入库单" prop="queryParams.params">
               <el-Input v-model="state.queryParams.params.RECEIVEREQUESTNAME" placeholder="到货单"
                         @keydown.enter.prevent="handleQuery" clearable />
diff --git a/src/views/stockIn/delivery/drawer.vue b/src/views/stockIn/delivery/drawer.vue
index 94e2580..d28de06 100644
--- a/src/views/stockIn/delivery/drawer.vue
+++ b/src/views/stockIn/delivery/drawer.vue
@@ -163,14 +163,14 @@ onMounted(()=> {
     { header: "组织", field: "erpFactory", hide: false },
     { header: "组织(CN)", field: "orgName", hide: false },
     { header: "订单编号", field: "receiveRequestName", hide: false },
-    { header: "料号", field: "materialSpecName", hide: false },
-    { header: "品名", field: "descCn", hide: false },
+    // { header: "料号", field: "materialSpecName", hide: false },
+    // { header: "品名", field: "descCn", hide: false },
     { header: "出入库类型编码", field: "receiveRequestType", hide: false },
     { header: "订单状态", field: "receiveRequestState", hide: false },
     { header: "供应商编号", field: "supplierNo", hide: false },
     { header: "单据日期" , field: "orderDate", hide: false},
     { header: "供应商名称", field: "supplierName", hide: false },
-    { header: "创建日期", field: "createTime", hide: false },
+    // { header: "创建日期", field: "createTime", hide: false },
     { header: "最后操作名称", field: "lastEventName", hide: false },
     { header: "最后操作时间", field: "lastEventTime", hide: false },
     { header: "最后操作人", field: "lastEventUser", hide: false },
@@ -207,7 +207,7 @@ function queryInfo() {
 async function handleQuery() {
   state.loading = true
   state.receiveList = []
-  await getReceiveList(state.queryParams).then((res: any) => {
+  await getReceiveList({...state.queryParams, deliveryType: props.deliveryType}).then((res: any) => {
     state.dataList = res.resultObj.list
     state.total = res.resultObj.total
     state.loading = false