From e875ccb607bc37c9515217277aafb3d4204c6d14 Mon Sep 17 00:00:00 2001
From: chengxiangling <291105840@qq.com>
Date: 星期五, 16 五月 2025 15:23:56 +0800
Subject: [PATCH] 提交计划运行和基础数据的搜索条件

---
 src/views/mainPlan/abnormalProcessAnalysis/index.vue           |    2 
 src/views/basicData/event/index.vue                            |    4 
 src/views/mainPlan/sheetMetalSupplyGap/index.vue               |    8 
 src/views/mainPlan/plateProcessStat/index.vue                  |    9 
 src/views/basicData/gasMaterialUsage/index.vue                 |   15 
 src/views/basicData/resourceGroup/index.vue                    |    4 
 src/views/mainPlan/gasPiping/index.vue                         |   17 
 src/views/mainPlan/gasProduceStatics/index.vue                 |  104 +++++---
 src/views/basicData/bom/index.vue                              |   14 
 src/views/mainPlan/abnormalPartNumberReport/index.vue          |    8 
 src/views/mainPlan/gasPlanning/index.vue                       |   10 
 src/views/basicData/processRouteDataPreparate/index.vue        |    4 
 src/views/basicData/calendar/index.vue                         |    4 
 src/views/basicData/apsPlant/index.vue                         |    2 
 src/views/mainPlan/sheetMetalRedundantReport/index.vue         |    8 
 src/views/mainPlan/pipeProduceStatics/index.vue                |  106 +++++++--
 src/views/mainPlan/workOrderJobLog/index.vue                   |   31 --
 src/views/mainPlan/sheetMetalOrderManage/index.vue             |   37 ---
 src/views/basicData/apsShop/index.vue                          |    2 
 src/views/basicData/processCapacityManagement/index.vue        |    4 
 src/views/basicData/standardProcess/index.vue                  |  168 ++++++++------
 src/views/basicData/materialManagement/index.vue               |    4 
 .env.development                                               |    2 
 src/views/mainPlan/weldSeamEcharts/index.vue                   |    6 
 src/views/partPlan/index.vue                                   |   21 -
 src/views/mainPlan/pipePlanning/index.vue                      |   10 
 src/views/basicData/materialStorageManagement/index.vue        |    4 
 src/views/basicData/professionalFixedCycleManagement/index.vue |    4 
 28 files changed, 322 insertions(+), 290 deletions(-)

diff --git a/.env.development b/.env.development
index a4a0a7d..605a602 100644
--- a/.env.development
+++ b/.env.development
@@ -10,4 +10,4 @@
 # 閰嶅悎鍚庣鏈嶅姟
 # VITE_APP_LOCAL = 'int'
 # VITE_APP_LOCAL = 'zhl'
-VITE_APP_LOCAL = 'cxl'
\ No newline at end of file
+VITE_APP_LOCAL = 'hjy'
\ No newline at end of file
diff --git a/src/views/basicData/apsPlant/index.vue b/src/views/basicData/apsPlant/index.vue
index f1cc89a..8e939ae 100644
--- a/src/views/basicData/apsPlant/index.vue
+++ b/src/views/basicData/apsPlant/index.vue
@@ -40,7 +40,7 @@
           v-hasPermi="['plant:export']"
         >瀵煎嚭</el-button>
       </el-col>
-      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar :search="false" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <HxlhTable
diff --git a/src/views/basicData/apsShop/index.vue b/src/views/basicData/apsShop/index.vue
index f121dbd..fc0f1c7 100644
--- a/src/views/basicData/apsShop/index.vue
+++ b/src/views/basicData/apsShop/index.vue
@@ -31,7 +31,7 @@
           v-hasPermi="['shop:export']"
         >瀵煎嚭</el-button>
       </el-col>
-      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar :search="false" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <HxlhTable
diff --git a/src/views/basicData/bom/index.vue b/src/views/basicData/bom/index.vue
index 19efb8d..40a71f6 100644
--- a/src/views/basicData/bom/index.vue
+++ b/src/views/basicData/bom/index.vue
@@ -9,10 +9,9 @@
       label-position="left"
     >
       <el-row :gutter="20">
-        <el-col :span="locale === 'zh' ? 5 : 8">
-          <el-form-item :label="$t('plan.query.itemNumber')" :label-width="locale === 'zh' ? '50px' : '110px'" prop="itemCode">
+        <el-col :span="6">
+          <el-form-item :style="{ width: '100%' }" :label="$t('plan.query.itemNumber')" prop="itemCode">
             <el-input
-              :style="{ width: locale === 'zh' ? '140px' : '220px' }"
               v-model="queryParams.itemCode"
               :placeholder="`${$t('common.common.placeholder')}${$t(
                 'plan.query.itemNumber'
@@ -22,16 +21,15 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="locale === 'zh' ? 7 : 10">
+        <el-col :span="6">
           <el-form-item
+            :style="{ width: '100%' }"
             :label="$t('plan.table.applicableFactories')"
-            :label-width="locale === 'zh' ? '70px' : '150px'"
             prop="orgCode"
           >
             <el-select
               clearable
               v-model="queryParams.orgCode"
