From 560ebd47c33706e4482a6c158fd795a4d0a6075f Mon Sep 17 00:00:00 2001
From: wumu <mayi@mayi.com>
Date: 星期四, 28 十一月 2024 22:49:28 +0800
Subject: [PATCH] 1128
---
internal_system_v1/threemergeproblemlist.cpp | 107 +++++++++++++++++++++++++++++++++--
internal_system_v1/threemergeproblemlist.ui | 38 +++++++++---
修改_241015/附件1-问题整改台账修改后1015.xlsx | 0
修改_241015/内审系统存在问题反馈1015.docx | 0
internal_system_v1/threemergeproblemlist.h | 8 ++
5 files changed, 137 insertions(+), 16 deletions(-)
diff --git a/internal_system_v1/threemergeproblemlist.cpp b/internal_system_v1/threemergeproblemlist.cpp
index 5ccc493..6c1f835 100644
--- a/internal_system_v1/threemergeproblemlist.cpp
+++ b/internal_system_v1/threemergeproblemlist.cpp
@@ -322,6 +322,49 @@
m_cbb_way = new ComboBoxDelegate(proLabels,this);
ui->tableWidget->setItemDelegateForColumn(6,m_cbb_way);
+ // 瀹¤鍙戠幇闂閲戦瀹氭��
+ QStringList moneyLabels;
+ moneyLabels<<"鍏朵腑锛氱哗鏁堢被闂閲戦"<<"鍚堣鎬ч棶棰橀噾棰�"<<"鍏朵腑锛氫細璁℃牳绠楁柟闈�"<<"杩濊浣跨敤璧勯噾"<<"鎴暀銆佹矇娣�璧勯噾"<<"鎹熷け娴垂"<<"鎸敤璧勯噾"<<"鍋锋紡绋庤垂"<<"杩濊鍙栧緱鏀跺叆"<<"鍏朵粬";
+ m_cbb_money = new ComboBoxDelegate(moneyLabels,this);
+ ui->tableWidget->setItemDelegateForColumn(12,m_cbb_money);
+
+ // 瀹¤鍙戠幇闂涓暟瀹氭��
+ QStringList cntLabels;
+ cntLabels<<"鍏朵腑锛氶噾棰濈被闂涓暟"<<"闈為噾棰濈被闂涓暟"<<"鍏朵腑锛氬浗瀹舵斂绛栨帾鏂借惤瀹炴柟闈�"<<"鍙戝睍瑙勫垝涓庢垬鐣ュ喅绛栨柟闈�"<<"鍐呴儴鎺у埗涓庨闄╃鐞嗘柟闈�"<<"鍏朵粬";
+ m_cbb_cnt = new ComboBoxDelegate(cntLabels,this);
+ ui->tableWidget->setItemDelegateForColumn(13,m_cbb_cnt);
+
+ // 鏁存敼缁撴灉
+ QStringList resLabels;
+ resLabels<<"绔嬭鏁存敼"<<"鍒嗛樁娈垫暣鏀�"<<"灏氭湭鏁存敼";
+ m_cbb_result = new ComboBoxDelegate(resLabels,this);
+ ui->tableWidget->setItemDelegateForColumn(20,m_cbb_result);
+
+ // 澶勫垎绫诲瀷
+ QStringList typeLabels;
+ typeLabels<<"鍏朵腑锛氬厷绾鍒�"<<"鏀垮姟澶勫垎"<<"鍐呴儴绾緥澶勫垎"<<"鏃犲鍒�";
+ m_cbb_type = new ComboBoxDelegate(typeLabels,this);
+ ui->tableWidget->setItemDelegateForColumn(26,m_cbb_type);
+
+ // 妫�鏌ョ粨鏋�
+ QStringList checkResLabels;
+ checkResLabels<<"宸插畬鎴�"<<"鏈畬鎴�";
+ m_cbb_check_res = new ComboBoxDelegate(checkResLabels,this);
+ ui->tableWidget->setItemDelegateForColumn(33,m_cbb_check_res);
+
+ // 閲戦绫绘暣鏀规垚鏋�
+ QStringList moneyResLabels;
+ moneyResLabels<<"鍏朵腑锛氳皟鏁翠細璁¤处鐩�"<<"鏀跺洖璧勯噾"<<"鎸藉洖鎹熷け"<<"褰掕繕鍘熻祫閲戞笭閬�"<<"琛ョ即绋庤垂"<<"鍏朵粬";
+ m_cbb_money_res = new ComboBoxDelegate(moneyResLabels,this);
+ ui->tableWidget->setItemDelegateForColumn(42,m_cbb_money_res);
+
+ // 闈為噾棰濈被鏁存敼鎴愭灉
+ QStringList noMoneyResLabels;
+ noMoneyResLabels<<"鍏朵腑锛氭柊鍒跺畾鍒跺害"<<"淇瀹屽杽鍒跺害"<<"浼樺寲瀹屽杽涓氬姟娴佺▼"<<"鍏朵粬";
+ m_cbb_no_money_res = new ComboBoxDelegate(noMoneyResLabels,this);
+ ui->tableWidget->setItemDelegateForColumn(44,m_cbb_no_money_res);
+
+
// 闂鎻忚堪浣愯瘉璧勬枡(涓婁紶鍙栬瘉鍗�) 褰曞叆鎴栬�呬笂浼�
//ui->tableWidget->setItemDelegateForColumn(13,m_fdd);
QStringList fwLabels;
@@ -335,10 +378,10 @@
m_date_ymd = new DateDelegate(this,"yyyy/MM/dd");
ui->tableWidget->setItemDelegateForColumn(19+2,m_date_ymd);
ui->tableWidget->setItemDelegateForColumn(21+2,m_date_ymd);
- ui->tableWidget->setItemDelegateForColumn(24+2,m_date_ymd);
- ui->tableWidget->setItemDelegateForColumn(29+2,m_date_ymd);
- ui->tableWidget->setItemDelegateForColumn(31+2,m_date_ymd);
- ui->tableWidget->setItemDelegateForColumn(34+2,m_date_ymd);
+ ui->tableWidget->setItemDelegateForColumn(24+2+5,m_date_ymd);
+ ui->tableWidget->setItemDelegateForColumn(29+2+5,m_date_ymd);
+ ui->tableWidget->setItemDelegateForColumn(31+2+5,m_date_ymd);
+ ui->tableWidget->setItemDelegateForColumn(34+2+5,m_date_ymd);
// 灏嗘爣棰樺鍏ョ涓夎
@@ -367,10 +410,60 @@
ui->tableWidget->setItem(0,1,new QTableWidgetItem("鍙戠幇闂"));
- ui->tableWidget->setItem(0,18,new QTableWidgetItem("鍙戠幇闂22"));
- ui->tableWidget->setSpan(0,1,2,15);
+ ui->tableWidget->setItem(0,16,new QTableWidgetItem("鏁存敼鎯呭喌"));
+ // 澶勫垎缁撴灉锛堣兘鑷姩缁熻缁煎悎瀹¤缁熻琛ㄤ腑锛氭牴鎹璁″缓璁粰浜堝厷绾�佹斂鍔″拰鍐呴儴绾緥澶勫垎锛�
+ ui->tableWidget->setItem(0,26,new QTableWidgetItem("澶勫垎缁撴灉"));
+ // 绉婚�佷俊鎭紙鑳借嚜鍔ㄧ粺璁＄患鍚堝璁＄粺璁¤〃涓細鍚戝徃娉曟満鍏崇Щ閫佹垨鎶ュ憡妗堜欢绾跨储锛�
+ ui->tableWidget->setItem(0,28,new QTableWidgetItem("绉婚�佷俊鎭�"));
+ ui->tableWidget->setItem(0,31,new QTableWidgetItem("鏁存敼妫�鏌ョ粨鏋�"));
+ ui->tableWidget->setItem(0,34,new QTableWidgetItem("鏁存敼绫诲瀷"));
+ ui->tableWidget->setItem(1,34,new QTableWidgetItem("宸叉暣鏀�"));
+ ui->tableWidget->setItem(1,37,new QTableWidgetItem("姝ｅ湪鏁存敼"));
+ ui->tableWidget->setItem(1,39,new QTableWidgetItem("灏氭湭鏁存敼"));
+ ui->tableWidget->setItem(0,42,new QTableWidgetItem("鏁存敼鎴愭灉"));
+ ui->tableWidget->setItem(1,42,new QTableWidgetItem("闂鏁存敼锛堥噾棰濈被锛�"));
+ ui->tableWidget->setItem(1,44,new QTableWidgetItem("闂鏁存敼锛堥潪閲戦绫伙級"));
+
+
+ ui->tableWidget->setSpan(0,1,2,15); // 鍙戠幇闂
ui->tableWidget->item(0,1)->setTextAlignment(Qt::AlignCenter);
- ui->tableWidget->item(0,1)->font().setBold(true);
+
+ ui->tableWidget->setSpan(0,16,2,10); // 鏁存敼鎯呭喌
+ ui->tableWidget->item(0,16)->setTextAlignment(Qt::AlignCenter);
+
+ ui->tableWidget->setSpan(0,26,2,2); // 澶勫垎缁撴灉
+ ui->tableWidget->item(0,26)->setTextAlignment(Qt::AlignCenter);
+
+ ui->tableWidget->setSpan(0,28,2,3); // 绉婚�佷俊鎭�
+ ui->tableWidget->item(0,28)->setTextAlignment(Qt::AlignCenter);
+
+ ui->tableWidget->setSpan(0,31,2,3); // 鏁存敼妫�鏌ョ粨鏋�
+ ui->tableWidget->item(0,31)->setTextAlignment(Qt::AlignCenter);
+
+ ui->tableWidget->setSpan(0,34,1,8); // 鏁存敼绫诲瀷
+ ui->tableWidget->item(0,34)->setTextAlignment(Qt::AlignCenter);
+
+ ui->tableWidget->setSpan(1,34,1,3); // 宸叉暣鏀�
+ ui->tableWidget->item(1,34)->setTextAlignment(Qt::AlignCenter);
+
+ ui->tableWidget->setSpan(1,37,1,2); // 姝ｅ湪鏁存敼
+ ui->tableWidget->item(1,37)->setTextAlignment(Qt::AlignCenter);
+
+ ui->tableWidget->setSpan(1,39,1,3); // 灏氭湭鏁存敼
+ ui->tableWidget->item(1,39)->setTextAlignment(Qt::AlignCenter);
+
+ ui->tableWidget->setSpan(0,42,1,4); // 鏁存敼鎴愭灉
+ ui->tableWidget->item(0,42)->setTextAlignment(Qt::AlignCenter);
+
+ ui->tableWidget->setSpan(1,42,1,2); // 闂鏁存敼锛堥噾棰濈被锛�
+ ui->tableWidget->item(1,42)->setTextAlignment(Qt::AlignCenter);
+
+ ui->tableWidget->setSpan(1,44,1,2); // 闂鏁存敼锛堥潪閲戦绫伙級
+ ui->tableWidget->item(1,44)->setTextAlignment(Qt::AlignCenter);
+
+
+ // 闅愯棌鍒楁爣棰�
+ ui->tableWidget->horizontalHeader()->setVisible(false);
// 鍔犺浇鍏徃鍚�
readCompanyFromSQL();
diff --git a/internal_system_v1/threemergeproblemlist.h b/internal_system_v1/threemergeproblemlist.h
index 0f5402e..71ae7ac 100644
--- a/internal_system_v1/threemergeproblemlist.h
+++ b/internal_system_v1/threemergeproblemlist.h
@@ -103,6 +103,14 @@
ComboBoxDelegate *m_cbb_way; // 瀹¤鏂瑰紡
ComboBoxDelegate *m_cbb_pro; // 瀹¤椤圭洰
ComboBoxDelegate *m_cbb_file_wri; // 闂鎻忚堪浣愯瘉
+ ComboBoxDelegate *m_cbb_money; // 瀹¤鍙戠幇闂閲戦瀹氭�� 24-11.28
+ ComboBoxDelegate *m_cbb_cnt; // 瀹¤鍙戠幇闂涓暟瀹氭��
+ ComboBoxDelegate *m_cbb_result; // 鏁存敼缁撴灉
+ ComboBoxDelegate *m_cbb_type; // 澶勫垎绫诲瀷
+ ComboBoxDelegate *m_cbb_check_res; // 妫�鏌ョ粨鏋�
+ ComboBoxDelegate *m_cbb_money_res; // 閲戦绫绘暣鏀规垚鏋�
+ ComboBoxDelegate *m_cbb_no_money_res; // 闈為噾棰濈被鏁存敼鎴愭灉
+
DateDelegate *m_date_ymd; // 鏃堕棿 骞存湀鏃�
//ThreeComboBox *m_noEdit; // 绂佺敤缂栬緫鍔熻兘
diff --git a/internal_system_v1/threemergeproblemlist.ui b/internal_system_v1/threemergeproblemlist.ui
index f5c0cee..2315dde 100644
--- a/internal_system_v1/threemergeproblemlist.ui
+++ b/internal_system_v1/threemergeproblemlist.ui
@@ -900,6 +900,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 +980,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>
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 d52e909..29e4b33 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 af4f6c4..f3033e2 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