From ad92b901b491d5921dbca2e91b0aafe8e2a0a017 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 27 九月 2024 13:30:53 +0800
Subject: [PATCH] 客户来源选择“政府采购”的才必选“机构代理”，除“政府采购”以外的客户来源，机构代码不用必填 “自联系”改为“上门送样”；“在线”改为“线上校对” 1）所有订单类型中的“印件名称”再增加几个字的长度，现在的格子有段短 （2）所有新增订单均把“客户单位”和“客户级别”这两行改到最前面，原来的“订单类型”这一行自动成为第3行 （3）“交货时间”现在默认的是第2天，全部改为默认第3天 在订单管理的列表中增加“封签”，列表中没打印显示“打印”，打印了就打“√” “订单管理”中，现在的“开票申请”栏目删除 生产安排中，生产“合版施工单”的前提必须是“订单类型”要相同，修改为不必相同。
---
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx | 135 +++++++++++++++++++++++----------------------
1 files changed, 69 insertions(+), 66 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
index 9cc124e..3f2b5e4 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
@@ -9,10 +9,23 @@
<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" type="text/javascript"></script>
+ <script src="../../js/Inquiry/Inquiry.js?v=18" type="text/javascript"></script>
<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",
@@ -30,7 +43,7 @@
///鏂板瀹㈡埛
function showCustomer() {
- top.Dialog.open({ URL: "/Pages/business/CorporateClientsEdit.aspx?src=order", Title: "鏂板瀹㈡埛", Width: 900, Height: 680 });
+ top.Dialog.open({ URL: "/Pages/business/CorporateClientsEdit.aspx?src=order", Title: "鏂板瀹㈡埛", Width: 1200, Height: 780 });
}
function Saveyaoqiu() {
@@ -97,7 +110,7 @@
try {
document.getElementById('spnCustormerControl').style.display = document.getElementById('txtCustormerName') ? 'none' : '';
if ('0' == document.getElementById('txtKeyid').value) {
- document.getElementById('txtDeliveryTime').value = new Date().ToFuture({ day: 1 }).ToString('yyyy-MM-dd');
+ document.getElementById('txtDeliveryTime').value = new Date().ToFuture({ day: 2 }).ToString('yyyy-MM-dd');
ReceiptT('customer', '', 6, 120); return;
} else {
ReceiptT('order', '<%=Orderid %>', 6, 120);
@@ -172,6 +185,24 @@
</td>
</tr>
<tr>
+ <td align="right">
+ 瀹㈡埛鍗曚綅锛�
+ </td>
+ <td colspan="3" align="left">
+ <input type="hidden" id='txtCustormer' runat="server" />
+ <input id='txtCustormerName' runat="server" readonly="readonly" /><span id='spnCustormerControl'><select id='selCustormer' runat="server" keepdefaultstyle='true' datavaluefield='MemberId' datatextfield='CompanyName' onchange='custormerChange(this)' class='Sreq' selinputhtml="True" sign="" style=" width:123px;"></select>
+ <%--<input type="button" value='鏂板' keepdefaultstyle='true' onclick="top.Dialog.open({ URL: '/Pages/business/CorporateClientsEdit.aspx', Title: '鏂板瀹㈡埛', Width: 900, Height: 680});" />--%>
+ </span>
+ <input type='hidden' runat="server" id='txtCompanyName' />
+ </td>
+ <td align="right">
+ 瀹㈡埛绾у埆锛�
+ </td>
+ <td align="left">
+ <select id='selCustormerLevel' class='Sreq' runat="server" datatextfield="Name" datavaluefield="Keyid" keepdefaultstyle='true'>
+ </select>
+ <!--datavaluefield="MeanValue"-->
+ </td>
<td align="right">
璁㈠崟绫诲瀷锛�
</td>
@@ -181,7 +212,10 @@
<select id='selPrintTypes' runat="server" datatextfield="PrintName" datavaluefield="Keyid" keepdefaultstyle='true' onchange='printTypeChange(this)' class=' Sreq'>
</select>
</td>
- <td align="right">
+
+ </tr>
+ <tr>
+ <td align="right">
璁㈠崟缂栧彿锛�
</td>
<td align="left">
@@ -200,25 +234,34 @@
<td align="left">
<input id='txtDeliveryTime' class='date req' runat="server" />
</td>
+ <td align="right">
+ 宸叉湁鍗颁欢锛�
+ </td>
+ <td align="left">
+ <select id='selprintask' runat="server" keepdefaultstyle='true' datavaluefield="Keyid" datatextfield='Name' onchange='printTypeChange1(this)' >
+ <option value="" >璇烽�夋嫨</option>
+ </select>
+ </td>
</tr>
+
<tr>
- <td align="right">
+ <td align="right">
鍗颁欢鍚嶇О锛�
</td>
<td align="left">
- <input id='txtDocumentName' runat="server" maxlength='200' class='req' />
+ <input id='txtDocumentName' runat="server" maxlength='200' class='req' style="width:200px;" />
</td>
<td align="right">
璁㈠崟鍗曚环锛�
</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">
鏍＄鏂瑰紡锛�
@@ -227,52 +270,9 @@
<select id='selVerifyWay' class=' Sreq' runat="server" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true'>
</select>
</td>
+
</tr>
- <tr>
- <td align="right">
- 宸叉湁鍗颁欢锛�
- </td>
- <td align="left">
- <select id='selprintask' runat="server" keepdefaultstyle='true' datavaluefield="Keyid" datatextfield='Name' onchange='printTypeChange1(this)' >
- <option value="" >璇烽�夋嫨</option>
- </select>
- </td>
- <td align="right">
-
- </td>
- <td align="left">
-
- </td>
- <td align="right">
-
- </td>
- <td align="left">
-
- </td>
- <td align="right">
-
- </td>
- <td align="left">
-
- </td>
- <td align="right">
-
- </td>
- <td align="left">
-
- </td>
- </tr>
<tr>
- <td align="right">
- 瀹㈡埛鍗曚綅锛�
- </td>
- <td colspan="3" align="left">
- <input type="hidden" id='txtCustormer' runat="server" />
- <input id='txtCustormerName' runat="server" readonly="readonly" /><span id='spnCustormerControl'><select id='selCustormer' runat="server" keepdefaultstyle='true' datavaluefield='MemberId' datatextfield='CompanyName' onchange='custormerChange(this)' class='Sreq' selinputhtml="True" sign="" style=" width:123px;"></select>
- <%--<input type="button" value='鏂板' keepdefaultstyle='true' onclick="top.Dialog.open({ URL: '/Pages/business/CorporateClientsEdit.aspx', Title: '鏂板瀹㈡埛', Width: 900, Height: 680});" />--%>
- </span>
- <input type='hidden' runat="server" id='txtCompanyName' />
- </td>
<td align="right">
涓氬姟缁忕悊锛�
</td>
@@ -286,16 +286,6 @@
<td align="left">
<select id='selCustormerManagers' runat="server" keepdefaultstyle='true' datavaluefield="Keyid" datatextfield='Name'>
</select>
- </td>
- </tr>
- <tr>
- <td align="right">
- 瀹㈡埛绾у埆锛�
- </td>
- <td align="left">
- <select id='selCustormerLevel' class='Sreq' runat="server" datatextfield="Name" datavaluefield="Keyid" keepdefaultstyle='true'>
- </select>
- <!--datavaluefield="MeanValue"-->
</td>
<td align="right">
鑱� 绯� 浜猴細
@@ -422,11 +412,12 @@
<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()" />
- <%--<input type="button" value="杩斿洖鍒楄〃" id='btnBackList' onclick="window.location='OrderList.aspx';" />--%>
+ <input type="button" value="杩斿洖鍒楄〃" id='btnBackList' onclick="window.location='OrderList.aspx';" />
</td>
</tr>
<tr>
@@ -477,18 +468,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 +503,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 +566,7 @@
function LoadPrintType1(printTypeId, pvcTypePar, OrderId) {
+ //alert(4);
$("#hidOrderId").val(OrderId);
switch (printTypeId) {
//鍚嶇墖
@@ -677,6 +678,7 @@
//鍔ㄦ�佸姞杞介〉闈㈠悗鎵ц鐨勮鍙�
function ExcuteCallBack1() {
+ // alert(5);
var printTypeId = $("#hidPrintTypeId").val();
$("#selDigitalPrintType").live("change",
@@ -726,6 +728,7 @@
var ssselprintask = $("#selprintask").val();
//淇敼鍙嶇粦鏁版嵁
+ //alert(3);
if (ssselprintask != "" || ssselprintask == "0") {
BindControl1(ssselprintask);
}
--
Gitblit v1.9.1