.gitignore

@@ -11,3 +11,5 @@

# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
/jrj/project/business/Expense/RmbRegister.cpp
/jrj/project/business/Expense/RmbRegister.cpp

 jrj/ext-jrj/ext-jrj.vcxproj

@@ -603,6 +603,7 @@
    <ClCompile Include="..\project\business\Expense\ExportCredit.SwitchTo.cpp">

      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>

    </ClCompile>

    <ClCompile Include="..\project\business\Expense\ExportCredit.SwitchToEx.cpp" />

    <ClCompile Include="..\project\business\Expense\ExportCreditMaint.cpp">

      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>

    </ClCompile>


 jrj/ext-jrj/ext-jrj.vcxproj.filters

@@ -1664,6 +1664,9 @@
    <ClCompile Include="..\project\business\ProductSample\UserProductApplyEx.cpp">

      <Filter>project\business\ProductSample</Filter>

    </ClCompile>

    <ClCompile Include="..\project\business\Expense\ExportCredit.SwitchToEx.cpp">

      <Filter>project\business\Expense</Filter>

    </ClCompile>

  </ItemGroup>

  <ItemGroup>

    <None Include="ext-jrj.def">


 jrj/project/business/Customer3.list.cpp

Binary files differ

 jrj/project/business/Customer3.maint.cpp

@@ -768,6 +768,21 @@
                OnShareMessage();
                return 0;
        }
        if (comdid == L"action:bill.check.ask")
        {
            int row = dw_detail.GetRow();
            if (row < 1) return 0;
            xstring PartyID = dw_detail.GetItemString(row, L"PartyID");
            KXMLDOMDocument xx3 = ViewObject::RetrieveData(L"/sale/data/CustomerV3/entity/GetCustomerResults", L"CustomerID", PartyID);

            xstring Results3 = xx3.text();

            if (Results3 != L"")
            {
                alert(Results3);
                return 0;
            }
        }
    //    else if (comdid.find(L"action:",0) >= 0) return OnAction(comdid);
        return -1;    
    }
@@ -901,6 +916,15 @@
                return 1;
            }
        }
        if (value == L"信保回复附件")
        {
                arg.AddArg(L"entityid", dw_detail.GetGuid(1));
                arg.AddArg(L"ApproveStatus", L"新建");
                OpenWindow(L"dev:xpage[maint.Document.SampleRequestForm.vx]", (LPARAM)&arg);
                return 1;
			
        }

        if(value == L"客户基本信息")
        {    
            xaserverarg arg1 = GetArg();    
@@ -1248,7 +1272,7 @@
            
            ApplyStatus=dw_detail.GetItemString(1,L"ApplyStatus");
            
            if(userno !=L"00601" && userno !=L"admin" && userno !=L"00701" && userno != L"00618" || userno == L"00620")
            if(userno !=L"00601" && userno !=L"admin" && userno !=L"00701" && userno != L"00618" || userno != L"00620")
            {
                if(ApplyStatus ==L"已审核")
                {
@@ -1256,7 +1280,13 @@
                }
            }
            
			
            if (userno == L"00601" && userno == L"admin" && userno != L"00701" && userno == L"00618" || userno == L"00620")
            {
				
                    dw_detail.SetReadOnly(false);
				
            }

            dw_detail.SetEditUpperMode(true);
            dw_visit.SetEditUpperMode(true);
            dw_Meetings.SetEditUpperMode(true);

 jrj/project/business/Expense/ExportCredit.SwitchToEx.cpp

Binary files differ

 jrj/project/business/Expense/ExportCredit.cpp

Binary files differ

 jrj/project/business/Expense/ExportCreditMaint.cpp

Binary files differ