解决导入英文格式因日期格式不统一出错的问题

Bailun.DC.Web/Areas/Reports/Views/Finance/ListEbayIncome.cshtml

@@ -29,7 +29,8 @@
                         <label>&nbsp;</label>
                         <button type="button" class="btn btn-primary" onclick="list();"><i class="fa fa-search"></i>&nbsp;查询</button>
                         <button id="btnUpload_chs" type="button" class="btn btn-success">导入paypal中文数据</button>
-                        <button id="btnUpload_en" type="button" class="btn btn-success">导入paypal英文数据</button>
+                        <button id="btnUpload_en_inside" type="button" class="btn btn-success">导入paypal英文【国内】账户</button>
+                        <button id="btnUpload_en_outside" type="button" class="btn btn-success">导入paypal英文【国外】帐号</button>
                     </div>
                 </div>
             </form>
@@ -89,22 +90,25 @@
 
         function list() {
             var columns = [
-                { field: 'record_time', title: '报告日期', width: '150', sortable: true },
+                { field: 'record_time', title: '报告日期', width: '160', sortable: true },
                 { field: 'account_name', title: '帐号', width: '180' },
                 { field: 'time_zone', title: '时区', width: '70'},
-                { field: 'type', title: '类型', width: '170'},
+                {
+                    field: 'type', title: '类型', width: '190', formatter: function (idx, data) {
+                        return '<div class="mules" title="' + data.type + '">' + data.type + '</div>';
+                    }},
                 { field: 'status', title: '状态', width: '120', iscount: true},
                 { field: 'currency', title: '币种', width: '70'},
                 { field: 'gross', title: '总额', width: '100', sortable: true, iscount: true },
                 { field: 'fee', title: '费用', width: '90', sortable: true, iscount: true },
                 { field: 'net', title: '净额', width: '90', sortable: true, iscount: true },
                 {
-                    field: 'from_email', title: '发件人邮箱地址', width: '180', formatter: function (idx, data) {
+                    field: 'from_email', title: '发件人邮箱地址', width: '190', formatter: function (idx, data) {
                         return '<div class="mules" title="' + data.from_email + '">' + data.from_email + '</div>';
                     }
                 },
                 {
-                    field: 'to_email', title: '收件人邮箱地址', width: '160', formatter: function (idx, data) {
+                    field: 'to_email', title: '收件人邮箱地址', width: '190', formatter: function (idx, data) {
                         return '<div class="mules" title="' + data.to_email + '">' + data.to_email + '</div>';
                     }
                 },
@@ -148,7 +152,7 @@
                         companyid = d.companyid;
 
                         uploadfile('btnUpload_chs',
-                            '@Url.Content("~/Reports/Finance/UploadEbayIncome")' + '?companyid=' + companyid +'&isChs=1',
+                            '@Url.Content("~/Reports/Finance/UploadEbayIncome")' + '?companyid=' + companyid +'&formattype=1',
                             function(result){
                                 if(result.success)
                                 {
@@ -160,8 +164,20 @@
                                 }
                             });
 
-                        uploadfile('btnUpload_en',
-                            '@Url.Content("~/Reports/Finance/UploadEbayIncome")' + '?companyid=' + companyid +'&isChs=0',
+                        uploadfile('btnUpload_en_inside',
+                            '@Url.Content("~/Reports/Finance/UploadEbayIncome")' + '?companyid=' + companyid +'&formattype=3',
+                            function(result){
+                                if(result.success)
+                                {
+                                    alert('上传成功！');
+                                }
+                                else
+                                {
+                                    alert(result.msg);
+                                }
+                            });
+                        uploadfile('btnUpload_en_outside',
+                            '@Url.Content("~/Reports/Finance/UploadEbayIncome")' + '?companyid=' + companyid +'&formattype=2',
                             function(result){
                                 if(result.success)
                                 {