sunny.qiao 1 vuosi sitten
vanhempi
commit
e2c9d3848e

+ 45 - 45
FMS24/FMS.BLL/Bdky/BdKyCkhzBLL.cs

@@ -10,14 +10,14 @@ using FMS.VAL;
 
 namespace FMS.BLL
 {
-    public class BdKyCkhzBLL:SuperBLL
+    public class BdKyCkhzBLL : SuperBLL
     {
-	    private BdKyCkhzDAL dal = new BdKyCkhzDAL();
+        private BdKyCkhzDAL dal = new BdKyCkhzDAL();
         private BdKyCkhzVAL val = new BdKyCkhzVAL();
 
         private static BdKyCkhzBLL instance;
 
-		public  static BdKyCkhzBLL Instance
+        public static BdKyCkhzBLL Instance
         {
             get { return instance; }
         }
@@ -27,55 +27,55 @@ namespace FMS.BLL
             instance = new BdKyCkhzBLL();
         }
 
-        public DataTable Load(BLLContext context,string guid)
+        public DataTable Load(BLLContext context, string guid)
         {
-             return dal.Load(context, guid);
+            return dal.Load(context, guid);
         }
 
-        public SearchResult Search(BLLContext context,Paging paging, EntityBase queryEntity)
+        public SearchResult Search(BLLContext context, Paging paging, EntityBase queryEntity)
         {
             return dal.Search(context, paging, queryEntity);
         }
-  
-         public void Delete(BLLContext context,List<string> listGuid)
-         {
-
-                   foreach (string guid in listGuid)
-                    {
-					    val.DeleteValidate(context,guid);
-                        BD_KY_CKHZ.DAL.Delete().Where(a => a.GUID = guid).Execute(context.ts);
-                   }
-         }
- 
-        public EntityBase Save(BLLContext context,EntityBase saveEntity,bool isAdd)
+
+        public void Delete(BLLContext context, List<string> listGuid)
         {
 
-                BD_KY_CKHZ bdKyCkhz= new BD_KY_CKHZ(BD_KY_CKHZ.Fields.GUID);
-                bdKyCkhz.Data = saveEntity.Data;
-                bdKyCkhz.EffectDataFields();
-
-				val.SaveValidate(context,bdKyCkhz,isAdd);
-
-                 if (isAdd)
-                 {
-                      bdKyCkhz.GUID = Guid.NewGuid().ToString("N");
-                      bdKyCkhz.AddOperInfo(context, isAdd);
-					 
-					  bdKyCkhz.Validate();
-                      bdKyCkhz.Insert(context.Transaction);
-                 }
-                else
-                {
-                     bdKyCkhz.AddOperInfo(context, isAdd);
-					 bdKyCkhz.NotSave("CREATE_DATE,CREATE_USER");
-
-					 bdKyCkhz.Validate();
-                     bdKyCkhz.Update(context.Transaction);
-                }
-
-               return bdKyCkhz;
-
-         }
-	   
+            foreach (string guid in listGuid)
+            {
+                val.DeleteValidate(context, guid);
+                BD_KY_CKHZ.DAL.Delete().Where(a => a.GUID = guid).Execute(context.ts);
+            }
+        }
+
+        public EntityBase Save(BLLContext context, EntityBase saveEntity, bool isAdd)
+        {
+
+            BD_KY_CKHZ bdKyCkhz = new BD_KY_CKHZ(BD_KY_CKHZ.Fields.GUID);
+            bdKyCkhz.Data = saveEntity.Data;
+            bdKyCkhz.EffectDataFields();
+
+            val.SaveValidate(context, bdKyCkhz, isAdd);
+
+            if (isAdd)
+            {
+                bdKyCkhz.GUID = Guid.NewGuid().ToString("N");
+                bdKyCkhz.AddUserInfo(context, isAdd, true);
+
+                bdKyCkhz.Validate();
+                bdKyCkhz.Insert(context.Transaction);
+            }
+            else
+            {
+                bdKyCkhz.AddUserInfo(context, isAdd, false);
+                bdKyCkhz.NotSave("CREATE_DATE,CREATE_USER");
+
+                bdKyCkhz.Validate();
+                bdKyCkhz.Update(context.Transaction);
+            }
+
+            return bdKyCkhz;
+
+        }
+
     }
 }

+ 45 - 45
FMS24/FMS.BLL/Bdky/BdKyCkhzJhrBLL.cs

@@ -10,14 +10,14 @@ using FMS.VAL;
 
 namespace FMS.BLL
 {
-    public class BdKyCkhzJhrBLL:SuperBLL
+    public class BdKyCkhzJhrBLL : SuperBLL
     {
-	    private BdKyCkhzJhrDAL dal = new BdKyCkhzJhrDAL();
+        private BdKyCkhzJhrDAL dal = new BdKyCkhzJhrDAL();
         private BdKyCkhzJhrVAL val = new BdKyCkhzJhrVAL();
 
         private static BdKyCkhzJhrBLL instance;
 
-		public  static BdKyCkhzJhrBLL Instance
+        public static BdKyCkhzJhrBLL Instance
         {
             get { return instance; }
         }
@@ -27,55 +27,55 @@ namespace FMS.BLL
             instance = new BdKyCkhzJhrBLL();
         }
 
-        public DataTable Load(BLLContext context,string guid)
+        public DataTable Load(BLLContext context, string guid)
         {
-             return dal.Load(context, guid);
+            return dal.Load(context, guid);
         }
 
-        public SearchResult Search(BLLContext context,Paging paging, EntityBase queryEntity)
+        public SearchResult Search(BLLContext context, Paging paging, EntityBase queryEntity)
         {
             return dal.Search(context, paging, queryEntity);
         }
-  
-         public void Delete(BLLContext context,List<string> listGuid)
-         {
-
-                   foreach (string guid in listGuid)
-                    {
-					    val.DeleteValidate(context,guid);
-                        BD_KY_CKHZ_JHR.DAL.Delete().Where(a => a.GUID = guid).Execute(context.ts);
-                   }
-         }
- 
-        public EntityBase Save(BLLContext context,EntityBase saveEntity,bool isAdd)
+
+        public void Delete(BLLContext context, List<string> listGuid)
         {
 
-                BD_KY_CKHZ_JHR bdKyCkhzJhr= new BD_KY_CKHZ_JHR(BD_KY_CKHZ_JHR.Fields.GUID);
-                bdKyCkhzJhr.Data = saveEntity.Data;
-                bdKyCkhzJhr.EffectDataFields();
-
-				val.SaveValidate(context,bdKyCkhzJhr,isAdd);
-
-                 if (isAdd)
-                 {
-                      bdKyCkhzJhr.GUID = Guid.NewGuid().ToString("N");
-                      bdKyCkhzJhr.AddOperInfo(context, isAdd);
-					 
-					  bdKyCkhzJhr.Validate();
-                      bdKyCkhzJhr.Insert(context.Transaction);
-                 }
-                else
-                {
-                     bdKyCkhzJhr.AddOperInfo(context, isAdd);
-					 bdKyCkhzJhr.NotSave("CREATE_DATE,CREATE_USER");
-
-					 bdKyCkhzJhr.Validate();
-                     bdKyCkhzJhr.Update(context.Transaction);
-                }
-
-               return bdKyCkhzJhr;
-
-         }
-	   
+            foreach (string guid in listGuid)
+            {
+                val.DeleteValidate(context, guid);
+                BD_KY_CKHZ_JHR.DAL.Delete().Where(a => a.GUID = guid).Execute(context.ts);
+            }
+        }
+
+        public EntityBase Save(BLLContext context, EntityBase saveEntity, bool isAdd)
+        {
+
+            BD_KY_CKHZ_JHR bdKyCkhzJhr = new BD_KY_CKHZ_JHR(BD_KY_CKHZ_JHR.Fields.GUID);
+            bdKyCkhzJhr.Data = saveEntity.Data;
+            bdKyCkhzJhr.EffectDataFields();
+
+            val.SaveValidate(context, bdKyCkhzJhr, isAdd);
+
+            if (isAdd)
+            {
+                bdKyCkhzJhr.GUID = Guid.NewGuid().ToString("N");
+                bdKyCkhzJhr.AddUserInfo(context, isAdd, true);
+
+                bdKyCkhzJhr.Validate();
+                bdKyCkhzJhr.Insert(context.Transaction);
+            }
+            else
+            {
+                bdKyCkhzJhr.AddUserInfo(context, isAdd, false);
+                bdKyCkhzJhr.NotSave("CREATE_DATE,CREATE_USER");
+
+                bdKyCkhzJhr.Validate();
+                bdKyCkhzJhr.Update(context.Transaction);
+            }
+
+            return bdKyCkhzJhr;
+
+        }
+
     }
 }

