Эхлэл Бүгдийг харах Тусламж
Бүртгүүлэх Нэвтрэх
root
/
FMS24
1
0
Салаа 0
Файлууд Асуудлууд 0 Хуулах хүсэлтүүд 0 Мэдлэгийн сан
Эх сурвалжийг харах

Merge branch 'master' of http://110.40.230.242:3000/root/FMS24

sunny.qiao 1 жил өмнө
parent
b9816d2071 41b28f835c
commit
49ee402e8a
3 өөрчлөгдсөн 130 нэмэгдсэн , 13 устгасан
Өөрчлөллтийг нэгтгэж харах Өөрчлөлтийн статистик харах
  1. 1 1
      FMS24/FMS.DAL/Bd/BdMoudleBodyDAL.cs
  2. 52 12
      FMS24/Web/AppFms/Bd/frmBdMoudleHeadEdit.aspx
  3. 77 0
      FMS24/Web/AppFms/Bd/frmBdMoudleHeadEdit.aspx.cs

+ 1 - 1
FMS24/FMS.DAL/Bd/BdMoudleBodyDAL.cs
Файл харах 

@@ -29,7 +29,7 @@ namespace FMS.DAL
 
                            ,A.GROUP_NAME,A.COMPANY_CODE,A.COMPANY_NAME,A.NODE_CODE,A.NODE_NAME
 
                            ,A.GROUP_NAME,A.COMPANY_CODE,A.COMPANY_NAME,A.NODE_CODE,A.NODE_NAME
 
                             ";
 
                             ";
 
            sql +=" FROM FMS_BD_MOUDLE_BODY A ";
 
            sql +=" FROM FMS_BD_MOUDLE_BODY A ";
 
-           sql +=" WHERE A.GUID=" + cmn.SQLQ(guid);
 
+           sql += " WHERE A.HEAD_GUID=" + cmn.SQLQ(guid);
 
 
 
            DataTable data = DBHelper.GetDataTable(sql);
 
            DataTable data = DBHelper.GetDataTable(sql);

+ 52 - 12
FMS24/Web/AppFms/Bd/frmBdMoudleHeadEdit.aspx
Файл харах 

