From 2605af51ca4787434c8c5f2b10dc0adc78a2fdb0 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 14 三月 2025 17:17:45 +0800
Subject: [PATCH] 外协管理，外协订单，你列表操作后面增加一个完工点，完工就进行。就是说，已完工处理好，前面呢，有个批量完工，好检索查询条件，也加个完工。
---
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx | 47 +++++++++++++++++++++++++++++++++++------------
1 files changed, 35 insertions(+), 12 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
index b4e8f50..353778e 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 });
@@ -185,6 +185,19 @@
function kaipiaoConfirm(orderId,orderno) {
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">
@@ -331,6 +344,11 @@
<td> </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 +369,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>
@@ -387,12 +408,13 @@
<th width="55">
璁㈠崟绫诲埆
</th>
- <th style="text-align: center;">
- 鍗颁欢鍚嶇О
- </th>
<th style="width:50px;">
鍚堝悓搴忓彿
</th>
+ <th style="text-align: center;">
+ 鍗颁欢鍚嶇О
+ </th>
+
<th width="36">
鏁伴噺
</th>
@@ -507,15 +529,16 @@
<td style="text-align: center;">
<%#Eval("PrintType.PrintName")%>
</td>
+ <td style="text-align: center;">
+ <div style="word-wrap: break-word; text-align:justify;">
+ <%#Eval("Duiyinghetongbianhao").ToString().Length > 10 ? (Eval("Duiyinghetongbianhao").ToString().Substring(0, 10)) : Eval("Duiyinghetongbianhao").ToString()%>
+ </div>
+ </td>
<td style="text-align: center; color:<%#(Eval("OrderExtend.ExigencyCaseId").ToString()=="-1" && int.Parse(Eval("OrderState").ToString()) <5 && int.Parse(Eval("OrderState").ToString()) > 0)?"red":""%>;">
<span title="<%#Eval("DocumentName")%>"><%#Eval("DocumentName").ToString().Length >22? (Eval("DocumentName").ToString().Substring(0,22)+".."):Eval("DocumentName").ToString() %></span>
</td>
- <td style="text-align: center;">
- <div style="word-wrap: break-word; text-align:justify;">
- <a href='javascript:void(0)' title='<%#Eval("Duiyinghetongbianhao").ToString()%>' class='a_under' onclick='View("<%#Eval("BuyerId")%>")'><%#Eval("Duiyinghetongbianhao").ToString().Length > 5 ? (Eval("Duiyinghetongbianhao").ToString().Substring(0, 5)) : Eval("Duiyinghetongbianhao").ToString()%></a>
- </div>
- </td>
+
<td>
<%#Eval("OrderExtend.PrintNum")%>
@@ -569,11 +592,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