From 8842d2cecee89dd7281a390e3e67f73ea646a243 Mon Sep 17 00:00:00 2001
From: ludj <ldj_willow@163.com>
Date: Thu, 23 Nov 2023 16:58:20 +0800
Subject: [PATCH] =?UTF-8?q?rev:=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lms/nladmin-ui/src/assets/styles/eladmin.scss | 12 ++++----
 .../src/views/wms/basedata/st/ivt/index.vue   |  5 +++-
 .../src/views/wms/stat/inbillquery/index2.vue | 30 ++++++++++---------
 .../views/wms/stat/outbillquery/index2.vue    | 24 +++++++--------
 .../src/views/wms/stat/pastivt/index.vue      | 24 +++++++--------
 5 files changed, 48 insertions(+), 47 deletions(-)

diff --git a/lms/nladmin-ui/src/assets/styles/eladmin.scss b/lms/nladmin-ui/src/assets/styles/eladmin.scss
index 57a62e5db..0970b01ac 100644
--- a/lms/nladmin-ui/src/assets/styles/eladmin.scss
+++ b/lms/nladmin-ui/src/assets/styles/eladmin.scss
@@ -4,11 +4,11 @@
   .filter-item {
     display: inline-block;
     vertical-align: middle;
-    margin: 0 3px 10px 0;
+    margin: 0 3px 3px 0;
 
     input {
-      height: 30.5px;
-      line-height: 30.5px;
+      height: 28px;
+      line-height: 28px;
     }
   }
 
@@ -19,7 +19,7 @@
     vertical-align: middle;
     font-size: 14px;
     color: #606266;
-    line-height: 30.5px;
+    line-height: 28px;
     padding: 0 7px 0 7px;
   }
 
@@ -28,7 +28,7 @@
   }
 
   .el-select__caret.el-input__icon.el-icon-arrow-up {
-    line-height: 30.5px;
+    line-height: 28px;
   }
 
   .date-item {
@@ -149,7 +149,7 @@
 }
 
 .el-form-item--mini.el-form-item {
-  margin-bottom: 10px !important;
+  margin-bottom: 8px !important;
 }
 
 //去除编辑文本框为数字时的上下箭头start
diff --git a/lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue b/lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue
index 5d86beac5..69c98f164 100644
--- a/lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue
+++ b/lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue
@@ -88,6 +88,7 @@
               clearable
               size="mini"
               placeholder="全部"
+              style="width: 200px;"
               class="filter-item"
               @change="crud.toQuery"
             >
@@ -117,13 +118,14 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item label="是否虚拟库">
+          <el-form-item label="是否虚拟">
             <el-select
               v-model="query.is_virtual"
               clearable
               size="mini"
               placeholder="请选择"
               class="filter-item"
+              style="width: 200px;"
               @change="crud.toQuery"
             >
               <el-option
@@ -140,6 +142,7 @@
               clearable
               multiple
               size="mini"
+              style="width: 200px;"
               placeholder="请选择"
               class="filter-item"
               @change="crud.toQuery"
diff --git a/lms/nladmin-ui/src/views/wms/stat/inbillquery/index2.vue b/lms/nladmin-ui/src/views/wms/stat/inbillquery/index2.vue
index 7d4916cc2..17fa6227c 100644
--- a/lms/nladmin-ui/src/views/wms/stat/inbillquery/index2.vue
+++ b/lms/nladmin-ui/src/views/wms/stat/inbillquery/index2.vue
@@ -28,18 +28,6 @@
               />
             </el-select>
           </el-form-item>
-
-          <el-form-item label="入库日期">
-            <el-date-picker
-              v-model="query.createTime"
-              type="daterange"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              :default-time="['00:00:00', '23:59:59']"
-            />
-          </el-form-item>
-
           <el-form-item label="业务类型">
             <el-select
               v-model="query.bill_type"
