服务类别

FMS24/FMS.BLL/Bd/BdServiceBLL.cs

@@ -77,6 +77,9 @@ namespace FMS.BLL
                return bdService;
 
          }
-	   
+        public DataTable GetLower(BLLContext context, string id)
+        {
+            return dal.GetLower(context, id);
+        }
     }
 }

FMS24/FMS.BLL/Bd/BdServiceTypeBLL.cs

@@ -80,9 +80,6 @@ namespace FMS.BLL
 
          }
 
-        public DataTable GetLower(BLLContext context, string id)
-        {
-            return dal.GetLower(context, id);
-        }
+      
     }
 }

FMS24/FMS.DAL/Bd/BdServiceDAL.cs

@@ -62,6 +62,28 @@ namespace FMS.DAL
  
             return result;
         }
+        public DataTable GetLower(BLLContext context, string id)
+        {
+            string sql = "SELECT GUID AS ID,PARENTID,NAME as TEXT,'closed' AS STATE,A.GUID AS CODE,'' AS OWNERID,A.MEMO ";
+            sql += " FROM FMS_BD_SERVICE A WHERE STATUS='Y' AND  PARENTID=" + cmn.SQLQ(id);
+            sql += " ORDER BY SEQ ";
+
+            DataTable data = DBHelper.GetDataTable(sql);
+
+            sql = @"SELECT A.GUID AS ID,A.PARENTID ,A.NAME as TEXT,'closed' AS STATE ,A.CODE,A.OWNED_SERVICE AS OWNERID,A.REAMRK AS MEMO
+                           ,(SELECT NAME FROM FMS_BD_SERVICE X WHERE X.GUID=A.OWNED_SERVICE) AS OWNERNAME
+                           ,(SELECT NAME FROM FMS_BD_SERVICE_TYPE X WHERE X.GUID=A.PARENTID) AS PARENTNAME";
+            sql += " FROM FMS_BD_SERVICE_TYPE A WHERE A.PARENTID=" + cmn.SQLQ(id);
+            sql += " ORDER BY A.NAME ";
+
+            DataTable dataHasChildren = DBHelper.GetDataTable(sql);
+
+            data.PrimaryKey = new DataColumn[] { data.Columns["ID"] };
+            dataHasChildren.PrimaryKey = new DataColumn[] { dataHasChildren.Columns["ID"] };
+            data.Merge(dataHasChildren);
+
+            return data;
+        }
 
     }
 

FMS24/FMS.DAL/Bd/BdServiceTypeDAL.cs

@@ -38,7 +38,7 @@ namespace FMS.DAL
             //Ó¦¸¶Ð¡ÊýβÊý´¦Àí
             manage.AddAsTs("A.PAY_MANTISSA_TYPE_ID", "PAY_MANTISSA_TYPE", true, "PAY_MANTISSA_TYPE_NAME");
 
-            string sql = @"SELECT A.GUID,A.CODE,A.TYPE_NAME_CN,A.TYPE_NAME_EN,A.DEFAULT_RECEIVE
+            string sql = @"SELECT A.GUID,A.CODE,A.NAME,A.TYPE_NAME_EN,A.DEFAULT_RECEIVE
                            ,A.RECEIVE_STANDARD_ID,A.RECEIVE_PRICE,A.RECEIVE_CURR_ID,A.RECEIVE_MIN,A.RECEIVE_MAX
                            ,A.DECIMAL_LENGTH,A.RECEIVE_MANTISSA_TYPE_ID,A.DEFAULT_PAY,A.PAY_STANDARD_ID,A.PAY_PRICE
                            ,A.PAY_CURR_ID,A.PAY_MIN,A.PAY_MAX,A.PAY_DECIMAL_LENGTH,A.PAY_MANTISSA_TYPE_ID
@@ -65,7 +65,7 @@ namespace FMS.DAL
         {
             SearchResult result = new SearchResult();
 
-            string sql = @"SELECT /*ECI_SELECT*/  A.GUID,A.CODE,A.TYPE_NAME_CN,A.TYPE_NAME_EN,A.DEFAULT_RECEIVE
+            string sql = @"SELECT /*ECI_SELECT*/  A.GUID,A.CODE,A.NAME,A.TYPE_NAME_EN,A.DEFAULT_RECEIVE
                            ,A.RECEIVE_STANDARD_ID,A.RECEIVE_PRICE,A.RECEIVE_CURR_ID,A.RECEIVE_MIN,A.RECEIVE_MAX
                            ,A.DECIMAL_LENGTH,A.RECEIVE_MANTISSA_TYPE_ID,A.DEFAULT_PAY,A.PAY_STANDARD_ID,A.PAY_PRICE
                            ,A.PAY_CURR_ID,A.PAY_MIN,A.PAY_MAX,A.PAY_DECIMAL_LENGTH,A.PAY_MANTISSA_TYPE_ID
@@ -83,28 +83,6 @@ namespace FMS.DAL
  
             return result;
         }
