xj qian
2024-06-28 448b56364d4bd9c990ee190e1aafd8188edf25a0
update quote enquiry
已修改5个文件
20 ■■■■■ 文件已修改
jrj/ext-jrj/ext-jrj.vcxproj 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
jrj/project/business/HR/AdministrativeDepartmentFolder.cpp 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
jrj/project/business/SO/maint.Document.SO3.v3.cpp 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
jrj/project/business/SO3.list.cpp 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jrj/xframe/vbusiness/vframe/listwin.vframe.vbusiness.hpp 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jrj/ext-jrj/ext-jrj.vcxproj
@@ -273,7 +273,7 @@
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\Public\memo.edit.new.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\quote.enquiry.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
jrj/project/business/HR/AdministrativeDepartmentFolder.cpp
@@ -181,7 +181,9 @@
            
            adid = L"";
            parentid = L"";
            if (GetWinParam()) {
            if (GetWinParam())
            {
                xaserverarg arg=GetArg();
                parentid = arg.GetArgString(L"parentid");
                adid = arg.GetArgString(L"adid");
            }
jrj/project/business/SO/maint.Document.SO3.v3.cpp
@@ -454,7 +454,7 @@
            if (GetWinParam())
            {
                xaserverarg arg;
                xaserverarg arg= GetArg();
                entityid = arg.GetArgString(L"entityid");
                Type = arg.GetArgString(L"Type");
                ApprovalStatus = arg.GetArgString(L"ApprovalStatus");
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;
jrj/xframe/vbusiness/vframe/listwin.vframe.vbusiness.hpp
@@ -406,13 +406,13 @@
        return 1;
    }
    virtual int PreOnCmdDispatch(string comdid)
    virtual int PreOnCmdDispatch(xstring comdid)
    {
        //返回0——不在执行以下代码;返回其他——执行以下代码。
        return 1;
    }
    virtual int PostOnCmdDispatch(string comdid)
    virtual int PostOnCmdDispatch(xstring comdid)
    {
        //    trace("test");
        return 1;