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/OrderListBatchKaipiao.aspx | 57 ++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 42 insertions(+), 15 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchKaipiao.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchKaipiao.aspx
index 30d286e..90fbc38 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchKaipiao.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchKaipiao.aspx
@@ -13,6 +13,11 @@
top.Dialog.open({ URL: url, Title: "寮�绁ㄧ敵璇风‘璁�", Height: 600, Width: 580 });
}
+ function ToInvoicingkehu() {
+ var url = "/Pages/business/kaipiaoKehu.aspx";
+ top.Dialog.open({ URL: url, Title: "棰勪粯娆惧紑绁�", Height: 600, Width: 580 });
+ }
+
//璁㈠崟璇勪环
function evaluationModel(orderid) {
dialog.open({ URL: "/Pages/business/EvaluationSeller.aspx?orderid=" + orderid, Title: "鍗栧璇勪环", Width: 580, Height: 300 });
@@ -190,20 +195,26 @@
<td style="width: 215px">
<input id="txtBeginData" type="text" runat="server" class='date w80px' maxlength='10' />-<input id="txtEndDate" type="text" runat="server" class='date w80px' maxlength='10' />
</td>
+ <td class="ali03">
+ 瀹㈡埛鍚嶇О锛�
+ </td>
+ <td>
+ <input id='txtCustormerName' runat="server" maxlength='50' />
+ </td>
<td class="ali03">
璁㈠崟缂栧彿锛�
</td>
<td>
<input id='txtOrderId' runat="server" maxlength='25' />
</td>
- <td class="ali03">
+ <%--<td class="ali03">
璁㈠崟绫诲瀷锛�
</td>
<td>
<select keepdefaultstyle='true' class=' firstfocus' id='selPrintTypes' runat="server" datatextfield="PrintName" datavaluefield="Keyid">
</select>
</td>
- <%--<td class="ali03">
+ <td class="ali03">
璁㈠崟鏉ユ簮锛�
</td>
<td>
@@ -216,6 +227,7 @@
<td>
<input id='txtCreaterName' runat="server" maxlength='50' />
</td>
+
</tr>
<tr style="padding-left: 50px">
<%--<td class="ali03">
@@ -225,12 +237,7 @@
<select keepdefaultstyle='true' id='selCustormerLevels' runat="server" datatextfield='Name' datavaluefield='Keyid'>
</select>
</td>--%>
- <td class="ali03">
- 瀹㈡埛鍚嶇О锛�
- </td>
- <td>
- <input id='txtCustormerName' runat="server" maxlength='50' />
- </td>
+
<td class="ali03">
瀹㈡埛缁忕悊锛�
</td>
@@ -253,14 +260,31 @@
</select>
</td>--%>
<td class="ali03">
-
+ 鏀舵鐘舵�侊細
+ </td>
+ <td>
+ <select keepdefaultstyle='true' id='selPayStates' runat="server" datatextfield="Name" datavaluefield="MeanValue">
+ </select>
+ </td>
+ <td class="ali03">
+ 寮�绁ㄧ姸鎬�
</td>
<td>
- <asp:button id="btn_Search" text="鏌ヨ" runat="server" /> <input type="button" value='閲嶇疆' onclick='document.body.innerHTML="";window.location=window.location;' />
- <input type="hidden" id='txtCommission' runat="server" />
+ <select keepdefaultstyle='true' id='selKaipiaoshenqing' runat="server" datatextfield="Name" datavaluefield="MeanValue">
+ <option value="" >璇烽�夋嫨</option>
+ <option value="2" >鏈敵璇�</option>
+ <option value="1" >鏈紑绁�</option>
+ <option value="3" >宸插紑绁�</option>
+ </select>
</td>
</tr>
+ <tr>
+ <td colspan="8">
+ <asp:button id="btn_Search" text="鏌ヨ" runat="server" /> <input type="button" value='閲嶇疆' onclick='document.body.innerHTML="";window.location=window.location;' />
+ <input type="hidden" id='txtCommission' runat="server" />
+ </td>
+ </tr>
<%-- <tr>
<td class="ali03">
鏀舵鐘舵�侊細
@@ -318,10 +342,13 @@
<div class="box_tool_line">
</div>--%>
- <a href="javascript:;" menu_member_case_id="case_ToBatchRemoveList" menu_member_case_name="鍘婚櫎璁㈠崟" onclick="ToBatchRemove();"><span class="icon_remove">鍘婚櫎璁㈠崟</span></a>
+ <a href="javascript:;" onclick="ToBatchRemove();"><span class="icon_remove">鍘婚櫎璁㈠崟</span></a>
<div class="box_tool_line">
</div>
- <a href="javascript:;" menu_member_case_id="case_ToBatchInvoicingList" menu_member_case_name="寮�绁ㄧ敵璇�" onclick="ToBatchInvoicingList();"><span class="icon_edit">寮�绁ㄧ敵璇�</span></a>
+ <a href="javascript:;" menu_member_case_id="case_kaipiaoshenqing" menu_member_case_name="寮�绁ㄧ敵璇�" onclick="ToBatchInvoicingList();"><span class="icon_edit">寮�绁ㄧ敵璇�</span></a>
+ <div class="box_tool_line">
+ </div>
+ <a href="javascript:;" menu_member_case_id="case_yufukuanshenqing" menu_member_case_name="棰勪粯娆惧紑绁�" onclick="ToInvoicingkehu();"><span class="icon_edit">棰勪粯娆惧紑绁�</span></a>
<div class="box_tool_line">
</div>
<%-- <a href="javascript:;" menu_member_case_id="case_ToBatchPayList" menu_member_case_name="鎵归噺鏀舵" onclick="ToBatchPayList();"><span class="icon_edit">鎵归噺鏀舵</span></a>
@@ -453,8 +480,8 @@
<%#Eval("SellerOrderId")%></a>--%>
</td>
<td style="text-align: center;">
- <div style="width: 140px; word-wrap: break-word; text-align:justify;">
- <a href='javascript:void(0)' title='鐐瑰嚮鏌ョ湅 <%#Eval("BuyerName").ToString()%> 璧勬枡' class='a_under' onclick='View("<%#Eval("BuyerId")%>")'><%#Eval("BuyerName").ToString().Length > 10 ? (Eval("BuyerName").ToString().Substring(0, 10) + "..") : Eval("BuyerName").ToString()%></a>
+ <div style="width: 210px; word-wrap: break-word; text-align:justify;">
+ <a href='javascript:void(0)' title='鐐瑰嚮鏌ョ湅 <%#Eval("BuyerName").ToString()%> 璧勬枡' class='a_under' onclick='View("<%#Eval("BuyerId")%>")'><%#Eval("BuyerName").ToString().Length > 30 ? (Eval("BuyerName").ToString().Substring(0, 30) + "..") : Eval("BuyerName").ToString()%></a>
</div>
</td>
<td>
--
Gitblit v1.9.1