-        public DataTable GetLower(BLLContext context, string id)
-        {
-            string sql = "SELECT GUID AS ID,PARENTID,NAME as TEXT,'closed' AS STATE,A.GUID AS CODE,'' AS OWNERID ";
-            sql += " FROM FMS_BD_SERVICE A WHERE STATUS='Y' AND  PARENTID=" + cmn.SQLQ(id);
-            sql += " ORDER BY SEQ ";
-
-            DataTable data = DBHelper.GetDataTable(sql);
-
-            sql = @"SELECT A.GUID AS ID,A.PARENTID ,A.TYPE_NAME_CN as TEXT,'closed' AS STATE ,A.CODE,A.OWNED_SERVICE AS OWNERID
-                           ,(SELECT NAME FROM FMS_BD_SERVICE X WHERE X.GUID=A.OWNED_SERVICE) AS OWNERNAME
-                           ,(SELECT NAME FROM FMS_BD_SERVICE_TYPE X WHERE X.GUID=A.PARENTID) AS PARENTNAME";
-            sql += " FROM FMS_BD_SERVICE_TYPE A WHERE A.PARENTID=" + cmn.SQLQ(id);
-            sql += " ORDER BY A.SEQ";
-
-            DataTable dataHasChildren = DBHelper.GetDataTable(sql);
-
-            data.PrimaryKey = new DataColumn[] { data.Columns["ID"] };
-            dataHasChildren.PrimaryKey = new DataColumn[] { dataHasChildren.Columns["ID"] };
-            data.Merge(dataHasChildren);
-
-            return data;
-        }
 
     }
 

FMS24/FMS.Entity/Entity/BD_SERVICE_TYPE.cs

@@ -68,15 +68,15 @@ namespace FMS.Entity
                     /// <summary>
                     ///  中文名称
                     /// </summary>
-                    public string TYPE_NAME_CN
+                    public string NAME
                     {
                         get
                         {
-                            return this.TextAccess["TYPE_NAME_CN"];
+                            return this.TextAccess["NAME"];
                         }
                         set
                         {
-                            this.TextAccess["TYPE_NAME_CN"] = value;
+                            this.TextAccess["NAME"] = value;
                         }
                     }
                     /// <summary>
@@ -569,6 +569,34 @@ namespace FMS.Entity
                             this.TextAccess["OWNED_SERVICE"] = value;
                         }
                     }
+                    /// <summary>
+                    ///  顺序
+                    /// </summary>
+                    public System.Nullable<double> SEQ
+                    {
+                        get
+                        {
+                            return this.DoubleAccess["SEQ"];
+                        }
+                        set
+                        {
+                            this.DoubleAccess["SEQ"] = value;
+                        }
+                    }
+                    /// <summary>
+                    ///  所属服务类别名称
+                    /// </summary>
+                    public string OWNERNAME
+                    {
+                        get
+                        {
+                            return this.TextAccess["OWNERNAME"];
+                        }
+                        set
+                        {
+                            this.TextAccess["OWNERNAME"] = value;
+                        }
+                    }
 
 
 		#endregion
@@ -658,7 +686,7 @@ namespace FMS.Entity
         {
                base.ListColumn.Add(new ColumnInfo() { Name = "GUID", Type = "TEXT" ,NText=false });
                base.ListColumn.Add(new ColumnInfo() { Name = "CODE", Type = "TEXT" ,NText=false });
-               base.ListColumn.Add(new ColumnInfo() { Name = "TYPE_NAME_CN", Type = "TEXT" ,NText=false });
+               base.ListColumn.Add(new ColumnInfo() { Name = "NAME", Type = "TEXT" ,NText=false });
                base.ListColumn.Add(new ColumnInfo() { Name = "TYPE_NAME_EN", Type = "TEXT" ,NText=false });
                base.ListColumn.Add(new ColumnInfo() { Name = "DEFAULT_RECEIVE", Type = "TEXT" ,NText=false });
                base.ListColumn.Add(new ColumnInfo() { Name = "RECEIVE_STANDARD_ID", Type = "TEXT" ,NText=false });
@@ -694,6 +722,8 @@ namespace FMS.Entity
                base.ListColumn.Add(new ColumnInfo() { Name = "SERVICE_TYPE_DETAIL", Type = "TEXT" ,NText=false });
                base.ListColumn.Add(new ColumnInfo() { Name = "PARENTID", Type = "TEXT" ,NText=false });
                base.ListColumn.Add(new ColumnInfo() { Name = "OWNED_SERVICE", Type = "TEXT" ,NText=false });
+               base.ListColumn.Add(new ColumnInfo() { Name = "SEQ", Type = "NUMBER" ,NText=false });
+               base.ListColumn.Add(new ColumnInfo() { Name = "OWNERNAME", Type = "TEXT" ,NText=false });
 
         }
     }
