|
|
@@ -1161,6 +1161,15 @@
|
|
|
<el-option :label="$t('state.alreadyPassedAndWaitingAudit')" value="1"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
+ <el-form-item prop="exportType" :label="'导出方式'" v-if="user.companyId == '936'">
|
|
|
+ <div class="exportReportRadio">
|
|
|
+ <el-radio v-model="exportType" :label="0">完整导出</el-radio>
|
|
|
+ <el-radio v-model="exportType" :label="1">精简导出</el-radio>
|
|
|
+ <el-tooltip effect="dark" :content="'精简日报不含工作事项和审批信息，数据量更小导出更快。'" placement="top-start">
|
|
|
+ <i class="el-icon-question"></i>
|
|
|
+ </el-tooltip>
|
|
|
+ </div>
|
|
|
+ </el-form-item>
|
|
|
</el-form>
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
<el-button type="primary" @click="exportReport" style="width:100%;" :loading="exportingData">{{$t('export.export')}}</el-button>
|
|
|
@@ -1952,6 +1961,7 @@
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
+ exportType: 0,
|
|
|
exportingData: false,
|
|
|
roleList:[{value: 1,label: 'CRC&LM'},{value: 2,label: 'PM'}],
|
|
|
jobResponseList:[],
|
|
|
@@ -4182,6 +4192,7 @@
|
|
|
// },
|
|
|
|
|
|
showExportDialog() {
|
|
|
+ this.exportType = 0
|
|
|
this.exportDialog = true;
|
|
|
},
|
|
|
showExportTimeDialog() {
|
|
|
@@ -5338,7 +5349,7 @@
|
|
|
this.exportingData = true;
|
|
|
var param = {};
|
|
|
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], exportType: this.exportType};
|
|
|
}
|
|
|
if (this.exportParam.projectId != null) {
|
|
|
param.projectId = this.exportParam.projectId;
|
|
|
@@ -5348,6 +5359,7 @@
|
|
|
}
|
|
|
param.stateKey = this.stateKey
|
|
|
// param.departmentId = this.user.departmentId
|
|
|
+ console.log(param, '《=== 导出传的参数')
|
|
|
this.http.post( this.port.report.export, param,
|
|
|
res => {
|
|
|
this.exportingData = false;
|
Lijy