From a3f97ceb36d4cb60bacdfbcb04c364faaca6138a Mon Sep 17 00:00:00 2001
From: wumu <mayi@mayi.com>
Date: 星期五, 29 十一月 2024 23:29:07 +0800
Subject: [PATCH] 1129
---
internal_system_v1/threemergeproblemlist.cpp | 13 +++---
internal_system_v1/threemergeproblemlist.ui | 68 +++++++++++++++++++++++++++++++---
修改_241015/附件1-问题整改台账修改后1015.xlsx | 0
修改_241015/内审系统存在问题反馈1015.docx | 0
4 files changed, 69 insertions(+), 12 deletions(-)
diff --git a/internal_system_v1/threemergeproblemlist.cpp b/internal_system_v1/threemergeproblemlist.cpp
index 6c1f835..1a0290e 100644
--- a/internal_system_v1/threemergeproblemlist.cpp
+++ b/internal_system_v1/threemergeproblemlist.cpp
@@ -105,7 +105,7 @@
return 0;
}
// 澶勭悊涓虹┖鐨勯潪棣栧垪鍗曞厓锛岃嚜鍔ㄨˉ闆�
- for(int i=1;i<ui->tableWidget->columnCount();++i){
+ for(int i=3;i<ui->tableWidget->columnCount();++i){
if(ui->tableWidget->item(row,i) == nullptr){
qDebug()<<"鍙戠幇绌洪」:"<<row<<i;
ui->tableWidget->setItem(row,i,new QTableWidgetItem(" "));
@@ -230,6 +230,7 @@
initProblemListUi(); // 鍒濆鍖栭棶棰樻竻鍗曠晫闈�
initProblemResultUi(); // 鍒濆鍖栭棶棰樺鐞嗙粨鏋滅晫闈�
+ ui->tableWidget->setRowCount(4); // 璁剧疆鍒濆琛屾暟
ui->tableWidget->setMinimumHeight(500); // 鏁存敼鍙拌处
ui->tableWidget_2->setMinimumHeight(500); // 鏁存敼缁撴灉
ui->tableWidget_3->setMinimumHeight(500); // 闂娓呭崟
@@ -943,10 +944,10 @@
QVector<QVector<QString>> res;
int rows = selectSQL(sql,res);
if(rows > 0){
- ui->tableWidget->setRowCount(rows);
+ ui->tableWidget->setRowCount(rows+3);
for(int i=0;i<res.size();++i){
for(int j=0;j<res.at(0).size()-1;++j){ // 鍘绘帀璁板綍鏃堕棿
- ui->tableWidget->setItem(i,j,new QTableWidgetItem(res[i][j]));
+ ui->tableWidget->setItem(i+3,j,new QTableWidgetItem(res[i][j]));
}
}
}else{
@@ -958,7 +959,7 @@
void ThreeMergeProblemList::on_pushButton_save_3_clicked()
{
int hasContentRow=0;
- for(int i=0;i<ui->tableWidget->rowCount();++i){
+ for(int i=3;i<ui->tableWidget->rowCount();++i){
int row = saveDataLine(i);
if(row > 0) {
hasContentRow++;
@@ -1069,10 +1070,10 @@
QVector<QVector<QString>> res;
int rows = selectSQL(sql,res);
if(rows > 0){
- ui->tableWidget->setRowCount(rows);
+ ui->tableWidget->setRowCount(rows+3);
for(int i=0;i<res.size();++i){
for(int j=0;j<res.at(0).size()-1;++j){ // 鍘绘帀璁板綍鏃堕棿
- ui->tableWidget->setItem(i,j,new QTableWidgetItem(res[i][j]));
+ ui->tableWidget->setItem(i+3,j,new QTableWidgetItem(res[i][j]));
}
}
}else{
diff --git a/internal_system_v1/threemergeproblemlist.ui b/internal_system_v1/threemergeproblemlist.ui
index 2315dde..e818070 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_qtype_2">
+ <property name="text">
+ <string>澶勫垎绫诲瀷</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QComboBox" name="comboBox_qtype_2">
+ <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_qtype_3">
+ <property name="text">
+ <string>绉婚�佷俊鎭�</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QComboBox" name="comboBox_qtype_3">
+ <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">
diff --git "a/\344\277\256\346\224\271_241015/\345\206\205\345\256\241\347\263\273\347\273\237\345\255\230\345\234\250\351\227\256\351\242\230\345\217\215\351\246\2101015.docx" "b/\344\277\256\346\224\271_241015/\345\206\205\345\256\241\347\263\273\347\273\237\345\255\230\345\234\250\351\227\256\351\242\230\345\217\215\351\246\2101015.docx"
index 29e4b33..cd6c789 100644
--- "a/\344\277\256\346\224\271_241015/\345\206\205\345\256\241\347\263\273\347\273\237\345\255\230\345\234\250\351\227\256\351\242\230\345\217\215\351\246\2101015.docx"
+++ "b/\344\277\256\346\224\271_241015/\345\206\205\345\256\241\347\263\273\347\273\237\345\255\230\345\234\250\351\227\256\351\242\230\345\217\215\351\246\2101015.docx"
Binary files differ
diff --git "a/\344\277\256\346\224\271_241015/\351\231\204\344\273\2661-\351\227\256\351\242\230\346\225\264\346\224\271\345\217\260\350\264\246\344\277\256\346\224\271\345\220\2161015.xlsx" "b/\344\277\256\346\224\271_241015/\351\231\204\344\273\2661-\351\227\256\351\242\230\346\225\264\346\224\271\345\217\260\350\264\246\344\277\256\346\224\271\345\220\2161015.xlsx"
index f3033e2..68c9fd5 100644
--- "a/\344\277\256\346\224\271_241015/\351\231\204\344\273\2661-\351\227\256\351\242\230\346\225\264\346\224\271\345\217\260\350\264\246\344\277\256\346\224\271\345\220\2161015.xlsx"
+++ "b/\344\277\256\346\224\271_241015/\351\231\204\344\273\2661-\351\227\256\351\242\230\346\225\264\346\224\271\345\217\260\350\264\246\344\277\256\346\224\271\345\220\2161015.xlsx"
Binary files differ
--
Gitblit v1.8.0