From 0576b9f77062f46f1a6227f5f58bb8d92e7cc6d2 Mon Sep 17 00:00:00 2001
From: wumu <mayi@mayi.com>
Date: 星期四, 16 五月 2024 23:11:20 +0800
Subject: [PATCH] 0516

---
 internal_system_v1/threemergeproblemlist.cpp |   15 +
 internal_system_v1/threemergeproblemlist.ui  |  761 +++++++++++++++++++++++++++++-----------------------------
 internal_system_v1/threemergeproblemlist.h   |    2 
 3 files changed, 401 insertions(+), 377 deletions(-)

diff --git a/internal_system_v1/threemergeproblemlist.cpp b/internal_system_v1/threemergeproblemlist.cpp
index e3ecf7f..cea9c81 100644
--- a/internal_system_v1/threemergeproblemlist.cpp
+++ b/internal_system_v1/threemergeproblemlist.cpp
@@ -38,6 +38,8 @@
     ui->line->hide();
     ui->line_2->hide();
 
+    ui->groupBox->hide(); // 棣栨鍏堥殣钘�
+
 }
 
 ThreeMergeProblemList::~ThreeMergeProblemList()
@@ -915,3 +917,16 @@
     }
 
 }
+
+void ThreeMergeProblemList::on_pushButton_multiSearch_clicked()
+{
+    static int cnt=0;
+    if(cnt%2 == 1){
+        ui->groupBox->hide();
+        ui->pushButton_multiSearch->setText("澶氱淮搴︽暟鎹煡璇煈�");
+    }else{
+        ui->groupBox->show();
+        ui->pushButton_multiSearch->setText("澶氱淮搴︽暟鎹煡璇煈�");
+    }
+    cnt++;
+}
diff --git a/internal_system_v1/threemergeproblemlist.h b/internal_system_v1/threemergeproblemlist.h
index 4de9168..caca147 100644
--- a/internal_system_v1/threemergeproblemlist.h
+++ b/internal_system_v1/threemergeproblemlist.h
@@ -70,6 +70,8 @@
 
     void on_pushButton_moreSearch_clicked();
 
+    void on_pushButton_multiSearch_clicked();
+
 private:
     Ui::ThreeMergeProblemList *ui;
     QMenu *m_menu; // 闂娓呭崟鑿滃崟
diff --git a/internal_system_v1/threemergeproblemlist.ui b/internal_system_v1/threemergeproblemlist.ui
index 41a04e6..dafc236 100644
--- a/internal_system_v1/threemergeproblemlist.ui
+++ b/internal_system_v1/threemergeproblemlist.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>1281</width>
-    <height>1038</height>
+    <height>748</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -15,6 +15,384 @@
   </property>
   <widget class="QWidget" name="centralwidget">
    <layout class="QGridLayout" name="gridLayout">
