From 84f9a6812122e59ba862d2e72c743b29c7ed5f48 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 25 十二月 2024 08:42:13 +0800
Subject: [PATCH] 采购付款
---
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx.cs | 2
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderList.aspx | 2
CY_ECommercePlatform/CY.WebForm/Pages/financial/CaigouPayEdit.aspx.designer.cs | 134 ++++
CY_ECommercePlatform/CY.WebForm/Pages/business/Caigoufukuanshenqing.aspx.cs | 314 +++++++++++
CY_ECommercePlatform/CY.WebForm/Pages/financial/NewWaixieExpenses.aspx.cs | 2
CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx | 2
CY_ECommercePlatform/CY.WebForm/Pages/financial/CaigouPayEdit.aspx | 142 +++++
CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestAdd.aspx | 2
CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx | 10
CY_ECommercePlatform/CY.WebForm/Pages/financial/CaigouPayEdit.aspx.cs | 260 +++++++++
CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanweikaipiao.aspx | 15
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx | 26
CY_ECommercePlatform/CY.WebForm/Pages/business/Caigoufukuanshenqing.aspx | 158 +++++
CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementList.aspx.designer.cs | 48
CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj | 16
CY_ECommercePlatform/CY.WebForm/Pages/business/Caigoufukuanshenqing.aspx.designer.cs | 116 ++++
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchKaipiao.aspx | 4
CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.cs | 2
CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanfukuan.aspx | 17
CY_ECommercePlatform/CY.WebForm/Pages/financial/WaixieExpenses.aspx.cs | 2
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx | 266 ++++++++-
CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestList.aspx | 7
CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementList.aspx | 78 ++
CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyList.aspx | 1
24 files changed, 1,529 insertions(+), 97 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj b/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
index 7e6d851..0c874d2 100644
--- a/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
+++ b/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
@@ -1883,6 +1883,7 @@
<Content Include="Pages\business\BackVisitNoteEdit.aspx" />
<Content Include="Pages\business\BargainPrice.aspx" />
<Content Include="Pages\business\BargainPriceByFirm.aspx" />
+ <Content Include="Pages\business\Caigoufukuanshenqing.aspx" />
<Content Include="Pages\business\WaixieOrderPrint.aspx" />
<Content Include="Pages\business\Waixiefukuanweikaipiao.aspx" />
<Content Include="Pages\business\Waixiefukuanfukuan.aspx" />
@@ -2045,6 +2046,7 @@
<Content Include="Pages\financial\DepositsCustomerFapiao.aspx" />
<Content Include="Pages\financial\NewWaixieExpenses.aspx" />
<Content Include="Pages\financial\OutsourcePiliangPayMoney.aspx" />
+ <Content Include="Pages\financial\CaigouPayEdit.aspx" />
<Content Include="Pages\financial\WaixieExpenses.aspx" />
<Content Include="Pages\financial\FirmAccountPrint.aspx" />
<Content Include="Pages\financial\FirmAccountPrintTable.aspx" />
@@ -3304,6 +3306,13 @@
<Compile Include="Pages\business\BargainPriceByFirm.aspx.designer.cs">
<DependentUpon>BargainPriceByFirm.aspx</DependentUpon>
</Compile>
+ <Compile Include="Pages\business\Caigoufukuanshenqing.aspx.cs">
+ <DependentUpon>Caigoufukuanshenqing.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\business\Caigoufukuanshenqing.aspx.designer.cs">
+ <DependentUpon>Caigoufukuanshenqing.aspx</DependentUpon>
+ </Compile>
<Compile Include="Pages\business\WaixieOrderPrint.aspx.cs">
<DependentUpon>WaixieOrderPrint.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -4438,6 +4447,13 @@
<Compile Include="Pages\financial\OutsourcePiliangPayMoney.aspx.designer.cs">
<DependentUpon>OutsourcePiliangPayMoney.aspx</DependentUpon>
</Compile>
+ <Compile Include="Pages\financial\CaigouPayEdit.aspx.cs">
+ <DependentUpon>CaigouPayEdit.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\financial\CaigouPayEdit.aspx.designer.cs">
+ <DependentUpon>CaigouPayEdit.aspx</DependentUpon>
+ </Compile>
<Compile Include="Pages\financial\WaixieExpenses.aspx.cs">
<DependentUpon>WaixieExpenses.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx
index 3b62621..7f4183a 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx
@@ -158,7 +158,7 @@
<div class="right">
<div class="padding_top5 padding_left10">
- <a href="javascript:;" onclick="ToWaixieFukuan()"><span class="icon_edit">澶栧崗浠樻鐢宠</span></a>
+ <a href="javascript:;" menu_member_case_id="case_waixiefukuan" menu_member_case_name="澶栧崗浠樻鐢宠" onclick="ToWaixieFukuan()"><span class="icon_edit">澶栧崗浠樻鐢宠</span></a>
<div class="box_tool_line">
</div>
<a style="color: #666; cursor: inherit;">(濡傛灉澶栧崗缁欑嚎涓婂巶鍟嗙殑璁㈠崟琚彈鐞嗭紝閭ｄ箞姝ゅ鍗忚鍗曚笉鍙啀淇敼锛屼篃涓嶅彲鍒犻櫎銆�)</a>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx
index a686273..c9bb454 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx
@@ -236,18 +236,18 @@
鍗板埛鏈哄彴
</td>
<td colspan="2">
- 鍗拌壊
+ <span style="<%#Eval("shifouxianshi")%>" >鍗拌壊</span>
</td>
<td rowspan="2" colspan="2">
- 鎺掔増鏂瑰紡
+ <span style="<%#Eval("shifouxianshi")%>" >鍗板埛鏂瑰紡</span>
</td>
</tr>
<tr class=" price_tabbg" style="font-weight: bold; background-color: #E4E4E4;">
<td>
- 姝�
+ <span style="<%#Eval("shifouxianshi")%>" >姝�</span>
</td>
<td>
- 鑳�
+ <span style="<%#Eval("shifouxianshi")%>" >鑳�</span>
</td>
</tr>
<tr style="background-color: #FFFFFF;">
@@ -261,13 +261,13 @@
<%#Eval("PSF_PressesDesk")%>
</td>
<td>
- <%#Eval("PSF_PrintedColorPositive")%>
+ <span style="<%#Eval("shifouxianshi")%>" ><%#Eval("PSF_PrintedColorPositive")%></span>
</td>
<td>
- <%#Eval("PSF_PrintedColorRear")%>
+ <span style="<%#Eval("shifouxianshi")%>" ><%#Eval("PSF_PrintedColorRear")%></span>
</td>
<td colspan="2">
- <%#Eval("PSF_Typesetting")%>
+ <span style="<%#Eval("shifouxianshi")%>" ><%#Eval("PSF_Typesetting")%></span>
</td>
<%--<td>
<%#Eval("PSF_SheetSource")%>
@@ -279,9 +279,9 @@
<%#Eval("PSF_EditionCount")%>
</td>--%>
</tr>
- <tr class=" price_tabbg" style="font-weight: bold; background-color: #E6E6E6;<%#Eval("shifouxianshi")%>">
+ <tr class=" price_tabbg" style="font-weight: bold; background-color: #E6E6E6;">
<td rowspan="2">
- 绾稿紶鏉ユ簮
+ 绾稿紶鏉ユ簮
</td>
<td rowspan="2" colspan="1">
绾稿紶鍚嶇О
@@ -296,7 +296,7 @@
寮�鏂欒鏍�
</td>
</tr>
- <tr class=" price_tabbg" style="font-weight: bold; background-color: #E6E6E6;<%#Eval("shifouxianshi")%>">
+ <tr class=" price_tabbg" style="font-weight: bold; background-color: #E6E6E6;">
<td>
绾稿紶鏁伴噺
</td>
@@ -316,7 +316,7 @@
闀垮害(mm)
</td>
</tr>
- <tr style="background-color: #FFFFFF;<%#Eval("shifouxianshi")%>">
+ <tr style="background-color: #FFFFFF;">
<td>
<%#Eval("PSF_PaperSource")%>
</td>
@@ -356,7 +356,7 @@
瑙勬牸
</td>
<td id="lbCTPCount" <%#show("CTPCount",Eval("PSF_PlateSource").ToString())%>>
- CTP鏁伴噺锛堝紶锛�
+ <span style="<%#Eval("shifouxianshi")%>" > CTP鏁伴噺锛堝紶锛� </span>
</td>
<td id="lbPSSpec" <%#show("PSSpec",Eval("PSF_PlateSource").ToString())%>>
PS鐗堣鏍�
@@ -375,7 +375,7 @@
<%#Eval("PSF_CTPSpecType")%>
</td>
<td id="tdCTPCount" <%#show("CTPCount",Eval("PSF_PlateSource").ToString())%>>
- <%#0.Equals(Eval("PSF_CTPCount")) ? "" : Eval("PSF_CTPCount")%>
+ <span style="<%#Eval("shifouxianshi")%>" > <%#0.Equals(Eval("PSF_CTPCount")) ? "" : Eval("PSF_CTPCount")%> </span>
</td>
<td id="tdPSSpec" <%#show("PSSpec",Eval("PSF_PlateSource").ToString())%>>
<%#Eval("PSF_PSSpec")%>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx.cs
index 4dab4a0..018f7c0 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx.cs
@@ -173,7 +173,7 @@
foreach (var eC_SpecialForums in m_EC_SpecialForumsList)
{
- if (eC_SpecialForums.PSF_PressesDesk.IndexOf("鏁扮爜")>=0)
+ if (eC_SpecialForums.PSF_PressesDesk.IndexOf("鏁扮爜")>=0 || eC_SpecialForums.PSF_PressesDesk.IndexOf("鐩存帴淇垏") >= 0)
{
eC_SpecialForums.shifouxianshi = "display:none;";
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx
index b610db5..a84ccae 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx
@@ -207,7 +207,7 @@
<p name="PSF_yinse" value_openwidthspan="<%#Container.ItemIndex + 1%>">鍗拌壊</p>
</td>
<td rowspan="2" colspan="2">
- 鍗板埛鏂瑰紡
+ <p name="PSF_yinshufangshi" value_openwidthspan="<%#Container.ItemIndex + 1%>">鍗板埛鏂瑰紡</p>
</td>
</tr>
@@ -351,7 +351,7 @@
<input type="text" class=" w80px int " msg="璇峰～鍐欐暟瀛�" name="PSF_OpenWidth" value="<%#(Eval("PSF_OpenWidth") == null || Eval("PSF_OpenWidth").ToString()=="0")?"":Eval("PSF_OpenWidth").ToString()%>" value_ppwaerid='<%#Container.ItemIndex + 1%>' />
<div class="xialap" value_ppwaerid='<%#Container.ItemIndex + 1%>' style="display:none;" >
- <input type="text" class=" w80px int " name="PSF_OpenWidthName" value="<%#(Eval("PSF_OpenWidth") == null || Eval("PSF_OpenWidth").ToString()=="0")?"":Eval("PSF_OpenWidth").ToString()%>" value_ppwaerid='<%#Container.ItemIndex + 1%>' />
+ <input type="text" class=" w80px int " value_ppwaerid='<%#Container.ItemIndex + 1%>' name="PSF_OpenWidthName" value="<%#(Eval("PSF_OpenWidth") == null || Eval("PSF_OpenWidth").ToString()=="0")?"":Eval("PSF_OpenWidth").ToString()%>" />
<div class="xialapb" >
<div class="xialapr">755</div>
@@ -571,6 +571,7 @@
$("p[name='PSF_OpenWidthspan']").last().attr("value_openwidthspan", value_id + 1);
$("p[name='PSF_yinse']").last().attr("value_openwidthspan", value_id + 1);
$("p[name='PSF_yinsezheng']").last().attr("value_openwidthspan", value_id + 1);
+ $("p[name='PSF_yinshufangshi']").last().attr("value_openwidthspan", value_id + 1);
$("p[name='PSF_yinsebei']").last().attr("value_openwidthspan", value_id + 1);
$("select[name='PSF_PrintedColorRear']").last().attr("value_ppwaerid", value_id + 1);
$("select[name='PSF_PressesDesk']").last().attr("value_selspec", value_id + 1);
@@ -791,6 +792,8 @@
$("p[name='PSF_yinsezheng'][value_openwidthspan='" + value_SelWaerId + "']").show();
$("p[name='PSF_yinsebei'][value_openwidthspan='" + value_SelWaerId + "']").show();
+ $("p[name='PSF_yinshufangshi'][value_openwidthspan='" + value_SelWaerId + "']").show();
+
$("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").show();
$("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").show();
@@ -800,7 +803,9 @@
$("tr[name='PSF_PrintedPaperTdtrtr'][value_selspec='" + value_SelWaerId + "']").show();
$("select[name='PSF_Typesettinghide'][value_ppwaerid='" + value_SelWaerId + "']").hide();
-
+ $(".lbCTPCount[value_ppwaerid='" + value_SelWaerId + "']").show();
+ $("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").show();
+
}
else if ($(this).val().indexOf('鍥涜壊') >= 0) {
$("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").val("鍥涜壊");
@@ -821,7 +826,7 @@
$("p[name='PSF_yinse'][value_openwidthspan='" + value_SelWaerId + "']").show();
$("p[name='PSF_yinsezheng'][value_openwidthspan='" + value_SelWaerId + "']").show();
$("p[name='PSF_yinsebei'][value_openwidthspan='" + value_SelWaerId + "']").show();
-
+ $("p[name='PSF_yinshufangshi'][value_openwidthspan='" + value_SelWaerId + "']").show();
$("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").show();
$("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").show();
@@ -830,6 +835,8 @@
$("tr[name='PSF_PrintedPaperTdtr'][value_selspec='" + value_SelWaerId + "']").show();
$("tr[name='PSF_PrintedPaperTdtrtr'][value_selspec='" + value_SelWaerId + "']").show();
$("select[name='PSF_Typesettinghide'][value_ppwaerid='" + value_SelWaerId + "']").hide();
+ $(".lbCTPCount[value_ppwaerid='" + value_SelWaerId + "']").show();
+ $("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").show();
}
else if ($(this).val().indexOf('鍏壊') >= 0) {
$("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").val("鍥涜壊");
@@ -852,7 +859,7 @@
$("p[name='PSF_yinsezheng'][value_openwidthspan='" + value_SelWaerId + "']").show();
$("p[name='PSF_yinsebei'][value_openwidthspan='" + value_SelWaerId + "']").show();
-
+ $("p[name='PSF_yinshufangshi'][value_openwidthspan='" + value_SelWaerId + "']").show();
$("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").show();
$("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").show();
@@ -860,6 +867,8 @@
$("tr[name='PSF_PrintedPaperTdtr'][value_selspec='" + value_SelWaerId + "']").show();
$("tr[name='PSF_PrintedPaperTdtrtr'][value_selspec='" + value_SelWaerId + "']").show();
$("select[name='PSF_Typesettinghide'][value_ppwaerid='" + value_SelWaerId + "']").hide();
+ $(".lbCTPCount[value_ppwaerid='" + value_SelWaerId + "']").show();
+ $("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").show();
}
else if ($(this).val().indexOf('榛戠櫧') >= 0) {
$("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").val("鍗曡壊");
@@ -871,8 +880,8 @@
$("p[name='PSF_OpenSpecificationsspan'][value_selspecspan='" + value_SelWaerId + "']").show();
$("p[name='PSF_OpenWidthspan'][value_openwidthspan='" + value_SelWaerId + "']").show();
$("input[name='PSF_OpenLength'][value_ppwaerid='" + value_SelWaerId + "']").show();
- $("input[name='PSF_OpenWidth'][value_ppwaerid='" + value_SelWaerId + "']").show();
- $(".xialap[value_ppwaerid='" + value_SelWaerId + "']").hide();
+ $("input[name='PSF_OpenWidth'][value_ppwaerid='" + value_SelWaerId + "']").hide();
+ $(".xialap[value_ppwaerid='" + value_SelWaerId + "']").show();
@@ -881,7 +890,7 @@
$("p[name='PSF_yinse'][value_openwidthspan='" + value_SelWaerId + "']").show();
$("p[name='PSF_yinsezheng'][value_openwidthspan='" + value_SelWaerId + "']").show();
$("p[name='PSF_yinsebei'][value_openwidthspan='" + value_SelWaerId + "']").show();
-
+ $("p[name='PSF_yinshufangshi'][value_openwidthspan='" + value_SelWaerId + "']").show();
$("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").show();
$("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").show();
@@ -890,6 +899,9 @@
$("tr[name='PSF_PrintedPaperTdtr'][value_selspec='" + value_SelWaerId + "']").show();
$("tr[name='PSF_PrintedPaperTdtrtr'][value_selspec='" + value_SelWaerId + "']").show();
$("select[name='PSF_Typesettinghide'][value_ppwaerid='" + value_SelWaerId + "']").hide();
+ $(".lbCTPCount[value_ppwaerid='" + value_SelWaerId + "']").show();
+ $("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").show();
+ $("input[name='PSF_OpenWidthName'][value_ppwaerid='" + value_SelWaerId + "']").val("755");
}
else if ($(this).val().indexOf('杞浆') >= 0) {
$("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").val("鍗曡壊");
@@ -898,13 +910,14 @@
$("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").val("");
$("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").change();
$("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").hide();
+ $(".xialap[value_ppwaerid='" + value_SelWaerId + "']").show();
$("input[name='PSF_OpenWidthName'][value_ppwaerid='" + value_SelWaerId + "']").val("755");
$("p[name='PSF_OpenSpecificationsspan'][value_selspecspan='" + value_SelWaerId + "']").hide();
$("p[name='PSF_OpenWidthspan'][value_openwidthspan='" + value_SelWaerId + "']").hide();
$("input[name='PSF_OpenLength'][value_ppwaerid='" + value_SelWaerId + "']").hide();
$("input[name='PSF_OpenWidth'][value_ppwaerid='" + value_SelWaerId + "']").hide();
- $(".xialap[value_ppwaerid='" + value_SelWaerId + "']").show();
+
@@ -915,7 +928,7 @@
$("p[name='PSF_yinsezheng'][value_openwidthspan='" + value_SelWaerId + "']").show();
$("p[name='PSF_yinsebei'][value_openwidthspan='" + value_SelWaerId + "']").show();
-
+ $("p[name='PSF_yinshufangshi'][value_openwidthspan='" + value_SelWaerId + "']").show();
$("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").show();
$("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").show();
@@ -923,9 +936,46 @@
$("tr[name='PSF_PrintedPaperTdtr'][value_selspec='" + value_SelWaerId + "']").show();
$("tr[name='PSF_PrintedPaperTdtrtr'][value_selspec='" + value_SelWaerId + "']").show();
$("select[name='PSF_Typesettinghide'][value_ppwaerid='" + value_SelWaerId + "']").hide();
+ $(".lbCTPCount[value_ppwaerid='" + value_SelWaerId + "']").show();
+ $("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").show();
+ }
+ // else if () {
+ // //$("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").show();
+ // //$("p[name='PSF_OpenSpecificationsspan'][value_selspecspan='" + value_SelWaerId + "']").show();
+ // //$("p[name='PSF_OpenWidthspan'][value_openwidthspan='" + value_SelWaerId + "']").show();
+ // //$("input[name='PSF_OpenLength'][value_ppwaerid='" + value_SelWaerId + "']").show();
+ // //$("input[name='PSF_OpenWidth'][value_ppwaerid='" + value_SelWaerId + "']").show();
+ // //$(".xialap[value_ppwaerid='" + value_SelWaerId + "']").hide();
+
+
- } else if ($(this).val().indexOf('鏁扮爜') >= 0) {
+ // //$("select[name='PSF_Typesetting'][value_ppwaerid='" + value_SelWaerId + "']").hide();
+
+ // //$("p[name='PSF_yinse'][value_openwidthspan='" + value_SelWaerId + "']").hide();
+ // //$("p[name='PSF_yinsezheng'][value_openwidthspan='" + value_SelWaerId + "']").hide();
+ // //$("p[name='PSF_yinsebei'][value_openwidthspan='" + value_SelWaerId + "']").hide();
+
+
+ // //$("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").hide();
+ // //$("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").hide();
+
+ // //$("tr[name='PSF_PrintedPaperTd'][value_selspec='" + value_SelWaerId + "']").hide();
+ // //$("tr[name='PSF_PrintedPaperTdtr'][value_selspec='" + value_SelWaerId + "']").hide();
+ // //$("tr[name='PSF_PrintedPaperTdtrtr'][value_selspec='" + value_SelWaerId + "']").hide();
+ // //$("select[name='PSF_Typesettinghide'][value_ppwaerid='" + value_SelWaerId + "']").show();
+ // //$("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").val("");
+ // //$("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").val("");
+
+
+ //}
+ else if ($(this).val().indexOf('鐩存帴淇垏') >= 0 || $(this).val().indexOf('鏁扮爜') >= 0) {
+
+ $("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").val("鍗曡壊");
+ $("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").val("鍗曡壊");
+ $("input[name='CTPSpecName'][value_ppwaerid='" + value_SelWaerId + "']").val("395*460");
+ $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").val("4寮�");
+ $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").change();
$("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").show();
$("p[name='PSF_OpenSpecificationsspan'][value_selspecspan='" + value_SelWaerId + "']").show();
$("p[name='PSF_OpenWidthspan'][value_openwidthspan='" + value_SelWaerId + "']").show();
@@ -933,26 +983,25 @@
$("input[name='PSF_OpenWidth'][value_ppwaerid='" + value_SelWaerId + "']").show();
$(".xialap[value_ppwaerid='" + value_SelWaerId + "']").hide();
-
-
-
+ $(".lbCTPCount[value_ppwaerid='" + value_SelWaerId + "']").hide();
+ $("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").hide();
$("select[name='PSF_Typesetting'][value_ppwaerid='" + value_SelWaerId + "']").hide();
$("p[name='PSF_yinse'][value_openwidthspan='" + value_SelWaerId + "']").hide();
$("p[name='PSF_yinsezheng'][value_openwidthspan='" + value_SelWaerId + "']").hide();
$("p[name='PSF_yinsebei'][value_openwidthspan='" + value_SelWaerId + "']").hide();
-
-
+ $("p[name='PSF_yinsebei'][value_openwidthspan='" + value_SelWaerId + "']").hide();
+
+ $("p[name='PSF_yinshufangshi'][value_openwidthspan='" + value_SelWaerId + "']").hide();
+
+
$("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").hide();
$("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").hide();
-
- $("tr[name='PSF_PrintedPaperTd'][value_selspec='" + value_SelWaerId + "']").hide();
- $("tr[name='PSF_PrintedPaperTdtr'][value_selspec='" + value_SelWaerId + "']").hide();
- $("tr[name='PSF_PrintedPaperTdtrtr'][value_selspec='" + value_SelWaerId + "']").hide();
- $("select[name='PSF_Typesettinghide'][value_ppwaerid='" + value_SelWaerId + "']").show();
- $("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").val("");
- $("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").val("");
+ $("tr[name='PSF_PrintedPaperTd'][value_selspec='" + value_SelWaerId + "']").show();
+ $("tr[name='PSF_PrintedPaperTdtr'][value_selspec='" + value_SelWaerId + "']").show();
+ $("tr[name='PSF_PrintedPaperTdtrtr'][value_selspec='" + value_SelWaerId + "']").show();
+ $("select[name='PSF_Typesettinghide'][value_ppwaerid='" + value_SelWaerId + "']").hide();
}
@@ -1024,37 +1073,186 @@
var keyid = "<%=keyid %>";
if (keyid != "") {
var value_SelWaerId = $(this).attr("value_selspec");
- if ($(vv).val().indexOf('杞浆') >= 0) {
+ if ($(vv).val().indexOf('鍏紑') >= 0) {
+
+ $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").show();
+ $("p[name='PSF_OpenSpecificationsspan'][value_selspecspan='" + value_SelWaerId + "']").show();
+ $("p[name='PSF_OpenWidthspan'][value_openwidthspan='" + value_SelWaerId + "']").show();
+ $("input[name='PSF_OpenLength'][value_ppwaerid='" + value_SelWaerId + "']").show();
+ $("input[name='PSF_OpenWidth'][value_ppwaerid='" + value_SelWaerId + "']").show();
+ $(".xialap[value_ppwaerid='" + value_SelWaerId + "']").hide();
+
+ $("select[name='PSF_Typesetting'][value_ppwaerid='" + value_SelWaerId + "']").show();
+
+ $("p[name='PSF_yinse'][value_openwidthspan='" + value_SelWaerId + "']").show();
+ $("p[name='PSF_yinsezheng'][value_openwidthspan='" + value_SelWaerId + "']").show();
+ $("p[name='PSF_yinsebei'][value_openwidthspan='" + value_SelWaerId + "']").show();
+
+ $("p[name='PSF_yinshufangshi'][value_openwidthspan='" + value_SelWaerId + "']").show();
+
+
+ $("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").show();
+ $("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").show();
+
+ $("tr[name='PSF_PrintedPaperTd'][value_selspec='" + value_SelWaerId + "']").show();
+ $("tr[name='PSF_PrintedPaperTdtr'][value_selspec='" + value_SelWaerId + "']").show();
+ $("tr[name='PSF_PrintedPaperTdtrtr'][value_selspec='" + value_SelWaerId + "']").show();
+ $("select[name='PSF_Typesettinghide'][value_ppwaerid='" + value_SelWaerId + "']").hide();
+
+ $(".lbCTPCount[value_ppwaerid='" + value_SelWaerId + "']").show();
+ $("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").show();
+
+ }
+ else if ($(vv).val().indexOf('鍥涜壊') >= 0) {
+
+ $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").show();
+ $("p[name='PSF_OpenSpecificationsspan'][value_selspecspan='" + value_SelWaerId + "']").show();
+ $("p[name='PSF_OpenWidthspan'][value_openwidthspan='" + value_SelWaerId + "']").show();
+ $("input[name='PSF_OpenLength'][value_ppwaerid='" + value_SelWaerId + "']").show();
+ $("input[name='PSF_OpenWidth'][value_ppwaerid='" + value_SelWaerId + "']").show();
+ $(".xialap[value_ppwaerid='" + value_SelWaerId + "']").hide();
+
+
+ $("select[name='PSF_Typesetting'][value_ppwaerid='" + value_SelWaerId + "']").show();
+
+ $("p[name='PSF_yinse'][value_openwidthspan='" + value_SelWaerId + "']").show();
+ $("p[name='PSF_yinsezheng'][value_openwidthspan='" + value_SelWaerId + "']").show();
+ $("p[name='PSF_yinsebei'][value_openwidthspan='" + value_SelWaerId + "']").show();
+ $("p[name='PSF_yinshufangshi'][value_openwidthspan='" + value_SelWaerId + "']").show();
+
+ $("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").show();
+ $("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").show();
+
+ $("tr[name='PSF_PrintedPaperTd'][value_selspec='" + value_SelWaerId + "']").show();
+ $("tr[name='PSF_PrintedPaperTdtr'][value_selspec='" + value_SelWaerId + "']").show();
+ $("tr[name='PSF_PrintedPaperTdtrtr'][value_selspec='" + value_SelWaerId + "']").show();
+ $("select[name='PSF_Typesettinghide'][value_ppwaerid='" + value_SelWaerId + "']").hide();
+ $(".lbCTPCount[value_ppwaerid='" + value_SelWaerId + "']").show();
+ $("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").show();
+ }
+ else if ($(vv).val().indexOf('鍏壊') >= 0) {
+
+ $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").show();
+ $("p[name='PSF_OpenSpecificationsspan'][value_selspecspan='" + value_SelWaerId + "']").show();
+ $("p[name='PSF_OpenWidthspan'][value_openwidthspan='" + value_SelWaerId + "']").show();
+ $("input[name='PSF_OpenLength'][value_ppwaerid='" + value_SelWaerId + "']").show();
+ $("input[name='PSF_OpenWidth'][value_ppwaerid='" + value_SelWaerId + "']").show();
+ $(".xialap[value_ppwaerid='" + value_SelWaerId + "']").hide();
+
+
+
+ $("select[name='PSF_Typesetting'][value_ppwaerid='" + value_SelWaerId + "']").show();
+
+ $("p[name='PSF_yinse'][value_openwidthspan='" + value_SelWaerId + "']").show();
+ $("p[name='PSF_yinsezheng'][value_openwidthspan='" + value_SelWaerId + "']").show();
+ $("p[name='PSF_yinsebei'][value_openwidthspan='" + value_SelWaerId + "']").show();
+
+ $("p[name='PSF_yinshufangshi'][value_openwidthspan='" + value_SelWaerId + "']").show();
+ $("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").show();
+ $("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").show();
+
+ $("tr[name='PSF_PrintedPaperTd'][value_selspec='" + value_SelWaerId + "']").show();
+ $("tr[name='PSF_PrintedPaperTdtr'][value_selspec='" + value_SelWaerId + "']").show();
+ $("tr[name='PSF_PrintedPaperTdtrtr'][value_selspec='" + value_SelWaerId + "']").show();
+ $("select[name='PSF_Typesettinghide'][value_ppwaerid='" + value_SelWaerId + "']").hide();
+ $(".lbCTPCount[value_ppwaerid='" + value_SelWaerId + "']").show();
+ $("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").show();
+ }
+ else if ($(vv).val().indexOf('榛戠櫧') >= 0) {
+
+ $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").show();
+ $("p[name='PSF_OpenSpecificationsspan'][value_selspecspan='" + value_SelWaerId + "']").show();
+ $("p[name='PSF_OpenWidthspan'][value_openwidthspan='" + value_SelWaerId + "']").show();
+ $("input[name='PSF_OpenLength'][value_ppwaerid='" + value_SelWaerId + "']").show();
+ $("input[name='PSF_OpenWidth'][value_ppwaerid='" + value_SelWaerId + "']").hide();
+ $(".xialap[value_ppwaerid='" + value_SelWaerId + "']").show();
+
+
+
+ $("select[name='PSF_Typesetting'][value_ppwaerid='" + value_SelWaerId + "']").show();
+
+ $("p[name='PSF_yinse'][value_openwidthspan='" + value_SelWaerId + "']").show();
+ $("p[name='PSF_yinsezheng'][value_openwidthspan='" + value_SelWaerId + "']").show();
+ $("p[name='PSF_yinsebei'][value_openwidthspan='" + value_SelWaerId + "']").show();
+ $("p[name='PSF_yinshufangshi'][value_openwidthspan='" + value_SelWaerId + "']").show();
+
+ $("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").show();
+ $("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").show();
+
+ $("tr[name='PSF_PrintedPaperTd'][value_selspec='" + value_SelWaerId + "']").show();
+ $("tr[name='PSF_PrintedPaperTdtr'][value_selspec='" + value_SelWaerId + "']").show();
+ $("tr[name='PSF_PrintedPaperTdtrtr'][value_selspec='" + value_SelWaerId + "']").show();
+ $("select[name='PSF_Typesettinghide'][value_ppwaerid='" + value_SelWaerId + "']").hide();
+ $(".lbCTPCount[value_ppwaerid='" + value_SelWaerId + "']").show();
+ $("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").show();
+ $("input[name='PSF_OpenWidthName'][value_ppwaerid='" + value_SelWaerId + "']").val("755");
+ }
+ else if ($(vv).val().indexOf('杞浆') >= 0) {
+
$("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").hide();
+ $(".xialap[value_ppwaerid='" + value_SelWaerId + "']").show();
+ $("input[name='PSF_OpenWidthName'][value_ppwaerid='" + value_SelWaerId + "']").val("755");
$("p[name='PSF_OpenSpecificationsspan'][value_selspecspan='" + value_SelWaerId + "']").hide();
$("p[name='PSF_OpenWidthspan'][value_openwidthspan='" + value_SelWaerId + "']").hide();
$("input[name='PSF_OpenLength'][value_ppwaerid='" + value_SelWaerId + "']").hide();
$("input[name='PSF_OpenWidth'][value_ppwaerid='" + value_SelWaerId + "']").hide();
- $(".xialap[value_ppwaerid='" + value_SelWaerId + "']").show();
- } else if ($(vv).val().indexOf('鏁扮爜') >= 0)
- {
-
+
+
+
+ $("select[name='PSF_Typesetting'][value_ppwaerid='" + value_SelWaerId + "']").show();
+
+ $("p[name='PSF_yinse'][value_openwidthspan='" + value_SelWaerId + "']").show();
+ $("p[name='PSF_yinsezheng'][value_openwidthspan='" + value_SelWaerId + "']").show();
+ $("p[name='PSF_yinsebei'][value_openwidthspan='" + value_SelWaerId + "']").show();
+
+ $("p[name='PSF_yinshufangshi'][value_openwidthspan='" + value_SelWaerId + "']").show();
+ $("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").show();
+ $("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").show();
+
+ $("tr[name='PSF_PrintedPaperTd'][value_selspec='" + value_SelWaerId + "']").show();
+ $("tr[name='PSF_PrintedPaperTdtr'][value_selspec='" + value_SelWaerId + "']").show();
+ $("tr[name='PSF_PrintedPaperTdtrtr'][value_selspec='" + value_SelWaerId + "']").show();
+ $("select[name='PSF_Typesettinghide'][value_ppwaerid='" + value_SelWaerId + "']").hide();
+ $(".lbCTPCount[value_ppwaerid='" + value_SelWaerId + "']").show();
+ $("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").show();
+ }
+
+ else if ($(vv).val().indexOf('鐩存帴淇垏') >= 0 || $(vv).val().indexOf('鏁扮爜') >= 0) {
+
+
+ $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").show();
+ $("p[name='PSF_OpenSpecificationsspan'][value_selspecspan='" + value_SelWaerId + "']").show();
+ $("p[name='PSF_OpenWidthspan'][value_openwidthspan='" + value_SelWaerId + "']").show();
+ $("input[name='PSF_OpenLength'][value_ppwaerid='" + value_SelWaerId + "']").show();
+ $("input[name='PSF_OpenWidth'][value_ppwaerid='" + value_SelWaerId + "']").show();
+ $(".xialap[value_ppwaerid='" + value_SelWaerId + "']").hide();
+
+ $(".lbCTPCount[value_ppwaerid='" + value_SelWaerId + "']").hide();
+ $("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").hide();
$("select[name='PSF_Typesetting'][value_ppwaerid='" + value_SelWaerId + "']").hide();
$("p[name='PSF_yinse'][value_openwidthspan='" + value_SelWaerId + "']").hide();
$("p[name='PSF_yinsezheng'][value_openwidthspan='" + value_SelWaerId + "']").hide();
$("p[name='PSF_yinsebei'][value_openwidthspan='" + value_SelWaerId + "']").hide();
+ $("p[name='PSF_yinsebei'][value_openwidthspan='" + value_SelWaerId + "']").hide();
+
+ $("p[name='PSF_yinshufangshi'][value_openwidthspan='" + value_SelWaerId + "']").hide();
$("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").hide();
$("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").hide();
- $("tr[name='PSF_PrintedPaperTd'][value_selspec='" + value_SelWaerId + "']").hide();
- $("tr[name='PSF_PrintedPaperTdtr'][value_selspec='" + value_SelWaerId + "']").hide();
- $("tr[name='PSF_PrintedPaperTdtrtr'][value_selspec='" + value_SelWaerId + "']").hide();
- $("select[name='PSF_Typesettinghide'][value_ppwaerid='" + value_SelWaerId + "']").show();
-
-
+ $("tr[name='PSF_PrintedPaperTd'][value_selspec='" + value_SelWaerId + "']").show();
+ $("tr[name='PSF_PrintedPaperTdtr'][value_selspec='" + value_SelWaerId + "']").show();
+ $("tr[name='PSF_PrintedPaperTdtrtr'][value_selspec='" + value_SelWaerId + "']").show();
+ $("select[name='PSF_Typesettinghide'][value_ppwaerid='" + value_SelWaerId + "']").hide();
+
}
+
}
});
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderList.aspx
index b7571ac..72c34b7 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderList.aspx
@@ -40,7 +40,7 @@
<td class="ali03 w60px">
涓嬪崟鏃堕棿锛�
</td>
- <td style="width: 215px;">
+ <td style="width: 265px;">
<input id="txtBeginDate" type="text" runat="server" class='date w100px' maxlength='10' />-<input id="txtEndDate" type="text" runat="server" class='date w100px' maxlength='10' />
</td>
<td class="ali03 w80px ">
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/Caigoufukuanshenqing.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/Caigoufukuanshenqing.aspx
new file mode 100644
index 0000000..8363dbc
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/Caigoufukuanshenqing.aspx
@@ -0,0 +1,158 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Caigoufukuanshenqing.aspx.cs" Inherits="CY.WebForm.Pages.business.Caigoufukuanshenqing" %>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head runat="server">
+ <uc:CMSHead ID="CMSHead1" runat="server" />
+ </head>
+ <body style="padding:10px">
+ <form runat="server">
+ <table class="tableStyle" >
+
+ <tr>
+ <td class="ali03">鏀舵鍗曚綅锛�</td>
+ <td> <%--<select keepdefaultstyle='true' id='selSuppliers' runat="server" datatextfield='Name' datavaluefield='Keyid' onchange='custormerChange(this)' class='Sreq' sign="" selinputhtml="True" style=" width:183px;" >
+ </select>--%>
+ <input id='txtSupplierName' runat="server" maxlength='50' placeholder="璇疯緭鍏ユ敹娆惧崟浣�" style="width:200px;" readonly="readonly" />
+ <input type="hidden" id='selSuppliersss' runat="server" />
+ </td>
+ </tr>
+ <tr>
+ <td class="ali03">閲戦锛�</td>
+ <td> <input id='txtZengjianmoney' runat="server" maxlength='18' onblur="validateAmount(event)" placeholder="璇疯緭鍏ラ噾棰�" readonly="readonly" /></td>
+ </tr>
+ <tr>
+ <td class="ali03">鎴峰悕锛�</td>
+ <td> <input id='txtHuming' runat="server" maxlength='50' placeholder="璇疯緭鍏ユ埛鍚�" style="width:200px;" /></td>
+ </tr>
+ <tr>
+ <td class="ali03">寮�鎴疯锛�</td>
+ <td> <input id='txtBank' runat="server" maxlength='50' placeholder="璇疯緭鍏ュ紑鎴疯" style="width:200px;" /></td>
+ </tr>
+ <tr>
+ <td class="ali03">璐﹀彿锛�</td>
+ <td> <input id='txtAccountID' runat="server" maxlength='50' placeholder="璇疯緭鍏ヨ处鍙�" style="width:200px;" /></td>
+ </tr>
+ <tr style="display:none;" >
+ <td class="ali03">璁㈠崟锛�</td>
+ <td> <span id="ordernos" runat="server" ></span></td>
+ </tr>
+ <tr style="display:none;">
+ <td class="ali03">璁㈠崟閲戦锛�</td>
+ <td> <span id="ordernjine" runat="server" ></span></td>
+ </tr>
+ <tr>
+ <td colspan="2"></td>
+ </tr>
+ <tr id="trbtn" runat="server">
+ <td class="ali02" colspan="2">
+ <asp:Button ID="btn_Submit" Text="鎻愪氦鐢宠" runat="server" OnClick="btn_Submit_form" />
+ <span style="margin-left:10px"></span>
+ <input type="button" value="鍙栨秷 " onclick="top.Dialog.close()" />
+ </td>
+ </tr>
+ </table>
+ </form>
+ </body>
+ <script type="text/javascript" language="javascript">
+ function custormerChange(sel) {
+
+
+
+
+ window.submitUrl = '/Pages/business/Caigoufukuanshenqing.aspx';
+
+ CallServer({ Target: "GetSuplier", id: sel.value }, function (data, textStatus) {
+ var jobj = false;
+ try {
+ jobj = eval('[' + data + ']')[0];
+ } catch (ex) {
+ global.DealDataException(ex); return;
+ }
+ if (jobj != '-2') {
+ document.getElementById('txtBank').value = jobj.Bank;
+ document.getElementById('txtAccountID').value = jobj.AccountID;
+ if (jobj.Huming == "") {
+ document.getElementById('txtHuming').value = jobj.Name;
+ } else {
+ document.getElementById('txtHuming').value = jobj.Huming;
+ }
+
+ } else {
+ document.getElementById('txtBank').value = "";
+ document.getElementById('txtAccountID').value = "";
+ document.getElementById('txtHuming').value = "";
+ }
+
+
+
+ });
+ }
+
+ ///鏂板瀹㈡埛
+ function showCustomer() {
+ top.Dialog.open({ URL: "/Pages/procurement/SuppliersEdit.aspx?Keyid='0'&&flasss=ddfffff", Title: "鏂板渚涘簲鍟�", Width: 950, Height: 650 });
+ }
+
+
+ //涓篠elect鏂板杩囨护鍔熻兘
+ function SelectAddSearch() {
+ $("select[SelInputHtml='True']").each(function (i, v) {
+ $(this).unbind("blur");
+ var old = $(this).html();
+ var oldObject = $(this).clone();
+ var sign = "selectS" + i;
+ $(v).attr("sign", sign);
+
+ var inputClass = "input_" + sign;
+ var html = "<span style='margin-left:10px'>杩囨护锛�</span><input type='text' class='" + inputClass + "' style='width:80px;height:18px;line-height:18px;'/><span onclick='showCustomer()' style=\"padding-left:10px;\" class=\"a_under\">鏂板渚涘簲鍟�</span>";
+ $(v).after(html);
+ $("." + inputClass).blur(function () {
+ var nowval = $(this).val().trim();
+ var output = "";
+ if (nowval == "" || nowval == null) {
+ output = old;
+ } else {
+ output += "<option value=''>璇烽�夋嫨</option>";
+ var valueArr = new Array();
+ oldObject.find("option").each(function (ii, vv) {
+
+ var value = $.trim($(vv).attr("value"));
+ var text = $.trim($(vv).text());
+
+ if (text.indexOf(nowval) >= 0)
+ valueArr.push(value + "|||" + text);
+ });
+ for (var ss in valueArr) {
+ var s = valueArr[ss];
+ if (s.split("|||").length == 2) {
+ var value1 = s.split("|||")[0];
+ var text1 = s.split("|||")[1];
+ output += "<option value='" + value1 + "'>" + text1 + "</option>";
+ }
+ }
+ }
+ $(v).html(output);
+ });
+ });
+ }
+
+ $(function () {
+ SelectAddSearch();
+ });
+
+ function validateAmount(event) {
+ var input = event.target;
+ var value = input.value;
+ var regex = /^\d+(\.\d+)?$/;
+
+ if (!regex.test(value)) {
+ // 杈撳叆鏃犳晥锛岄噸缃�煎苟灏嗙劍鐐硅鍥炴枃鏈
+ input.value = '0';
+ input.focus();
+ alert('璇疯緭鍏ユ湁鏁堢殑姝ｈ礋閲戦锛屼緥濡� 45.67');
+ }
+ }
+ </script>
+</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/Caigoufukuanshenqing.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/Caigoufukuanshenqing.aspx.cs
new file mode 100644
index 0000000..1e4e4c7
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/Caigoufukuanshenqing.aspx.cs
@@ -0,0 +1,314 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using CY.BLL.EC;
+using CY.Model;
+using CY.Infrastructure.Common;
+using CY.BLL.Integrity;
+using CY.BLL;
+using System.Threading.Tasks;
+using System.Transactions;
+using CY.BLL.OA;
+using CY.Infrastructure.Query;
+
+namespace CY.WebForm.Pages.business
+{
+ //鍚磋緣
+ //鍗栧璇勪环
+ public partial class Caigoufukuanshenqing : BasePage
+ {
+
+ OA_FukuanshenqingBLL _oA_FukuanshenqingBLL = null;
+ OA_CorporateClientsBLL _oA_CorporateClientsBLL = null;
+ OA_StaffBLL bll_OA_StaffBLL = null;
+ OA_WorkPlanBll oA_WorkReminderBll = null;
+ OA_SuppliersBLL _OA_SuppliersBLL = null;
+ OA_ProcurementBLL _OA_ProcurementBLL = null;
+
+
+ //鍒濆鍖�
+ public Caigoufukuanshenqing()
+ {
+
+ _oA_CorporateClientsBLL = new OA_CorporateClientsBLL();
+ _oA_FukuanshenqingBLL = new OA_FukuanshenqingBLL();
+ bll_OA_StaffBLL = new OA_StaffBLL();
+ oA_WorkReminderBll = new OA_WorkPlanBll();
+ _OA_SuppliersBLL = new OA_SuppliersBLL();
+ _OA_ProcurementBLL = new OA_ProcurementBLL();
+ }
+
+ //椤甸潰鍔犺浇
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ try
+ {
+ switch (Request["Target"])
+ {
+ case "GetSuplier":
+ LoadCommunication();
+ break;
+
+ default:
+ if (!IsPostBack)
+ {
+ InitData();
+ }
+ return;
+ }
+ }
+ catch (Exception ex)
+ {
+ PAGEHandleException(ex);
+ Response.Clear();
+ //Response.Write("-1");
+ Response.Write(ex.Message);
+ }
+ Response.End();
+
+ }
+
+ //缁戝畾鏁版嵁
+ public void InitData()
+ {
+ string orderIdStr = Request["id"];
+ string orderNoStr = Request["orderno"];
+ if (!string.IsNullOrEmpty(orderIdStr))
+ {
+ this.ordernos.InnerText = orderNoStr.Trim(',');
+ ////渚涘簲鍟�
+ //this.selSuppliers.DataSource = _OA_SuppliersBLL.getSupplierTable(CurrentUser.MemberId);
+ //this.selSuppliers.DataBind();
+ //this.selSuppliers.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+
+ decimal total = 0;
+
+ orderIdStr = orderIdStr.Trim(',');
+ string[] idsArray = orderIdStr.Split(',');
+ if (idsArray != null && idsArray.Length > 0)
+ {
+
+ Pagination pa = new Pagination();
+ pa.PageSize = 1000;
+ pa.PageIndex = 1;
+ var models = _OA_ProcurementBLL.getModelList(pa, CurrentUser.MemberId,orderIdStr).ToList();
+ if (models.Count > 0)
+ {
+ var sss = _OA_SuppliersBLL.getSingleSupplier(models[0].SuppliersId.Value.ToString());
+
+
+
+
+
+ if (sss!=null)
+ {
+ this.txtSupplierName.Value = sss.Name;
+ this.selSuppliersss.Value = sss.Keyid.ToString();
+ this.txtHuming.Value = sss.Huming;
+ this.txtBank.Value = sss.Bank;
+ this.txtAccountID.Value = sss.AccountID;
+ }
+ }
+
+
+ total = models.Sum(x => x.AllMoney) ?? 0;
+
+
+
+
+ ordernjine.InnerText = total.ToString("0.00");
+ this.txtZengjianmoney.Value = total.ToString("0.00");
+ //khname.InnerText = name;
+ //Dingdanshu.InnerText = orderIdStr.Split(',').Length +"涓�";
+ }
+ else
+ {
+ JavaScript.CloseDIVOpener(this);
+ }
+ }
+ }
+
+
+ /// <summary>
+ /// 鍔犺浇渚涘簲鍟�
+ /// </summary>
+ private void LoadCommunication()
+ {
+ Response.Clear();
+ string id = Request["id"];
+ if (string.IsNullOrEmpty(id))
+ {
+ Response.Write("-2");
+ return;
+ }
+
+ var oA_Suppliers = _OA_SuppliersBLL.getSingleSupplier(id);
+
+
+ Response.Write(null == oA_Suppliers ? "" : JsonHelper.GetJsonStringByObject(oA_Suppliers));
+ }
+
+ //鎻愪氦浜嬩欢
+ protected void btn_Submit_form(object sender, EventArgs e)
+ {
+ AcceptAll3();
+ }
+
+ /// <summary>
+ /// 鎵归噺寮�绁ㄧ敵璇�
+ /// </summary>
+ public void AcceptAll3()
+ {
+
+ //if (string.IsNullOrEmpty(this.selSuppliers.Value))
+ //{
+ // JavaScript.MessageBox("璇烽�夋嫨鏀舵鍗曚綅锛�", this);
+ // return;
+ //}
+
+ if (this.txtZengjianmoney.Value.ToDecimal2()<=0)
+ {
+ JavaScript.MessageBox("璇疯緭鍏ョ敵璇烽噾棰濓紒", this);
+ return;
+ }
+ string ids = Request["id"].Trim(',');
+ string orderNoStr = Request["orderno"].Trim(',');
+ string[] idsArray = ids.Split(',');
+ if (idsArray != null && idsArray.Length > 0)
+ {
+
+ using (TransactionScope scope = new TransactionScope(TransactionScopeOption.Required,
+ new TransactionOptions
+ {
+ IsolationLevel = IsolationLevel.ReadCommitted,
+ Timeout = TransactionManager.MaximumTimeout
+ }
+ )
+ )
+ {
+
+ try
+ {
+ bool result = false;
+
+ OA_Fukuanshenqing oA_Fukuanshenqing = new OA_Fukuanshenqing();
+
+
+
+ oA_Fukuanshenqing.FirmId = CurrentUser.MemberId;
+ oA_Fukuanshenqing.SupplierId = this.selSuppliersss.Value;
+ oA_Fukuanshenqing.Fukuanshenqingstatus = 0;
+ oA_Fukuanshenqing.ApprovalStatus = 0;
+ oA_Fukuanshenqing.Fukuanmoney = this.txtZengjianmoney.Value.ToDecimal2();
+
+ oA_Fukuanshenqing.Bank = this.txtBank.Value;
+ oA_Fukuanshenqing.Huming = this.txtHuming.Value;
+ oA_Fukuanshenqing.AccountID = this.txtAccountID.Value;
+ oA_Fukuanshenqing.Yishoumoney = 0;
+ oA_Fukuanshenqing.Youwufapiao = 0;
+ oA_Fukuanshenqing.Fukuanyongtu = "閲囪喘浠樻";
+ oA_Fukuanshenqing.FukuanStatus = 1 ;
+ oA_Fukuanshenqing.remark = "";
+ oA_Fukuanshenqing.DindanId = ids;
+
+
+
+
+ oA_Fukuanshenqing.Creater = CurrentUser.ShortName;
+ oA_Fukuanshenqing.CreateTime = DateTime.Now;
+ oA_Fukuanshenqing.Updater = CurrentUser.ShortName;
+ oA_Fukuanshenqing.LastUpdateTime = DateTime.Now;
+ //var oA_Suppliers = _OA_SuppliersBLL.getSingleSupplier(this.selSuppliers.Value);
+ //var _SupplierName = "";
+ //if (oA_Suppliers != null)
+ //{
+ // _SupplierName = oA_Suppliers.Name;
+ //}
+
+ var _SupplierName = this.txtSupplierName.Value;
+ oA_Fukuanshenqing.SupplierName = _SupplierName;
+ var id = _oA_FukuanshenqingBLL.InsertModel(oA_Fukuanshenqing);
+
+
+
+ //闇�瑕佹坊鍔犲鎵逛俊鎭�
+ DateTime nowTime = DateTime.Now;
+ OA_WorkPlan m_OA_WorkPlan = new OA_WorkPlan();
+ m_OA_WorkPlan.ApprovalContent = "";
+ m_OA_WorkPlan.ApprovalStaffId = Guid.Empty;
+ m_OA_WorkPlan.ApprovalStaffName = "";
+ m_OA_WorkPlan.ApprovalStatus = 0;
+ m_OA_WorkPlan.ApprovalTime = nowTime;
+ m_OA_WorkPlan.EvaluationContent = "";
+ m_OA_WorkPlan.EvaluationStaff = "";
+ m_OA_WorkPlan.EvaluationStaffId = Guid.Empty;
+ m_OA_WorkPlan.EvaluationStatus = 0;
+ m_OA_WorkPlan.EvaluationTime = nowTime;
+ m_OA_WorkPlan.RewardContent = "";
+ m_OA_WorkPlan.RewardMoney = 0;
+ m_OA_WorkPlan.RewardResult = "";
+ m_OA_WorkPlan.RewardType = 0;
+
+ m_OA_WorkPlan.PlanStartTime = nowTime;
+ m_OA_WorkPlan.PlanStatus = 1;
+ m_OA_WorkPlan.SentStaffId = CurrentUser.TrueMemberId;
+ m_OA_WorkPlan.MemberId = CurrentUser.MemberId;
+
+ OA_Staff m_OA_Staff = bll_OA_StaffBLL.GetModelByMemberId(CurrentUser.TrueMemberId);
+ if (m_OA_Staff != null)
+ m_OA_WorkPlan.DepartId = m_OA_Staff.DepartmentId;
+ else
+ m_OA_WorkPlan.DepartId = 0;
+
+ m_OA_WorkPlan.PlanPeople = CurrentUser.TrueName;
+ m_OA_WorkPlan.ReciveStaffId = CurrentUser.TrueMemberId;
+
+ m_OA_WorkPlan.Operator = CurrentUser.ShortName;
+ m_OA_WorkPlan.PlanComplany = id.ToString();
+ m_OA_WorkPlan.PlanContent = orderNoStr + " 閲囪喘浠樻鐢宠銆傝鍗曢噾棰濓細"+ this.ordernjine.InnerText + ", 鏀舵鍗曚綅锛�"+ _SupplierName + ", 鎴峰悕锛�" + oA_Fukuanshenqing.Huming;
+ m_OA_WorkPlan.PlanDataType = 16;
+ m_OA_WorkPlan.PlanMoney = oA_Fukuanshenqing.Fukuanmoney;
+ m_OA_WorkPlan.PlanRemark = oA_Fukuanshenqing.remark;
+ m_OA_WorkPlan.PlanRunTime = DateTime.Now;
+ m_OA_WorkPlan.PlanTitle = orderNoStr + " 閲囪喘浠樻鐢宠";
+ m_OA_WorkPlan.PlanType = 3;
+ m_OA_WorkPlan.LastUpdateTime = nowTime;
+ result = oA_WorkReminderBll.InsertModel(m_OA_WorkPlan);
+
+
+
+
+
+
+
+
+
+
+ if (!result)
+ {
+ return;
+ }
+ //}
+ scope.Complete();
+ }
+ catch (Exception ex)
+ {
+ // 鍥炴粴浜嬪姟
+ }
+ finally
+ {
+ // 閲婃斁璧勬簮
+ scope.Dispose();
+ }
+ }
+ //JavaScript.MessageBox("鎻愪氦鎴愬姛", this);
+
+ //鎿嶄綔鎴愬姛
+ JavaScript.MessageBoxsssss("鎻愪氦鎴愬姛", this, true, true);
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/Caigoufukuanshenqing.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/Caigoufukuanshenqing.aspx.designer.cs
new file mode 100644
index 0000000..de12d28
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/Caigoufukuanshenqing.aspx.designer.cs
@@ -0,0 +1,116 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.business
+{
+
+
+ public partial class Caigoufukuanshenqing
+ {
+
+ /// <summary>
+ /// CMSHead1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
+
+ /// <summary>
+ /// txtSupplierName 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtSupplierName;
+
+ /// <summary>
+ /// selSuppliersss 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputHidden selSuppliersss;
+
+ /// <summary>
+ /// txtZengjianmoney 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtZengjianmoney;
+
+ /// <summary>
+ /// txtHuming 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtHuming;
+
+ /// <summary>
+ /// txtBank 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtBank;
+
+ /// <summary>
+ /// txtAccountID 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtAccountID;
+
+ /// <summary>
+ /// ordernos 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl ordernos;
+
+ /// <summary>
+ /// ordernjine 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl ordernjine;
+
+ /// <summary>
+ /// trbtn 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlTableRow trbtn;
+
+ /// <summary>
+ /// btn_Submit 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Button btn_Submit;
+ }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx
index b983c1f..f339d20 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx
@@ -436,12 +436,12 @@
</td>
<td>
- <a href='javascript:void(0)' title='浠樻鐧昏' class='a_under' onclick='ViewFukuan("<%#Eval("Keyid")%>")'> 浠樻鐧昏 </a>
- <a href='javascript:void(0)' title='鍌' class='a_under' onclick='ViewCuishou("<%#Eval("Keyid")%>")'> 鍌 </a>
- <a href='javascript:void(0)' title='鏀舵' class='a_under' onclick='ViewShoukuan("<%#Eval("Keyid")%>","<%#Eval("Shenqingleixing")%>")'> 鏀舵 </a>
- <a href='javascript:void(0)' title='鏀舵' class='a_under' onclick='ViewShouru("<%#Eval("Keyid")%>","<%#Eval("Shenqingleixing")%>")'> 鏀跺叆纭 </a>
+ <a href='javascript:void(0)' menu_member_case_id="case_fukuandengji" menu_member_case_name="浠樻鐧昏" title='浠樻鐧昏' class='a_under' onclick='ViewFukuan("<%#Eval("Keyid")%>")'> 浠樻鐧昏 </a>
+ <a href='javascript:void(0)' menu_member_case_id="case_cuikuan" menu_member_case_name="鍌" title='鍌' class='a_under' onclick='ViewCuishou("<%#Eval("Keyid")%>")'> 鍌 </a>
+ <a href='javascript:void(0)' menu_member_case_id="case_shoukuan" menu_member_case_name="鏀舵" title='鏀舵' class='a_under' onclick='ViewShoukuan("<%#Eval("Keyid")%>","<%#Eval("Shenqingleixing")%>")'> 鏀舵 </a>
+ <a href='javascript:void(0)' menu_member_case_id="case_shouruqueren" menu_member_case_name="鏀跺叆纭" title='鏀跺叆纭' class='a_under' onclick='ViewShouru("<%#Eval("Keyid")%>","<%#Eval("Shenqingleixing")%>")'> 鏀跺叆纭 </a>
- <a href='javascript:void(0)' title='鎾ゅ洖' class='a_under' onclick='ToAccept("<%#Eval("Keyid")%>")'> 鎾ゅ洖 </a>
+ <a href='javascript:void(0)'menu_member_case_id="case_chehui" menu_member_case_name="鎾ゅ洖" title='鎾ゅ洖' class='a_under' onclick='ToAccept("<%#Eval("Keyid")%>")'> 鎾ゅ洖 </a>
</td>
</tr>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchKaipiao.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchKaipiao.aspx
index f440667..f1794d2 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchKaipiao.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchKaipiao.aspx
@@ -335,10 +335,10 @@
<a href="javascript:;" onclick="ToBatchRemove();"><span class="icon_remove">鍘婚櫎璁㈠崟</span></a>
<div class="box_tool_line">
</div>
- <a href="javascript:;" onclick="ToBatchInvoicingList();"><span class="icon_edit">寮�绁ㄧ敵璇�</span></a>
+ <a href="javascript:;" menu_member_case_id="case_kaipiaoshenqing" menu_member_case_name="寮�绁ㄧ敵璇�" onclick="ToBatchInvoicingList();"><span class="icon_edit">寮�绁ㄧ敵璇�</span></a>
<div class="box_tool_line">
</div>
- <a href="javascript:;" onclick="ToInvoicingkehu();"><span class="icon_edit">棰勪粯娆惧紑绁�</span></a>
+ <a href="javascript:;" menu_member_case_id="case_yufukuanshenqing" menu_member_case_name="棰勪粯娆惧紑绁�" onclick="ToInvoicingkehu();"><span class="icon_edit">棰勪粯娆惧紑绁�</span></a>
<div class="box_tool_line">
</div>
<%-- <a href="javascript:;" menu_member_case_id="case_ToBatchPayList" menu_member_case_name="鎵归噺鏀舵" onclick="ToBatchPayList();"><span class="icon_edit">鎵归噺鏀舵</span></a>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanfukuan.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanfukuan.aspx
index 67ef283..2cf2dc5 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanfukuan.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanfukuan.aspx
@@ -92,7 +92,14 @@
function ViewShoukuan(personId, yongtu, supplierId) {
if (yongtu == "澶栧崗鍔犲伐璐�" && supplierId.length > 10) {
top.Dialog.open({ URL: "/Pages/financial/NewWaixieExpenses.aspx?id=" + personId, Title: "澶栧崗浠樻", Width: 600, Height: 800 });
- } else {
+ }
+ else if (yongtu == "閲囪喘浠樻") {
+ top.Dialog.open({ URL: "/Pages/financial/CaigouPayEdit.aspx?id=" + personId, Title: "閲囪喘浠樻", Width: 600, Height: 800 });
+ }
+ else if (yongtu == "鍏朵粬浠樻") {
+ top.Dialog.open({ URL: "/Pages/financial/WaixieExpenses.aspx?id=" + personId, Title: "鍏朵粬浠樻", Width: 600, Height: 800 });
+ }
+ else {
top.Dialog.open({ URL: "/Pages/financial/WaixieExpenses.aspx?id=" + personId, Title: "澶栧崗浠樻", Width: 600, Height: 800 });
}
@@ -121,11 +128,13 @@
if (yongtu == "澶栧崗鍔犲伐璐�") {
if (supplierId.length > 10) {
- top.Dialog.open({ URL: "/Pages/business/WaixieOrderPrint.aspx?Keyid=&SellerOrderId=" + SellerOrderId, Title: "鏌ョ湅璁㈠崟", Width: 1080, Height: 650 });
+ top.Dialog.open({ URL: "/Pages/business/WaixieOrderPrint.aspx?Keyid=&SellerOrderId=" + SellerOrderId, Title: "鏌ョ湅澶栧崗璁㈠崟", Width: 1080, Height: 650 });
} else {
top.Dialog.open({ URL: "/Pages/business/InvoicingOrderPrint.aspx?Keyid=&SellerOrderId=" + SellerOrderId, Title: "鏌ョ湅璁㈠崟", Width: 1080, Height: 650 });
}
-
+
+ } else if (yongtu == "閲囪喘浠樻"){
+ top.Dialog.open({ URL: "/Pages/procurement/ProcurementListHTML.aspx?Keyid=" + SellerOrderId, Title: "鏌ョ湅閲囪喘璁㈠崟", Width: 1080, Height: 650 });
}
}
@@ -364,7 +373,7 @@
<td>
- <a href='javascript:void(0)' title='浠樻' class='a_under' onclick='ViewShoukuan("<%#Eval("Keyid")%>","<%#Eval("Fukuanyongtu")%>","<%#Eval("SupplierId")%>")'> 浠樻 </a>
+ <a href='javascript:void(0)' menu_member_case_id="case_fukuan" menu_member_case_name="浠樻" title='浠樻' class='a_under' onclick='ViewShoukuan("<%#Eval("Keyid")%>","<%#Eval("Fukuanyongtu")%>","<%#Eval("SupplierId")%>")'> 浠樻 </a>
</td>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanweikaipiao.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanweikaipiao.aspx
index d3e916a..414a83d 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanweikaipiao.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanweikaipiao.aspx
@@ -115,10 +115,17 @@
//鏌ョ湅瀹㈡埛璧勬枡
- function Viewkaipiao(Keyid, SellerOrderId, yongtu) {
- //window.open("/Pages/business/InvoicingOrderPrint.aspx?Keyid=&SellerOrderId=" + SellerOrderId, '', '');
+ function Viewkaipiao(Keyid, SellerOrderId, yongtu, supplierId) {
+
if (yongtu == "澶栧崗鍔犲伐璐�") {
- top.Dialog.open({ URL: "/Pages/business/WaixieOrderPrint.aspx?Keyid=&SellerOrderId=" + SellerOrderId, Title: "鏌ョ湅璁㈠崟", Width: 1080, Height: 650 });
+ if (supplierId.length > 10) {
+ top.Dialog.open({ URL: "/Pages/business/WaixieOrderPrint.aspx?Keyid=&SellerOrderId=" + SellerOrderId, Title: "鏌ョ湅澶栧崗璁㈠崟", Width: 1080, Height: 650 });
+ } else {
+ top.Dialog.open({ URL: "/Pages/business/InvoicingOrderPrint.aspx?Keyid=&SellerOrderId=" + SellerOrderId, Title: "鏌ョ湅璁㈠崟", Width: 1080, Height: 650 });
+ }
+
+ } else if (yongtu == "閲囪喘浠樻") {
+ top.Dialog.open({ URL: "/Pages/procurement/ProcurementListHTML.aspx?Keyid=" + SellerOrderId, Title: "鏌ョ湅閲囪喘璁㈠崟", Width: 1080, Height: 650 });
}
}
@@ -330,7 +337,7 @@
<td>
- <%#Eval("Fukuanyongtu").ToString().Equals("鍏朵粬浠樻")?"":"<a href='javascript:void(0)' title='鏌ョ湅璁㈠崟' class='a_under' onclick='Viewkaipiao(\""+Eval("Keyid") +"\",\""+Eval("DindanId")+"\",\""+Eval("Fukuanyongtu")+"\")'> 鏌ョ湅璁㈠崟 </a>" %>
+ <%#Eval("Fukuanyongtu").ToString().Equals("鍏朵粬浠樻")?"":"<a href='javascript:void(0)' title='鏌ョ湅璁㈠崟' class='a_under' onclick='Viewkaipiao(\""+Eval("Keyid") +"\",\""+Eval("DindanId")+"\",\""+Eval("Fukuanyongtu")+"\",\""+Eval("SupplierId")+"\")'> 鏌ョ湅璁㈠崟 </a>" %>
</td>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/CaigouPayEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/financial/CaigouPayEdit.aspx
new file mode 100644
index 0000000..a4764d4
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/CaigouPayEdit.aspx
@@ -0,0 +1,142 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="CaigouPayEdit.aspx.cs" Inherits="CY.WebForm.Pages.financial.CaigouPayEdit" %>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head id="Head1" runat="server">
+ <title>閫夋嫨浠樻璐︽埛</title>
+ <uc:CMSHead ID="CMSHead1" runat="server" />
+ <script language="javascript" type="text/javascript">
+ function ChangeThisType(obj) {
+ $("#selAccountNameOut").html("<option value=''>璇烽�夋嫨</option>");
+ $("#spanMoneyOut").html("");
+ $.ajax({
+ url: "/Pages/financial/FirmAccountExpensesEdit.aspx",
+ type: "POST",
+ dataType: "html",
+ data: { TypeName: $(obj).val(), DataType: "change" },
+ global: false,
+ cache: false,
+ success: function (data) {
+ var myobj = eval('(' + data + ')');
+ if (myobj != null && myobj.length > 0) {
+ for (var i = 0; i < myobj.length; i++) {
+ var city_keyid = myobj[i].Keyid;
+ var city_name = myobj[i].AccountName + "-" + myobj[i].UserName;
+ var option = "";
+ option = "<option value = '" + city_keyid + "' value_money='" + myobj[i].Balance.toFixed(2) + "'>" + city_name + "</option>";
+ $(option).appendTo($("#selAccountNameOut"));
+ }
+ }
+ }
+ });
+ }
+
+ </script>
+ <script type="text/javascript">
+ $(function () {
+ ChangeThisType("#selAcoountTypeOut");
+
+ $(".AccountName").change(function () {
+ var nowMoney = $(this).find("option:selected").attr("value_money");
+ if (nowMoney == undefined || nowMoney == "") {
+ $("#spanMoneyOut").html("浣欓锛�0");
+ } else {
+ $("#spanMoneyOut").html("浣欓锛�" + nowMoney);
+ }
+ });
+ });
+ </script>
+</head>
+<body>
+ <form id="form1" runat="server" class="form2">
+ <table class="tableStyle" style="margin: 5px 0;">
+ <tr>
+ <td class="ali03 ">
+ 閲囪喘鍗曟暟锛�
+ </td>
+ <td>
+ <span class="moneystyle" id="spanCountRe" runat="server"></span>
+ <input type="hidden" id="Keyid" runat="server" />
+ </td>
+ </tr>
+ <tr>
+ <td class="ali03 ">
+ 鎬婚噾棰濓細
+ </td>
+ <td>
+ <span class="moneystyle" id="spanAllMoney" runat="server">锟�</span>
+ </td>
+ </tr>
+ <tr>
+ <td class="ali03 ">
+ 鏈粯閲戦锛�
+ </td>
+ <td>
+ <span class="moneystyle" id="spanReceiveMoney" runat="server">锟�</span>
+ </td>
+ </tr>
+ <tr>
+ <td class="ali03 ">
+ 鏈夋棤鍙戠エ锛�
+ </td>
+ <td>
+ <input runat="server" id="txtYouwufapiao" type="text" style="width: 259px" readonly="readonly" />
+ </td>
+ </tr>
+ <tr>
+ <td class="ali03 ">
+ 璐︽埛绫诲瀷锛�
+ </td>
+ <td>
+ <select id="selAcoountTypeOut" runat="server" datatextfield="Name" datavaluefield="Name" onchange="ChangeThisType(this);" keepdefaultstyle="true" style="width: 120px;" msg="璇烽�夋嫨璐︽埛绫诲瀷">
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td class="ali03 ">
+ 璐︽埛鍚嶇О锛�
+ </td>
+ <td>
+ <select class="Sreq AccountName" id="selAccountNameOut" runat="server" datatextfield="AccountName" datavaluefield="Keyid" keepdefaultstyle="true" style="width: 120px;" msg="璇烽�夋嫨璐︽埛鍚嶇О">
+ <option value="">璇烽�夋嫨</option>
+ </select><span style="padding-left: 10px; color: #999999;" id="spanMoneyOut"></span>
+ </td>
+ </tr>
+ <tr>
+ <td class="ali03 ">
+ 绉戠洰锛�
+ </td>
+ <td>
+ <select class="Sreq" id="selSubject" runat="server" datatextfield="SubjectName" datavaluefield="Keyid" keepdefaultstyle="true" style="width: 120px;" msg="璇烽�夋嫨绉戠洰">
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td class="ali03 ">
+ 鏀跺彇閲戦锛�
+ </td>
+ <td title="褰撳崟涓粯娆炬椂鍙儴鍒嗕粯娆�">
+ <asp:TextBox TextMode="SingleLine" id="txtReciveMoney" runat="server" class="req float" min="0"></asp:TextBox>
+ </td>
+ </tr>
+ <tr>
+
+ <td class="ali03 ">
+ 鏈夋棤鍙戠エ锛�
+ </td>
+ <td>
+ <input type="radio" name='rdoReceiveQuannbu' id='rdoReceiveQuannbu0' value='2' /><label for='rdoReceiveQuannbu0'>鏈�</label>
+ <input type="radio" name='rdoReceiveQuannbu' id='rdoReceiveQuannbu1' value='1' checked="checked" /><label for='rdoReceiveQuannbu1'>鏃�</label>
+ </td>
+ </tr>
+ <tr>
+ <td class="ali03">
+ </td>
+ <td>
+ <asp:Button ID="btn_Submit" Text="鎻愪氦" runat="server" OnClick="btn_Submit_form" />
+ </td>
+ </tr>
+ </table>
+ </form>
+</body>
+</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/CaigouPayEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/financial/CaigouPayEdit.aspx.cs
new file mode 100644
index 0000000..830e042
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/CaigouPayEdit.aspx.cs
@@ -0,0 +1,260 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using CY.BLL.OA;
+using System.Data;
+using System.Data.SqlClient;
+using CY.Infrastructure.Common;
+using CY.Model;
+using CY.BLL.Sys;
+using CY.BLL;
+using System.Transactions;
+
+namespace CY.WebForm.Pages.financial
+{
+ //鍚磋緣
+ //閲囪喘浠樻閫夋嫨璐︽埛
+ public partial class CaigouPayEdit : BasePage
+ {
+
+ OA_WarehouseInfoBLL _OA_WarehouseInfoBLL = null;
+ OA_CargoSpaceBLL _OA_CargoSpaceBLL = null;
+ OA_OutOfStorageBLL bll_OA_OutOfStorageBLL = null;
+ OA_SubjectSetBLL bll_OA_SubjectSetBLL = null;
+ Sys_DictionaryBLL bll_Sys_DictionaryBLL = null;
+ OA_ProcurementBLL bll_OA_ProcurementBLL = null;
+ OA_FirmAccountBLL bll_OA_FirmAccountBLL = null;
+ OA_SuppliersBLL bll_OA_SuppliersBLL = null;
+ OA_FukuanshenqingBLL _fukuanshenqingBLL = null;
+ decimal? AllMoney = 0;
+ decimal? ReceiveMoney = 0;
+ //鍒濆鍖�
+ public CaigouPayEdit()
+ {
+ bll_OA_OutOfStorageBLL = new OA_OutOfStorageBLL();
+ _OA_WarehouseInfoBLL = new OA_WarehouseInfoBLL();
+ _OA_CargoSpaceBLL = new OA_CargoSpaceBLL();
+ bll_OA_SubjectSetBLL = new OA_SubjectSetBLL();
+ bll_Sys_DictionaryBLL = new Sys_DictionaryBLL();
+ bll_OA_ProcurementBLL = new OA_ProcurementBLL();
+ bll_OA_FirmAccountBLL = new OA_FirmAccountBLL();
+ bll_OA_SuppliersBLL = new OA_SuppliersBLL();
+ _fukuanshenqingBLL = new OA_FukuanshenqingBLL();
+ }
+
+ //椤甸潰鍔犺浇
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ if (!IsPostBack)
+ {
+ InitialData();
+ }
+
+ }
+
+ //鍔犺浇鏁版嵁
+ protected void InitialData()
+ {
+ //绉戠洰鍚嶇О
+ this.selSubject.DataSource = bll_OA_SubjectSetBLL.getAllSubject(CurrentUser.MemberId, "璐�");
+ this.selSubject.DataBind();
+ this.selSubject.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
+
+ //璐︽埛绫诲瀷
+ this.selAcoountTypeOut.DataSource = bll_Sys_DictionaryBLL.GetDataByType("璐︽埛绫诲瀷");
+ this.selAcoountTypeOut.DataBind();
+
+ var id = Request["id"];
+ var fukuanshenqing = _fukuanshenqingBLL.GetModelByKeyid(id.ToInt32().Value);
+ if (fukuanshenqing != null)
+ {
+ this.Keyid.Value = id;
+ this.txtYouwufapiao.Value = fukuanshenqing.YouwufapiaoName;
+ string[] Keys = fukuanshenqing.DindanId.Trim(',').Split(',');
+ foreach (var item in Keys)
+ {
+ if (!string.IsNullOrEmpty(item))
+ {
+ OA_Procurement m_OA_Procurement = bll_OA_ProcurementBLL.SelectSingleModel(item);
+ if (m_OA_Procurement != null)
+ {
+ AllMoney += m_OA_Procurement.AllMoney;
+ ReceiveMoney += (m_OA_Procurement.AllMoney - m_OA_Procurement.ReceiveMoney);
+ }
+ }
+ }
+ this.spanAllMoney.InnerHtml = "锟�" + (AllMoney ?? 0).ToString("0.00");
+ this.spanReceiveMoney.InnerHtml = "锟�" + ReceiveMoney.Value.ToString("0.00");
+ this.spanCountRe.InnerHtml = Keys.Count().ToString2() + " 鍗�";
+
+ this.txtReciveMoney.Enabled = false;
+ this.txtReciveMoney.Text = (ReceiveMoney ?? 0).ToString("0.00");
+ this.txtReciveMoney.Attributes.Add("max", (ReceiveMoney ?? 0).ToString("0.00"));
+ }
+
+
+
+
+
+ }
+
+ //鎻愪氦浜嬩欢
+ protected void btn_Submit_form(object sender, EventArgs e)
+ {
+ try
+ {
+ if (string.IsNullOrEmpty(Request["selAccountNameOut"]))
+ {
+ JavaScript.MessageBox("璇烽�夋嫨璐︽埛", this);
+ return;
+ }
+ ReceiveMoney = this.txtReciveMoney.Text.ToDecimal2();
+ int? SubjectId = this.selSubject.Value.ToInt32();
+
+ decimal? money = ReceiveMoney;
+ if (Request["amount"].ToString2() == "one")
+ {
+ money = this.txtReciveMoney.Text.ToDecimal2();
+ }
+
+ int? AccountIdOut = Request["selAccountNameOut"].ToInt32();
+
+ if (SubjectId == null || money == null || AccountIdOut == null)
+ JavaScript.MessageBox("鎿嶄綔澶辫触", this);
+ else
+ {
+ DateTime nowTime = DateTime.Now;
+ OA_SubjectSet m_OA_SubjectSet = bll_OA_SubjectSetBLL.getSingleSubject(SubjectId);
+ OA_FirmAccount m_OA_FirmAccountOut = bll_OA_FirmAccountBLL.getSingleSubject(AccountIdOut);
+
+ if (m_OA_FirmAccountOut.Balance < money)
+ {
+ JavaScript.MessageBox("璐︽埛浣欓涓嶈冻", this);
+ }
+ else
+ {
+ var id = this.Keyid.Value.ToInt32().Value;
+ var fukuanshenqing = _fukuanshenqingBLL.GetModelByKeyid(id);
+ var Youwufapiao = Request["rdoReceiveQuannbu"];
+ if (fukuanshenqing.Youwufapiao == 2 && Youwufapiao == "1")
+ {
+ JavaScript.MessageBox("宸茬粡淇濆瓨涓烘湁鍙戠エ锛屾棤娉曚慨鏀逛负鏃犲彂绁紒", this);
+ return;
+ }
+ string[] Keys = fukuanshenqing.DindanId.Trim(',').Split(',');
+ var ssss = false;
+ using (TransactionScope scope = new TransactionScope(TransactionScopeOption.Required,
+ new TransactionOptions
+ {
+ IsolationLevel = System.Transactions.IsolationLevel.ReadCommitted,
+ Timeout = TransactionManager.MaximumTimeout
+ }
+ ))
+ {
+ try
+ {
+ var yishoumoney = fukuanshenqing.Yishoumoney.HasValue ? fukuanshenqing.Yishoumoney.Value : 0;
+ if (money >= (fukuanshenqing.Fukuanmoney - fukuanshenqing.Yishoumoney))
+ {
+ fukuanshenqing.FukuanStatus = 2;
+ }
+ fukuanshenqing.Yishoumoney = yishoumoney + money;
+ fukuanshenqing.Updater = CurrentUser.ShortName;
+ fukuanshenqing.LastUpdateTime = DateTime.Now;
+ fukuanshenqing.Youwufapiao = Youwufapiao.ToInt32();
+ ssss = _fukuanshenqingBLL.UpdateModel(fukuanshenqing);
+ if (this.txtReciveMoney.Text.ToDecimal2() > 0)
+ {
+ List<OA_Procurement> m_OA_ProcurementList = new List<OA_Procurement>();
+ List<OA_FirmAccountRecord> m_OA_FirmAccountRecordList = new List<OA_FirmAccountRecord>();
+ m_OA_FirmAccountOut.Balance -= money;
+ m_OA_FirmAccountOut.AllExpenses += money;
+ foreach (var item in Keys)
+ {
+ OA_Procurement m_OA_Procurement = bll_OA_ProcurementBLL.SelectSingleModel(item);
+ if (m_OA_Procurement != null)
+ {
+ if (Request["amount"].ToString2() == "one")
+ m_OA_Procurement.ReceiveMoney += money;
+ else
+ m_OA_Procurement.ReceiveMoney = m_OA_Procurement.AllMoney;
+
+ if (m_OA_Procurement.ReceiveMoney == m_OA_Procurement.AllMoney)
+ m_OA_Procurement.ClearingStatusId = bll_Sys_DictionaryBLL.GetKeyIdByKeyid(1, "缁撹处鐘舵��");
+
+ m_OA_Procurement.Operator = CurrentUser.ShortName;
+ m_OA_Procurement.LastUpdateTime = DateTime.Now;
+
+
+ OA_Suppliers m_OA_Suppliers = bll_OA_SuppliersBLL.getSingleSupplier(m_OA_Procurement.SuppliersId.ToString2());
+ OA_FirmAccountRecord m_OA_FirmAccountRecordOut = new OA_FirmAccountRecord();
+ m_OA_FirmAccountRecordOut.AccountId = m_OA_FirmAccountOut.Keyid;
+ m_OA_FirmAccountRecordOut.RecordTypeId = 2;//鏀嚭
+
+ if (Request["amount"].ToString2() == "one")
+ m_OA_FirmAccountRecordOut.Money = money;
+ else
+ m_OA_FirmAccountRecordOut.Money = (m_OA_Procurement.AllMoney - m_OA_Procurement.ReceiveMoney);
+
+ m_OA_FirmAccountRecordOut.SubjectId = m_OA_SubjectSet.Keyid;
+ m_OA_FirmAccountRecordOut.OperationalMatters = "閲囪喘浠樻";
+ m_OA_FirmAccountRecordOut.PaymentUnit = m_OA_Suppliers.Name;
+ m_OA_FirmAccountRecordOut.LastUpdateTime = nowTime;
+ m_OA_FirmAccountRecordOut.Operator = CurrentUser.ShortName.ToString2();
+ m_OA_FirmAccountRecordOut.Remark = "";
+ m_OA_FirmAccountRecordOut.ResidualAmount = m_OA_FirmAccountOut.Balance;
+ m_OA_FirmAccountRecordList.Add(m_OA_FirmAccountRecordOut);
+ m_OA_ProcurementList.Add(m_OA_Procurement);
+ }
+ }
+
+
+ if (m_OA_ProcurementList.Count > 0)
+ {
+ ssss = bll_OA_FirmAccountBLL.PurchasePayList(m_OA_FirmAccountRecordList, m_OA_ProcurementList, m_OA_FirmAccountOut);
+
+ }
+ }
+
+
+
+ if (ssss)
+ {
+
+ scope.Complete();
+ JavaScript.MessageBox("浠樻鎴愬姛", this, "top.frmright.ReLoad();top.Dialog.close();");
+ }
+ else
+ JavaScript.MessageBox("娣诲姞澶辫触", this);
+ }
+ catch (Exception ex)
+ {
+ PAGEHandleException(ex);
+ JavaScript.MessageBox("娣诲姞澶辫触", this);
+ }
+ finally
+ {
+ scope.Dispose();
+ }
+
+ }
+
+
+
+
+ }
+ }
+
+ }
+ catch (Exception ex)
+ {
+ PAGEHandleException(ex);
+ JavaScript.MessageBox("鎿嶄綔澶辫触", this);
+ }
+ }
+
+ }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/CaigouPayEdit.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/financial/CaigouPayEdit.aspx.designer.cs
new file mode 100644
index 0000000..777c57f
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/CaigouPayEdit.aspx.designer.cs
@@ -0,0 +1,134 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.financial
+{
+
+
+ public partial class CaigouPayEdit
+ {
+
+ /// <summary>
+ /// Head1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
+
+ /// <summary>
+ /// CMSHead1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
+
+ /// <summary>
+ /// form1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+ /// <summary>
+ /// spanCountRe 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanCountRe;
+
+ /// <summary>
+ /// Keyid 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputHidden Keyid;
+
+ /// <summary>
+ /// spanAllMoney 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanAllMoney;
+
+ /// <summary>
+ /// spanReceiveMoney 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanReceiveMoney;
+
+ /// <summary>
+ /// txtYouwufapiao 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtYouwufapiao;
+
+ /// <summary>
+ /// selAcoountTypeOut 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selAcoountTypeOut;
+
+ /// <summary>
+ /// selAccountNameOut 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selAccountNameOut;
+
+ /// <summary>
+ /// selSubject 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selSubject;
+
+ /// <summary>
+ /// txtReciveMoney 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.TextBox txtReciveMoney;
+
+ /// <summary>
+ /// btn_Submit 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Button btn_Submit;
+ }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/NewWaixieExpenses.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/financial/NewWaixieExpenses.aspx.cs
index a369a66..8f308a6 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/financial/NewWaixieExpenses.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/NewWaixieExpenses.aspx.cs
@@ -155,11 +155,11 @@
{
var yishoumoney = fukuanshenqing.Yishoumoney.HasValue ? fukuanshenqing.Yishoumoney.Value : 0;
- fukuanshenqing.Yishoumoney = yishoumoney + money;
if (money >= (fukuanshenqing.Fukuanmoney - fukuanshenqing.Yishoumoney))
{
fukuanshenqing.FukuanStatus = 2;
}
+ fukuanshenqing.Yishoumoney = yishoumoney + money;
fukuanshenqing.Updater = CurrentUser.ShortName;
fukuanshenqing.LastUpdateTime = DateTime.Now;
fukuanshenqing.Youwufapiao = Youwufapiao.ToInt32();
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/WaixieExpenses.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/financial/WaixieExpenses.aspx.cs
index a6797ee..d7b231c 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/financial/WaixieExpenses.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/WaixieExpenses.aspx.cs
@@ -151,11 +151,11 @@
try
{
var yishoumoney = fukuanshenqing.Yishoumoney.HasValue ? fukuanshenqing.Yishoumoney.Value : 0;
- fukuanshenqing.Yishoumoney = yishoumoney + money;
if (money >= (fukuanshenqing.Fukuanmoney - fukuanshenqing.Yishoumoney))
{
fukuanshenqing.FukuanStatus = 2;
}
+ fukuanshenqing.Yishoumoney = yishoumoney + money;
fukuanshenqing.Updater = CurrentUser.ShortName;
fukuanshenqing.LastUpdateTime = DateTime.Now;
fukuanshenqing.Youwufapiao = Youwufapiao.ToInt32();
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementList.aspx
index 05704bb..d9b1a1f 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementList.aspx
@@ -32,6 +32,74 @@
window.location = "/Pages/procurement/ProcurementList.aspx?Keyid=" + keyid;
});
}
+
+
+
+ /*
+纭鎵归噺寮�绁ㄧ敵璇�
+*/
+ function ToWaixieFukuan() {
+
+ var ids = '';
+ var ordernos = '';
+ var cks = $("input[name='ckId']:checked");
+ if (cks.length == 0) {
+ alertMsg('娌℃湁閫変腑浠讳綍椤癸紒');
+ return;
+ }
+ else {
+ }
+ var SellerId = '';
+ var i = 0;
+ var SellerId111 = '';
+
+ cks.each(
+ function () {
+
+ var ckVal = $(this).val();
+
+ var ckValJson = eval('(' + ckVal + ')');
+ if (i == 0) {
+ SellerId = ckValJson.SuppliersId;
+ SellerId111 = ckValJson.SuppliersId;
+ i += 1;
+ } else {
+ if (SellerId != ckValJson.SuppliersId) {
+ SellerId = ''
+
+ }
+ }
+ ids = ids + ',' + ckValJson.id;
+ //ordernos = ordernos + ',' + ckValJson.orderId;
+
+
+ }
+ );
+
+ if (SellerId111 == '') {
+
+ alertMsg('鏃犱緵搴斿晢鐨勮鍗曚笉鑳界敵璇蜂粯娆撅紒');
+ return;
+ }
+ if (SellerId == '') {
+
+ alertMsg('蹇呴』閫夋嫨鍚屼竴涓緵搴斿晢锛�');
+ return;
+ }
+
+
+
+ kaipiaoConfirm(ids, ordernos);
+ //var msg = ('纭寮�绁ㄧ敵璇峰悧?');
+ //top.Dialog.confirm(msg, function () {
+ // DoAcceptAll3(ids);
+ //});
+
+ }
+ function kaipiaoConfirm(orderId, orderno) {
+ var url = "/Pages/business/Caigoufukuanshenqing.aspx?id=" + orderId + "&&orderno=" + orderno;
+ top.Dialog.open({ URL: url, Title: "閲囪喘浠樻鐢宠", Height: 600, Width: 580 });
+ }
</script>
</head>
<body>
@@ -105,7 +173,7 @@
<td>
</td>
<td>
- <asp:Button ID="btn_Register" Text="鏌ヨ" runat="server" padding="0px" OnClick="btn_Register_Click" />
+ <asp:Button ID="btn_Search" Text="鏌ヨ" runat="server" padding="0px" OnClick="btn_Register_Click" />
<input type="button" onclick="resetSearch()" value="閲嶇疆" />
</td>
</tr>
@@ -118,6 +186,9 @@
<div class="padding_top5 padding_left10">
<a href="javascript:;" onclick="addModel()" menu_member_case_id="case_addModel" menu_member_case_name="鏂板閲囪喘淇℃伅"><span class="icon_add">鏂板閲囪喘淇℃伅</span></a>
<a href="javascript:;" onclick="PrintModel()" menu_member_case_id="case_PrintModel" menu_member_case_name="鎵撳嵃閲囪喘淇℃伅"><span class="icon_add">鎵撳嵃閲囪喘淇℃伅</span></a>
+ <a href="javascript:;" menu_member_case_id="case_caigoufukuan" menu_member_case_name="閲囪喘浠樻鐢宠" onclick="ToWaixieFukuan()"><span class="icon_edit">閲囪喘浠樻鐢宠</span></a>
+ <div class="box_tool_line">
+ </div>
<div class="clear">
</div>
</div>
@@ -181,7 +252,10 @@
<ItemTemplate>
<tr>
<td>
- <input type="checkbox" />
+ <input type="checkbox" name='ckId' value_keyid="<%#Eval("Keyid")%>" value="{
+ id:<%#Eval("Keyid")%>,
+ SuppliersId:'<%#Eval("SuppliersId")%>'
+ }" id='ckBox<%#Container.ItemIndex%>' class='ckBox' />
</td>
<td>
<%#Container.ItemIndex + 1+ this.UCPager1.PageSize * (this.UCPager1.PageIndex - 1)%>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementList.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementList.aspx.designer.cs
index 53b5d4a..d36ebf6 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementList.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementList.aspx.designer.cs
@@ -2,16 +2,18 @@
// <鑷姩鐢熸垚>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
// </鑷姩鐢熸垚>
//------------------------------------------------------------------------------
-namespace CY.WebForm.Pages.procurement {
-
-
- public partial class ProcurementList {
-
+namespace CY.WebForm.Pages.procurement
+{
+
+
+ public partial class ProcurementList
+ {
+
/// <summary>
/// CMSHead1 鎺т欢銆�
/// </summary>
@@ -20,7 +22,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
-
+
/// <summary>
/// form1 鎺т欢銆�
/// </summary>
@@ -29,7 +31,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-
+
/// <summary>
/// txtRegTimeStart 鎺т欢銆�
/// </summary>
@@ -38,7 +40,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtRegTimeStart;
-
+
/// <summary>
/// txtRegTimeEnd 鎺т欢銆�
/// </summary>
@@ -47,7 +49,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtRegTimeEnd;
-
+
/// <summary>
/// selSuppliers 鎺т欢銆�
/// </summary>
@@ -56,7 +58,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selSuppliers;
-
+
/// <summary>
/// selOpretor 鎺т欢銆�
/// </summary>
@@ -65,7 +67,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText selOpretor;
-
+
/// <summary>
/// selClearingStatus 鎺т欢銆�
/// </summary>
@@ -74,7 +76,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selClearingStatus;
-
+
/// <summary>
/// selPurchaseStatus 鎺т欢銆�
/// </summary>
@@ -83,7 +85,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selPurchaseStatus;
-
+
/// <summary>
/// dwCommity 鎺т欢銆�
/// </summary>
@@ -92,7 +94,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.WebControls.DropDownList dwCommity;
-
+
/// <summary>
/// selGoodsName 鎺т欢銆�
/// </summary>
@@ -101,7 +103,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selGoodsName;
-
+
/// <summary>
/// txtBrandName 鎺т欢銆�
/// </summary>
@@ -110,7 +112,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtBrandName;
-
+
/// <summary>
/// txtPaperWeight 鎺т欢銆�
/// </summary>
@@ -119,16 +121,16 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtPaperWeight;
-
+
/// <summary>
- /// btn_Register 鎺т欢銆�
+ /// btn_Search 鎺т欢銆�
/// </summary>
/// <remarks>
/// 鑷姩鐢熸垚鐨勫瓧娈点��
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
- protected global::System.Web.UI.WebControls.Button btn_Register;
-
+ protected global::System.Web.UI.WebControls.Button btn_Search;
+
/// <summary>
/// ReProcurentList 鎺т欢銆�
/// </summary>
@@ -137,7 +139,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.WebControls.Repeater ReProcurentList;
-
+
/// <summary>
/// UCPager1 鎺т欢銆�
/// </summary>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestAdd.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestAdd.aspx
index 60d2278..540502c 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestAdd.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestAdd.aspx
@@ -149,7 +149,7 @@
</tr>
<tr class="trShoukuandanwei" style=" display:none;">
<td class="ali03">閫夋嫨渚涘簲鍟嗭細</td>
- <td colspan="3"> <select keepdefaultstyle='true' id='selSuppliers' runat="server" datatextfield='Name' datavaluefield='Keyid' onchange='custormerChange(this)' class='Sreq' sign="" selinputhtml="True" style=" width:183px;" >
+ <td colspan="3"> <select keepdefaultstyle='true' id='selSuppliers' runat="server" datatextfield='Name' datavaluefield='Keyid' onchange='custormerChange(this)' sign="" selinputhtml="True" style=" width:183px;" >
</select></td>
</tr>
<tr>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestList.aspx
index d1f9517..d02f896 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestList.aspx
@@ -86,6 +86,7 @@
<option value="13">寮�绁ㄧ敵璇�</option>
<option value="14">澶栧崗浠樻鐢宠</option>
<option value="15">浠樻鐢宠</option>
+ <option value="16">閲囪喘浠樻鐢宠</option>
<option value="12">鍏朵粬</option>
</select>
</td>
@@ -166,7 +167,7 @@
<ItemTemplate>
<tr>
<td>
- <input type="checkbox" value='<%#Eval("Keyid")%>' class='<%#(Eval("ApprovalStatus").ToString()=="1" || Eval("ApprovalStatus").ToString()=="3" || Eval("PlanDataType").ToString()=="13" || Eval("PlanDataType").ToString()=="14")?"AlreadyReply":""%>' />
+ <input type="checkbox" value='<%#Eval("Keyid")%>' class='<%#(Eval("ApprovalStatus").ToString()=="1" || Eval("ApprovalStatus").ToString()=="3" || Eval("PlanDataType").ToString()=="13" || Eval("PlanDataType").ToString()=="14"|| Eval("PlanDataType").ToString()=="16")?"AlreadyReply":""%>' />
</td>
<td style="text-align: center">
<%#Container.ItemIndex + 1+ this.UCPager1.PageSize * (this.UCPager1.PageIndex - 1)%>
@@ -188,8 +189,8 @@
</td>
<td class="Operate " style="text-align: center">
<span menu_member_case_id="case_PlanView" menu_member_case_name="鏌ョ湅" onclick="onView('<%#Eval("Keyid")%>')">鏌ョ湅</span>
- <span menu_member_case_id="case_PlanEdit" menu_member_case_name="淇敼" onclick="onEdit('<%#Eval("Keyid")%>')" class='<%#(Eval("ApprovalStatus").ToString()=="1" || Eval("ApprovalStatus").ToString()=="3" || Eval("PlanDataType").ToString()=="13" || Eval("PlanDataType").ToString()=="14" )?"AlreadyReply":""%>'>淇敼</span>
- <span menu_member_case_id="case_PlanDele" menu_member_case_name="鍒犻櫎" onclick="onDele('<%#Eval("Keyid")%>')" class='<%#(Eval("ApprovalStatus").ToString()=="1" || Eval("ApprovalStatus").ToString()=="3" || Eval("PlanDataType").ToString()=="13" || Eval("PlanDataType").ToString()=="14")?"AlreadyReply":""%>'>鍒犻櫎</span>
+ <span menu_member_case_id="case_PlanEdit" menu_member_case_name="淇敼" onclick="onEdit('<%#Eval("Keyid")%>')" class='<%#(Eval("ApprovalStatus").ToString()=="1" || Eval("ApprovalStatus").ToString()=="3" || Eval("PlanDataType").ToString()=="13" || Eval("PlanDataType").ToString()=="14" || Eval("PlanDataType").ToString()=="16")?"AlreadyReply":""%>'>淇敼</span>
+ <span menu_member_case_id="case_PlanDele" menu_member_case_name="鍒犻櫎" onclick="onDele('<%#Eval("Keyid")%>')" class='<%#(Eval("ApprovalStatus").ToString()=="1" || Eval("ApprovalStatus").ToString()=="3" || Eval("PlanDataType").ToString()=="13" || Eval("PlanDataType").ToString()=="14"|| Eval("PlanDataType").ToString()=="16")?"AlreadyReply":""%>'>鍒犻櫎</span>
</td>
</tr>
</ItemTemplate>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.cs
index 1b4bc8d..5e370b4 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.cs
@@ -103,7 +103,7 @@
}
- if (m_OA_WorkPlan.ApprovalStatus == 1 && m_OA_WorkPlan.PlanDataType == 14)
+ if (m_OA_WorkPlan.ApprovalStatus == 1 && (m_OA_WorkPlan.PlanDataType == 14 || m_OA_WorkPlan.PlanDataType == 16))
{//鎵瑰噯鍙嶅啓
var fukuanshenqing = _oA_FukuanshenqingBLL.GetModelByKeyid(m_OA_WorkPlan.PlanComplany.ToInt32().Value);
fukuanshenqing.ApprovalStatus = 1;
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyList.aspx
index c35477f..7f0fcb0 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyList.aspx
@@ -60,6 +60,7 @@
<option value="13">寮�绁ㄧ敵璇�</option>
<option value="14">澶栧崗浠樻鐢宠</option>
<option value="15">浠樻鐢宠</option>
+ <option value="16">閲囪喘浠樻鐢宠</option>
<option value="12">鍏朵粬</option>
</select>
</td>
--
Gitblit v1.9.1