@@ -717,7 +747,7 @@ namespace FMS.Entity
 		
                     public readonly string GUID = "GUID";
         public readonly string CODE = "CODE";
-        public readonly string TYPE_NAME_CN = "TYPE_NAME_CN";
+        public readonly string NAME = "NAME";
         public readonly string TYPE_NAME_EN = "TYPE_NAME_EN";
         public readonly string DEFAULT_RECEIVE = "DEFAULT_RECEIVE";
         public readonly string RECEIVE_STANDARD_ID = "RECEIVE_STANDARD_ID";
@@ -753,6 +783,8 @@ namespace FMS.Entity
         public readonly string SERVICE_TYPE_DETAIL = "SERVICE_TYPE_DETAIL";
         public readonly string PARENTID = "PARENTID";
         public readonly string OWNED_SERVICE = "OWNED_SERVICE";
+        public readonly string SEQ = "SEQ";
+        public readonly string OWNERNAME = "OWNERNAME";
 
    }
 }

FMS24/FMS.SO/3.FMS.SO.csproj

@@ -75,7 +75,7 @@
     <Compile Include="BdExtendType\BdExtendTypeLoad.cs" />
     <Compile Include="BdExtendType\BdExtendTypeSave.cs" />
     <Compile Include="BdExtendType\BdExtendTypeSearch.cs" />
-    <Compile Include="BdServiceType\BdServiceTypeGetLower.cs" />
+    <Compile Include="BdService\BdServiceGetLower.cs" />
     <Compile Include="BdService\BdServiceDelete.cs" />
     <Compile Include="BdService\BdServiceLoad.cs" />
     <Compile Include="BdService\BdServiceSave.cs" />

FMS24/FMS.SO/BdServiceType/BdServiceTypeGetLower.cs → FMS24/FMS.SO/BdService/BdServiceGetLower.cs

@@ -7,17 +7,17 @@ using System.Data;
 using FMS.BLL;
 using FMS.ServiceList;
 
-namespace ECI.FMS.SO
+namespace FMS.SO
 {
-    public class BdServiceTypeGetLower : BaseSO
+    public class BdServiceGetLower : BaseSO
     {
         public override void Execute(EciContext context)
         {
-            this.ServiceId = FMSService.BdServiceTypeGetLower;
+            this.ServiceId = FMSService.BdServiceGetLower;
 
             string id = context.Request["ID"];
 
-            DataTable data = BdServiceTypeBLL.Instance.GetLower(context.BLLContext, id);
+            DataTable data = BdServiceBLL.Instance.GetLower(context.BLLContext, id);
 
             context.Response.DataTable = data;
 

FMS24/FMS.ServiceList/Bd/BdService.cs

@@ -26,5 +26,6 @@ namespace FMS.ServiceList
         /// XXX:删除
         /// </summary>
         public const string BdServiceDelete = prex + "BdServiceDelete";
+        public const string BdServiceGetLower = prex + "BdServiceGetLower";
     }
 }

FMS24/FMS.ServiceList/Bd/BdServiceType.cs

@@ -26,6 +26,5 @@ namespace FMS.ServiceList
         /// XXX:删除
         /// </summary>
         public const string BdServiceTypeDelete = prex + "BdServiceTypeDelete";
-        public const string BdServiceTypeGetLower = prex + "BdServiceTypeGetLower";
     }
 }

FMS24/FMS.VAL/Bd/BdServiceTypeVAL.cs

@@ -36,9 +36,9 @@ namespace FMS.VAL
 
                 DBHelper.CheckRepeat(sql, serviceType.GUID, "代码[" + serviceType.CODE + "]已经存在");
 
-                sql = "SELECT GUID FROM FMS_BD_SERVICE_TYPE WHERE PARENTID=" + cmn.SQLQ(serviceType.PARENTID) + " AND NAME=" + cmn.SQLQ(serviceType.TYPE_NAME_CN);
+                sql = "SELECT GUID FROM FMS_BD_SERVICE_TYPE WHERE PARENTID=" + cmn.SQLQ(serviceType.PARENTID) + " AND NAME=" + cmn.SQLQ(serviceType.NAME);
 
-                DBHelper.CheckRepeat(sql, serviceType.GUID, "该服务下，名称[" + serviceType.TYPE_NAME_CN + "]已经存在");
+                DBHelper.CheckRepeat(sql, serviceType.GUID, "该服务下，名称[" + serviceType.NAME + "]已经存在");
             }
         }
     }

FMS24/Web/AppFms/Bd/ascxEditPt.ascx

@@ -8,6 +8,7 @@
         <th style="width: 20%"></th>
         <th style="width: 10%"></th>
         <th style="width: 20%"></th>
+        <th style="width: 10%"></th>
 
     </tr>
     <tr>
