From a7e05ebe00fdcb649c012e5afc4a42a8d631e824 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 02 四月 2025 08:38:24 +0800
Subject: [PATCH] 删除客户管理查询条件中的“客户编号” 完成 新增订单---黑白印件 的后道工序最右边增加一个“口 竖式”，同前面套号、压痕一样，默认不勾选，是竖式的业务经理自己下单时勾选 完成提交外协付款申请时，增加上传审批证明的上传图片功能，可以添加多张图片；查询列表中增加“付款状态：全部、已付款、未付款”查询条件，默认全部；“完工状态”改为默认未完工 完成请示批复----付款申请 中也要向上面的需求一样，增加上传审批证明的上传图片功能，可以添加多张图片 完成在“请示批复”中进行“批复”操作的时候要能查看上传的审批图片 完成包装要求”要显示在打印的订单中 完成包装要求”要显示在打印的订单中 完成收据联单的新增订单中，纸张选无碳纸时，不显示“品牌”、“克重”，在联数的后面增加颜色选择：“颜色：上白下红”（匹配联数）订单管理中的“订单状态”删除，删除后新增两个状态：“完工状态：全部、未完工、已完工”和“送货状态：全部、已送货、未送货” 完成请示批复中默认“未批复” 完成请示批复中默认“未批复” 完成
---
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx | 84 ++++++++++++++++++++++++++++++-----------
1 files changed, 61 insertions(+), 23 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
index 931670d..3cb4293 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
@@ -9,15 +9,15 @@
<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=49" type="text/javascript"></script>
- <script src="../../js/business/Order.js?v=35" type="text/javascript"></script>
+ <script src="../../js/Inquiry/Inquiry.js?v=184" type="text/javascript"></script>
+ <script src="../../js/business/Order.js?v=46" type="text/javascript"></script>
<!--鍓嶅彴椤甸潰end-->
<script type="text/javascript" language="javascript">
function jsPrice(dj) {
var num = $("#printCount").val();
- $("#txtSumPrice").val(dj * num);
+ $("#txtSumPrice").val((dj * num).toFixed(4));
}
function jsdjPrice(zj) {
@@ -47,9 +47,15 @@
}
function Saveyaoqiu() {
+ if (document.getElementById('txtSumPrice').value == "" || parseFloat(document.getElementById('txtSumPrice').value) <=0 ) {
+ if (!confirm("璁㈠崟鎬讳环涓�0锛屾槸鍚︾户缁繚瀛橈紵"))
+ return false;
+ }
+
+
if (document.getElementById('selPrintTypes').value != "6") {
alertMsg("鐩墠鍙繚瀛樹功鍒婅姹�!");
- return;
+ return false;
}
return ValidateForm();
}
@@ -111,6 +117,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);
@@ -139,6 +147,21 @@
}
+
+ //缁存姢
+ function onViewuplod() {
+
+ var keyid = $("#selCustormer").val();
+ if (keyid == "") {
+ alertMsg("璇烽�夋嫨瀹㈡埛!");
+ return;
+ }
+ var l = (screen.availWidth - 500) / 2;
+ var t = (screen.availHeight - 300) / 2;
+ // window.open({ URL: "/Pages/business/CorporateClientsUpLoadContract.aspx?Keyid=" + keyid, Title: "鏌ョ湅鍚堝悓", Width: 900, Height: 750 });
+ window.open('/Pages/business/CorporateClientsContractShow.aspx?Keyid=' + keyid, '_blank', 'height=750,width=900,top=' + t + ',left=' + l + ',toolbar=no,menubar=no,scrollbars=no,resizable=no,location=no,status=no');
+ }
+
</script>
<style type="text/css">
@@ -161,7 +184,10 @@
<table class="table2" id="tbBasic" align="left" style=" width:1000px;">
<thead>
<tr>
- <th colspan="8">
+ <th colspan="1">
+ <input type="button" id="btnPrint" value="鏌ョ湅鍚堝悓" onclick="onViewuplod()">
+ </th>
+ <th colspan="7">
鍩烘湰淇℃伅
</th>
</tr>
@@ -186,6 +212,15 @@
</tr>
<tr>
<td align="right">
+ 璁㈠崟绫诲瀷锛�
+ </td>
+ <td align="left">
+ <span id='spnPrintType'></span>
+ <input type="hidden" id='txtPrintTypes' runat="server" />
+ <select id='selPrintTypes' runat="server" datatextfield="PrintName" datavaluefield="Keyid" keepdefaultstyle='true' onchange='printTypeChange(this)' class=' Sreq'>
+ </select>
+ </td>
+ <td align="right">
瀹㈡埛鍗曚綅锛�
</td>
<td colspan="3" align="left">
@@ -203,15 +238,7 @@
</select>
<!--datavaluefield="MeanValue"-->
</td>
- <td align="right">
- 璁㈠崟绫诲瀷锛�
- </td>
- <td align="left">
- <span id='spnPrintType'></span>
- <input type="hidden" id='txtPrintTypes' runat="server" />
- <select id='selPrintTypes' runat="server" datatextfield="PrintName" datavaluefield="Keyid" keepdefaultstyle='true' onchange='printTypeChange(this)' class=' Sreq'>
- </select>
- </td>
+
</tr>
<tr>
@@ -238,7 +265,7 @@
宸叉湁鍗颁欢锛�
</td>
<td align="left">
- <select id='selprintask' runat="server" keepdefaultstyle='true' datavaluefield="Keyid" datatextfield='Name' onchange='printTypeChange1(this)' >
+ <select id='selprintask' runat="server" keepdefaultstyle='true' datavaluefield="Keyid" datatextfield='Name' style="width:150px;" onchange='printTypeChange1(this)' >
<option value="" >璇烽�夋嫨</option>
</select>
</td>
@@ -252,17 +279,17 @@
<input id='txtDocumentName' runat="server" maxlength='200' class='req' style="width:200px;" />
<input type='hidden' id='txtDocumentNameHide' />
</td>
- <td align="right">
+ <td align="right" id="selVerifyWay1234">
璁㈠崟鍗曚环锛�
</td>
- <td align="left">
+ <td align="left" id="selVerifyWay4321">
<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" onchange="jsdjPrice(this.value)" />
+ <input id='txtSumPrice' runat="server" maxlength='16' value='0' class="req float" min="0" onchange="jsdjPrice(this.value)" />
</td>
<td align="right" id="selVerifyWay12">
鏍＄鏂瑰紡锛�
@@ -335,6 +362,17 @@
<div id="divInquiry" style=' display: block;width:1010px;' >
</div>
<br />
+ <table class="table2 table2Left" id="Duiyinghetongbianhao" align="left" style=" width:1000px;">
+ <tr style=" height:11px;">
+ <td style="width:100px;text-align:right;">
+ 瀵瑰簲鍚堝悓搴忓彿锛�
+ </td>
+ <td style="text-align:left;" >
+ <input id='txtDuiyinghetongbianhao' runat="server" maxlength="100" />
+ </td>
+ </tr>
+ </table>
+ <br />
<table class="table2 table2Left" align="left" style=" width:1000px;">
<thead>
<tr>
@@ -415,6 +453,7 @@
</td>
</tr>
</table>
+ <br />
<table class="table2" align="left" style=" width:1000px;">
<tbody>
@@ -461,12 +500,11 @@
var count = document.getElementById('printCount').value;
var numPerBag = parseInt($("#txtNumberPerBag").val());
- if (isNaN(count)) {
+ if (isNaN(count) || isNaN(numPerBag)) {
- $("#txtBagNum").val(0);
+ /* $("#txtBagNum").val("");*/
}
else {
-
var bagNum = parseInt(count / numPerBag);
$("#txtBagNum").val(bagNum);
}
@@ -476,9 +514,9 @@
var count = document.getElementById('printCount').value;
var bagNum = parseInt($("#txtBagNum").val());
- if (isNaN(count)) {
+ if (isNaN(count) || isNaN(bagNum)) {
- $("#txtNumberPerBag").val(0);
+ /* $("#txtNumberPerBag").val("");*/
}
else {
--
Gitblit v1.9.1