From 641ddf669ad57fb544e13a6433aa5905551b3bba Mon Sep 17 00:00:00 2001
From: CB2-20200827ONU\Administrator <liaoxujun@qq.com>
Date: 星期三, 22 九月 2021 09:04:14 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/chuanyin-group-project
---
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx | 36 +++++++++++++++++++++++++++++++-----
1 files changed, 31 insertions(+), 5 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
index 9cc124e..875669e 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
@@ -13,6 +13,19 @@
<script src="../../js/business/Order.js?v=25" type="text/javascript"></script>
<!--鍓嶅彴椤甸潰end-->
<script type="text/javascript" language="javascript">
+
+ function jsPrice(dj) {
+ var num = $("#printCount").val();
+
+ $("#txtSumPrice").val(dj * num);
+ }
+
+ function jsdjPrice(zj) {
+ var num = $("#printCount").val();
+
+ $("#txtUnitPrice").val( (zj/num).toFixed(4) );
+ }
+
function ReBindClients() {
$.ajax({
url: "/Pages/business/OrderEdit.aspx",
@@ -212,13 +225,13 @@
璁㈠崟鍗曚环锛�
</td>
<td align="left">
- <input id='txtUnitPrice' runat="server" maxlength='9' class='float' />
+ <input id='txtUnitPrice' runat="server" maxlength='9' class='float' onchange="jsPrice(this.value)" />
</td>
<td align="right">
璁㈠崟鎬讳环锛�
</td>
<td align="left">
- <input id='txtSumPrice' runat="server" maxlength='9' value='0' class="req float" min="0" />
+ <input id='txtSumPrice' runat="server" maxlength='9' value='0' class="req float" min="0" onchange="jsdjPrice(this.value)" />
</td>
<td align="right">
鏍$鏂瑰紡锛�
@@ -422,7 +435,8 @@
<td class="contentLeft" colspan="2" style=" padding-left:300px;">
<input type="hidden" id='txtKeyid' runat="server" value='0' /><input type="hidden" value='0' id='txtBillMode' runat="server" />
<input type="hidden" name='Target' value='default' />
- <input name='hidPrintTypeId' id='hidPrintTypeId' type="hidden" /><input type="button" id="btnSaveask" runat="server" value="淇濆瓨璁㈠崟鍜岃姹�" onclick="if(!Saveyaoqiu())return false;" /> <input type="button" id="btnSave" runat="server" value="淇濆瓨璁㈠崟" onclick="if(!Save())return false;" /> <input type="button" value="閲� 缃�" id='btnReset' onclick="ReLoad()" />
+ <input name='hidPrintTypeId' id='hidPrintTypeId' type="hidden" />
+ <input type="button" id="btnSaveask" runat="server" value="淇濆瓨璁㈠崟鍜岃姹�" onclick="if(!Saveyaoqiu())return false;" /> <input type="button" id="btnSave" runat="server" value="淇濆瓨璁㈠崟" onclick="if(!Save())return false;" /> <input type="button" value="閲� 缃�" id='btnReset' onclick="ReLoad()" />
@@ -477,18 +491,23 @@
showWait();
var OldOrderId = document.getElementById('txtKeyid').value;
var ssselPrintTypes = document.getElementById('selPrintTypes').value;
+ alert(7);
if (ssselPrintTypes == -1 || ssselPrintTypes == "-1") {//鍏朵粬绫诲瀷
$("#hidOrderId").val(OldOrderId);
$("#divInquiry").load("/Pages/front/OtherType.aspx", { "PrintTypeId": "-1" });
setTimeout(function () {
+ alert(8);
if (sel.value != "" || sel.value == "0") {
BindControl1(sel.value);
}
}, 1000);
window.hideWaitDiv = window.parent.parent.parent.parent.parent.parent.hideWaitDiv;
- if (window.hideWaitDiv) window.hideWaitDiv();
- } else {
+ if (window.hideWaitDiv)
+ window.hideWaitDiv();
+ }
+ else
+ {
DelayLoadPrintType1(ssselPrintTypes, '1', OldOrderId, 'order');
}
document.getElementById('hidPrintTypeId').value = ssselPrintTypes;
@@ -507,18 +526,22 @@
//淇敼鍙嶇粦鏁版嵁
function BindControl1(orderId) {
+ alert(1);
if (parseInt(orderId) > 0) {
$.ajax({
url: '/Pages/front/InquiryOnLine.aspx?tmp' + (new Date()).valueOf(),
type: "POST",
data: "BindControl1=true&OrderId=" + orderId,
success: function (dataJsonStr) {
+ alert(2);
if (dataJsonStr == null || dataJsonStr == "")
return;
var dataJson = eval('(' + dataJsonStr + ')');
+ alert(dataJson.PrintTypeId);
if (dataJson.PrintTypeId == "-1" || dataJson.PrintTypeId == -1) {
$("[name='printSizeName']").val(dataJson.PrintSizeName);
$("[name='printCount']").val(dataJson.PrintCount);
+ $("#ysUnit").attr("value", dataJson.Unit);
$("[name='txtPrintDemand']").val(dataJson.PrintDemand);
} else {
BindControlByPrintType(dataJson);
@@ -566,6 +589,7 @@
function LoadPrintType1(printTypeId, pvcTypePar, OrderId) {
+ alert(4);
$("#hidOrderId").val(OrderId);
switch (printTypeId) {
//鍚嶇墖
@@ -677,6 +701,7 @@
//鍔ㄦ�佸姞杞介〉闈㈠悗鎵ц鐨勮鍙�
function ExcuteCallBack1() {
+ alert(5);
var printTypeId = $("#hidPrintTypeId").val();
$("#selDigitalPrintType").live("change",
@@ -726,6 +751,7 @@
var ssselprintask = $("#selprintask").val();
//淇敼鍙嶇粦鏁版嵁
+ alert(3);
if (ssselprintask != "" || ssselprintask == "0") {
BindControl1(ssselprintask);
}
--
Gitblit v1.9.1