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/OrderList.aspx | 69 +++++++++++++++++++++++++++-------
1 files changed, 54 insertions(+), 15 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
index 75d16de..8840546 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
@@ -5,7 +5,7 @@
<head id="Head1" runat="server">
<title>璁㈠崟鍒楄〃</title>
<uc:cmshead id="CMSHead1" runat="server" />
- <script src="../../js/business/Order.js?v=6" type="text/javascript"></script>
+ <script src="../../js/business/Order.js?v=8" type="text/javascript"></script>
<script type="text/javascript">
//璁㈠崟璇勪环
function evaluationModel(orderid) {
@@ -50,7 +50,7 @@
function DeliverWork(orderId, orderCode, orderState) {
- var url = "/Pages/business/DeliverWork.aspx?id=" + orderId;
+ var url = "/Pages/business/DeliverWork.aspx?ids=" + orderId;
url += "&OrderShowId=" + orderCode;
url += "&OrderState=" + orderState;
top.Dialog.open({ URL: url, Title: "閫佽揣", Height: 450, Width: 680 });
@@ -186,6 +186,19 @@
var url = "/Pages/business/Waixiefukuanshenqing.aspx?id=" + orderId + "&&orderno=" + orderno;
top.Dialog.open({ URL: url, Title: "澶栧崗浠樻鐢宠", Height: 600, Width: 580 });
}
+
+
+
+
+ function showProgress() {
+ document.getElementById('progressBar').style.display = 'block';
+
+
+ setTimeout(function () {
+ document.getElementById('progressBar').style.display = 'none';
+ }, 5000); // 10000姣绛変簬10绉�
+
+ }
</script>
<style type="text/css">
.tableStyleXS th { padding: 1px 0 1px 3px; background-image:none; border-bottom:1px solid #CCC; }
@@ -251,13 +264,7 @@
<td>
<input id='txtCustormerName' runat="server" maxlength='50' />
</td>
- <td class="ali03">
- 瀹㈡埛缁忕悊锛�
- </td>
- <td>
- <select keepdefaultstyle='true' id='selCustormerManager' runat="server" datatextfield='Name' datavaluefield='Keyid'>
- </select>
- </td>
+
<td class="ali03">
涓氬姟缁忕悊锛�
</td>
@@ -265,11 +272,24 @@
<select keepdefaultstyle='true' id='selBusinessManager' runat="server" datatextfield='Name' datavaluefield='Keyid'>
</select>
</td>
+ <td class="ali03">
+ 瀹屽伐鐘舵�侊細
+ </td>
+ <td>
+ <select id='selWorkStates' runat="server" keepdefaultstyle="true">
+ <option value="">鍏ㄩ儴</option>
+ <option value="true">宸插畬宸�</option>
+ <option value="false">鏈畬宸�</option>
+ </select>
+ </td>
<td class="ali03">
- 璁㈠崟鐘舵�侊細
+ 閫佽揣鐘舵�侊細
</td>
<td>
- <select keepdefaultstyle='true' id='selOrderStates' runat="server" datatextfield="Name" datavaluefield="MeanValue">
+ <select id='selDeleverStates' runat="server" keepdefaultstyle="true">
+ <option value="">鍏ㄩ儴</option>
+ <option value="true">宸查�佽揣</option>
+ <option value="false">鏈�佽揣</option>
</select>
</td>
</tr>
@@ -318,10 +338,14 @@
</td>
</tr>
<tr>
- <td class="ali03">
+ <td class="ali03">
+ 瀹㈡埛缁忕悊锛�
</td>
- <td>
+ <td>
+ <select keepdefaultstyle='true' id='selCustormerManager' runat="server" datatextfield='Name' datavaluefield='Keyid'>
+ </select>
</td>
+
<td class="ali03"> </td>
<td> </td>
<td class="ali03"> </td>
@@ -329,8 +353,20 @@
<td class="ali03"> </td>
<td> </td>
<td> </td>
+ <td class="ali03" style="display:none;">
+ 璁㈠崟鐘舵�侊細
+ </td>
+ <td style="display:none;">
+ <select keepdefaultstyle='true' id='selOrderStates' runat="server" datatextfield="Name" datavaluefield="MeanValue">
+ </select>
+ </td>
<td>
<asp:button id="btn_Search" text="鏌ヨ" runat="server" /> <input type="button" value='閲嶇疆' onclick='document.body.innerHTML="";window.location=window.location;' />
+
+ <asp:Button ID="Button1" Text="瀵煎嚭" OnClientClick="showProgress();return true;" runat="server" OnClick="btn_Daochu_Click" />
+ <div id="progressBar" style="display:none; position:fixed; top:50%; left:50%; transform:translate(-50%, -50%);border:1px solid black;height:50px;background-color:azure;">
+ 姝ｅ湪瀵煎嚭Excel鏂囦欢锛岃绋嶅��...
+</div>
<input type="hidden" id='txtCommission' runat="server" />
</td>
</tr>
@@ -351,6 +387,9 @@
<div class="box_tool_line">
</div>
<a href="javascript:;" menu_member_case_id="case_ToCompledList" menu_member_case_name="鎵归噺瀹屽伐" onclick="ToCompled();"><span class="icon_edit">鎵归噺瀹屽伐</span></a>
+ <div class="box_tool_line">
+ </div>
+ <a href="javascript:;" menu_member_case_id="case_ToSonghuoList" menu_member_case_name="鎵归噺閫佽揣" onclick="ToDeliverWork();"><span class="icon_edit">鎵归噺閫佽揣</span></a>
<div class="box_tool_line">
</div>
<a href="javascript:;" menu_member_case_id="case_ToPrintAwbOrder" menu_member_case_name="鎵撳嵃閫佽揣鍗�" onclick="ToPrintAwbOrder()"><span class="icon_edit">鎵撳嵃閫佽揣鍗�</span></a>
@@ -571,11 +610,11 @@
</td>
<td class="td_hide" menu_member_case_id="case_CompledWork" menu_member_case_name="瀹屽伐">
<span class="<%#IsCanOpearte(Eval("Keyid"),Eval("OrderState"),Eval("OutId"),"瀹屽伐")?"hand_yes":"hand_no"%>" <%#IsOpearted(Eval("Keyid"), Eval("OrderState"), "瀹屽伐")?"title='宸插畬宸�'":"title='瀹屽伐'"%> style='display: ' onclick="CompledWork(<%#Eval("Keyid")%>)">
- <%#IsOpearted(Eval("Keyid"), Eval("OrderState"), "瀹屽伐") ? "鈭�" : "瀹屽伐"%></span>
+ <%#IsOpearted(Eval("Keyid"), Eval("OrderState"), "瀹屽伐") ? "鈭�" : Eval("Shifoubiaohongwangong")%></span>
</td>
<td class="td_hide" menu_member_case_id="case_DeliverWork" menu_member_case_name="閫佽揣">
<span class="<%#IsCanOpearte(Eval("Keyid"),Eval("OrderState"),Eval("OutId"),"閫佽揣")?"hand_yes":"hand_no"%>" <%#IsOpearted(Eval("Keyid"), Eval("OrderState"), "閫佽揣")?"title='宸查�佽揣'":"title='閫佽揣'"%> style='display: ' onclick='DeliverWork(<%#Eval("Keyid")%>,"<%#Eval("SellerOrderId")%>","<%#Eval("OrderState")%>")'>
- <%#IsOpearted(Eval("Keyid"), Eval("OrderState"), "閫佽揣") ? "鈭�" : "閫佽揣"%></span>
+ <%#IsOpearted(Eval("Keyid"), Eval("OrderState"), "閫佽揣") ? "鈭�" : Eval("Shifoubiaohongsonghuo")%></span>
</td>
<td class="td_hide" menu_member_case_id="case_ShowDoDelay" menu_member_case_name="鎾ゅ崟">
<span class="<%#IsCanOpearte(Eval("Keyid"),Eval("OrderState"),Eval("OutId"),"鎾ゅ崟")?"hand_yes":"hand_no"%>" <%#IsOpearted(Eval("Keyid"), Eval("OrderState"), "鎾ゅ崟")?"title='宸叉挙鍗�'":"title='鎾ゅ崟'"%> style='display: ' onclick="ShowDoDelay({dtypeId:4,defaultarget:'<%#Eval("TradingSingle.PayedMoney", "{0:F}")%>',orderid:<%#Eval("Keyid")%>,orderShowId:'<%#Eval("SellerOrderId")%>',receiver:'<%#Eval("BuyerId")%>',orderState:'<%#Eval("OrderState")%>',orderType:'<%#Eval("OrderTypeId")%>',title:'鎾ゅ崟绠＄悊' })">
--
Gitblit v1.9.1