@@ -15,33 +16,98 @@
         <td>
             <asp:ETextBox runat="server" ID="txtOWNED_SERVICE" Width="85%" ReadOnly="true"></asp:ETextBox>
         </td>
-        <td class="lbl">上级服务类别</td>
+        <%--<td class="lbl">上级服务类别</td>
         <td>
             <asp:ETextBox runat="server" ID="txtParentName" Width="85%" ReadOnly="true"></asp:ETextBox>
+        </td>--%>
+        <td class="lbl">备注</td>
+        <td colspan="4">
+            <asp:ETextBox runat="server" ID="txtMemo" Width="96%" ReadOnly="true"></asp:ETextBox>
         </td>
     </tr>
     <tr>
-        <td class="lbl">代码</td>
+        <td class="lbl">助记码</td>
+        <td>
+            <asp:ETextBox runat="server" AutoUpper="true" ID="txtCODE" DataField="CODE" NotNull="true" Width="85%"></asp:ETextBox></td>
+        <td class="lbl">中文名称</td>
         <td>
-            <asp:ETextBox runat="server" NotNull="true" ID="txtCODE" Width="85%"></asp:ETextBox></td>
-        <td class="lbl">名称</td>
+            <asp:ETextBox runat="server" ID="txtNAME" DataField="NAME" NotNull="true" Width="85%"></asp:ETextBox></td>
+        <td class="lbl">英文名称</td>
+        <td colspan="3">
+            <asp:ETextBox runat="server" NotNull="true" ID="txtTypeNameEn" DataField="TYPE_NAME_EN" Width="85%"></asp:ETextBox></td>
+
+    </tr>
+    <tr>
+        <td class="lbl">默认应收</td>
         <td>
-            <asp:ETextBox runat="server" ID="txtNAME" Width="85%" NotNull="true"></asp:ETextBox></td>
-        <td class="lbl">顺序</td>
+            <asp:ECombox runat="server" ID="cboDefaultReceive" DefaultValue="N" ECIType="FMS_ISUSE" DataField="DEFAULT_RECEIVE" AddEmpty="true" Width="85%"></asp:ECombox></td>
+        <td class="lbl">收费标准</td>
         <td>
-            <asp:ETextBox runat="server" ID="txtSEQ" Width="85%" IsNum="true"></asp:ETextBox></td>
+            <asp:ECombox runat="server" ID="txtReceiveStandardId" ECIType="SFBZ" AddEmpty="true" DataField="RECEIVE_STANDARD_ID" Width="85%"></asp:ECombox></td>
+        <td class="lbl">收费单价</td>
+        <td>
+            <asp:ETextBox runat="server" ID="txtReceivePrice" DataField="RECEIVE_PRICE" Width="85%"></asp:ETextBox></td>
+        <td>
+            <asp:EChoose runat="server" ID="txtReceiveCurrId" ECIType="CURRENCY" DataField="RECEIVE_CURR_ID" Width="85%"></asp:EChoose></td>
     </tr>
     <tr>
-        <td class="lbl">是否启用</td>
+        <td class="lbl">最低收费</td>
         <td>
-            <asp:EDropDownList runat="server" ID="txtStatus" Width="85%" NotNull="true" ECIType="FMS_ISUSE"></asp:EDropDownList></td>
-        <td class="lbl">是否单选</td>
+            <asp:ETextBox runat="server" ID="txtReceiveMin" DataField="RECEIVE_MIN" Width="85%"></asp:ETextBox></td>
+        <td class="lbl">最高收费</td>
+        <td>
+            <asp:ETextBox runat="server" ID="txtReceiveMax" DataField="RECEIVE_MAX" Width="85%"></asp:ETextBox></td>
+
+        <td class="lbl">小数位</td>
         <td>
-            <asp:EDropDownList runat="server" ID="cboSelectType" Width="85%" NotNull="true" ECIType="FMS_ISUSE"></asp:EDropDownList></td>
-        <td class="lbl">作业系统</td>
+            <asp:ECombox runat="server" ID="cboDecimalLength" ECIType="XSW" DataField="DECIMAL_LENGTH" AddEmpty="true" Width="85%"></asp:ECombox></td>
         <td>
