From 21a248a0cf76b6f05fcaac6f90975ef15ab607a1 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 18 十二月 2024 09:24:10 +0800
Subject: [PATCH] 公文纸，试卷
---
CY_ECommercePlatform/CY.Model/Inquiry/InquiryCommonModel.cs | 5
CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js | 46 +
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx | 4
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.cs | 4
CY_ECommercePlatform/CY.WebForm/Pages/procurement/SuppliersList.aspx.cs | 2
CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs | 41 +
CY_ECommercePlatform/CY.WebForm/Pages/procurement/SuppliersDetail.aspx.cs | 1
CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementADD.aspx | 182 ++++++
CY_ECommercePlatform/CY.SQLDAL/OA/OA_FukuanshenqingDAL.cs | 13
CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingOrderPrint.aspx.cs | 7
CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.designer.cs | 40
CY_ECommercePlatform/CY.WebForm/Pages/front/GongWenZhi.aspx.cs | 35 +
CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanfukuan.aspx | 27
CY_ECommercePlatform/CY.WebForm/Pages/front/GongWenZhi.aspx.designer.cs | 35 +
CY_ECommercePlatform/CY.WebForm/Pages/front/Shijuan.aspx.cs | 34 +
CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingWeiquerenshouru.aspx | 3
CY_ECommercePlatform/CY.WebForm/Pages/business/kaipiaoConfirm.aspx.cs | 7
CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanshenqing.aspx.designer.cs | 18
CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementADD.aspx.cs | 367 ++++++++++++
CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx.cs | 4
CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingApply.aspx | 3
CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingOrderPrint.aspx.designer.cs | 27
CY_ECommercePlatform/CY.SQLDAL/OA/OA_SuppliersDAL.cs | 3
CY_ECommercePlatform/CY.WebForm/Pages/procurement/SuppliersEdit.aspx.cs | 12
CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx | 2
CY_ECommercePlatform/CY.Model/OA/OA_Suppliers.cs | 16
CY_ECommercePlatform/CY.WebForm/Pages/financial/InvoicingShoukuan.aspx.cs | 1
CY_ECommercePlatform/CY.WebForm/Pages/front/Shijuan.aspx.designer.cs | 26
CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx | 3
CY_ECommercePlatform/CY.WebForm/Pages/procurement/SuppliersDetail.aspx | 13
CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanweikaipiao.aspx | 3
CY_ECommercePlatform/CY.WebForm/Pages/front/GongWenZhi.aspx | 108 +++
CY_ECommercePlatform/CY.Model/OA/OA_Fukuanshenqing.cs | 8
CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx | 10
CY_ECommercePlatform/CY.WebForm/Pages/procurement/SuppliersDetail.aspx.designer.cs | 9
CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj | 24
CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingOrderPrint.aspx | 20
CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanshenqing.aspx.cs | 45
CY_ECommercePlatform/CY.WebForm/Pages/financial/InvoicingShoukuan.aspx | 11
CY_ECommercePlatform/CY.WebForm/Pages/front/Shijuan.aspx | 265 +++++++++
CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementADD.aspx.designer.cs | 179 ++++++
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx | 10
CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingWeiquerenshouru.aspx.cs | 4
CY_ECommercePlatform/CY.WebForm/Pages/procurement/SuppliersEdit.aspx | 13
CY_ECommercePlatform/CY.WebForm/Pages/procurement/SuppliersEdit.aspx.designer.cs | 9
CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanshenqing.aspx | 19
46 files changed, 1,617 insertions(+), 101 deletions(-)
diff --git a/CY_ECommercePlatform/CY.Model/Inquiry/InquiryCommonModel.cs b/CY_ECommercePlatform/CY.Model/Inquiry/InquiryCommonModel.cs
index 1c3fe6c..e02c6db 100644
--- a/CY_ECommercePlatform/CY.Model/Inquiry/InquiryCommonModel.cs
+++ b/CY_ECommercePlatform/CY.Model/Inquiry/InquiryCommonModel.cs
@@ -142,6 +142,11 @@
public string PaperMP { get; set; }
/// <summary>
+ /// 绾稿紶鍚嶇О
+ /// </summary>
+ public string pageNumsbs { get; set; }
+
+ /// <summary>
/// 鍚嶇墖娆炬暟
/// </summary>
public int PrintBoxNumber { get; set; }
diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_Fukuanshenqing.cs b/CY_ECommercePlatform/CY.Model/OA/OA_Fukuanshenqing.cs
index 6d353f7..811d66e 100644
--- a/CY_ECommercePlatform/CY.Model/OA/OA_Fukuanshenqing.cs
+++ b/CY_ECommercePlatform/CY.Model/OA/OA_Fukuanshenqing.cs
@@ -66,6 +66,8 @@
public string Bank { get; set; }
+ public string Huming { get; set; }
+
public string AccountID { get; set; }
@@ -245,6 +247,12 @@
this.Bank = isChange ? MyConvert.ConvertToString(value) : Bank;
theValue = this.Bank;
}
+ else if ("Huming".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 28)
+ {
+ this.Huming = isChange ? MyConvert.ConvertToString(value) : Huming;
+ theValue = this.Huming;
+ }
+
else if ("AccountID".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 22)
{
this.AccountID = isChange ? MyConvert.ConvertToString(value) : AccountID;
diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_Suppliers.cs b/CY_ECommercePlatform/CY.Model/OA/OA_Suppliers.cs
index eb0a932..6975314 100644
--- a/CY_ECommercePlatform/CY.Model/OA/OA_Suppliers.cs
+++ b/CY_ECommercePlatform/CY.Model/OA/OA_Suppliers.cs
@@ -307,7 +307,10 @@
set { _remark = value; }
get { return _remark; }
}
-
+ /// <summary>
+ /// 寮�鎴疯
+ /// </summary>
+ public string Huming { get; set; }
/// <summary>
/// 寮�鎴疯
/// </summary>
@@ -485,17 +488,22 @@
this.Remark = isChange ? MyConvert.ConvertToString(value) : Remark;
theValue = this.Remark;
}
- else if ("Bank".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 31)
+ else if ("Bank".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 37)
{
this.Bank = isChange ? MyConvert.ConvertToString(value) : Bank;
theValue = this.Bank;
}
- else if ("AccountID".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 32)
+ else if ("AccountID".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 38)
{
this.AccountID = isChange ? MyConvert.ConvertToString(value) : AccountID;
theValue = this.AccountID;
}
-
+ else if ("Huming".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 39)
+ {
+ this.Huming = isChange ? MyConvert.ConvertToString(value) : Huming;
+ theValue = this.Huming;
+ }
+
#region 鎵╁睍灞炴��
else if ("CooperativeStateName".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 31)
{
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_FukuanshenqingDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_FukuanshenqingDAL.cs
index a0e04db..426c286 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_FukuanshenqingDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_FukuanshenqingDAL.cs
@@ -77,13 +77,14 @@
new SqlParameter("@Updater",trueModel.Updater),
new SqlParameter("@LastUpdateTime",trueModel.LastUpdateTime),
new SqlParameter("@Creater",trueModel.Creater),
+ new SqlParameter("@Huming",string.IsNullOrEmpty(trueModel.Huming)?"":trueModel.Huming),
};
- string sql = "Insert Into OA_Fukuanshenqing ([FirmId],[SupplierId],[Fukuanshenqingstatus],[ApprovalStatus], [Fukuanmoney], [Bank],[AccountID], [Yishoumoney],[Youwufapiao], [Creater],[CreateTime],[Updater],[LastUpdateTime],[Fukuanyongtu],FukuanStatus,remark,DindanId)"
- + " Values (@FirmId,@SupplierId,@Fukuanshenqingstatus, @ApprovalStatus, @Fukuanmoney, @Bank, @AccountID, @Yishoumoney, @Youwufapiao, @Creater,@CreateTime,@Updater,@LastUpdateTime,@Fukuanyongtu,@FukuanStatus,@remark,@DindanId )";
+ string sql = "Insert Into OA_Fukuanshenqing ([FirmId],[SupplierId],[Fukuanshenqingstatus],[ApprovalStatus], [Fukuanmoney], [Bank],[AccountID], [Yishoumoney],[Youwufapiao], [Creater],[CreateTime],[Updater],[LastUpdateTime],[Fukuanyongtu],FukuanStatus,remark,DindanId,Huming)"
+ + " Values (@FirmId,@SupplierId,@Fukuanshenqingstatus, @ApprovalStatus, @Fukuanmoney, @Bank, @AccountID, @Yishoumoney, @Youwufapiao, @Creater,@CreateTime,@Updater,@LastUpdateTime,@Fukuanyongtu,@FukuanStatus,@remark,@DindanId,@Huming )";
try
{
@@ -128,13 +129,14 @@
new SqlParameter("@Updater",trueModel.Updater),
new SqlParameter("@LastUpdateTime",trueModel.LastUpdateTime),
new SqlParameter("@Creater",trueModel.Creater),
+ new SqlParameter("@Huming",string.IsNullOrEmpty(trueModel.Huming)?"":trueModel.Huming),
};
- string sql = "Insert Into OA_Fukuanshenqing ([FirmId],[SupplierId],[Fukuanshenqingstatus],[ApprovalStatus], [Fukuanmoney], [Bank],[AccountID], [Yishoumoney],[Youwufapiao], [Creater],[CreateTime],[Updater],[LastUpdateTime],[Fukuanyongtu],FukuanStatus,remark,DindanId)"
- + " Values (@FirmId,@SupplierId,@Fukuanshenqingstatus, @ApprovalStatus, @Fukuanmoney, @Bank, @AccountID, @Yishoumoney, @Youwufapiao, @Creater,@CreateTime,@Updater,@LastUpdateTime,@Fukuanyongtu,@FukuanStatus,@remark,@DindanId )";
+ string sql = "Insert Into OA_Fukuanshenqing ([FirmId],[SupplierId],[Fukuanshenqingstatus],[ApprovalStatus], [Fukuanmoney], [Bank],[AccountID], [Yishoumoney],[Youwufapiao], [Creater],[CreateTime],[Updater],[LastUpdateTime],[Fukuanyongtu],FukuanStatus,remark,DindanId,Huming)"
+ + " Values (@FirmId,@SupplierId,@Fukuanshenqingstatus, @ApprovalStatus, @Fukuanmoney, @Bank, @AccountID, @Yishoumoney, @Youwufapiao, @Creater,@CreateTime,@Updater,@LastUpdateTime,@Fukuanyongtu,@FukuanStatus,@remark,@DindanId,@Huming )";
int id = 0;
try
{
@@ -183,9 +185,10 @@
new SqlParameter("@Updater",trueModel.Updater),
new SqlParameter("@LastUpdateTime",trueModel.LastUpdateTime),
new SqlParameter("@Creater",trueModel.Creater),
+ new SqlParameter("@Huming",string.IsNullOrEmpty(trueModel.Huming)?"":trueModel.Huming),
};
- string sql = "Update OA_Fukuanshenqing Set [FirmId]=@FirmId,[SupplierId]=@SupplierId,[Fukuanshenqingstatus]=@Fukuanshenqingstatus,[ApprovalStatus]=@ApprovalStatus, [Fukuanmoney]=@Fukuanmoney, [Bank]=@Bank,[AccountID]=@AccountID, [Yishoumoney]=@Yishoumoney,[Youwufapiao]=@Youwufapiao, [Creater]=@Creater,[CreateTime]=@CreateTime,[Updater]=@Updater,[LastUpdateTime]=@LastUpdateTime,Fukuanyongtu=@Fukuanyongtu,FukuanStatus=@FukuanStatus,remark=@remark,DindanId=@DindanId where [Keyid] =@Keyid ";
+ string sql = "Update OA_Fukuanshenqing Set [FirmId]=@FirmId,[SupplierId]=@SupplierId,[Fukuanshenqingstatus]=@Fukuanshenqingstatus,[ApprovalStatus]=@ApprovalStatus, [Fukuanmoney]=@Fukuanmoney, [Bank]=@Bank,[AccountID]=@AccountID, [Yishoumoney]=@Yishoumoney,[Youwufapiao]=@Youwufapiao, [Creater]=@Creater,[CreateTime]=@CreateTime,[Updater]=@Updater,[LastUpdateTime]=@LastUpdateTime,Fukuanyongtu=@Fukuanyongtu,FukuanStatus=@FukuanStatus,remark=@remark,DindanId=@DindanId,Huming=@Huming where [Keyid] =@Keyid ";
try
{
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_SuppliersDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_SuppliersDAL.cs
index e1fd6f9..e8a0d05 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_SuppliersDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_SuppliersDAL.cs
@@ -67,6 +67,8 @@
new SqlParameter("@OrderNum",trueModel.OrderNum) ,
new SqlParameter("@Bank",string.IsNullOrEmpty(trueModel.Bank)?"":trueModel.Bank) ,
new SqlParameter("@AccountID",string.IsNullOrEmpty(trueModel.AccountID)?"":trueModel.AccountID) ,
+
+ new SqlParameter("@Huming",string.IsNullOrEmpty(trueModel.Huming)?"":trueModel.Huming) ,
};
try
{
@@ -126,6 +128,7 @@
new SqlParameter("@OrderNum",trueModel.OrderNum) ,
new SqlParameter("@Bank",string.IsNullOrEmpty(trueModel.Bank)?"":trueModel.Bank) ,
new SqlParameter("@AccountID",string.IsNullOrEmpty(trueModel.AccountID)?"":trueModel.AccountID) ,
+ new SqlParameter("@Huming",string.IsNullOrEmpty(trueModel.Huming)?"":trueModel.Huming) ,
};
try
{
diff --git a/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj b/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
index f2d4dbe..fcbb531 100644
--- a/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
+++ b/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
@@ -2056,6 +2056,8 @@
<Content Include="Pages\financial\ProcurementListHTML.aspx" />
<Content Include="Pages\financial\ProcurementListPrint.aspx" />
<Content Include="Pages\financial\UnpayOrderList.aspx" />
+ <Content Include="Pages\front\Shijuan.aspx" />
+ <Content Include="Pages\front\GongWenZhi.aspx" />
<Content Include="Pages\front\WorkBook.aspx" />
<Content Include="Pages\front\DeskCalendar.aspx" />
<Content Include="Pages\front\DigitalBook.aspx" />
@@ -2170,6 +2172,7 @@
<Content Include="Pages\personnel\OA_RecruitmentsSearch.aspx" />
<Content Include="Pages\procurement\InventoryPrint.aspx" />
<Content Include="Pages\procurement\InventoryPrintTable.aspx" />
+ <Content Include="Pages\procurement\ProcurementADD.aspx" />
<Content Include="Pages\procurement\ProcurementListHTML.aspx" />
<Content Include="Pages\procurement\StockOutEdit.aspx" />
<Content Include="Pages\procurement\ProcurementListPrint.aspx" />
@@ -4509,6 +4512,20 @@
<Compile Include="Pages\financial\UnpayOrderList.aspx.designer.cs">
<DependentUpon>UnpayOrderList.aspx</DependentUpon>
</Compile>
+ <Compile Include="Pages\front\Shijuan.aspx.cs">
+ <DependentUpon>Shijuan.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\front\Shijuan.aspx.designer.cs">
+ <DependentUpon>Shijuan.aspx</DependentUpon>
+ </Compile>
+ <Compile Include="Pages\front\GongWenZhi.aspx.cs">
+ <DependentUpon>GongWenZhi.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\front\GongWenZhi.aspx.designer.cs">
+ <DependentUpon>GongWenZhi.aspx</DependentUpon>
+ </Compile>
<Compile Include="Pages\front\WorkBook.aspx.cs">
<DependentUpon>WorkBook.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -5307,6 +5324,13 @@
<Compile Include="Pages\procurement\InventoryPrintTable.aspx.designer.cs">
<DependentUpon>InventoryPrintTable.aspx</DependentUpon>
</Compile>
+ <Compile Include="Pages\procurement\ProcurementADD.aspx.cs">
+ <DependentUpon>ProcurementADD.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\procurement\ProcurementADD.aspx.designer.cs">
+ <DependentUpon>ProcurementADD.aspx</DependentUpon>
+ </Compile>
<Compile Include="Pages\procurement\ProcurementListHTML.aspx.cs">
<DependentUpon>ProcurementListHTML.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx
index f9891a0..85c810c 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx
@@ -532,6 +532,8 @@
<tr>
<td style="text-align: center;" colspan="10">
<asp:Button ID="btn_submit" runat="server" Text="鎻愪氦" OnClick="btn_Submit_form" OnClientClick="CorrectText();" />
+
+ <input type="button" class="Btn" value="绾稿紶閲囪喘" onclick="zhizhangcaigou();" />
</td>
</tr>
</tbody>
@@ -583,6 +585,14 @@
top.Dialog.open({ URL: "/Pages/business/AgConWarehouse.aspx?CommidityType=鐗堟潗&&value_pparid=" + value_pparid, Width: 1000, Height: 650, Title: "閫夋嫨璐у搧鍙傛暟" });
});
});
+
+
+ //绾稿紶閲囪喘
+ function zhizhangcaigou() {
+
+ top.Dialog.open({ URL: "/Pages/procurement/ProcurementADD.aspx", Title: "绾稿紶閲囪喘", Width: 1100, Height: 700 });
+
+ }
</script>
</body>
</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx
index 3f1603b..b610db5 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx
@@ -447,7 +447,8 @@
<tr>
<td colspan="2" align="center">
<input type="button" class="Btn AddForums" value="娣诲姞鐗堥潰" />
- <input type="button" class="Btn CutForums" value="鍑忓皯鐗堥潰" />
+ <input type="button" class="Btn CutForums" value="鍑忓皯鐗堥潰" />
+ <input type="button" class="Btn" value="绾稿紶閲囪喘" onclick="zhizhangcaigou();" />
</td>
</tr>
<tr>
@@ -1169,6 +1170,13 @@
}
}
+
+ //绾稿紶閲囪喘
+ function zhizhangcaigou() {
+
+ top.Dialog.open({ URL: "/Pages/procurement/ProcurementADD.aspx", Title: "绾稿紶閲囪喘", Width: 1100, Height: 700 });
+
+ }
</script>
</body>
</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingApply.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingApply.aspx
index d5e8504..518e2bd 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingApply.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingApply.aspx
@@ -15,7 +15,8 @@
//鏌ョ湅瀹㈡埛璧勬枡
function Viewkaipiao(Keyid, SellerOrderId) {
- window.open("/Pages/business/InvoicingOrderPrint.aspx?Keyid=" + Keyid + "&SellerOrderId=" + SellerOrderId , '', '');
+ //window.open("/Pages/business/InvoicingOrderPrint.aspx?Keyid=" + Keyid + "&SellerOrderId=" + SellerOrderId, '', '');
+ top.Dialog.open({ URL: "/Pages/business/InvoicingOrderPrint.aspx?Keyid=" + Keyid + "&SellerOrderId=" + SellerOrderId, Title: "鏌ョ湅璁㈠崟", Width: 1080, Height: 650 });
}
function ViewRemark(str) {
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx
index 0d285cb..f7d1ec9 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx
@@ -116,7 +116,8 @@
//鏌ョ湅瀹㈡埛璧勬枡
function Viewkaipiao(Keyid, SellerOrderId) {
- window.open("/Pages/business/InvoicingOrderPrint.aspx?Keyid=" + Keyid + "&SellerOrderId=" + SellerOrderId, '', '');
+ // window.open("/Pages/business/InvoicingOrderPrint.aspx?Keyid=" + Keyid + "&SellerOrderId=" + SellerOrderId, '', '');
+ top.Dialog.open({ URL: "/Pages/business/InvoicingOrderPrint.aspx?Keyid=" + Keyid + "&SellerOrderId=" + SellerOrderId, Title: "鏌ョ湅璁㈠崟", Width: 1080, Height: 650 });
}
//鏌ョ湅瀹㈡埛璧勬枡
function View(personId) {
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx.cs
index 1bfb138..6b36501 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx.cs
@@ -590,8 +590,8 @@
this.selBusinessManager.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
//this.selBusinessManager.Items.Insert(1, new ListItem(CurrentUser.ShortName, CurrentUser.ShortName));
- this.txtSQBeginDate.Value = DateTime.Now.AddDays(-14).ToString("yyyy-MM-dd");
- this.txtSQEndDate.Value = DateTime.Now.ToString("yyyy-MM-dd");
+ //this.txtSQBeginDate.Value = DateTime.Now.AddDays(-14).ToString("yyyy-MM-dd");
+ //this.txtSQEndDate.Value = DateTime.Now.ToString("yyyy-MM-dd");
//鍒濇鏁版嵁鍔犺浇
btn_Search_Click(btn_Search, new EventArgs());
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingOrderPrint.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingOrderPrint.aspx
index 37f01d0..42fdb36 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingOrderPrint.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingOrderPrint.aspx
@@ -56,16 +56,16 @@
<th style="text-align: center;" width="70">
璁㈠崟鍙�
</th>
- <th style="text-align: center;">
+ <th style="text-align: center;" width="120">
瀹㈡埛鍚嶇О
</th>
<th width="55">
璁㈠崟鏉ユ簮
</th>
- <th class="auto-style4">
+ <th class="auto-style4" width="70">
璁㈠崟绫诲埆
</th>
- <th style="text-align: center;">
+ <th style="text-align: center;" width="140">
鍗颁欢鍚嶇О
</th>
<th width="36">
@@ -152,6 +152,20 @@
</tr>
</itemtemplate>
</asp:repeater>
+ <tr>
+ <td colspan="11">
+ 鍚堣
+</td>
+ <td >
+ <span id="Spanjineheji" runat="server" ></span>
+</td>
+ <td >
+ <span id="Spanyishou" runat="server" ></span>
+</td>
+ <td >
+ <span id="Spanweishou" runat="server" ></span>
+</td>
+ </tr>
</tbody>
</table>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingOrderPrint.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingOrderPrint.aspx.cs
index 7b5b7dd..17f899b 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingOrderPrint.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingOrderPrint.aspx.cs
@@ -144,7 +144,12 @@
rptOrder.DataSource = result;
rptOrder.DataBind();
-
+ this.Spanjineheji.InnerText = string.Format("{0:F2}", result.Sum(x => x.SumPrice));
+ this.Spanyishou.InnerText = string.Format("{0:F2}", result.Sum(x => x.TradingSingle.PayedMoney));
+ this.Spanweishou.InnerText = string.Format("{0:F2}", result.Sum(x => x.UnPayedMoney));
+
+
+
return true;
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingOrderPrint.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingOrderPrint.aspx.designer.cs
index 51b275d..491fee2 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingOrderPrint.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingOrderPrint.aspx.designer.cs
@@ -49,5 +49,32 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.WebControls.Repeater rptOrder;
+
+ /// <summary>
+ /// Spanjineheji 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl Spanjineheji;
+
+ /// <summary>
+ /// Spanyishou 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl Spanyishou;
+
+ /// <summary>
+ /// Spanweishou 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl Spanweishou;
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingWeiquerenshouru.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingWeiquerenshouru.aspx
index 998f036..749db9b 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingWeiquerenshouru.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingWeiquerenshouru.aspx
@@ -123,7 +123,8 @@
//鏌ョ湅瀹㈡埛璧勬枡
function Viewkaipiao(Keyid, SellerOrderId) {
- window.open("/Pages/business/InvoicingOrderPrint.aspx?Keyid=" + Keyid + "&SellerOrderId=" + SellerOrderId, '', '');
+ //window.open("/Pages/business/InvoicingOrderPrint.aspx?Keyid=" + Keyid + "&SellerOrderId=" + SellerOrderId, '', '');
+ top.Dialog.open({ URL: "/Pages/business/InvoicingOrderPrint.aspx?Keyid=" + Keyid + "&SellerOrderId=" + SellerOrderId, Title: "鏌ョ湅璁㈠崟", Width: 1080, Height: 650 });
}
//鏌ョ湅瀹㈡埛璧勬枡
function View(personId) {
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingWeiquerenshouru.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingWeiquerenshouru.aspx.cs
index 56f0cb4..a7ad74e 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingWeiquerenshouru.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingWeiquerenshouru.aspx.cs
@@ -473,8 +473,8 @@
this.selBusinessManager.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
//this.selBusinessManager.Items.Insert(1, new ListItem(CurrentUser.ShortName, CurrentUser.ShortName));
- this.txtSQBeginDate.Value = DateTime.Now.AddDays(-14).ToString("yyyy-MM-dd");
- this.txtSQEndDate.Value = DateTime.Now.ToString("yyyy-MM-dd");
+ //this.txtSQBeginDate.Value = DateTime.Now.AddDays(-14).ToString("yyyy-MM-dd");
+ //this.txtSQEndDate.Value = DateTime.Now.ToString("yyyy-MM-dd");
this.selQuerenstatus.Value = "0";
//鍒濇鏁版嵁鍔犺浇
btn_Search_Click(btn_Search, new EventArgs());
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
index ebf30a7..fb889bd 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
@@ -9,7 +9,7 @@
<link rel="stylesheet" type="text/css" href="../../Styles/base.css" />
<link href="../../Styles/changes.css" rel="stylesheet" type="text/css" />
<link href="../../Styles/ParticularWQJ.css" rel="stylesheet" type="text/css" />
- <script src="../../js/Inquiry/Inquiry.js?v=89 type="text/javascript"></script>
+ <script src="../../js/Inquiry/Inquiry.js?v=102" type="text/javascript"></script>
<script src="../../js/business/Order.js?v=36" type="text/javascript"></script>
<!--鍓嶅彴椤甸潰end-->
<script type="text/javascript" language="javascript">
@@ -111,6 +111,8 @@
document.getElementById('spnCustormerControl').style.display = document.getElementById('txtCustormerName') ? 'none' : '';
if ('0' == document.getElementById('txtKeyid').value) {
document.getElementById('txtDeliveryTime').value = new Date().ToFuture({ day: 2 }).ToString('yyyy-MM-dd');
+ document.getElementById('selPrintTypes').value = "29";
+ printTypeChange(document.getElementById('selPrintTypes'));
ReceiptT('customer', '', 6, 120); return;
} else {
ReceiptT('order', '<%=Orderid %>', 6, 120);
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.cs
index 00a5e3e..2760ddc 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.cs
@@ -408,7 +408,7 @@
}
eC_OrderBasic.SumPrice = MyConvert.ConvertToDecimal(Request["txtSumPrice"]);
//eC_OrderExtend.SurplusPrintNum = MyConvert.ConvertToInt32(txtSurplusPrintNum.Value);
- if (Request["hidPrintTypeId"].ToString().ToInt32() == -1)
+ if (Request["hidPrintTypeId"].ToString().ToInt32() == -1 )
{
_inquiryCommonModel = new InquiryCommonModel();
_inquiryCommonModel.PrintTypeId = -1;
@@ -596,7 +596,7 @@
}
eC_OrderBasic.SumPrice = MyConvert.ConvertToDecimal(Request["txtSumPrice"]);
//eC_OrderExtend.SurplusPrintNum = MyConvert.ConvertToInt32(txtSurplusPrintNum.Value);
- if (Request["hidPrintTypeId"].ToString().ToInt32() == -1)
+ if (Request["hidPrintTypeId"].ToString().ToInt32() == -1 || Request["hidPrintTypeId"].ToString().ToInt32() == 38 || Request["hidPrintTypeId"].ToString().ToInt32() == 39)
{
_inquiryCommonModel = new InquiryCommonModel();
_inquiryCommonModel.PrintTypeId = -1;
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanfukuan.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanfukuan.aspx
index e78998d..cdadbbb 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanfukuan.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanfukuan.aspx
@@ -114,7 +114,8 @@
//鏌ョ湅瀹㈡埛璧勬枡
function Viewkaipiao(Keyid, SellerOrderId) {
- window.open("/Pages/business/InvoicingOrderPrint.aspx?Keyid=&SellerOrderId=" + SellerOrderId, '', '');
+ //window.open("/Pages/business/InvoicingOrderPrint.aspx?Keyid=&SellerOrderId=" + SellerOrderId, '', '');
+ top.Dialog.open({ URL: "/Pages/business/InvoicingOrderPrint.aspx?Keyid=&SellerOrderId=" + SellerOrderId, Title: "鏌ョ湅璁㈠崟", Width: 1080, Height: 650 });
}
//鏌ョ湅
function onView(keyid) {
@@ -234,6 +235,15 @@
鏀舵鍗曚綅
</th>
<th style="text-align: center;" width="70">
+ 鎴峰悕
+ </th>
+ <th style="text-align: center;" width="70">
+ 寮�鎴疯
+ </th>
+ <th style="text-align: center;" width="70">
+ 璐﹀彿
+ </th>
+ <th style="text-align: center;" width="70">
浠樻鐢ㄩ��
</th>
<th width="60">
@@ -283,6 +293,21 @@
</td>
+ <td style="text-align: center;">
+ <%#Eval("Huming")%>
+
+
+ </td>
+ <td style="text-align: center;">
+ <%#Eval("Bank")%>
+
+
+ </td>
+ <td style="text-align: center;">
+ <%#Eval("AccountID")%>
+
+
+ </td>
<td style="text-align: center;">
<%#Eval("Fukuanyongtu")%>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanshenqing.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanshenqing.aspx
index 724fd36..5615a60 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanshenqing.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanshenqing.aspx
@@ -20,16 +20,24 @@
<td> <input id='txtZengjianmoney' runat="server" maxlength='18' onblur="validateAmount(event)" placeholder="璇疯緭鍏ラ噾棰�" /></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="璇疯緭鍏ュ紑鎴疯" /></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="璇疯緭鍏ヨ处鍙�" /></td>
+ <td> <input id='txtAccountID' runat="server" maxlength='50' placeholder="璇疯緭鍏ヨ处鍙�" style="width:200px;" /></td>
</tr>
<tr>
<td class="ali03">璁㈠崟锛�</td>
<td> <span id="ordernos" runat="server" ></span></td>
+ </tr>
+ <tr>
+ <td class="ali03">璁㈠崟閲戦锛�</td>
+ <td> <span id="ordernjine" runat="server" ></span></td>
</tr>
<tr>
<td colspan="2"></td>
@@ -62,9 +70,16 @@
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 = "";
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanshenqing.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanshenqing.aspx.cs
index 13da1ff..df70e11 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanshenqing.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanshenqing.aspx.cs
@@ -74,7 +74,7 @@
public void InitData()
{
string orderIdStr = Request["id"];
- string orderNoStr = Request["orderno"];
+ string orderNoStr = Request["orderno"];
if (!string.IsNullOrEmpty(orderIdStr))
{
this.ordernos.InnerText = orderNoStr.Trim(',');
@@ -84,32 +84,28 @@
this.selSuppliers.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
decimal total = 0;
- string name = "";
- //this.txtOrderIds.Value = orderIdStr.Trim(',');
- // string[] idsArray = orderIdStr.Split(',');
- //if (idsArray != null && idsArray.Length > 0)
- //{
+
+ orderIdStr = orderIdStr.Trim(',');
+ string[] idsArray = orderIdStr.Split(',');
+ if (idsArray != null && idsArray.Length > 0)
+ {
- // var models = _eC_OrderBLL.GetOrderByIds(orderIdStr).ToList();
- //if(models!=null&& models.Count > 0)
- //{
- // var model = bll_EC_OrderBasicBLL.SelectModelById(models[0].Keyid.Value);
- // name = models[0].BuyerName;
- // this.selBusinessManager.Value = model.BusinessManagerId.HasValue? model.BusinessManagerId.Value.ToString():"";
- //}
- //total = models.Sum(x=>x.SumPrice)??0;
- //txtZengjianmoney.Value = "0";
+ var models = _eC_OrderBLL.GetOrderByIds(orderIdStr).ToList();
+
+ total = models.Sum(x => x.SumPrice) ?? 0;
-
- //kpmoney.InnerText = total.ToString("0.00");
- //khname.InnerText = name;
- //Dingdanshu.InnerText = orderIdStr.Split(',').Length +"涓�";
- }
- else
- {
- JavaScript.CloseDIVOpener(this);
+
+
+ ordernjine.InnerText = total.ToString("0.00");
+ //khname.InnerText = name;
+ //Dingdanshu.InnerText = orderIdStr.Split(',').Length +"涓�";
+ }
+ else
+ {
+ JavaScript.CloseDIVOpener(this);
+ }
}
}
@@ -188,6 +184,7 @@
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;
@@ -247,7 +244,7 @@
m_OA_WorkPlan.Operator = CurrentUser.ShortName;
m_OA_WorkPlan.PlanComplany = id.ToString();
- m_OA_WorkPlan.PlanContent = orderNoStr + " 澶栧崗浠樻鐢宠銆傛敹娆惧崟浣嶏細"+ _SupplierName;
+ m_OA_WorkPlan.PlanContent = orderNoStr + " 澶栧崗浠樻鐢宠銆傝鍗曢噾棰濓細"+ this.ordernjine.InnerText + ", 鏀舵鍗曚綅锛�"+ _SupplierName;
m_OA_WorkPlan.PlanDataType = 14;
m_OA_WorkPlan.PlanMoney = oA_Fukuanshenqing.Fukuanmoney;
m_OA_WorkPlan.PlanRemark = oA_Fukuanshenqing.remark;
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanshenqing.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanshenqing.aspx.designer.cs
index c565da7..39ac8e0 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanshenqing.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanshenqing.aspx.designer.cs
@@ -42,6 +42,15 @@
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>
@@ -69,6 +78,15 @@
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>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanweikaipiao.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanweikaipiao.aspx
index 44edeb9..62f201b 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanweikaipiao.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanweikaipiao.aspx
@@ -116,7 +116,8 @@
//鏌ョ湅瀹㈡埛璧勬枡
function Viewkaipiao(Keyid, SellerOrderId) {
- window.open("/Pages/business/InvoicingOrderPrint.aspx?Keyid=&SellerOrderId=" + SellerOrderId, '', '');
+ // window.open("/Pages/business/InvoicingOrderPrint.aspx?Keyid=&SellerOrderId=" + SellerOrderId, '', '');
+ top.Dialog.open({ URL: "/Pages/business/InvoicingOrderPrint.aspx?Keyid=&SellerOrderId=" + SellerOrderId, Title: "鏌ョ湅璁㈠崟", Width: 1080, Height: 650 });
}
//鏌ョ湅
function onView(keyid) {
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/kaipiaoConfirm.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/kaipiaoConfirm.aspx.cs
index b5fce9b..fa22046 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/kaipiaoConfirm.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/kaipiaoConfirm.aspx.cs
@@ -72,7 +72,12 @@
{
var model = bll_EC_OrderBasicBLL.SelectModelById(models[0].Keyid.Value);
name = models[0].BuyerName;
- this.selBusinessManager.Value = model.BusinessManagerId.HasValue? model.BusinessManagerId.Value.ToString():"";
+ OA_CorporateClients oA_CorporateClients = _oA_CorporateClientsBLL.GetModel(models[0].BuyerId);
+ if (oA_CorporateClients != null)
+ {
+ this.selBusinessManager.Value = oA_CorporateClients.BusinessManagerId.HasValue ? oA_CorporateClients.BusinessManagerId.Value.ToString() : "";
+ }
+
}
total = models.Sum(x=>x.SumPrice)??0;
txtZengjianmoney.Value = "0";
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/InvoicingShoukuan.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/financial/InvoicingShoukuan.aspx
index f0a194c..9cf411b 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/financial/InvoicingShoukuan.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/InvoicingShoukuan.aspx
@@ -70,6 +70,11 @@
}
LoadAccountType();
+
+
+
+ $('[name="rdoReceiveWay"]:first-child').prop('checked', true);
+ $('[name="rdoReceiveWay"]:first-child').click();
});
function QuannbuCheckedChanging(sel) {
@@ -254,7 +259,7 @@
<tr>
<td colspan='3' class='col_third' id='td_receiveWay'>
鏀舵鏂瑰紡锛�<span id='spn_receiveWay'></span>
- <input type="radio" name='rdoReceiveWay' id='rdoReceiveWay0' value='0' checked="checked" onclick="CheckedChanging(this,'')" /><label for='rdoReceiveWay0'>棰勪粯娆�</label>
+ <%--<input type="radio" name='rdoReceiveWay' id='rdoReceiveWay0' value='0' checked="checked" onclick="CheckedChanging(this,'')" /><label for='rdoReceiveWay0'>棰勪粯娆�</label>--%>
</td>
</tr>
@@ -272,8 +277,8 @@
<tr style='display: none;'>
<td colspan='3' class='col_third' id='td_toaccount' style='display: none;'>
鏀舵璐︽埛锛�<select id='selAccounts' name='selAccounts' keepdefaultstyle='true'>
- </select><br />
- 绉戠洰(鍊�)锛�<select id='selSubjects' runat="server" datatextfield='SubjectName' datavaluefield='Keyid' keepdefaultstyle='true'>
+ </select><%--<br />--%>
+ <%-- 绉戠洰(鍊�)锛�--%><select id='selSubjects' runat="server" datatextfield='SubjectName' datavaluefield='Keyid' keepdefaultstyle='true' style="display:none;">
</select>
</td>
</tr>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/InvoicingShoukuan.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/financial/InvoicingShoukuan.aspx.cs
index 7be2493..1f23bc6 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/financial/InvoicingShoukuan.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/InvoicingShoukuan.aspx.cs
@@ -322,6 +322,7 @@
this.selSubjects.DataSource = _OA_SubjectSetBLL.getAllSubject(CurrentUser.MemberId, "鍊�");
this.selSubjects.DataBind();
this.selSubjects.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
+ this.selSubjects.Value = "1";
int i = -1;
//璐︽埛绫诲瀷
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/GongWenZhi.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/front/GongWenZhi.aspx
new file mode 100644
index 0000000..57d0391
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/GongWenZhi.aspx
@@ -0,0 +1,108 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="GongWenZhi.aspx.cs" Inherits="CY.WebForm.Pages.front.GongWenZhi" %>
+
+<!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">
+ <title>榛戠櫧鍗颁欢璇环</title>
+</head>
+<body>
+ <input type="hidden" name="printMode" value="0" />
+ <table class="table2">
+ <tbody>
+ <tr>
+ <th style="text-align: center;">
+ 鎴愬搧灏哄
+ </th>
+ <th style="text-align: center;">
+ 绾稿紶
+ </th>
+
+ <th style="text-align: center;">
+ 鍗板埛鏁伴噺(寮�)
+ </th>
+
+ <th style="text-align: center;">
+ 鍗板埛棰滆壊
+ </th>
+ </tr>
+ <tr>
+ <td>
+
+ <select class="selectLaber" id="paperSize" name="paperSize">
+ <%
+ CY.BLL.Inquiry.PaperSizeDetailBLL _paperSizeDetailBLL=new CY.BLL.Inquiry.PaperSizeDetailBLL();
+ List<CY.Model.SysInquiry_PaperSizeDetail> paperSizeList = _paperSizeDetailBLL.GetPaperSizeList(PrintTypeId);
+ foreach (CY.Model.SysInquiry_PaperSizeDetail size in paperSizeList)
+ {
+ %>
+ <option value="<%=size.KeyId%>"><%=size.Name%></option>
+ <%
+ }
+ %>
+ </select>
+ </td>
+ <td>
+ <select class="selectLaber" id="paper0" name="paper0" runat="server" remark="#value#" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true' >
+
+ </select>
+ </td>
+
+
+ <td align="center">
+ <table>
+ <tr>
+ <td>
+ <div class="xialap">
+ <input type="text" id="printCount" name="printCount" readonly="readonly" style="height: 15px; line-height: 15px; width:80px;" class="validateInt" defaultValue="500" value="500"/>
+ <div class="xialapb">
+ <div class="xialapr">500</div>
+ <div class="xialapr">1000</div>
+ <div class="xialapr">2000</div>
+ <div class="xialapr">3000</div>
+ <div class="xialapr">5000</div>
+ <div class="xialapr">10000</div>
+ <div class="xialapr">20000</div>
+ <div class="xialapr">50000</div>
+ <div class="xialapr">100000</div>
+ </div>
+ </div>
+ </td>
+ <td>
+ <select id='ysUnit' runat="server" name="ysUnit" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true'></select>
+ </td>
+ </tr>
+ </table>
+
+ </td>
+
+ <td>
+ <select class="selectLaber" name="printColor0">
+ <option value="閲戠孩">閲戠孩</option>
+
+ </select>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ <table class="table2">
+ <tbody>
+ <tr>
+ <th colspan="4">
+ 鍚庨亾宸ュ簭
+ </th>
+ </tr>
+ <tr>
+ <td align="left" style="padding-left: 40px;width:120px;"><input type="checkbox" name="works" value="100" checked="checked" /> 鏁ｉ〉</td>
+
+
+ <td align="left"><div style="float:left"><input type="checkbox" name="works" value="13" onclick="SelectFuc(this)" index="0"/> 鑳跺ご</div><div style="float:left; display:none" id="divJT0"> <%--姣忔湰椤垫暟锛� --%> <select class="selectLaber" id="pageNumsbs" name="pageNumsbs">
+ <option value="100寮�/鏈�">100寮�/鏈�</option>
+ <option value="50寮�/鏈�">50寮�/鏈�</option>
+ </select>
+ <%-- <input type="text" name="pageNum" style="width:60px" class="validateInt" defaultValue="1" value="1"/>寮�/鏈�--%></div></td>
+ </tr>
+ </tbody>
+ </table>
+</body>
+</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/GongWenZhi.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/GongWenZhi.aspx.cs
new file mode 100644
index 0000000..6eaccb7
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/GongWenZhi.aspx.cs
@@ -0,0 +1,35 @@
+锘縰sing CY.BLL.Sys;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace CY.WebForm.Pages.front
+{
+ public partial class GongWenZhi : System.Web.UI.Page
+ {
+ public int PrintTypeId { get; set; }
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ if (!IsPostBack)
+ {
+ if (Request["PrintTypeId"] != null)
+ PrintTypeId = int.Parse(Request["PrintTypeId"].ToString());
+
+ Sys_DictionaryBLL _sys_DictionaryBLL = new Sys_DictionaryBLL();//瀛楀吀涓氬姟閫昏緫鎿嶄綔绫诲璞�
+ this.ysUnit.DataSource = _sys_DictionaryBLL.GetDataByType("鍗板埛鍗曚綅").Where(x=>x.MeanValue == 2);
+ this.ysUnit.DataBind();
+ this.ysUnit.Value = "2";
+
+
+ var fengmianzhizhangs = _sys_DictionaryBLL.GetDataByType("鍏枃绾哥焊寮�").OrderBy(x => x.MeanValue);
+
+
+ this.paper0.DataSource = fengmianzhizhangs;
+ this.paper0.DataBind();
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/GongWenZhi.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/GongWenZhi.aspx.designer.cs
new file mode 100644
index 0000000..ad5ca68
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/GongWenZhi.aspx.designer.cs
@@ -0,0 +1,35 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.front
+{
+
+
+ public partial class GongWenZhi
+ {
+
+ /// <summary>
+ /// paper0 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect paper0;
+
+ /// <summary>
+ /// ysUnit 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect ysUnit;
+ }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
index 753bf2b..b866916 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
@@ -117,6 +117,8 @@
int billMode = -1;
string remarks = string.Empty;
string paperMP = string.Empty;
+
+ string pageNumsbs = string.Empty;
int printBoxNumber = 0;
int printCountByBox = 0;
int cupType = 0;
@@ -187,6 +189,8 @@
remarks = request["remarks"].ToString();
if (request["pNameMP"] != null)
paperMP = request["pNameMP"].ToString();
+ if (request["pageNumsbs"] != null)
+ pageNumsbs = request["pageNumsbs"].ToString();
if (request["printBoxNumber"] != null)
printBoxNumber = request["printBoxNumber"].ToString().ToInt32().Value;
if (request["printCountByBox"] != null)
@@ -259,6 +263,7 @@
model.BillMode = billMode;
model.Remarks = remarks;
model.PaperMP = paperMP;
+ model.pageNumsbs = pageNumsbs;
model.PrintBoxNumber = printBoxNumber;
model.CupType = cupType;
model.PrintColor = printColor;
@@ -856,6 +861,27 @@
printDemand += "锛�" + model.GramWeight + "鍏�";
}
printDemand += "锛�" + model.SingleOrdouble + "锛�" + model.PrintColor;
+ }
+ else if (model.PrintTypeId == 39) //鍏枃绾�
+ {
+
+ Sys_DictionaryBLL _sys_DictionaryBLL = new Sys_DictionaryBLL();//瀛楀吀涓氬姟閫昏緫鎿嶄綔绫诲璞�
+ var fengmianzhizhangs = _sys_DictionaryBLL.GetDataByType("鍏枃绾哥焊寮�").FirstOrDefault(x => x.MeanValue == model.PaperId);
+ model.PrintCountName = model.PrintCount.ToString();
+
+ if (model.PrintSizeId != -1)
+ {
+ SysInquiry_PaperSizeDetail paperSize = _paperSizeDetailBLL.GetPaperSizeDetail(model.PrintTypeId, model.PrintSizeId);
+ printDemand = paperSize.Name + "锛�";
+ model.PrintSizeName = paperSize.Name;
+ }
+ if (fengmianzhizhangs != null)
+ {
+ printDemand += fengmianzhizhangs.Name + "锛�";
+ }
+
+
+ printDemand += model.PrintColor;
}
else if (model.PrintTypeId == 22) //渚跨
{
@@ -1635,6 +1661,11 @@
{
if(model.PrintTypeId!=27)
afterInfo.ParameterName = "鑳跺ご(姣忔湰" + model.PageNum.ToString() + "椤�)";
+
+ if (model.PrintTypeId == 39)
+ {
+ afterInfo.ParameterName = "鑳跺ご(" + model.pageNumsbs.ToString() + ")";
+ }
}
if (afterInfo.ParameterName == "鑳跺乏")
{
@@ -1920,7 +1951,15 @@
newSize = new SysInquiry_PaperSizeDetail();
newSize.KeyId = size.KeyId;
int index=size.Name.IndexOf('(');
- newSize.Name = size.Name.Substring(0, index);
+ if (index >= 0)
+ {
+ newSize.Name = size.Name.Substring(0, index);
+ }
+ else
+ {
+ newSize.Name = size.Name;
+ }
+
tempList = newSizeList.Where(p => p.Name == newSize.Name).ToList<SysInquiry_PaperSizeDetail>();
if (tempList == null || tempList.Count == 0)
{
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/Shijuan.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/front/Shijuan.aspx
new file mode 100644
index 0000000..63f7c1d
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/Shijuan.aspx
@@ -0,0 +1,265 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Shijuan.aspx.cs" Inherits="CY.WebForm.Pages.front.Shijuan" %>
+
+<!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">
+ <title>榛戠櫧鍗颁欢璇环</title>
+</head>
+<body>
+ <input type="hidden" name="printMode" value="0" />
+ <table class="table2">
+ <tbody>
+ <tr>
+ <td align="center">
+ <table>
+ <tr>
+ <td colspan="6">
+ <div class="xialap">
+ <input type="text" id="printCount" name="printCount" readonly="readonly" style="height: 15px; line-height: 15px; width:80px;" class="validateInt" defaultValue="500" value="500"/>
+ <div class="xialapb">
+ <div class="xialapr">500</div>
+ <div class="xialapr">1000</div>
+ <div class="xialapr">2000</div>
+ <div class="xialapr">3000</div>
+ <div class="xialapr">5000</div>
+ <div class="xialapr">10000</div>
+ <div class="xialapr">20000</div>
+ <div class="xialapr">50000</div>
+ <div class="xialapr">100000</div>
+ </div>
+ </div>
+ </td>
+ <td>
+ <select id='ysUnit' runat="server" name="ysUnit" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true'></select>
+ </td>
+ </tr>
+ </table>
+
+ </td>
+ </tr>
+ <tr>
+ <th style="text-align: left;" colspan="6">
+ 鍗板埛瑕佹眰
+ </th>
+
+ </tr>
+ <tr>
+ <th style="text-align: left;" colspan="6">
+ 璇曞嵎
+ </th>
+
+ </tr>
+
+ <tr>
+ <td style="width:20%">
+ 绾稿紶锛�<select class="selectLaber" id="paper0" name="paper0" keepdefaultstyle='true' >
+ <option value="60鍏嬫湰鑹插弻鑳�">60鍏嬫湰鑹插弻鑳�</option>
+ <option value="60鍏嬮珮鐧藉弻鑳�">60鍏嬮珮鐧藉弻鑳�</option>
+ <option value="70鍏嬫湰鑹插弻鑳�">70鍏嬫湰鑹插弻鑳�</option>
+ <option value="70鍏嬮珮鐧藉弻鑳�" selected="selected">70鍏嬮珮鐧藉弻鑳�</option>
+ <option value="80鍏嬫湰鑹插弻鑳�">80鍏嬫湰鑹插弻鑳�</option>
+ <option value="80鍏嬮珮鐧藉弻鑳�">80鍏嬮珮鐧藉弻鑳�</option>
+ </select>
+ </td>
+ <td style="width:20%">
+
+ 鎴愬搧灏哄锛�4P <select class="selectLaber" id="paperSize" name="paperSize">
+ <%
+ CY.BLL.Inquiry.PaperSizeDetailBLL _paperSizeDetailBLL=new CY.BLL.Inquiry.PaperSizeDetailBLL();
+ List<CY.Model.SysInquiry_PaperSizeDetail> paperSizeList = _paperSizeDetailBLL.GetPaperSizeList(PrintTypeId);
+ foreach (CY.Model.SysInquiry_PaperSizeDetail size in paperSizeList)
+ {
+ %>
+ <option value="<%=size.KeyId%>"><%=size.Name%></option>
+ <%
+ }
+ %>
+ </select>
+
+
+</td>
+ <td style="width:15%">
+ 6P <select class="selectLaber" id="paperSize6P" name="paperSize6P">
+ <option value="260x540">260x540</option>
+ <option value="-1">鑷畾涔夊昂瀵�</option>
+ </select>
+ <span style="display:none; margin-left:5px" id="divSize6P"><input id="txtFirstSize6P" name="txtFirstSize6P" type="text" class="validateInt" style="width:35px"/>脳<input id="txtSecondSize6P" name="txtSecondSize6P" type="text" class="validateInt" style="width:35px"/>mm</span>
+ </td>
+ <td style="width:15%">
+ 8P <select class="selectLaber" id="paperSize8P" name="paperSize8P">
+ <option value="260x540">260x740</option>
+ <option value="-1">鑷畾涔夊昂瀵�</option>
+ </select>
+ <span style="display:none; margin-left:5px" id="divSize8P"><input id="txtFirstSize8P" name="txtFirstSize8P" type="text" class="validateInt" style="width:35px"/>脳<input id="txtSecondSize8P" name="txtSecondSize8P" type="text" class="validateInt" style="width:35px"/>mm</span>
+ </td>
+
+
+
+
+
+ <td style="width:25%">
+ 璇曞嵎琚嬬焊寮狅細<select class="selectLaber" name="printColor0">
+ <option value="80鍏嬬墰鐨焊">80鍏嬬墰鐨焊</option>
+ <option value="100鍏嬬墰鐨焊" selected="selected">100鍏嬬墰鐨焊</option>
+ <option value="120鍏嬬墰鐨焊">120鍏嬬墰鐨焊</option>
+
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <th style="text-align: left;" colspan="6">
+ 绛旈鍗�
+ </th>
+
+ </tr>
+ <tr>
+ <td style="width:20%">
+ 绾稿紶锛�<select class="selectLaber" id="paper1" name="paper1" keepdefaultstyle='true' >
+
+
+ <option value="70鍏嬮珮鐧藉弻鑳�" >70鍏嬮珮鐧藉弻鑳�</option>
+
+ <option value="80鍏嬮珮鐧藉弻鑳�">80鍏嬮珮鐧藉弻鑳�</option>
+ <option value="100鍏嬮珮鐧藉弻鑳�" selected="selected">100鍏嬮珮鐧藉弻鑳�</option>
+
+ <option value="120鍏嬮珮鐧藉弻鑳�">120鍏嬮珮鐧藉弻鑳�</option>
+ </select>
+ </td>
+
+ <td style="width:20%">
+ 鎴愬搧灏哄锛欰4 <select class="selectLaber" id="paperSizeA4" name="paperSizeA4">
+ <option value="260x540">260x540</option>
+ <option value="-1">鑷畾涔夊昂瀵�</option>
+ </select>
+ <span style="display:none; margin-left:5px" id="divSizeA4"><input id="txtFirstSizeA4" name="txtFirstSizeA4" type="text" class="validateInt" style="width:35px"/>脳<input id="txtSecondSizeA4" name="txtSecondSizeA4" type="text" class="validateInt" style="width:35px"/>mm</span>
+ </td>
+ <td style="width:15%">
+ A3 <select class="selectLaber" id="paperSizeA3" name="paperSizeA3">
+ <option value="260x540">260x740</option>
+ <option value="-1">鑷畾涔夊昂瀵�</option>
+ </select>
+ <span style="display:none; margin-left:5px" id="divSizeA3"><input id="txtFirstSizeA3" name="txtFirstSizeA3" type="text" class="validateInt" style="width:35px"/>脳<input id="txtSecondSizeA3" name="txtSecondSizeA3" type="text" class="validateInt" style="width:35px"/>mm</span>
+ </td>
+
+ <td style="width:25%">
+ 鍗板埛棰滆壊锛�<select class="selectLaber" name="printColor1">
+ <option value="榛戣壊">榛戣壊</option>
+ <option value="鍙岃壊(榛�+閲戠孩)" selected="selected">鍙岃壊(榛�+閲戠孩)</option>
+
+
+ </select>
+ </td>
+
+
+
+ <td style="width:25%">
+ 绛旈鍗¤绾稿紶锛�<select class="selectLaber" name="printColor2">
+
+ <option value="80鍏嬬墰鐨焊">80鍏嬬墰鐨焊</option>
+ <option value="100鍏嬬墰鐨焊" selected="selected">100鍏嬬墰鐨焊</option>
+ <option value="120鍏嬬墰鐨焊">120鍏嬬墰鐨焊</option>
+
+ </select>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ <table class="table2">
+ <tbody>
+ <tr>
+ <th colspan="4">
+ 鍗板埛鏁伴噺
+ </th>
+ </tr>
+
+ </tbody>
+ </table>
+ <table class="table2 AddTab" value_id="1">
+ <tbody>
+
+ <tr>
+ <td align="left" style="padding-left: 40px;width:160px;"><span name="biaohao" value_id="1" >1銆�</span>骞寸骇锛�<select class="selectLaber" name="selNianji" value_id="1">
+
+ <option value="80鍏嬬墰鐨焊">80鍏嬬墰鐨焊</option>
+ <option value="100鍏嬬墰鐨焊" selected="selected">100鍏嬬墰鐨焊</option>
+ <option value="120鍏嬬墰鐨焊">120鍏嬬墰鐨焊</option>
+
+ </select></td>
+ <td align="left" style="padding-left: 40px;">浜烘暟锛�<input type="text" name="txtRenshu" style="height: 15px; line-height: 15px; width:80px;" class="validateInt" value_id="1" /> </td>
+
+
+
+ </tr>
+ </tbody>
+ </table>
+
+ <table class="table2">
+ <tbody>
+ <tr>
+ <td colspan="2" align="center">
+ <input type="button" class="Btn AddForums" value="娣诲姞骞寸邯" />
+ <input type="button" class="Btn CutForums" value="鍑忓皯骞寸邯" />
+ </td>
+ </tr>
+
+ </tbody>
+ </table>
+</body>
+ <script type="text/javascript" language="javascript">
+ $("#paperSize6P").bind("change", function () {
+ var value = $("#paperSize6P").val();
+ if (value == "-1" || value == -1) {
+ $("#divSize6P").show();
+ $("#divSize6P").find("input").show();
+ } else {
+ $("#divSize6P").hide();
+ }
+ });
+ $("#paperSize8P").bind("change", function () {
+ var value = $("#paperSize8P").val();
+ if (value == "-1" || value == -1) {
+ $("#divSize8P").show();
+ $("#divSize8P").find("input").show();
+ } else {
+ $("#divSize8P").hide();
+ }
+ });
+ $("#paperSizeA4").bind("change", function () {
+ var value = $("#paperSizeA4").val();
+ if (value == "-1" || value == -1) {
+ $("#divSizeA4").show();
+ $("#divSizeA4").find("input").show();
+ } else {
+ $("#divSizeA4").hide();
+ }
+ });
+ $("#paperSizeA3").bind("change", function () {
+ var value = $("#paperSizeA3").val();
+ if (value == "-1" || value == -1) {
+ $("#divSizeA3").show();
+ $("#divSizeA3").find("input").show();
+ } else {
+ $("#divSizeA3").hide();
+ }
+ });
+
+
+ $(".AddForums").click(function () {
+
+ var value_id = parseInt($(".AddTab").last().attr("value_id"));
+ $(".AddTab").last().after($(".AddTab").last().clone(true));
+ $(".AddTab").last().attr("value_id", value_id + 1);
+
+
+ });
+
+ $(".CutForums").click(function () {
+ var value_id = parseInt($(".AddTab").last().attr("value_id"));
+ if (value_id == 1) {
+ } else {
+ $(".AddTab").last().remove();
+ }
+ });
+ </script>
+</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/Shijuan.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/Shijuan.aspx.cs
new file mode 100644
index 0000000..1e28bc1
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/Shijuan.aspx.cs
@@ -0,0 +1,34 @@
+锘縰sing CY.BLL.Sys;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace CY.WebForm.Pages.front
+{
+ public partial class Shijuan : System.Web.UI.Page
+ {
+ public int PrintTypeId { get; set; }
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ if (!IsPostBack)
+ {
+ if (Request["PrintTypeId"] != null)
+ PrintTypeId = int.Parse(Request["PrintTypeId"].ToString());
+
+ Sys_DictionaryBLL _sys_DictionaryBLL = new Sys_DictionaryBLL();//瀛楀吀涓氬姟閫昏緫鎿嶄綔绫诲璞�
+ this.ysUnit.DataSource = _sys_DictionaryBLL.GetDataByType("鍗板埛鍗曚綅").Where(x=>x.MeanValue == 2);
+ this.ysUnit.DataBind();
+ this.ysUnit.Value = "2";
+
+
+ //var fengmianzhizhangs = _sys_DictionaryBLL.GetDataByType("鍏枃绾哥焊寮�").OrderBy(x => x.MeanValue);
+
+
+
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/Shijuan.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/Shijuan.aspx.designer.cs
new file mode 100644
index 0000000..a03bf5e
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/Shijuan.aspx.designer.cs
@@ -0,0 +1,26 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.front
+{
+
+
+ public partial class Shijuan
+ {
+
+ /// <summary>
+ /// ysUnit 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect ysUnit;
+ }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementADD.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementADD.aspx
new file mode 100644
index 0000000..4631f1b
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementADD.aspx
@@ -0,0 +1,182 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ProcurementADD.aspx.cs" Inherits="CY.WebForm.Pages.procurement.ProcurementADD" %>
+
+<!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">
+ <title>閲囪喘淇℃伅</title>
+ <uc:CMSHead ID="CMSHead1" runat="server" />
+</head>
+<body>
+ <form runat="server" id="form1" class="form2">
+ <table class="tableStyle1" style=" width:98%;">
+ <tr>
+ <td class="ali03 w100px">
+ 渚涘簲鍟嗭細
+ </td>
+ <td>
+ <select id="selSuppliers" runat="server" class="Sreq w120px" datatextfield="Name" keepdefaultstyle="true" datavaluefield="Keyid" msg="璇烽�夋嫨渚涘簲鍟�">
+ </select>
+ </td>
+ <td class="ali03 w100px">
+ 璐у搧绫诲埆锛�
+ </td>
+ <td>
+ <asp:DropDownList runat="server" ID="dwCommity" class="Sreq w120px" AutoPostBack="true" keepDefaultStyle="true" OnSelectedIndexChanged="dwCommity_SelectedIndexChanged" msg="璇烽�夋嫨璐у搧绫诲埆">
+ </asp:DropDownList>
+ </td>
+ </tr>
+ <tr>
+ <td class="ali03 w100px">
+ 璐у搧鍚嶇О锛�
+ </td>
+ <td>
+ <asp:DropDownList runat="server" ID="dwGoodsList" class="Sreq w120px" AutoPostBack="true" keepDefaultStyle="true" OnSelectedIndexChanged="dwGoodsList_SelectedIndexChanged" msg="璇烽�夋嫨璐у搧鍚嶇О">
+ </asp:DropDownList>
+ </td>
+ <td class="ali03 ">
+ 璐у搧鍝佺墝锛�
+ </td>
+ <td>
+ <asp:DropDownList runat="server" ID="dwBrand" class="Sreq w120px" AutoPostBack="false" keepDefaultStyle="true" msg="璇烽�夋嫨璐у搧鍝佺墝">
+ </asp:DropDownList>
+ </td>
+ </tr>
+ <tr>
+ <td class="ali03 ">
+ 璐у搧瑙勬牸锛�
+ </td>
+ <td>
+ <asp:DropDownList runat="server" ID="dwSpecification" class="Sreq w120px" AutoPostBack="false" keepDefaultStyle="true" msg="璇烽�夋嫨璐у搧瑙勬牸">
+ </asp:DropDownList>
+ </td>
+ <asp:Panel ID="div_td" runat="server">
+ <td class="ali03 w100px" runat="server" id="trWeight">
+ 绾稿紶鍏嬮噸锛�
+ </td>
+ <td>
+ <asp:DropDownList runat="server" ID="dwPaperWeight" class="Sreq w120px" AutoPostBack="false" keepDefaultStyle="true" msg="璇烽�夋嫨绾稿紶鍏嬮噸">
+ </asp:DropDownList>
+ </td>
+ </asp:Panel>
+ <asp:Panel ID="div_td1" runat="server">
+ </asp:Panel>
+ </tr>
+ <tr>
+ <td class="ali03 ">
+ 閲囪喘鏁伴噺锛�
+ </td>
+ <td>
+ <input type="text" runat="server" class="req int w120px" id="txtQuantity" msg="璇峰～鍐欓噰璐暟閲�"/>
+ </td>
+ <td class="ali03 ">
+ 鍗曚环(鍏�)锛�
+ </td>
+ <td>
+ <input type="text" runat="server" class="req float w120px" id="txtPrice" msg="璇峰～鍐欏崟浠�"/>
+ </td>
+
+ </tr>
+ <tr>
+ <asp:Panel ID="tanDiv" runat="server">
+ <td class="ali03 ">
+ 鍚ㄤ环(鍏�)锛�
+ </td>
+ <td>
+ <input type="text" runat="server" class=" float w120px" id="txtTenPrice" msg="璇峰～鍐欏惃浠�"/>
+ </td>
+ </asp:Panel>
+ <td class="ali03 ">
+ 閲戦(鍏�)锛�
+ </td>
+ <td>
+ <input type="text" runat="server" class="req float w120px" id="txtAllMoney" msg="璇峰～鍐欓噾棰�"/>
+ </td>
+ <asp:Panel ID="tanDiv1" runat="server">
+ </asp:Panel>
+ </tr>
+ <tr>
+ <td colspan="6" align="center">
+ <asp:Button runat="server" Text="鎻愪氦" ID="btn_config" OnClick="btn_config_Click" />
+ </td>
+ </tr>
+ </table>
+ </form>
+ <script type="text/javascript">
+ $(function () {
+ $("#dwCommity option").each(function (ii, vv) {
+ $(this).html($(this).html().replace(/[.]/g, " "));
+ });
+
+ GetAllPrice();
+
+ $("#txtPrice").blur(function () {
+ GetAllPrice();
+ });
+ $("#txtQuantity").blur(function () {
+
+ var price = parseFloat($("#txtPrice").val());
+ var quantity = parseFloat($("#txtQuantity").val());
+ if (isNaN(price) || isNaN(quantity)) {
+ $("#txtAllMoney").val("0");
+ } else {
+ var eda = (price * quantity).toFixed(2);
+ $("#txtAllMoney").val(eda);
+ }
+ });
+
+ $("#txtTenPrice").blur(function () {
+ var TenPrice = parseFloat($("#txtTenPrice").val());
+ if (!isNaN(TenPrice)) {
+ var PaperSize = $("#dwSpecification option:selected").text();
+ var PaperSizes = PaperSize.split("*");
+ var Width = PaperSizes[0];
+ var Height = PaperSizes[1];
+ // var PaperWeight = $("#dwPaperWeight").val();
+ var PaperWeight = parseFloat($("#dwPaperWeight option:selected").text());
+ var aa = (Width * Height * PaperWeight * TenPrice / 1000000000000).toFixed(4);
+ if (isNaN(aa)) {
+ $("#txtPrice").val(0);
+ }
+ else {
+ $("#txtPrice").val(aa);
+ var quantity = parseFloat($("#txtQuantity").val());
+ if (isNaN(quantity)) {
+ $("#txtAllMoney").val("0");
+ }
+ else {
+ var eda = (aa * quantity).toFixed(2);
+ $("#txtAllMoney").val(eda);
+ }
+ }
+ }
+ });
+ function GetAllPrice() {
+ var price = parseFloat($("#txtPrice").val());
+ if (!isNaN(price)) {
+ var TenPrice = parseFloat($("#txtTenPrice").val());
+ var PaperSize = $("#dwSpecification option:selected").text();
+ var PaperSizes = PaperSize.split("*");
+ var Width = PaperSizes[0];
+ var Height = PaperSizes[1];
+ var quantity = parseFloat($("#txtQuantity").val());
+ var PaperWeight = $("#dwPaperWeight option:selected").text();
+
+ var aa = (price * 1000000000000 / PaperWeight / Width / Height).toFixed(2);
+ if (isNaN(aa)) {
+ $("#txtTenPrice").val(0);
+ }
+ else {
+ $("#txtTenPrice").val(aa);
+ }
+ }
+ if (isNaN(price) || isNaN(quantity)) {
+ $("#txtAllMoney").val("0");
+ } else {
+ var eda = (price * quantity).toFixed(2);
+ $("#txtAllMoney").val(eda);
+ }
+ }
+ });
+ </script>
+</body>
+</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementADD.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementADD.aspx.cs
new file mode 100644
index 0000000..e35325b
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementADD.aspx.cs
@@ -0,0 +1,367 @@
+锘縰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;
+
+namespace CY.WebForm.Pages.procurement
+{
+ public partial class ProcurementADD : BasePage
+ {
+ OA_SpecificationBLL _OA_SpecificationBLL = null;
+ OA_SuppliersBLL _OA_SuppliersBLL = null;
+ OA_CommodityBLL _OA_CommodityBLL = null;
+ OA_GoodsInfoBLL _OA_GoodsInfoBLL = null;
+ OA_ProcurementBLL _OA_ProcurementBLL = null;
+ OA_GoodsInfo GoodsInfo = null;
+ OA_Procurement procurement = null;
+ Sys_DictionaryBLL bll_Sys_DictionaryBLL = null;
+ OA_BrandBLL _OA_BrandBLL = null;
+ OA_PaperWeightBLL _OA_PaperWeightBLL = null;
+ string Keyid = string.Empty;
+
+ public ProcurementADD()
+ {
+ _OA_PaperWeightBLL = new OA_PaperWeightBLL();
+ _OA_SpecificationBLL = new OA_SpecificationBLL();
+ _OA_BrandBLL = new OA_BrandBLL();
+ procurement = new OA_Procurement();
+ _OA_CommodityBLL = new OA_CommodityBLL();
+ _OA_ProcurementBLL = new OA_ProcurementBLL();
+ _OA_SuppliersBLL = new OA_SuppliersBLL();
+ _OA_GoodsInfoBLL = new OA_GoodsInfoBLL();
+ GoodsInfo = new OA_GoodsInfo();
+ bll_Sys_DictionaryBLL = new Sys_DictionaryBLL();
+ }
+
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ if (!IsPostBack)
+ {
+ InitialData();
+ if (dwCommity.SelectedItem.Text != "绾稿紶")
+ {
+ this.tanDiv.Visible = false;
+ this.tanDiv1.Visible = true;
+ this.dwPaperWeight.Visible = false;
+ this.trWeight.Visible = false;
+ this.div_td.Visible = false;
+ this.div_td1.Visible = true;
+ }
+ dwBrand.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
+ dwSpecification.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
+ dwGoodsList.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
+
+ }
+ }
+
+ /// <summary>
+ /// 鍒濆鍖栦笅鎷夊垪琛�
+ /// </summary>
+ protected void InitialData()
+ {
+
+ ///渚涘簲鍟�
+ selSuppliers.DataSource = _OA_SuppliersBLL.getSupplierTable(CurrentUser.MemberId);
+
+ selSuppliers.DataBind();
+ //selSuppliers.Items.Insert(0, new ListItem("璇烽�夋嫨", "0"));
+ ///浜у搧绫诲埆
+ ///
+ dwCommity.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
+ DataTable ds = _OA_CommodityBLL.SelectModelPage(CurrentUser.MemberId, "", "true");
+ GetDataByLevel(dwCommity, ds, 0, 0);
+
+ if (Request["Keyid"].ToInt32() > 0)
+ {
+ Keyid = Request["Keyid"].ToString();
+ ShowProcurementData();
+ }
+
+
+ }
+
+ private void ShowProcurementData()
+ {
+ OA_Procurement procurementModel = null;
+ procurementModel = new OA_Procurement();
+ procurementModel = _OA_ProcurementBLL.SelectSingleModel(Keyid);
+
+ this.selSuppliers.Value = procurementModel.SuppliersId.ToString();
+ this.dwCommity.SelectedValue = procurementModel.Commodityid.ToString();
+ DataTable ds = _OA_GoodsInfoBLL.SlectModleByCommity(dwCommity.SelectedValue, CurrentUser.MemberId);
+ if (ds.Rows.Count > 0)
+ {
+ dwGoodsList.DataSource = ds;
+ dwGoodsList.DataTextField = "GoodsName";
+ dwGoodsList.DataValueField = "Keyid";
+ dwGoodsList.DataBind();
+ }
+ else
+ {
+ dwGoodsList.Items.Clear();
+ dwGoodsList.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
+ }
+ this.dwGoodsList.SelectedValue = procurementModel.GoodsId.ToString();
+ indecChage();
+ this.dwBrand.SelectedValue = procurementModel.BrandId.ToString();
+ this.dwSpecification.SelectedValue = procurementModel.SpecificationId.ToString();
+ this.dwPaperWeight.SelectedValue = procurementModel.PaperWeightId.ToString();
+ this.txtQuantity.Value = procurementModel.Quantity.ToString();
+ this.txtPrice.Value = procurementModel.Price.ToString();
+ this.txtTenPrice.Value = procurementModel.TanPrice.ToString();
+ this.txtAllMoney.Value = procurementModel.AllMoney.ToString();
+
+
+
+ }
+
+ /// <summary>
+ /// 浜у搧绫诲埆
+ /// </summary>
+ /// <param name="dwCommity"></param>
+ /// <param name="data"></param>
+ /// <param name="parentId"></param>
+ /// <param name="level"></param>
+ public static void GetDataByLevel(System.Web.UI.WebControls.DropDownList dwCommity, DataTable data, int parentId, int level)
+ {
+ DataRow[] result = data.Select(string.Format("ParentId={0}", parentId));
+ int i = -1;
+ while (++i < result.Length)
+ {
+ dwCommity.Items.Add(new ListItem(GetSplitChar(level) + result[i]["CommodityName"].ToString2(), result[i]["Keyid"].ToString2()));
+ GetDataByLevel(dwCommity, data, result[i]["Keyid"].ToInt32().Value, level + 1);
+
+ }
+ }
+
+ public static string GetSplitChar(int level)
+ {
+ string splitchar = "";
+ int i = -1;
+ while (++i < level)
+ {
+ splitchar += ".";
+ }
+ return splitchar;
+ }
+
+ /// <summary>
+ /// 绫诲埆閫夊彇
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ protected void dwCommity_SelectedIndexChanged(object sender, EventArgs e)
+ {
+
+ DataTable ds = _OA_GoodsInfoBLL.SlectModleByCommity(dwCommity.SelectedValue, CurrentUser.MemberId);
+ if (ds.Rows.Count > 0)
+ {
+ dwGoodsList.DataSource = ds;
+ dwGoodsList.DataTextField = "GoodsName";
+ dwGoodsList.DataValueField = "Keyid";
+ dwGoodsList.DataBind();
+ dwGoodsList.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
+
+ dwBrand.Items.Clear();
+ dwBrand.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
+
+ dwSpecification.Items.Clear();
+ dwSpecification.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
+
+ dwPaperWeight.Items.Clear();
+ dwPaperWeight.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
+
+ if (dwCommity.SelectedItem.Text == "绾稿紶")
+ {
+ this.dwPaperWeight.Visible = true;
+ this.trWeight.Visible = true;
+ this.tanDiv.Visible = true;
+ this.tanDiv1.Visible = false;
+ this.div_td.Visible = true;
+ this.div_td1.Visible = false;
+ }
+ else
+ {
+ this.dwPaperWeight.Visible = false;
+ this.trWeight.Visible = false;
+ this.tanDiv.Visible = false;
+ this.tanDiv1.Visible = true;
+ this.div_td.Visible = false;
+ this.div_td1.Visible = true;
+ }
+ }
+ else
+ {
+ dwGoodsList.Items.Clear();
+ dwGoodsList.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
+
+ dwBrand.Items.Clear();
+ dwBrand.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
+
+ dwSpecification.Items.Clear();
+ dwSpecification.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
+
+ dwPaperWeight.Items.Clear();
+ dwPaperWeight.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
+ }
+ //indecChage();
+ }
+
+ /// <summary>
+ /// 鏍规嵁浜у搧鍚嶅垵濮嬪寲鏁版嵁
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ protected void dwGoodsList_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ indecChage();
+ }
+
+ /// <summary>
+ /// 鏍规嵁璐у搧绫诲埆鍜岃揣鍝佸悕绉伴�夋嫨瑙勬牸鍜屽搧鐗�
+ /// </summary>
+ protected void indecChage()
+ {
+ ///鍝佺墝
+ DataTable dt_brand = _OA_BrandBLL.getAllBrand(CurrentUser.MemberId, this.dwCommity.SelectedValue, this.dwGoodsList.SelectedValue);
+ if (dt_brand.Rows.Count > 0)
+ {
+ this.dwBrand.DataSource = dt_brand;
+ this.dwBrand.DataTextField = "Name";
+ this.dwBrand.DataValueField = "Keyid";
+ this.dwBrand.DataBind();
+ }
+ else
+ {
+ this.dwBrand.Items.Clear();
+ this.dwBrand.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
+ }
+ DataTable dt_Specefiction = _OA_SpecificationBLL.getAllSpecification(CurrentUser.MemberId, this.dwCommity.SelectedValue, this.dwGoodsList.SelectedValue);
+ //瑙勬牸
+ if (dt_Specefiction.Rows.Count > 0)
+ {
+ this.dwSpecification.DataSource = dt_Specefiction;
+ this.dwSpecification.DataTextField = "Name";
+ this.dwSpecification.DataValueField = "Keyid";
+ this.dwSpecification.DataBind();
+ }
+ else
+ {
+ this.dwSpecification.Items.Clear();
+ this.dwSpecification.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
+ }
+ ///濡傛灉鏄焊寮犵被鍨� 鍒欏姞杞藉厠閲�
+ OA_Commodity model = _OA_CommodityBLL.getCommodityId(CurrentUser.MemberId);
+ if (model.Keyid.ToString() == this.dwCommity.SelectedValue)
+ {
+ DataTable dt_PaperWeight = _OA_PaperWeightBLL.getPaperWeight(CurrentUser.MemberId, this.dwCommity.SelectedValue, this.dwGoodsList.SelectedValue);
+ ///鍏嬮噸
+ if (dt_PaperWeight.Rows.Count > 0)
+ {
+ this.dwPaperWeight.DataSource = dt_PaperWeight;
+ this.dwPaperWeight.DataTextField = "Name";
+ this.dwPaperWeight.DataValueField = "Keyid";
+ this.dwPaperWeight.DataBind();
+ this.dwPaperWeight.Visible = true;
+ this.trWeight.Visible = true;
+ this.tanDiv.Visible = true;
+ this.tanDiv1.Visible = false;
+ this.div_td.Visible = true;
+ this.div_td1.Visible = false;
+ }
+ else
+ {
+ this.dwPaperWeight.Items.Clear();
+ this.dwPaperWeight.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
+ }
+ }
+ else
+ {
+ this.dwPaperWeight.Visible = false;
+ this.trWeight.Visible = false;
+ this.tanDiv.Visible = false;
+ this.tanDiv1.Visible = true;
+ this.div_td.Visible = false;
+ this.div_td1.Visible = true;
+ }
+ }
+
+ protected void btn_config_Click(object sender, EventArgs e)
+ {
+ procurement.AllMoney = this.txtAllMoney.Value.ToDecimal2();
+ procurement.Quantity = this.txtQuantity.Value.ToInt32();
+ procurement.Price = this.txtPrice.Value.ToDecimal2();
+ procurement.LastUpdateTime = DateTime.Now;
+ procurement.Operator = CurrentUser.ShortName;
+ procurement.SuppliersId = this.selSuppliers.Value.ToInt32();
+ procurement.FirmId = CurrentUser.MemberId;
+ procurement.GoodsId = this.dwGoodsList.SelectedValue.ToInt32();
+ procurement.Remark = "";
+ procurement.BrandId = this.dwBrand.SelectedValue.ToInt32();
+ procurement.SpecificationId = this.dwSpecification.SelectedValue.ToInt32();
+ procurement.PaperWeightId = this.dwPaperWeight.SelectedValue.ToInt32() ?? 0;
+ procurement.TanPrice = this.txtTenPrice.Value.ToDecimal2() ?? 0;
+ procurement.Commodityid = this.dwCommity.SelectedValue.ToInt32();
+ procurement.PurchaseStatusId = bll_Sys_DictionaryBLL.GetKeyIdByKeyid(0, "閲囪喘鐘舵��"); ///閲囪喘鐘舵��
+ procurement.ClearingStatusId = bll_Sys_DictionaryBLL.GetKeyIdByKeyid(0, "缁撹处鐘舵��"); ///缁撶畻鐘舵��
+ procurement.PurchaseTime = DateTime.Now;
+ if (Request["Keyid"].ToInt32() > 0)
+ {
+ OA_Procurement procurementModel = new OA_Procurement();
+ procurementModel = _OA_ProcurementBLL.SelectSingleModel(Request["Keyid"]);
+ procurementModel.SuppliersId = this.selSuppliers.Value.ToInt32();
+ procurementModel.Commodityid = this.dwCommity.SelectedValue.ToInt32();
+ procurementModel.GoodsId = this.dwGoodsList.SelectedValue.ToInt32();
+ procurementModel.BrandId = this.dwBrand.SelectedValue.ToInt32();
+ procurementModel.SpecificationId = this.dwSpecification.SelectedValue.ToInt32();
+ procurementModel.PaperWeightId = this.dwPaperWeight.SelectedValue.ToInt32();
+ procurementModel.Quantity = this.txtQuantity.Value.ToInt32();
+ procurementModel.Price = this.txtPrice.Value.ToDecimal2();
+ procurementModel.TanPrice = this.txtTenPrice.Value.ToDecimal2();
+ procurementModel.AllMoney = this.txtAllMoney.Value.ToDecimal2();
+ procurementModel.PaperWeightId = this.dwPaperWeight.SelectedValue.ToInt32() ?? 0;
+ procurementModel.LastUpdateTime = DateTime.Now;
+ procurementModel.Operator = CurrentUser.ShortName;
+ if (_OA_ProcurementBLL.UpdateModel(procurementModel))
+ {
+ JavaScript.RefreshDIVOpener(this);
+ }
+ else
+ {
+ JavaScript.MessageBox("淇敼澶辫触", this);
+ }
+ }
+ else
+ {
+ if (_OA_ProcurementBLL.insertModel(procurement))
+ {
+ ClearData();
+ //JavaScript.RefreshDIVOpener(this);
+ JavaScript.MessageBox("鎿嶄綔鎴愬姛", this, true, false);
+ }
+ else
+ {
+ JavaScript.MessageBox("娣诲姞澶辫触", this);
+ }
+ }
+
+ }
+ public void ClearData()
+ {
+ dwCommity_SelectedIndexChanged(null, null);
+
+ txtQuantity.Value = "";
+ txtPrice.Value = "";
+ txtTenPrice.Value = "";
+ txtAllMoney.Value = "";
+ }
+ }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementADD.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementADD.aspx.designer.cs
new file mode 100644
index 0000000..e5b2799
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementADD.aspx.designer.cs
@@ -0,0 +1,179 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.procurement
+{
+
+
+ public partial class ProcurementADD
+ {
+
+ /// <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>
+ /// selSuppliers 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selSuppliers;
+
+ /// <summary>
+ /// dwCommity 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.DropDownList dwCommity;
+
+ /// <summary>
+ /// dwGoodsList 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.DropDownList dwGoodsList;
+
+ /// <summary>
+ /// dwBrand 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.DropDownList dwBrand;
+
+ /// <summary>
+ /// dwSpecification 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.DropDownList dwSpecification;
+
+ /// <summary>
+ /// div_td 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Panel div_td;
+
+ /// <summary>
+ /// trWeight 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlTableCell trWeight;
+
+ /// <summary>
+ /// dwPaperWeight 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.DropDownList dwPaperWeight;
+
+ /// <summary>
+ /// div_td1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Panel div_td1;
+
+ /// <summary>
+ /// txtQuantity 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtQuantity;
+
+ /// <summary>
+ /// txtPrice 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtPrice;
+
+ /// <summary>
+ /// tanDiv 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Panel tanDiv;
+
+ /// <summary>
+ /// txtTenPrice 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtTenPrice;
+
+ /// <summary>
+ /// txtAllMoney 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtAllMoney;
+
+ /// <summary>
+ /// tanDiv1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Panel tanDiv1;
+
+ /// <summary>
+ /// btn_config 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Button btn_config;
+ }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/SuppliersDetail.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/SuppliersDetail.aspx
index 72c45fa..4e6ca24 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/SuppliersDetail.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/SuppliersDetail.aspx
@@ -153,6 +153,12 @@
</tr>
<tr>
+ <td class="ali03 ">
+ 鎴峰悕锛�
+ </td>
+ <td>
+ <span id="spanHuming" runat="server"></span>
+ </td>
<td class="ali03 w150px">
寮�鎴疯锛�
</td>
@@ -165,12 +171,7 @@
<td>
<span id="spanAccountID" runat="server"></span>
</td>
- <td class="ali03 ">
-
- </td>
- <td>
-
- </td>
+
</tr>
<tr>
<td class="ali03 ">
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/SuppliersDetail.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/SuppliersDetail.aspx.cs
index b2d2fb7..7c88ad9 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/SuppliersDetail.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/SuppliersDetail.aspx.cs
@@ -43,6 +43,7 @@
this.spanFax.InnerText = supplier.Fax;
this.spanFinancialOfficers.InnerText = supplier.FinancialOfficers;
this.spanBank.InnerText = supplier.Bank;
+ this.spanHuming.InnerText = supplier.Huming;
this.spanAccountID.InnerText = supplier.AccountID;
this.spanLegalMobile.InnerText = supplier.LegalMobile;
this.spanLegalQQ.InnerText = supplier.LegalQQ;
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/SuppliersDetail.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/SuppliersDetail.aspx.designer.cs
index 657cac2..e7ed661 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/SuppliersDetail.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/SuppliersDetail.aspx.designer.cs
@@ -222,6 +222,15 @@
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanOfficersQQ;
/// <summary>
+ /// spanHuming 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanHuming;
+
+ /// <summary>
/// spanBank 鎺т欢銆�
/// </summary>
/// <remarks>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/SuppliersEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/SuppliersEdit.aspx
index 2853d14..702f592 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/SuppliersEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/SuppliersEdit.aspx
@@ -159,6 +159,12 @@
</tr>
<tr>
+ <td class="ali03 ">
+ 鎴峰悕锛�
+ </td>
+ <td>
+ <input id="txtHuming" type="text" runat="server" class=" " maxlength="50" />
+ </td>
<td class="ali03 ">
寮�鎴疯锛�
</td>
@@ -171,12 +177,7 @@
<td>
<input id="txtAccountID" type="text" runat="server" class=" " maxlength="50" />
</td>
- <td class="ali03 ">
-
- </td>
- <td>
-
- </td>
+
</tr>
<tr>
<td class="ali03 ">
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/SuppliersEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/SuppliersEdit.aspx.cs
index 73fcd00..fbe26e9 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/SuppliersEdit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/SuppliersEdit.aspx.cs
@@ -54,7 +54,7 @@
selCooperativeStateId.DataBind();
selSuppliersLevelId.DataSource = _Sys_DictionaryBLL.GetDataByType("渚涘簲鍟嗙骇鍒�");
selSuppliersLevelId.DataBind();
- selSuppliersTypeId.DataSource = _Sys_DictionaryBLL.GetDataByType("渚涘簲鍟嗙被鍒� ");
+ selSuppliersTypeId.DataSource = _Sys_DictionaryBLL.GetDataByType("渚涘簲鍟嗙被鍒� ").OrderBy(x=>x.LastUpdateTime);
selSuppliersTypeId.DataBind();
}
@@ -83,6 +83,7 @@
this.txtOfficersMobile.Value = supplier.OfficersMobile;
this.txtOfficersQQ.Value = supplier.OfficersQQ;
this.txtBank.Value = supplier.Bank;
+ this.txtHuming.Value = supplier.Huming;
this.txtAccountID.Value = supplier.AccountID;
this.txtPostcode.Value = supplier.Postcode;
this.txtQQ.Value = supplier.QQ;
@@ -223,6 +224,15 @@
supplier.Name = this.txtName.Value;
supplier.OfficersMobile = this.txtOfficersMobile.Value;
supplier.OfficersQQ = this.txtOfficersQQ.Value;
+ if (!string.IsNullOrEmpty(this.txtHuming.Value))
+ {
+ supplier.Huming = this.txtHuming.Value;
+ }
+ else
+ {
+ supplier.Huming = this.txtName.Value;
+ }
+
supplier.Bank = this.txtBank.Value;
supplier.AccountID = this.txtAccountID.Value;
supplier.Postcode = this.txtPostcode.Value;
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/SuppliersEdit.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/SuppliersEdit.aspx.designer.cs
index 48705af..2c420c9 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/SuppliersEdit.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/SuppliersEdit.aspx.designer.cs
@@ -222,6 +222,15 @@
protected global::System.Web.UI.HtmlControls.HtmlInputText txtOfficersQQ;
/// <summary>
+ /// txtHuming 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtHuming;
+
+ /// <summary>
/// txtBank 鎺т欢銆�
/// </summary>
/// <remarks>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/SuppliersList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/SuppliersList.aspx.cs
index 0df0ca7..37f49c3 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/SuppliersList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/SuppliersList.aspx.cs
@@ -98,7 +98,7 @@
selSuppliersLevelId.DataBind();
selSuppliersLevelId.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
- selSuppliersTypeId.DataSource = _Sys_DictionaryBLL.GetDataByType("渚涘簲鍟嗙被鍒� ");
+ selSuppliersTypeId.DataSource = _Sys_DictionaryBLL.GetDataByType("渚涘簲鍟嗙被鍒� ").OrderBy(x => x.LastUpdateTime);
selSuppliersTypeId.DataBind();
selSuppliersTypeId.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx
index b673938..44183d4 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx
@@ -84,7 +84,7 @@
<td colspan="3">
<select keepDefaultStyle="true" runat="server" id="selApprovalStatus" class="wx100px Sreq" msg="璇烽�夋嫨瀹℃壒缁撴灉">
<option value="">璇烽�夋嫨</option>
- <option value="1">鎵瑰噯</option>
+ <option value="1" selected="selected" >鎵瑰噯</option>
<option value="2">涓嶆壒鍑�</option>
</select>
</td>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.designer.cs
index 2a50a0f..d47d4c0 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.designer.cs
@@ -2,16 +2,18 @@
// <鑷姩鐢熸垚>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
// </鑷姩鐢熸垚>
//------------------------------------------------------------------------------
-namespace CY.WebForm.Pages.work {
-
-
- public partial class RequestReplyAdd {
-
+namespace CY.WebForm.Pages.work
+{
+
+
+ public partial class RequestReplyAdd
+ {
+
/// <summary>
/// Head1 鎺т欢銆�
/// </summary>
@@ -20,7 +22,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
-
+
/// <summary>
/// CMSHead1 鎺т欢銆�
/// </summary>
@@ -29,7 +31,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
-
+
/// <summary>
/// form1 鎺т欢銆�
/// </summary>
@@ -38,7 +40,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-
+
/// <summary>
/// spanPlanDataType 鎺т欢銆�
/// </summary>
@@ -47,7 +49,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPlanDataType;
-
+
/// <summary>
/// spanPlanMoney 鎺т欢銆�
/// </summary>
@@ -56,7 +58,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPlanMoney;
-
+
/// <summary>
/// spanPlanPeople 鎺т欢銆�
/// </summary>
@@ -65,7 +67,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPlanPeople;
-
+
/// <summary>
/// spanPlanStartTime 鎺т欢銆�
/// </summary>
@@ -74,7 +76,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPlanStartTime;
-
+
/// <summary>
/// spanPlanTitle 鎺т欢銆�
/// </summary>
@@ -83,7 +85,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPlanTitle;
-
+
/// <summary>
/// spanPlanContent 鎺т欢銆�
/// </summary>
@@ -92,7 +94,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPlanContent;
-
+
/// <summary>
/// spanPlanRemark 鎺т欢銆�
/// </summary>
@@ -101,7 +103,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPlanRemark;
-
+
/// <summary>
/// selApprovalStatus 鎺т欢銆�
/// </summary>
@@ -110,7 +112,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selApprovalStatus;
-
+
/// <summary>
/// txtApprovalContent 鎺т欢銆�
/// </summary>
@@ -119,7 +121,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlTextArea txtApprovalContent;
-
+
/// <summary>
/// btn_submit 鎺т欢銆�
/// </summary>
diff --git a/CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js b/CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js
index 0f06751..828999a 100644
--- a/CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js
+++ b/CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js
@@ -127,6 +127,14 @@
case "37":
$("#divInquiry").load("/Pages/front/WorkBook.aspx", { "PrintTypeId": printTypeId }, ExcuteCallBack);
break;
+ //璇曞嵎
+ case "38":
+ $("#divInquiry").load("/Pages/front/Shijuan.aspx", { "PrintTypeId": printTypeId }, ExcuteCallBack);
+ break;
+ //鍏枃绾�
+ case "39":
+ $("#divInquiry").load("/Pages/front/GongWenZhi.aspx", { "PrintTypeId": printTypeId }, ExcuteCallBack);
+ break;
//鏀舵嵁鑱斿崟
case "27":
$("#divInquiry").load("/Pages/front/ReceiptDocument.aspx", { "PrintTypeId": printTypeId }, ExcuteCallBack);
@@ -366,7 +374,7 @@
if (dataJsonStr == null || dataJsonStr == "")
return;
var dataJson = eval('(' + dataJsonStr + ')');
- if (dataJson.PrintTypeId == "-1" || dataJson.PrintTypeId == -1) {
+ if (dataJson.PrintTypeId == "-1" || dataJson.PrintTypeId == -1 ) {
$("[name='printSizeName']").val(dataJson.PrintSizeName);
$("[name='printCount']").val(dataJson.PrintCount);
$("[name='ysUnit']").val(dataJson.Unit);
@@ -1316,16 +1324,16 @@
$("#thickness").val(dataJson.Thickness);
$("#pageNum").val(dataJson.PageNum);
}
-
+
$("[name='printMode']").each(
- function () {
- if ($(this).val() == dataJson.PrintMode) {
- $(this).attr("checked", true);
- $(this).click();
- }
+ function () {
+ if ($(this).val() == dataJson.PrintMode) {
+ $(this).attr("checked", true);
+ $(this).click();
}
- );
+ }
+ );
if (dataJson.IsDefinedSize == 1) {
$("[name='paperSize']").val("-1");
@@ -1349,7 +1357,7 @@
$("[name='pNameMP']").val(dataJson.PaperMP);
$("[name='paper0']").val(dataJson.PaperId);
if (dataJson.PrintMode == 0) {
- if (dataJson.PaperMP && dataJson.PaperMP != "" && $("#hidPrintTypeId").val() !="29") {
+ if (dataJson.PaperMP && dataJson.PaperMP != "" && $("#hidPrintTypeId").val() != "29") {
PaperSelect($("[name='pNameMP']").val(), $("#hidPrintTypeId").val(), 0);
}
else {
@@ -1395,6 +1403,14 @@
$("[name='sjType']").change();
$("[name='RopeTypeId']").val(dataJson.RopeTypeId);
var afterWorkArry = dataJson.AfterWorkList;
+ if (printTypeId == 39) {
+ $("[name='works']").each(
+ function () {
+ $(this).attr("checked", false);
+ }
+ );
+ }
+
if (afterWorkArry.length > 0) {
for (var i = 0; i < afterWorkArry.length; i++) {
$("[name='works']").each(
@@ -1452,6 +1468,11 @@
}
}
}
+ }
+ if (printTypeId == 39) {
+
+ $("#pageNumsbs").val(dataJson.pageNumsbs);
+
}
//鍙板巻
if (printTypeId == 25) {
@@ -1774,7 +1795,7 @@
return;
}
- if (printTypeId == 32 || printTypeId == 31) {
+ if (printTypeId == 32 || printTypeId == 31 || printTypeId == 38 ) {
$("#printCount").attr("readonly", false);
return;
}
@@ -2028,6 +2049,11 @@
$("#printCount").attr("readonly", false);
return;
}
+ if (printTypeId == "39") {
+ $("#printCount").attr("readonly", false);
+ $("#paper0").attr("disabled", false);
+ return;
+ }
$("[id*='paper'][id!=paperSize]").val(3);
$("[id*='paper'][id!=paperSize]").attr("disabled", true);
$("[id*='brand']").attr("disabled", true);
--
Gitblit v1.9.1