From cd8c64312f4c3f4247f53cf5874febf9ab47ff76 Mon Sep 17 00:00:00 2001
From: ludj <ldj_willow@163.com>
Date: Wed, 22 Nov 2023 20:10:06 +0800
Subject: [PATCH] =?UTF-8?q?rev:=E5=89=8D=E7=AB=AF=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/wms/st/inAndOutReturn/index.vue | 49 ++++++++++---------
 1 file changed, 27 insertions(+), 22 deletions(-)

diff --git a/lms/nladmin-ui/src/views/wms/st/inAndOutReturn/index.vue b/lms/nladmin-ui/src/views/wms/st/inAndOutReturn/index.vue
index b276655e3..ce0a11ed0 100644
--- a/lms/nladmin-ui/src/views/wms/st/inAndOutReturn/index.vue
+++ b/lms/nladmin-ui/src/views/wms/st/inAndOutReturn/index.vue
@@ -82,6 +82,7 @@
             </el-select>
           </el-form-item>-->
           <el-form-item label="物料">
+            <label slot="label">物&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;料:</label>
             <el-input
               v-model="query.material_search"
               size="mini"
@@ -91,6 +92,7 @@
             />
           </el-form-item>
           <el-form-item label="批次">
+            <label slot="label">批&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;次:</label>
             <el-input
               v-model="query.pcsn"
               size="mini"
@@ -100,6 +102,7 @@
             />
           </el-form-item>
           <el-form-item label="SAP批次">
+            <label slot="label">SAP批&nbsp;次:</label>
             <el-input
               v-model="query.sap_pcsn"
               size="mini"
@@ -108,6 +111,26 @@
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
+          <el-form-item label="箱号">
+            <label slot="label">箱&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号:</label>
+            <el-input
+              v-model="query.box_no"
+              size="mini"
+              clearable
+              placeholder="箱号"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label="交货单">
+            <label slot="label">交&nbsp;货&nbsp;单:</label>
+            <el-input
+              v-model="query.vbeln"
+              size="mini"
+              clearable
+              placeholder="交货单"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
           <el-form-item label="单据日期">
             <el-date-picker
               v-model="query.createTime"
@@ -119,24 +142,6 @@
               @change="crud.toQuery"
             />
           </el-form-item>
-          <el-form-item label="箱号">
-            <el-input
-              v-model="query.box_no"
-              size="mini"
-              clearable
-              placeholder="箱号"
-              @keyup.enter.native="crud.toQuery"
-            />
-          </el-form-item>
-          <el-form-item label="交货单">
-            <el-input
-              v-model="query.vbeln"
-              size="mini"
-              clearable
-              placeholder="交货单"
-              @keyup.enter.native="crud.toQuery"
-            />
-          </el-form-item>
           <el-form-item label="模糊查询">
             <el-input
               v-model="query.bill_code"
@@ -171,7 +176,7 @@
         <el-button
           slot="right"
           class="filter-item"
-          type="success"
+          type="primary"
           icon="el-icon-position"
           size="mini"
           @click="upload"
@@ -191,7 +196,7 @@
         <el-button
           slot="right"
           class="filter-item"
-          type="success"
+          type="info"
           icon="el-icon-position"
           size="mini"
           @click="uploadSAP"
@@ -201,7 +206,7 @@
         <el-button
           slot="right"
           class="filter-item"
-          type="success"
+          type="warning"
           icon="el-icon-position"
           size="mini"
           @click="disupload"
@@ -212,7 +217,7 @@
           slot="right"
           class="filter-item"
           type="success"
-          icon="el-icon-thumb"
+          icon="el-icon-download"
           size="mini"
           :loading="showDtlLoading"
           :disabled="crud.selections.length !== 1"