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/DeliverPlanList.aspx | 83 ++++++++++++++++++++++-------------------
1 files changed, 45 insertions(+), 38 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx
index 0f3af0c..3ea3c20 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx
@@ -300,12 +300,13 @@
function ToPrintdelev() {
var DeliveryTime = $("#txtDeliveryTime").val();
var CarId = $("#selCarId").val();
- var DriverId = $("#selDriverId").val();
+ var DriverId = "";
var CustormerName = $("#txtCustormerName").val();
var BusinessManager = $("#selBusinessManager").val();
+ var Paiche = $("#selPaiche").val();
// OpenWindowByUrl();
- OpenWindowByUrl('/Pages/business/DeliverPlanPrint.aspx?DeliverTime=' + DeliveryTime + '&CarId=' + CarId + '&DriverId=' + DriverId + '&CustormerName=' + CustormerName + '&BusinessManager=' + BusinessManager, '', '');
+ OpenWindowByUrl('/Pages/business/DeliverPlanPrint.aspx?DeliverTime=' + DeliveryTime + '&CarId=' + CarId + '&DriverId=' + DriverId + '&CustormerName=' + CustormerName + '&BusinessManager=' + BusinessManager + '&Paiche=' + Paiche, '', '');
}
</script>
<style type="text/css">
@@ -388,13 +389,7 @@
<select keepdefaultstyle='true' id='selCarId' runat="server" datatextfield='CarNumber' datavaluefield='Keyid'>
</select>
</td>
- <td class="ali03" >
- 椹鹃┒鍛橈細
- </td>
- <td >
- <select keepdefaultstyle='true' id='selDriverId' runat="server" datatextfield='Name' datavaluefield='Keyid'>
- </select>
- </td>
+
<td class="ali03">
瀹㈡埛鍗曚綅锛�
@@ -402,7 +397,13 @@
<td>
<input id='txtCustormerName' runat="server" maxlength='50' />
</td>
-
+ <td class="ali03">
+ 涓氬姟缁忕悊锛�
+ </td>
+ <td>
+ <select keepdefaultstyle='true' id='selBusinessManager' runat="server" datatextfield='Name' datavaluefield='Keyid'>
+ </select>
+ </td>
</tr>
<tr>
@@ -421,11 +422,14 @@
<select keepdefaultstyle='true' id='selDriverIddo' runat="server" datatextfield='Name' datavaluefield='Keyid'>
</select>
</td>--%>
- <td class="ali03">
- 涓氬姟缁忕悊锛�
+ <td class="ali03" >
+ 鏄惁娲捐溅锛�
</td>
- <td>
- <select keepdefaultstyle='true' id='selBusinessManager' runat="server" datatextfield='Name' datavaluefield='Keyid'>
+ <td >
+ <select keepdefaultstyle='true' id='selPaiche' runat="server" datatextfield='Name' datavaluefield='Keyid'>
+ <option value="">鍏ㄩ儴</option>
+ <option value="1">鏄�</option>
+ <option value="2">鍚�</option>
</select>
</td>
<td colspan="9">
@@ -434,7 +438,7 @@
<input type="button" value='鏂板閫佽揣' onclick='ToAddorder();' />
<input type="button" value='娲捐溅' onclick='ToAllAccept3();' />
- <input type="button" value='鍗曟嵁绉讳氦' onclick='ToAllAccept4();' />
+ <%-- <input type="button" value='鍗曟嵁绉讳氦' onclick='ToAllAccept4();' /> --%>
<input type="button" value='鎵撳嵃鍏ㄩ儴' onclick='ToPrintdelev();' />
</td>
@@ -495,9 +499,9 @@
<th style="text-align: center;" width="70">
瑕佹眰鍒拌揪鏃堕棿
</th>
- <th style="text-align: center;"width="100">
+ <%-- <th style="text-align: center;"width="100">
瀹為檯鍒拌揪鏃堕棿
- </th>
+ </th>--%>
<th width="70">
涓氬姟缁忕悊
</th>
@@ -510,32 +514,34 @@
<th width="60">
- 璐у崟鏁伴噺
+ 璁㈠崟鏁伴噺
</th>
- <th width="60">
+ <%-- <th width="60">
杞﹁締
</th>
<th width="60">
椹鹃┒鍛�
- </th>
- <th width="200">
- 闂鍙嶉
- </th>
+ </th>--%>
+ <%-- <th width="200">
+ 闂鍙嶉 </th>
+ --%>
+
+
<th width="200">
娉ㄦ剰浜嬮」
</th>
- <th width="200">
+ <%-- <th width="200">
宸ヤ綔鑰冭瘎
</th>
<th width="60">
绉讳氦鐘舵��
- </th>
+ </th>--%>
<th width="60">
鎵撳嵃閫佽揣鍗�
</th>
- <th width="60">
+ <%-- <th width="60">
閫佽揣鍗曞浘鐗�
- </th>
+ </th>--%>
</tr>
</thead>
<tbody>
@@ -553,7 +559,8 @@
</td>
<td>
- <a href='javascript:void(0)' title='鐐瑰嚮淇敼鎺掑簭' class='a_under' onclick='View("<%#Eval("Keyid")%>","<%#Eval("BuyerId")%>","<%#Eval("DeliverTime", "{0:yyyy-MM-dd}")%>","<%#Eval("Sort")%>")'> <%#Eval("Sort")==null?"淇敼鎺掑簭":Eval("Sort")%> </a>
+ <%-- <a href='javascript:void(0)' title='鐐瑰嚮淇敼鎺掑簭' class='a_under' onclick='View("<%#Eval("Keyid")%>","<%#Eval("BuyerId")%>","<%#Eval("DeliverTime", "{0:yyyy-MM-dd}")%>","<%#Eval("Sort")%>")'> <%#Eval("Sort")==null?"淇敼鎺掑簭":Eval("Sort")%> </a> --%>
+ <%#Container.ItemIndex + (UCPager1.PageSize *( UCPager1.PageIndex-1)+1)%>
</td>
<td>
<%#Eval("SellerOrderId")%>
@@ -561,9 +568,9 @@
<td>
<%#Eval("DeliverTime", "{0:yyyy-MM-dd}")%>
</td>
- <td>
+ <%--<td>
<%#Eval("DeliveredTime", "{0:yyyy-MM-dd}")%>
- </td>
+ </td>--%>
<td>
<%#Eval("BusinessManager")%>
</td>
@@ -577,30 +584,30 @@
<td>
<%#Eval("shuliang")%>
</td>
- <td>
+ <%--<td>
<%#Eval("CarName")%>
</td>
<td>
<%#Eval("DriverName")%>
- </td>
- <td>
+ </td>--%>
+ <%-- <td>
<%#Eval("wentifankui")%>
- </td>
+ </td>--%>
<td>
<a href='javascript:void(0)' title='鐐瑰嚮淇敼娉ㄦ剰浜嬮」' class='a_under' onclick='ViewZhuyishixiang("<%#Eval("Keyid")%>","<%#Eval("BuyerId")%>","<%#Eval("DeliverTime", "{0:yyyy-MM-dd}")%>")'> <%#Eval("Zhuyishixiang").ToString()==""?"淇敼娉ㄦ剰浜嬮」":Eval("Zhuyishixiang")%> </a>
</td>
- <td>
+ <%--<td>
<a href='javascript:void(0)' title='鐐瑰嚮淇敼宸ヤ綔鑰冭瘎' class='a_under' onclick='ViewGongzuokaoping("<%#Eval("Keyid")%>","<%#Eval("BuyerId")%>","<%#Eval("DeliverTime", "{0:yyyy-MM-dd}")%>")' ><%#Eval("Gongzuokaoping").ToString()==""?"淇敼宸ヤ綔鑰冭瘎":Eval("Gongzuokaoping")%> </a>
</td>
<td style="text-align: center;">
<%#Eval("TransferName")==null || Eval("TransferName").ToString()==""?"鏈Щ浜�":Eval("TransferName")%>
- </td>
+ </td>--%>
<td>
<a href='javascript:void(0)' title='鎵撳嵃閫佽揣鍗�' class='a_under' onclick='ToPrintDriverorder("<%#Eval("Keyid")%>")'> 鎵撳嵃 </a>
</td>
- <td>
+ <%--<td>
<a href='javascript:void(0)' title='閫佽揣鍗曞浘鐗�' class='a_under' onclick='onViewuplod("<%#Eval("Keyid")%>")'> 閫佽揣鍗曞浘鐗� </a>
- </td>
+ </td>--%>
</tr>
</itemtemplate>
</asp:repeater>
--
Gitblit v1.9.1