-            <asp:EChoose runat="server" ID="txtSysCode" Width="85%" ECIType="FZGJ_BD_SYS"></asp:EChoose></td>
-        </tr>
+            <asp:ECombox runat="server" ID="cboReceiveMantissaTypeId" ECIType="JSFS" DataField="RECEIVE_MANTISSA_TYPE_ID" AddEmpty="true" Width="85%"></asp:ECombox></td>
+    </tr>
+    <tr>
+        <td class="lbl">默认应付</td>
+        <td>
+            <asp:ECombox runat="server" ID="cboDefaultPay" DefaultValue="N" ECIType="FMS_ISUSE" DataField="DEFAULT_PAY" AddEmpty="true" Width="85%"></asp:ECombox></td>
+
+        <td class="lbl">付费标准</td>
+        <td>
+            <asp:ECombox runat="server" ID="txtPayStandardId" ECIType="SFBZ" AddEmpty="true" DataField="PAY_STANDARD_ID" Width="85%"></asp:ECombox></td>
+        <td class="lbl">付费单价</td>
+        <td>
+            <asp:ETextBox runat="server" ID="txtPayPrice" DataField="PAY_PRICE" Width="85%"></asp:ETextBox></td>
+        <td>
+            <asp:EChoose runat="server" ID="txtPayCurrId" ECIType="CURRENCY" DataField="PAY_CURR_ID" Width="85%"></asp:EChoose></td>
+
+    </tr>
+    <tr>
+        <td class="lbl">最低收费</td>
+        <td>
+            <asp:ETextBox runat="server" ID="txtPayMin" DataField="PAY_MIN" Width="85%"></asp:ETextBox></td>
+        <td class="lbl">最高收费</td>
+        <td>
+            <asp:ETextBox runat="server" ID="txtPayMax" DataField="PAY_MAX" Width="85%"></asp:ETextBox></td>
+        <td class="lbl">小数位</td>
+        <td>
+            <asp:ECombox runat="server" ID="cboPayDecimalLength" ECIType="XSW" DataField="PAY_DECIMAL_LENGTH" AddEmpty="true" Width="85%"></asp:ECombox></td>
+
+        <td>
+            <asp:ECombox runat="server" ID="cboPayMantissaTypeId" ECIType="JSFS" DataField="PAY_MANTISSA_TYPE_ID" AddEmpty="true" Width="85%"></asp:ECombox></td>
+    </tr>
+    <tr>
+        <td class="lbl">服务备注</td>
+        <td colspan="6">
+            <asp:ETextBox TextMode="MultiLine" runat="server" ID="txtReamrk" DataField="REAMRK" Width="96%"></asp:ETextBox></td>
+
+    </tr>
+    <tr>
+        <td class="lbl">修改人</td>
+        <td>
+            <asp:ETextBox runat="server" ID="txtUpdateUserName" ReadOnly="true" DataField="UPDATE_USER_NAME" Width="85%"></asp:ETextBox></td>
+        <td class="lbl">修改日期</td>
+        <td>
+            <asp:ETextBox runat="server" ID="txtUpdateDate" DataField="UPDATE_DATE" Format="yyyy-MM-dd HH:mm:ss" ReadOnly="true" IsDate="true" Width="85%"></asp:ETextBox></td>
+
+    </tr>
 </table>
 
 <div style="display: none;">

FMS24/Web/AppFms/Bd/frmBdServiceTypeData.aspx.cs

