From f820d227c54e7686d7b582fcd3c1ffcf885b5d31 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 24 一月 2025 12:22:49 +0800
Subject: [PATCH] 审批拒绝的可以修改后再次提交 完成 报销单需要一个编号 EvaluationContent 报销单编号 完成 增加一个状态，保存状态 完成
---
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx | 124 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 119 insertions(+), 5 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
index 72a858e..75d16de 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=5" type="text/javascript"></script>
+ <script src="../../js/business/Order.js?v=6" type="text/javascript"></script>
<script type="text/javascript">
//璁㈠崟璇勪环
function evaluationModel(orderid) {
@@ -27,10 +27,27 @@
top.Dialog.open({ URL: url, Title: "璁㈠崟鍥炶", Height: 400 });
}
+ function Liuyang(orderId) {
+ var url = "/Pages/business/OrderUpLoadLiuyang.aspx?Keyid=" + orderId;
+ top.Dialog.open({ URL: url, Title: "鐣欐牱", Height: 600, Width: 800 });
+ }
+
+
+
function CompledWork(orderId) {
var url = "/Pages/business/CompledWork.aspx?ids=" + orderId;
top.Dialog.open({ URL: url, Title: "瀹屽伐", Height: 300, Width: 680 });
}
+
+ function ShowOrderFengqian(orderId) {
+ top.Dialog.open({ URL: "/Pages/business/AgSealPrint.aspx?orderid=" + orderId, Title: "鎵撳嵃灏佺", Width: 1100, Height: 900 });
+ }
+
+
+ function ShowPlanOrder(orderId) {
+ top.Dialog.open({ URL: "/Pages/business/PlanOrderList.aspx?orderkeyid=" + orderId, Title: "璁″垝璁㈠崟", Width: 1100, Height: 900 });
+ }
+
function DeliverWork(orderId, orderCode, orderState) {
var url = "/Pages/business/DeliverWork.aspx?id=" + orderId;
@@ -118,6 +135,57 @@
}
);
});
+
+
+
+
+ /*
+纭鎵归噺寮�绁ㄧ敵璇�
+*/
+ function ToWaixieFukuan() {
+
+ var ids = '';
+ var ordernos = '';
+ var cks = $("input[name='ckId']:checked");
+ if (cks.length == 0) {
+ alertMsg('娌℃湁閫変腑浠讳綍椤癸紒');
+ return;
+ }
+ else {
+ }
+
+
+
+
+ cks.each(
+ function () {
+ var ckVal = $(this).val();
+
+ var ckValJson = eval('(' + ckVal + ')');
+
+ ids = ids + ',' + ckValJson.id;
+ ordernos = ordernos + ',' + ckValJson.orderId;
+
+
+ }
+ );
+
+
+
+
+
+
+ kaipiaoConfirm(ids, ordernos);
+ //var msg = ('纭寮�绁ㄧ敵璇峰悧?');
+ //top.Dialog.confirm(msg, function () {
+ // DoAcceptAll3(ids);
+ //});
+
+ }
+ function kaipiaoConfirm(orderId,orderno) {
+ var url = "/Pages/business/Waixiefukuanshenqing.aspx?id=" + orderId + "&&orderno=" + orderno;
+ top.Dialog.open({ URL: url, Title: "澶栧崗浠樻鐢宠", Height: 600, Width: 580 });
+ }
</script>
<style type="text/css">
.tableStyleXS th { padding: 1px 0 1px 3px; background-image:none; border-bottom:1px solid #CCC; }
@@ -286,6 +354,9 @@
<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>
+ <%-- <div class="box_tool_line">
+ </div>
+ <a href="javascript:;" onclick="ToWaixieFukuan()"><span class="icon_edit">澶栧崗浠樻鐢宠</span></a>--%>
<div class="clear">
</div>
</div>
@@ -316,9 +387,13 @@
<th width="55">
璁㈠崟绫诲埆
</th>
+ <th style="width:50px;">
+ 鍚堝悓搴忓彿
+ </th>
<th style="text-align: center;">
鍗颁欢鍚嶇О
</th>
+
<th width="36">
鏁伴噺
</th>
@@ -352,6 +427,15 @@
<th width="26" menu_member_case_id="case_ToAccept" menu_member_case_name="鍙楃悊">
鍙楃悊
</th>
+ <th width="26" >
+ 閿佸崟
+ </th>
+ <th width="26" >
+ 璁″垝璁㈠崟
+ </th>
+ <th width="26" >
+ 灏佺
+ </th>
<th width="26" menu_member_case_id="case_CompledWork" menu_member_case_name="瀹屽伐">
瀹屽伐
</th>
@@ -363,6 +447,9 @@
</th>
<th width="26" menu_member_case_id="case_DeferPay" menu_member_case_name="寤舵湡">
寤舵湡
+ </th>
+ <th width="26" menu_member_case_id="case_Liuyang" menu_member_case_name="鐣欐牱">
+ 鐣欐牱
</th>
<th width="26" menu_member_case_id="case_OpenVisit" menu_member_case_name="鍥炶">
鍥炶
@@ -396,7 +483,9 @@
deliverPrice:<%#Eval("SumPrice")%>,
UnitPrice:'<%#Eval("UnitPrice") %>',
sumPrice:<%#Eval("SumPrice")%>,
- DeliveryOrderId:'<%#Eval("DeliveryOrderId")%>',
+ DeliveryOrderId:'<%#Eval("DeliveryOrderId")%>',
+ yssldw: '<%#Eval("OrderExtend.PrintNum")%><%#Eval("yssldw")%>',
+ PrintSizeName:'<%#Eval("PrintSizeName")%>'
}" id='ckBox<%#Container.ItemIndex%>' id='ckBox<%#Container.ItemIndex%>' class='ckBox' />
</td>
<td>
@@ -410,7 +499,7 @@
</td>
<td style="text-align: center;">
<div style="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 > 15 ? (Eval("BuyerName").ToString().Substring(0, 15) + "..") : Eval("BuyerName").ToString()%></a>
+ <a href='javascript:void(0)' title='<%#Eval("BuyerName").ToString()%>' class='a_under' onclick='View("<%#Eval("BuyerId")%>")'><%#Eval("BuyerName").ToString().Length > 22 ? (Eval("BuyerName").ToString().Substring(0, 22) + "..") : Eval("BuyerName").ToString()%></a>
</div>
</td>
<td>
@@ -419,9 +508,17 @@
<td style="text-align: center;">
<%#Eval("PrintType.PrintName")%>
</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 >15? (Eval("DocumentName").ToString().Substring(0,15)+".."):Eval("DocumentName").ToString() %></span>
+ <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>
<%#Eval("OrderExtend.PrintNum")%>
</td>
@@ -459,6 +556,19 @@
<span class="<%#IsCanOpearte(Eval("Keyid"),Eval("OrderState"),Eval("OutId"),"鍙楃悊")?"hand_yes":"hand_no"%>" <%#IsOpearted(Eval("Keyid"), Eval("OrderState"), "鍙楃悊") ?"title='宸插彈鐞�'":"title='鍙楃悊'"%> onclick="ToAccept(<%#Eval("SumPrice" )%>,'<%#Eval("SellerOrderId")%>',<%#Eval("Keyid")%>,<%#Eval("OrderTypeId")%>)">
<%#IsOpearted(Eval("Keyid"), Eval("OrderState"), "鍙楃悊") ? "鈭�" : "鍙楃悊"%></span>
</td>
+ <td >
+ <span <%#"37" == Eval("PrintTypeId").ToString()? "style='display:block;'" : "style='display:none;'" %> <%#true.Equals(Eval("SuodanState"))?"title='宸查攣鍗�'":"title='閿佸崟'"%> onclick="<%#true.Equals(Eval("SuodanState"))?"":"ToSuodan("+Eval("Keyid")+",'"+Eval("SellerOrderId")+"')"%>">
+ <%#true.Equals(Eval("SuodanState")) ? "鈭�" : "閿佸崟"%></span>
+ </td>
+ <td >
+ <span <%#"37" == Eval("PrintTypeId").ToString()? "style='display:block;'" : "style='display:none;'" %> onclick="ShowPlanOrder(<%#Eval("Keyid")%>)">
+ 璁″垝璁㈠崟
+ </td>
+ <td >
+ <%-- <span class="hand look" title="鏌ョ湅鎴栨墦鍗�" onclick='ShowOrder(<%#Eval("Keyid") %>)'>鎵撳嵃</span>--%>
+ <span class="hand_yes" <%#true.Equals(Eval("IsPrintfengqian"))? "title='宸叉墦鍗�'" : "title='鎵撳嵃'"%> onclick='ShowOrderFengqian(<%#Eval("Keyid") %>)'>
+ <%#true.Equals(Eval("IsPrintfengqian")) ? "鈭�" : "鎵撳嵃"%></span>
+ </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>
@@ -475,6 +585,10 @@
<span style='display: ' class='hand_no' <%#true.Equals(Eval("IsDeferPay"))?"title='宸插欢鏈�'":"title=''"%>>
<%#true.Equals(Eval("IsDeferPay")) ? "鈭�" : ""%></span>
</td>
+ <td menu_member_case_id="case_Liuyang" menu_member_case_name="鐣欐牱">
+ <span class="hand_yes" <%#1.Equals(Eval("LiuyangStatus"))?"title='宸茬暀鏍�'":"title=''"%> onclick="Liuyang(<%#Eval("Keyid")%>);" >
+ <%#1.Equals(Eval("LiuyangStatus")) ? "鈭�" : "鐣欐牱"%></span>
+ </td>
<td class="td_hide" menu_member_case_id="case_OpenVisit" menu_member_case_name="鍥炶">
<%-- <span class="hand_yes" title="鍥炶" onclick="dialog.open({URL: '/Pages/business/BackVisitNoteEdit.aspx?id=<%#Eval("Keyid") %>&orderId=<%#Eval("SellerOrderId") %>&buyerName=<%#Eval("BuyerName") %>' , Title: '璁㈠崟鍥炶',Height:400});">鍥炶</span>--%>
<span class="<%#IsCanOpearte(Eval("Keyid"),Eval("OrderState"),Eval("OutId"),"鍥炶")?"hand_yes":"hand_no"%>" <%#true.Equals(Eval("IsVisit"))?"title='宸插洖璁�'":"title='鍥炶'"%> style='display: ' onclick='OpenVisit(<%#Eval("Keyid")%>,"<%#Eval("SellerOrderId")%>","<%#Eval("BuyerName")%>")'>
--
Gitblit v1.9.1