From 93850ee66d5fcc6441e387d0a6622e17d881da04 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 15 十月 2024 15:01:38 +0800
Subject: [PATCH] 作业本，页面排版
---
CY_ECommercePlatform/CY.WebForm/js/business/Order.js | 12 ++++++++++++
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx | 14 ++++++++++----
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.cs | 1 +
CY_ECommercePlatform/CY.Model/OA/OA_CustomerCommunications.cs | 11 +++++++++++
4 files changed, 34 insertions(+), 4 deletions(-)
diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_CustomerCommunications.cs b/CY_ECommercePlatform/CY.Model/OA/OA_CustomerCommunications.cs
index adc3b09..395e502 100644
--- a/CY_ECommercePlatform/CY.Model/OA/OA_CustomerCommunications.cs
+++ b/CY_ECommercePlatform/CY.Model/OA/OA_CustomerCommunications.cs
@@ -54,6 +54,8 @@
private int? _degreeimportanid;
private int? _accountmanagerid;
private int? _businessmanagerid;
+ private string _companyName;
+
/// <summary>
/// 鍚堜綔瀹㈡埛鍞竴缂栧彿
@@ -239,6 +241,15 @@
set { _remark = value; }
get { return _remark; }
}
+
+ /// <summary>
+ /// 鍏徃鍚嶅瓧
+ /// </summary>
+ public string CompanyName
+ {
+ set { _companyName = value; }
+ get { return _companyName; }
+ }
/// <summary>
/// 閲嶈绋嬪害缂栧彿
/// </summary>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
index 7e8c9ae..3d74128 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
@@ -10,7 +10,7 @@
<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=49" type="text/javascript"></script>
- <script src="../../js/business/Order.js?v=29" type="text/javascript"></script>
+ <script src="../../js/business/Order.js?v=32" type="text/javascript"></script>
<!--鍓嶅彴椤甸潰end-->
<script type="text/javascript" language="javascript">
@@ -228,11 +228,11 @@
<select id='selExigencyDegree' runat="server" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true'>
</select>
</td>
- <td align="right">
+ <td align="right" id="selVerifyWay123">
浜よ揣鏃堕棿锛�
</td>
- <td align="left">
- <input id='txtDeliveryTime' class='date req' runat="server" />
+ <td align="left" id="selVerifyWay321">
+ <input id='txtDeliveryTime' class='date' runat="server" />
</td>
<td align="right">
宸叉湁鍗颁欢锛�
@@ -250,6 +250,7 @@
</td>
<td align="left">
<input id='txtDocumentName' runat="server" maxlength='200' class='req' style="width:200px;" />
+ <input type='hidden' id='txtDocumentNameHide' />
</td>
<td align="right">
璁㈠崟鍗曚环锛�
@@ -527,12 +528,17 @@
document.getElementById('tbFacing').style.display = 'none';
document.getElementById('selVerifyWay12').style.display = 'none';
document.getElementById('selVerifyWay21').style.display = 'none';
+ document.getElementById('selVerifyWay123').style.display = 'none';
+ document.getElementById('selVerifyWay321').style.display = 'none';
+
}
else {
document.getElementById('tbFacing').style.display = '';
document.getElementById('selVerifyWay12').style.display = '';
document.getElementById('selVerifyWay21').style.display = '';
+ document.getElementById('selVerifyWay123').style.display = '';
+ document.getElementById('selVerifyWay321').style.display = '';
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.cs
index 4b495cf..d7e5ac1 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.cs
@@ -274,6 +274,7 @@
_oA_CustomerCommunications.DegreeImportanId = m_OA_CorporateClients.DegreeImportanId;
_oA_CustomerCommunications.AccountManagerId = m_OA_CorporateClients.AccountManagerId;
_oA_CustomerCommunications.BusinessManagerId = m_OA_CorporateClients.BusinessManagerId;
+ _oA_CustomerCommunications.CompanyName = m_OA_CorporateClients.CompanyName;
Response.Write(null == _oA_CustomerCommunications ? "" : JsonHelper.GetJsonStringByObject(_oA_CustomerCommunications));
}
diff --git a/CY_ECommercePlatform/CY.WebForm/js/business/Order.js b/CY_ECommercePlatform/CY.WebForm/js/business/Order.js
index 5d5ead6..9dadc51 100644
--- a/CY_ECommercePlatform/CY.WebForm/js/business/Order.js
+++ b/CY_ECommercePlatform/CY.WebForm/js/business/Order.js
@@ -514,11 +514,16 @@
document.getElementById('tbFacing').style.display = 'none';
document.getElementById('selVerifyWay12').style.display = 'none';
document.getElementById('selVerifyWay21').style.display = 'none';
+ document.getElementById('selVerifyWay123').style.display = 'none';
+ document.getElementById('selVerifyWay321').style.display = 'none';
+ document.getElementById('txtDocumentName').value = document.getElementById('txtDocumentNameHide').value
}
else {
document.getElementById('tbFacing').style.display = '';
document.getElementById('selVerifyWay12').style.display = '';
document.getElementById('selVerifyWay21').style.display = '';
+ document.getElementById('selVerifyWay123').style.display = '';
+ document.getElementById('selVerifyWay321').style.display = '';
}
}
@@ -554,6 +559,13 @@
document.getElementById('selBusinessManagers').value = jobj.BusinessManagerId;
document.getElementById('txtContact').value = jobj.BusinessManagers;
document.getElementById('txtPhone').value = jobj.CompanyPhone;
+ var aaaaaaaaaselPrintTypes = document.getElementById('selPrintTypes').value;
+ if (aaaaaaaaaselPrintTypes == "37") {
+ document.getElementById('txtDocumentName').value = jobj.CompanyName + "浣滀笟鏈�";
+ document.getElementById('txtDocumentNameHide').value = jobj.CompanyName + "浣滀笟鏈�";
+ } else {
+ document.getElementById('txtDocumentNameHide').value = jobj.CompanyName + "浣滀笟鏈�";
+ }
setTimeout(function () { ReceiptT('customer', jobj.Keyid, 6, 120); }, 0); //鑾峰彇鏀惰揣鏂瑰紡
} else;
});
--
Gitblit v1.9.1