Commit 367afd79 authored by gary's avatar gary

1、fix

parent 083e8496
......@@ -996,6 +996,8 @@
"PleaseSelect": "Please Select...",
"PleaseSelectColumn": "Please Select Column Name",
"PleaseSelectFileFirst": "Please Choose at Lease One File!",
"PleaseSelectCountryFirst": "Please Choose at one country!",
"PleaseSelectCompanyFirst": "Please Choose at one company!",
"PostedBy": "Posted by",
"PostingPeriod": "Posting Period",
"PreVoucherNumber": "Initial Value of Voucher Number",
......
......@@ -1293,6 +1293,8 @@
"PleaseSelectColumn": "请选择列名",
"PleaseSelectFile": "请先选择文件",
"PleaseSelectFileFirst": "请先选择文件!",
"PleaseSelectCountryFirst": "请先选择国家!",
"PleaseSelectCompanyFirst": "请先选择公司!",
"PleaseSelectProductType": "请选择商品种类",
"PleaseSelectRecordToDelete": "请选择需要删除的记录!",
"PleaseSelectServiceType": "请选择服务类型",
......
......@@ -194,10 +194,21 @@
return;
}
if (!$scope.selectCountry||''===$scope.selectCountry){
SweetAlert.warning($translate.instant('PleaseSelectFileFirst'));
return;
}
if (!$scope.selectCompany||''===$scope.selectCompany){
SweetAlert.warning($translate.instant('PleaseSelectFileFirst'));
return;
}
var url = getUploadUrl();
var period = $scope.UploadPeriodTime;
Upload.upload({
url: url,
data: {
......@@ -297,39 +308,34 @@
columns: [
{
dataField: "gmv",
width: '14%',
width: '16%',
allowHeaderFiltering: false,
caption: 'Gmv'
}, {
dataField: "trips",
allowHeaderFiltering: false,
caption: 'Trips',
width: '14%'
width: '16%'
}, {
dataField: "subsidyB",
allowHeaderFiltering: false,
width: '14%',
width: '16%',
caption: 'SubsidyB'
}, {
dataField: "subsidyC",
allowHeaderFiltering: false,
width: '14%',
width: '16%',
caption: 'SubsidyC'
}, {
dataField: "revenue",
allowHeaderFiltering: false,
width: '14%',
width: '16%',
caption: 'Revenue'
}, {
dataField: "profit",
allowHeaderFiltering: false,
width: '14%',
width: '16%',
caption: 'Profit'
}, {
dataField: "exchangeRate",
allowHeaderFiltering: false,
width: '14%',
caption: 'ExchangeRate'
}],
onContentReady: function (e) {
$scope.accountingRateListInstance = e.component;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment