diff --git a/DLG_C_TDSet_Signature_Modify.cpp b/DLG_C_TDSet_Signature_Modify.cpp index 29aaff5..d64630c 100644 --- a/DLG_C_TDSet_Signature_Modify.cpp +++ b/DLG_C_TDSet_Signature_Modify.cpp @@ -41,6 +41,8 @@ DLG_C_TDSet_Signature_Modify::DLG_C_TDSet_Signature_Modify(CWnd* pParent /*=null , m_strSignatureSource(_T("")) , m_iConflict(0) , m_strSendCount(_T("")) + , m_strLegalMobile(_T("")) + , m_strAgencyMobile(_T("")) { m_pMainFrame = NULL; memset((BYTE*)&m_Data, 0, sizeof(ANS_TD2Signature_Data)); @@ -71,7 +73,7 @@ void DLG_C_TDSet_Signature_Modify::DoDataExchange(CDataExchange* pDX) DDV_MaxChars(pDX, m_strCorpanyName, 120); DDX_CBIndex(pDX, IDC_TDSET_SIGNATURE_MODIFY_OPERTYPE, m_iOperType); DDX_Text(pDX, IDC_TDSET_SIGNATURE_MODIFY_AGENCYCERTID, m_strAgencyCertID); - DDV_MaxChars(pDX, m_strAgencyCertID, 60); + DDV_MaxChars(pDX, m_strAgencyCertID, 30); DDX_CBString(pDX, IDC_TDSET_SIGNATURE_MODIFY_AGENCYCERTTYPE, m_strAgencyCertType); DDV_MaxChars(pDX, m_strAgencyCertType, 30); DDX_Text(pDX, IDC_TDSET_SIGNATURE_MODIFY_AGENCYNAME, m_strAgencyName); @@ -82,7 +84,7 @@ void DLG_C_TDSet_Signature_Modify::DoDataExchange(CDataExchange* pDX) DDX_Text(pDX, IDC_TDSET_SIGNATURE_MODIFY_ERRDATA, m_strErrData); DDX_Text(pDX, IDC_TDSET_SIGNATURE_MODIFY_ERRTYPE, m_strErrType); DDX_Text(pDX, IDC_TDSET_SIGNATURE_MODIFY_LEGALCERTID, m_strLegalCertID); - DDV_MaxChars(pDX, m_strLegalCertID, 60); + DDV_MaxChars(pDX, m_strLegalCertID, 30); DDX_CBString(pDX, IDC_TDSET_SIGNATURE_MODIFY_LEGALCERTTYPE, m_strLegalCertType); DDV_MaxChars(pDX, m_strLegalCertType, 30); DDX_Text(pDX, IDC_TDSET_SIGNATURE_MODIFY_LEGALNAME, m_strLegalName); @@ -101,6 +103,10 @@ void DLG_C_TDSet_Signature_Modify::DoDataExchange(CDataExchange* pDX) DDX_Control(pDX, IDC_TDSET_SIGNATURE_MODIFY_TDTITLE, m_L_TD); DDX_CBIndex(pDX, IDC_TDSET_SIGNATURE_MODIFY_CONFLICT, m_iConflict); DDX_Text(pDX, IDC_TDSET_SIGNATURE_MODIFY_SENDCOUNT, m_strSendCount); + DDX_Text(pDX, IDC_TDSET_SIGNATURE_MODIFY_LEGALMOBILE, m_strLegalMobile); + DDV_MaxChars(pDX, m_strLegalMobile, 16); + DDX_Text(pDX, IDC_TDSET_SIGNATURE_MODIFY_AGENCYMOBILE, m_strAgencyMobile); + DDV_MaxChars(pDX, m_strAgencyMobile, 16); } @@ -135,9 +141,11 @@ BOOL DLG_C_TDSet_Signature_Modify::OnInitDialog() m_strLegalName = m_Data.szLegalName; m_strLegalCertType = m_Data.szLegalCertType; m_strLegalCertID = m_Data.szLegalCertID; + m_strLegalMobile = m_Data.szLegalMobile; m_strAgencyName = m_Data.szAgencyName; m_strAgencyCertType = m_Data.szAgencyCertType; m_strAgencyCertID = m_Data.szAgencyCertID; + m_strAgencyMobile = m_Data.szAgencyMobile; m_strPortType = m_Data.szPortType; m_strPortUsage = m_Data.szPortUsage; @@ -197,9 +205,11 @@ BOOL DLG_C_TDSet_Signature_Modify::OnInitDialog() ((CEdit*)GetDlgItem(IDC_TDSET_SIGNATURE_MODIFY_LEGALNAME))->SetReadOnly(true); GetDlgItem(IDC_TDSET_SIGNATURE_MODIFY_LEGALCERTTYPE)->EnableWindow(false); ((CEdit*)GetDlgItem(IDC_TDSET_SIGNATURE_MODIFY_LEGALCERTID))->SetReadOnly(true); + ((CEdit*)GetDlgItem(IDC_TDSET_SIGNATURE_MODIFY_LEGALMOBILE))->SetReadOnly(true); ((CEdit*)GetDlgItem(IDC_TDSET_SIGNATURE_MODIFY_AGENCYNAME))->SetReadOnly(true); GetDlgItem(IDC_TDSET_SIGNATURE_MODIFY_AGENCYCERTTYPE)->EnableWindow(false); ((CEdit*)GetDlgItem(IDC_TDSET_SIGNATURE_MODIFY_AGENCYCERTID))->SetReadOnly(true); + ((CEdit*)GetDlgItem(IDC_TDSET_SIGNATURE_MODIFY_AGENCYMOBILE))->SetReadOnly(true); ((CEdit*)GetDlgItem(IDC_TDSET_SIGNATURE_MODIFY_PORTTYPE))->SetReadOnly(true); ((CEdit*)GetDlgItem(IDC_TDSET_SIGNATURE_MODIFY_PORTUSAGE))->SetReadOnly(true); @@ -335,9 +345,11 @@ void DLG_C_TDSet_Signature_Modify::OnBnClickedOk() _tcscpy(data.szLegalName, m_strLegalName); _tcscpy(data.szLegalCertType, m_strLegalCertType); _tcscpy(data.szLegalCertID, m_strLegalCertID); + _tcscpy(data.szLegalMobile, m_strLegalMobile); _tcscpy(data.szAgencyName, m_strAgencyName); _tcscpy(data.szAgencyCertType, m_strAgencyCertType); _tcscpy(data.szAgencyCertID, m_strAgencyCertID); + _tcscpy(data.szAgencyMobile, m_strAgencyMobile); _tcscpy(data.szPortType, m_strPortType); diff --git a/DLG_C_TDSet_Signature_Modify.h b/DLG_C_TDSet_Signature_Modify.h index 497168a..cc85604 100644 --- a/DLG_C_TDSet_Signature_Modify.h +++ b/DLG_C_TDSet_Signature_Modify.h @@ -62,4 +62,6 @@ public: afx_msg void OnSelchangeTdsetSignatureModifyTdtitle(); int m_iConflict; CString m_strSendCount; + CString m_strLegalMobile; + CString m_strAgencyMobile; }; diff --git a/DLG_C_TDSet_Signature_Upload.cpp b/DLG_C_TDSet_Signature_Upload.cpp index 0a422ff..20cef1c 100644 --- a/DLG_C_TDSet_Signature_Upload.cpp +++ b/DLG_C_TDSet_Signature_Upload.cpp @@ -668,6 +668,8 @@ void DLG_C_TDSet_Signature_Upload::UploadNext(ANS_TD2Signature_Upload * pAnsUplo //m_AdoRSX.GetCollect(21, str); str.Trim(); str.Replace(_T("'"), _T("")); //_T("经办人证件号码") str = _T(""); m_AdoRSX.GetCollect(_T("经办人证件号码"), str); str.Trim(); str.Replace(_T("'"), _T("")); //_T("经办人证件号码") _tcscpy(pData[i].szAgencyCertID, str); + str = _T(""); m_AdoRSX.GetCollect(_T("经办人手机号码"), str); str.Trim(); str.Replace(_T("'"), _T("")); //_T("经办人证件号码") + _tcscpy(pData[i].szAgencyMobile, str); //m_AdoRSX.GetCollect(26, str); str.Trim(); str.Replace(_T("'"), _T("")); //_T("端口类型") str = _T(""); m_AdoRSX.GetCollect(_T("短信端口服务类型"), str); str.Trim(); str.Replace(_T("'"), _T("")); //_T("端口类型") @@ -714,12 +716,16 @@ void DLG_C_TDSet_Signature_Upload::UploadNext(ANS_TD2Signature_Upload * pAnsUplo _tcscpy(pData[i].szLegalCertType, str); str = _T(""); m_AdoRSX.GetCollect(_T("责任人证件号码"), str); str.Trim(); str.Replace(_T("'"), _T("")); _tcscpy(pData[i].szLegalCertID, str); + str = _T(""); m_AdoRSX.GetCollect(_T("责任人手机号码"), str); str.Trim(); str.Replace(_T("'"), _T("")); + _tcscpy(pData[i].szLegalMobile, str); str = _T(""); m_AdoRSX.GetCollect(_T("经办人名称"), str); str.Trim(); str.Replace(_T("'"), _T("")); _tcscpy(pData[i].szAgencyName, str); str = _T(""); m_AdoRSX.GetCollect(_T("经办人证件类型"), str); str.Trim(); str.Replace(_T("'"), _T("")); _tcscpy(pData[i].szAgencyCertType, str); str = _T(""); m_AdoRSX.GetCollect(_T("经办人证件号码"), str); str.Trim(); str.Replace(_T("'"), _T("")); _tcscpy(pData[i].szAgencyCertID, str); + str = _T(""); m_AdoRSX.GetCollect(_T("经办人手机号码"), str); str.Trim(); str.Replace(_T("'"), _T("")); + _tcscpy(pData[i].szAgencyMobile, str); str = _T(""); m_AdoRSX.GetCollect(_T("具体用途"), str); str.Trim(); str.Replace(_T("'"), _T("")); _tcscpy(pData[i].szPortUsage, str); str = _T(""); m_AdoRSX.GetCollect(_T("签名来源"), str); str.Trim(); str.Replace(_T("'"), _T("")); diff --git a/DLG_Corp_File.cpp b/DLG_Corp_File.cpp index 4ef9745..4ea1172 100644 --- a/DLG_Corp_File.cpp +++ b/DLG_Corp_File.cpp @@ -80,9 +80,10 @@ BOOL DLG_Corp_File::OnInitDialog() //ʼList m_Image.Create(16,16,ILC_COLOR16|ILC_MASK,5,5); + m_Image.Add(AfxGetApp()->LoadIcon(IDI_NULL)); m_Image.Add(AfxGetApp()->LoadIcon(IDI_L_CORP) ); m_wndList.SubClassWindow2(); - m_wndList.SetHeadings(_T(",50; ļ,100; ǩʱ,90; ϴʱ,90; ϴû,80;С(K),70;Ƿ,70;ԭʼļ,200;ע,200;")); + m_wndList.SetHeadings(_T(",50; ļ,100; ͬ,100; ǩʱ,90; ϴʱ,90; ϴû,80;С(K),70;Ƿ,70;ԭʼļ,200;ע,200;")); m_wndList.SetGridLines(true); m_wndList.SetImageList(&m_Image,LVSIL_SMALL); @@ -331,12 +332,13 @@ void DLG_Corp_File::SetListText(ANS_Corp_FileData FileData, long lType) if ( lType == -1 || lType == -2 ) { m_wndList.SetItemText( lItem , iTemp++ , FileData.szFileType); + m_wndList.SetItemText(lItem, iTemp++, FileData.szContractNum); str.Format( _T("%04d.%02d.%02d") , FileData.tFileTime.wYear,FileData.tFileTime.wMonth,FileData.tFileTime.wDay ); m_wndList.SetItemText( lItem , iTemp++ , str ); } else { - iTemp += 2 ; + iTemp += 3 ; } if ( lType==-1 || lType == -3 ) @@ -371,6 +373,13 @@ void DLG_Corp_File::SetListText(ANS_Corp_FileData FileData, long lType) } m_wndList.SetItemData( lItem , FileData.lFileID ); + + //Ƿͼ + if (FileData.lFileSize > 0 && FileData.lFileSize == FileData.lUploadSize) + m_wndList.SetIconIndex(lItem, 1); + else + m_wndList.SetIconIndex(lItem, 0); + } long DLG_Corp_File::GetCurrentSelected() @@ -403,8 +412,31 @@ void DLG_Corp_File::OnCorpFileModify() FileData.lFileID = m_wndList.GetItemData(lItem); + CString strTime; m_wndList.GetItemText(lItem , 1 , FileData.szFileType , sizeof(FileData.szFileType)-2 ); - m_wndList.GetItemText(lItem , 8 , FileData.szBZ , sizeof(FileData.szBZ)-2 ); + m_wndList.GetItemText(lItem, 2, FileData.szContractNum, sizeof(FileData.szContractNum) - 2); + strTime = m_wndList.GetItemText(lItem, 3); + m_wndList.GetItemText(lItem , 9 , FileData.szBZ , sizeof(FileData.szBZ)-2 ); + + try + { + // ַеꡢ¡ + if (swscanf(strTime, _T("%d.%d.%d"), &FileData.tFileTime.wYear, &FileData.tFileTime.wMonth, &FileData.tFileTime.wDay) == 3) { + // ֶĬΪ0ʱ룩 + FileData.tFileTime.wHour = 0; + FileData.tFileTime.wMinute = 0; + FileData.tFileTime.wSecond = 0; + FileData.tFileTime.wMilliseconds = 0; + } + else { + // ʧܴ쳣򷵻Чֵ + memset(&FileData.tFileTime, 0, sizeof(SYSTEMTIME)); + } + } + catch (...) + { + memset(&FileData.tFileTime, 0, sizeof(SYSTEMTIME)); + } CString str; str = m_wndList.GetItemText(lItem , 2 ); diff --git a/DLG_Corp_File_Add.cpp b/DLG_Corp_File_Add.cpp index c00068e..cbe8f1b 100644 --- a/DLG_Corp_File_Add.cpp +++ b/DLG_Corp_File_Add.cpp @@ -17,6 +17,7 @@ static char THIS_FILE[] = __FILE__; DLG_Corp_File_Add::DLG_Corp_File_Add(CWnd* pParent /*=NULL*/) : CDialog(DLG_Corp_File_Add::IDD, pParent) + , m_strContractNum(_T("")) { //{{AFX_DATA_INIT(DLG_Corp_File_Add) m_strBZ = _T(""); @@ -37,14 +38,20 @@ void DLG_Corp_File_Add::DoDataExchange(CDataExchange* pDX) DDV_MaxChars(pDX, m_strBZ, 250); DDX_DateTimeCtrl(pDX, IDC_CORP_FILEADD_FILETIME, m_tFileTime); DDX_CBString(pDX, IDC_CORP_FILEADD_FILETYPE, m_strFileType); - DDV_MaxChars(pDX, m_strFileType, 50); + DDV_MaxChars(pDX, m_strFileType, 30); //}}AFX_DATA_MAP + DDX_Text(pDX, IDC_CORP_FILEADD_CONTRACTNUM, m_strContractNum); + DDV_MaxChars(pDX, m_strContractNum, 20); } BEGIN_MESSAGE_MAP(DLG_Corp_File_Add, CDialog) //{{AFX_MSG_MAP(DLG_Corp_File_Add) //}}AFX_MSG_MAP + ON_CBN_SELCHANGE(IDC_CORP_FILEADD_FILETYPE, &DLG_Corp_File_Add::OnSelchangeCorpFileaddFiletype) + ON_CBN_EDITCHANGE(IDC_CORP_FILEADD_FILETYPE, &DLG_Corp_File_Add::OnEditchangeCorpFileaddFiletype) + ON_BN_CLICKED(IDOK, &DLG_Corp_File_Add::OnBnClickedOk) + ON_WM_TIMER() END_MESSAGE_MAP() ///////////////////////////////////////////////////////////////////////////// @@ -57,8 +64,9 @@ BOOL DLG_Corp_File_Add::OnInitDialog() if ( !m_bAdd ) { m_strFileType = m_FileData.szFileType; + m_strContractNum = m_FileData.szContractNum; m_strBZ = m_FileData.szBZ; - + m_tFileTime = m_FileData.tFileTime; } else @@ -67,6 +75,7 @@ BOOL DLG_Corp_File_Add::OnInitDialog() } UpdateData(false); + OnSelchangeCorpFileaddFiletype(); return TRUE; // return TRUE unless you set the focus to a control // EXCEPTION: OCX Property Pages should return FALSE @@ -78,27 +87,76 @@ void DLG_Corp_File_Add::SetParam(ANS_Corp_FileData data, BOOL bAdd) m_bAdd = bAdd; } -void DLG_Corp_File_Add::OnOK() -{ - if ( !UpdateData(true)) - return ; - - if ( m_strFileType.GetLength()<=2 ) - { - MessageBox( _T("ûļͣȷϣ") , _T("") , MB_ICONWARNING ); - GetDlgItem(IDC_CORP_FILEADD_FILETYPE)->SetFocus(); - return; - } - - _tcscpy(m_FileData.szFileType , m_strFileType ); - _tcscpy(m_FileData.szBZ , m_strBZ ); - m_tFileTime.GetAsSystemTime( m_FileData.tFileTime ); - - - CDialog::OnOK(); -} - ANS_Corp_FileData DLG_Corp_File_Add::GetParam() { return m_FileData; } + + +void DLG_Corp_File_Add::OnSelchangeCorpFileaddFiletype() +{ + // TODO: ڴӿؼ֪ͨ + + SetTimer(1, 10, NULL); //ǷΪͬ +} + + +void DLG_Corp_File_Add::OnEditchangeCorpFileaddFiletype() +{ + if (!UpdateData(true)) + return; + //CString str; + //((CEdit*)GetDlgItem(IDC_CORP_FILEADD_FILETYPE))->GetWindowText(str); + if (m_strFileType.Find(CString(_T("ͬ"))) < 0) + { + GetDlgItem(IDC_CORP_FILEADD_CONTRACTNUM_S)->ShowWindow(SW_HIDE); + GetDlgItem(IDC_CORP_FILEADD_CONTRACTNUM)->ShowWindow(SW_HIDE); + } + else + { + GetDlgItem(IDC_CORP_FILEADD_CONTRACTNUM_S)->ShowWindow(SW_SHOW); + GetDlgItem(IDC_CORP_FILEADD_CONTRACTNUM)->ShowWindow(SW_SHOW); + } +} + + +void DLG_Corp_File_Add::OnBnClickedOk() +{ + if (!UpdateData(true)) + return; + + if (m_strFileType.GetLength() < 2) + { + MessageBox(_T("ûļͣȷϣ"), _T(""), MB_ICONWARNING); + GetDlgItem(IDC_CORP_FILEADD_FILETYPE)->SetFocus(); + return; + } + + if (m_strFileType.Find(CString(_T("ͬ")))>=0 && m_strContractNum.GetLength() <= 2) + { + MessageBox(_T("ļΪͬȷĺͬţ"), _T(""), MB_ICONWARNING); + GetDlgItem(IDC_CORP_FILEADD_CONTRACTNUM)->SetFocus(); + return; + } + + _tcscpy(m_FileData.szContractNum, m_strContractNum); + _tcscpy(m_FileData.szFileType, m_strFileType); + _tcscpy(m_FileData.szBZ, m_strBZ); + m_tFileTime.GetAsSystemTime(m_FileData.tFileTime); + + + CDialog::OnOK(); + +} + + +void DLG_Corp_File_Add::OnTimer(UINT_PTR nIDEvent) +{ + CDialog::OnTimer(nIDEvent); + + if (nIDEvent == 1) + { + KillTimer(nIDEvent); + OnEditchangeCorpFileaddFiletype(); + } +} diff --git a/DLG_Corp_File_Add.h b/DLG_Corp_File_Add.h index 2970164..f9f066e 100644 --- a/DLG_Corp_File_Add.h +++ b/DLG_Corp_File_Add.h @@ -44,9 +44,14 @@ protected: // Generated message map functions //{{AFX_MSG(DLG_Corp_File_Add) virtual BOOL OnInitDialog(); - virtual void OnOK(); //}}AFX_MSG DECLARE_MESSAGE_MAP() +public: + CString m_strContractNum; + afx_msg void OnSelchangeCorpFileaddFiletype(); + afx_msg void OnEditchangeCorpFileaddFiletype(); + afx_msg void OnBnClickedOk(); + afx_msg void OnTimer(UINT_PTR nIDEvent); }; //{{AFX_INSERT_LOCATION}} diff --git a/Debug_Unicode/SmsManager.exe b/Debug_Unicode/SmsManager.exe index a2b6a55..da0dd0b 100644 Binary files a/Debug_Unicode/SmsManager.exe and b/Debug_Unicode/SmsManager.exe differ diff --git a/Debug_Unicode/SmsManager.res b/Debug_Unicode/SmsManager.res index 98205f1..2ba6fb5 100644 Binary files a/Debug_Unicode/SmsManager.res and b/Debug_Unicode/SmsManager.res differ diff --git a/Debug_Unicode/SmsManager.tlog/CL.read.1.tlog b/Debug_Unicode/SmsManager.tlog/CL.read.1.tlog index ebc5c7e..5f3be46 100644 Binary files a/Debug_Unicode/SmsManager.tlog/CL.read.1.tlog and b/Debug_Unicode/SmsManager.tlog/CL.read.1.tlog differ diff --git a/Debug_Unicode/SmsManager.tlog/CL.write.1.tlog b/Debug_Unicode/SmsManager.tlog/CL.write.1.tlog index d8f77fa..59be123 100644 Binary files a/Debug_Unicode/SmsManager.tlog/CL.write.1.tlog and b/Debug_Unicode/SmsManager.tlog/CL.write.1.tlog differ diff --git a/Debug_Unicode/SmsManager.tlog/link.read.1.tlog b/Debug_Unicode/SmsManager.tlog/link.read.1.tlog index 3500741..7818fca 100644 Binary files a/Debug_Unicode/SmsManager.tlog/link.read.1.tlog and b/Debug_Unicode/SmsManager.tlog/link.read.1.tlog differ diff --git a/Debug_Unicode/Temp/UpLoad.rar b/Debug_Unicode/Temp/UpLoad.rar new file mode 100644 index 0000000..832c0d7 Binary files /dev/null and b/Debug_Unicode/Temp/UpLoad.rar differ diff --git a/Debug_Unicode/vc143.idb b/Debug_Unicode/vc143.idb index 767a956..781711b 100644 Binary files a/Debug_Unicode/vc143.idb and b/Debug_Unicode/vc143.idb differ diff --git a/Release_Unicode/SmsManager.res b/Release_Unicode/SmsManager.res index 7e972f2..8424aeb 100644 Binary files a/Release_Unicode/SmsManager.res and b/Release_Unicode/SmsManager.res differ diff --git a/Release_Unicode/SmsManager3.exe b/Release_Unicode/SmsManager3.exe index 03f09f2..73a9f04 100644 Binary files a/Release_Unicode/SmsManager3.exe and b/Release_Unicode/SmsManager3.exe differ diff --git a/SmsManager.rc b/SmsManager.rc index efff100..76003b4 100644 --- a/SmsManager.rc +++ b/SmsManager.rc @@ -448,7 +448,7 @@ BEGIN EDITTEXT IDC_CORP_MODIFY_LEGALPERSONID,91,245,77,12,ES_AUTOHSCROLL EDITTEXT IDC_CORP_MODIFY_RESPONSIBLE,37,258,33,12,ES_AUTOHSCROLL EDITTEXT IDC_CORP_MODIFY_RESPONSIBLEID,91,258,77,12,ES_AUTOHSCROLL - EDITTEXT IDC_CORP_MODIFY_RESPONSIBLE_MOBILE,53,272,56,12,ES_AUTOHSCROLL + EDITTEXT IDC_CORP_MODIFY_RESPONSIBLE_MOBILE,55,272,56,12,ES_AUTOHSCROLL EDITTEXT IDC_CORP_MODIFY_BZ,37,285,131,23,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN | WS_VSCROLL EDITTEXT IDC_CORP_MODIFY_ADC_HT,225,83,32,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_VISIBLE EDITTEXT IDC_CORP_MODIFY_ADC_XY,263,83,30,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_VISIBLE @@ -3556,22 +3556,24 @@ BEGIN CONTROL "Progress1",IDC_CORP_FILE_GDT,"msctls_progress32",WS_BORDER,14,268,341,14 END -IDD_CORP_FILE_ADD DIALOGEX 0, 0, 231, 146 +IDD_CORP_FILE_ADD DIALOGEX 0, 0, 244, 137 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "ļϢ" FONT 9, "Microsoft Sans Serif", 400, 0, 0x0 BEGIN - EDITTEXT IDC_CORP_FILEADD_BZ,33,66,109,62,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN | WS_VSCROLL - DEFPUSHBUTTON "ȷ ",IDOK,166,83,50,21 - PUSHBUTTON "ȡ ",IDCANCEL,166,118,50,21 - GROUPBOX "",-1,7,5,142,134 - LTEXT "ǩʱ",-1,14,37,31,8 - ICON IDI_L_CORP,-1,181,51,20,20 - LTEXT "ļ",-1,14,17,31,8 - LTEXT "ע",-1,14,64,16,8 - COMBOBOX IDC_CORP_FILEADD_FILETYPE,47,15,95,155,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + EDITTEXT IDC_CORP_FILEADD_BZ,33,65,136,57,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN | WS_VSCROLL + DEFPUSHBUTTON "ȷ ",IDOK,186,77,50,21 + PUSHBUTTON "ȡ ",IDCANCEL,186,107,50,21 + GROUPBOX "", IDC_STATIC,7,5,170,125 + LTEXT "ǩʱ", IDC_STATIC,14,47,31,8 + ICON IDI_L_CORP, IDC_STATIC,204,48,13,12 + LTEXT "ļ", IDC_STATIC,14,17,31,8 + LTEXT "ע", IDC_STATIC,14,65,16,8 + COMBOBOX IDC_CORP_FILEADD_FILETYPE,49,15,119,155,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP CONTROL "DateTimePicker1",IDC_CORP_FILEADD_FILETIME, - "SysDateTimePick32",DTS_RIGHTALIGN | WS_TABSTOP,46,36,95,13 + "SysDateTimePick32",DTS_RIGHTALIGN | WS_TABSTOP,49,46,119,12 + LTEXT "ͬ",IDC_CORP_FILEADD_CONTRACTNUM_S,14,32,31,8 + EDITTEXT IDC_CORP_FILEADD_CONTRACTNUM,49,29,119,12,ES_AUTOHSCROLL END IDD_GZMSG_JS DIALOGEX 0, 0, 209, 110 @@ -5618,12 +5620,14 @@ BEGIN EDITTEXT IDC_TDSET_SIGNATURE_MODIFY_CORPANYNAME,183,51,172,12,ES_AUTOHSCROLL COMBOBOX IDC_TDSET_SIGNATURE_MODIFY_SIGNATURESOURCE,49,69,80,187,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP EDITTEXT IDC_TDSET_SIGNATURE_MODIFY_CORPANYNUM,183,68,172,12,ES_AUTOHSCROLL - EDITTEXT IDC_TDSET_SIGNATURE_MODIFY_LEGALNAME,44,110,113,12,ES_AUTOHSCROLL - COMBOBOX IDC_TDSET_SIGNATURE_MODIFY_LEGALCERTTYPE,167,111,55,76,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP - EDITTEXT IDC_TDSET_SIGNATURE_MODIFY_LEGALCERTID,237,110,113,12,ES_AUTOHSCROLL - EDITTEXT IDC_TDSET_SIGNATURE_MODIFY_AGENCYNAME,44,126,113,12,ES_AUTOHSCROLL - COMBOBOX IDC_TDSET_SIGNATURE_MODIFY_AGENCYCERTTYPE,167,127,55,76,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP - EDITTEXT IDC_TDSET_SIGNATURE_MODIFY_AGENCYCERTID,237,126,113,12,ES_AUTOHSCROLL + EDITTEXT IDC_TDSET_SIGNATURE_MODIFY_LEGALNAME,44,110,77,12,ES_AUTOHSCROLL + COMBOBOX IDC_TDSET_SIGNATURE_MODIFY_LEGALCERTTYPE,128,111,46,76,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + EDITTEXT IDC_TDSET_SIGNATURE_MODIFY_LEGALCERTID,187,110,86,12,ES_AUTOHSCROLL + EDITTEXT IDC_TDSET_SIGNATURE_MODIFY_LEGALMOBILE,283,110,74,12,ES_AUTOHSCROLL + EDITTEXT IDC_TDSET_SIGNATURE_MODIFY_AGENCYNAME,44,126,77,12,ES_AUTOHSCROLL + COMBOBOX IDC_TDSET_SIGNATURE_MODIFY_AGENCYCERTTYPE,128,127,46,76,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + EDITTEXT IDC_TDSET_SIGNATURE_MODIFY_AGENCYCERTID,187,126,86,12,ES_AUTOHSCROLL + EDITTEXT IDC_TDSET_SIGNATURE_MODIFY_AGENCYMOBILE,283,126,74,12,ES_AUTOHSCROLL EDITTEXT IDC_TDSET_SIGNATURE_MODIFY_PORTTYPE,49,161,107,12,ES_AUTOHSCROLL EDITTEXT IDC_TDSET_SIGNATURE_MODIFY_PORTUSAGE,205,161,143,12,ES_AUTOHSCROLL EDITTEXT IDC_TDSET_SIGNATURE_MODIFY_PORTUSAGECATEGORY,49,176,107,12,ES_AUTOHSCROLL @@ -5649,8 +5653,8 @@ BEGIN LTEXT "",IDC_STATIC,20,112,15,8 LTEXT "ϵ",IDC_STATIC,17,127,23,8 LTEXT "/",IDC_STATIC,72,99,32,8 - LTEXT "֤",IDC_STATIC,178,99,30,8 - LTEXT "֤",IDC_STATIC,277,99,30,8 + LTEXT "֤",IDC_STATIC,134,99,30,8 + LTEXT "֤",IDC_STATIC,208,99,30,8 LTEXT "ǩԴ",IDC_STATIC,16,70,30,8 GROUPBOX "ӦϢ",IDC_STATIC,7,150,357,59 LTEXT "˿",IDC_STATIC,16,164,30,8 @@ -5669,6 +5673,7 @@ BEGIN LTEXT "˿ڳͻ",IDC_STATIC,247,37,37,8 EDITTEXT IDC_TDSET_SIGNATURE_MODIFY_SENDCOUNT,298,223,48,12,ES_AUTOHSCROLL | ES_READONLY LTEXT "",IDC_STATIC,263,225,30,8 + LTEXT "ֻ",IDC_STATIC,303,99,30,8 END IDD_DOUBLECONFIRM DIALOGEX 0, 0, 285, 135 @@ -6637,9 +6642,9 @@ BEGIN IDD_CORP_FILE_ADD, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 223 + RIGHTMARGIN, 236 TOPMARGIN, 7 - BOTTOMMARGIN, 139 + BOTTOMMARGIN, 130 END IDD_GZMSG_JS, DIALOG diff --git a/UserDlg.cpp b/UserDlg.cpp index 6a5851f..74978a9 100644 --- a/UserDlg.cpp +++ b/UserDlg.cpp @@ -8838,7 +8838,10 @@ void CUserDlg::On_User_Assist_ExpiryRecycling() ANS_Corp_SeeData* pData = m_Corp.GetNext(pos); if (pData->lAgentID > 0) + { + MessageBox(_T("代理商客户,只能由代理商进行过期回收!"), _T("错误"), MB_ICONWARNING); return; + } REQ_Corp_Assist_ExpiryRecycling_Get* pExpiry = new REQ_Corp_Assist_ExpiryRecycling_Get; memset(pExpiry, 0, sizeof(REQ_Corp_Assist_ExpiryRecycling_Get)); diff --git a/resource.h b/resource.h index d4f8911..c02b473 100644 --- a/resource.h +++ b/resource.h @@ -208,7 +208,6 @@ #define IDC_MANAGER_MODIFY_BZ 1055 #define IDC_CORP_MODIFY_LEGALPERSONID 1055 #define IDC_CORP_MODIFY_TAXNUM 1056 -#define IDC_CORP_MODIFY_RESPONSIBLE2 1056 #define IDC_CORP_MODIFY_RESPONSIBLE_MOBILE 1056 #define IDC_CORP_LXRMODIFY_EMAIL 1057 #define IDC_USERMODIFY_BSEELIST 1058 @@ -2152,6 +2151,7 @@ #define IDC_TDSET_SIGNATURE_MODIFY_PORTUSAGECATEGORY 2469 #define IDC_TDSET_SIGNATURE_MODIFY_LOCATIONSERVERROOM 2470 #define IDC_TDSET_SIGNATURE_MODIFY_COTENTTEMPLATE 2471 +#define IDC_TDSET_SIGNATURE_MODIFY_LEGALMOBILE 2472 #define IDC_TDSET_SIGNATURE_MODIFY_ADDTIME 2473 #define IDC_TDSET_SIGNATURE_MODIFY_UPDATETIME 2474 #define IDC_TDSET_SIGNATURE_MODIFY_AUDITTIME 2475 @@ -2160,7 +2160,9 @@ #define IDC_TDSET_SIGNATURE_MODIFY_BZ 2478 #define IDC_TDSET_SIGNATURE_MODIFY_TDTITLE 2479 #define IDC_TDSET_SIGNATURE_MODIFY_CONFLICT 2480 +#define IDC_CORP_FILEADD_CONTRACTNUM 2480 #define IDC_TDSET_SIGNATURE_MODIFY_SENDCOUNT 2481 +#define IDC_TDSET_SIGNATURE_MODIFY_AGENCYMOBILE 2482 #define IDC_HANDCUR 3010 #define IDD_CORP_BZ 32260 #define IDD_CORP_OPER_OPEN 32261 @@ -2282,6 +2284,7 @@ #define ID_QUERY_JL 32786 #define ID_32787 32787 #define ID_QUERY_JL_INPORTMMDCOUNT 32788 +#define IDC_CORP_FILEADD_CONTRACTNUM_S 65535 // Next default values for new objects // @@ -2290,7 +2293,7 @@ #define _APS_3D_CONTROLS 1 #define _APS_NEXT_RESOURCE_VALUE 324 #define _APS_NEXT_COMMAND_VALUE 32789 -#define _APS_NEXT_CONTROL_VALUE 2480 +#define _APS_NEXT_CONTROL_VALUE 2481 #define _APS_NEXT_SYMED_VALUE 101 #endif #endif