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

D7MqClient/D7MqClient/InvtoD7.cs

@@ -486,7 +486,13 @@ namespace D7MqClient
 
                     if (string.IsNullOrWhiteSpace(inv.invNum))
                     {
-                        result.REMARK = inv.errormessage.message;
+                        try
+                        {
+                            result.REMARK = inv.errormessage.message;
+                        }
+                        catch (Exception e) { 
+                        
+                        }
                     }
 
                     result.CUSTOMERNAME = _infoclient.SHORTNAME;

DSWeb/Areas/Account/Viewsjs/Chfee_lock/Chfee_lock.js

@@ -419,11 +419,6 @@ Ext.extend(Shipping.MsChfeelock, Ext.Panel, {
             dataIndex: 'BSTYPE',
             header: '运输类型',
             width: 70
-            }, {
-                sortable: true,
-                dataIndex: 'BLTYPE',
-                header: '主分单类型',
-                width: 70
             },
         {
             sortable: true,

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

@@ -512,16 +512,6 @@ Ext.extend(Shipping.MsChPayapplicationIndex, Ext.Panel, {
               dataIndex: 'SALECORP',
               header: Zi.LAN.DepartmentName, //驳回原因
                 width: 80
-            }, {
-                sortable: true,
-              dataIndex: 'CUSTBANKNAME',
-              header: Zi.LAN.jsuanBank, //驳回原因
-                width: 80
-            }, {
-                sortable: true,
-              dataIndex: 'CUSTACCOUNT',
-              header: Zi.LAN.jsuanzh, //驳回原因
-                width: 80
             }, {
                 sortable: true,
               dataIndex: 'ISREVINV',

DSWeb/Areas/Account/Viewsjs/Chfee_recvapplication/ChRecvapplicationBLEdit.js

@@ -2834,6 +2834,8 @@ Ext.extend(Shipping.MsChRecvapplicationBLEdit, Ext.Panel, {
                                         }, this);
                                         this.editRecord.commit();
 
+                                        
+                                        this.onClearClick();
                                     } else {
                                         Ext.MessageBox.alert('请求出现错误,请重试', response.responseText);
                                     }
@@ -3206,6 +3208,14 @@ Ext.extend(Shipping.MsChRecvapplicationBLEdit, Ext.Panel, {
         this.storeBodyAddList.load({ params: { start: 0, limit: this.PageSize, sort: '', condition: sql} });
     },
 
+    //用于在费用列表生成收费申请后 清空下方的业务明细和费用明细
+    onClearClick: function (button, event) {
+        if (this.bsnosql) {
+            this.storeBodyAddList.removeAll();
+            this.storeAddFeeList.removeAll();
+        }
+    },
+
     onDsQuery: function (button, event) {
         var sql = this.sqlcontext;
         this.PageSize = this.Pagenum.getValue();

DSWeb/Areas/MvcShipping/Viewsjs/Comm/DsComm.js

@@ -252,6 +252,32 @@ function FilterCombox(e, limit = 1) {
     }
 }
 
+//写在combox的按键事件中 形如：
+// specialkey: function (combo, e) {
+//     //将回车13转义成tab9
+//     GetComboxFirstValueOnTableClick(combo, e);
+// }
+//用于在点击回车或table键，跳转至下一输入框时，在combox当中取目前第一条选项作为值
+function GetComboxFirstValueOnTableClick(combo, e) {
+    //var combo = e.combo;
+    if (e.getKey() == e.ENTER) {
+        e.keyCode = 9;
+    }
+    if (e.keyCode == 9) {
+        //将combo
+        //alert(field.value);
+        if (combo.value == null) {
+            _name = combo.store.data.keys[0];
+            combo.setValue(_name);
+        } else {
+            if (combo.value.replace(/\s*/g, "") == "") {
+                _name = combo.store.data.keys[0];
+                combo.setValue(_name);
+            }
+        }
+    }
+}
+
 //获取目前表最大的Serialno
 function DsGetCurSerialNo(store,serialno) {
     var result = serialno;

DSWeb/Areas/MvcShipping/Viewsjs/MsInfoClient/MsInfoClientIndex.js

@@ -277,22 +277,6 @@ Ext.extend(Shipping.MsInfoClientIndex, Ext.Panel, {
                 align: 'center',
                 width: 80
             },
-            {
-                sortable: true,
-                id: '',
-                dataIndex: 'TEL',
-                header: Zi.LAN.TEL, //'业务锁定',
-                align: 'center',
-                width: 80
-            },
-            {
-                sortable: true,
-                id: '',
-                dataIndex: 'FAX',
-                header: Zi.LAN.FAX, //'业务锁定',
-                align: 'center',
-                width: 80
-            },
             {
                 sortable: true,
                 id: '',

DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeSaleIndex.js

@@ -693,13 +693,6 @@ Ext.extend(Shipping.MsOpSeaeSaleIndex, Ext.Panel, {
             dataIndex: 'CONTRACTNO',
                 header: '运费协议号',
                 width: 100
-            },
-            {
-                sortable: true,
-                id: '',
-                dataIndex: 'SERVICECONTRACTNO',
-                header: Zi.LAN.SERVICECONTRACTNO, //'服务合同号',
-                width: 100
             }, {
                 dataIndex: 'SALECORP',
                 header: '所属分部', //'货物标识',