From e804d4ec483ecdc2e21337ae1aec51804fc321f6 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 11 十一月 2025 12:31:52 +0800
Subject: [PATCH] 提交
---
CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj | 8
CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuList.aspx | 8
CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuDetail.aspx | 278 ++++++++++++++++++++++++++++++
CY_ECommercePlatform/CY.WebForm/Pages/front/Shijuan.aspx | 5
CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuDetail.aspx.cs | 137 +++++++++++++++
CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuDetail.aspx.designer.cs | 44 ++++
CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs | 24 +-
7 files changed, 489 insertions(+), 15 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj b/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
index 4093fb9..5ca4941 100644
--- a/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
+++ b/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
@@ -2224,6 +2224,7 @@
<Content Include="Pages\procurement\OutOfStorageListPrint.aspx" />
<Content Include="Pages\Property\PrintCheckTable.aspx" />
<Content Include="Pages\Property\ShebeimanageEdit.aspx" />
+ <Content Include="Pages\Property\ShebeiWeixiuDetail.aspx" />
<Content Include="Pages\Property\ShebeiWeixiuFukuanAdd.aspx" />
<Content Include="Pages\Property\ShebeiWeixiuList.aspx" />
<Content Include="Pages\Property\ShebeimanageList.aspx" />
@@ -5754,6 +5755,13 @@
<Compile Include="Pages\Property\ShebeimanageEdit.aspx.designer.cs">
<DependentUpon>ShebeimanageEdit.aspx</DependentUpon>
</Compile>
+ <Compile Include="Pages\Property\ShebeiWeixiuDetail.aspx.cs">
+ <DependentUpon>ShebeiWeixiuDetail.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\Property\ShebeiWeixiuDetail.aspx.designer.cs">
+ <DependentUpon>ShebeiWeixiuDetail.aspx</DependentUpon>
+ </Compile>
<Compile Include="Pages\Property\ShebeiWeixiuFukuanAdd.aspx.cs">
<DependentUpon>ShebeiWeixiuFukuanAdd.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuDetail.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuDetail.aspx
new file mode 100644
index 0000000..165f50b
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuDetail.aspx
@@ -0,0 +1,278 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ShebeiWeixiuDetail.aspx.cs" Inherits="CY.WebForm.Pages.Property.ShebeiWeixiuDetail" %>
+
+<!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 >
+ <%=oA_ShebeiManage.ZerenrenName %>
+ </td>
+ </tr>
+ <tr>
+ <td class="ali03">瀹夎鍦扮偣锛�</td>
+ <td> <%=oA_ShebeiWeixiu.Anzhuangdidian %>
+ </td>
+ </tr>
+
+ <tr>
+ <td class="ali03">璁惧鍚嶇О锛�</td>
+ <td> <%=oA_ShebeiWeixiu.Name %>
+ </td>
+ </tr>
+
+ <tr>
+ <td class="ali03">
+ 鏁呴殰鍘熷洜锛�
+ </td>
+ <td colspan="3">
+ <textarea id="txtPlanRemark" runat="server" style="width: 390px; height: 50px;" MaxLength="100" readonly="readonly"></textarea>
+ </td>
+ </tr>
+ <tr>
+ <td class="ali03">
+ 缁翠慨鏃ユ湡锛�
+ </td>
+ <td>
+ <%=oA_ShebeiWeixiu.WeixiuTime.HasValue?oA_ShebeiWeixiu.WeixiuTime.Value.ToString("yyyy-MM-dd"):"" %>
+ </td>
+ </tr>
+
+ <tr>
+ <td class="ali03">鐢宠璐圭敤锛�</td>
+ <td> <%=oA_ShebeiWeixiu.WeixiuPrice.Value.ToString("F2") %> </td>
+ </tr>
+
+ <tr>
+ <td class="ali03">浜嬫晠璐ｄ换浜猴細</td>
+ <td> <%=oA_ShebeiWeixiu.ZerenrenName %> </td></td>
+ </tr>
+
+ <tr>
+ <td class="ali03">鎷呰矗璐圭敤锛�</td>
+ <td> <%=oA_ShebeiWeixiu.DanzePrice.Value.ToString("F2") %> </td></td>
+ </tr>
+
+ <td colspan="2"></td>
+ </tr>
+ <tr id="trbtn" runat="server">
+ <td class="ali02" colspan="2">
+
+ <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/Property/ShebeiWeixiuDetail.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 changeShifoufukuan() {
+ if ($("#selShifoufukuan").val() == "1") {
+ $("#Fukuanfangshitr").show();
+ } else {
+ $("#Fukuanfangshitr").hide();
+ }
+ }
+
+ ///鏂板瀹㈡埛
+ 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;'/>";
+ $(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');
+ }
+ }
+
+
+
+ //鏌ョ湅
+ function checkSelFile() {
+
+ var oFile = document.getElementById('file1');
+ if (oFile.value == "") {
+ alertMsg('娌℃湁閫夋嫨鏂囦欢');
+ return;
+
+ }
+
+
+
+ var formData = new FormData();
+ formData.append('file', oFile.files[0]); // this.files[0]鏄枃浠跺璞�
+
+
+ $.ajax({
+ url: '/Pages/Property/FileUploadHandler.ashx', // 鏇挎崲涓轰綘鐨勬湇鍔″櫒绔偣
+ type: 'POST',
+ data: formData,
+ contentType: false,
+ processData: false,
+ async: false, // 璁剧疆涓哄悓姝�
+ success: function (response) {
+ console.log('File uploaded successfully:', response);
+ if (response.code == 1) {
+
+ $(".AddTab").last().after($(".AddTab").last().clone(true));
+ $(".AddTab").last().show();
+ $("input[name='HideKeyidFapiao']").last().val("");
+ $("input[name='HideAttachmentFapiao']").last().val(response.data);
+ $('a[name="HrefAttachmentFapiao"]').last().attr("href", response.data);
+ $('a[name="HrefAttachmentFapiao"]').last().html('<img src="' + response.data+'" width="20" height="20" />');
+ alertMsg('涓婁紶鎴愬姛');
+ } else {
+ alertMsg(response.message);
+ }
+
+
+ },
+ error: function (xhr, status, error) {
+ console.error('File upload failed:', status, error);
+ alertMsg('涓婁紶澶辫触');
+ }
+ });
+
+
+
+
+
+
+
+
+ }
+
+
+
+
+ function deletefujian(obj) {
+ if (confirm("鏄惁鍒犻櫎閫変腑鏁版嵁锛�")) {
+ $(obj).parent().parent().remove()
+ }
+ }
+
+
+
+ function ChangeThisType(obj) {
+ $("#selShebei").html("");
+ $.ajax({
+ url: "/Pages/Property/ShebeiWeixiuDetail.aspx",
+ type: "POST",
+ dataType: "html",
+ data: { TypeName: $(obj).val(), Target: "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].Name;
+ var option = "";
+ option = "<option value = '" + city_keyid + "'>" + city_name + "</option>";
+ $(option).appendTo($("#selShebei"));
+ }
+ }
+ }
+ });
+ }
+
+ </script>
+</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuDetail.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuDetail.aspx.cs
new file mode 100644
index 0000000..a364c19
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuDetail.aspx.cs
@@ -0,0 +1,137 @@
+锘縰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 System.Net;
+using System.IO;
+using System.Web.Script.Serialization;
+
+namespace CY.WebForm.Pages.Property
+{
+ //鍚磋緣
+ //鍗栧璇勪环
+ public partial class ShebeiWeixiuDetail : BasePage
+ {
+ EC_OrderBasicBLL bll_EC_OrderBasicBLL = null;
+
+ OA_FukuanshenqingBLL _oA_FukuanshenqingBLL = null;
+ OA_SubjectSetBLL _OA_SubjectSetBLL = null;
+
+ OA_StaffBLL bll_OA_StaffBLL = null;
+ OA_WorkPlanBll oA_WorkReminderBll = null;
+ OA_ShebeiManageBLL oA_ShebeiManageBLL = null;
+ OA_ShebeiWeixiuBLL oA_ShebeiWeixiuBLL = null;
+ public OA_ShebeiWeixiu oA_ShebeiWeixiu = new OA_ShebeiWeixiu();
+ public OA_ShebeiManage oA_ShebeiManage = new OA_ShebeiManage();
+
+
+
+ //鍒濆鍖�
+ public ShebeiWeixiuDetail()
+ {
+ bll_EC_OrderBasicBLL = new EC_OrderBasicBLL();
+
+ _oA_FukuanshenqingBLL = new OA_FukuanshenqingBLL();
+ bll_OA_StaffBLL = new OA_StaffBLL();
+ oA_WorkReminderBll = new OA_WorkPlanBll();
+ oA_ShebeiManageBLL = new OA_ShebeiManageBLL();
+ oA_ShebeiWeixiuBLL = new OA_ShebeiWeixiuBLL();
+ _OA_SubjectSetBLL = new OA_SubjectSetBLL();
+
+
+ }
+
+ //椤甸潰鍔犺浇
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ try
+ {
+ switch (Request["Target"])
+ {
+
+ case "change":
+ Response.Write(reLoadAccountName(Request["TypeName"].ToString2()));
+ break;
+ 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()
+ {
+ var keyid = Request["Keyid"].ToInt32();
+
+ oA_ShebeiWeixiu = oA_ShebeiWeixiuBLL.GetModelByKeyid(keyid);
+
+ oA_ShebeiManage = oA_ShebeiManageBLL.GetModelByKeyid(oA_ShebeiWeixiu.ShebeiId);
+ this.txtPlanRemark.Value = oA_ShebeiWeixiu.Remark;
+ }
+
+
+ protected string reLoadAccountName(string selAcoountType)
+ {
+ var query = new Infrastructure.Query.Query();
+ if (!string.IsNullOrEmpty(selAcoountType))
+ {
+ return JsonHelper.GetJsonStringByObject(oA_ShebeiManageBLL.SelectAllModel(query).Where(x => x.Status != 1 && x.Zerenren == selAcoountType.ToInt32()));
+ }
+ else
+ {
+ return JsonHelper.GetJsonStringByObject(oA_ShebeiManageBLL.SelectAllModel(query).Where(x => x.Status != 1));
+ }
+
+
+ }
+
+ /// <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));
+ }
+
+
+
+ }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuDetail.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuDetail.aspx.designer.cs
new file mode 100644
index 0000000..121ac88
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuDetail.aspx.designer.cs
@@ -0,0 +1,44 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.Property
+{
+
+
+ public partial class ShebeiWeixiuDetail
+ {
+
+ /// <summary>
+ /// CMSHead1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
+
+ /// <summary>
+ /// txtPlanRemark 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlTextArea txtPlanRemark;
+
+ /// <summary>
+ /// trbtn 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlTableRow trbtn;
+ }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuList.aspx
index dd6c883..fda0d28 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuList.aspx
@@ -11,6 +11,12 @@
top.Dialog.open({ URL: "/Pages/Property/ShebeiWeixiuFukuanAdd.aspx?keyid=" + keyid, Title: "缁翠慨浠樻鐢宠", Width: 500, Height: 430 });
}
+
+ //鏌ョ湅
+ function onDetal(keyid) {
+ top.Dialog.open({ URL: "/Pages/Property/ShebeiWeixiuDetail.aspx?Keyid=" + keyid, Title: "缁翠慨鏌ョ湅", Width: 500, Height: 600 });
+ }
+
//娣诲姞
function addModel() {
top.Dialog.open({ URL: "/Pages/Property/ShebeiWeixiuAdd.aspx", Title: "缁翠慨鐢宠", Width: 500, Height: 430 });
@@ -240,7 +246,7 @@
<%#Eval("FukuanfangshiName")%>
</td>
<td class="Operate " style="text-align: center">
-
+ <span menu_member_case_id="case_Chakan" menu_member_case_name="缁翠慨鏌ョ湅" onclick="onDetal('<%#Eval("Keyid")%>')">缁翠慨鏌ョ湅</span>
<%#Eval("Caozuo")%>
</td>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
index 5e8d7ea..e8b8920 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
@@ -1323,10 +1323,10 @@
}
if (!string.IsNullOrEmpty(inquirySHiJuanModel.sixiangpingdecheckboxinput))
{
- //printDemand += "鎬濇兂鍝佸痉锛�" + inquirySHiJuanModel.sixiangpingdecheckboxinput + "寮狅紝";
+ //printDemand += "閬撳痉涓庢硶娌伙細" + inquirySHiJuanModel.sixiangpingdecheckboxinput + "寮狅紝";
//printDemand += inquirySHiJuanModel.sixiangpingdeselect + "锛�";
- printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鎬濇兂鍝佸痉锛�" + inquirySHiJuanModel.sixiangpingdecheckboxinput + "寮狅紝" + inquirySHiJuanModel.sixiangpingdeselect + "</td>";
+ printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">閬撳痉涓庢硶娌伙細" + inquirySHiJuanModel.sixiangpingdecheckboxinput + "寮狅紝" + inquirySHiJuanModel.sixiangpingdeselect + "</td>";
}
printDemand += "</tr>";
@@ -1377,10 +1377,10 @@
}
if (!string.IsNullOrEmpty(inquirySHiJuanModel.sixiangpingdedatikacheckboxinput))
{
- //printDemand += "鎬濇兂鍝佸痉锛�" + inquirySHiJuanModel.sixiangpingdedatikacheckboxinput + "寮狅紝";
+ //printDemand += "閬撳痉涓庢硶娌伙細" + inquirySHiJuanModel.sixiangpingdedatikacheckboxinput + "寮狅紝";
//printDemand += inquirySHiJuanModel.sixiangpingdedatikaselect + "锛�";
- printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鎬濇兂鍝佸痉锛�" + inquirySHiJuanModel.sixiangpingdedatikacheckboxinput + "寮狅紝" + inquirySHiJuanModel.sixiangpingdedatikaselect + "</td>";
+ printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">閬撳痉涓庢硶娌伙細" + inquirySHiJuanModel.sixiangpingdedatikacheckboxinput + "寮狅紝" + inquirySHiJuanModel.sixiangpingdedatikaselect + "</td>";
}
}
else if (inquirySHiJuanModel.Nianji == "鍏勾绾�")
@@ -1422,10 +1422,10 @@
}
if (!string.IsNullOrEmpty(inquirySHiJuanModel.sixiangpingdecheckboxinput))
{
- //printDemand += "鎬濇兂鍝佸痉锛�" + inquirySHiJuanModel.sixiangpingdecheckboxinput + "寮狅紝";
+ //printDemand += "閬撳痉涓庢硶娌伙細" + inquirySHiJuanModel.sixiangpingdecheckboxinput + "寮狅紝";
//printDemand += inquirySHiJuanModel.sixiangpingdeselect + "锛�";
- printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鎬濇兂鍝佸痉锛�" + inquirySHiJuanModel.sixiangpingdecheckboxinput + "寮狅紝" + inquirySHiJuanModel.sixiangpingdeselect + "</td>";
+ printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">閬撳痉涓庢硶娌伙細" + inquirySHiJuanModel.sixiangpingdecheckboxinput + "寮狅紝" + inquirySHiJuanModel.sixiangpingdeselect + "</td>";
}
printDemand += "</tr>";
@@ -1484,10 +1484,10 @@
}
if (!string.IsNullOrEmpty(inquirySHiJuanModel.sixiangpingdedatikacheckboxinput))
{
- //printDemand += "鎬濇兂鍝佸痉锛�" + inquirySHiJuanModel.sixiangpingdedatikacheckboxinput + "寮狅紝";
+ //printDemand += "閬撳痉涓庢硶娌伙細" + inquirySHiJuanModel.sixiangpingdedatikacheckboxinput + "寮狅紝";
//printDemand += inquirySHiJuanModel.sixiangpingdedatikaselect + "锛�";
- printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鎬濇兂鍝佸痉锛�" + inquirySHiJuanModel.sixiangpingdedatikacheckboxinput + "寮狅紝" + inquirySHiJuanModel.sixiangpingdedatikaselect + "</td>";
+ printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">閬撳痉涓庢硶娌伙細" + inquirySHiJuanModel.sixiangpingdedatikacheckboxinput + "寮狅紝" + inquirySHiJuanModel.sixiangpingdedatikaselect + "</td>";
}
@@ -1525,10 +1525,10 @@
}
if (!string.IsNullOrEmpty(inquirySHiJuanModel.sixiangpingdecheckboxinput))
{
- //printDemand += "鎬濇兂鍝佸痉锛�" + inquirySHiJuanModel.sixiangpingdecheckboxinput + "寮狅紝";
+ //printDemand += "閬撳痉涓庢硶娌伙細" + inquirySHiJuanModel.sixiangpingdecheckboxinput + "寮狅紝";
//printDemand += inquirySHiJuanModel.sixiangpingdeselect + "锛�";
- printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鎬濇兂鍝佸痉锛�" + inquirySHiJuanModel.sixiangpingdecheckboxinput + "寮狅紝" + inquirySHiJuanModel.sixiangpingdeselect + "</td>";
+ printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">閬撳痉涓庢硶娌伙細" + inquirySHiJuanModel.sixiangpingdecheckboxinput + "寮狅紝" + inquirySHiJuanModel.sixiangpingdeselect + "</td>";
}
printDemand += "</tr>";
printDemand += "<tr>";
@@ -1580,10 +1580,10 @@
}
if (!string.IsNullOrEmpty(inquirySHiJuanModel.sixiangpingdedatikacheckboxinput))
{
- //printDemand += "鎬濇兂鍝佸痉锛�" + inquirySHiJuanModel.sixiangpingdedatikacheckboxinput + "寮狅紝";
+ //printDemand += "閬撳痉涓庢硶娌伙細" + inquirySHiJuanModel.sixiangpingdedatikacheckboxinput + "寮狅紝";
//printDemand += inquirySHiJuanModel.sixiangpingdedatikaselect + "锛�";
- printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鎬濇兂鍝佸痉锛�" + inquirySHiJuanModel.sixiangpingdedatikacheckboxinput + "寮狅紝" + inquirySHiJuanModel.sixiangpingdedatikaselect + "</td>";
+ printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">閬撳痉涓庢硶娌伙細" + inquirySHiJuanModel.sixiangpingdedatikacheckboxinput + "寮狅紝" + inquirySHiJuanModel.sixiangpingdedatikaselect + "</td>";
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/Shijuan.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/front/Shijuan.aspx
index 51bdb55..89dbd93 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/Shijuan.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/Shijuan.aspx
@@ -228,6 +228,7 @@
<option value="8P">8P</option>
<option value="6+4P">6+4P</option>
<option value="6+6P">6+6P</option>
+ <option value="8+4P">8+4P</option>
</select>
<input type="checkbox" name="kexuecheckbox" value_id="1" value="1" style="display:none;" /><span name="kexuetitle" value_id="1" style="display:none;" >绉戝锛�</span><input type="text" onchange="ShijuanCountChange();" name="kexuecheckboxinput" style="height: 15px; line-height: 15px; width:40px;display:none;" class="validateIntshijuan" value_id="1" /><span name="kexueunit" value_id="1" style="display:none;" >寮�</span>
@@ -302,7 +303,7 @@
<option value="6+6P">6+6P</option>
</select>
- <input type="checkbox" name="sixiangpingdecheckbox" value_id="1" value="1" style="display:none;" /><span name="sixiangpingdetitle" value_id="1" style="display:none;" >鎬濇兂鍝佸痉锛�</span><input type="text" onchange="ShijuanCountChange();" name="sixiangpingdecheckboxinput" style="height: 15px; line-height: 15px; width:40px;display:none;" class="validateIntshijuan" value_id="1" /><span name="sixiangpingdeunit" value_id="1" style="display:none;" >寮�</span>
+ <input type="checkbox" name="sixiangpingdecheckbox" value_id="1" value="1" style="display:none;" /><span name="sixiangpingdetitle" value_id="1" style="display:none;" >閬撳痉涓庢硶娌伙細</span><input type="text" onchange="ShijuanCountChange();" name="sixiangpingdecheckboxinput" style="height: 15px; line-height: 15px; width:40px;display:none;" class="validateIntshijuan" value_id="1" /><span name="sixiangpingdeunit" value_id="1" style="display:none;" >寮�</span>
<select class="selectLaber" name="sixiangpingdeselect" style=" width:45px;display:none;" value_id="1" onchange="ShijuanCountChange();" >
<option value="4P">4P</option>
<option value="6P" >6P</option>
@@ -386,7 +387,7 @@
<option value="A3" >A3</option>
</select>
- <input type="checkbox" name="sixiangpingdedatikacheckbox" value_id="1" value="1" style="display:none;" /><span name="sixiangpingdedatikatitle" value_id="1" >鎬濇兂鍝佸痉锛�</span><input type="text" onchange="ShijuanCountChange();" name="sixiangpingdedatikacheckboxinput" style="height: 15px; line-height: 15px; width:40px;" class="validateIntshijuan" value_id="1" /><span name="sixiangpingdedatikaunit" value_id="1" >寮�</span>
+ <input type="checkbox" name="sixiangpingdedatikacheckbox" value_id="1" value="1" style="display:none;" /><span name="sixiangpingdedatikatitle" value_id="1" >閬撳痉涓庢硶娌伙細</span><input type="text" onchange="ShijuanCountChange();" name="sixiangpingdedatikacheckboxinput" style="height: 15px; line-height: 15px; width:40px;" class="validateIntshijuan" value_id="1" /><span name="sixiangpingdedatikaunit" value_id="1" >寮�</span>
<select class="selectLaber" name="sixiangpingdedatikaselect" style=" width:45px;" value_id="1">
<option value="A4">A4</option>
<option value="A3" >A3</option>
--
Gitblit v1.9.1