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

DSWeb/Areas/Account/DAL/Chfee_invoice_HangXin/Chfee_InvoiceDAL.cs

@@ -4542,7 +4542,7 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Invoice_HangXin
             string str = "";
             var strSql = new StringBuilder();
             strSql.Append("SELECT ");
-            strSql.Append(" VISIBLERANGE,OPERATERANGE,AUTHORITYID,VSSQL ");
+            strSql.Append(" VISIBLERANGE,OPERATERANGE,AUTHORITYID ");//,VSSQL
             strSql.Append("  from VW_User_Authority ");
             strSql.Append("  where [NAME]='modInvoiceManagement' and USERID='" + userid + "' and ISDELETE=0");
 
@@ -4558,7 +4558,7 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Invoice_HangXin
                     visiblerange = Convert.ToString(reader["VISIBLERANGE"]);
                     operaterange = Convert.ToString(reader["OPERATERANGE"]);
                     AUTHORITYID = Convert.ToString(reader["AUTHORITYID"]);
-                    VSSQL = Convert.ToString(reader["VSSQL"]);
+                    //VSSQL = Convert.ToString(reader["VSSQL"]);
                     break;
                 }
                 reader.Close();

DSWeb/Areas/Account/Viewsjs/Chfee_invoice_HangXin/ChInvoiceAppEdit_P2.js

@@ -1398,7 +1398,8 @@ Ext.extend(Shipping.MsChInvoiceAppEdit, Ext.Panel, {
                     scope: this
                 },
                 '-', {
-                    text: '冲红',hidden:true,
+                    text: '冲红',
+                    //hidden: true,
                     id: "btn_Setred",
                     tooltip: '注意，未冲红、未作废的发票才能进行此操作',
                     handler: function (button, event) {

DSWeb/Areas/MvcShipping/Viewsjs/WMSNew/WMSNewINEdit.js

@@ -923,7 +923,7 @@ Ext.extend(Shipping.WMSNewINEdit, Ext.Panel, {
         //数据集
         this.storeWMSIN = Ext.create('Ext.data.Store', {
             model: 'WMSINmb',
-            pageSize: this.PageSize,
+            pageSize: 1000,
             remoteSort: false,
             pruneModifiedRecords: true,
             proxy: {
@@ -2122,7 +2122,7 @@ Ext.extend(Shipping.WMSNewINEdit, Ext.Panel, {
                                                 _this.storeWMSIN.load({
                                                     params: {
                                                         start: 0,
-                                                        limit: _this.PageSize,
+                                                        limit: 1000,
                                                         sort: '',
                                                         condition: "ASSOCIATEDNO='" + GID + "'"
                                                     },
@@ -3831,7 +3831,7 @@ Ext.extend(Shipping.WMSNewINEdit, Ext.Panel, {
 
             var GID = this.EditRecord.get('GID');
             this.storeWMSIN.load({
-                params: { start: 0, limit: this.PageSize, sort: '', condition: "  ASSOCIATEDNO='" + GID + "'" },
+                params: { start: 0, limit: 1000, sort: '', condition: "  ASSOCIATEDNO='" + GID + "'" },
                 waitMsg: "正在查询数据...",
                 scope: this
             });
@@ -4168,7 +4168,7 @@ Ext.extend(Shipping.WMSNewINEdit, Ext.Panel, {
                             var GID = _this.EditRecord.get('GID');
                             _this.panelFee.EditRecord = this.EditRecord;
                             this.storeWMSIN.load({
-                                params: { start: 0, limit: this.PageSize, sort: '', condition: "  ASSOCIATEDNO='" + GID + "'" },
+                                params: { start: 0, limit: 1000, sort: '', condition: "  ASSOCIATEDNO='" + GID + "'" },
                                 waitMsg: "正在查询数据...",
                                 scope: this
                             });