From c4cfd5c566d137fb60781b8b2e0057d11cf4b051 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 13 三月 2025 17:33:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/CNAS/systemManagement/documentControl/components/ControlledFileApplication.vue | 85 ++++++++++++++++++------------------------
1 files changed, 37 insertions(+), 48 deletions(-)
diff --git a/src/views/CNAS/systemManagement/documentControl/components/ControlledFileApplication.vue b/src/views/CNAS/systemManagement/documentControl/components/ControlledFileApplication.vue
index 81b5f6a..f642c37 100644
--- a/src/views/CNAS/systemManagement/documentControl/components/ControlledFileApplication.vue
+++ b/src/views/CNAS/systemManagement/documentControl/components/ControlledFileApplication.vue
@@ -190,10 +190,18 @@
{
label: "鏂囦欢绫诲埆", prop: "type", width: "120px", dataType: "tag",
formatData: (params) => {
- return this.fileType.find((m) => m.value == params).label;
+ if(this.fileType.find((m) => m.value == params)) {
+ return this.fileType.find((m) => m.value == params).label;
+ } else {
+ return null
+ }
},
formatType: (params) => {
- return this.fileType.find((m) => m.value == params).type;
+ if(this.fileType.find((m) => m.value == params)) {
+ return this.fileType.find((m) => m.value == params).type;
+ } else {
+ return null
+ }
},
},
{
@@ -239,7 +247,12 @@
this.handleCheck(row);
},
disabled: (row) => {
- return !row.dutyUserName.includes(this.nickName) || row.state == '閫氳繃'
+ if(row.dutyUserName != null && row.dutyUserName != "") {
+ return !row.dutyUserName.includes(this.nickName) || row.state == '閫氳繃'
+ }else {
+ return false
+ }
+
}
},
{
@@ -290,6 +303,7 @@
delete param.total;
pageManageDocumentControlled({ ...param })
.then((res) => {
+ console.log('res',res)
this.tableLoading = false;
if (res.code === 200) {
this.tableData = res.data.records;
@@ -313,37 +327,6 @@
this.queryParams = {};
this.page.current = 1;
this.getList();
- },
- getPower() {
- let power = JSON.parse(sessionStorage.getItem('power'))
- let up = false
- let del = false
- let add = false
- // let check = false
- for (var i = 0; i < power.length; i++) {
- if (power[i].menuMethod == 'addManageDocumentControlled') {
- up = true
- }
- if (power[i].menuMethod == 'addManageDocumentControlled') {
- add = true
- }
- if (power[i].menuMethod == 'delManageDocumentControlled') {
- del = true
- }
- // if (power[i].menuMethod == 'checkManageDocumentControlled') {
- // check = true
- // }
- }
- // if (!check) {
- // this.componentData.do.splice(2, 1)
- // }
- if (!del) {
- this.componentData.do.splice(1, 1)
- }
- if (!up) {
- this.componentData.do.splice(0, 1)
- }
- this.addPower = add
},
getAuthorizedPerson() {
selectUserCondition().then(res => {
@@ -433,6 +416,7 @@
handleUpdate(row) {
this.title = '鏂囦欢鍙樻洿鐢宠'
this.addInfo = this.HaveJson(row)
+ this.file = null
this.addDialogVisible = true
},
// 鏌ョ湅闄勪欢
@@ -460,8 +444,7 @@
},
handleDown(row) {
if (!row.url) return this.$message.warning('鏂囦欢鏈笂浼�')
- let url = this.javaApi + '/word/' + row.url
- this.$download.saveAs(url, row.url);
+ this.$download.saveAs(row.url, row.url);
},
async uploadPDF(pdfBlob) {
const formData = new FormData();
@@ -470,18 +453,25 @@
formData.append('state', this.type); // 鏂囦欢鍚嶅瓧娈�
formData.append('writer', this.currentInfo.writer); // 鏂囦欢鍚嶅瓧娈�
- let res = await checkManageDocumentControlled(formData)
- this.checkLoading = false
- this.noCheckLoading = false
- if (res.code == 200) {
- this.$message({ message: '鎿嶄綔鎴愬姛', type: 'success' });
- this.checkDialogVisible = false;
- this.refreshTable()
- return true
- } else {
- this.$message({ message: '鎿嶄綔澶辫触', type: 'error' });
- return false
+ try {
+ let res = await checkManageDocumentControlled(formData)
+ this.checkLoading = false
+ this.noCheckLoading = false
+ if (res.code == 200) {
+ this.$message({ message: '鎿嶄綔鎴愬姛', type: 'success' });
+ this.checkDialogVisible = false;
+ this.refreshTable()
+ return true
+ } else {
+ this.$message({ message: '鎿嶄綔澶辫触', type: 'error' });
+ return false
+ }
+ } catch (e) {
+ this.checkLoading = false
+ this.noCheckLoading = false
}
+
+
},
handleCheckSub(type) {
this.type = type
@@ -501,7 +491,6 @@
})
.then(() => {
delManageDocumentControlled({ id: row.id }).then((res) => {
- if (res.code == 201) return;
this.$message.success("鍒犻櫎鎴愬姛");
this.refresh();
});
--
Gitblit v1.9.3