@@ -58,6 +46,17 @@
               />
             </el-select>
           </el-form-item>
+
+          <el-form-item label="入库日期">
+            <el-date-picker
+              v-model="query.createTime"
+              type="daterange"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              :default-time="['00:00:00', '23:59:59']"
+            />
+          </el-form-item>
           <el-form-item label="厚度幅宽">
             <el-input
               v-model="query.with"
@@ -68,6 +67,7 @@
             />
           </el-form-item>
           <el-form-item label="厚度">
+            <label slot="label">厚&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;度:</label>
             <el-input
               v-model="query.thickness_request"
               size="mini"
@@ -76,6 +76,7 @@
             />
           </el-form-item>
           <el-form-item label="子卷号">
+            <label slot="label">子&nbsp;&nbsp;卷&nbsp;号:</label>
             <el-input
               v-model="query.pcsn"
               size="mini"
@@ -83,7 +84,7 @@
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
-          <el-form-item label-width="120" label="销售订单及行号">
+          <el-form-item  label="订单行号">
             <el-input
               v-model="query.sale_order_name"
               size="mini"
@@ -107,7 +108,7 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item label="是否虚拟库">
+          <el-form-item label="是否虚拟">
             <el-select
               v-model="query.is_virtual"
               clearable
@@ -125,6 +126,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="班次">
+            <label slot="label">班&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;次:</label>
             <el-select
               v-model="query.classes"
               clearable
diff --git a/lms/nladmin-ui/src/views/wms/stat/outbillquery/index2.vue b/lms/nladmin-ui/src/views/wms/stat/outbillquery/index2.vue
index f124fafe9..066715717 100644
--- a/lms/nladmin-ui/src/views/wms/stat/outbillquery/index2.vue
+++ b/lms/nladmin-ui/src/views/wms/stat/outbillquery/index2.vue
@@ -28,19 +28,6 @@
               />
             </el-select>
           </el-form-item>
-
-          <el-form-item label="创建时间">
-            <el-date-picker
-              v-model="query.createTime"
-              type="daterange"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              :default-time="['00:00:00', '23:59:59']"
-              @change="crud.toQuery"
-            />
-          </el-form-item>
-
           <el-form-item label="业务类型">
             <el-select
               v-model="query.bill_types"
@@ -58,6 +45,17 @@
               />
             </el-select>
           </el-form-item>
+          <el-form-item label="创建时间">
+            <el-date-picker
+              v-model="query.createTime"
+              type="daterange"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              :default-time="['00:00:00', '23:59:59']"
+              @change="crud.toQuery"
+            />
+          </el-form-item>
           <el-form-item label="厚度幅宽">
             <el-input
               v-model="query.with"
diff --git a/lms/nladmin-ui/src/views/wms/stat/pastivt/index.vue b/lms/nladmin-ui/src/views/wms/stat/pastivt/index.vue
index 73fb8ab27..07d805ee3 100644
--- a/lms/nladmin-ui/src/views/wms/stat/pastivt/index.vue
+++ b/lms/nladmin-ui/src/views/wms/stat/pastivt/index.vue
@@ -106,19 +106,6 @@
             >
             </el-date-picker>
           </el-form-item>-->
-
-          <el-form-item label="生产日期">
-            <el-date-picker
-              v-model="query.createTime"
-              type="daterange"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              :default-time="['00:00:00', '23:59:59']"
-              @change="crud.toQuery"
-            />
-          </el-form-item>
-
           <el-form-item label="入库日期">
             <el-date-picker
               v-model="query.date_of_FG_inbound"
@@ -142,6 +129,17 @@
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
+          <el-form-item label="生产日期">
+            <el-date-picker
+              v-model="query.createTime"
+              type="daterange"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              :default-time="['00:00:00', '23:59:59']"
+              @change="crud.toQuery"
+            />
+          </el-form-item>
 
           <el-form-item label="客户编码">
             <el-input