From 60322c503d201e4d1000e62d8ecf17db4f628e4c Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期三, 12 三月 2025 15:49:23 +0800
Subject: [PATCH] 合并冲突
---
src/views/CNAS/systemManagement/documentRecords/outDocumenRecordt.vue | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/views/CNAS/systemManagement/documentRecords/outDocumenRecordt.vue b/src/views/CNAS/systemManagement/documentRecords/outDocumenRecordt.vue
index 4ddaefb..b6988a4 100644
--- a/src/views/CNAS/systemManagement/documentRecords/outDocumenRecordt.vue
+++ b/src/views/CNAS/systemManagement/documentRecords/outDocumenRecordt.vue
@@ -170,7 +170,7 @@
name: "鎵瑰噯",
type: "text",
clickFun: (row) => {
- this.handleSubmit(row);
+ this.handleApproval(row);
},
disabled: (row) => {
return !row.submitUserName || !!row.ratifyUserName
@@ -393,8 +393,7 @@
}).catch(err => { });
},
handleDown0(row) {
- let url = this.javaApi + '/word/' + row.url
- this.$download.saveAs(url, '澶栨潵鏂囦欢纭璁板綍')
+ this.$download.saveAs(row.url, '澶栨潵鏂囦欢纭璁板綍')
},
// 鎻愪氦
handleSubmit(row) {
@@ -410,7 +409,7 @@
type: 'success',
message: '鎻愪氦鎴愬姛!'
});
- this.refreshTable()()
+ this.refreshTable()
}).catch(err => { });
})
},
@@ -437,7 +436,7 @@
type: 'success',
message: '鎿嶄綔鎴愬姛!'
});
- this.refreshTable()()
+ this.refreshTable()
this.lookDialogVisible = false
}).catch(err => { });
},
--
Gitblit v1.9.3