From 99ddfbcecf0fa2881eb3a91028257eef87dab6de Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 14 五月 2025 08:46:06 +0800
Subject: [PATCH] 用例注册
---
CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaDetail.aspx | 2
CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj | 8
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanWentiEdit.aspx | 2
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanWentiAdd.aspx.cs | 302 +++++++++
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanWentiAdd.aspx.designer.cs | 89 ++
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx | 10
CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaList.aspx | 4
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanWentiAdd.aspx | 199 ++++++
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanWentiList.aspx | 1146 ++++++++++++++++++------------------
CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaAdd.aspx | 4
CY_ECommercePlatform/CY.BLL/OA/OA_DeliverPlanPaicheBLL.cs | 2
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanWentiList.aspx.cs | 52 -
12 files changed, 1,190 insertions(+), 630 deletions(-)
diff --git a/CY_ECommercePlatform/CY.BLL/OA/OA_DeliverPlanPaicheBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/OA_DeliverPlanPaicheBLL.cs
index b73566c..3a079a2 100644
--- a/CY_ECommercePlatform/CY.BLL/OA/OA_DeliverPlanPaicheBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/OA/OA_DeliverPlanPaicheBLL.cs
@@ -250,7 +250,7 @@
public IEnumerable<OA_DeliverPlan> SelectModelPageWenti(Pagination pa, Guid FirmId,
string DeliveredTimeStart, string DeliveredTimeEnd, string DriverId, string Zerenren , string CustormerName , string Wanjiestatus )
{
- string Condition = " and od.FirmId ='" + FirmId + "' and od.shifouDelivery = 1 and od.DeliveredTime is not null and od.wentifankui is not null and od.wentifankui!='' ";
+ string Condition = " and od.FirmId ='" + FirmId + "' and od.DeliveredTime is not null and od.wentifankui is not null and od.wentifankui!='' "; // and od.shifouDelivery = 1
string sort = "DeliveredTime desc ";
diff --git a/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj b/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
index f525f0d..f38558b 100644
--- a/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
+++ b/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
@@ -1888,6 +1888,7 @@
<Content Include="Pages\business\Baozhengjinfukuan.aspx" />
<Content Include="Pages\business\BaozhengjinCuishou.aspx" />
<Content Include="Pages\business\DeliverPlanDakaList.aspx" />
+ <Content Include="Pages\business\DeliverPlanWentiAdd.aspx" />
<Content Include="Pages\business\DeliverPlanWentiEdit.aspx" />
<Content Include="Pages\business\DeliverPlanPaicheEdit.aspx" />
<Content Include="Pages\business\DeliverPlanFujianShow.aspx" />
@@ -3382,6 +3383,13 @@
<Compile Include="Pages\business\DeliverPlanDakaList.aspx.designer.cs">
<DependentUpon>DeliverPlanDakaList.aspx</DependentUpon>
</Compile>
+ <Compile Include="Pages\business\DeliverPlanWentiAdd.aspx.cs">
+ <DependentUpon>DeliverPlanWentiAdd.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\business\DeliverPlanWentiAdd.aspx.designer.cs">
+ <DependentUpon>DeliverPlanWentiAdd.aspx</DependentUpon>
+ </Compile>
<Compile Include="Pages\business\DeliverPlanWentiEdit.aspx.cs">
<DependentUpon>DeliverPlanWentiEdit.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanWentiAdd.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanWentiAdd.aspx
new file mode 100644
index 0000000..9e3c81e
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanWentiAdd.aspx
@@ -0,0 +1,199 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="DeliverPlanWentiAdd.aspx.cs" Inherits="CY.WebForm.Pages.business.DeliverPlanWentiAdd" %>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head id="Head1" runat="server">
+ <title>璁㈠崟缂栬緫</title>
+ <uc:CMSHead ID="CMSHead1" runat="server" />
+ <!--鍓嶅彴椤甸潰start-->
+ <link rel="stylesheet" type="text/css" href="../../Styles/base.css" />
+ <link href="../../Styles/changes.css" rel="stylesheet" type="text/css" />
+ <link href="../../Styles/ParticularWQJ.css" rel="stylesheet" type="text/css" />
+ <!--鍓嶅彴椤甸潰end-->
+ <script type="text/javascript" language="javascript">
+ function ReBindClients() {
+ $.ajax({
+ url: "/Pages/business/OrderEdit.aspx",
+ type: "POST",
+ dataType: "html",
+ data: { Target: "ReBindClients"},
+ global: false,
+ cache: false,
+ async: false,
+ success: function (data) {
+ $("#selBuyerId").html(data);
+ }
+ });
+ }
+ function custormerChange(sel) {
+
+
+ CallServer({ Target: "GetCommunication", id: sel.value }, function (data, textStatus) {
+ var jobj = false;
+ try {
+ jobj = eval('[' + data + ']')[0];
+ } catch (ex) {
+ global.DealDataException(ex); return;
+ }
+ if (jobj) {
+ /* document.getElementById('txtLianxiren').value = jobj.BusinessManagers;*/
+ //document.getElementById('txtDizhi').value = jobj.Province + jobj.City + jobj.County + jobj.DetailedAddress ;
+ //document.getElementById('txtDianhua').value = jobj.CompanyPhone;
+ document.getElementById('txtCompanyName').value = jobj.CompanyName;
+ } else;
+ });
+ }
+
+
+
+
+ //涓篠elect鏂板杩囨护鍔熻兘
+ function SelectAddSearch() {
+ $("select[SelInputHtml='True']").each(function (i, v) {
+ $(this).unbind("blur");
+ var old = $(this).html();
+ var oldObject = $(this).clone();
+ var sign = "selectS" + i;
+ $(v).attr("sign", sign);
+
+ var inputClass = "input_" + sign;
+ var html = "<span style='margin-left:10px'>杩囨护锛�</span><input type='text' class='" + inputClass + "' style='width:80px;height:18px;line-height:18px;'/>";
+ $(v).after(html);
+ $("." + inputClass).blur(function () {
+ var nowval = $(this).val().trim();
+ var output = "";
+ if (nowval == "" || nowval == null) {
+ output = old;
+ } else {
+ output += "<option value=''>璇烽�夋嫨</option>";
+ var valueArr = new Array();
+ oldObject.find("option").each(function (ii, vv) {
+
+ var value = $.trim($(vv).attr("value"));
+ var text = $.trim($(vv).text());
+
+ if (text.indexOf(nowval) >= 0)
+ valueArr.push(value + "|||" + text);
+ });
+ for (var ss in valueArr) {
+ var s = valueArr[ss];
+ if (s.split("|||").length == 2) {
+ var value1 = s.split("|||")[0];
+ var text1 = s.split("|||")[1];
+ output += "<option value='" + value1 + "'>" + text1 + "</option>";
+ }
+ }
+ }
+ $(v).html(output);
+ });
+ });
+ }
+
+ window.FastKeyDistinctived = true; //渚嬪蹇嵎閿�(涓嶄娇鐢ㄩ�氱敤蹇嵎閿�)
+ var keyDownHook = new KeyBehaviorHook('keydown');
+ keyDownHook.Regist(window.Keys.S, "ClickElement('btnSave')", window.WithKey.Ctrl); //Ctrl+s 淇濆瓨
+ keyDownHook.Regist(window.Keys.Enter, "ClickElement('btnSave')", window.WithKey.Ctrl); //Ctrl+Enter 淇濆瓨
+ keyDownHook.Regist(window.Keys.R, "ClickElement('btnReset')", window.WithKey.Ctrl); //Ctrl+R 閲嶇疆
+ keyDownHook.Regist(window.Keys.Q, "ClickElement('btnBackList')", window.WithKey.Ctrl); //Ctrl+Q 閫�鍑�(Quit)
+
+ $(function () {
+ SelectAddSearch();
+ keyDownHook.Binding();
+ global.SetReqMsg();
+
+ });
+
+
+
+
+ </script>
+
+</head>
+<body style='padding: 0; margin: 0;'>
+ <form id="form1" runat="server" style='padding: 0; margin: 0;' class='form2'>
+
+
+ <table class="table2" id="tbBasic">
+ <thead>
+ <tr>
+ <th colspan="8">
+ 鍩烘湰淇℃伅
+ </th>
+ </tr>
+ </thead>
+ <tr style=" height:1px;">
+ <td style="border:none;width: 100px;">
+ </td>
+ <td style="border:none; width:300px;">
+ </td>
+ <td style="border:none;width: 100px;">
+ </td>
+ <td style="border:none;">
+ </td>
+
+ </tr>
+ <tr>
+ <td align="right">
+ 鍙嶉浜猴細
+ </td>
+ <td align="left" colspan="3">
+ <select keepdefaultstyle='true' id='selFankuiren' runat="server" datatextfield='Name' datavaluefield='Keyid' class="Sreq">
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td align="right">
+ 瀹㈡埛鍗曚綅锛�
+ </td>
+ <td align="left">
+
+ <span id='spnCustormerControl'><select id='selBuyerId' runat="server" keepdefaultstyle='true' datavaluefield='MemberId' datatextfield='CompanyName' onchange='custormerChange(this)' selinputhtml="True" sign="" style=" width:123px;"></select>
+ <%--<input type="button" value='鏂板' keepdefaultstyle='true' onclick="top.Dialog.open({ URL: '/Pages/business/CorporateClientsEdit.aspx', Title: '鏂板瀹㈡埛', Width: 900, Height: 680});" />--%>
+ </span>
+
+ </td>
+ <td align="right">
+ 瀹㈡埛鍗曚綅锛�
+ </td>
+ <td align="left">
+ <input id='txtCompanyName' runat="server" maxlength="200" class='Sreq' style="width:200px;" />
+ </td>
+ </tr>
+
+
+
+
+ <tr>
+ <td style="width: 100px; text-align:right;">
+ 闂鎻忚堪锛�
+ </td>
+ <td style=" text-align:left;" colspan="3">
+ <textarea id="txtRemark" name="txtRemark" runat="server" style="width: 692px; height: 30px;" maxlength="200" class="req" ></textarea>
+ </td>
+ </tr>
+
+
+
+ <tr>
+ <td class="contentLeft" colspan="4" style=" padding-left:300px;">
+ <asp:Button ID="btnSaves" runat="server" Text="淇濆瓨鍙嶉" OnClick="btnSave_ServerClick" />
+
+
+
+
+
+ </td>
+ </tr>
+ </table>
+
+
+
+ </form>
+
+</body>
+<script type="text/javascript" language="javascript">
+
+
+
+</script>
+</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanWentiAdd.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanWentiAdd.aspx.cs
new file mode 100644
index 0000000..dafd901
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanWentiAdd.aspx.cs
@@ -0,0 +1,302 @@
+锘�/**
+* OrderEdit.aspx.cs
+*
+* 鍔� 鑳斤細 璁㈠崟鍒楄〃
+* 绫� 鍚嶏細 OrderEdit
+*
+* Ver 鍙樻洿鏃ユ湡 璐熻矗浜� 鍙樻洿鍐呭
+* 鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�
+* V0.01 2013-5-8 13:55 鍚村磶鍧� 鍒濈増
+* V0.02 2013-5-8 15:47 鍚村磶鍧� 瀹炵幇涓嬫媺鏁版嵁缁戝畾涓庢暟鎹骇鑱�
+* V0.03 2013-5-8 18:00 鍚村磶鍧� 鍒濇瀹屾垚鏂板绾夸笅璁㈠崟(鏈皟璇�)
+*
+*/
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using CY.BLL.Sys;
+using CY.BLL;
+using CY.Model;
+using CY.Infrastructure.Common;
+using CY.WebForm.Pages.common;
+using CY.BLL.EC;
+using CY.Model.Inquiry;
+
+namespace CY.WebForm.Pages.business
+{
+ public partial class DeliverPlanWentiAdd : BasePage
+ {
+ public int Orderid = 0;
+ public int printNum = 0;
+
+ OA_CarManageBll _OA_CarManageBll = null;
+ OA_DeliverPlanPaicheBLL oA_DeliverPlanBLL = null;
+ OA_StaffBLL _OA_StaffBLL = null;
+
+ //鍒濆鍖�
+ public DeliverPlanWentiAdd()
+ {
+
+
+ _OA_CarManageBll = new OA_CarManageBll();
+ oA_DeliverPlanBLL = new OA_DeliverPlanPaicheBLL();
+ _OA_StaffBLL = new OA_StaffBLL();
+
+
+ }
+
+ /// <summary>
+ /// 椤甸潰鍔犺浇浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ try
+ {
+ switch (Request["Target"])
+ {
+ case "GetCommunication":
+ LoadCommunication();
+ break;
+ case "ReBindClients":
+ Response.Write(ReLoadClients());
+ break;
+
+ default:
+ Page_Load_Default();
+ return;
+ }
+ }
+ catch (Exception ex)
+ {
+ PAGEHandleException(ex);
+ Response.Clear();
+ //Response.Write("-1");
+ Response.Write(ex.Message);
+ }
+ Response.End();
+ }
+
+
+
+ /// <summary>
+ /// 榛樿鎵ц鏂规硶
+ /// </summary>
+ private void Page_Load_Default()
+ {
+
+
+
+ if (!IsPostBack && !IsCallback)
+ {
+
+ Sys_DictionaryBLL _sys_DictionaryBLL = new Sys_DictionaryBLL();//瀛楀吀涓氬姟閫昏緫鎿嶄綔绫诲璞�
+ SysInquiry_PrintingTypeBLL _sysInquiry_PrintingTypeBLL = new SysInquiry_PrintingTypeBLL();//鍗板埛涓氬姟绫诲瀷涓氬姟閫昏緫鎿嶄綔绫诲璞�
+ OA_CorporateClientsBLL _oA_CorporateClientsBLL = new OA_CorporateClientsBLL();
+ EC_OrderBasicBLL _eC_OrderBasicBLL = new EC_OrderBasicBLL();
+
+
+
+ IList<OA_CorporateClients> corporateClients = _oA_CorporateClientsBLL.SelectListByFirmId(CurrentUser.MemberId) as IList<OA_CorporateClients>;
+ if (null != corporateClients)
+ {
+ corporateClients.Where(cc => CurrentUser.MemberId.Equals(cc.MemberId) && corporateClients.Remove(cc));
+ }
+ this.selBuyerId.DataSource = corporateClients;
+ this.selBuyerId.DataBind();
+ this.selBuyerId.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
+
+
+ var oA_Staffs = _OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId,false,false);
+
+
+ this.selFankuiren.DataSource = oA_Staffs;
+ this.selFankuiren.DataTextField = "Name";
+ this.selFankuiren.DataValueField = "Keyid";
+ this.selFankuiren.DataBind();
+ this.selFankuiren.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
+
+ this.selFankuiren.Value = CurrentUser.StaffId.Value.ToString();
+
+
+
+
+
+
+ }
+ }
+
+ /// <summary>
+ /// 淇濆瓨鐐瑰嚮浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ protected void btnSave_ServerClick(object sender, EventArgs e)
+ {
+
+ if (SaveOrder())
+ {
+ //鎿嶄綔鎴愬姛
+ JavaScript.MessageBox("鎿嶄綔鎴愬姛", this, true,true);
+ }
+ else
+ {
+ //鎿嶄綔澶辫触
+ JavaScript.MessageBox("鎿嶄綔澶辫触", this);
+ }
+ }
+
+
+
+
+
+ /// <summary>
+ /// 鍔犺浇瀹㈡埛鑱旂郴鏂瑰紡
+ /// </summary>
+ private void LoadCommunication()
+ {
+ Response.Clear();
+ string id = Request["id"];
+ if (string.IsNullOrEmpty(id))
+ {
+ Response.Write("-2");
+ return;
+ }
+
+ OA_CorporateClientsBLL _oA_CorporateClientsBLL = new OA_CorporateClientsBLL();
+ OA_CorporateClients m_OA_CorporateClients = _oA_CorporateClientsBLL.SelectModelByFirmIdandMemberId(CurrentUser.MemberId, id.ToGuid2());
+ OA_CustomerCommunications _oA_CustomerCommunications = _oA_CorporateClientsBLL.GetModel_CustomerCommunications(m_OA_CorporateClients.Keyid);
+ _oA_CustomerCommunications.DegreeImportanId = m_OA_CorporateClients.DegreeImportanId;
+ _oA_CustomerCommunications.AccountManagerId = m_OA_CorporateClients.AccountManagerId;
+ _oA_CustomerCommunications.BusinessManagerId = m_OA_CorporateClients.BusinessManagerId;
+ _oA_CustomerCommunications.CompanyName = m_OA_CorporateClients.CompanyName;
+ Response.Write(null == _oA_CustomerCommunications ? "" : JsonHelper.GetJsonStringByObject(_oA_CustomerCommunications));
+ }
+
+
+
+
+
+
+
+ /// <summary>
+ /// 淇濆瓨璁㈠崟
+ /// </summary>
+ private bool SaveOrder()
+ {
+
+
+ bool isWin = false;
+ try
+ {
+ var keyid = Request["keyid"];
+ EC_OrderBasicBLL _eC_OrderBasicBLL = new EC_OrderBasicBLL();
+
+ OA_CorporateClientsBLL _oA_CorporateClientsBLL = new OA_CorporateClientsBLL();
+
+ string SellerOrderId = "";
+
+
+
+
+
+ OA_DeliverPlan oA_DeliverPlan = new OA_DeliverPlan();
+ oA_DeliverPlan.Lianxiren = "";
+ oA_DeliverPlan.Keyid = Guid.NewGuid();
+ oA_DeliverPlan.FirmId = CurrentUser.MemberId;
+ oA_DeliverPlan.DeliverTime = DateTime.Now;
+ oA_DeliverPlan.DeliveredTime = oA_DeliverPlan.DeliverTime;
+ if (string.IsNullOrWhiteSpace(this.selBuyerId.Value))
+ {
+ oA_DeliverPlan.BuyerId = Guid.Empty;
+ oA_DeliverPlan.BusinessManagerId = 0;
+ oA_DeliverPlan.Biddingcompany = 0;
+
+ }
+ else
+ {
+ oA_DeliverPlan.BuyerId = this.selBuyerId.Value.ToGuid2();
+ OA_CorporateClients oA_CorporateClients = _oA_CorporateClientsBLL.SelectModelByFirmIdandMemberId(CurrentUser.MemberId, this.selBuyerId.Value.ToGuid2());
+ oA_DeliverPlan.BusinessManagerId = oA_CorporateClients.BusinessManagerId ?? 0;
+ oA_DeliverPlan.Biddingcompany = oA_CorporateClients.Biddingcompany ?? 0;
+
+ }
+
+ //oA_DeliverPlan.DeliveredTime = null;
+ oA_DeliverPlan.Zhuyishixiang = "";
+ oA_DeliverPlan.Gongzuokaoping = "";
+ oA_DeliverPlan.CarId = 0;
+ oA_DeliverPlan.DriverId = this.selFankuiren.Value.ToInt32();
+
+
+
+ oA_DeliverPlan.Transferstatus = 1;
+ oA_DeliverPlan.TransfersTime = null;
+ oA_DeliverPlan.Sort = 1;
+ oA_DeliverPlan.Creater = CurrentUser.TrueMemberId;
+ oA_DeliverPlan.CreateTime = DateTime.Now;
+ oA_DeliverPlan.Updater = CurrentUser.TrueMemberId;
+ oA_DeliverPlan.LastUpdateTime = DateTime.Now;
+ oA_DeliverPlan.SellerOrderId = SellerOrderId;
+ oA_DeliverPlan.Dianhua = "";
+ oA_DeliverPlan.Dizhi = "";
+ oA_DeliverPlan.wentifankui = this.txtRemark.Value;
+ oA_DeliverPlan.Remark = "";
+ oA_DeliverPlan.shifouDelivery = 0;
+ oA_DeliverPlan.CompanyName = this.txtCompanyName.Value;
+
+ isWin = oA_DeliverPlanBLL.InsertModel(oA_DeliverPlan);
+
+
+
+ }
+ catch (Exception ex)
+ {
+ isWin = false;
+ }
+
+
+
+
+
+ return isWin;
+ }
+
+
+
+ /// <summary>
+ /// 閲嶆柊鍔犺浇瀹㈡埛鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ private string ReLoadClients()
+ {
+ try
+ {
+ string res = "<option value=''>璇烽�夋嫨</option>";
+ OA_CorporateClientsBLL bll_OA_CorporateClientsBLL = new OA_CorporateClientsBLL();
+ IList<OA_CorporateClients> m_OA_CorporateClientsList = bll_OA_CorporateClientsBLL.SelectListByFirmId(CurrentUser.MemberId) as IList<OA_CorporateClients>;
+ if (null != m_OA_CorporateClientsList)
+ {
+ m_OA_CorporateClientsList.Where(cc => CurrentUser.MemberId.Equals(cc.MemberId) && m_OA_CorporateClientsList.Remove(cc));
+ if (m_OA_CorporateClientsList.Count > 0)
+ {
+ foreach (var m_OA_CorporateClients in m_OA_CorporateClientsList)
+ {
+ res = res + ("<option value='" + m_OA_CorporateClients.MemberId + "'>" + m_OA_CorporateClients.CompanyName + "</option>");
+ }
+ }
+ }
+ return res;
+ }
+ catch (Exception ex)
+ {
+ PAGEHandleException(ex);
+ return "";
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanWentiAdd.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanWentiAdd.aspx.designer.cs
new file mode 100644
index 0000000..f8e482f
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanWentiAdd.aspx.designer.cs
@@ -0,0 +1,89 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.business
+{
+
+
+ public partial class DeliverPlanWentiAdd
+ {
+
+ /// <summary>
+ /// Head1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
+
+ /// <summary>
+ /// CMSHead1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
+
+ /// <summary>
+ /// form1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+ /// <summary>
+ /// selFankuiren 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selFankuiren;
+
+ /// <summary>
+ /// selBuyerId 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selBuyerId;
+
+ /// <summary>
+ /// txtCompanyName 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtCompanyName;
+
+ /// <summary>
+ /// txtRemark 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlTextArea txtRemark;
+
+ /// <summary>
+ /// btnSaves 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Button btnSaves;
+ }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanWentiEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanWentiEdit.aspx
index c8e190e..96e7cab 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanWentiEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanWentiEdit.aspx
@@ -135,7 +135,7 @@
<tr>
<td align="right">
- 鍙嶉闂锛�
+ 闂鎻忚堪锛�
</td>
<td align="left" colspan="3">
<span id="spnwentifankui" runat="server" > </span>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanWentiList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanWentiList.aspx
index 771417a..4d7e123 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanWentiList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanWentiList.aspx
@@ -1,582 +1,564 @@
-锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="DeliverPlanWentiList.aspx.cs" Inherits="CY.WebForm.Pages.business.DeliverPlanWentiList" %>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head id="Head1" runat="server">
- <title>璁㈠崟鍒楄〃</title>
- <uc:cmshead id="CMSHead1" runat="server" />
- <%-- <script src="../../js/business/Order.js" type="text/javascript"></script>--%>
- <script type="text/javascript">
- //宸ヤ綔鑰冭瘎
- function View(Keyid, BuyerId, DeliverTime,Sort) {
- //if (Keyid == '00000000-0000-0000-0000-000000000000') {
- // alert("璇峰厛瀹夋帓閫佽揣锛�");
- // return;
- //}
-
- top.Dialog.open({ URL: "/Pages/business/DeliverPlanSort.aspx?Keyid=" + Keyid + "&BuyerId=" + BuyerId + "&DeliverTime=" + DeliverTime + "&Sort=" + Sort, Title: "閫佽揣瀹夋帓鎺掑簭", Width: 300, Height: 300 });
- }
-
- //宸ヤ綔鑰冭瘎
- function ViewZhuyishixiang(Keyid, BuyerId, DeliverTime) {
- //if (Keyid == '00000000-0000-0000-0000-000000000000') {
- // alert("璇峰厛瀹夋帓閫佽揣锛�");
- // return;
- //}
-
- top.Dialog.open({ URL: "/Pages/business/DeliverPlanPaicheZhuyishixiang.aspx?Keyid=" + Keyid + "&BuyerId=" + BuyerId + "&DeliverTime=" + DeliverTime , Title: "閫佽揣瀹夋帓娉ㄦ剰浜嬮」", Width: 800, Height: 300 });
- }
-
- //宸ヤ綔鑰冭瘎
- function ViewGongzuokaoping(Keyid, BuyerId, DeliverTime) {
- //if (Keyid == '00000000-0000-0000-0000-000000000000') {
- // alert("璇峰厛瀹夋帓閫佽揣锛�");
- // return;
- //}
-
- top.Dialog.open({ URL: "/Pages/business/DeliverPlanGongzuokaoping.aspx?Keyid=" + Keyid + "&BuyerId=" + BuyerId + "&DeliverTime=" + DeliverTime , Title: "閫佽揣瀹夋帓宸ヤ綔鑰冭瘎", Width: 800, Height: 300 });
- }
-
-
- //閫佽揣瀹夋帓
- function ToAddorder() {
- top.Dialog.open({ URL: "/Pages/business/DeliverPlanPaicheEdit.aspx", Title: "鏂板閫佽揣鍗�", Width: 900, Height: 750 });
- }
- //杩借矗
- function Xiugai(keyid) {
- top.Dialog.open({ URL: "/Pages/business/DeliverPlanWentiEdit.aspx?keyid=" + keyid, Title: "杩借矗", Width: 900, Height: 750 });
- }
-
-
- //閫佽揣瀹夋帓
- function outAfterWorks(Keyid, BuyerId, DeliveredTime) {
- top.Dialog.open({ URL: "/Pages/business/OrderProductionprogress.aspx?SellerOrderId=" + SellerOrderId + "&Keyid=" + Keyid + "&works=" + works, Title: works, Width: 300, Height: 300 });
- }
- //鎵撳嵃
- function outAfterWorks(Keyid) {
- if (Keyid == '00000000-0000-0000-0000-000000000000') {
- alert("璇峰厛瀹夋帓閫佽揣锛�");
- return;
- }
- top.Dialog.open({ URL: "/Pages/business/DeliverPlanPrint.aspx?Keyid=" + Keyid + "&DelayTime=2021-04-09", Title: "宸ヤ綔鑰冭瘎", Width: 1000, Height: 800 });
- }
-
- ///鎵归噺鍙楃悊
- function ToAllAccept1() {
-
- var ids = '';
- var cks = $("input[name='ckId']:checked");
- if (cks.length == 0) { alertMsg('娌℃湁閫変腑浠讳綍椤癸紒'); return; } else { }
- var isCan = true;
- var DeliverTime = '';
- var BuyerId = '';
-
-
-
- cks.each(
- function () {
- var ckVal = $(this).val();
-
- var ckValJson = eval('(' + ckVal + ')');
-
- ids = ids + ',' + ckValJson.id;
- //orderShowIds = orderShowIds + ',' + ckValJson.ordershowId;
-
- DeliverTime = DeliverTime + ',' + ckValJson.DeliverTime;
- BuyerId = BuyerId + ',' + ckValJson.BuyerId;
- }
- );
-
-
- if (!isCan) {
- // alertMsg('璇烽�夋嫨鏈彈鐞嗙殑璁㈠崟锛�');
- }
- else {
- if (ids != '') {
- ids = ids.substring(1);
- DeliverTime = DeliverTime.substring(1);
- BuyerId = BuyerId.substring(1);
- }
-
- var msg = ('纭绉讳氦鍗曟嵁鍚�?') ;
- top.Dialog.confirm(msg, function () {
- DoAcceptAll(ids, DeliverTime, BuyerId);
- });
- }
- }
-
- /*
-鎵归噺澶勭悊鍙楃悊璁㈠崟
-*/
- var DoAcceptAll = function (orderIds, DeliverTime, BuyerId) {
- CallServer({ Target: "AcceptOrderAll", ids: orderIds, DeliverTimes: DeliverTime, BuyerIds: BuyerId }, function (data, textStatus) {
- if ('1' == data) {
- alertMsg('鎿嶄綔鎴愬姛锛�');
- RefreshDIVOpener(); //鍏抽棴椤甸潰
- } else {
- alertMsg('-1' == data ? '绉讳氦鍗曟嵁澶辫触锛�' : '绉讳氦鍗曟嵁澶辫触锛�');
- //dialog.close();
- }
- });
- }
-
-
- ///鎵归噺鍙楃悊
- function ToAllAccept3() {
-
- var ids = '';
- var cks = $("input[name='ckId']:checked");
- if (cks.length == 0) { alertMsg('娌℃湁閫変腑浠讳綍椤癸紒'); return; } else { }
- var isCan = true;
- var DeliverTime = '';
- var BuyerId = '';
-
- //var carid = $("#selCarIddo").val();
- //var driverid = $("#selDriverIddo").val();
-
- //if (carid == "") { alertMsg('璇烽�夋嫨杞﹁締锛�'); return; } else { }
- //if (driverid == "") { alertMsg('璇烽�夋嫨椹鹃┒鍛橈紒'); return; } else { }
-
- cks.each(
- function () {
- var ckVal = $(this).val();
-
- var ckValJson = eval('(' + ckVal + ')');
-
- ids = ids + ',' + ckValJson.id;
- //orderShowIds = orderShowIds + ',' + ckValJson.ordershowId;
-
- DeliverTime = DeliverTime + ',' + ckValJson.DeliverTime;
- BuyerId = BuyerId + ',' + ckValJson.BuyerId;
- }
- );
-
-
- if (!isCan) {
- // alertMsg('璇烽�夋嫨鏈彈鐞嗙殑璁㈠崟锛�');
- }
- else {
- if (ids != '') {
- ids = ids.substring(1);
- //DeliverTime = DeliverTime.substring(1);
- //BuyerId = BuyerId.substring(1);
- }
-
- top.Dialog.open({ URL: "/Pages/business/DeliverPlanPaiche.aspx?ids=" + ids, Title: "瀹夋帓杞﹁締", Width: 600, Height: 300 });
- }
- }
-
-
-
- //宸ヤ綔鑰冭瘎
- function danjuyijiao(Keyid, Transferstatus) {
-
-
- top.Dialog.open({ URL: "/Pages/business/DeliverPlanYijiao.aspx?ids=" + Keyid, Title: "鍗曟嵁绉讳氦", Width: 600, Height: 300 });
- }
-
- //宸ヤ綔鑰冭瘎
- function wanjie(Keyid) {
-
- var msg = ('纭瀹岀粨鍚�?');
- top.Dialog.confirm(msg, function () {
- top.Dialog.open({ URL: "/Pages/business/DeliverPlanWentiEdit.aspx?Target=wanjie&&keyid=" + Keyid, Title: "瀹岀粨", Width: 600, Height: 300 });
- });
-
-
-
- }
-
-
-
- ///鎵归噺鍙楃悊
- function ToAllAccept4() {
-
- var ids = '';
- var cks = $("input[name='ckId']:checked");
- if (cks.length == 0) { alertMsg('娌℃湁閫変腑浠讳綍椤癸紒'); return; } else { }
- var isCan = true;
- var DeliverTime = '';
- var BuyerId = '';
-
- //var carid = $("#selCarIddo").val();
- //var driverid = $("#selDriverIddo").val();
-
- //if (carid == "") { alertMsg('璇烽�夋嫨杞﹁締锛�'); return; } else { }
- //if (driverid == "") { alertMsg('璇烽�夋嫨椹鹃┒鍛橈紒'); return; } else { }
-
- cks.each(
- function () {
- var ckVal = $(this).val();
-
- var ckValJson = eval('(' + ckVal + ')');
-
- ids = ids + ',' + ckValJson.id;
- //orderShowIds = orderShowIds + ',' + ckValJson.ordershowId;
-
- DeliverTime = DeliverTime + ',' + ckValJson.DeliverTime;
- BuyerId = BuyerId + ',' + ckValJson.BuyerId;
- }
- );
-
-
- if (!isCan) {
- // alertMsg('璇烽�夋嫨鏈彈鐞嗙殑璁㈠崟锛�');
- }
- else {
- if (ids != '') {
- ids = ids.substring(1);
- //DeliverTime = DeliverTime.substring(1);
- //BuyerId = BuyerId.substring(1);
- }
-
- top.Dialog.open({ URL: "/Pages/business/DeliverPlanYijiao.aspx?ids=" + ids, Title: "鍗曟嵁绉讳氦", Width: 600, Height: 300 });
- }
- }
-
-
-
-
- ///鎵归噺鍙楃悊
- function ToAllAccept2() {
-
- var ids = '';
- var cks = $("input[name='ckId']:checked");
- if (cks.length == 0) { alertMsg('娌℃湁閫変腑浠讳綍椤癸紒'); return; } else { }
- var isCan = true;
- var DeliverTime = '';
- var BuyerId = '';
-
- var carid = $("#selCarIddo").val();
- var driverid = $("#selDriverIddo").val();
-
- if (carid == "") { alertMsg('璇烽�夋嫨杞﹁締锛�'); return; } else { }
- if (driverid == "") { alertMsg('璇烽�夋嫨椹鹃┒鍛橈紒'); return; } else { }
-
- cks.each(
- function () {
- var ckVal = $(this).val();
-
- var ckValJson = eval('(' + ckVal + ')');
-
- ids = ids + ',' + ckValJson.id;
- //orderShowIds = orderShowIds + ',' + ckValJson.ordershowId;
-
- DeliverTime = DeliverTime + ',' + ckValJson.DeliverTime;
- BuyerId = BuyerId + ',' + ckValJson.BuyerId;
- }
- );
-
-
- if (!isCan) {
- // alertMsg('璇烽�夋嫨鏈彈鐞嗙殑璁㈠崟锛�');
- }
- else {
- if (ids != '') {
- ids = ids.substring(1);
- DeliverTime = DeliverTime.substring(1);
- BuyerId = BuyerId.substring(1);
- }
-
- var msg = ('纭娲捐溅鍚�?');
- top.Dialog.confirm(msg, function () {
- DoAcceptAll2(ids, DeliverTime, BuyerId, carid, driverid);
- });
- }
- }
-
- /*
-鎵归噺澶勭悊鍙楃悊璁㈠崟
-*/
- var DoAcceptAll2 = function (orderIds, DeliverTime, BuyerId, carid, driverid) {
- CallServer({ Target: "AcceptOrderAll2", ids: orderIds, DeliverTimes: DeliverTime, BuyerIds: BuyerId, Carid: carid, Driverid: driverid}, function (data, textStatus) {
- if ('1' == data) {
- alertMsg('鎿嶄綔鎴愬姛锛�');
- RefreshDIVOpener(); //鍏抽棴椤甸潰
- } else {
- alertMsg('-1' == data ? '娲捐溅澶辫触锛�' : '娲捐溅澶辫触锛�');
- //dialog.close();
- }
- });
- }
-
-
- /*
-鎵撳嵃閫佽揣鍗�
-*/
- function ToPrintDriverorder(DriverId) {
-
- OpenWindowByUrl('/Pages/business/DeliverOrderPrint.aspx?deliverorderId=' + DriverId, '', '');
- }
-
-
-
-
- //缁存姢
- function onViewuplod(keyid) {
- var l = (screen.availWidth - 500) / 2;
- var t = (screen.availHeight - 300) / 2;
- // window.open({ URL: "/Pages/business/CorporateClientsUpLoadContract.aspx?Keyid=" + keyid, Title: "鏌ョ湅鍚堝悓", Width: 900, Height: 750 });
- window.open('/Pages/business/DeliverPlanFujianShow.aspx?Keyid=' + keyid + '&AttachmentType=3', '_blank', 'height=750,width=900,top=' + t + ',left=' + l + ',toolbar=no,menubar=no,scrollbars=no,resizable=no,location=no,status=no');
- }
-
- /*
-鎵撳嵃閫佽揣鍗�
-*/
- function ToPrintdelev() {
- var DeliveryTime = $("#txtDeliveryTime").val();
- var CarId = $("#selCarId").val();
- var DriverId = $("#selDriverId").val();
- var CustormerName = $("#txtCustormerName").val();
- var BusinessManager = $("#selBusinessManager").val();
-
- // OpenWindowByUrl();
- OpenWindowByUrl('/Pages/business/DeliverPlanPrint.aspx?DeliverTime=' + DeliveryTime + '&CarId=' + CarId + '&DriverId=' + DriverId + '&CustormerName=' + CustormerName + '&BusinessManager=' + BusinessManager, '', '');
- }
- </script>
- <style type="text/css">
- .tableStyleXS th { padding: 1px 0 1px 3px; background-image:none; border-bottom:1px solid #CCC; }
- .tableStyleXS td { padding: 1px 0 1px 3px; }
- .TableNewStyle select { width: 80px; }
- .td_hide span { text-decoration: default; display: none; text-align: center; }
- span.hand_no { cursor: default; display: block; font-size: 12px; }
- span.hand_no:hover { text-decoration: none; }
- span.hand_yes { cursor: pointer; display: block; font-size: 12px; }
- .td_hide { cursor: pointer; }
- </style>
-</head>
-<body>
- <form id="form1" runat="server">
- <div id="scrollContent" style="width: auto;">
- <div class="box1">
- <table class="TableNewStyle" style="width: 100%;">
-
- <tr>
- <td class="ali03">
- 鍙嶉鏃堕棿锛�
- </td>
- <td style="width: 215px">
- <input id="txtBeginDate" type="text" runat="server" class='date w80px' maxlength='10' />-<input id="txtEndDate" type="text" runat="server" class='date w80px' maxlength='10' />
- </td>
-
- <td class="ali03">
- 鍙嶉浜猴細
- </td>
- <td>
- <select keepdefaultstyle='true' id='selDriverIddo' runat="server" datatextfield='Name' datavaluefield='Keyid'>
- </select>
- </td>
- <td class="ali03">
- 璐ｄ换浜猴細
- </td>
- <td>
- <select keepdefaultstyle='true' id='selZerenren' runat="server" datatextfield='Name' datavaluefield='Keyid'>
- </select>
- </td>
- <td class="ali03">
- 瀹㈡埛鍗曚綅锛�
- </td>
- <td>
- <input id='txtCustormerName' runat="server" maxlength='50' />
- </td>
-
-
-
-
-
- </tr>
-
- <tr>
- <td class="ali03">
- 鏄惁瀹岀粨锛�
- </td>
- <td >
- <select keepdefaultstyle='true' id='selWanjiestatus' runat="server" >
- <option value="">鍏ㄩ儴</option>
- <option value="1">瀹岀粨</option>
- <option value="0">鏈畬缁�</option>
- </select>
- </td>
- <td colspan="6">
-
- <asp:button id="btn_Search" text="鏌ヨ" runat="server" padding="0px" OnClick="btn_Search_Click" /> <input type="button" value='閲嶇疆' onclick='document.body.innerHTML="";window.location=window.location;' />
-
-
-
- </td>
- </tr>
-
-
- </table>
- </div>
-
- <%-- <div class="center" style=" margin-left:0px;">
- <div class="left">
- <div class="right">
- <div class="padding_top5 padding_left10">
- 杞﹁締锛� <select keepdefaultstyle='true' id='CarId' runat="server" datatextfield='CarNumber' datavaluefield='Keyid'>
</select>
<div class="box_tool_line">
- </div>
椹鹃┒鍛橈細 <select keepdefaultstyle='true' id='DriverId' runat="server" datatextfield='Name' datavaluefield='Keyid'>
</select>
- <div class="box_tool_line">
- </div>
-
- </div>
- </div>
- </div>
-
- </div>
- <div class="box_tool_min">
- <div class="center" style=" margin-left:0px;">
- <div class="left">
- <div class="right">
- <div class="padding_top5 padding_left10">
-
- <a href="javascript:;" onclick="ToAllAccept2();"><span class="icon_edit">鏂板閫佽揣</span></a>
- <div class="box_tool_line">
- </div>
- <a href="javascript:;" onclick="ToAllAccept1();"><span class="icon_edit">鍗曟嵁绉讳氦</span></a>
- <div class="box_tool_line">
- </div>
- <a href="javascript:;" onclick="ToPrintdelev()"><span class="icon_edit">鎵撳嵃</span></a>
- <div class="clear">
- </div>
- </div>
- </div>
- </div>
- </div>
- <div class="clear">
- </div>
- </div>--%>
- <div clear="fl">
- <table class="tableStyle tableStyleXS" useclick="false" usecheckbox="true" sortmode="false">
- <thead>
- <tr>
- <th width="25">
- </th>
- <th width="25">
- 椤哄簭
- </th>
-
- <th style="text-align: center;" width="70">
- 鍙嶉鏃堕棿
- </th>
-
- <th width="60">
- 鍙嶉浜�
- </th>
- <th width="100">
- 瀹㈡埛鍗曚綅
- </th>
- <th style="text-align: center;"width="200">
- 鍙嶉闂
- </th>
-
-
-
- <th width="70">
- 璐ｄ换浜�
- </th>
- <th width="70">
- 杩借矗缃氭
- </th>
-
-
-
-
-
-
- <th width="60">
- 鏄惁瀹岀粨
- </th>
-
-
- <th width="100">
- 鎿嶄綔
- </th>
- </tr>
- </thead>
- <tbody>
- <asp:repeater id="RepClientList" runat="server">
- <itemtemplate>
- <tr>
- <td>
- <input type="checkbox" name='ckId' value_keyid="<%#Eval("Keyid")%>" value="{
- id:'<%#Eval("Keyid")%>',
- DeliverTime: '<%#Eval("DeliverTime", "{0:yyyy-MM-dd}")%>',
- BuyerId:'<%#Eval("BuyerId")%>',
- CarId:'<%#Eval("CarId")%>',
- DriverId:'<%#Eval("DriverId")%>',
- }" id='ckBox<%#Container.ItemIndex%>' id='ckBox<%#Container.ItemIndex%>' class='ckBox' />
- </td>
-
- <td>
- <%#Container.ItemIndex + (UCPager1.PageSize *( UCPager1.PageIndex-1)+1)%>
- </td>
-
- <td>
- <%#Eval("DeliveredTime", "{0:yyyy-MM-dd}")%>
- </td>
-
- <td>
- <%#Eval("DriverName")%>
- </td>
-
- <td>
- <%#Eval("CompanyName")%>
- </td>
-
- <td>
- <%#Eval("wentifankui")%>
- </td>
- <td>
- <%#Eval("ZerenrenName")%>
- </td>
- <td>
- <%#Eval("Fakuan","{0:F2}")%>
- </td>
-
-
- <td>
- <%#Eval("WanjiestatusName")%>
- </td>
-
-
-
-
- <td style="text-align: center;">
-
- <a href='javascript:void(0)' menu_member_case_id="case_Zhuize" menu_member_case_name="杩借矗" title='鐐瑰嚮淇敼' class='a_under' onclick='Xiugai("<%#Eval("Keyid")%>","<%#Eval("Transferstatus")%>")'> 杩借矗 </a>
-
-
- <a href='javascript:void(0)' menu_member_case_id="case_Wanjie" menu_member_case_name="瀹岀粨" title='鐐瑰嚮瀹岀粨' class='a_under' onclick='wanjie("<%#Eval("Keyid")%>")'> 瀹岀粨 </a>
-
-
- </td>
- </tr>
- </itemtemplate>
- </asp:repeater>
- <tr>
- <td colspan="7" align="right">
- 鍚堣锛�
- </td>
-
-
- <td >
- <span id="heji" runat="server" ></span>
- </td>
-
- <td colspan="2">
-
- </td>
-
-
-
- </tr>
- </tbody>
- </table>
- <uc:ucpager id="UCPager1" runat="server" />
- </div>
- </div>
- </form>
-</body>
-</html>
-
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="DeliverPlanWentiList.aspx.cs" Inherits="CY.WebForm.Pages.business.DeliverPlanWentiList" %>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head id="Head1" runat="server">
+ <title>璁㈠崟鍒楄〃</title>
+ <uc:cmshead id="CMSHead1" runat="server" />
+ <%-- <script src="../../js/business/Order.js" type="text/javascript"></script>--%>
+ <script type="text/javascript">
+ //宸ヤ綔鑰冭瘎
+ function View(Keyid, BuyerId, DeliverTime,Sort) {
+ //if (Keyid == '00000000-0000-0000-0000-000000000000') {
+ // alert("璇峰厛瀹夋帓閫佽揣锛�");
+ // return;
+ //}
+
+ top.Dialog.open({ URL: "/Pages/business/DeliverPlanSort.aspx?Keyid=" + Keyid + "&BuyerId=" + BuyerId + "&DeliverTime=" + DeliverTime + "&Sort=" + Sort, Title: "閫佽揣瀹夋帓鎺掑簭", Width: 300, Height: 300 });
+ }
+
+ //宸ヤ綔鑰冭瘎
+ function ViewZhuyishixiang(Keyid, BuyerId, DeliverTime) {
+ //if (Keyid == '00000000-0000-0000-0000-000000000000') {
+ // alert("璇峰厛瀹夋帓閫佽揣锛�");
+ // return;
+ //}
+
+ top.Dialog.open({ URL: "/Pages/business/DeliverPlanPaicheZhuyishixiang.aspx?Keyid=" + Keyid + "&BuyerId=" + BuyerId + "&DeliverTime=" + DeliverTime , Title: "閫佽揣瀹夋帓娉ㄦ剰浜嬮」", Width: 800, Height: 300 });
+ }
+
+ //宸ヤ綔鑰冭瘎
+ function ViewGongzuokaoping(Keyid, BuyerId, DeliverTime) {
+ //if (Keyid == '00000000-0000-0000-0000-000000000000') {
+ // alert("璇峰厛瀹夋帓閫佽揣锛�");
+ // return;
+ //}
+
+ top.Dialog.open({ URL: "/Pages/business/DeliverPlanGongzuokaoping.aspx?Keyid=" + Keyid + "&BuyerId=" + BuyerId + "&DeliverTime=" + DeliverTime , Title: "閫佽揣瀹夋帓宸ヤ綔鑰冭瘎", Width: 800, Height: 300 });
+ }
+
+
+ //鏂板闂鍙嶉
+ function ToAddorder() {
+ top.Dialog.open({ URL: "/Pages/business/DeliverPlanWentiAdd.aspx", Title: "闂鍙嶉", Width: 900, Height: 750 });
+ }
+ //杩借矗
+ function Xiugai(keyid) {
+ top.Dialog.open({ URL: "/Pages/business/DeliverPlanWentiEdit.aspx?keyid=" + keyid, Title: "杩借矗", Width: 900, Height: 750 });
+ }
+
+
+ //閫佽揣瀹夋帓
+ function outAfterWorks(Keyid, BuyerId, DeliveredTime) {
+ top.Dialog.open({ URL: "/Pages/business/OrderProductionprogress.aspx?SellerOrderId=" + SellerOrderId + "&Keyid=" + Keyid + "&works=" + works, Title: works, Width: 300, Height: 300 });
+ }
+ //鎵撳嵃
+ function outAfterWorks(Keyid) {
+ if (Keyid == '00000000-0000-0000-0000-000000000000') {
+ alert("璇峰厛瀹夋帓閫佽揣锛�");
+ return;
+ }
+ top.Dialog.open({ URL: "/Pages/business/DeliverPlanPrint.aspx?Keyid=" + Keyid + "&DelayTime=2021-04-09", Title: "宸ヤ綔鑰冭瘎", Width: 1000, Height: 800 });
+ }
+
+ ///鎵归噺鍙楃悊
+ function ToAllAccept1() {
+
+ var ids = '';
+ var cks = $("input[name='ckId']:checked");
+ if (cks.length == 0) { alertMsg('娌℃湁閫変腑浠讳綍椤癸紒'); return; } else { }
+ var isCan = true;
+
+
+
+
+ cks.each(
+ function () {
+ var ckVal = $(this).val();
+
+ var ckValJson = eval('(' + ckVal + ')');
+
+ ids = ids + ',' + ckValJson.id;
+ if (ckValJson.Wanjiestatus == "1") {
+ isCan = false;
+ }
+ }
+ );
+
+
+ if (!isCan) {
+ alertMsg('璇烽�夋嫨鏈畬缁撶殑璁㈠崟锛�');
+ return;
+ }
+ else {
+ if (ids != '') {
+ ids = ids.substring(1);
+
+ }
+
+ var msg = ('纭鍒犻櫎鍗曟嵁鍚�?') ;
+ top.Dialog.confirm(msg, function () {
+ DoAcceptAll(ids);
+ });
+ }
+ }
+
+ /*
+鎵归噺澶勭悊鍙楃悊璁㈠崟
+*/
+ var DoAcceptAll = function (orderIds) {
+ CallServer({ Target: "AcceptOrderAll", ids: orderIds }, function (data, textStatus) {
+ if ('1' == data) {
+ alertMsg('鎿嶄綔鎴愬姛锛�');
+ RefreshDIVOpener(); //鍏抽棴椤甸潰
+ } else {
+ alertMsg('-1' == data ? '鍒犻櫎鍗曟嵁澶辫触锛�' : '鍒犻櫎鍗曟嵁澶辫触锛�');
+ //dialog.close();
+ }
+ });
+ }
+
+
+ ///鎵归噺鍙楃悊
+ function ToAllAccept3() {
+
+ var ids = '';
+ var cks = $("input[name='ckId']:checked");
+ if (cks.length == 0) { alertMsg('娌℃湁閫変腑浠讳綍椤癸紒'); return; } else { }
+ var isCan = true;
+ var DeliverTime = '';
+ var BuyerId = '';
+
+ //var carid = $("#selCarIddo").val();
+ //var driverid = $("#selDriverIddo").val();
+
+ //if (carid == "") { alertMsg('璇烽�夋嫨杞﹁締锛�'); return; } else { }
+ //if (driverid == "") { alertMsg('璇烽�夋嫨椹鹃┒鍛橈紒'); return; } else { }
+
+ cks.each(
+ function () {
+ var ckVal = $(this).val();
+
+ var ckValJson = eval('(' + ckVal + ')');
+
+ ids = ids + ',' + ckValJson.id;
+ //orderShowIds = orderShowIds + ',' + ckValJson.ordershowId;
+
+ DeliverTime = DeliverTime + ',' + ckValJson.DeliverTime;
+ BuyerId = BuyerId + ',' + ckValJson.BuyerId;
+ }
+ );
+
+
+ if (!isCan) {
+ // alertMsg('璇烽�夋嫨鏈彈鐞嗙殑璁㈠崟锛�');
+ }
+ else {
+ if (ids != '') {
+ ids = ids.substring(1);
+ //DeliverTime = DeliverTime.substring(1);
+ //BuyerId = BuyerId.substring(1);
+ }
+
+ top.Dialog.open({ URL: "/Pages/business/DeliverPlanPaiche.aspx?ids=" + ids, Title: "瀹夋帓杞﹁締", Width: 600, Height: 300 });
+ }
+ }
+
+
+
+ //宸ヤ綔鑰冭瘎
+ function danjuyijiao(Keyid, Transferstatus) {
+
+
+ top.Dialog.open({ URL: "/Pages/business/DeliverPlanYijiao.aspx?ids=" + Keyid, Title: "鍗曟嵁绉讳氦", Width: 600, Height: 300 });
+ }
+
+ //宸ヤ綔鑰冭瘎
+ function wanjie(Keyid) {
+
+ var msg = ('纭瀹岀粨鍚�?');
+ top.Dialog.confirm(msg, function () {
+ top.Dialog.open({ URL: "/Pages/business/DeliverPlanWentiEdit.aspx?Target=wanjie&&keyid=" + Keyid, Title: "瀹岀粨", Width: 600, Height: 300 });
+ });
+
+
+
+ }
+
+
+
+ ///鎵归噺鍙楃悊
+ function ToAllAccept4() {
+
+ var ids = '';
+ var cks = $("input[name='ckId']:checked");
+ if (cks.length == 0) { alertMsg('娌℃湁閫変腑浠讳綍椤癸紒'); return; } else { }
+ var isCan = true;
+ var DeliverTime = '';
+ var BuyerId = '';
+
+ //var carid = $("#selCarIddo").val();
+ //var driverid = $("#selDriverIddo").val();
+
+ //if (carid == "") { alertMsg('璇烽�夋嫨杞﹁締锛�'); return; } else { }
+ //if (driverid == "") { alertMsg('璇烽�夋嫨椹鹃┒鍛橈紒'); return; } else { }
+
+ cks.each(
+ function () {
+ var ckVal = $(this).val();
+
+ var ckValJson = eval('(' + ckVal + ')');
+
+ ids = ids + ',' + ckValJson.id;
+ //orderShowIds = orderShowIds + ',' + ckValJson.ordershowId;
+
+ DeliverTime = DeliverTime + ',' + ckValJson.DeliverTime;
+ BuyerId = BuyerId + ',' + ckValJson.BuyerId;
+ }
+ );
+
+
+ if (!isCan) {
+ // alertMsg('璇烽�夋嫨鏈彈鐞嗙殑璁㈠崟锛�');
+ }
+ else {
+ if (ids != '') {
+ ids = ids.substring(1);
+ //DeliverTime = DeliverTime.substring(1);
+ //BuyerId = BuyerId.substring(1);
+ }
+
+ top.Dialog.open({ URL: "/Pages/business/DeliverPlanYijiao.aspx?ids=" + ids, Title: "鍗曟嵁绉讳氦", Width: 600, Height: 300 });
+ }
+ }
+
+
+
+
+ ///鎵归噺鍙楃悊
+ function ToAllAccept2() {
+
+ var ids = '';
+ var cks = $("input[name='ckId']:checked");
+ if (cks.length == 0) { alertMsg('娌℃湁閫変腑浠讳綍椤癸紒'); return; } else { }
+ var isCan = true;
+ var DeliverTime = '';
+ var BuyerId = '';
+
+ var carid = $("#selCarIddo").val();
+ var driverid = $("#selDriverIddo").val();
+
+ if (carid == "") { alertMsg('璇烽�夋嫨杞﹁締锛�'); return; } else { }
+ if (driverid == "") { alertMsg('璇烽�夋嫨椹鹃┒鍛橈紒'); return; } else { }
+
+ cks.each(
+ function () {
+ var ckVal = $(this).val();
+
+ var ckValJson = eval('(' + ckVal + ')');
+
+ ids = ids + ',' + ckValJson.id;
+ //orderShowIds = orderShowIds + ',' + ckValJson.ordershowId;
+
+ DeliverTime = DeliverTime + ',' + ckValJson.DeliverTime;
+ BuyerId = BuyerId + ',' + ckValJson.BuyerId;
+ }
+ );
+
+
+ if (!isCan) {
+ // alertMsg('璇烽�夋嫨鏈彈鐞嗙殑璁㈠崟锛�');
+ }
+ else {
+ if (ids != '') {
+ ids = ids.substring(1);
+ DeliverTime = DeliverTime.substring(1);
+ BuyerId = BuyerId.substring(1);
+ }
+
+ var msg = ('纭娲捐溅鍚�?');
+ top.Dialog.confirm(msg, function () {
+ DoAcceptAll2(ids, DeliverTime, BuyerId, carid, driverid);
+ });
+ }
+ }
+
+ /*
+鎵归噺澶勭悊鍙楃悊璁㈠崟
+*/
+ var DoAcceptAll2 = function (orderIds, DeliverTime, BuyerId, carid, driverid) {
+ CallServer({ Target: "AcceptOrderAll2", ids: orderIds, DeliverTimes: DeliverTime, BuyerIds: BuyerId, Carid: carid, Driverid: driverid}, function (data, textStatus) {
+ if ('1' == data) {
+ alertMsg('鎿嶄綔鎴愬姛锛�');
+ RefreshDIVOpener(); //鍏抽棴椤甸潰
+ } else {
+ alertMsg('-1' == data ? '娲捐溅澶辫触锛�' : '娲捐溅澶辫触锛�');
+ //dialog.close();
+ }
+ });
+ }
+
+
+ /*
+鎵撳嵃閫佽揣鍗�
+*/
+ function ToPrintDriverorder(DriverId) {
+
+ OpenWindowByUrl('/Pages/business/DeliverOrderPrint.aspx?deliverorderId=' + DriverId, '', '');
+ }
+
+
+
+
+ //缁存姢
+ function onViewuplod(keyid) {
+ var l = (screen.availWidth - 500) / 2;
+ var t = (screen.availHeight - 300) / 2;
+ // window.open({ URL: "/Pages/business/CorporateClientsUpLoadContract.aspx?Keyid=" + keyid, Title: "鏌ョ湅鍚堝悓", Width: 900, Height: 750 });
+ window.open('/Pages/business/DeliverPlanFujianShow.aspx?Keyid=' + keyid + '&AttachmentType=3', '_blank', 'height=750,width=900,top=' + t + ',left=' + l + ',toolbar=no,menubar=no,scrollbars=no,resizable=no,location=no,status=no');
+ }
+
+ /*
+鎵撳嵃閫佽揣鍗�
+*/
+ function ToPrintdelev() {
+ var DeliveryTime = $("#txtDeliveryTime").val();
+ var CarId = $("#selCarId").val();
+ var DriverId = $("#selDriverId").val();
+ var CustormerName = $("#txtCustormerName").val();
+ var BusinessManager = $("#selBusinessManager").val();
+
+ // OpenWindowByUrl();
+ OpenWindowByUrl('/Pages/business/DeliverPlanPrint.aspx?DeliverTime=' + DeliveryTime + '&CarId=' + CarId + '&DriverId=' + DriverId + '&CustormerName=' + CustormerName + '&BusinessManager=' + BusinessManager, '', '');
+ }
+ </script>
+ <style type="text/css">
+ .tableStyleXS th { padding: 1px 0 1px 3px; background-image:none; border-bottom:1px solid #CCC; }
+ .tableStyleXS td { padding: 1px 0 1px 3px; }
+ .TableNewStyle select { width: 80px; }
+ .td_hide span { text-decoration: default; display: none; text-align: center; }
+ span.hand_no { cursor: default; display: block; font-size: 12px; }
+ span.hand_no:hover { text-decoration: none; }
+ span.hand_yes { cursor: pointer; display: block; font-size: 12px; }
+ .td_hide { cursor: pointer; }
+ </style>
+</head>
+<body>
+ <form id="form1" runat="server">
+ <div id="scrollContent" style="width: auto;">
+ <div class="box1">
+ <table class="TableNewStyle" style="width: 100%;">
+
+ <tr>
+ <td class="ali03">
+ 鍙嶉鏃堕棿锛�
+ </td>
+ <td style="width: 215px">
+ <input id="txtBeginDate" type="text" runat="server" class='date w80px' maxlength='10' />-<input id="txtEndDate" type="text" runat="server" class='date w80px' maxlength='10' />
+ </td>
+
+ <td class="ali03">
+ 鍙嶉浜猴細
+ </td>
+ <td>
+ <select keepdefaultstyle='true' id='selDriverIddo' runat="server" datatextfield='Name' datavaluefield='Keyid'>
+ </select>
+ </td>
+ <td class="ali03">
+ 璐ｄ换浜猴細
+ </td>
+ <td>
+ <select keepdefaultstyle='true' id='selZerenren' runat="server" datatextfield='Name' datavaluefield='Keyid'>
+ </select>
+ </td>
+ <td class="ali03">
+ 瀹㈡埛鍗曚綅锛�
+ </td>
+ <td>
+ <input id='txtCustormerName' runat="server" maxlength='50' />
+ </td>
+
+
+
+
+
+ </tr>
+
+ <tr>
+ <td class="ali03">
+ 鏄惁瀹岀粨锛�
+ </td>
+ <td >
+ <select keepdefaultstyle='true' id='selWanjiestatus' runat="server" >
+ <option value="">鍏ㄩ儴</option>
+ <option value="1">瀹岀粨</option>
+ <option value="0">鏈畬缁�</option>
+ </select>
+ </td>
+ <td colspan="6">
+
+ <asp:button id="btn_Search" text="鏌ヨ" runat="server" padding="0px" OnClick="btn_Search_Click" /> <input type="button" value='閲嶇疆' onclick='document.body.innerHTML="";window.location=window.location;' />
+
+
+
+ </td>
+ </tr>
+
+
+ </table>
+ </div>
+
+
+ <div class="box_tool_min">
+ <div class="center" style=" margin-left:0px;">
+ <div class="left">
+ <div class="right">
+ <div class="padding_top5 padding_left10">
+ <a href="javascript:;" menu_member_case_id="case_adWentifankui" menu_member_case_name="鏂板闂鍙嶉" onclick="ToAddorder();"><span class="icon_edit">闂鍙嶉</span></a>
+ <div class="box_tool_line">
+ </div>
+ <a href="javascript:;" menu_member_case_id="case_Piliangdel" menu_member_case_name="鎵归噺鍒犻櫎" onclick="ToAllAccept1();"><span class="icon_edit">鎵归噺鍒犻櫎</span></a>
+ <div class="clear">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="clear">
+ </div>
+ </div>
+ <div clear="fl">
+ <table class="tableStyle tableStyleXS" useclick="false" usecheckbox="true" sortmode="false">
+ <thead>
+ <tr>
+ <th width="25">
+ </th>
+ <th width="25">
+ 椤哄簭
+ </th>
+
+ <th style="text-align: center;" width="70">
+ 鍙嶉鏃堕棿
+ </th>
+
+ <th width="60">
+ 鍙嶉浜�
+ </th>
+ <th width="100">
+ 瀹㈡埛鍗曚綅
+ </th>
+ <th style="text-align: center;"width="200">
+ 闂鎻忚堪
+ </th>
+
+
+
+ <th width="70">
+ 璐ｄ换浜�
+ </th>
+ <th width="70">
+ 杩借矗缃氭
+ </th>
+
+
+
+
+
+
+ <th width="60">
+ 鏄惁瀹岀粨
+ </th>
+
+
+ <th width="100">
+ 鎿嶄綔
+ </th>
+ </tr>
+ </thead>
+ <tbody>
+ <asp:repeater id="RepClientList" runat="server">
+ <itemtemplate>
+ <tr>
+ <td>
+ <input type="checkbox" name='ckId' value_keyid="<%#Eval("Keyid")%>" value="{
+ id:'<%#Eval("Keyid")%>',
+ DeliverTime: '<%#Eval("DeliverTime", "{0:yyyy-MM-dd}")%>',
+ BuyerId:'<%#Eval("BuyerId")%>',
+ CarId:'<%#Eval("CarId")%>',
+ DriverId:'<%#Eval("DriverId")%>',
+ Wanjiestatus:'<%#Eval("Wanjiestatus")%>',
+ }" id='ckBox<%#Container.ItemIndex%>' id='ckBox<%#Container.ItemIndex%>' class='ckBox' />
+ </td>
+
+ <td>
+ <%#Container.ItemIndex + (UCPager1.PageSize *( UCPager1.PageIndex-1)+1)%>
+ </td>
+
+ <td>
+ <%#Eval("DeliveredTime", "{0:yyyy-MM-dd}")%>
+ </td>
+
+ <td>
+ <%#Eval("DriverName")%>
+ </td>
+
+ <td>
+ <%#Eval("CompanyName")%>
+ </td>
+
+ <td>
+ <%#Eval("wentifankui")%>
+ </td>
+ <td>
+ <%#Eval("ZerenrenName")%>
+ </td>
+ <td>
+ <%#Eval("Fakuan","{0:F2}")%>
+ </td>
+
+
+ <td>
+ <%#Eval("WanjiestatusName")%>
+ </td>
+
+
+
+
+ <td style="text-align: center;">
+
+ <a href='javascript:void(0)' menu_member_case_id="case_Zhuize" menu_member_case_name="杩借矗" title='鐐瑰嚮淇敼' class='a_under' onclick='Xiugai("<%#Eval("Keyid")%>","<%#Eval("Transferstatus")%>")'> 杩借矗 </a>
+
+
+ <a href='javascript:void(0)' menu_member_case_id="case_Wanjie" menu_member_case_name="瀹岀粨" title='鐐瑰嚮瀹岀粨' class='a_under' onclick='wanjie("<%#Eval("Keyid")%>")'> 瀹岀粨 </a>
+
+
+ </td>
+ </tr>
+ </itemtemplate>
+ </asp:repeater>
+ <tr>
+ <td colspan="7" align="right">
+ 鍚堣锛�
+ </td>
+
+
+ <td >
+ <span id="heji" runat="server" ></span>
+ </td>
+
+ <td colspan="2">
+
+ </td>
+
+
+
+ </tr>
+ </tbody>
+ </table>
+ <uc:ucpager id="UCPager1" runat="server" />
+ </div>
+ </div>
+ </form>
+</body>
+</html>
+
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanWentiList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanWentiList.aspx.cs
index 09dc2fb..4000063 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanWentiList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanWentiList.aspx.cs
@@ -54,7 +54,7 @@
case "wanjie":
AcceptAll();
break;
- case "AcceptOrderAll2":
+ case "AcceptOrderAll":
AcceptAll2();
break;
default:
@@ -77,7 +77,7 @@
//this.selDriverId.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
- this.selDriverIddo.DataSource = bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, null, null).Where(x => x.BF_IsDriver == true);//.Where(x => x.SM_Post.Equals("椹鹃┒鍛�"));
+ this.selDriverIddo.DataSource = bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, null, null);//.Where(x => x.BF_IsDriver == true);
this.selDriverIddo.DataTextField = "Name";
this.selDriverIddo.DataValueField = "Keyid";
this.selDriverIddo.DataBind();
@@ -199,27 +199,17 @@
public void AcceptAll2()
{
Response.Clear();
- int? carid = Request["CarId"].ToInt32(); //this.CarId.Value.ToGuid2();
- int? driverId = Request["DriverId"].ToInt32(); //this.DriverId.Value.ToGuid2();
+
string ids = string.Empty;
- string DeliverTimes = string.Empty;
- string BuyerIds = string.Empty;
+
if (Request["ids"] != null)
{
ids = Request["ids"].ToString();
}
- if (Request["DeliverTimes"] != null)
- {
- DeliverTimes = Request["DeliverTimes"].ToString();
- }
- if (Request["BuyerIds"] != null)
- {
- BuyerIds = Request["BuyerIds"].ToString();
- }
+
string[] idsArray = ids.Split(',');
- string[] DeliverTimesArray = DeliverTimes.Split(',');
- string[] BuyerIdsArray = BuyerIds.Split(',');
+
if (idsArray != null && idsArray.Length > 0)
{
@@ -227,33 +217,13 @@
{
bool result = true;
- OA_DeliverPlan oA_DeliverPlan = _OA_DeliverPlanPaicheBLL.GetModelByKeyid(idsArray[i].ToGuid2(), BuyerIdsArray[i].ToGuid2(), DeliverTimesArray[i].ToDateTime2());
- if (oA_DeliverPlan == null)
+ OA_DeliverPlan oA_DeliverPlan = _OA_DeliverPlanPaicheBLL.GetModelByKeyid(idsArray[i].ToGuid2(), null, null);
+ if (oA_DeliverPlan != null)
+
{
- oA_DeliverPlan = new OA_DeliverPlan();
- oA_DeliverPlan.Keyid = Guid.NewGuid();
- oA_DeliverPlan.FirmId = CurrentUser.MemberId;
- oA_DeliverPlan.DeliverTime = DeliverTimesArray[i].ToDateTime2();
- oA_DeliverPlan.BuyerId = BuyerIdsArray[i].ToGuid2();
- oA_DeliverPlan.DeliveredTime = null;
- oA_DeliverPlan.Zhuyishixiang = "";
- oA_DeliverPlan.Gongzuokaoping = "";
- oA_DeliverPlan.CarId = carid;
- oA_DeliverPlan.DriverId = driverId;
- oA_DeliverPlan.Transferstatus = 1;
- oA_DeliverPlan.TransfersTime = null;
- oA_DeliverPlan.Sort = 1;
- oA_DeliverPlan.Creater = CurrentUser.TrueMemberId;
- oA_DeliverPlan.CreateTime = DateTime.Now;
- oA_DeliverPlan.Updater = CurrentUser.TrueMemberId;
- oA_DeliverPlan.LastUpdateTime = DateTime.Now;
oA_DeliverPlan.wentifankui = "";
- result = _OA_DeliverPlanPaicheBLL.InsertModel(oA_DeliverPlan);
- }
- else
- {
- oA_DeliverPlan.CarId = carid;
- oA_DeliverPlan.DriverId = driverId;
+ oA_DeliverPlan.LastUpdateTime = DateTime.Now;
+ oA_DeliverPlan.Updater = CurrentUser.TrueMemberId;
result = _OA_DeliverPlanPaicheBLL.UpdateModel(oA_DeliverPlan);
}
if (!result)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
index 8840546..f9b26da 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
@@ -12,6 +12,12 @@
dialog.open({ URL: "/Pages/business/EvaluationSeller.aspx?orderid=" + orderid, Title: "鍗栧璇勪环", Width: 580, Height: 300 });
}
+
+ //鏂板闂鍙嶉
+ function ToAddorder() {
+ top.Dialog.open({ URL: "/Pages/business/DeliverPlanWentiAdd.aspx", Title: "闂鍙嶉", Width: 900, Height: 750 });
+ }
+
function OpenComplainan(orderId, orderCode, firmId) {
var url = "/Pages/business/ComplainanEdit.aspx?orderId=" + orderId;
url += "&orderCode=" + orderCode;
@@ -396,6 +402,10 @@
<%-- <div class="box_tool_line">
</div>
<a href="javascript:;" onclick="ToWaixieFukuan()"><span class="icon_edit">澶栧崗浠樻鐢宠</span></a>--%>
+ <div class="box_tool_line">
+ </div>
+ <a href="javascript:;" menu_member_case_id="case_adWentifankui" menu_member_case_name="鏂板闂鍙嶉" onclick="ToAddorder();"><span class="icon_edit">闂鍙嶉</span></a>
+
<div class="clear">
</div>
</div>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaAdd.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaAdd.aspx
index b3ae1e1..cc608bc 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaAdd.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaAdd.aspx
@@ -45,10 +45,10 @@
<tr>
<td class="ali03">
- 浜у搧椤圭洰锛�
+ 椤圭洰锛�
</td>
<td >
- <input id="txtchanpinxiangmu" type="text" class="w700px req" runat="server" maxlength="100" msg="璇峰～鍐欎骇鍝侀」鐩�"/>
+ <input id="txtchanpinxiangmu" type="text" class="w700px req" runat="server" maxlength="100" msg="璇峰～鍐欓」鐩�"/>
</td>
</tr>
<tr>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaDetail.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaDetail.aspx
index b78cfab..addb5b9 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaDetail.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaDetail.aspx
@@ -27,7 +27,7 @@
<tr>
<td class="ali03">
- 浜у搧椤圭洰锛�
+ 椤圭洰锛�
</td>
<td >
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaList.aspx
index 11dd4d5..399031f 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaList.aspx
@@ -71,7 +71,7 @@
</select>
</td>
<td class="ali03">
- 浜у搧椤圭洰锛�
+ 椤圭洰锛�
</td>
<td>
<input type="text" id="txtchanpinxiangmu" runat="server" class="w120px" />
@@ -115,7 +115,7 @@
绫诲埆
</th>
<th style="text-align: center">
- 浜у搧椤圭洰
+ 椤圭洰
</th>
<th style="text-align: center">
璐﹀彿
--
Gitblit v1.9.1