From a4f2ebf136cbac92638d0268f9068dff92241f06 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 26 十二月 2024 14:33:12 +0800
Subject: [PATCH] 修改cnas8里面的bug
---
src/components/do/a8-measures_deal_risks_opportunities/hazard_identification_risk_assessment.vue | 6 ++++++
src/components/view/a8-document-approval-records.vue | 7 ++++---
src/assets/api/controller.js | 14 +++++++-------
3 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index 84a6cad..5ed70de 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -528,13 +528,13 @@
}
// 8.4璁板綍鐨勬帶鍒�--鏂囦欢瀹℃壒璁板綍
const manageRecordCheck = {
- pageManageRecordCheck:'/manageRecordCheck/pageManageRecordCheck ',//鍒楄〃
- addManageRecordCheck:'/manageRecordCheck/addManageRecordCheck ',//鏂板
- doManageRecordCheck:'/manageRecordCheck/doManageRecordCheck ',//缂栬緫
- delManageRecordCheck:'/manageRecordCheck/delManageRecordCheck ',//鍒犻櫎
- checkManageRecordCheck:'/manageRecordCheck/checkManageRecordCheck ',//瀹℃牳
- ratifyManageRecordCheck:'/manageRecordCheck/ratifyManageRecordCheck ',//鎵瑰噯
- exportOutManageRecordCheck:'/manageRecordCheck/exportOutManageRecordCheck ',//瀵煎嚭
+ pageManageRecordCheck:'/manageRecordCheck/pageManageRecordCheck',//鍒楄〃
+ addManageRecordCheck:'/manageRecordCheck/addManageRecordCheck',//鏂板
+ doManageRecordCheck:'/manageRecordCheck/doManageRecordCheck',//缂栬緫
+ delManageRecordCheck:'/manageRecordCheck/delManageRecordCheck',//鍒犻櫎
+ checkManageRecordCheck:'/manageRecordCheck/checkManageRecordCheck',//瀹℃牳
+ ratifyManageRecordCheck:'/manageRecordCheck/ratifyManageRecordCheck',//鎵瑰噯
+ exportOutManageRecordCheck:'/manageRecordCheck/exportOutManageRecordCheck',//瀵煎嚭
exportInManageRecordCheck:'/manageRecordCheck/exportInManageRecordCheck',//瀵煎叆
}
diff --git a/src/components/do/a8-measures_deal_risks_opportunities/hazard_identification_risk_assessment.vue b/src/components/do/a8-measures_deal_risks_opportunities/hazard_identification_risk_assessment.vue
index 361094e..a0df8e4 100644
--- a/src/components/do/a8-measures_deal_risks_opportunities/hazard_identification_risk_assessment.vue
+++ b/src/components/do/a8-measures_deal_risks_opportunities/hazard_identification_risk_assessment.vue
@@ -41,6 +41,7 @@
</el-table-column>
<el-table-column prop="level" label="椋庨櫓绛夌骇" min-width="180"></el-table-column>
<el-table-column prop="measures" label="鎺у埗鎺柦" min-width="180"></el-table-column>
+ <el-table-column prop="conclusion" label="璇勪环缁撹" min-width="180"></el-table-column>
<el-table-column prop="editorName" label="缂栧埗浜哄鍚�" min-width="180"></el-table-column>
<el-table-column prop="editorDate" label="缂栧埗鏃ユ湡" min-width="180"></el-table-column>
<el-table-column prop="approvalName" label="瀹℃壒浜哄鍚�" min-width="180"></el-table-column>
@@ -128,6 +129,11 @@
<el-input v-model="form.measures" size="small"></el-input>
</el-form-item>
</el-col>
+ <el-col :span="12">
+ <el-form-item label="璇勪环缁撹">
+ <el-input v-model="form.conclusion" size="small"></el-input>
+ </el-form-item>
+ </el-col>
</el-row>
</el-form>
<span slot="footer" class="dialog-footer">
diff --git a/src/components/view/a8-document-approval-records.vue b/src/components/view/a8-document-approval-records.vue
index 79c4da0..330f6e1 100644
--- a/src/components/view/a8-document-approval-records.vue
+++ b/src/components/view/a8-document-approval-records.vue
@@ -200,14 +200,15 @@
// 瀵煎嚭
handleDown(){
this.outLoading = true
- this.$axios.post(this.$api.manageRecordCheck.exportOutManageRecordCheck,{entity:this.componentData.entity},{headers: { 'Content-Type': 'application/json' }}).then(res => {
+ this.$axios.get(this.$api.manageRecordCheck.exportOutManageRecordCheck + '?documentName=' + this.componentData.entity.documentName + '&documentCode='+ this.componentData.entity.documentCode,{responseType: "blob"}).then(res => {
this.outLoading = false
if(res.code==201) return this.$message.error('瀵煎嚭澶辫触')
this.$message.success('瀵煎嚭鎴愬姛')
- let url = this.javaApi+'word/'+res.message
+ const blob = new Blob([res],{ type: 'application/msword' });
+ const url = URL.createObjectURL(blob);
const link = document.createElement('a');
link.href = url;
- link.download = '鏂囦欢瀹℃壒璁板綍';
+ link.download = '鏂囦欢瀹℃壒璁板綍.docx';
link.click();
})
},
--
Gitblit v1.9.3