chuanyin-group-project.git

			@@ -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 });
			@@ -264,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>
			@@ -278,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>
			@@ -331,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>
			@@ -342,6 +353,13 @@
			<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;' />

			@@ -369,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>
			@@ -589,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:'撤单管理' })">