页面修改

ruoyi-admin-vue/src/views/inventory/orders/index.vue

@@ -54,13 +54,14 @@
 
     <!-- 页面容器 -->
     <div class="page-container">
-      <!-- 搜索区域 -->
-      <page-wrapper-search
-        :model="queryParams"
-        ref="queryForm"
-        size="small"
-        @search="handleQuery"
-        @reset="resetQuery"
+      <!-- 搜索区域 - 参考样式修改 -->
+      <el-form 
+        :model="queryParams" 
+        ref="queryForm" 
+        size="small" 
+        :inline="true" 
+        v-show="showSearch" 
+        label-width="100px"
       >
         <el-form-item label="出库单号" prop="orderId">
           <el-input
@@ -96,7 +97,7 @@
             v-model="queryParams.orderTypeId"
             placeholder="请输入出库类型"
             clearable
-            style="width: 100%"
+            style="width: 150px"
           >
            <el-option
               v-for="dict in dict.type.inbound_outbound_type"
@@ -120,7 +121,7 @@
             v-model="queryParams.orderStatus"
             placeholder="请选择订单状态"
             clearable
-            style="width: 100%"
+            style="width: 150px"
           >
             <el-option
               v-for="dict in dict.type.outbound_order_status"
@@ -150,7 +151,13 @@
             </template>
           </el-input>
         </el-form-item>
-      </page-wrapper-search>
+        
+        <!-- 新增搜索和重置按钮 -->
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
 
       <!-- 表格容器 -->
       <div class="table-container">
@@ -1271,6 +1278,13 @@ export default {
         ownerId: false,
         outboundOrderId: false
       }
+      // 核心修改：设置出库日期默认值为当前日期
+  const today = new Date()
+  const year = today.getFullYear()
+  const month = String(today.getMonth() + 1).padStart(2, '0')
+  const day = String(today.getDate()).padStart(2, '0')
+  this.form.inboundDate = `${year}-${month}-${day}`
+  
       this.open = true
       this.title = "添加出库单"
     },
@@ -1562,4 +1576,42 @@ export default {
     }
   }
 }
-</script>
+</script>
\ No newline at end of file
+<style scoped>
+.page-container {
+  padding: 16px;
+  background: #fff;
+  border-radius: 4px;
+  margin-bottom: 16px;
+  display: flex;
+  flex-direction: column;
+  height: calc(100vh - 140px);
+  min-height: 600px;
+}
+
+.table-container {
+  flex: 1;
+  min-height: 0;
+  margin-top: 16px;
+  display: flex;
+  flex-direction: column;
+  overflow-x: auto;
+}
+
+/* 补充样式，保持和参考页面一致 */
+.el-form-item {
+  margin-bottom: 16px;
+}
+
+.material-group {
+  margin-bottom: 16px;
+}
+
+.mb8 {
+  margin-bottom: 8px;
+}
+
+.mb10 {
+  margin-bottom: 10px;
+}
+</style>
\ No newline at end of file

ruoyi-inventory/src/main/resources/mapper/inventory/OutboundOrdersMapper.xml

@@ -108,7 +108,7 @@
         <if test="orderId != null  and orderId != ''"> and oo.order_id like concat('%', #{orderId}, '%')</if>
         <if test="batchCode != null  and batchCode != ''"> and oo.batch_code like concat('%', #{batchCode}, '%')</if>
         <if test="systemNo != null  and systemNo != ''"> and oo.system_no like concat('%', #{systemNo}, '%')</if>
-        <if test="orderTypeId != null  and orderTypeId != ''"> and oo.order_type_id = {orderTypeId}</if>
+        <if test="orderTypeId != null  and orderTypeId != ''"> and oo.order_type_id = #{orderTypeId}</if>
         <if test="orderType != null  and orderType != ''"> and oo.order_type = #{orderType}</if>
         <if test="batchCode != null  and batchCode != ''"> and oo.batch_code like concat('%', #{batchCode}, '%')</if>
         <if test="warehouseId != null  and warehouseId != ''"> and oo.warehouse_id = #{warehouseId}</if>