+    <item row="2" column="0">
+     <widget class="QGroupBox" name="groupBox">
+      <property name="minimumSize">
+       <size>
+        <width>0</width>
+        <height>250</height>
+       </size>
+      </property>
+      <property name="title">
+       <string>澶氱淮搴︽煡璇㈡潯浠�</string>
+      </property>
+      <layout class="QGridLayout" name="gridLayout_6">
+       <item row="0" column="0">
+        <layout class="QHBoxLayout" name="horizontalLayout">
+         <item>
+          <widget class="QCheckBox" name="checkBox_type">
+           <property name="text">
+            <string>瀹¤绫诲埆</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QComboBox" name="comboBox_type">
+           <item>
+            <property name="text">
+             <string>鍐呭</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>澶栧</string>
+            </property>
+           </item>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item row="0" column="1">
+        <layout class="QHBoxLayout" name="horizontalLayout_10">
+         <item>
+          <widget class="QCheckBox" name="checkBox_about_money">
+           <property name="text">
+            <string>娑夊強閲戦(涓�)</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QComboBox" name="comboBox_about_bgMonney">
+           <property name="editable">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLabel" name="label_8">
+           <property name="text">
+            <string>鑷�</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QComboBox" name="comboBox_about_edMoney">
+           <property name="editable">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item row="1" column="0">
+        <layout class="QHBoxLayout" name="horizontalLayout_2">
+         <item>
+          <widget class="QCheckBox" name="checkBox_year">
+           <property name="text">
+            <string>瀹¤骞村害</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QDateEdit" name="dateEdit_year">
+           <property name="displayFormat">
+            <string>yyyy</string>
+           </property>
+           <property name="date">
+            <date>
+             <year>2024</year>
+             <month>1</month>
+             <day>1</day>
+            </date>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item row="1" column="1">
+        <layout class="QHBoxLayout" name="horizontalLayout_11">
+         <item>
+          <widget class="QCheckBox" name="checkBox_changeMoney">
+           <property name="text">
+            <string>鏁存敼閲戦(涓�)</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QComboBox" name="comboBox_change_bgMoney">
+           <property name="editable">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLabel" name="label_9">
+           <property name="text">
+            <string>鑷�</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QComboBox" name="comboBox_change_edMoney">
+           <property name="editable">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item row="2" column="0">
+        <layout class="QHBoxLayout" name="horizontalLayout_3">
+         <item>
+          <widget class="QCheckBox" name="checkBox_com">
+           <property name="text">
+            <string>瀹¤鍗曚綅</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QComboBox" name="comboBox_com">
+           <item>
+            <property name="text">
+             <string>瀹¤灞�</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>瀹¤鍘�</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>瀹¤缃�</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>鍏朵粬</string>
+            </property>
+           </item>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item row="2" column="1">
+        <layout class="QHBoxLayout" name="horizontalLayout_12">
+         <item>
+          <widget class="QCheckBox" name="checkBox_change_over_time">
+           <property name="text">
+            <string>鏁存敼瀹屾垚鏃堕棿</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QDateEdit" name="dateEdit_change_over_time">
+           <property name="displayFormat">
+            <string>yyyy/MM/dd</string>
+           </property>
+           <property name="date">
+            <date>
+             <year>2024</year>
+             <month>1</month>
+             <day>1</day>
+            </date>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item row="3" column="0">
+        <layout class="QHBoxLayout" name="horizontalLayout_4">
+         <item>
+          <widget class="QCheckBox" name="checkBox_way">
+           <property name="text">
+            <string>瀹¤鏂瑰紡</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QComboBox" name="comboBox_way">
+           <item>
+            <property name="text">
+             <string>灏卞湴瀹¤</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>鎶ラ�佸璁�</string>
+            </property>
+           </item>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item row="3" column="1" rowspan="2">
+        <layout class="QHBoxLayout" name="horizontalLayout_13">
+         <item>
+          <widget class="QCheckBox" name="checkBox_change_expected_time">
+           <property name="text">
+            <string>鏁存敼棰勮瀹屾垚鏃堕棿</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QDateEdit" name="dateEdit_change_expected_time">
+           <property name="displayFormat">
+            <string>yyyy/MM/dd</string>
+           </property>
+           <property name="date">
+            <date>
+             <year>2024</year>
+             <month>1</month>
+             <day>1</day>
+            </date>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item row="4" column="0">
+        <layout class="QHBoxLayout" name="horizontalLayout_5">
+         <item>
+          <widget class="QCheckBox" name="checkBox_mainCom">
+           <property name="text">
+            <string>璐d换涓讳綋</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QComboBox" name="comboBox_mainCom">
+           <property name="editable">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item row="5" column="0">
+        <layout class="QHBoxLayout" name="horizontalLayout_6">
+         <item>
+          <widget class="QCheckBox" name="checkBox_pro">
+           <property name="text">
+            <string>瀹¤椤圭洰</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QComboBox" name="comboBox_pro">
+           <item>
+            <property name="text">
+             <string>璐交钀藉疄鍥藉閲嶅ぇ鏀跨瓥鎺柦瀹¤</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>璐㈡斂璐㈠姟鏀舵敮瀹¤</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>鍥哄畾璧勪骇鎶曡祫瀹¤</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>鍐呴儴鎺у埗鍜岄闄╃鐞嗗璁�</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>缁忔祹璐d换瀹¤</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>淇℃伅绯荤粺瀹¤</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>澧冨瀹¤</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>鍏朵粬</string>
+            </property>
+           </item>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item row="6" column="0">
+        <layout class="QHBoxLayout" name="horizontalLayout_7">
+         <item>
+          <widget class="QCheckBox" name="checkBox_proName">
+           <property name="text">
+            <string>瀹¤椤圭洰鍚嶇О</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QComboBox" name="comboBox_proName">
+           <property name="editable">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item row="7" column="0">
+        <layout class="QHBoxLayout" name="horizontalLayout_8">
+         <item>
+          <widget class="QCheckBox" name="checkBox_qtype">
+           <property name="text">
+            <string>闂绫诲埆</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QComboBox" name="comboBox_qtype">
+           <property name="editable">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item row="7" column="2" rowspan="2">
+        <widget class="QPushButton" name="pushButton_moreSearch">
+         <property name="font">
+          <font>
+           <pointsize>15</pointsize>
+          </font>
+         </property>
+         <property name="text">
+          <string>澶氱淮搴︽煡璇�</string>
+         </property>
+        </widget>
+       </item>
+       <item row="8" column="0">
+        <layout class="QHBoxLayout" name="horizontalLayout_9">
+         <item>
+          <widget class="QCheckBox" name="checkBox_qdx">
+           <property name="text">
+            <string>闂瀹氭��</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QComboBox" name="comboBox_qdx">
+           <property name="editable">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+      </layout>
+     </widget>
+    </item>
     <item row="0" column="0">
      <widget class="QScrollArea" name="scrollArea">
       <property name="widgetResizable">