+ 45 - 45
FMS24/FMS.BLL/Bdky/BdKyJcxxBLL.cs

@@ -10,14 +10,14 @@ using FMS.VAL;
 
 namespace FMS.BLL
 {
-    public class BdKyJcxxBLL:SuperBLL
+    public class BdKyJcxxBLL : SuperBLL
     {
-	    private BdKyJcxxDAL dal = new BdKyJcxxDAL();
+        private BdKyJcxxDAL dal = new BdKyJcxxDAL();
         private BdKyJcxxVAL val = new BdKyJcxxVAL();
 
         private static BdKyJcxxBLL instance;
 
-		public  static BdKyJcxxBLL Instance
+        public static BdKyJcxxBLL Instance
         {
             get { return instance; }
         }
@@ -27,55 +27,55 @@ namespace FMS.BLL
             instance = new BdKyJcxxBLL();
         }
 
-        public DataTable Load(BLLContext context,string guid)
+        public DataTable Load(BLLContext context, string guid)
         {
-             return dal.Load(context, guid);
+            return dal.Load(context, guid);
         }
 
-        public SearchResult Search(BLLContext context,Paging paging, EntityBase queryEntity)
+        public SearchResult Search(BLLContext context, Paging paging, EntityBase queryEntity)
         {
             return dal.Search(context, paging, queryEntity);
         }
-  
-         public void Delete(BLLContext context,List<string> listGuid)
-         {
-
-                   foreach (string guid in listGuid)
-                    {
-					    val.DeleteValidate(context,guid);
-                        BD_KY_JCXX.DAL.Delete().Where(a => a.GUID = guid).Execute(context.ts);
-                   }
-         }
- 
-        public EntityBase Save(BLLContext context,EntityBase saveEntity,bool isAdd)
+
+        public void Delete(BLLContext context, List<string> listGuid)
         {
 
-                BD_KY_JCXX bdKyJcxx= new BD_KY_JCXX(BD_KY_JCXX.Fields.GUID);
-                bdKyJcxx.Data = saveEntity.Data;
-                bdKyJcxx.EffectDataFields();
-
-				val.SaveValidate(context,bdKyJcxx,isAdd);
-
-                 if (isAdd)
-                 {
-                      bdKyJcxx.GUID = Guid.NewGuid().ToString("N");
-                      bdKyJcxx.AddOperInfo(context, isAdd);
-					 
-					  bdKyJcxx.Validate();
-                      bdKyJcxx.Insert(context.Transaction);
-                 }
-                else
-                {
-                     bdKyJcxx.AddOperInfo(context, isAdd);
-					 bdKyJcxx.NotSave("CREATE_DATE,CREATE_USER");
-
-					 bdKyJcxx.Validate();
-                     bdKyJcxx.Update(context.Transaction);
-                }
-
-               return bdKyJcxx;
-
-         }
-	   
+            foreach (string guid in listGuid)
+            {
+                val.DeleteValidate(context, guid);
+                BD_KY_JCXX.DAL.Delete().Where(a => a.GUID = guid).Execute(context.ts);
+            }
+        }
+
+        public EntityBase Save(BLLContext context, EntityBase saveEntity, bool isAdd)
+        {
+
+            BD_KY_JCXX bdKyJcxx = new BD_KY_JCXX(BD_KY_JCXX.Fields.GUID);
+            bdKyJcxx.Data = saveEntity.Data;
+            bdKyJcxx.EffectDataFields();
+
+            val.SaveValidate(context, bdKyJcxx, isAdd);
+
+            if (isAdd)
+            {
+                bdKyJcxx.GUID = Guid.NewGuid().ToString("N");
+                bdKyJcxx.AddUserInfo(context, isAdd, true);
+
+                bdKyJcxx.Validate();
+                bdKyJcxx.Insert(context.Transaction);
+            }
+            else
+            {
+                bdKyJcxx.AddUserInfo(context, isAdd, false);
+                bdKyJcxx.NotSave("CREATE_DATE,CREATE_USER");
+
+                bdKyJcxx.Validate();
+                bdKyJcxx.Update(context.Transaction);
+            }
+
+            return bdKyJcxx;
+
+        }
+
     }
 }

+ 5 - 0
FMS24/FMS.DAL/Bdky/BdKyCkhzDAL.cs

@@ -5,6 +5,7 @@ using System.Linq;
 using System.Text;
 using PL.Base;
 using FMS.Entity;
