1

DSWeb/Areas/Account/Controllers/Chfee_AuditController.cs

@@ -58,6 +58,7 @@ namespace DSWeb.Areas.Account.Controllers
             return new ContentResult() { Content = json };
         }
 
+        [ValidateInput(false)]
         public ContentResult GetBLListData(int start, int limit, string sort,string condition)
         {
             var dataList = Chfee_AuditDAL.GetBillDataList(start, limit,condition, Convert.ToString(Session["USERID"]), Convert.ToString(Session["SHOWNAME"]), Convert.ToString(Session["COMPANYID"]), sort);
@@ -68,6 +69,7 @@ namespace DSWeb.Areas.Account.Controllers
             return new ContentResult() { Content = json };
         }
 
+        [ValidateInput(false)]
         public ContentResult GetBLListDataStr(string sort, string condition)
         {
             var dataListStr = Chfee_AuditDAL.GetBillDataListStr(condition, Convert.ToString(Session["USERID"]), Convert.ToString(Session["SHOWNAME"]), Convert.ToString(Session["COMPANYID"]), sort);
@@ -85,6 +87,7 @@ namespace DSWeb.Areas.Account.Controllers
             var json = JsonConvert.Serialize(new { Success = true, Message = "查询成功", totalCount = dataList.Count, data = list.ToList() });
             return new ContentResult() { Content = json };
         }
+        [ValidateInput(false)]
         public ContentResult GetBLListData3(int start, int limit, string sort, string condition)
         {
             var dataList = Chfee_AuditDAL.GetBillDataList3(start, limit, condition, Convert.ToString(Session["USERID"]), Convert.ToString(Session["SHOWNAME"]), Convert.ToString(Session["COMPANYID"]), sort);

DSWeb/Areas/Account/Viewsjs/Chfee_payapplication/ChPayapplicationAudit.js

@@ -2563,7 +2563,7 @@ Ext.extend(Shipping.ChPayapplicationAudit, Ext.Panel, {
         sql = sql + getAndConSql(sql, expDateEnd, "APPLYTIME <='" + expDateEnd + "'");
 
         var APPLICANT = form.findField('APPLICANT').getValue();
-        sql = sql + getAndConSql(sql, APPLICANT, "APPLICANT like '%" + APPLICANT + "%'");
+        sql = sql + getAndConSql(sql, APPLICANT, "APPLICANT= '" + APPLICANT + "'");
 
         this.isAudit = form.findField('DC').getValue();
 

DSWeb/Areas/Account/Viewsjs/Chfee_payapplication/ChPayapplicationIndex.js

@@ -646,7 +646,31 @@ Ext.extend(Shipping.MsChPayapplicationIndex, Ext.Panel, {
 
         });
 
+        //人员信息加载
+        this.storeOpCode = Ext.create('DsExt.ux.RefTableStore', {
+            model: 'DsShipping.ux.UserRefModel',
+            proxy: { url: '/CommMng/BasicDataRef/GetUserRefList' }
+        });
+        this.storeOpCode.load();
+        //
+        this.comboxAPPLICANT = Ext.create('DsExt.ux.RefTableCombox', {
+            fieldLabel: Zi.LAN.Applicant,
+            store: this.storeOpCode,
+            forceSelection: true,
+            name: 'APPLICANT',
+            labelWidth: 50,
 
+            valueField: 'GID',
+            displayField: 'CodeAndName',
+            enableKeyEvents: true,
+            listeners: {
+                keyup: function (field, e) {
+                    if (e.getKey() == e.ENTER) {
+                        _this.onRefreshClick();
+                    }
+                }
+            }
+        });
         //#endregion
 
 
@@ -769,9 +793,9 @@ Ext.extend(Shipping.MsChPayapplicationIndex, Ext.Panel, {
                                         }
                                     }
                                 }
-                                }, {
+                                }, this.comboxAPPLICANT,{
                                     xtype: 'hiddenfield',
-                                    flex: 3.82
+                                    flex: 2.82
                                 }
                             ]
                         }
@@ -1278,6 +1302,8 @@ Ext.extend(Shipping.MsChPayapplicationIndex, Ext.Panel, {
         var expDateEnd = form.findField('ExpDateEnd').getRawValue();
         sql = sql + getAndConSql(sql, expDateEnd, "APPLYTIME <='" + expDateEnd + "'");
 
+        var APPLICANT = form.findField('APPLICANT').getValue();
+        sql = sql + getAndConSql(sql, APPLICANT, "APPLICANT= '" + APPLICANT + "'");
 
         return sql;
     },

DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeEdiPortDAL.cs

@@ -48391,6 +48391,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL
             ordermain.reeferf = bill.REEFERF;
             ordermain.humidity = bill.HUMIDITY;
             ordermain.IsCreateHtmlPage = true;
+            ordermain.GoodsDescription = bill.DESCRIPTION;
 
 
                 var cntrlist = new List<ContaList>();

DSWeb/Areas/MvcShipping/Models/MsOpSeae/MsOpSeaeDjy.cs

@@ -484,6 +484,8 @@ namespace DSWeb.MvcShipping.Models.MsOpSeaeDjy
         /// 
         ///</summary>
         ///
+        public string GoodsDescription { get; set; }
+
         public bool IsCreateHtmlPage { get; set; }
         public List<ContaList> contaList { get; set; }
     }

