From 03ef0b51103c735077c784c7df81ae2bcc1599ab Mon Sep 17 00:00:00 2001
From: LiFan <2308045698@qq.com>
Date: 星期四, 13 二月 2025 18:33:56 +0800
Subject: [PATCH] update
---
jrj/project/business/Enquiry.list.cpp | 88 +++++++++++++++++++++-----------------------
1 files changed, 42 insertions(+), 46 deletions(-)
diff --git a/jrj/project/business/Enquiry.list.cpp b/jrj/project/business/Enquiry.list.cpp
index 9e6968c..54b6378 100644
--- a/jrj/project/business/Enquiry.list.cpp
+++ b/jrj/project/business/Enquiry.list.cpp
@@ -20,8 +20,8 @@
}
public:
- xstring m_sType; //鏍戦�変腑鐨勭被鍨�
- xstring m_sTypeTxt; //鏍戦�変腑鐨勬暟鎹�
+ xstring m_sType; //树选中的类型
+ xstring m_sTypeTxt; //树选中的数据
xstring urlTree;
xstring myDataUrl;
xstring myDataUrl1;
@@ -76,8 +76,8 @@
xml x ;
- xaserverarg& arg = *new xaserverarg;
- arg.setNativePointer(arg.CreateInstance());
+ xaserverarg arg;
+
arg.AddArg(L"scene",scene,L"xs:xstring");
arg.AddArg(L"EntityID",EntityID,L"xs:xstring");
arg.AddArg(L"EntityName",GetEntityName(1),L"xs:xstring");
@@ -147,7 +147,7 @@
}
//process tree
- //鏌ユ壘褰撳墠鏍戦」鐨勯《绾х洰褰�
+ //查找当前树项的顶级目录
HTREEITEM LookupTopFolder(HTREEITEM hItem)
{
HTREEITEM hRoot = tv_folder.GetRootItem();
@@ -164,7 +164,7 @@
{
KXMLDOMElement e = nlist.item(i);
xstring name = e.getAttribute(L"name");
- HTREEITEM h = tv_folder.InsertChildItem(hItem, name, (LPARAM)&e, image);
+ HTREEITEM h = tv_folder.InsertChildItem(hItem, name, e, image);
ExpandCatChildFolder(tv_folder,h,e,35);
}
return 1;
@@ -181,13 +181,13 @@
{
KXMLDOMElement e = nlist.item(i);
xstring name = e.getAttribute(L"name");
- HTREEITEM h = tv_folder.InsertChildItem(hItem, name, (LPARAM)&e,35);
+ HTREEITEM h = tv_folder.InsertChildItem(hItem, name, e,35);
ExpandCatChildFolder(tv_folder,h,e,35);
}
return 1;
}
- //鏍戝睍寮�
+ //树展开
int OnTreeExpanding(TEvent* evt, int p)
{
NMTREEVIEW& nmtv = *(NMTREEVIEW*)evt->notify.pnmh;
@@ -196,7 +196,7 @@
xstring name = tv_folder.GetItemLabel(hTopItem);
HTREEITEM child = tv_folder.GetChildItem(hItem);
- KXMLDOMElement& e = *(KXMLDOMElement*)tv_folder.GetItemData(hItem);
+ KXMLDOMElement e = tv_folder.GetItemData(hItem);
if (!child)ExpandFolderItem(tv_folder,hItem,e.getAttribute(L"no"));
return 1;
@@ -212,7 +212,7 @@
xstring name = tv_folder_pricebill.GetItemLabel(hTopItem);
HTREEITEM child = tv_folder_pricebill.GetChildItem(hItem);
- KXMLDOMElement& e = *(KXMLDOMElement*)tv_folder_pricebill.GetItemData(hItem);
+ KXMLDOMElement e = tv_folder_pricebill.GetItemData(hItem);
if (!child)ExpandFolderItem(tv_folder_pricebill,hItem,e.getAttribute(L"no"));
return 1;
@@ -232,7 +232,7 @@
int image = 15;
if(sImage) image = sImage.toInt();
- HTREEITEM h = tv_folder.InsertChildItem(hItem, name, (LPARAM)&e, image);
+ HTREEITEM h = tv_folder.InsertChildItem(hItem, name, e, image);
if(child !=L"no" ) tv_folder.SetItemChild(h,1);
ExpandChildFolder(tv_folder,h,e);
}
@@ -289,11 +289,11 @@
xstring str = x.documentElement().getAttribute(L"text");
if(str == L"true")
{
- alert(L"淇濆瓨鎴愬姛!");
+ alert(L"保存成功!");
dw_pricelistshare.ResetUpdateStatus();
}else
{
- alert(L"淇濆瓨澶辫触!");
+ alert(L"保存失败!");
}
}
@@ -306,10 +306,10 @@
KXMLDOMElement xitem = nlist.item(0);
xstring Reciever = xitem.selectSingleNode(L"userno").text();
- xstring Subject = L"浠锋牸鍗曞凡鍏变韩["+CName+L"]";
- xstring Category = L"浠锋牸鍗曞叡浜�";
+ xstring Subject = L"价格单已共享["+CName+L"]";
+ xstring Category = L"价格单共享";
xstring Content = L"";
- ViewObject::AddMessage(Category, Reciever, NO, EntityID, Subject, Content);
+ ViewObject::AddMessage(GetServerUrl(),Category, Reciever, NO, EntityID, Subject, Content);
return 1;
}
int SendNotice(xml content)
@@ -359,7 +359,7 @@
xml x ;
xaserverarg arg ;
- arg.setNativePointer(arg.CreateInstance());
+
dw_pricelistex.DwUpdateAllToEx(x);
if(x.xml()!=L"")
@@ -380,7 +380,7 @@
dw_pricelistex.ResetUpdateStatus();
}else
{
- alert(L"鎴愬搧浠锋牸鍗曚繚瀛樺け璐�!");
+ alert(L"成品价格单保存失败!");
return 1;
}
}
@@ -388,7 +388,7 @@
xml x0 ;
dw_pricelist.DwUpdateAllToEx(x0);
- if(x0.xml() !=L"")
+ if((xstring)x0.xml() !=L"")
{
xml x1;
dw_priceitem.DwUpdateAllToEx(x1);
@@ -413,7 +413,7 @@
dw_priceitem.ResetUpdateStatus();
}else
{
- alert(L"缁勪欢浠锋牸鍗曚繚瀛樺け璐�!");
+ alert(L"组件价格单保存失败!");
return 1;
}
}
@@ -435,19 +435,19 @@
if(str == L"true")
{
dw_pricelistshare.ResetUpdateStatus();
- alert(L"淇濆瓨鎴愬姛!");
- OnProductPriceShareRetrieve();//鍒锋柊鏁版嵁
- SendNotice(x2);//鍙戦�侀�氱煡
+ alert(L"保存成功!");
+ OnProductPriceShareRetrieve();//刷新数据
+ SendNotice(x2);//发送通知
}else
{
- alert(L"鍏变韩鏁版嵁淇濆瓨澶辫触!");
+ alert(L"共享数据保存失败!");
}
}
return 1;
}
- int ViewUpdate(int pr,xstring updateItem,xaserverarg arg)
+ int ViewUpdate(LPARAM pr,xstring updateItem,xaserverarg arg)
{
if( updateItem==L"del")
{
@@ -487,12 +487,12 @@
return false;
}
- //妫�绱�
+ //检索
int OnPreRetrieve()
{
HTREEITEM hItem = tv_folder.GetSelectedItem();
- if(hItem <=0) return 1;
+ if(!hItem) return 1;
HCURSOR hCursor = xutil::SetCursorWait();
KXMLDOMElement e1 = tv_folder.GetItemData(hItem);
@@ -556,7 +556,7 @@
return 1;
}
- //鍘嗗彶鏁版嵁
+ //历史数据
int Onhistroydata()
{
return 1;
@@ -868,7 +868,7 @@
dw_pricelistshare.SetItemString(crow,L"NO",No);
dw_pricelistshare.SetItemString(crow,L"GroupOrEmp",GroupOrEmp);
dw_pricelistshare.SetItemString(crow,L"EntityID",EntityID);
- dw_pricelistshare.SetItemString(crow,L"EntityName",L"浜у搧浠锋牸鍗�");
+ dw_pricelistshare.SetItemString(crow,L"EntityName",L"产品价格单");
if(node.selectSingleNode(L"UserGroupID"))
dw_pricelistshare.SetItemString(crow,L"UserGroupID",node.selectSingleNode(L"UserGroupID").text());
if(node.selectSingleNode(L"PersonID"))
@@ -1023,12 +1023,13 @@
int OnTech(xdwgrid dw_term)
{
- xaserverarg arg;
+ xaserverarg arg=GetArg();
int row = dw_term.GetRow();
if(row < 1) return 0;
xstring str = dw_term.GetItemString(row,L"TechNote");
arg.AddArg(L"value",str);
OpenWindow(L"dev:xpage[memo.edit.new.vx]",arg);
+
if(arg.GetArgString(L"comdid")==L"xmOK")
{
str = arg.GetArgString(L"value");
@@ -1216,9 +1217,9 @@
xml supplier_x = ViewObject::RetrieveData(L"/sale/data/SupplierV3/entity/FindBySaleType",L"id", s);
if(supplier_x)
{
- if((xstring)supplier_x.text() == L"閲囪喘缁忕悊")
+ if((xstring)supplier_x.text() == L"采购经理")
{
- alert(L"褰撳墠瑙掕壊涓嶆槸閲囪喘鍛樹笉鑳芥柊澧炲崟瀛愶紝璇烽噸鏂伴�夋嫨瑙掕壊");
+ alert(L"当前角色不是采购员不能新增单子，请重新选择角色");
return 0;
}
}
@@ -1281,7 +1282,7 @@
return 1;
}
- //xcombobox涓嬫媺
+ //xcombobox下拉
int OnSelectDdlb(TEvent* evt,int p)
{
changeddlb=1;
@@ -1405,17 +1406,11 @@
xutil::RestoreCursor(hCursor);
return 1;
}
- int OnDoubleClicked(TEvent* evt, LPARAM pr)
- {
- HCURSOR hCursor = xutil::SetCursorWait();
- OnCmdDispatch(L"action:bill.open");
- xutil::RestoreCursor(hCursor);
- return 1;
- }
+
int AttachListon()
{
- AttachEvent(L"tv_folder", L"TVN_SELCHANGED",(FEvent)&Enquiry3list::OnTreeSelChanged); //鏍戦�夋嫨
- AttachEvent(L"tv_folder", L"TVN_ITEMEXPANDING", (FEvent)&Enquiry3list::OnTreeExpanding); //鏍戝睍寮�
+ AttachEvent(L"tv_folder", L"TVN_SELCHANGED",(FEvent)&Enquiry3list::OnTreeSelChanged); //树选择
+ AttachEvent(L"tv_folder", L"TVN_ITEMEXPANDING", (FEvent)&Enquiry3list::OnTreeExpanding); //树展开
AttachEvent(L"dw_list",L"DWV_ROWFOCUSCHANGED", (FEvent)&Enquiry3list::OnRowChanged);
AttachEvent(L"dw_list2",L"DWV_ROWFOCUSCHANGED", (FEvent)&Enquiry3list::OnRowChanged2);
AttachEvent(L"dw_list1",L"DWV_ROWFOCUSCHANGED", (FEvent)&Enquiry3list::OnRowChanged1);
@@ -1423,7 +1418,7 @@
AttachEvent(L"WM_COMMAND", (FEvent)&Enquiry3list::OnCkbCLick);
AttachEvent(L"dw_list",L"DWV_ASKSTYLE", (FEvent)&Enquiry3list::OnItemAskStyle);
AttachEvent(L"dw_pricelist",L"DWV_ROWFOCUSCHANGED", (FEvent)&Enquiry3list::OnPriceListRowChanged);
- AttachEvent(L"tv_folder_pricebill", L"TVN_SELCHANGED", (FEvent)&Enquiry3list::OnPriceBillTreeSelChanged); //鏍戦�夋嫨
+ AttachEvent(L"tv_folder_pricebill", L"TVN_SELCHANGED", (FEvent)&Enquiry3list::OnPriceBillTreeSelChanged); //树选择
AttachEvent(L"tv_folder_pricebill", L"TVN_ITEMEXPANDING", (FEvent)&Enquiry3list::OnPriceBillTreeExpanding);
AttachEvent(L"dw_pricelistex",L"DWV_DOUBLECLICKED", (FEvent)&Enquiry3list::OnPriceListDoubleClicked);
@@ -1521,6 +1516,7 @@
}
int onload()
{
+ SetArg();
state1=-1;
state2=-1;
@@ -1615,7 +1611,7 @@
tv_folder_pricebill = GetControl(L"tv_folder_pricebill");
InitialFolderPriceBill();
-
+ return 1;
}
int onloaded()
@@ -1663,7 +1659,7 @@
{
HTREEITEM hItem = tv_folder.GetCaretItem();
arg.AddArg(L"sheetname",sheetname);
- if(hItem > 0)
+ if(!hItem)
{
KXMLDOMElement e = tv_folder.GetItemData(hItem);
@@ -1674,7 +1670,7 @@
{
arg.AddArg(L"CustomerID",e.getAttribute(L"id"));
xstring name = e.getAttribute(L"name");
- if(name.find(L"(L")>=0) name = name.left(name.find(L"(L"));
+ if(name.find(L"(")>=0) name = name.left(name.find(L"("));
arg.AddArg(L"CustomerName",name);
}
}
--
Gitblit v1.9.3