|
@@ -1163,7 +1163,7 @@
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
</el-form>
|
|
</el-form>
|
|
|
<div slot="footer" class="dialog-footer">
|
|
<div slot="footer" class="dialog-footer">
|
|
|
- <el-button type="primary" @click="exportReport" style="width:100%;" :loading="listLoading">{{$t('export.export')}}</el-button>
|
|
|
|
|
|
|
+ <el-button type="primary" @click="exportReport" style="width:100%;" :loading="exportingData">{{$t('export.export')}}</el-button>
|
|
|
</div>
|
|
</div>
|
|
|
</el-dialog>
|
|
</el-dialog>
|
|
|
<!--导出报表条件选择 -->
|
|
<!--导出报表条件选择 -->
|
|
@@ -1952,6 +1952,7 @@
|
|
|
},
|
|
},
|
|
|
data() {
|
|
data() {
|
|
|
return {
|
|
return {
|
|
|
|
|
+ exportingData: false,
|
|
|
roleList:[{value: 1,label: 'CRC&LM'},{value: 2,label: 'PM'}],
|
|
roleList:[{value: 1,label: 'CRC&LM'},{value: 2,label: 'PM'}],
|
|
|
jobResponseList:[],
|
|
jobResponseList:[],
|
|
|
yisibeiCompId: 3092,
|
|
yisibeiCompId: 3092,
|
|
@@ -5334,7 +5335,7 @@
|
|
|
},
|
|
},
|
|
|
//导出日报
|
|
//导出日报
|
|
|
exportReport() {
|
|
exportReport() {
|
|
|
- this.listLoading = true;
|
|
|
|
|
|
|
+ this.exportingData = true;
|
|
|
var param = {};
|
|
var param = {};
|
|
|
if (this.exportParam.dateRange != null) {
|
|
if (this.exportParam.dateRange != null) {
|
|
|
param = {startDate:this.exportParam.dateRange[0], endDate: this.exportParam.dateRange[1]};
|
|
param = {startDate:this.exportParam.dateRange[0], endDate: this.exportParam.dateRange[1]};
|
|
@@ -5349,7 +5350,7 @@
|
|
|
// param.departmentId = this.user.departmentId
|
|
// param.departmentId = this.user.departmentId
|
|
|
this.http.post( this.port.report.export, param,
|
|
this.http.post( this.port.report.export, param,
|
|
|
res => {
|
|
res => {
|
|
|
- this.listLoading = false;
|
|
|
|
|
|
|
+ this.exportingData = false;
|
|
|
if (res.code == "ok") {
|
|
if (res.code == "ok") {
|
|
|
location.href = res.data;
|
|
location.href = res.data;
|
|
|
this.exportDialog = false;
|
|
this.exportDialog = false;
|
|
@@ -5361,7 +5362,7 @@
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|
|
|
error => {
|
|
error => {
|
|
|
- this.listLoading = false;
|
|
|
|
|
|
|
+ this.exportingData = false;
|
|
|
this.$message({
|
|
this.$message({
|
|
|
message: error,
|
|
message: error,
|
|
|
type: "error"
|
|
type: "error"
|
