Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev

.gitignore

@@ -53,4 +53,5 @@ BookingWeb/Properties/PublishProfiles/FolderProfile.pubxml.user
 DSWeb/DSWeb.csproj.user
 BookingJieFeng/BookingJieFeng.csproj.user
 DispatchWeb/DispatchWeb.csproj.user
-DSWeb/Properties/PublishProfiles/FolderProfile.pubxml
+DSWeb/Properties/PublishProfiles/FolderProfile.pubxml
+/DSWeb/Areas/MvcShipping/DAL/MsChFee/MsChFeeDAL.cs

DSWeb/Areas/Account/Models/Chfee_recvapplication/Chfee_Recvapplication.cs

@@ -158,7 +158,7 @@ namespace DSWeb.Areas.Account.Models.Chfee_Recvapplication
             set { _settlerate = value; }
         }
 
-        [ModelDB]
+        [ModelDB(MDBType = ModelDBOprationType.Insert)]
         public string APPLICANT
         {
             get { return _applicant; }

DSWeb/Areas/Dispatch/Views/Dispatch/DispatchFeeList.aspx

@@ -15,7 +15,7 @@
             <div class="weui-form-preview">
                 <div class="weui-form-preview__bd">
                     <div class="weui-form-preview__item">
-                        <label class="weui-form-preview__label">陆运费</label>
+                        <label class="weui-form-preview__label" style="text-align:left !important;text-align-last:left !important;">陆运费</label>
                         <span class="weui-form-preview__value"><%=truckFee %></span>
                     </div>
                 </div>

DSWeb/Areas/MvcShipping/DAL/MsChFee/MsChFeeDAL.cs

@@ -6680,9 +6680,8 @@ namespace DSWeb.MvcShipping.DAL.MsChFeeDAL
         /// <param name="AMOUNT">金额</param>
         /// <param name="QUANTITY">数量</param>
         /// <returns></returns>
-        public static ch_fee_md getChFee(string USERID, string BSNO, string CUSTOMERNAME, int FEETYPE, string FEENAME, decimal AMOUNT, string UNIT, decimal QUANTITY = 1,string remark="",string sale="")
-        {
-
+        public static ch_fee_md getChFee(string USERID, string BSNO, string CUSTOMERNAME, int FEETYPE, string FEENAME, decimal AMOUNT, string UNIT, decimal QUANTITY = 1, string SALE = "", string remark = "") 
+        { 
             var result = getNewChfee();
             result.BSNO = BSNO;
             result.CUSTOMERNAME = CUSTOMERNAME;
@@ -6703,8 +6702,8 @@ namespace DSWeb.MvcShipping.DAL.MsChFeeDAL
             result.EXCHANGERATE = 1M;
 
             result.UNIT = UNIT;
+
             result.REMARK = remark;
-            result.MANAGER = sale;
             //
             CommonDataContext cdc = new CommonDataContext();
             var codefeelist = cdc.code_fee.Where(x => 1 == 1).ToList();
@@ -6765,7 +6764,7 @@ namespace DSWeb.MvcShipping.DAL.MsChFeeDAL
             {
                 if (AMOUNT != 0)
                 {
-                    var newfee = getChFee(USERID, BSNO, CUSTOMERNAME, FEETYPE, FEENAME, AMOUNT,UNIT, QUANTITY,"",SALE);
+                    var newfee = getChFee(USERID, BSNO, CUSTOMERNAME, FEETYPE, FEENAME, AMOUNT,UNIT, QUANTITY);
 
                     CommonDataContext cdc = new CommonDataContext();