From 708abd6f59663758bd901947c3d79a5ab0ada870 Mon Sep 17 00:00:00 2001
From: wumu <mayi@mayi.com>
Date: 星期五, 13 十二月 2024 00:15:16 +0800
Subject: [PATCH] 1212

---
 internal_system_v1/threemergeproblemlist.ui |  106 +++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 91 insertions(+), 15 deletions(-)

diff --git a/internal_system_v1/threemergeproblemlist.ui b/internal_system_v1/threemergeproblemlist.ui
index f5c0cee..e9d7d19 100644
--- a/internal_system_v1/threemergeproblemlist.ui
+++ b/internal_system_v1/threemergeproblemlist.ui
@@ -226,7 +226,7 @@
          </item>
         </layout>
        </item>
-       <item row="3" column="1" rowspan="2">
+       <item row="3" column="1">
         <layout class="QHBoxLayout" name="horizontalLayout_13">
          <item>
           <widget class="QCheckBox" name="checkBox_change_expected_time">
@@ -269,7 +269,45 @@
          </item>
         </layout>
        </item>
-       <item row="5" column="0">
+       <item row="4" column="1" rowspan="2">
+        <layout class="QHBoxLayout" name="horizontalLayout_14">
+         <item>
+          <widget class="QCheckBox" name="checkBox_punish_type">
+           <property name="text">
+            <string>澶勫垎绫诲瀷</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QComboBox" name="comboBox_punish_type">
+           <property name="editable">
+            <bool>true</bool>
+           </property>
+           <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="5" column="0" rowspan="2">
         <layout class="QHBoxLayout" name="horizontalLayout_6">
          <item>
           <widget class="QCheckBox" name="checkBox_pro">
@@ -324,7 +362,25 @@
          </item>
         </layout>
        </item>
-       <item row="6" column="0">
+       <item row="6" column="1" rowspan="2">
+        <layout class="QHBoxLayout" name="horizontalLayout_15">
+         <item>
+          <widget class="QCheckBox" name="checkBox_transfer">
+           <property name="text">
+            <string>绉婚�佷俊鎭�</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QComboBox" name="comboBox_transfer">
+           <property name="editable">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item row="7" column="0">
         <layout class="QHBoxLayout" name="horizontalLayout_7">
          <item>
           <widget class="QCheckBox" name="checkBox_proName">
@@ -342,7 +398,7 @@
          </item>
         </layout>
        </item>
-       <item row="7" column="0">
+       <item row="8" column="0">
         <layout class="QHBoxLayout" name="horizontalLayout_8">
          <item>
           <widget class="QCheckBox" name="checkBox_qtype">
@@ -360,7 +416,7 @@
          </item>
         </layout>
        </item>
-       <item row="7" column="2" rowspan="2">
+       <item row="8" column="2" rowspan="2">
         <widget class="QPushButton" name="pushButton_moreSearch">
          <property name="font">
           <font>
@@ -372,7 +428,7 @@
          </property>
         </widget>
        </item>
-       <item row="8" column="0">
+       <item row="9" column="0">
         <layout class="QHBoxLayout" name="horizontalLayout_9">
          <item>
           <widget class="QCheckBox" name="checkBox_qdx">
@@ -900,6 +956,31 @@
             </column>
             <column>
              <property name="text">
+              <string>澶勫垎绫诲瀷</string>
+             </property>
+            </column>
+            <column>
+             <property name="text">
+              <string>澶勫垎浜烘暟(鍗曚綅:浜�)</string>
+             </property>
+            </column>
+            <column>
+             <property name="text">
+              <string>绉婚�佽缁嗕俊鎭�</string>
+             </property>
+            </column>
+            <column>
+             <property name="text">
+              <string>澶勭悊缁撴灉</string>
+             </property>
+            </column>
+            <column>
+             <property name="text">
+              <string>娑夋浜哄憳(鍗曚綅:浜�)</string>
+             </property>
+            </column>
+            <column>
+             <property name="text">
               <string>鏁存敼妫�鏌ョ粨鏋�:妫�鏌ユ椂闂�</string>
              </property>
             </column>
@@ -955,27 +1036,22 @@
             </column>
             <column>
              <property name="text">
-              <string>鍒跺害寤鸿:淇鍒跺害</string>
+              <string>閲戦绫绘暣鏀规垚鏋�</string>
              </property>
             </column>
             <column>
              <property name="text">
-              <string>鍒跺害寤鸿:鏂板鍒跺害</string>
+              <string>閲戦(鍏�)</string>
              </property>
             </column>
             <column>
              <property name="text">
-              <string>璧勯噾鏀跺洖:鎸藉洖鎹熷け</string>
+              <string>闈為噾棰濈被鏁存敼鎴愭灉</string>
              </property>
             </column>
             <column>
              <property name="text">
-              <string>璧勯噾鏀跺洖:鍏朵粬</string>
-             </property>
-            </column>
-            <column>
-             <property name="text">
-              <string>璧勯噾鏀跺洖:瀹″噺</string>
+              <string>鏁伴噺(涓�)</string>
              </property>
             </column>
            </widget>

--
Gitblit v1.8.0