@@ -25,8 +403,8 @@
         <rect>
          <x>0</x>
          <y>0</y>
-         <width>1257</width>
-         <height>654</height>
+         <width>1236</width>
+         <height>522</height>
         </rect>
        </property>
        <layout class="QGridLayout" name="gridLayout_5">
@@ -683,381 +1061,10 @@
      </widget>
     </item>
     <item row="1" column="0">
-     <widget class="QGroupBox" name="groupBox">
-      <property name="minimumSize">
-       <size>
-        <width>0</width>
-        <height>200</height>
-       </size>
+     <widget class="QPushButton" name="pushButton_multiSearch">
+      <property name="text">
+       <string>澶氱淮搴︽暟鎹煡璇煈�</string>
       </property>
-      <property name="title">
-       <string>澶氱淮搴︽煡璇㈡潯浠�</string>
-      </property>
-      <layout class="QGridLayout" name="gridLayout_6">
-       <item row="0" column="0">
-        <layout class="QHBoxLayout" name="horizontalLayout">
-         <item>
-          <widget class="QCheckBox" name="checkBox_type">
-           <property name="text">
-            <string>瀹¤绫诲埆</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QComboBox" name="comboBox_type">
-           <item>
-            <property name="text">
-             <string>鍐呭</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>澶栧</string>
-            </property>
-           </item>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item row="0" column="1">
-        <layout class="QHBoxLayout" name="horizontalLayout_10">
-         <item>
-          <widget class="QCheckBox" name="checkBox_about_money">
-           <property name="text">
-            <string>娑夊強閲戦(涓�)</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QComboBox" name="comboBox_about_bgMonney">
-           <property name="editable">
-            <bool>true</bool>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QLabel" name="label_8">
-           <property name="text">
-            <string>鑷�</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QComboBox" name="comboBox_about_edMoney">
-           <property name="editable">
-            <bool>true</bool>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item row="1" column="0">
-        <layout class="QHBoxLayout" name="horizontalLayout_2">
-         <item>
-          <widget class="QCheckBox" name="checkBox_year">
-           <property name="text">
-            <string>瀹¤骞村害</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QDateEdit" name="dateEdit_year">
-           <property name="displayFormat">
-            <string>yyyy</string>
-           </property>
-           <property name="date">
-            <date>
-             <year>2024</year>
-             <month>1</month>
-             <day>1</day>
-            </date>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item row="1" column="1">
-        <layout class="QHBoxLayout" name="horizontalLayout_11">
-         <item>
-          <widget class="QCheckBox" name="checkBox_changeMoney">
-           <property name="text">
-            <string>鏁存敼閲戦(涓�)</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QComboBox" name="comboBox_change_bgMoney">
-           <property name="editable">
-            <bool>true</bool>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QLabel" name="label_9">
-           <property name="text">
-            <string>鑷�</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QComboBox" name="comboBox_change_edMoney">
-           <property name="editable">
-            <bool>true</bool>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item row="2" column="0">
-        <layout class="QHBoxLayout" name="horizontalLayout_3">
-         <item>
-          <widget class="QCheckBox" name="checkBox_com">
-           <property name="text">
-            <string>瀹¤鍗曚綅</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QComboBox" name="comboBox_com">
-           <item>
-            <property name="text">
-             <string>瀹¤灞�</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>瀹¤鍘�</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>瀹¤缃�</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>鍏朵粬</string>
-            </property>
-           </item>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item row="2" column="1">
-        <layout class="QHBoxLayout" name="horizontalLayout_12">
-         <item>
-          <widget class="QCheckBox" name="checkBox_change_over_time">
-           <property name="text">
-            <string>鏁存敼瀹屾垚鏃堕棿</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QDateEdit" name="dateEdit_change_over_time">
-           <property name="displayFormat">
-            <string>yyyy/MM/dd</string>
-           </property>
-           <property name="date">
-            <date>
-             <year>2024</year>
-             <month>1</month>
-             <day>1</day>
-            </date>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item row="3" column="0">
-        <layout class="QHBoxLayout" name="horizontalLayout_4">
-         <item>
-          <widget class="QCheckBox" name="checkBox_way">
-           <property name="text">
-            <string>瀹¤鏂瑰紡</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QComboBox" name="comboBox_way">
-           <item>
-            <property name="text">
-             <string>灏卞湴瀹¤</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>鎶ラ�佸璁�</string>
-            </property>
-           </item>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item row="3" column="1" rowspan="2">
-        <layout class="QHBoxLayout" name="horizontalLayout_13">
-         <item>
-          <widget class="QCheckBox" name="checkBox_change_expected_time">
-           <property name="text">
-            <string>鏁存敼棰勮瀹屾垚鏃堕棿</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QDateEdit" name="dateEdit_change_expected_time">
-           <property name="displayFormat">
-            <string>yyyy/MM/dd</string>
-           </property>
-           <property name="date">
-            <date>
-             <year>2024</year>
-             <month>1</month>
-             <day>1</day>
-            </date>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item row="4" column="0">
-        <layout class="QHBoxLayout" name="horizontalLayout_5">
-         <item>
-          <widget class="QCheckBox" name="checkBox_mainCom">
-           <property name="text">
-            <string>璐d换涓讳綋</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QComboBox" name="comboBox_mainCom">
-           <property name="editable">
-            <bool>true</bool>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item row="5" column="0">
-        <layout class="QHBoxLayout" name="horizontalLayout_6">
-         <item>
-          <widget class="QCheckBox" name="checkBox_pro">
-           <property name="text">
-            <string>瀹¤椤圭洰</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QComboBox" name="comboBox_pro">
-           <item>
-            <property name="text">
-             <string>璐交钀藉疄鍥藉閲嶅ぇ鏀跨瓥鎺柦瀹¤</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>璐㈡斂璐㈠姟鏀舵敮瀹¤</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>鍥哄畾璧勪骇鎶曡祫瀹¤</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>鍐呴儴鎺у埗鍜岄闄╃鐞嗗璁�</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>缁忔祹璐d换瀹¤</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>淇℃伅绯荤粺瀹¤</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>澧冨瀹¤</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>鍏朵粬</string>
-            </property>
-           </item>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item row="6" column="0">
-        <layout class="QHBoxLayout" name="horizontalLayout_7">
-         <item>
-          <widget class="QCheckBox" name="checkBox_proName">
-           <property name="text">
-            <string>瀹¤椤圭洰鍚嶇О</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QComboBox" name="comboBox_proName">
-           <property name="editable">
-            <bool>true</bool>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item row="7" column="0">
-        <layout class="QHBoxLayout" name="horizontalLayout_8">
-         <item>
-          <widget class="QCheckBox" name="checkBox_qtype">
-           <property name="text">
-            <string>闂绫诲埆</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QComboBox" name="comboBox_qtype">
-           <property name="editable">
-            <bool>true</bool>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item row="7" column="2" rowspan="2">
-        <widget class="QPushButton" name="pushButton_moreSearch">
-         <property name="font">
-          <font>
-           <pointsize>15</pointsize>
-          </font>
-         </property>
-         <property name="text">
-          <string>澶氱淮搴︽煡璇�</string>
-         </property>
-        </widget>
-       </item>
-       <item row="8" column="0">
-        <layout class="QHBoxLayout" name="horizontalLayout_9">
-         <item>
-          <widget class="QCheckBox" name="checkBox_qdx">
-           <property name="text">
-            <string>闂瀹氭��</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QComboBox" name="comboBox_qdx">
-           <property name="editable">
-            <bool>true</bool>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-      </layout>
      </widget>
     </item>
    </layout>

--
Gitblit v1.8.0