@@ -12,8 +12,6 @@
 
         function addAction() {
 
         function addAction() {
 
 
 
             if (eci.hasSave()) {
 
             if (eci.hasSave()) {
 
-                var biztype = this.cboBizType.value;
 
-                var moudle=this.cbo
 
                 var url = "frmBdMoudleHeadEdit.aspx";
 
                 var url = "frmBdMoudleHeadEdit.aspx";
 
 
 
                 window.location.href = url;
 
                 window.location.href = url;
 
@@ -26,7 +24,8 @@
 
 <body>
 
 <body>
 
     <form id="form1" runat="server">
 
     <form id="form1" runat="server">
 
         <input type="hidden" id="hidKey" runat="server" />
 
         <input type="hidden" id="hidKey" runat="server" />
 
-
 
+        <input type="hidden" id="hidBizType" runat="server" />        
+        <input type="hidden" id="hidMoudle" runat="server" />
 
 
 
         <div id="root">
 
         <div id="root">
 
 
 
@@ -81,13 +80,13 @@
 
                 </table>
 
                 </table>
 
             </div>
 
             </div>
 
             <div id="toolbar2">
 
             <div id="toolbar2">
 
-                <asp:EButton runat="server" ID="btnAdd2" Text="新增" Icon="Add" OnClientClick="addAction2();" IsClient="true" />
 
+                <asp:EButton runat="server" ID="btnAdd2" Text="新增" Icon="Add" CancelLoading="true"  OnClick="btnAdd_Click" />
 
             </div>
 
             </div>
 
             <div id="datagrid">
 
             <div id="datagrid">
 
 
 
                 <asp:EGridView ID="gvData" Layout="divQuery,toolbar,pagetitle" runat="server" 
                 <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"> 
+                    FitWindow="true"  EnableSorting="True" EnableSelect="false"   EnablePaging="false" EnableClickSelectRow="true"  OnRowDataBound="gvData_RowDataBound"
 
+                    Width="1000px" KeyField="GUID"  HAlign="center"> 
                     <Columns>
 
                     <Columns>
 
                           <asp:TemplateField HeaderText="删除" ItemStyle-HorizontalAlign="Center" ItemStyle-Width="80">
 
                           <asp:TemplateField HeaderText="删除" ItemStyle-HorizontalAlign="Center" ItemStyle-Width="80">
 
                             <ItemTemplate>
 
                             <ItemTemplate>
 
@@ -95,14 +94,55 @@
 
 
 
                             </ItemTemplate>
 
                             </ItemTemplate>
 
                         </asp:TemplateField>
 
                         </asp:TemplateField>
 
-                          <asp:TemplateField HeaderText="服务名称" ItemStyle-HorizontalAlign="Center" ItemStyle-Width="80">
 
+                          <asp:ETemplateField  HeaderText="应收服务" DataField="SERVICE_ID" TwoWay="cboServiceId" SortExpression="SERVICE_ID"  ItemStyle-Width="150px">
 
                             <ItemTemplate>
 
                             <ItemTemplate>
 
-                                <asp:ECombox runat="server" ID="cboServiceId" DataField="SERVICE_ID" ECIType="BIZ_FLAG" Width="85%" ReadOnly="true"></asp:ECombox>
 
+                                <asp:ECombox runat="server" ID="cboServiceId" AddEmpty="true" DataField="SERVICE_ID" ECIType="SFMC" Width="85%"></asp:ECombox>
 
                             </ItemTemplate>
 
                             </ItemTemplate>
 
-                        </asp:TemplateField>
 
-
 
+                        </asp:ETemplateField>
 
+                        <asp:ETemplateField HeaderText="收款客户" DataField="CUSTOM_NAME" TwoWay="txtCustomName" SortExpression="CUSTOM_NAME" ItemStyle-Width="250px">
 
+                            <ItemTemplate>
 
+                                <asp:EChoose runat="server" ID="txtCustomName" Text='<%# Eval("CUSTOM_NAME")%>' Tag="NotNull" headertext="请选择客户" ECIType="	CUSTOMER" Width="85%"></asp:EChoose>
 
+                            </ItemTemplate>
 
+                        </asp:ETemplateField>
 
+                          <asp:ETemplateField HeaderText="收费标准" DataField="RECEIVE_STANDARD_ID" TwoWay="cboReceiveStandardId" SortExpression="RECEIVE_STANDARD_ID"  ItemStyle-Width="150px">
 
+                            <ItemTemplate>
 
+                                <asp:ECombox runat="server" ID="cboReceiveStandardId" AddEmpty="true" DataField="RECEIVE_STANDARD_ID" ECIType="SFBZ" Width="85%"></asp:ECombox>
 
+                            </ItemTemplate>
 
+                        </asp:ETemplateField>
 
+                        <asp:ETemplateField HeaderText="单价" DataField="RECEIVE_PRICE" TwoWay="txtReceivePrice" SortExpression="RECEIVE_PRICE" ItemStyle-Width="100px" ItemStyle-HorizontalAlign="Right">
 
+                            <ItemTemplate>
 
+                                <asp:ETextBox runat="server" Text='<%# String.Format("{0:f4}",Eval("RECEIVE_PRICE")) %>' Style="text-align: right;" ID="txtReceivePrice" Tag="NotNull" headertext="单价" 
+                                    DataField="RECEIVE_PRICE" Width="85%" IsFloat="true"></asp:ETextBox>
 
+                            </ItemTemplate>
 
+                        </asp:ETemplateField>
 
+                        <asp:ETemplateField HeaderText="币制" DataField="RECEIVE_CURR_ID" TwoWay="txtReceiveCurrId" SortExpression="RECEIVE_CURR_ID" ItemStyle-Width="150px">
 
+                            <ItemTemplate>
 
+                                <asp:EChoose runat="server" ID="txtReceiveCurrId" Text='<%# Eval("RECEIVE_CURR_ID")%>' Tag="NotNull" headertext="币制" ECIType="CURRENCY" Width="80%"></asp:EChoose>
 
+                            </ItemTemplate>
 
+                        </asp:ETemplateField>
 
+                        <asp:ETemplateField HeaderText="最低收费" DataField="RECEIVE_MIN" TwoWay="txtReceiveMin" SortExpression="RECEIVE_MIN" ItemStyle-Width="120px" ItemStyle-HorizontalAlign="Right">
 
+                            <ItemTemplate>
 
+                                <asp:ETextBox runat="server" Text='<%# String.Format("{0:f4}",Eval("RECEIVE_MIN")) %>' Style="text-align: right;" ID="txtReceiveMin" Tag="NotNull" headertext="最低收费" DataField="RECEIVE_MIN" Width="85%" IsFloat="true"></asp:ETextBox>
 
+                            </ItemTemplate>
 
+                        </asp:ETemplateField>
 
+                        <asp:ETemplateField HeaderText="最高收费" DataField="RECEIVE_MAX" TwoWay="txtReceiveMax" SortExpression="RECEIVE_MAX" ItemStyle-Width="120px" ItemStyle-HorizontalAlign="Right">
 
+                            <ItemTemplate>
 
+                                <asp:ETextBox runat="server" Text='<%# String.Format("{0:f4}",Eval("RECEIVE_MAX")) %>' Style="text-align: right;" ID="txtReceiveMax" Tag="NotNull" headertext="最高收费" DataField="RECEIVE_MAX" Width="85%" IsFloat="true"></asp:ETextBox>
 
+                            </ItemTemplate>
 
+                        </asp:ETemplateField>
 
+                          <asp:ETemplateField HeaderText="小数长度" DataField="DECIMAL_LENGTH" TwoWay="cboDecimalLength" SortExpression="DECIMAL_LENGTH"  ItemStyle-Width="100px">
 
+                            <ItemTemplate>
 
+                                <asp:ECombox runat="server" ID="cboDecimalLength" AddEmpty="true" DataField="DECIMAL_LENGTH" ECIType="XSW" Width="85%"></asp:ECombox>
 
+                            </ItemTemplate>
 
+                        </asp:ETemplateField>
 
+                          <asp:ETemplateField HeaderText="进位方式" DataField="RECEIVE_MANTISSA_TYPE_ID" TwoWay="cboReceiveMantissaTypeId" SortExpression="RECEIVE_MANTISSA_TYPE_ID"  ItemStyle-Width="100px">
 
+                            <ItemTemplate>
 
+                                <asp:ECombox runat="server" ID="cboReceiveMantissaTypeId" AddEmpty="true" DataField="RECEIVE_MANTISSA_TYPE_ID" ECIType="JSFS" Width="85%"></asp:ECombox>
 
+                            </ItemTemplate>
 
+                        </asp:ETemplateField>
 
+                      <asp:BoundField DataField="HEAD_GUID" HeaderText="表头主键" SortExpression="HEAD_GUID"  ItemStyle-Width="0"></asp:BoundField>
 
 
 
-                      <asp:BoundField DataField="SERVICE_ID" HeaderText="服务编号" SortExpression="SERVICE_ID"  ItemStyle-Width="150"></asp:BoundField>
 
+                      <%--<asp:BoundField DataField="SERVICE_ID" HeaderText="服务编号" SortExpression="SERVICE_ID"  ItemStyle-Width="150"></asp:BoundField>
 
                       <asp:BoundField DataField="CUSTOM_CODE" HeaderText="客户编码" SortExpression="CUSTOM_CODE"  ItemStyle-Width="150"></asp:BoundField>
 
                       <asp:BoundField DataField="CUSTOM_CODE" HeaderText="客户编码" SortExpression="CUSTOM_CODE"  ItemStyle-Width="150"></asp:BoundField>
 
                       <asp:BoundField DataField="CUSTOM_NAME" HeaderText="客户名称" SortExpression="CUSTOM_NAME"  ItemStyle-Width="150"></asp:BoundField>
 
                       <asp:BoundField DataField="CUSTOM_NAME" HeaderText="客户名称" SortExpression="CUSTOM_NAME"  ItemStyle-Width="150"></asp:BoundField>
 
                       <asp:BoundField DataField="RECEIVE_STANDARD_ID" HeaderText="收费标准" SortExpression="RECEIVE_STANDARD_ID"  ItemStyle-Width="150"></asp:BoundField>
 
                       <asp:BoundField DataField="RECEIVE_STANDARD_ID" HeaderText="收费标准" SortExpression="RECEIVE_STANDARD_ID"  ItemStyle-Width="150"></asp:BoundField>
 
@@ -111,7 +151,7 @@
 
                       <asp:BoundField DataField="RECEIVE_MIN" HeaderText="最低收费" SortExpression="RECEIVE_MIN"  ItemStyle-Width="150"></asp:BoundField>
 
                       <asp:BoundField DataField="RECEIVE_MIN" HeaderText="最低收费" SortExpression="RECEIVE_MIN"  ItemStyle-Width="150"></asp:BoundField>
 
                       <asp:BoundField DataField="RECEIVE_MAX" HeaderText="最高收费" SortExpression="RECEIVE_MAX"  ItemStyle-Width="150"></asp:BoundField>
 
                       <asp:BoundField DataField="RECEIVE_MAX" HeaderText="最高收费" SortExpression="RECEIVE_MAX"  ItemStyle-Width="150"></asp:BoundField>
 
                       <asp:BoundField DataField="DECIMAL_LENGTH" HeaderText="小数长度" SortExpression="DECIMAL_LENGTH"  ItemStyle-Width="150"></asp:BoundField>
 
                       <asp:BoundField DataField="DECIMAL_LENGTH" HeaderText="小数长度" SortExpression="DECIMAL_LENGTH"  ItemStyle-Width="150"></asp:BoundField>
 
-                      <asp:BoundField DataField="RECEIVE_MANTISSA_TYPE_ID" HeaderText="进位方式" SortExpression="RECEIVE_MANTISSA_TYPE_ID"  ItemStyle-Width="150"></asp:BoundField>
 
+                      <asp:BoundField DataField="RECEIVE_MANTISSA_TYPE_ID" HeaderText="进位方式" SortExpression="RECEIVE_MANTISSA_TYPE_ID"  ItemStyle-Width="150"></asp:BoundField>--%>
 
 
 
                    </Columns>
 
                    </Columns>
 
                 </asp:EGridView>
 
                 </asp:EGridView>

+ 77 - 0
FMS24/Web/AppFms/Bd/frmBdMoudleHeadEdit.aspx.cs
Файл харах 

@@ -10,6 +10,8 @@ using PL.UI.Controls;
 
 using FMS.ServiceList;
 
 using FMS.ServiceList;
 
 using FMS.Entity;
 
 using FMS.Entity;
 
 using FMS.UI;
 
 using FMS.UI;
 
+using System.Activities.Expressions;
 
+using System.Data.Common.CommandTrees;
 
 
 
 
 
 public partial class AppFms_ServiceMoudle_frmBdMoudleHeadEdit : BasePage
 
 public partial class AppFms_ServiceMoudle_frmBdMoudleHeadEdit : BasePage
 
@@ -19,6 +21,16 @@ public partial class AppFms_ServiceMoudle_frmBdMoudleHeadEdit : BasePage
 
         get { return this.hidKey.Value; }
 
         get { return this.hidKey.Value; }
 
         set { this.hidKey.Value = value; }
 
         set { this.hidKey.Value = value; }
 
     }
 
     }
 
+    private string biztype
 
+    {
 
+        get { return this.hidBizType.Value; }
 
+        set { this.hidBizType.Value = value; }
 
+    }
 
+    private string moudle
 
+    {
 
+        get { return this.hidMoudle.Value; }
 
+        set { this.hidMoudle.Value = value; }
 
+    }
 
 
 
     protected void Page_Load(object sender, EventArgs e)
 
     protected void Page_Load(object sender, EventArgs e)
 
     {
 
     {
 
@@ -30,6 +42,10 @@ public partial class AppFms_ServiceMoudle_frmBdMoudleHeadEdit : BasePage
 
             this.key = PageHelper.Request("key");
 
             this.key = PageHelper.Request("key");
 
             this.cboBizType.SelectedValue = PageHelper.Request("biztype");
 
             this.cboBizType.SelectedValue = PageHelper.Request("biztype");
 
             this.cboMoudleType.SelectedValue = PageHelper.Request("moudle");
 
             this.cboMoudleType.SelectedValue = PageHelper.Request("moudle");
 
+            this.biztype = PageHelper.Request("biztype");
 
+            this.moudle = PageHelper.Request("moudle");
 
+
 
+            this.gvData.Columns[2].HeaderText = (this.moudle == "M01" ? "壇澗륩蛟" : "壇마륩蛟");
 
             //this.cboServiceId.InitItems();
 
             //this.cboServiceId.InitItems();
 
             if (this.key.HasValue())
 
             if (this.key.HasValue())
 
             {
 
             {
 
@@ -52,6 +68,15 @@ public partial class AppFms_ServiceMoudle_frmBdMoudleHeadEdit : BasePage
 
         BD_MOUDLE_HEAD data = response.DataTable.ToEntity<BD_MOUDLE_HEAD>();
 
         BD_MOUDLE_HEAD data = response.DataTable.ToEntity<BD_MOUDLE_HEAD>();
 
 
 
         this.Bind(data);
 
         this.Bind(data);
 
+
 
+        EciRequest requestBody = new EciRequest(FMSService.BdMoudleBodyLoad);
 
+        request.Key = this.key;
 
+
 
+        EciResponse responseBody = SOA.Execute(request);
 
+
 
+        BD_MOUDLE_BODY dataBody = response.DataTable.ToEntity<BD_MOUDLE_BODY>();
 
+
 
+        this.Bind(dataBody);
 
     }
 
     }
 
 
 
     protected void btnSave_Click(object sender, EventArgs e)
 
     protected void btnSave_Click(object sender, EventArgs e)
 
@@ -103,4 +128,56 @@ public partial class AppFms_ServiceMoudle_frmBdMoudleHeadEdit : BasePage
 
 
 
         //this.Search();
 
         //this.Search();
 
     }
 
     }
 
+
 
+    /// <summary>
 
+    /// 
+    /// </summary>
 
+    /// <param name="sender"></param>
 
+    /// <param name="e"></param>
 
+    protected void gvData_RowDataBound(object sender, GridViewRowEventArgs e)
 
+    {
 
+        if (e.Row.RowType == DataControlRowType.DataRow)
 
+        {
 
+            //string SERVICE_ID = this.moudle=="M01"?e.Row.FromKey("SERVICE_ID").Text="壇澗륩蛟":"壇마륩蛟";
 
+            ECombox cboServiceId = (ECombox)e.Row.FindControl("cboServiceId");
 
+            EChoose txtCustomName = (EChoose)e.Row.FindControl("txtCustomName");
 
+            ECombox cboReceiveStandardId = (ECombox)e.Row.FindControl("cboReceiveStandardId");
 
+            ETextBox txtReceivePrice = (ETextBox)e.Row.FindControl("txtReceivePrice");
 
+            EChoose txtReceiveCurrId = (EChoose)e.Row.FindControl("txtReceiveCurrId"); 
+            ETextBox txtReceiveMin = (ETextBox)e.Row.FindControl("txtReceiveMin");
 
+            ETextBox txtReceiveMax = (ETextBox)e.Row.FindControl("txtReceiveMax");
 
+            ECombox cboDecimalLength = (ECombox)e.Row.FindControl("cboDecimalLength");
 
+            ECombox cboReceiveMantissaTypeId = (ECombox)e.Row.FindControl("cboReceiveMantissaTypeId");
 
+            cboServiceId.Condition = "BIZ_FLAG=" + this.biztype;
 
+            cboServiceId.InitItems();
 
+            cboReceiveStandardId.InitItems();
 
+            cboDecimalLength.InitItems();
 
+            cboReceiveMantissaTypeId.InitItems();
 
+
 
+
 
+        }
 
+    }
 
+    /// <summary>
 
+    /// 劤藤
 
+    /// </summary>
 
+    /// <param name="sender"></param>
 
+    /// <param name="e"></param>
 
+    protected void btnAdd_Click(object sender, EventArgs e)
 
+    {
 
+        //칵훰써炬렘
 
+        DataTable dt = this.gvData.DataTable(true);
 
+        for (int i = 0; i <1; i++)
 
+        {
 
+            DataRow dr = dt.NewRow();
 
+            //칵훰榴檄(꿇멨)
 
+            dr["HEAD_GUID"] = this.key;
 
+            dr["SERVICE_ID"] = this.biztype;
 
+
 
+            dt.Rows.Add(dr);
 
+        }
 
+        this.gvData.EDataSource = dt;
 
+
 
+        int rowNum = dt.Rows.Count;
 
+        HtmlWindow.Onload("setFocus(" + rowNum + ")");
 
+    }
 
 }
 
 }