@@ -33,7 +33,7 @@ public partial class AppFms_Bd_frmBdServiceTypeData : BasePage
         {
             string id = PageHelper.Request("id");
 
-            EciRequest request = new EciRequest(FMSService.BdServiceTypeGetLower);
+            EciRequest request = new EciRequest(FMSService.BdServiceGetLower);
             request["ID"] = id;
 
             EciResponse response = SOA.Execute(request);

FMS24/Web/AppFms/Bd/frmBdServiceTypeEdit.aspx

@@ -1,4 +1,4 @@
-<%@ Page Language="C#" AutoEventWireup="true" CodeFile="frmBdServiceTypeEdit.aspx.cs" Inherits="AppFms_Bd_frmBdServiceTypeEdit" %>
+    <%@ Page Language="C#" AutoEventWireup="true" CodeFile="frmBdServiceTypeEdit.aspx.cs" Inherits="AppFms_Bd_frmBdServiceTypeEdit" %>
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -48,12 +48,12 @@
 
                     </tr>
                     <tr>
-                        <td class="lbl">助记词</td>
+                        <td class="lbl">助记码</td>
                         <td>
                             <asp:ETextBox runat="server" ID="txtHelpWord" DataField="HELP_WORD" NotNull="true" Width="85%"></asp:ETextBox></td>
                         <td class="lbl">中文名称</td>
                         <td>
-                            <asp:ETextBox runat="server" ID="txtTypeNameCn" DataField="TYPE_NAME_CN" NotNull="true" Width="85%"></asp:ETextBox></td>
+                            <asp:ETextBox runat="server" ID="txtTypeNameCn" DataField="NAME" NotNull="true" Width="85%"></asp:ETextBox></td>
                         <td class="lbl">英文名称</td>
                         <td>
                             <asp:ETextBox runat="server" ID="txtTypeNameEn" DataField="TYPE_NAME_EN" Width="85%"></asp:ETextBox></td>
@@ -62,7 +62,7 @@
                     <tr>
                         <td class="lbl">默认应收</td>
                         <td>
-                            <asp:ECombox runat="server" ID="cboDefaultReceive" DataField="DEFAULT_RECEIVE" AddEmpty="true" Width="85%"></asp:ECombox></td>
+                            <asp:ECombox runat="server" ID="cboDefaultReceive" DefaultValue="N" ECIType="FMS_ISUSE" DataField="DEFAULT_RECEIVE" AddEmpty="true" Width="85%"></asp:ECombox></td>
                         <td class="lbl">收费标准</td>
                         <td>
                             <asp:EChoose runat="server" ID="txtReceiveStandardId" DataField="RECEIVE_STANDARD_ID" Width="85%"></asp:EChoose></td>
@@ -92,7 +92,7 @@
                             <asp:ECombox runat="server" ID="cboReceiveMantissaTypeId" DataField="RECEIVE_MANTISSA_TYPE_ID" AddEmpty="true" Width="85%"></asp:ECombox></td>
                         <td class="lbl">默认应付</td>
                         <td>
-                            <asp:ECombox runat="server" ID="cboDefaultPay" DataField="DEFAULT_PAY" AddEmpty="true" Width="85%"></asp:ECombox></td>
+                            <asp:ECombox runat="server" ID="cboDefaultPay" DefaultValue="N" ECIType="FMS_ISUSE" DataField="DEFAULT_PAY" AddEmpty="true" Width="85%"></asp:ECombox></td>
 
                     </tr>
                     <tr>
@@ -126,32 +126,15 @@
                         <td class="lbl">备注</td>
                         <td>
                             <asp:ETextBox runat="server" ID="txtReamrk" DataField="REAMRK" Width="85%"></asp:ETextBox></td>
-                        <td class="lbl">创建人</td>
-                        <td>
-                            <asp:ETextBox runat="server" ID="txtCreateUser" DataField="CREATE_USER" ReadOnly="true" Width="85%"></asp:ETextBox></td>
 
                     </tr>
                     <tr>
-                        <td class="lbl">创建日期</td>
-                        <td>
-                            <asp:ETextBox runat="server" ID="txtCreateDate" DataField="CREATE_DATE" Format="yyyy-MM-dd HH:mm:ss" ReadOnly="true" IsDate="true" Width="85%"></asp:ETextBox></td>
                         <td class="lbl">修改人</td>
                         <td>
-                            <asp:ETextBox runat="server" ID="txtUpdateUser" DataField="UPDATE_USER" ReadOnly="true" Width="85%"></asp:ETextBox></td>
+                            <asp:ETextBox runat="server" ID="txtUpdateUserName" ReadOnly="true" DataField="UPDATE_USER_NAME" Width="85%"></asp:ETextBox></td>
                         <td class="lbl">修改日期</td>
                         <td>
-                            <asp:ETextBox runat="server" ID="txtUpdateDate" DataField="UPDATE_DATE" Format="yyyy-MM-dd HH:mm:ss" ReadOnly="true" IsDate="true" Width="85%"></asp:ETextBox></td>
-
-                    </tr>
-                    <tr>
-                        <td class="lbl"></td>
-                        <td>
-                            <asp:ETextBox runat="server" ID="txtCreateUserName" DataField="CREATE_USER_NAME" Width="85%"></asp:ETextBox></td>
-                        <td class="lbl"></td>
-                        <td>
-                            <asp:ETextBox runat="server" ID="txtUpdateUserName" DataField="UPDATE_USER_NAME" Width="85%"></asp:ETextBox></td>
-                        <td class="lbl">&nbsp;</td>
-                        <td>&nbsp;</td>
+                            <asp:ETextBox runat="server" ID="txtUpdateDate" DataField="UPDATE_DATE" ReadOnly="true" Format="yyyy-MM-dd HH:mm:ss" ReadOnly="true" IsDate="true" Width="85%"></asp:ETextBox></td>
 
                     </tr>
 

FMS24/Web/AppFms/Bd/frmBdServiceTypeList.aspx

@@ -122,24 +122,25 @@
                 $('#tt').tree('expand', node.target);
             }
 
-            if (parentNode.children) {
-                var seq = parentNode.children.length * 10;
-                seq += 10;
-                $("#ascxEdit_txtSEQ").val(seq);
-            }
-            else {
-                $("#ascxEdit_txtSEQ").val(10);
-            }
+            //if (parentNode.children) {
+            //    var seq = parentNode.children.length * 10;
+            //    seq += 10;
+            //    $("#ascxEdit_txtSEQ").val(seq);
+            //}
+            //else {
+            //    $("#ascxEdit_txtSEQ").val(10);
+            //}
 
             if (node.ownerid == "") {
                 $("#ascxEdit_txtOwnerId").val(node.id);
                 $("#ascxEdit_txtOWNED_SERVICE").val(node.text);
+                $("#ascxEdit_txtMemo").val(node.memo);
             }
             else {
                 $("#ascxEdit_txtOwnerId").val(node.ownerid);
                 $("#ascxEdit_txtOWNED_SERVICE").val(node.ownername);
-                //$("#ascxEdit_txtParentName").val(node.parentname == "" ? node.text : node.parentname);
-                $("#ascxEdit_txtParentName").val(node.text);
+                //$("#ascxEdit_txtParentName").val(node.text);
+                $("#ascxEdit_txtMemo").val(node.memo);
             }
 
             //showOpType("NA");
