From 4cc27f93a1901e12eb12a198029911c483dd991f Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期三, 27 八月 2025 14:30:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_JLMY' into dev_JLMY

---
 src/views/production/productionReporting/index.vue |   32 ++++++++++++++++----------------
 1 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/views/production/productionReporting/index.vue b/src/views/production/productionReporting/index.vue
index 7a1d60e..4022023 100644
--- a/src/views/production/productionReporting/index.vue
+++ b/src/views/production/productionReporting/index.vue
@@ -2,12 +2,12 @@
   <div class="app-container">
     <!-- 鎼滅储琛ㄥ崟 -->
     <el-form :inline="true" :model="queryParams" class="search-form">
-      <el-form-item label="鎼滅储">
-        <el-input
-            v-model="queryParams.searchAll"
-            placeholder="璇疯緭鍏ュ叧閿瘝"
-            clearable
-        />
+      <el-form-item label="鐘舵��">
+        <el-select style="width: 200px;" clearable v-model="queryParams.searchAll" placeholder="璇烽�夋嫨鐘舵��">
+          <el-option label="寰呯敓浜�" value="1"></el-option>
+          <el-option label="鐢熶骇涓�" value="2"></el-option>
+          <el-option label="宸插叆搴�" value="3"></el-option>
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" @click="handleSearch">鏌ヨ</el-button>
@@ -18,16 +18,16 @@
     <!-- 涓昏鍐呭鍖哄煙 -->
     <el-card>
       <!-- 鎿嶄綔鎸夐挳 -->
-      <div class="toolbar">
-        <el-button
-            type="danger"
-            :icon="Delete"
-            :disabled="!selectedRows.length"
-            @click="() => deleteSelected(delProductionScheduling)"
-        >
-          鍒犻櫎
-        </el-button>
-      </div>
+<!--      <div class="toolbar">-->
+<!--        <el-button-->
+<!--            type="danger"-->
+<!--            :icon="Delete"-->
+<!--            :disabled="!selectedRows.length"-->
+<!--            @click="() => deleteSelected(delProductionScheduling)"-->
+<!--        >-->
+<!--          鍒犻櫎-->
+<!--        </el-button>-->
+<!--      </div>-->
       <!-- 鏁版嵁琛ㄦ牸 -->
       <ETable
           :showOverflowTooltip="false"

--
Gitblit v1.9.3