From 0a251e40e30e7c8a96d71b3b9b6c459d4dfa4b22 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期三, 08 七月 2026 23:04:45 +0800
Subject: [PATCH] 暂存

---
 src/views/inventoryManagement/dispatchLog/Record.vue |  148 ++++++++++++++++++++++++++++++++++---------------
 1 files changed, 103 insertions(+), 45 deletions(-)

diff --git a/src/views/inventoryManagement/dispatchLog/Record.vue b/src/views/inventoryManagement/dispatchLog/Record.vue
index dd47cb4..c7d53ab 100644
--- a/src/views/inventoryManagement/dispatchLog/Record.vue
+++ b/src/views/inventoryManagement/dispatchLog/Record.vue
@@ -1,41 +1,84 @@
 <template>
   <div>
     <div class="search_form" style="margin-bottom: 10px">
-      <div>
-        <span class="search_title ml10">鍑哄簱鏃ユ湡锛�</span>
-        <el-date-picker
-          v-model="searchForm.timeStr"
-          type="date"
-          placeholder="璇烽�夋嫨鏃ユ湡"
-          value-format="YYYY-MM-DD"
-          format="YYYY-MM-DD"
-          clearable
-          @change="handleQuery"
-        />
-        <span class="search_title ml10">鏉ユ簮锛�</span>
-        <el-select
-          v-model="searchForm.recordType"
-          style="width: 240px"
-          placeholder="璇烽�夋嫨"
-          clearable
-        >
-          <el-option
-            v-for="item in stockRecordTypeOptions"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
-        </el-select>
-        <el-button type="primary" @click="handleQuery" style="margin-left: 10px"
-          >鎼滅储</el-button
-        >
-      </div>
-      <div>
-        <el-button type="primary" @click="handleBatchApprove">瀹℃壒</el-button>
-        <el-button @click="handleOut">瀵煎嚭</el-button>
-        <el-button type="danger" plain @click="handleDelete">鍒犻櫎</el-button>
-        <el-button type="primary" plain @click="handlePrint">鎵撳嵃</el-button>
-      </div>
+      <el-form
+          ref="searchFormRef"
+          :model="searchForm"
+          class="demo-form-inline"
+      >
+        <el-row :gutter="20">
+          <el-col :span="4">
+            <el-form-item label="鍑哄簱鏃ユ湡" prop="timeStr">
+              <el-date-picker v-model="searchForm.timeStr"
+                              type="date"
+                              placeholder="璇烽�夋嫨鏃ユ湡"
+                              value-format="YYYY-MM-DD"
+                              format="YYYY-MM-DD"
+                              clearable/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="浜у搧澶х被" prop="productName">
+              <el-input v-model="searchForm.productName"
+                        style="width: 240px"
+                        placeholder="璇疯緭鍏�"
+                        clearable/>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="4">
+            <el-form-item label="浜у搧瑙勬牸" prop="model">
+              <el-input v-model="searchForm.model"
+                        style="width: 240px"
+                        placeholder="璇疯緭鍏�"
+                        clearable/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="鎵瑰彿" prop="batchNo">
+              <el-input v-model="searchForm.batchNo"
+                        style="width: 240px"
+                        placeholder="璇疯緭鍏�"
+                        clearable/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="鏉ユ簮" prop="recordType">
+              <el-select
+                  v-model="searchForm.recordType"
+                  style="width: 240px"
+                  placeholder="璇烽�夋嫨"
+                  clearable
+              >
+                <el-option
+                    v-for="item in stockRecordTypeOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <!-- 鎸夐挳 -->
+          <el-col :span="4">
+            <el-form-item>
+              <el-button type="primary" @click="getList">
+                鎼滅储
+              </el-button>
+
+              <el-button @click="resetSearch">
+                閲嶇疆
+              </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+    <div class="actions">
+      <!-- <el-button type="primary" @click="handleBatchApprove">瀹℃壒</el-button> -->
+      <el-button @click="handleOut">瀵煎嚭</el-button>
+      <el-button type="danger" plain @click="handleDelete">鍒犻櫎</el-button>
+      <el-button type="primary" plain @click="handlePrint">鎵撳嵃</el-button>
     </div>
     <div class="table_list">
       <el-table
@@ -59,28 +102,34 @@
         <el-table-column
           label="鍑哄簱鏃ユ湡"
           prop="createTime"
+          width="120"
           show-overflow-tooltip
-        />
+        >
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
         <el-table-column
           label="浜у搧澶х被"
           prop="productName"
           show-overflow-tooltip
         />
         <el-table-column label="瑙勬牸鍨嬪彿" prop="model" show-overflow-tooltip />
-        <el-table-column label="鎵瑰彿" prop="batchNo" show-overflow-tooltip />
-        <el-table-column label="鍗曚綅" prop="unit" show-overflow-tooltip />
+        <el-table-column label="鎵瑰彿" prop="batchNo" width="150" show-overflow-tooltip />
+        <el-table-column label="鍗曚綅" prop="unit" width="80" show-overflow-tooltip />
         <el-table-column
           label="鍑哄簱鏁伴噺"
           prop="stockOutNum"
+          width="80"
           show-overflow-tooltip
         />
-        <el-table-column label="鍑哄簱浜�" prop="createBy" show-overflow-tooltip />
+        <el-table-column label="鍑哄簱浜�" prop="createBy" width="100" show-overflow-tooltip />
         <el-table-column label="鏉ユ簮" prop="recordType" show-overflow-tooltip>
           <template #default="scope">
             {{ getRecordType(scope.row.recordType) }}
           </template>
         </el-table-column>
-        <el-table-column
+        <!-- <el-table-column
           label="瀹℃壒鐘舵��"
           prop="approvalStatus"
           show-overflow-tooltip
@@ -93,7 +142,7 @@
               {{ getApprovalStatusLabel(scope.row.approvalStatus) }}
             </el-tag>
           </template>
-        </el-table-column>
+        </el-table-column> -->
       </el-table>
       <pagination
         v-show="total > 0"
@@ -122,6 +171,7 @@
   findAllQualifiedStockOutRecordTypeOptions,
   findAllUnQualifiedStockOutRecordTypeOptions,
 } from "@/api/basicData/enum.js";
+import { parseTime } from "@/utils/ruoyi";
 
 const userStore = useUserStore();
 const { proxy } = getCurrentInstance();
@@ -162,12 +212,14 @@
 });
 const { searchForm } = toRefs(data);
 
-// 鏌ヨ鍒楄〃
-/** 鎼滅储鎸夐挳鎿嶄綔 */
-const handleQuery = () => {
+const searchFormRef = ref(null);
+
+const resetSearch = () => {
+  searchFormRef.value?.resetFields();
   page.current = 1;
   getList();
-};
+}
+
 const paginationChange = (obj) => {
   page.current = obj.page;
   page.size = obj.limit;
@@ -812,4 +864,10 @@
     page-break-after: avoid;
   }
 }
+
+.actions {
+  display: flex;
+  justify-content: flex-end;
+  margin-bottom: 10px;
+}
 </style>

--
Gitblit v1.9.3