From d013a35ef5bb3b45b46362c67d6f3ca52a54e96d Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期一, 01 七月 2024 16:07:55 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/project/business/SO3.list.cpp | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/jrj/project/business/SO3.list.cpp b/jrj/project/business/SO3.list.cpp
index 2169958..c75d8cc 100644
--- a/jrj/project/business/SO3.list.cpp
+++ b/jrj/project/business/SO3.list.cpp
@@ -285,12 +285,12 @@
return 1;
}
- int PreOnCmdDispatch(string comdid)
+ int PreOnCmdDispatch(xstring comdid)
{
if (comdid == L"action:bill.new")
{
- string s = publiccode::GetUser().id;
- string no = publiccode::GetUser().no;
+ xstring s = publiccode::GetUser().id;
+ xstring no = publiccode::GetUser().no;
if (no != L"00303" && no != L"admin")
{
KXMLDOMDocument supplier_x = ViewObject::RetrieveData(GetServerUrl(),L"/sale/data/SupplierV3/entity/FindBySaleType", L"id", s);
@@ -306,7 +306,7 @@
}
if (comdid == L"action:bill.annex")
{
- string deptname = publiccode::GetUser().deptname;
+ xstring deptname = publiccode::GetUser().deptname;
if (deptname == L"采购部")
{
return 1;
@@ -406,7 +406,7 @@
{
AttachEvent(L"tv_folder", L"TVN_SELCHANGED", (FEvent)&SO3list::OnTreeSelChanged); //树选择
AttachEvent(L"dw_list", L"DWV_ROWFOCUSCHANGED", (FEvent)&SO3list::OnRowChanged);//绑定行更改触发事件OnRowChanged
- AttachEvent(L"dw_list", L"DWV_DOUBLECLICKED", (FEvent)&listwin::OnDoubleClicked);
+ //AttachEvent(L"dw_list", L"DWV_DOUBLECLICKED", (FEvent)&listwin::OnDoubleClicked);
AttachEvent(L"cbx_1", L"CBN_SELCHANGE", (FEvent)&SO3list::OnSelectDdlb);//绑定下拉框更改触发事件OnSelectDdlb
AttachEvent(L"cbx_datashow", L"CBN_SELCHANGE", (FEvent)&SO3list::OnSelectDataShowDdlb);//绑定选择数据显示下拉列表事件OnSelectDataShowDdlb
return 1;
--
Gitblit v1.9.3