DSWeb/Areas/SoftMng/Controllers/ExportController.cs

@@ -439,9 +439,10 @@ namespace DSWeb.SoftMng.Controllers
                     var propArr = model.GetType().GetProperties();
                     var errorstr = "";
 
+
                     foreach (var CodeSgAuditRuleGroup in CodeSgAuditRuleGroupList) {
+                        var iserror = true;
                         var billerrorstr = "";
-                        var iserror = false;
                         foreach (var audit in CodeSgAuditRuleGroup.CodeSgAuditRuleList) {
                             if (1==2)
                             {
@@ -1243,9 +1244,9 @@ namespace DSWeb.SoftMng.Controllers
                             }
 
                         }
-                        if (iserror) {
+                        if (!string.IsNullOrEmpty(billerrorstr)) {
 
-                            errorstr = errorstr+ Environment.NewLine+"序号："+ CodeSgAuditRuleGroup.SGANO+"("+billerrorstr+")";
+                            errorstr = errorstr+ "<br>序号：" + CodeSgAuditRuleGroup.SGANO+"("+billerrorstr+")";
 
                         }
 

DSWeb/Areas/SoftMng/DAL/DecHead.cs

@@ -1932,7 +1932,7 @@ namespace DSWeb.SoftMng.DAL
                         {
                             model.COMPOP = row["COMPOP"].ToString();
                         }
-                        if (row["COMPTIME"] != null)
+                        if (row["COMPTIME"] !=DBNull.Value)
                         {
                             model.COMPTIME = Convert.ToDateTime(row["COMPTIME"]).ToString("yyyy-MM-dd hh:mm:ss");
                         }

DSWeb/Areas/SoftMng/Viewsjs/SingleAudit/SingleIndex.js

@@ -519,9 +519,9 @@ Ext.extend(Shipping.SingleIndex, Ext.Panel, {
             return '';
         }
 
-        var sql = " s.COMPOP<>'" + SHOWNAME + "' ";
+//        var sql = " s.COMPOP<>'" + SHOWNAME + "' ";
 
-       
+        var sql = " 1=1 ";
         var BillState = form.findField('BillState').getValue();
         sql = sql + getAndConSql(sql, BillState, " d.BillState='" + BillState + "'");     
 

DSWeb/Areas/TruckMng/Viewsjs/MsWlBs/MsPcEdit_WFSDIndex.js

@@ -271,6 +271,23 @@ Ext.extend(DsTruck.MsPcEditIndex, Ext.Panel, {
             }
         });
 
+        this.Pagenum = Ext.create('Ext.form.field.Number', {
+            name: 'bottles',
+            fieldLabel: '每页记录数',
+            labelAlign: 'right',
+            value: this.PageSize,
+            maxValue: 100000,
+            width: 180,
+            minValue: 0,
+            listeners: {
+                specialkey: function (field, e) {
+                    if (e.getKey() == e.ENTER) {
+                        _this.onRefreshClick();
+                    }
+                }
+            }
+        });
+
         this.column = [
         {
             sortable: true, hidden: true,
@@ -937,12 +954,12 @@ Ext.extend(DsTruck.MsPcEditIndex, Ext.Panel, {
                 hideGroupedHeader: true,
                 enableGroupingMenu: true
             }],
-            bbar: Ext.create('Ext.PagingToolbar', {
+            bbar: [Ext.create('Ext.PagingToolbar', {
                 store: this.storeList,
                 displayInfo: true,
                 displayMsg: '当前显示 {0} - {1}条记录 /共 {2}条记录',
                 emptyMsg: "没有数据"
-            })
+            }), this.Pagenum]
         });
 
 
@@ -2002,12 +2019,16 @@ Ext.extend(DsTruck.MsPcEditIndex, Ext.Panel, {
 
         var sql = this.getCondition();
         this.sqlcontext = sql;
+        this.PageSize = this.Pagenum.getValue();
+
+        this.storeList.pageSize = this.PageSize;
         this.storeList.load({
             params: { start: 0, limit: this.PageSize, condition: sql },
             waitMsg: "正在查询数据...",
             scope: this
         });
 
+        this.storeListNofen.pageSize = this.PageSize;
         this.storeListNofen.load({
             params: { start: 0, limit: this.PageSize, condition: " t.BLTYPE='派车分票' AND (t.GID=t.PGID OR t.PGID='' OR t.PGID IS NULL) and (isend=0 or isend is null) " },
             waitMsg: "正在查询数据...",
@@ -2018,13 +2039,16 @@ Ext.extend(DsTruck.MsPcEditIndex, Ext.Panel, {
     },
     onDsQuery: function (button, event) {
 
-        var sql=this.sqlcontext;
+        var sql = this.sqlcontext;
+        this.PageSize = this.Pagenum.getValue();
+
+        this.storeList.pageSize = this.PageSize;
         this.storeList.load({
             params: { start: 0, limit: this.PageSize, condition: sql },
             waitMsg: "正在查询数据...",
             scope: this
         });
-
+        this.storeListNofen.pageSize = this.PageSize;
         this.storeListNofen.load({
             params: { start: 0, limit: this.PageSize, condition: " t.BLTYPE='派车分票' AND (t.GID=t.PGID OR t.PGID='' OR t.PGID IS NULL) and (isend=0 or isend is null) " },
             waitMsg: "正在查询数据...",