-              :style="{ width: locale === 'zh' ? '180px' : '280px' }"
               :placeholder="`${$t('common.common.placeholder')}${$t(
                 'plan.table.applicableFactories'
               )}`"
@@ -46,7 +44,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="locale === 'zh' ? 11 : 6" style="text-align: right">
+        <!-- <el-col :span="locale === 'zh' ? 11 : 6" style="text-align: right">
           <el-form-item class="column-with-margin">
             <el-button type="primary" icon="Search" @click="handleQuery">{{
               $t("common.common.query")
@@ -55,7 +53,7 @@
               $t("common.common.reset")
             }}</el-button>
           </el-form-item>
-        </el-col>
+        </el-col> -->
       </el-row>
     </el-form>
     <el-row :gutter="10" class="mb8">
diff --git a/src/views/basicData/calendar/index.vue b/src/views/basicData/calendar/index.vue
index cf00806..af6d220 100644
--- a/src/views/basicData/calendar/index.vue
+++ b/src/views/basicData/calendar/index.vue
@@ -38,14 +38,14 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="13" style="text-align: right">
+        <!-- <el-col :span="13" style="text-align: right">
           <el-form-item class="column-with-margin">
             <el-button type="primary" icon="Search" @click="handleQuery"
               >鏌ヨ</el-button
             >
             <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
           </el-form-item>
-        </el-col>
+        </el-col> -->
       </el-row>
     </el-form>
 
diff --git a/src/views/basicData/event/index.vue b/src/views/basicData/event/index.vue
index 7a59a76..db7db09 100644
--- a/src/views/basicData/event/index.vue
+++ b/src/views/basicData/event/index.vue
@@ -49,10 +49,10 @@
 <!--          placeholder="璇烽�夋嫨浜嬩欢缁撴潫鏃堕棿">-->
 <!--        </el-date-picker>-->
 <!--      </el-form-item>-->
-      <el-form-item>
+      <!-- <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
         <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
-      </el-form-item>
+      </el-form-item> -->
     </el-form>
 
     <el-row :gutter="10" class="mb8">
diff --git a/src/views/basicData/gasMaterialUsage/index.vue b/src/views/basicData/gasMaterialUsage/index.vue
index 0d6b106..da0f6ef 100644
--- a/src/views/basicData/gasMaterialUsage/index.vue
+++ b/src/views/basicData/gasMaterialUsage/index.vue
@@ -4,7 +4,7 @@
       <el-col>
         <el-form :model="queryParams" ref="queryRef" :inline="true" label-position="left" v-show="showSearch">
           <el-row :gutter="20">
-            <el-col :span="8">
+            <el-col :span="6">
               <el-form-item label="鏂欏彿" prop="itemNumber" :style="{ width: '100%' }">
                 <el-input
                     v-model="queryParams.itemNumber"
@@ -14,7 +14,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="6">
               <el-form-item label="鍥惧彿" prop="drawingNo" :style="{ width: '100%' }">
                 <el-input
                     v-model="queryParams.drawingNo"
@@ -24,7 +24,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="6">
               <el-form-item label="鐗堟湰" prop="version" :style="{ width: '100%' }">
                 <el-input
                     v-model="queryParams.version"
@@ -34,9 +34,7 @@
                 />
               </el-form-item>
             </el-col>
-          </el-row>
-          <el-row :gutter="20">
-            <el-col :span="8">
+            <el-col :span="6">
               <el-form-item label="宸ュ簭鍚嶇О" prop="processName" :style="{ width: '100%' }">
                 <el-input
                     v-model="queryParams.processName"
@@ -46,13 +44,16 @@
                 />
               </el-form-item>
             </el-col>
+          </el-row>
+          <!-- <el-row :gutter="20">
+            
             <el-col :span="16" style="text-align: right;">
               <el-form-item class="column-with-margin">
                 <el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
                 <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
               </el-form-item>
             </el-col>
-          </el-row>
+          </el-row> -->
         </el-form>
       </el-col>
     </el-row>
diff --git a/src/views/basicData/materialManagement/index.vue b/src/views/basicData/materialManagement/index.vue
index ccb05fe..6d98da6 100644
--- a/src/views/basicData/materialManagement/index.vue
+++ b/src/views/basicData/materialManagement/index.vue
@@ -12,12 +12,12 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="18" style="text-align: right;">
+        <!-- <el-col :span="18" style="text-align: right;">
           <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
               <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
             </el-form-item>
-        </el-col>
+        </el-col> -->
       </el-row>
     </el-form>
 
diff --git a/src/views/basicData/materialStorageManagement/index.vue b/src/views/basicData/materialStorageManagement/index.vue
index 4467600..3693cda 100644
--- a/src/views/basicData/materialStorageManagement/index.vue
+++ b/src/views/basicData/materialStorageManagement/index.vue
@@ -12,12 +12,12 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="18" style="text-align: right;">
+        <!-- <el-col :span="18" style="text-align: right;">
           <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
               <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
             </el-form-item>
-        </el-col>
+        </el-col> -->
       </el-row>
     </el-form>
 
diff --git a/src/views/basicData/processCapacityManagement/index.vue b/src/views/basicData/processCapacityManagement/index.vue
index d9a05bd..e20d4b3 100644
--- a/src/views/basicData/processCapacityManagement/index.vue
+++ b/src/views/basicData/processCapacityManagement/index.vue
@@ -12,12 +12,12 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="18" style="text-align: right;">
+        <!-- <el-col :span="18" style="text-align: right;">
           <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
               <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
             </el-form-item>
-        </el-col>
+        </el-col> -->
       </el-row>
     </el-form>
 
diff --git a/src/views/basicData/processRouteDataPreparate/index.vue b/src/views/basicData/processRouteDataPreparate/index.vue
index 242ff6d..257740b 100644
--- a/src/views/basicData/processRouteDataPreparate/index.vue
+++ b/src/views/basicData/processRouteDataPreparate/index.vue
@@ -46,7 +46,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="locale === 'zh' ? 11 : 6" style="text-align: right">
+        <!-- <el-col :span="locale === 'zh' ? 11 : 6" style="text-align: right">
           <el-form-item class="column-with-margin">
             <el-button type="primary" icon="Search" @click="handleQuery">{{
               $t("common.common.query")
@@ -55,7 +55,7 @@
               $t("common.common.reset")
             }}</el-button>
           </el-form-item>
-        </el-col>
+        </el-col> -->
       </el-row>
     </el-form>
     <el-row :gutter="10" class="mb8">
diff --git a/src/views/basicData/professionalFixedCycleManagement/index.vue b/src/views/basicData/professionalFixedCycleManagement/index.vue
index c190cb8..fe75d80 100644
--- a/src/views/basicData/professionalFixedCycleManagement/index.vue
+++ b/src/views/basicData/professionalFixedCycleManagement/index.vue
@@ -12,12 +12,12 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="18" style="text-align: right;">
+        <!-- <el-col :span="18" style="text-align: right;">
           <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
               <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
             </el-form-item>
-        </el-col>
+        </el-col> -->
       </el-row>
     </el-form>
 
diff --git a/src/views/basicData/resourceGroup/index.vue b/src/views/basicData/resourceGroup/index.vue
index 138b1a1..fb25338 100644
--- a/src/views/basicData/resourceGroup/index.vue
+++ b/src/views/basicData/resourceGroup/index.vue
@@ -26,14 +26,14 @@
         ></el-date-picker>
       </el-form-item>
         </el-col>
-        <el-col
+        <!-- <el-col
           :span="12"
           style="text-align: right;">
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
         <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
       </el-form-item>
-        </el-col>
+        </el-col> -->
       </el-row>
     </el-form>
 
diff --git a/src/views/basicData/standardProcess/index.vue b/src/views/basicData/standardProcess/index.vue
index 9159628..550a649 100644
--- a/src/views/basicData/standardProcess/index.vue
+++ b/src/views/basicData/standardProcess/index.vue
@@ -7,84 +7,104 @@
       v-show="showSearch"
       label-width="68px"
     >
-      <el-form-item label="宸ュ簭缂栫爜" prop="processNumber">
-        <el-input
-          v-model="queryParams.processNumber"
-          placeholder="璇疯緭鍏ュ伐搴忕紪鐮�"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="宸ュ簭鍚嶇О" prop="processName">
-        <el-input
-          v-model="queryParams.processName"
-          placeholder="璇疯緭鍏ュ伐搴忓悕绉�"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="璧勬簮缁�" prop="resourceGroupName">
-        <el-input
-          v-model="queryParams.resourceGroupName"
-          placeholder="璇疯緭鍏ヨ祫婧愮粍"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="浜ц兘妯″瀷" prop="model">
-        <el-input
-          v-model="queryParams.model"
-          placeholder="璇疯緭鍏ヤ骇鑳芥ā鍨�: 鐙崰/鍚堟壒"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="璁捐浜ц兘" prop="designCapacity">
-        <el-input
-          v-model="queryParams.designCapacity"
-          placeholder="璇疯緭鍏ヨ璁′骇鑳�"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="宸ュ巶" prop="plant">
-        <el-select
-          clearable
-          v-model="queryParams.plant"
-          style="width: 200px;"
-          placeholder="璇疯緭鍏ラ�傜敤宸ュ巶"
-        >
-          <el-option
-            v-for="plant in plantList"
-            :key="plant.id"
-            :label="plant.plantName"
-            :value="plant.plantCode"
-          >
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="杞﹂棿" prop="workShop">
-        <el-input
-          v-model="queryParams.workShop"
-          placeholder="璇疯緭鍏ヨ溅闂�"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="鏃ュ巻鎻忚堪" prop="workCalender">
-        <el-input
-          v-model="queryParams.workCalender"
-          placeholder="璇疯緭鍏ユ棩鍘嗘弿杩�"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
+      <el-row :gutter="20">
+        <el-col :span="6">
+          <el-form-item label="宸ュ簭缂栫爜" prop="processNumber" style="width:100%">
+            <el-input
+              v-model="queryParams.processNumber"
+              placeholder="璇疯緭鍏ュ伐搴忕紪鐮�"
+              clearable
+              @keyup.enter="handleQuery"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="宸ュ簭鍚嶇О" prop="processName" style="width:100%">
+            <el-input
+              v-model="queryParams.processName"
+              placeholder="璇疯緭鍏ュ伐搴忓悕绉�"
+              clearable
+              @keyup.enter="handleQuery"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="璧勬簮缁�" prop="resourceGroupName" style="width:100%">
+            <el-input
+              v-model="queryParams.resourceGroupName"
+              placeholder="璇疯緭鍏ヨ祫婧愮粍"
+              clearable
+              @keyup.enter="handleQuery"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="浜ц兘妯″瀷" prop="model" style="width:100%">
+            <el-input
+              v-model="queryParams.model"
+              placeholder="璇疯緭鍏ヤ骇鑳芥ā鍨�: 鐙崰/鍚堟壒"
+              clearable
+              @keyup.enter="handleQuery"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="6">
+          <el-form-item label="璁捐浜ц兘" prop="designCapacity" style="width:100%">
+            <el-input
+              v-model="queryParams.designCapacity"
+              placeholder="璇疯緭鍏ヨ璁′骇鑳�"
+              clearable
+              @keyup.enter="handleQuery"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="宸ュ巶" prop="plant" style="width:100%">
+            <el-select
+              clearable
+              v-model="queryParams.plant"
+              style="width: 200px"
+              placeholder="璇疯緭鍏ラ�傜敤宸ュ巶"
+            >
+              <el-option
+                v-for="plant in plantList"
+                :key="plant.id"
+                :label="plant.plantName"
+                :value="plant.plantCode"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="杞﹂棿" prop="workShop" style="width:100%">
+            <el-input
+              v-model="queryParams.workShop"
+              placeholder="璇疯緭鍏ヨ溅闂�"
+              clearable
+              @keyup.enter="handleQuery"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="鏃ュ巻鎻忚堪" prop="workCalender" style="width:100%">
+            <el-input
+              v-model="queryParams.workCalender"
+              placeholder="璇疯緭鍏ユ棩鍘嗘弿杩�"
+              clearable
+              @keyup.enter="handleQuery"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <!-- <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery"
           >鎼滅储</el-button
         >
         <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
-      </el-form-item>
+      </el-form-item> -->
     </el-form>
 
     <el-row :gutter="10" class="mb8">
diff --git a/src/views/mainPlan/abnormalPartNumberReport/index.vue b/src/views/mainPlan/abnormalPartNumberReport/index.vue
index 73fc7c0..28cac0c 100644
--- a/src/views/mainPlan/abnormalPartNumberReport/index.vue
+++ b/src/views/mainPlan/abnormalPartNumberReport/index.vue
@@ -9,7 +9,7 @@
       label-position="left"
     >
       <el-row :gutter="20">
-        <el-col :span="8">
+        <el-col :span="6">
           <el-form-item :style="{ width: '100%'  }" :label="$t('plan.query.itemNumber')" prop="itemNum">
             <el-input
               v-model="queryParams.itemNum"
@@ -19,7 +19,7 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="8">
+        <el-col :span="6">
           <el-form-item
             :style="{ width: '100%'  }"
             :label="$t('plan.query.workOrderNo')"
@@ -35,7 +35,7 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="8" style="text-align: right">
+        <!-- <el-col :span="6" style="text-align: right">
           <el-form-item class="column-with-margin">
             <el-button type="primary" icon="Search" @click="handleQuery">{{
               $t("common.common.query")
@@ -44,7 +44,7 @@
               $t("common.common.reset")
             }}</el-button>
           </el-form-item>
-        </el-col>
+        </el-col> -->
       </el-row>
     </el-form>
 
diff --git a/src/views/mainPlan/abnormalProcessAnalysis/index.vue b/src/views/mainPlan/abnormalProcessAnalysis/index.vue
index ca93cbc..7061234 100644
--- a/src/views/mainPlan/abnormalProcessAnalysis/index.vue
+++ b/src/views/mainPlan/abnormalProcessAnalysis/index.vue
@@ -10,7 +10,7 @@
           v-hasPermi="['abnormalAnalysis:export']"
         >瀵煎嚭</el-button>
       </el-col>
-      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar :search="false" @queryTable="getList"></right-toolbar>
     </el-row>
     <HxlhTable
         style="width: 100%"
diff --git a/src/views/mainPlan/gasPiping/index.vue b/src/views/mainPlan/gasPiping/index.vue
index 653d7e2..261ae30 100644
--- a/src/views/mainPlan/gasPiping/index.vue
+++ b/src/views/mainPlan/gasPiping/index.vue
@@ -8,7 +8,7 @@
       label-position="left"
     >
       <el-row :gutter="20">
-        <el-col :span="8">
+        <el-col :span="6">
           <el-form-item :style="{ width: '100%' }" :label="$t('plan.query.daterangePlanStartDay')">
             <el-date-picker
               v-model="daterangePlanStartDay"
@@ -20,7 +20,7 @@
             ></el-date-picker>
           </el-form-item>
         </el-col>
-        <el-col :span="8">
+        <el-col :span="6">
           <el-form-item :style="{ width: '100%' }" :label="$t('plan.query.daterangePlanEndDay')">
             <el-date-picker
               v-model="daterangePlanEndDay"
@@ -32,7 +32,7 @@
             ></el-date-picker>
           </el-form-item>
         </el-col>
-        <el-col :span="8">
+        <el-col :span="6">
           <el-form-item
             :style="{ width: '100%' }" 
             :label="$t('plan.query.documentNumber')"
@@ -46,9 +46,7 @@
             />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="8">
+        <el-col :span="6">
           <el-form-item :style="{ width: '100%' }" :label="$t('plan.query.customer')" prop="customer">
             <el-input
               v-model="queryParams.customer"
@@ -58,7 +56,10 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="16" style="text-align: right">
+      </el-row>
+      <el-row :gutter="20">
+        
+        <!-- <el-col :span="16" style="text-align: right">
           <el-form-item class="column-with-margin">
             <el-button type="primary" icon="Search" @click="handleQuery">{{
               $t("common.common.query")
@@ -67,7 +68,7 @@
               $t("common.common.reset")
             }}</el-button>
           </el-form-item>
-        </el-col>
+        </el-col> -->
       </el-row>
     </el-form>
     <el-row :gutter="10" class="mb8">
diff --git a/src/views/mainPlan/gasPlanning/index.vue b/src/views/mainPlan/gasPlanning/index.vue
index 73ad321..9e8f157 100644
--- a/src/views/mainPlan/gasPlanning/index.vue
+++ b/src/views/mainPlan/gasPlanning/index.vue
@@ -7,8 +7,8 @@
       :inline="true"
       label-position="left"
     >
-      <el-row type="flex" justify="left">
-        <el-col :span="8">
+      <el-row :gutter="20">
+        <el-col :span="6">
           <el-form-item
             :style="{ width: '100%' }"
             :label="$t('plan.query.selectMonth')"
@@ -24,7 +24,7 @@
             </el-date-picker>
           </el-form-item>
         </el-col>
-        <el-col :span="8">
+        <el-col :span="6">
           <el-form-item
             :label="$t('basic.table.applicableFactories')"
             style="width: 100%"
@@ -44,7 +44,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="8" style="text-align: right">
+        <!-- <el-col :span="6" style="text-align: right">
           <el-form-item class="column-with-margin">
             <el-button type="primary" icon="Search" @click="handleQuery">{{
               $t("common.common.query")
@@ -53,7 +53,7 @@
               $t("common.common.reset")
             }}</el-button>
           </el-form-item>
-        </el-col>
+        </el-col> -->
       </el-row>
     </el-form>
     <!-- <div class="box_container"> -->
diff --git a/src/views/mainPlan/gasProduceStatics/index.vue b/src/views/mainPlan/gasProduceStatics/index.vue
index 3bb1eee..2051343 100644
--- a/src/views/mainPlan/gasProduceStatics/index.vue
+++ b/src/views/mainPlan/gasProduceStatics/index.vue
@@ -10,12 +10,11 @@
     >
       <el-row :gutter="20">
         <el-col :span="8">
-          <el-form-item :label="$t('plan.query.statistical')" >
+          <el-form-item :label="$t('plan.query.statistical')" :style="{ width: '100%' }">
             <el-select
               v-model="queryParams.searchType"
               placeholder="Select"
               @change="handleChangeSelectType"
-              :style="{ width: '270px' }"
             >
               <el-option
                 v-for="item in options"
@@ -27,10 +26,16 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item :label="!dayCom?$t('plan.query.selectDateRange'):$t('plan.query.selectDateMonth')">
+          <el-form-item
+            :style="{ width: '100%' }"
+            :label="
+              !dayCom
+                ? $t('plan.query.selectDateRange')
+                : $t('plan.query.selectDateMonth')
+            "
+          >
             <div v-if="!dayCom">
               <el-date-picker
-                :style="{ width: '240px' }"
                 v-model="queryParams.monthRange"
                 type="monthrange"
                 :range-separator="$t('plan.placeholder.to')"
@@ -40,7 +45,6 @@
             </div>
             <div v-else>
               <el-date-picker
-                :style="{ width: '200px' }"
                 v-model="queryParams.monthDays"
                 type="month"
                 :placeholder="$t('plan.placeholder.selectMonth')"
@@ -48,13 +52,13 @@
             </div>
           </el-form-item>
         </el-col>
-        <el-col :span="8" v-if="!dayCom">
+        <el-col :span="8" v-if="dayCom">
           <el-form-item
             :label="$t('basic.table.applicableFactories')"
             prop="plant"
+            :style="{ width: '100%' }"
           >
             <el-select
-              :style="{ width: '300px' }"
               clearable
               v-model="queryParams.applicableFactory"
               :placeholder="$t('basic.table.applicableFactories')"
@@ -68,7 +72,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <!-- <el-col :span="8" style="text-align:right;">
+        <!-- <el-col :span="6" style="text-align:right;">
           <el-form-item class="column-with-margin">
             <el-button type="primary" icon="Search" @click="handleQuery">{{
               $t("common.common.query")
@@ -103,7 +107,11 @@
           >{{ $t("common.common.update") }}</el-button
         >
       </el-col>
-      <right-toolbar @queryTable="handleQuery"></right-toolbar>
+      <right-toolbar
+        v-model:showSearch="showSearch"
+        @queryTable="handleQuery"
+        @resetTable="resetQuery"
+      ></right-toolbar>
     </el-row>
     <vxe-grid ref="gridRef" v-bind="gridOptions" :loading="loading"></vxe-grid>
   </div>
@@ -223,9 +231,7 @@
   if (list) {
     return list
       .map((type) => {
-        const item = aps_factory.value.find(
-          (item) => item.value === type
-        );
+        const item = aps_factory.value.find((item) => item.value === type);
         return item ? item.label : type;
       })
       .join("");
@@ -249,39 +255,51 @@
       : dateStr(queryParams.value.monthDays),
     searchType: searchTypeValue.value,
     major: "gas",
+    plant: !dayCom.value?"": queryParams.value.applicableFactory
   }).then((response) => {
     const colList = [];
-    let headersOne = [];
-    let headersTwo = [];
     if (response.code == "200") {
       if (!response.data.planTitle) {
         loading.value = false;
         return;
       }
-      // headersOne.push("");//t("plan.table.dateYearMonth")
-      // headersOne.push("");
-      // headersTwo.push(t("plan.table.processName"));
-      // headersTwo.push(t("plan.table.applicableFactories"));
-      colList.push({
-        field: "dateCol",
-        title: t("plan.table.dateYearMonth"),
-        fixed: "left",
-        children: [
-          {
-            field: `resourceName`,
-            title: t("plan.table.processName"),
-            width: 250,
-            type: "html",
-          },
-          {
-            field: `resourceGroupName`,
-            title: t("plan.table.applicableFactories"),
-            width: 250,
-            type: "html",
-          },
-        ],
-        width: 160,
-      });
+      if (!dayCom.value) {
+        colList.push({
+          field: "dateCol",
+          title: t("plan.table.dateYearMonth"),
+          fixed: "left",
+          children: [
+            {
+              field: `resourceName`,
+              title: t("plan.table.processName"),
+              width: 250,
+              type: "html",
+            },
+            {
+              field: `resourceGroupName`,
+              title: t("plan.table.applicableFactories"),
+              width: 250,
+              type: "html",
+            },
+          ],
+          width: 160,
+        });
+      }else{
+        colList.push({
+          field: "dateCol",
+          title: t("plan.table.dateYearMonth"),
+          fixed: "left",
+          children: [
+            {
+              field: `resourceName`,
+              title: t("plan.table.processName"),
+              width: 250,
+              type: "html",
+            }
+          ],
+          width: 160,
+        });
+      }
       response.data.planTitle.forEach((item) => {
         // headersOne.push(item);
         // headersOne.push("");
@@ -328,7 +346,6 @@
         // let lastCol = startCol + 2;
         // merges.push({ s: { r: 0, c: startCol }, e: { r: 0, c: lastCol } });
         // startCol = lastCol + 1;
-        let data = [];
         const item = {
           id: `${rowKey}`,
         };
@@ -357,8 +374,13 @@
           // item[`resourceName`] = flag
           //   ? `<div class='el-badge'><sup class="el-badge__content is-fixed is-dot"></sup>${key}</div>`
           //   : key;
-          item[`resourceName`] = key.split("_")[0];
-          item[`resourceGroupName`] = formatTypeLabelPlant([key.split("_")[1]]);
+          if (!dayCom.value) {
+            const lastIndex = key.lastIndexOf('_');
+            item[`resourceName`] = key.slice(0, lastIndex);
+            item[`resourceGroupName`] = formatTypeLabelPlant([key.slice(lastIndex + 1)]);
+          }else{
+            item[`resourceName`] = key
+          }
         }
         // exportData.value.push(data);
         dataList.push(item);
diff --git a/src/views/mainPlan/pipePlanning/index.vue b/src/views/mainPlan/pipePlanning/index.vue
index 359c764..2bb49cc 100644
--- a/src/views/mainPlan/pipePlanning/index.vue
+++ b/src/views/mainPlan/pipePlanning/index.vue
@@ -7,8 +7,8 @@
       :inline="true"
       label-position="left"
     >
-      <el-row type="flex" justify="left">
-        <el-col :span="8">
+      <el-row :gutter="20">
+        <el-col :span="6">
           <el-form-item
             :style="{ width: '100%' }"
             :label="$t('plan.query.selectMonth')"
@@ -24,7 +24,7 @@
             </el-date-picker>
           </el-form-item>
         </el-col>
-        <el-col :span="8">
+        <el-col :span="6">
           <el-form-item :label="$t('basic.table.applicableFactories')" style="width: 100%" prop="plant">
             <el-select
               clearable
@@ -40,7 +40,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="8" style="text-align: right">
+        <!-- <el-col :span="6" style="text-align: right">
           <el-form-item class="column-with-margin">
             <el-button type="primary" icon="Search" @click="handleQuery">{{
               $t("common.common.query")
@@ -49,7 +49,7 @@
               $t("common.common.reset")
             }}</el-button>
           </el-form-item>
-        </el-col>
+        </el-col> -->
       </el-row>
     </el-form>
     <!-- <div class="box_container"> -->
diff --git a/src/views/mainPlan/pipeProduceStatics/index.vue b/src/views/mainPlan/pipeProduceStatics/index.vue
index 1e9835d..5884192 100644
--- a/src/views/mainPlan/pipeProduceStatics/index.vue
+++ b/src/views/mainPlan/pipeProduceStatics/index.vue
@@ -15,6 +15,7 @@
               v-model="queryParams.searchType"
               placeholder="Select"
               @change="handleChangeSelectType"
+              
             >
               <el-option
                 v-for="item in options"
@@ -26,7 +27,14 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item :label="$t('plan.query.selectDateRange')" :style="{ width: '100%' }">
+          <el-form-item
+            :label="
+              !dayCom
+                ? $t('plan.query.selectDateRange')
+                : $t('plan.query.selectDateMonth')
+            "
+            :style="{ width: '100%' }"
+          >
             <div v-if="!dayCom">
               <el-date-picker
                 v-model="queryParams.monthRange"
@@ -45,7 +53,27 @@
             </div>
           </el-form-item>
         </el-col>
-        <el-col :span="8" style="text-align: right">
+        <el-col :span="8" v-if="dayCom">
+          <el-form-item
+            :label="$t('basic.table.applicableFactories')"
+            prop="plant"
+            :style="{ width: '100%' }"
+          >
+            <el-select
+              clearable
+              v-model="queryParams.applicableFactory"
+              :placeholder="$t('basic.table.applicableFactories')"
+            >
+              <el-option
+                v-for="item in aps_factory"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <!-- <el-col :span="6" style="text-align:right;">
           <el-form-item class="column-with-margin">
             <el-button type="primary" icon="Search" @click="handleQuery">{{
               $t("common.common.query")
@@ -54,7 +82,7 @@
               $t("common.common.reset")
             }}</el-button>
           </el-form-item>
-        </el-col>
+        </el-col> -->
       </el-row>
     </el-form>
     <el-row :gutter="10" class="mb8">
@@ -79,7 +107,11 @@
           >{{ $t("common.common.update") }}</el-button
         >
       </el-col>
-      <right-toolbar @queryTable="handleQuery" :search="false"></right-toolbar>
+      <right-toolbar
+        v-model:showSearch="showSearch"
+        @queryTable="handleQuery"
+        @resetTable="resetQuery"
+      ></right-toolbar>
     </el-row>
     <!-- <div class="box_container"> -->
     <!-- <div class="title_text">绠¤矾瑙勫垝浜ц兘璐熻浇缁熻</div> -->
@@ -242,26 +274,43 @@
       }
       // headersOne.push(t("plan.table.dateYearMonth"));
       // headersTwo.push(t("plan.table.processName"));
-      colList.push({
-        field: "dateCol",
-        title: t("plan.table.dateYearMonth"),
-        fixed: "left",
-        children: [
-          {
-            field: `resourceName`,
-            title: t("plan.table.processName"),
-            width: 250,
-            type: "html",
-          },
-          {
-            field: `resourceGroupName`,
-            title: t("plan.table.applicableFactories"),
-            width: 250,
-            type: "html",
-          },
-        ],
-        width: 160,
-      });
+      if (!dayCom.value) {
+        colList.push({
+          field: "dateCol",
+          title: t("plan.table.dateYearMonth"),
+          fixed: "left",
+          children: [
+            {
+              field: `resourceName`,
+              title: t("plan.table.processName"),
+              width: 250,
+              type: "html",
+            },
+            {
+              field: `resourceGroupName`,
+              title: t("plan.table.applicableFactories"),
+              width: 250,
+              type: "html",
+            },
+          ],
+          width: 160,
+        });
+      }else{
+        colList.push({
+          field: "dateCol",
+          title: t("plan.table.dateYearMonth"),
+          fixed: "left",
+          children: [
+            {
+              field: `resourceName`,
+              title: t("plan.table.processName"),
+              width: 250,
+              type: "html",
+            }
+          ],
+          width: 160,
+        });
+      }
       response.data.planTitle.forEach((item) => {
         colKey++;
         colList.push({
@@ -314,8 +363,13 @@
           // item[`resourceName`] = flag
           //   ? `<div class='el-badge'><sup class="el-badge__content is-fixed is-dot"></sup>${key}</div>`
           //   : key;
-          item[`resourceName`] = key.split("_")[0];
-          item[`resourceGroupName`] = formatTypeLabelPlant([key.split("_")[1]]);
+          if (!dayCom.value) {
+            const lastIndex = key.lastIndexOf('_');
+            item[`resourceName`] = key.slice(0, lastIndex);
+            item[`resourceGroupName`] = formatTypeLabelPlant([key.slice(lastIndex + 1)]);
+          }else{
+            item[`resourceName`] = key
+          }
         }
         dataList.push(item);
       });
diff --git a/src/views/mainPlan/plateProcessStat/index.vue b/src/views/mainPlan/plateProcessStat/index.vue
index b6c5737..0347fe6 100644
--- a/src/views/mainPlan/plateProcessStat/index.vue
+++ b/src/views/mainPlan/plateProcessStat/index.vue
@@ -9,7 +9,7 @@
       label-position="left"
     >
       <el-row :gutter="20">
-        <el-col :span="8">
+        <el-col :span="6">
           <el-form-item :style="{ width: '100%'  }" :label="$t('plan.query.workOrderNo')" prop="num">
             <el-input
               v-model="queryParams.workOrderNo"
@@ -21,7 +21,7 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="16" style="text-align: right">
+        <!-- <el-col :span="16" style="text-align: right">
           <el-form-item class="column-with-margin">
             <el-button type="primary" icon="Search" @click="handleQuery">{{
               $t("common.common.query")
@@ -30,7 +30,7 @@
               $t("common.common.reset")
             }}</el-button>
           </el-form-item>
-        </el-col>
+        </el-col> -->
       </el-row>
     </el-form>
     <el-row :gutter="10" class="mb8">
@@ -58,7 +58,8 @@
 
       <right-toolbar
         v-model:showSearch="showSearch"
-        @queryTable="getList"
+        @queryTable="handleQuery"
+        @resetTable="resetQuery"
       ></right-toolbar>
     </el-row>
 
diff --git a/src/views/mainPlan/sheetMetalOrderManage/index.vue b/src/views/mainPlan/sheetMetalOrderManage/index.vue
index e7118e0..90f2440 100644
--- a/src/views/mainPlan/sheetMetalOrderManage/index.vue
+++ b/src/views/mainPlan/sheetMetalOrderManage/index.vue
@@ -9,7 +9,7 @@
       label-position="left"
     >
       <el-row :gutter="20">
-        <el-col :span="8">
+        <el-col :span="6">
           <el-form-item
             :style="{ width: '100%'  }"
             :label="$t('plan.query.workOrderNo')"
@@ -25,7 +25,7 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="8">
+        <el-col :span="6">
           <el-form-item
             :style="{ width: '100%'  }"
             :label="$t('plan.query.requireTraceID')"
@@ -41,7 +41,7 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="8">
+        <el-col :span="6">
           <el-form-item
             :style="{ width: '100%'  }"
             :label="$t('plan.query.itemNumber')"
@@ -57,23 +57,12 @@
             />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="8">
+        <el-col :span="6">
           <el-form-item
             :style="{ width: '100%'  }"
             :label="$t('plan.table.delayRiskIdentification')"
             prop="hasDelayRisk"
           >
-            <!-- <el-input
-          :style="{ width: locale == 'zh' ? '200px' : '280px' }"
-          v-model="queryParams.hasDelayRisk"
-          :placeholder="`${$t('common.common.placeholder')}${$t(
-            'plan.table.delayRiskIdentification'
-          )}`"
-          clearable
-          @keyup.enter="handleQuery"
-        /> -->
             <el-select
               clearable
               v-model="queryParams.hasDelayRisk"
@@ -85,24 +74,6 @@
                 :value="item.value"
               />
             </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col
-          :span="16"
-          style="
-            display: flex;
-            justify-content: flex-end;
-            align-item: center;
-            text-align: right;
-          "
-        >
-          <el-form-item class="column-with-margin">
-            <el-button type="primary" icon="Search" @click="handleQuery">{{
-              $t("common.common.query")
-            }}</el-button>
-            <el-button icon="Refresh" @click="resetQuery">{{
-              $t("common.common.reset")
-            }}</el-button>
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/mainPlan/sheetMetalRedundantReport/index.vue b/src/views/mainPlan/sheetMetalRedundantReport/index.vue
index 58a692f..1d97d0d 100644
--- a/src/views/mainPlan/sheetMetalRedundantReport/index.vue
+++ b/src/views/mainPlan/sheetMetalRedundantReport/index.vue
@@ -9,7 +9,7 @@
       label-position="left"
     >
       <el-row :gutter="20">
-        <el-col :span="8">
+        <el-col :span="6">
           <el-form-item :style="{ width: '100%'  }" :label="$t('plan.query.itemNumber')" prop="itemNumber">
             <el-input
               v-model="queryParams.itemNumber"
@@ -21,7 +21,7 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="8">
+        <el-col :span="6">
           <el-form-item
             :style="{ width: '100%'  }"
             :label="$t('plan.query.workOrderNo')"
@@ -37,7 +37,7 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="8" style="text-align: right">
+        <!-- <el-col :span="6" style="text-align: right">
           <el-form-item class="column-with-margin">
             <el-button type="primary" icon="Search" @click="handleQuery">{{
               $t("common.common.query")
@@ -46,7 +46,7 @@
               $t("common.common.reset")
             }}</el-button>
           </el-form-item>
-        </el-col>
+        </el-col> -->
       </el-row>
     </el-form>
 
diff --git a/src/views/mainPlan/sheetMetalSupplyGap/index.vue b/src/views/mainPlan/sheetMetalSupplyGap/index.vue
index a00451c..11bcec6 100644
--- a/src/views/mainPlan/sheetMetalSupplyGap/index.vue
+++ b/src/views/mainPlan/sheetMetalSupplyGap/index.vue
@@ -9,7 +9,7 @@
       label-position="left"
     >
       <el-row :gutter="20">
-        <el-col :span="8">
+        <el-col :span="6">
           <el-form-item
             :style="{ width: '100%'  }" 
             :label="$t('plan.query.requireTraceID')"
@@ -23,7 +23,7 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="8">
+        <el-col :span="6">
           <el-form-item :style="{ width: '100%'  }" :label="$t('plan.query.itemNumber')" prop="bomLineCode">
             <el-input
               v-model="queryParams.bomLineCode"
@@ -35,7 +35,7 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="8" style="text-align: right">
+        <!-- <el-col :span="6" style="text-align: right">
           <el-form-item class="column-with-margin">
             <el-button type="primary" icon="Search" @click="handleQuery">{{
               $t("common.common.query")
@@ -44,7 +44,7 @@
               $t("common.common.reset")
             }}</el-button>
           </el-form-item>
-        </el-col>
+        </el-col> -->
       </el-row>
     </el-form>
 
diff --git a/src/views/mainPlan/weldSeamEcharts/index.vue b/src/views/mainPlan/weldSeamEcharts/index.vue
index 543ab2d..6ce72b8 100644
--- a/src/views/mainPlan/weldSeamEcharts/index.vue
+++ b/src/views/mainPlan/weldSeamEcharts/index.vue
@@ -9,7 +9,7 @@
             <el-col>
                 <el-form :model="queryParams" ref="queryRef" :inline="true" label-position="left">
                     <el-row :gutter="20">
-                        <el-col :span="8">
+                        <el-col :span="6">
                             <el-form-item label="缁熻鏃ユ湡" :style="{ width: '100%' }">
                                 <el-date-picker
                                     v-model="totalDay"
@@ -21,12 +21,12 @@
                                 ></el-date-picker>
                             </el-form-item>
                         </el-col>
-                        <el-col  :span="16"  style="text-align: right;">
+                        <!-- <el-col  :span="16"  style="text-align: right;">
                             <el-form-item class="column-with-margin">
                                 <el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
                                 <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
                             </el-form-item>
-                        </el-col>
+                        </el-col> -->
                     </el-row>
                 </el-form>
             </el-col>
diff --git a/src/views/mainPlan/workOrderJobLog/index.vue b/src/views/mainPlan/workOrderJobLog/index.vue
index e9dbdce..b244d52 100644
--- a/src/views/mainPlan/workOrderJobLog/index.vue
+++ b/src/views/mainPlan/workOrderJobLog/index.vue
@@ -2,8 +2,7 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-position="left">
       <el-row :gutter="20">
-
-        <el-col :span="8">
+        <el-col :span="6">
           <el-form-item label="涓氬姟绫诲瀷" style="width: 100%;">
             <el-select v-model="queryParams.bizType" placeholder="璇烽�夋嫨">
               <el-option
@@ -16,7 +15,7 @@
           </el-form-item>
         </el-col>
 
-        <el-col :span="8">
+        <el-col :span="6">
           <el-form-item label="璇锋眰鏃堕棿" style="width: 100%;">
             <el-date-picker
                 v-model="createTimes"
@@ -28,19 +27,7 @@
             ></el-date-picker>
           </el-form-item>
         </el-col>
-
-<!--        <el-col :span="6">
-          <el-form-item label="璇锋眰鍙傛暟" prop="requestData">
-            <el-input
-                v-model="queryParams.requestData"
-                placeholder="璇疯緭鍏ヨ姹傚弬鏁�"
-                clearable
-                @keyup.enter="handleQuery"
-            />
-          </el-form-item>
-        </el-col>-->
-
-        <el-col :span="8">
+        <el-col :span="6">
           <el-form-item label="璇锋眰缁撴灉" prop="result">
             <el-input
                 v-model="queryParams.result"
@@ -50,9 +37,7 @@
             />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="8">
+        <el-col :span="6">
           <el-form-item label="鍝嶅簲鏁版嵁" prop="requestData">
             <el-input
                 v-model="queryParams.responseData"
@@ -60,14 +45,6 @@
                 clearable
                 @keyup.enter="handleQuery"
             />
-          </el-form-item>
-        </el-col>
-        <el-col
-            :span="16"
-            style="text-align: right;">
-          <el-form-item class="column-with-margin">
-            <el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
-            <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/partPlan/index.vue b/src/views/partPlan/index.vue
index 4c27aa8..07d09ab 100644
--- a/src/views/partPlan/index.vue
+++ b/src/views/partPlan/index.vue
@@ -8,7 +8,7 @@
       label-position="left"
     >
       <el-row :gutter="20" class="mb8">
-        <el-col :span="8">
+        <el-col :span="6">
           <el-form-item
             :label="$t('plan.query.daterangePlanStartDay')"
             :style="{ width: '100%' }"
@@ -23,7 +23,7 @@
             ></el-date-picker>
           </el-form-item>
         </el-col>
-        <el-col :span="8">
+        <el-col :span="6">
           <el-form-item
             :style="{ width: '100%' }"
             :label="$t('plan.query.daterangePlanEndDay')"
@@ -38,7 +38,7 @@
             ></el-date-picker>
           </el-form-item>
         </el-col>
-        <el-col :span="8">
+        <el-col :span="6">
           <el-form-item
             :label="$t('plan.query.documentNumber')"
             :style="{ width: '100%' }"
@@ -53,9 +53,7 @@
             />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="8">
+        <el-col :span="6">
           <el-form-item
             :style="{ width: '100%' }"
             :label="$t('plan.query.customer')"
@@ -69,19 +67,8 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="16" style="text-align: right">
-          <el-form-item class="column-with-margin">
-            <el-button type="primary" icon="Search" @click="handleQuery">{{
-              $t("common.common.query")
-            }}</el-button>
-            <el-button icon="Refresh" @click="resetQuery">{{
-              $t("common.common.reset")
-            }}</el-button>
-          </el-form-item>
-        </el-col>
       </el-row>
     </el-form>
-
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button

--
Gitblit v1.9.3