+using FMS.Common;
 
 namespace FMS.DAL
 {
@@ -37,6 +38,9 @@ namespace FMS.DAL
  
         public SearchResult Search(BLLContext context, Paging paging, EntityBase queryEntity)
         {
+            FMSName manage = new FMSName();
+            manage.AddAsTs("A.JGDJ", "JGDJ", false, "JGDJ_NAME");
+
             SearchResult result = new SearchResult();
 
             string sql = @"SELECT A.GUID,A.BIZ_FLAG,A.CODE,A.JC_CODE,A.NAME
@@ -44,6 +48,7 @@ namespace FMS.DAL
                            ,A.CREATE_DATE,A.UPDATE_USER,A.UPDATE_USER_NAME,A.UPDATE_DATE,A.COMPANY_CODE
                            ,A.COMPANY_NAME,A.NODE_CODE,A.NODE_NAME,A.GROUP_CODE,A.GROUP_NAME
                             ";
+            sql += manage.ToAppendSql();
             sql +=" FROM FMS_BD_KY_CKHZ A ";
             sql +=" WHERE 1=1";
 

+ 5 - 0
FMS24/FMS.DAL/Bdky/BdKyCkhzJhrDAL.cs

@@ -5,6 +5,7 @@ using System.Linq;
 using System.Text;
 using PL.Base;
 using FMS.Entity;
+using FMS.Common;
 
 namespace FMS.DAL
 {
@@ -37,6 +38,9 @@ namespace FMS.DAL
  
         public SearchResult Search(BLLContext context, Paging paging, EntityBase queryEntity)
         {
+            FMSName manage = new FMSName();
+            manage.AddAsTs("A.JHMB", "JHTSMB", false, "JHMB_NAME");
+
             SearchResult result = new SearchResult();
 
             string sql = @"SELECT A.GUID,A.CKHZ_GUID,A.JHLX,A.JHMB,A.USER_NAME
@@ -44,6 +48,7 @@ namespace FMS.DAL
                            ,A.CREATE_USER_NAME,A.CREATE_DATE,A.UPDATE_USER,A.UPDATE_USER_NAME,A.UPDATE_DATE
                            ,A.COMPANY_CODE,A.COMPANY_NAME,A.NODE_CODE,A.NODE_NAME,A.GROUP_CODE
                            ,A.GROUP_NAME ";
+            sql += manage.ToAppendSql();
             sql +=" FROM FMS_BD_KY_CKHZ_JHR A ";
             sql +=" WHERE 1=1";
 

+ 46 - 33
FMS24/Web/AppFms/Bdky/frmBdKyCkhzEdit.aspx

@@ -8,17 +8,25 @@
     <link href="../../Themes/Default/eci.css" rel="stylesheet" />
     <!-- #include File="../../App/Common/PageLoad.aspx" -->
     <script type="text/javascript">
-         
-       function addAction() {
 
-            if(eci.hasSave())
-            {
-               var url = "frmBdKyCkhzEdit.aspx";
+        function addAction() {
 
-                window.location.href=url;
-             }
+            if (eci.hasSave()) {
+                var url = "frmBdKyCkhzEdit.aspx";
+
+                window.location.href = url;
+            }
         }
 
+        function closeAction() {
+            var key = $("#hidKey").val();
+            if (key == "") {
+                eci.close();
+            }
+            else {
+                window.parent.eci.close();
+            }
+        }
 
     </script>
 </head>
@@ -28,51 +36,56 @@
 
 
         <div id="root">
-              
-           <asp:ETitle runat="server" ID="pagetitle" Title="仓库货站维护"></asp:ETitle>
+
+            <%--<asp:ETitle runat="server" ID="pagetitle" Title="仓库货站维护"></asp:ETitle>--%>
 
             <div id="toolbar" class="toolbar">
-              <asp:EButton runat="server" ID="btnSave" Text="保存" NeedCheck="true" ValidateId="tbEdit" OnClick="btnSave_Click" Icon="save" />
-              <asp:EButton runat="server" ID="btnAdd" Text="新增" Icon="Add" OnClientClick="addAction();" IsClient="true" />
-              <asp:EButton runat="server" IsClient="true" ID="btnClose" Text="关闭" Icon="close" OnClientClick="eci.close();" />
+                <asp:EButton runat="server" ID="btnSave" Text="保存" NeedCheck="true" ValidateId="tbEdit" OnClick="btnSave_Click" Icon="save" />
+                <asp:EButton runat="server" ID="btnAdd" Text="新增" Icon="Add" OnClientClick="addAction();" IsClient="true" />
+                <asp:EButton runat="server" IsClient="true" ID="btnClose" Text="关闭" Icon="close" OnClientClick="closeAction();" />
 
             </div>
             <div>
-                <table  id="tbEdit" class="grid" cellpadding="0" cellspacing="0" >
+                <table id="tbEdit" class="grid" cellpadding="0" cellspacing="0">
                     <tr>
                         <th style="width: 10%"></th>
-<th style="width: 20%"></th>
-<th style="width: 10%"></th>
-<th style="width: 20%"></th>
-<th style="width: 10%"></th>
-<th style="width: 20%"></th>
+                        <th style="width: 20%"></th>
+                        <th style="width: 10%"></th>
+                        <th style="width: 20%"></th>
+                        <th style="width: 10%"></th>
+                        <th style="width: 20%"></th>
 
                     </tr>
-                        <tr>
+                    <tr>
                         <td class="lbl">业务范畴</td>
-<td><asp:ECombox runat="server" ID ="cboBizFlag"  DataField="BIZ_FLAG" AddEmpty="true" ECIType="BIZ_FLAG" NotNull="true" Width="85%"></asp:ECombox></td>
+                        <td>
+                            <asp:ECombox runat="server" ID="cboBizFlag" DataField="BIZ_FLAG" AddEmpty="true" ECIType="BIZ_FLAG_KY" NotNull="true" Width="85%"></asp:ECombox></td>
                         <td class="lbl">货站代码</td>
-<td><asp:ETextBox runat="server" ID ="txtCode"  DataField="CODE" NotNull="true" Width="85%"></asp:ETextBox></td>
+                        <td>
+                            <asp:ETextBox runat="server" ID="txtCode" DataField="CODE" NotNull="true" Width="85%"></asp:ETextBox></td>
                         <td class="lbl">机场代码</td>
-<td><asp:ETextBox runat="server" ID ="txtJcCode"  DataField="JC_CODE" NotNull="true" Width="85%"></asp:ETextBox></td>
+                        <td>
+                            <asp:ETextBox runat="server" ID="txtJcCode" DataField="JC_CODE" NotNull="true" Width="85%"></asp:ETextBox></td>
 
-               </tr>
-   <tr>
+                    </tr>
+                    <tr>
                         <td class="lbl">货站中文名称</td>
-<td><asp:ETextBox runat="server" ID ="txtName"  DataField="NAME" NotNull="true" Width="85%"></asp:ETextBox></td>
+                        <td>
+                            <asp:ETextBox runat="server" ID="txtName" DataField="NAME" NotNull="true" Width="85%"></asp:ETextBox></td>
                         <td class="lbl">监管等级</td>
-<td><asp:ECombox runat="server" ID ="cboJgdj"  DataField="JGDJ" AddEmpty="true" ECIType="JGDJ" NotNull="true" Width="85%"></asp:ECombox></td>
+                        <td>
+                            <asp:ECombox runat="server" ID="cboJgdj" DataField="JGDJ" AddEmpty="true" ECIType="JGDJ" NotNull="true" Width="85%"></asp:ECombox></td>
                         <td class="lbl">申报编码</td>
-<td><asp:ETextBox runat="server" ID ="txtSbbm"  DataField="SBBM" Width="85%"></asp:ETextBox></td>
+                        <td>
+                            <asp:ETextBox runat="server" ID="txtSbbm" DataField="SBBM" Width="85%"></asp:ETextBox></td>
 
-               </tr>
-   <tr>
+                    </tr>
+                    <tr>
                         <td class="lbl">接货人信息</td>
-<td><asp:ETextBox runat="server" ID ="txtJhrxx"  DataField="JHRXX" Width="85%"></asp:ETextBox></td>
-                        <td class="lbl">&nbsp;</td><td>&nbsp;</td>
-                        <td class="lbl">&nbsp;</td><td>&nbsp;</td>
+                        <td colspan="5">
+                            <asp:ETextBox TextMode="MultiLine" Rows="3" runat="server" ID="txtJhrxx" DataField="JHRXX" Width="96%"></asp:ETextBox></td>
 
-               </tr>
+                    </tr>
 
                 </table>
             </div>

+ 20 - 23
FMS24/Web/AppFms/Bdky/frmBdKyCkhzEdit.aspx.cs

@@ -23,31 +23,33 @@ public partial class AppFms_Bdky_frmBdKyCkhzEdit : BasePage
     protected void Page_Load(object sender, EventArgs e)
     {
 
-            if (!IsPostBack)
+        if (!IsPostBack)
+        {
+            this.key = PageHelper.Request("key");
+            cboBizFlag.InitItems();
+            cboJgdj.InitItems();
+
+            if (this.key.HasValue())
             {
-                this.key = PageHelper.Request("key");
-
-                if (this.key.HasValue())
-                {
-                    LoadRecord();
-                }
-			   else
-               {
-                  this.btnAdd.Enabled = false;
-               }
+                LoadRecord();
             }
+            else
+            {
+                this.btnAdd.Enabled = false;
+            }
+        }
     }
 
     private void LoadRecord()
     {
-            EciRequest request = new EciRequest(FMSService.BdKyCkhzLoad);
-            request.Key = this.key;
+        EciRequest request = new EciRequest(FMSService.BdKyCkhzLoad);
+        request.Key = this.key;
 
-            EciResponse response = SOA.Execute(request);
+        EciResponse response = SOA.Execute(request);
 
-            BD_KY_CKHZ data = response.DataTable.ToEntity<BD_KY_CKHZ>();
+        BD_KY_CKHZ data = response.DataTable.ToEntity<BD_KY_CKHZ>();
 
-            this.Bind(data);
+        this.Bind(data);
     }
 
     protected void btnSave_Click(object sender, EventArgs e)
@@ -71,17 +73,12 @@ public partial class AppFms_Bdky_frmBdKyCkhzEdit : BasePage
         if (request.IsAdd)
         {
             this.key = data.GUID;
- 
+
             this.btnAdd.Enabled = true;
 
-            //this.txtCreateDate.Text = DateTime.Now.ToFullString();
-            //this.txtCreateUser.Text = this.UserInfo.UserName;
+            HtmlWindow.Onload("window.parent.location.href='frmBdKyCkhzEditTab.aspx?cg=" + key + "'");
 
         }
-
-        //this.txtUpdateDate.Text = DateTime.Now.ToFullString();
-        //this.txtUpdateUser.Text = this.UserInfo.UserName;
-
         response.Message.Tip();
     }
 }

+ 28 - 0
FMS24/Web/AppFms/Bdky/frmBdKyCkhzEditTab.aspx

@@ -0,0 +1,28 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeFile="frmBdKyCkhzEditTab.aspx.cs" Inherits="AppFms_Bdky_frmBdKyCkhzEditTab" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <title></title>
+    <link href="../../Themes/Default/eci.css" rel="stylesheet" />
+    <!-- #include File="../../App/Common/PageLoad.aspx" -->
+    <link href="../../EasyUI/themes/default/easyui.css" rel="stylesheet" />
+    <link href="../../EasyUI/themes/icon.css" rel="stylesheet" />
+    <script type="text/javascript">
+       
+    </script>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <input type="hidden" runat="server" id="hidCkhzGuid" />
+        <div id="divHead"  class="fitH" >
+            <asp:ETab runat="server" ID="tabMain">
+                <asp:ETabItem runat="server" ID="tabCkhz" Title="仓库货站编辑" Frame="true"></asp:ETabItem>
+                <asp:ETabItem runat="server" ID="tabJhr" Title="交货人信息" Frame="true"></asp:ETabItem>
+            </asp:ETab>
+        </div>
+    </form>
+</body>
+</html>

+ 25 - 0
FMS24/Web/AppFms/Bdky/frmBdKyCkhzEditTab.aspx.cs

@@ -0,0 +1,25 @@
+using PL.Base;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+public partial class AppFms_Bdky_frmBdKyCkhzEditTab : BasePage
+{
+    private string CkhzGuid
+    {
+        get { return this.hidCkhzGuid.Value; }
+        set { this.hidCkhzGuid.Value = value; }
+    }
+    protected void Page_Load(object sender, EventArgs e)
+    {
+        if (!IsPostBack)
+        {
+            this.CkhzGuid = PageHelper.Request("cg");
+            this.tabCkhz.Url = "frmBdKyCkhzEdit.aspx?key=" + this.CkhzGuid;
+            this.tabJhr.Url = "frmBdKyCkhzJhrList.aspx?cg=" + this.CkhzGuid;
+        }
+    }
+}

+ 49 - 45
FMS24/Web/AppFms/Bdky/frmBdKyCkhzJhrEdit.aspx

@@ -4,19 +4,18 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
-    <title>仓库货站维护</title>
+    <title>仓库货站-交货人信息维护</title>
     <link href="../../Themes/Default/eci.css" rel="stylesheet" />
     <!-- #include File="../../App/Common/PageLoad.aspx" -->
     <script type="text/javascript">
-         
-       function addAction() {
 
-            if(eci.hasSave())
-            {
-               var url = "frmBdKyCkhzJhrEdit.aspx";
+        function addAction() {
 
-                window.location.href=url;
-             }
+            if (eci.hasSave()) {
+                var url = "frmBdKyCkhzJhrEdit.aspx";
+
+                window.location.href = url;
+            }
         }
 
 
@@ -25,54 +24,59 @@
 <body>
     <form id="form1" runat="server">
         <input type="hidden" id="hidKey" runat="server" />
-
+        <input type="hidden" runat="server" id="hidCkhzGuid" />
 
         <div id="root">
-              
-           <asp:ETitle runat="server" ID="pagetitle" Title="仓库货站维护"></asp:ETitle>
+
+            <asp:ETitle runat="server" ID="pagetitle" Title="仓库货站-交货人信息维护"></asp:ETitle>
 
             <div id="toolbar" class="toolbar">
-              <asp:EButton runat="server" ID="btnSave" Text="保存" NeedCheck="true" ValidateId="tbEdit" OnClick="btnSave_Click" Icon="save" />
-              <asp:EButton runat="server" ID="btnAdd" Text="新增" Icon="Add" OnClientClick="addAction();" IsClient="true" />
-              <asp:EButton runat="server" IsClient="true" ID="btnClose" Text="关闭" Icon="close" OnClientClick="eci.close();" />
+                <asp:EButton runat="server" ID="btnSave" Text="保存" NeedCheck="true" ValidateId="tbEdit" OnClick="btnSave_Click" Icon="save" />
+                <asp:EButton runat="server" ID="btnAdd" Text="新增" Icon="Add" OnClientClick="addAction();" IsClient="true" />
+                <asp:EButton runat="server" IsClient="true" ID="btnClose" Text="关闭" Icon="close" OnClientClick="eci.close();" />
 
             </div>
             <div>
-                <table  id="tbEdit" class="grid" cellpadding="0" cellspacing="0" >
+                <table id="tbEdit" class="grid" cellpadding="0" cellspacing="0">
                     <tr>
                         <th style="width: 10%"></th>
-<th style="width: 20%"></th>
-<th style="width: 10%"></th>
-<th style="width: 20%"></th>
-<th style="width: 10%"></th>
-<th style="width: 20%"></th>
+                        <th style="width: 20%"></th>
+                        <th style="width: 10%"></th>
+                        <th style="width: 20%"></th>
+                        <th style="width: 10%"></th>
+                        <th style="width: 20%"></th>
+
+                    </tr>
+                    <tr>
+                        <td class="lbl">交货类型</td>
+                        <td>
+                            <asp:ETextBox runat="server" ID="txtJhlx" NotNull="true" DataField="JHLX" Width="85%"></asp:ETextBox></td>
+                        <td class="lbl">交货模板</td>
+                        <td>
+                            <asp:ECombox runat="server" ID="cboJhmb" DataField="JHMB" AddEmpty="true" ECIType="JHTSMB" NotNull="true" Width="85%"></asp:ECombox></td>
+                        <td class="lbl">姓名</td>
+                        <td>
+                            <asp:ETextBox runat="server" ID="txtUserName" DataField="USER_NAME" Width="85%"></asp:ETextBox></td>
+
+                    </tr>
+                    <tr>
+                        <td class="lbl">电话</td>
+                        <td>
+                            <asp:ETextBox runat="server" ID="txtTel" DataField="TEL" Width="85%"></asp:ETextBox></td>
+                        <td class="lbl">身份证号</td>
+                        <td>
+                            <asp:ETextBox runat="server" ID="txtIdCard" DataField="ID_CARD" Width="85%"></asp:ETextBox></td>
+                        <td class="lbl">安检证号</td>
+                        <td>
+                            <asp:ETextBox runat="server" ID="txtAjzh" DataField="AJZH" Width="85%"></asp:ETextBox></td>
+
+                    </tr>
+                    <tr>
+                        <td class="lbl">备注</td>
+                        <td colspan="5">
+                            <asp:ETextBox TextMode="MultiLine" Rows="3"  runat="server" ID="txtRemark" DataField="REMARK" Width="96%"></asp:ETextBox></td>
 
                     </tr>
-                        <tr>
-                        <td class="lbl">业务范畴</td>
-<td><asp:ECombox runat="server" ID ="cboBizFlag"  DataField="BIZ_FLAG" AddEmpty="true" ECIType="BIZ_FLAG" NotNull="true" Width="85%"></asp:ECombox></td>
-                        <td class="lbl">货站代码</td>
-<td><asp:ETextBox runat="server" ID ="txtCode"  DataField="CODE" NotNull="true" Width="85%"></asp:ETextBox></td>
-                        <td class="lbl">机场代码</td>
-<td><asp:ETextBox runat="server" ID ="txtJcCode"  DataField="JC_CODE" NotNull="true" Width="85%"></asp:ETextBox></td>
-
-               </tr>
-   <tr>
-                        <td class="lbl">货站中文名称</td>
-<td><asp:ETextBox runat="server" ID ="txtName"  DataField="NAME" NotNull="true" Width="85%"></asp:ETextBox></td>
-                        <td class="lbl">监管等级</td>
-<td><asp:ECombox runat="server" ID ="cboJgdj"  DataField="JGDJ" AddEmpty="true" ECIType="JGDJ" NotNull="true" Width="85%"></asp:ECombox></td>
-                        <td class="lbl">申报编码</td>
-<td><asp:ETextBox runat="server" ID ="txtSbbm"  DataField="SBBM" Width="85%"></asp:ETextBox></td>
-
-               </tr>
-   <tr>
-                        <td class="lbl">接货人信息</td>
-<td><asp:ETextBox runat="server" ID ="txtJhrxx"  DataField="JHRXX" Width="85%"></asp:ETextBox></td>
-                        <td class="lbl">&nbsp;</td><td>&nbsp;</td>
-                        <td class="lbl">&nbsp;</td><td>&nbsp;</td>
-
-               </tr>
 
                 </table>
             </div>

+ 26 - 20
FMS24/Web/AppFms/Bdky/frmBdKyCkhzJhrEdit.aspx.cs

@@ -19,35 +19,41 @@ public partial class AppFms_Bdky_frmBdKyCkhzJhrEdit : BasePage
         get { return this.hidKey.Value; }
         set { this.hidKey.Value = value; }
     }
-
+    private string CkhzGuid
+    {
+        get { return this.hidCkhzGuid.Value; }
+        set { this.hidCkhzGuid.Value = value; }
+    }
     protected void Page_Load(object sender, EventArgs e)
     {
 
-            if (!IsPostBack)
+        if (!IsPostBack)
+        {
+            this.key = PageHelper.Request("key");
+            this.CkhzGuid = PageHelper.Request("cg");
+            cboJhmb.InitItems();
+
+            if (this.key.HasValue())
             {
-                this.key = PageHelper.Request("key");
-
-                if (this.key.HasValue())
-                {
-                    LoadRecord();
-                }
-			   else
-               {
-                  this.btnAdd.Enabled = false;
-               }
+                LoadRecord();
             }
+            else
+            {
+                this.btnAdd.Enabled = false;
+            }
+        }
     }
 
     private void LoadRecord()
     {
-            EciRequest request = new EciRequest(FMSService.BdKyCkhzJhrLoad);
-            request.Key = this.key;
+        EciRequest request = new EciRequest(FMSService.BdKyCkhzJhrLoad);
+        request.Key = this.key;
 
-            EciResponse response = SOA.Execute(request);
+        EciResponse response = SOA.Execute(request);
 
-            BD_KY_CKHZ_JHR data = response.DataTable.ToEntity<BD_KY_CKHZ_JHR>();
+        BD_KY_CKHZ_JHR data = response.DataTable.ToEntity<BD_KY_CKHZ_JHR>();
 
-            this.Bind(data);
+        this.Bind(data);
     }
 
     protected void btnSave_Click(object sender, EventArgs e)
@@ -63,6 +69,7 @@ public partial class AppFms_Bdky_frmBdKyCkhzJhrEdit : BasePage
         saveEntity.Data = this.GetEntityFromUI().Data;
 
         saveEntity.GUID = this.key;
+        saveEntity.CKHZ_GUID = this.CkhzGuid;
 
         EciResponse response = SOA.Execute(request);
 
@@ -71,11 +78,10 @@ public partial class AppFms_Bdky_frmBdKyCkhzJhrEdit : BasePage
         if (request.IsAdd)
         {
             this.key = data.GUID;
- 
+
             this.btnAdd.Enabled = true;
 
-            //this.txtCreateDate.Text = DateTime.Now.ToFullString();
-            //this.txtCreateUser.Text = this.UserInfo.UserName;
+            this.CkhzGuid = data.CKHZ_GUID;
 
         }
 

+ 40 - 54
FMS24/Web/AppFms/Bdky/frmBdKyCkhzJhrList.aspx

@@ -4,7 +4,7 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
-    <title>仓库货站</title>
+    <title>仓库货站-交货人信息</title>
     <link href="../../Themes/Default/eci.css" rel="stylesheet" />
     <!-- #include File="../../App/Common/PageLoad.aspx" -->
     <script type="text/javascript">
@@ -14,13 +14,13 @@
         }
 
         function addAction() {
-            var url = "frmBdKyCkhzJhrEdit.aspx";
+            var url = "frmBdKyCkhzJhrEdit.aspx?cg=" + $("#hidCkhzGuid").val();
             eci.open(url);
         }
 
         function editAction(obj) {
             var key = $(obj).getKey();
-            var url = "frmBdKyCkhzJhrEdit.aspx?key=" + key;
+            var url = "frmBdKyCkhzJhrEdit.aspx?key=" + key + "&cg=" + $("#hidCkhzGuid").val();
             eci.open(url);
         }
 
@@ -28,82 +28,68 @@
 </head>
 <body>
     <form id="form1" runat="server">
+        <input type="hidden" runat="server" id="hidCkhzGuid" />
         <div id="root">
-           
-           <asp:ETitle runat="server" ID="pagetitle" Title="仓库货站"></asp:ETitle>
-               
+
+            <%--<asp:ETitle runat="server" ID="pagetitle" Title="仓库货站-交货人信息"></asp:ETitle>--%>
+
             <div id="divQuery" style="width: 100%;">
-                <table   id="tbQuery" class="grid" cellpadding="0" cellspacing="0">
+                <table id="tbQuery" class="grid" cellpadding="0" cellspacing="0">
+                    <tr>
+                        <th style="width: 10%"></th>
+                        <th style="width: 20%"></th>
+                        <th style="width: 10%"></th>
+                        <th style="width: 20%"></th>
+                        <th style="width: 10%"></th>
+                        <th style="width: 20%"></th>
+
+                    </tr>
                     <tr>
-                         <th style="width: 10%"></th>
-<th style="width: 20%"></th>
-<th style="width: 10%"></th>
-<th style="width: 20%"></th>
-<th style="width: 10%"></th>
-<th style="width: 20%"></th>
+                        <td class="lbl">交货模板</td>
+                        <td>
+                            <asp:ECombox runat="server" ID="cboJhmb" DataField="JHMB" Query="A.JHMB|string|=" AddEmpty="true" ECIType="JHTSMB" Width="85%"></asp:ECombox></td>
+                        <td class="lbl">&nbsp;</td>
+                        <td>&nbsp;</td>
+                        <td class="lbl">&nbsp;</td>
+                        <td>&nbsp;</td>
 
                     </tr>
-                        <tr>
-                        <td class="lbl">业务范畴</td>
-<td><asp:ECombox runat="server" ID ="cboBizFlag"  DataField="BIZ_FLAG" Query="A.BIZ_FLAG|string|=" AddEmpty="true" ECIType="BIZ_FLAG" Width="85%"></asp:ECombox></td>
-                        <td class="lbl">机场代码</td>
-<td><asp:ETextBox runat="server" ID ="txtJcCode"  DataField="JC_CODE" Query="A.JC_CODE|string|like" Width="85%"></asp:ETextBox></td>
-                        <td class="lbl">货站中文名称</td>
-<td><asp:ETextBox runat="server" ID ="txtName"  DataField="NAME" Query="A.NAME|string|like" Width="85%"></asp:ETextBox></td>
-
-               </tr>
-   <tr>
-                        <td class="lbl">监管等级</td>
-<td><asp:ECombox runat="server" ID ="cboJgdj"  DataField="JGDJ" Query="A.JGDJ|string|=" AddEmpty="true" ECIType="JGDJ" Width="85%"></asp:ECombox></td>
-                        <td class="lbl">&nbsp;</td><td>&nbsp;</td>
-                        <td class="lbl">&nbsp;</td><td>&nbsp;</td>
-
-               </tr>
 
                     <tr>
                         <td class="center" colspan="6">
-                            <asp:EButton runat="server" ID="btnSearch" Text="查询"  Icon="find"   />
-                            <asp:EButton runat="server" ID="btnReset" IsClient="true" Text="重置"  Icon="reset"   OnClientClick= "eci.reset('tbQuery');"/></td>
+                            <asp:EButton runat="server" ID="btnSearch" Text="查询" Icon="find" />
+                            <asp:EButton runat="server" ID="btnReset" IsClient="true" Text="重置" Icon="reset" OnClientClick="eci.reset('tbQuery');" /></td>
                     </tr>
                 </table>
             </div>
             <div id="toolbar">
                 <asp:EButton runat="server" ID="btnAdd" Text="新增" Icon="Add" OnClientClick="addAction();" IsClient="true" />
+                <asp:EButton runat="server" IsClient="true" ID="btnClose" Text="关闭" Icon="close" OnClientClick="window.parent.eci.close();" />
             </div>
             <div id="datagrid">
 
-                <asp:EGridView ID="gvData" Layout="divQuery,toolbar,pagetitle" runat="server" 
-                    FitWindow="true"  EnableSorting="True" EnableSelect="false"   EnablePaging="true" EnableClickSelectRow="true" 
-                    Width="1000px" KeyField="GUID"  HAlign="center" OnClick="editAction"> 
+                <asp:EGridView ID="gvData" Layout="divQuery,toolbar,pagetitle" runat="server"
+                    FitWindow="true" EnableSorting="True" EnableSelect="false" EnablePaging="true" EnableClickSelectRow="true"
+                    Width="1000px" KeyField="GUID" HAlign="center" OnClick="editAction">
                     <Columns>
 
-                      <asp:TemplateField HeaderText="编辑" ItemStyle-HorizontalAlign="Center" ItemStyle-Width="80">
+                        <asp:TemplateField HeaderText="操作" ItemStyle-HorizontalAlign="Center" ItemStyle-Width="150">
                             <ItemTemplate>
                                 <asp:EButton runat="server" ID="btnEdit" Text="编辑" IsClient="true" Icon="edit" OnClientClick="editAction(this);" />
+                                <asp:EButton runat="server" Icon="Delete" ID="btnDelete" Text="删除" IsClient="true" OnClientClick="return deleteAction(this);" CommandArgument='<%#Eval("GUID")%>' OnClick="btnDelete_Click" />
                             </ItemTemplate>
                         </asp:TemplateField>
 
 
-                          <asp:TemplateField HeaderText="删除" ItemStyle-HorizontalAlign="Center" ItemStyle-Width="80">
-                            <ItemTemplate>
-                                <asp:EButton runat="server" Icon="Delete" ID="btnDelete" Text="删除" IsClient="true" OnClientClick="return deleteAction(this);"  CommandArgument='<%#Eval("GUID")%>'  OnClick="btnDelete_Click" />
-
-                            </ItemTemplate>
-                        </asp:TemplateField>
-
-
-                      <asp:BoundField DataField="BIZ_FLAG" HeaderText="业务范畴" SortExpression="BIZ_FLAG"  ItemStyle-Width="150"></asp:BoundField>
-                      <asp:BoundField DataField="JC_CODE" HeaderText="机场代码" SortExpression="JC_CODE"  ItemStyle-Width="150"></asp:BoundField>
-                      <asp:BoundField DataField="CODE" HeaderText="货站代码" SortExpression="CODE"  ItemStyle-Width="150"></asp:BoundField>
-                      <asp:BoundField DataField="NAME" HeaderText="货站中文名称" SortExpression="NAME"  ItemStyle-Width="150"></asp:BoundField>
-                      <asp:BoundField DataField="JGDJ" HeaderText="监管等级" SortExpression="JGDJ"  ItemStyle-Width="150"></asp:BoundField>
-                      <asp:BoundField DataField="SBBM" HeaderText="申报编码" SortExpression="SBBM"  ItemStyle-Width="150"></asp:BoundField>
-                      <asp:BoundField DataField="CREATE_USER_NAME" HeaderText="创建人" SortExpression="CREATE_USER_NAME"  ItemStyle-Width="150"></asp:BoundField>
-                      <asp:BoundField DataField="CREATE_DATE" HeaderText="创建日期" SortExpression="CREATE_DATE" DataFormatString="{0:yyyy-MM-dd HH:mm:ss}" ItemStyle-Width="150"></asp:BoundField>
-                      <asp:BoundField DataField="UPDATE_USER_NAME" HeaderText="修改人" SortExpression="UPDATE_USER_NAME"  ItemStyle-Width="150"></asp:BoundField>
-                      <asp:BoundField DataField="UPDATE_DATE" HeaderText="修改日期" SortExpression="UPDATE_DATE" DataFormatString="{0:yyyy-MM-dd HH:mm:ss}" ItemStyle-Width="150"></asp:BoundField>
+                        <asp:BoundField DataField="JHLX" HeaderText="交货类型" SortExpression="JHLX" ItemStyle-Width="150"></asp:BoundField>
+                        <asp:BoundField DataField="JHMB_NAME" HeaderText="交货模板" SortExpression="JHMB" ItemStyle-Width="150"></asp:BoundField>
+                        <asp:BoundField DataField="USER_NAME" HeaderText="姓名" SortExpression="USER_NAME" ItemStyle-Width="150"></asp:BoundField>
+                        <asp:BoundField DataField="TEL" HeaderText="电话" SortExpression="TEL" ItemStyle-Width="150"></asp:BoundField>
+                        <asp:BoundField DataField="ID_CARD" HeaderText="身份证号" SortExpression="ID_CARD" ItemStyle-Width="150"></asp:BoundField>
+                        <asp:BoundField DataField="AJZH" HeaderText="安检证号" SortExpression="AJZH" ItemStyle-Width="150"></asp:BoundField>
+                        <asp:BoundField DataField="REMARK" HeaderText="备注" SortExpression="REMARK" ItemStyle-Width="150"></asp:BoundField>
 
-                   </Columns>
+                    </Columns>
                 </asp:EGridView>
             </div>
         </div>

+ 10 - 2
FMS24/Web/AppFms/Bdky/frmBdKyCkhzJhrList.aspx.cs

@@ -13,12 +13,19 @@ using FMS.UI;
 
 public partial class AppFms_Bdky_frmBdKyCkhzJhrList : QueryPage
 {
+    private string CkhzGuid
+    {
+        get { return this.hidCkhzGuid.Value; }
+        set { this.hidCkhzGuid.Value = value; }
+    }
     protected void Page_Load(object sender, EventArgs e)
     {
 
          if (!IsPostBack)
-         {
-
+        {
+            this.CkhzGuid = PageHelper.Request("cg");
+            cboJhmb.InitItems();
+            this.Search();
          }
 
     }
@@ -29,6 +36,7 @@ public partial class AppFms_Bdky_frmBdKyCkhzJhrList : QueryPage
  
         request.Entity = new EntityBase();
         request.Entity.GetBindingData();
+        request.Entity.AddCommonQuerySetting("CKHZ_GUID", "A.CKHZ_GUID|s|=", this.CkhzGuid);
     }
 
     protected void btnDelete_Click(object sender, EventArgs e)

+ 46 - 48
FMS24/Web/AppFms/Bdky/frmBdKyCkhzList.aspx

@@ -20,7 +20,7 @@
 
         function editAction(obj) {
             var key = $(obj).getKey();
-            var url = "frmBdKyCkhzEdit.aspx?key=" + key;
+            var url = "frmBdKyCkhzEditTab.aspx?cg=" + key;
             eci.open(url);
         }
 
@@ -29,41 +29,47 @@
 <body>
     <form id="form1" runat="server">
         <div id="root">
-           
-           <asp:ETitle runat="server" ID="pagetitle" Title="仓库货站"></asp:ETitle>
-               
+
+            <asp:ETitle runat="server" ID="pagetitle" Title="仓库货站"></asp:ETitle>
+
             <div id="divQuery" style="width: 100%;">
-                <table   id="tbQuery" class="grid" cellpadding="0" cellspacing="0">
+                <table id="tbQuery" class="grid" cellpadding="0" cellspacing="0">
                     <tr>
-                         <th style="width: 10%"></th>
-<th style="width: 20%"></th>
-<th style="width: 10%"></th>
-<th style="width: 20%"></th>
-<th style="width: 10%"></th>
-<th style="width: 20%"></th>
+                        <th style="width: 10%"></th>
+                        <th style="width: 20%"></th>
+                        <th style="width: 10%"></th>
+                        <th style="width: 20%"></th>
+                        <th style="width: 10%"></th>
+                        <th style="width: 20%"></th>
 
                     </tr>
-                        <tr>
+                    <tr>
                         <td class="lbl">业务范畴</td>
-<td><asp:ECombox runat="server" ID ="cboBizFlag"  DataField="BIZ_FLAG" Query="A.BIZ_FLAG|string|=" AddEmpty="true" ECIType="BIZ_FLAG" Width="85%"></asp:ECombox></td>
+                        <td>
+                            <asp:ECombox runat="server" ID="cboBizFlag" DataField="BIZ_FLAG" Query="A.BIZ_FLAG|string|=" AddEmpty="true" ECIType="BIZ_FLAG_KY" Width="85%"></asp:ECombox></td>
                         <td class="lbl">机场代码</td>
-<td><asp:ETextBox runat="server" ID ="txtJcCode"  DataField="JC_CODE" Query="A.JC_CODE|string|like" Width="85%"></asp:ETextBox></td>
+                        <td>
+                            <asp:ETextBox runat="server" ID="txtJcCode" DataField="JC_CODE" Query="A.JC_CODE|string|like" Width="85%"></asp:ETextBox></td>
                         <td class="lbl">货站中文名称</td>
-<td><asp:ETextBox runat="server" ID ="txtName"  DataField="NAME" Query="A.NAME|string|like" Width="85%"></asp:ETextBox></td>
+                        <td>
+                            <asp:ETextBox runat="server" ID="txtName" DataField="NAME" Query="A.NAME|string|like" Width="85%"></asp:ETextBox></td>
 
-               </tr>
-   <tr>
+                    </tr>
+                    <tr>
                         <td class="lbl">监管等级</td>
-<td><asp:ECombox runat="server" ID ="cboJgdj"  DataField="JGDJ" Query="A.JGDJ|string|=" AddEmpty="true" ECIType="JGDJ" Width="85%"></asp:ECombox></td>
-                        <td class="lbl">&nbsp;</td><td>&nbsp;</td>
-                        <td class="lbl">&nbsp;</td><td>&nbsp;</td>
+                        <td>
+                            <asp:ECombox runat="server" ID="cboJgdj" DataField="JGDJ" Query="A.JGDJ|string|=" AddEmpty="true" ECIType="JGDJ" Width="85%"></asp:ECombox></td>
+                        <td class="lbl">&nbsp;</td>
+                        <td>&nbsp;</td>
+                        <td class="lbl">&nbsp;</td>
+                        <td>&nbsp;</td>
 
-               </tr>
+                    </tr>
 
                     <tr>
                         <td class="center" colspan="6">
-                            <asp:EButton runat="server" ID="btnSearch" Text="查询"  Icon="find"   />
-                            <asp:EButton runat="server" ID="btnReset" IsClient="true" Text="重置"  Icon="reset"   OnClientClick= "eci.reset('tbQuery');"/></td>
+                            <asp:EButton runat="server" ID="btnSearch" Text="查询" Icon="find" />
+                            <asp:EButton runat="server" ID="btnReset" IsClient="true" Text="重置" Icon="reset" OnClientClick="eci.reset('tbQuery');" /></td>
                     </tr>
                 </table>
             </div>
@@ -72,38 +78,30 @@
             </div>
             <div id="datagrid">
 
-                <asp:EGridView ID="gvData" Layout="divQuery,toolbar,pagetitle" runat="server" 
-                    FitWindow="true"  EnableSorting="True" EnableSelect="false"   EnablePaging="true" EnableClickSelectRow="true" 
-                    Width="1000px" KeyField="GUID"  HAlign="center" OnClick="editAction"> 
+                <asp:EGridView ID="gvData" Layout="divQuery,toolbar,pagetitle" runat="server"
+                    FitWindow="true" EnableSorting="True" EnableSelect="false" EnablePaging="true" EnableClickSelectRow="true"
+                    Width="1000px" KeyField="GUID" HAlign="center" OnClick="editAction">
                     <Columns>
 
-                      <asp:TemplateField HeaderText="编辑" ItemStyle-HorizontalAlign="Center" ItemStyle-Width="80">
+                        <asp:TemplateField HeaderText="操作" ItemStyle-HorizontalAlign="Center" ItemStyle-Width="150">
                             <ItemTemplate>
                                 <asp:EButton runat="server" ID="btnEdit" Text="编辑" IsClient="true" Icon="edit" OnClientClick="editAction(this);" />
+                                <asp:EButton runat="server" Icon="Delete" ID="btnDelete" Text="删除" IsClient="true" OnClientClick="return deleteAction(this);" CommandArgument='<%#Eval("GUID")%>' OnClick="btnDelete_Click" />
                             </ItemTemplate>
                         </asp:TemplateField>
 
-
-                          <asp:TemplateField HeaderText="删除" ItemStyle-HorizontalAlign="Center" ItemStyle-Width="80">
-                            <ItemTemplate>
-                                <asp:EButton runat="server" Icon="Delete" ID="btnDelete" Text="删除" IsClient="true" OnClientClick="return deleteAction(this);"  CommandArgument='<%#Eval("GUID")%>'  OnClick="btnDelete_Click" />
-
-                            </ItemTemplate>
-                        </asp:TemplateField>
-
-
-                      <asp:BoundField DataField="BIZ_FLAG" HeaderText="业务范畴" SortExpression="BIZ_FLAG"  ItemStyle-Width="150"></asp:BoundField>
-                      <asp:BoundField DataField="JC_CODE" HeaderText="机场代码" SortExpression="JC_CODE"  ItemStyle-Width="150"></asp:BoundField>
-                      <asp:BoundField DataField="CODE" HeaderText="货站代码" SortExpression="CODE"  ItemStyle-Width="150"></asp:BoundField>
-                      <asp:BoundField DataField="NAME" HeaderText="货站中文名称" SortExpression="NAME"  ItemStyle-Width="150"></asp:BoundField>
-                      <asp:BoundField DataField="JGDJ" HeaderText="监管等级" SortExpression="JGDJ"  ItemStyle-Width="150"></asp:BoundField>
-                      <asp:BoundField DataField="SBBM" HeaderText="申报编码" SortExpression="SBBM"  ItemStyle-Width="150"></asp:BoundField>
-                      <asp:BoundField DataField="CREATE_USER_NAME" HeaderText="创建人" SortExpression="CREATE_USER_NAME"  ItemStyle-Width="150"></asp:BoundField>
-                      <asp:BoundField DataField="CREATE_DATE" HeaderText="创建日期" SortExpression="CREATE_DATE" DataFormatString="{0:yyyy-MM-dd HH:mm:ss}" ItemStyle-Width="150"></asp:BoundField>
-                      <asp:BoundField DataField="UPDATE_USER_NAME" HeaderText="修改人" SortExpression="UPDATE_USER_NAME"  ItemStyle-Width="150"></asp:BoundField>
-                      <asp:BoundField DataField="UPDATE_DATE" HeaderText="修改日期" SortExpression="UPDATE_DATE" DataFormatString="{0:yyyy-MM-dd HH:mm:ss}" ItemStyle-Width="150"></asp:BoundField>
-
-                   </Columns>
+                        <asp:BoundField DataField="BIZ_FLAG" HeaderText="业务范畴" SortExpression="BIZ_FLAG" ItemStyle-Width="150"></asp:BoundField>
+                        <asp:BoundField DataField="JC_CODE" HeaderText="机场代码" SortExpression="JC_CODE" ItemStyle-Width="150"></asp:BoundField>
+                        <asp:BoundField DataField="CODE" HeaderText="货站代码" SortExpression="CODE" ItemStyle-Width="150"></asp:BoundField>
+                        <asp:BoundField DataField="NAME" HeaderText="货站中文名称" SortExpression="NAME" ItemStyle-Width="150"></asp:BoundField>
+                        <asp:BoundField DataField="JGDJ_NAME" HeaderText="监管等级" SortExpression="JGDJ" ItemStyle-Width="150"></asp:BoundField>
+                        <asp:BoundField DataField="SBBM" HeaderText="申报编码" SortExpression="SBBM" ItemStyle-Width="150"></asp:BoundField>
+                        <asp:BoundField DataField="CREATE_USER_NAME" HeaderText="创建人" SortExpression="CREATE_USER_NAME" ItemStyle-Width="150"></asp:BoundField>
+                        <asp:BoundField DataField="CREATE_DATE" HeaderText="创建日期" SortExpression="CREATE_DATE" DataFormatString="{0:yyyy-MM-dd HH:mm:ss}" ItemStyle-Width="150"></asp:BoundField>
+                        <asp:BoundField DataField="UPDATE_USER_NAME" HeaderText="修改人" SortExpression="UPDATE_USER_NAME" ItemStyle-Width="150"></asp:BoundField>
+                        <asp:BoundField DataField="UPDATE_DATE" HeaderText="修改日期" SortExpression="UPDATE_DATE" DataFormatString="{0:yyyy-MM-dd HH:mm:ss}" ItemStyle-Width="150"></asp:BoundField>
+
+                    </Columns>
                 </asp:EGridView>
             </div>
         </div>

+ 3 - 2
FMS24/Web/AppFms/Bdky/frmBdKyCkhzList.aspx.cs

@@ -18,8 +18,9 @@ public partial class AppFms_Bdky_frmBdKyCkhzList : QueryPage
 
          if (!IsPostBack)
          {
-
-         }
+            cboBizFlag.InitItems();
+            cboJgdj.InitItems();
+        }
 
     }