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.SQLDAL/EC/EC_OrderBasicDAL.cs | 2
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaiche.aspx | 2
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaiche.aspx.cs | 2
CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx | 146 +++++++++++++++++++++++++++++++++++++++++++++++-
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaicheEdit.aspx | 4
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaicheEdit.aspx.cs | 17 +++++
6 files changed, 162 insertions(+), 11 deletions(-)
diff --git a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
index 469bf31..8ad1113 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
@@ -2075,7 +2075,7 @@
if (string.IsNullOrEmpty(Keyids))
return null;//閿欒鏁版嵁杩斾細绌�
- IList<EC_OrderBasic> result = _dataBase.SelectModel<EC_OrderBasic>("*", "EC_OrderBasic", string.Format(" Keyid in ({0}) and SellerId ='{1}' order by SellerOrderId DESC ", Keyids, FirmId)) as IList<EC_OrderBasic>;//鎵ц鏌ヨ
+ IList<EC_OrderBasic> result = _dataBase.SelectModel<EC_OrderBasic>("*", "EC_OrderBasic", string.Format(" Keyid in ({0}) order by SellerOrderId DESC ", Keyids)) as IList<EC_OrderBasic>;//鎵ц鏌ヨ and SellerId ='{1}' , FirmId
return result;//杩斿洖缁撴灉
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx
index 35ce08d..43b5eac 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx
@@ -5,7 +5,7 @@
<head id="Head1" runat="server">
<title>澶栧崗璁㈠崟</title>
<uc:CMSHead ID="CMSHead1" runat="server" />
- <script src="../../js/business/Order.js" type="text/javascript"></script>
+ <script src="../../js/business/Order.js?v=1" type="text/javascript"></script>
<style type="text/css">
span.hand:hover { text-decoration: underline; }
span.hand_no { display: block; font-size: 14px; font-weight: bold; font-family: 骞煎渾; color: Red; }
@@ -101,6 +101,131 @@
var url = "/Pages/business/Waixiefukuanshenqing.aspx?id=" + orderId + "&&orderno=" + orderno;
top.Dialog.open({ URL: url, Title: "澶栧崗浠樻鐢宠", Height: 600, Width: 580 });
}
+
+
+
+ /*
+纭鍙楃悊
+*/
+ function ToAcceptwaixie(sumPrice, orderShowId, orderId, orderTypeId) {
+ //var commission = parseFloat(document.getElementById('txtCommission').value);
+ //if (isNaN(commission)) return;
+
+ // var html = '';
+ // html += '<div style="padding:15px">';
+ // html += orderTypeId > 0 ? ('纭鍙楃悊璁㈠崟:<b>' + orderShowId + '</b>?') : ('鍙楃悊璁㈠崟:<b>' + orderShowId + '</b>闇�瑕佹敮浠橈骏<b>' + Float2(commission * sumPrice) + '</b>鏈嶅姟璐�,鏄惁纭鍙楃悊锛�<br>');
+ // html += '</div>';
+ // html += '<br/><div style=\'text-align:right;\' ><input type="button" class="button" value="鍙� 鐞�" onclick="DoAccept(' + orderId + ')"/> <input type="button" class="button" value="鍙� 娑�" onclick="parent.dialog.close()"/></div>';
+ // dialog.open({ InnerHtml: html, Title: '纭鍙楃悊', Width: 200, Height: 100, Modal: false });
+
+ var msg ='纭鍙楃悊璁㈠崟:' + orderShowId + '?';
+ top.Dialog.confirm(msg, function () {
+ DoAcceptwaixie(orderId);
+ });
+ }
+
+
+
+
+ /*
+ 澶勭悊鍙楃悊璁㈠崟
+ */
+ var DoAcceptwaixie = function (orderId) {
+ window.submitUrl = "/Pages/business/OrderList.aspx"; //璁剧疆褰撳墠椤电殑鎻愪氦璺緞
+ CallServer({ Target: "AcceptOrder", id: orderId }, function (data, textStatus) {
+ if ('1' == data) {
+ alertMsg('鎿嶄綔鎴愬姛锛�');
+ RefreshDIVOpener(); //鍏抽棴椤甸潰
+ } else {
+ alertMsg('-1' == data ? '鍙楃悊杩囩▼涓彂鐢熷紓甯革紝璇烽噸鏂板彈鐞嗭紒' : '鍙楃悊澶辫触锛�');
+ //dialog.close();
+ }
+ });
+ }
+
+
+ ///鎵归噺鍙楃悊
+ function ToAllAcceptwaixie() {
+ //var commission = parseFloat(document.getElementById('txtCommission').value);
+ //if (isNaN(commission)) return;
+ var ids = '';
+ var cks = $("input[name='ckId']:checked");
+ if (cks.length == 0) { alertMsg('娌℃湁閫変腑浠讳綍椤癸紒'); return; } else { }
+ var isCan = true;
+ var needPrice = false;
+ var price = 0;
+ var orderShowIds = '';
+ cks.each(
+ function () {
+ var ckVal = $(this).val();
+ var ckValJson = eval('(' + ckVal + ')');
+ if (ckValJson.orderState != 1) {
+ isCan = false;
+ return false;
+ }
+ ids = ids + ',' + $(this).attr("value_keyid");
+ orderShowIds = orderShowIds + ',' + ckValJson.ordershowId;
+ //if (ckValJson.orderType < 1) {
+ // needPrice = true;
+ // price += parseFloat(ckValJson.sumPrice) * commission;
+ //}
+ }
+ );
+ if (!isCan) {
+ alertMsg('璇烽�夋嫨鏈彈鐞嗙殑璁㈠崟锛�');
+ }
+ else {
+ if (ids != '') {
+ ids = ids.substring(1);
+ }
+ if (orderShowIds != '') {
+ orderShowIds = orderShowIds.substring(1);
+ }
+ // var html = '';
+ // html += '<p>';
+ // html += !needPrice ? ('纭鎵归噺鍙楃悊鎵�閫�<b>' + orderShowIds + '</b>璁㈠崟?') : ('鍙楃悊鎵�閫夌嚎涓婅鍗曢渶瑕佹敮浠橈骏<b>' + Float2(price) + '</b>鏈嶅姟璐�,鏄惁纭鎵归噺鍙楃悊<b>' + orderShowIds + '</b>璁㈠崟锛�<br>');
+ // html += '</p>';
+ // html += '<br/><div style=\'text-align:right;\' ><input type="button" class="button" value="鍙� 鐞�" onclick="DoAcceptAll(\'' + ids + '\')"/> <input type="button" class="button" value="鍙� 娑�" onclick="parent.dialog.close()"/></span></div>';
+ // dialog.open({ InnerHtml: html, Title: '鎵归噺纭鍙楃悊', Width: 400, Height: 100, Modal: false });
+ var msg = '纭鎵归噺鍙楃悊鎵�閫�' + orderShowIds + '璁㈠崟?';
+ top.Dialog.confirm(msg, function () {
+ DoAcceptAllwaixie(ids);
+ });
+ }
+ }
+
+
+ /*
+鎵归噺澶勭悊鍙楃悊璁㈠崟
+*/
+ var DoAcceptAllwaixie = function (orderIds) {
+ window.submitUrl = "/Pages/business/OrderList.aspx"; //璁剧疆褰撳墠椤电殑鎻愪氦璺緞
+ CallServer({ Target: "AcceptOrderAll", ids: orderIds }, function (data, textStatus) {
+ if ('1' == data) {
+ alertMsg('鎿嶄綔鎴愬姛锛�');
+ RefreshDIVOpener(); //鍏抽棴椤甸潰
+ } else {
+ alertMsg('-1' == data ? '鍙楃悊杩囩▼涓彂鐢熷紓甯革紝璇烽噸鏂板彈鐞嗭紒' : '鍙楃悊澶辫触锛�');
+ //dialog.close();
+ }
+ });
+ }
+
+
+ function CompledWork(orderId) {
+ var url = "/Pages/business/CompledWork.aspx?ids=" + orderId;
+ top.Dialog.open({ URL: url, Title: "瀹屽伐", Height: 300, Width: 680 });
+ }
+
+
+
+ function DeliverWork(orderId, orderCode, orderState) {
+ var url = "/Pages/business/DeliverWork.aspx?ids=" + orderId;
+ url += "&OrderShowId=" + orderCode;
+ url += "&OrderState=" + orderState;
+ top.Dialog.open({ URL: url, Title: "閫佽揣", Height: 450, Width: 680 });
+ }
+
</script>
</head>
<body>
@@ -170,6 +295,16 @@
<a href="javascript:;" menu_member_case_id="case_waixiefukuan" menu_member_case_name="澶栧崗浠樻鐢宠" onclick="ToWaixieFukuan()"><span class="icon_edit">澶栧崗浠樻鐢宠</span></a>
<div class="box_tool_line">
</div>
+
+ <a href="javascript:;" menu_member_case_id="case_ToAllAcceptList" menu_member_case_name="鎵归噺鍙楃悊" onclick="ToAllAcceptwaixie();"><span class="icon_edit">鎵归噺鍙楃悊</span></a>
+ <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 style="color: #666; cursor: inherit;">(濡傛灉澶栧崗缁欑嚎涓婂巶鍟嗙殑璁㈠崟琚彈鐞嗭紝閭ｄ箞姝ゅ鍗忚鍗曚笉鍙啀淇敼锛屼篃涓嶅彲鍒犻櫎銆�)</a>
</div>
</div>
@@ -234,7 +369,8 @@
id:<%#Eval("Keyid")%>,
buyerId:'<%#Eval("BuyerId")%>',
SellerId:'<%#Eval("SellerId")%>',
- orderId:'<%#Eval("SellerOrderId")%>'
+ orderId:'<%#Eval("SellerOrderId")%>',
+ orderState:<%#Eval("OrderState")%>
}" id='ckBox<%#Container.ItemIndex%>' class='ckBox' />
</td>
<td>
@@ -267,15 +403,15 @@
<%#Eval("SumPrice","{0:F2}")%>
</td>
<td style="text-align: center;">
- <span class="<%#IsOpearted(Eval("Keyid"), Eval("OrderState"), "鍙楃悊") ? "hand_yes" : "hand_no"%>">
+ <span class="<%#IsOpearted(Eval("Keyid"), Eval("OrderState"), "鍙楃悊") ? "hand_yes" : "hand_no"%>" <%#IsOpearted(Eval("Keyid"), Eval("OrderState"), "鍙楃悊") ? "" : "onclick=\"ToAcceptwaixie("+Eval("SumPrice" )+",'"+ Eval("SellerOrderId")+"',"+Eval("Keyid")+","+Eval("OrderTypeId")+")\""%> >
<%#IsOpearted(Eval("Keyid"), Eval("OrderState"), "鍙楃悊") ? "鈭�" : "脳"%></span>
</td>
<td style="text-align: center;">
- <span class="<%#IsOpearted(Eval("Keyid"), Eval("OrderState"), "瀹屽伐") ? "hand_yes" : "hand_no"%>">
+ <span class="<%#IsOpearted(Eval("Keyid"), Eval("OrderState"), "瀹屽伐") ? "hand_yes" : "hand_no"%>" <%#IsOpearted(Eval("Keyid"), Eval("OrderState"), "鍙楃悊") ? "onclick=\"CompledWork("+Eval("Keyid")+")\"" : ""%> >
<%#IsOpearted(Eval("Keyid"), Eval("OrderState"), "瀹屽伐") ? "鈭�" : "脳"%></span>
</td>
<td style="text-align: center;">
- <span class="<%#IsOpearted(Eval("Keyid"), Eval("OrderState"), "閫佽揣") ? "hand_yes" : "hand_no"%>">
+ <span class="<%#IsOpearted(Eval("Keyid"), Eval("OrderState"), "閫佽揣") ? "hand_yes" : "hand_no"%>" <%#IsOpearted(Eval("Keyid"), Eval("OrderState"), "鍙楃悊") ? "onclick=\"DeliverWork("+Eval("Keyid" )+",'"+ Eval("SellerOrderId")+"','"+Eval("OrderState")+"')\"" : ""%> >
<%#IsOpearted(Eval("Keyid"), Eval("OrderState"), "閫佽揣") ? "鈭�" : "脳"%></span>
</td>
<td>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaiche.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaiche.aspx
index 21a5f76..3fdb4ea 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaiche.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaiche.aspx
@@ -69,7 +69,7 @@
<td class="ali03 " style="width: 120px;">娉ㄦ剰浜嬮」锛�</td>
<td style=" text-align:left;" colspan="3">
- <textarea id="txtZhuyishixiang" name="txtZhuyishixiang" runat="server" style="width: 402px; height: 30px;" class="req" maxlength="200"></textarea>
+ <textarea id="txtZhuyishixiang" name="txtZhuyishixiang" runat="server" style="width: 402px; height: 30px;" maxlength="200"></textarea>
</td>
</tr>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaiche.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaiche.aspx.cs
index 38b7494..186ca3f 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaiche.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaiche.aspx.cs
@@ -245,7 +245,7 @@
}
oA_DeliverPlanPaiche.Keyid = Keyid;
oA_DeliverPlanPaiche.DeliverTime = this.txtDeliverTime.Value.ToDateTime2();
- oA_DeliverPlanPaiche.Remark = dingdanhao.Trim(',')+"銆�" + this.txtZhuyishixiang.Value;
+ oA_DeliverPlanPaiche.Remark = /*dingdanhao.Trim(',')+"銆�" +*/ this.txtZhuyishixiang.Value;
oA_DeliverPlanPaiche.shuliang = ids.Length;
var oA_DeliverPlans = _OA_DeliverPlanPaicheBLL.GetModelByDeliveredTime(CurrentUser.MemberId, oA_DeliverPlanPaiche.DeliverTime.Value).Max(x=>x.Sort);
if (oA_DeliverPlans.HasValue)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaicheEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaicheEdit.aspx
index 20157c0..ab29beb 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaicheEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaicheEdit.aspx
@@ -162,7 +162,7 @@
鑱旂郴鐢佃瘽锛�
</td>
<td align="left">
- <input id='txtDianhua' class='req' runat="server" maxlength="200" />
+ <input id='txtDianhua' runat="server" maxlength="200" />
</td>
@@ -172,7 +172,7 @@
鏀惰揣鍦板潃锛�
</td>
<td align="left">
- <input id='txtDizhi' class='req' runat="server" maxlength="200" style="width:300px;" />
+ <input id='txtDizhi' runat="server" maxlength="200" style="width:300px;" />
</td>
<td align="right">
閫佽揣鏃堕棿锛�
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaicheEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaicheEdit.aspx.cs
index 9f75ae2..81a37fa 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaicheEdit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaicheEdit.aspx.cs
@@ -34,6 +34,7 @@
OA_CarManageBll _OA_CarManageBll = null;
OA_DeliverPlanPaicheBLL oA_DeliverPlanBLL = null;
+ OA_StaffBLL _OA_StaffBLL = null;
//鍒濆鍖�
public DeliverPlanPaicheEdit()
@@ -42,6 +43,7 @@
_OA_CarManageBll = new OA_CarManageBll();
oA_DeliverPlanBLL = new OA_DeliverPlanPaicheBLL();
+ _OA_StaffBLL = new OA_StaffBLL();
}
@@ -107,9 +109,22 @@
this.selBuyerId.DataSource = corporateClients;
this.selBuyerId.DataBind();
this.selBuyerId.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
+ var oA_CarManages = _OA_CarManageBll.SelectListByFirmId(CurrentUser.MemberId);
+ foreach (var oA_CarManage in oA_CarManages)
+ {
+ if (oA_CarManage.StaffID.HasValue)
+ {
+ var oA_Staff = _OA_StaffBLL.GetModelByKeyid(oA_CarManage.StaffID);
+ if (oA_Staff != null)
+ {
+ oA_CarManage.CarNumber = oA_CarManage.CarNumber + "(" + oA_Staff.Name + ")";
+ }
+ }
+
+ }
- this.selCarId.DataSource = _OA_CarManageBll.SelectListByFirmId(CurrentUser.MemberId);
+ this.selCarId.DataSource = oA_CarManages;
this.selCarId.DataTextField = "CarNumber";
this.selCarId.DataValueField = "Keyid";
this.selCarId.DataBind();
--
Gitblit v1.9.1