@@ -254,15 +255,30 @@
                 if (res.success) {
                     $("#ascxEdit_txtGroup").val(res.group_code + "|" + res.group_name);
                     $("#ascxEdit_txtOWNED_SERVICE").val(res.ownername);
-                    $("#ascxEdit_txtParentName").val(res.parentname);
+                    //$("#ascxEdit_txtParentName").val(res.parentname);
+                    $("#ascxEdit_txtMemo").val(res.memo);
                     $("#ascxEdit_txtCODE").val(res.code);
-                    $("#ascxEdit_txtNAME").val(res.name);
-                    $("#ascxEdit_txtSEQ").val(res.seq);
+                    $("#ascxEdit_txtNAME").val(res.type_name_cn);
+                    $("#ascxEdit_txtTypeNameEn").val(res.type_name_en);
                     $("#ascxEdit_txtGUID").val(res.guid);
                     $("#ascxEdit_txtPARENTID").val(res.parentid);
-                    $("#ascxEdit_txtStatus").val(res.status);
-                    $("#ascxEdit_cboSelectType").val(res.select_type);
-                    $("#ascxEdit_txtSysCode").val(res.sys_code);
+                    $("#ascxEdit_cboDefaultReceive").val(res.default_receive);
+                    $("#ascxEdit_txtReceiveStandardId").val(res.receive_standard_id);
+                    $("#ascxEdit_txtReceivePrice").val(res.receive_price);
+                    $("#ascxEdit_txtReceiveCurrId").val(res.receive_curr_id);
+                    $("#ascxEdit_txtReceiveMin").val(res.receive_min);
+                    $("#ascxEdit_txtReceiveMax").val(res.receive_max);
+                    $("#ascxEdit_cboDecimalLength").val(res.decimal_length);
+                    $("#ascxEdit_cboReceiveMantissaTypeId").val(res.receive_mantissa_type_id);
+                    $("#ascxEdit_cboDefaultPay").val(res.default_pay);
+                    $("#ascxEdit_txtPayStandardId").val(res.pay_standard_id);
+                    $("#ascxEdit_txtPayPrice").val(res.pay_price);
+                    $("#ascxEdit_txtPayCurrId").val(res.pay_curr_id);
+                    $("#ascxEdit_txtPayMin").val(res.pay_min);
+                    $("#ascxEdit_txtPayMax").val(res.pay_max);
+                    $("#ascxEdit_cboPayDecimalLength").val(res.pay_decimal_length);
+                    $("#ascxEdit_cboPayMantissaTypeId").val(res.pay_mantissa_type_id);
+                    $("#ascxEdit_txtReamrk").val(res.reamrk);
 
                     if (res.ownerid == "") {
                         $("#btnDeleteIt").hide();
@@ -298,14 +314,28 @@
             data.GUID = $("#ascxEdit_txtGUID").val();
             data.NAME = $("#ascxEdit_txtNAME").val();
             data.CODE = $("#ascxEdit_txtCODE").val();
-            data.SEQ = $("#ascxEdit_txtSEQ").val();
+            data.TYPE_NAME_EN = $("#ascxEdit_txtTypeNameEn").val();
             data.PARENTID = $("#ascxEdit_txtPARENTID").val();
             data.OWNED_SERVICE = $("#ascxEdit_txtOwnerId").val();
             data.FLAG = $("#ascxEdit_txtFLAG").val();
             data.OWNERNAME = $("#ascxEdit_txtOWNED_SERVICE").val();
-            data.STATUS = $("#ascxEdit_txtStatus").val();
-            data.SELECT_TYPE = $("#ascxEdit_cboSelectType").val();
-            data.SYS_CODE = $("#ascxEdit_txtSysCode").val();
+            data.DEFAULT_RECEIVE = $("#ascxEdit_cboDefaultReceive").val();
+            data.RECEIVE_STANDARD_ID = $("#ascxEdit_txtReceiveStandardId").val();
+            data.RECEIVE_PRICE = $("#ascxEdit_txtReceivePrice").val();
+            data.RECEIVE_CURR_ID = $("#ascxEdit_txtReceiveCurrId").val();
+            data.RECEIVE_MIN = $("#ascxEdit_txtReceiveMin").val();
+            data.RECEIVE_MAX = $("#ascxEdit_txtReceiveMax").val();
+            data.DECIMAL_LENGTH = $("#ascxEdit_cboDecimalLength").val();
+            data.RECEIVE_MANTISSA_TYPE_ID = $("#ascxEdit_cboReceiveMantissaTypeId").val();
+            data.DEFAULT_PAY = $("#ascxEdit_cboDefaultPay").val();
+            data.PAY_STANDARD_ID = $("#ascxEdit_txtPayStandardId").val();
+            data.PAY_PRICE = $("#ascxEdit_txtPayPrice").val();
+            data.PAY_CURR_ID = $("#ascxEdit_txtPayCurrId").val();
+            data.PAY_MIN = $("#ascxEdit_txtPayMin").val();
+            data.PAY_MAX = $("#ascxEdit_txtPayMax").val();
+            data.PAY_DECIMAL_LENGTH = $("#ascxEdit_cboPayDecimalLength").val();
+            data.PAY_MANTISSA_TYPE_ID = $("#ascxEdit_cboPayMantissaTypeId").val();
+            data.REAMRK = $("#ascxEdit_txtReamrk").val();
 
             if (data.ID == "" && !data.PARENTID) {
                 msg.warning("保存异常,没有选择上级节点");
@@ -380,12 +410,30 @@
             $("#ascxEdit_txtFLAG").val("Add");
             $("#ascxEdit_txtNAME").val("");
             $("#ascxEdit_txtCODE").val("");
-            $("#ascxEdit_txtSEQ").val("");
-            $("#ascxEdit_txtParentName").val("");
+            $("#ascxEdit_txtTypeNameEn").val("");
+            //$("#ascxEdit_txtParentName").val("");
+            $("#ascxEdit_txtMemo").val("");
             $("#ascxEdit_txtPARENTID").val(parentId);
-            $("#ascxEdit_txtStatus option:first").attr("selected", true);
-            $("#ascxEdit_cboSelectType option:first").attr("selected", true);
-            $("#ascxEdit_txtSysCode").val("");
+            //$("#ascxEdit_txtStatus option:first").attr("selected", true);
+            //$("#ascxEdit_cboSelectType option:first").attr("selected", true);
+            //$("#ascxEdit_txtSysCode").val("");
+            $("#ascxEdit_cboDefaultReceive option:first").attr("selected", true);
+            $("#ascxEdit_txtReceiveStandardId option:first").attr("selected", true);
+            $("#ascxEdit_txtReceivePrice").val("");
+            $("#ascxEdit_txtReceiveCurrId").val("");
+            $("#ascxEdit_txtReceiveMin").val("");
+            $("#ascxEdit_txtReceiveMax").val("");
+            $("#ascxEdit_cboDecimalLength option:first").attr("selected", true);
+            $("#ascxEdit_cboReceiveMantissaTypeId option:first").attr("selected", true);
+            $("#ascxEdit_cboDefaultPay option:first").attr("selected", true);
+            $("#ascxEdit_txtPayStandardId option:first").attr("selected", true);
+            $("#ascxEdit_txtPayPrice").val("");
+            $("#ascxEdit_txtPayCurrId").val("");
+            $("#ascxEdit_txtPayMin").val("");
+            $("#ascxEdit_txtPayMax").val("");
+            $("#ascxEdit_cboPayDecimalLength option:first").attr("selected", true);
+            $("#ascxEdit_cboPayMantissaTypeId option:first").attr("selected", true);
+            $("#ascxEdit_txtReamrk").val("");
 
             $("#ascxEdit_txtCODE").focus();
 
@@ -486,7 +534,7 @@
         }
 
         $(function () {
-            $("#divHidden").show();
+            /*$("#divHidden").show();*/
 
             layout();
 
@@ -512,7 +560,7 @@
                                 <input type="hidden" id="hidRootId" runat="server" />
                                 <input type="hidden" id="hidKey" runat="server" />
 
-                                <asp:EButton runat="server" Text="添加项目"  ID="btnAdd" Icon="add" IsClient="true" OnClientClick="append()" />
+                                <asp:EButton runat="server" Text="添加项目" ID="btnAdd" Icon="add" IsClient="true" OnClientClick="append()" />
                                 <asp:EButton runat="server" Text="保存" ID="btnSave" Icon="save" IsClient="true" OnClientClick="save()" />
                                 <asp:EButton runat="server" Text="删除" ID="btnDeleteIt" Icon="delete" IsClient="true" OnClientClick="deleteIt()" />
                             </div>
@@ -539,7 +587,7 @@
                 </table>
             </div>
         </div>
-        <div class="hidden" id="divHidden" style="display:none">
+        <%--<div class="hidden" id="divHidden">
 
             <div id="mm" class="easyui-menu" style="width: 120px;">
                 <div onclick="menuRefresh()" data-options="iconCls:'icon-refresh'">刷新</div>
@@ -552,7 +600,7 @@
                 <div class="menu-sep"></div>
                 <div onclick="resetSEQ()">重置顺序</div>
             </div>
-        </div>
+        </div>--%>
     </form>
 </body>
 </html>