From cfece63631cf3bef57a9fd3f10cc9c08bc43a216 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 05 三月 2025 10:32:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/CNAS/systemManagement/documentRecords/distributionCollectionRecord.vue | 2
src/store/modules/user.js | 4 +
src/views/CNAS/systemManagement/documentRecords/approvalRecord.vue | 4
src/views/CNAS/systemManagement/documentRecords/cancellationRecord.vue | 2
src/views/CNAS/systemManagement/documentRecords/regularReviewsRecord.vue | 106 -----------------------------------
src/views/CNAS/systemManagement/documentRecords/outDocumenRecordt.vue | 8 +-
6 files changed, 13 insertions(+), 113 deletions(-)
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 54d35ca..e5d40e4 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -2,6 +2,7 @@
import { getToken, setToken, removeToken } from "@/utils/auth";
import { isHttp, isEmpty } from "@/utils/validate";
import defAva from "@/assets/images/profile.jpg";
+import Vue from "vue";
const user = {
state: {
@@ -50,6 +51,9 @@
.then((res) => {
setToken(res.token);
commit("SET_TOKEN", res.token);
+ Vue.prototype.uploadHeader = {
+ Authorization: "Bearer " + res.token,
+ };
resolve();
})
.catch((error) => {
diff --git a/src/views/CNAS/systemManagement/documentRecords/approvalRecord.vue b/src/views/CNAS/systemManagement/documentRecords/approvalRecord.vue
index 7f12fca..ef71f30 100644
--- a/src/views/CNAS/systemManagement/documentRecords/approvalRecord.vue
+++ b/src/views/CNAS/systemManagement/documentRecords/approvalRecord.vue
@@ -298,7 +298,7 @@
})
})
this.personList = data
- this.refreshTable()()
+ this.refreshTable()
})
},
// 瀹℃牳
@@ -410,7 +410,7 @@
this.upLoading = false;
if (response.code == 200) {
this.$message.success('涓婁紶鎴愬姛');
- this.refreshTable()()
+ this.refreshTable()
} else {
this.$message.error('涓婁紶澶辫触');
}
diff --git a/src/views/CNAS/systemManagement/documentRecords/cancellationRecord.vue b/src/views/CNAS/systemManagement/documentRecords/cancellationRecord.vue
index 29112da..686e6eb 100644
--- a/src/views/CNAS/systemManagement/documentRecords/cancellationRecord.vue
+++ b/src/views/CNAS/systemManagement/documentRecords/cancellationRecord.vue
@@ -296,7 +296,7 @@
this.upLoading = false;
if (response.code == 200) {
this.$message.success('涓婁紶鎴愬姛');
- this.refreshTable()()
+ this.refreshTable()
} else {
this.$message.error('涓婁紶澶辫触');
}
diff --git a/src/views/CNAS/systemManagement/documentRecords/distributionCollectionRecord.vue b/src/views/CNAS/systemManagement/documentRecords/distributionCollectionRecord.vue
index bd992eb..d224ee2 100644
--- a/src/views/CNAS/systemManagement/documentRecords/distributionCollectionRecord.vue
+++ b/src/views/CNAS/systemManagement/documentRecords/distributionCollectionRecord.vue
@@ -365,7 +365,7 @@
this.upLoading = false;
if (response.code == 200) {
this.$message.success('涓婁紶鎴愬姛');
- this.refreshTable()()
+ this.refreshTable()
} else {
this.$message.error('涓婁紶澶辫触');
}
diff --git a/src/views/CNAS/systemManagement/documentRecords/outDocumenRecordt.vue b/src/views/CNAS/systemManagement/documentRecords/outDocumenRecordt.vue
index f323f0d..c7c2922 100644
--- a/src/views/CNAS/systemManagement/documentRecords/outDocumenRecordt.vue
+++ b/src/views/CNAS/systemManagement/documentRecords/outDocumenRecordt.vue
@@ -169,8 +169,8 @@
{
name: "鎵瑰噯",
type: "text",
- clickFun: (handleApproval) => {
- this.handleSubmit(row);
+ clickFun: (row) => {
+ this.handleApproval(row);
},
disabled: (row) => {
return !row.submitUserName || !!row.ratifyUserName
@@ -410,7 +410,7 @@
type: 'success',
message: '鎻愪氦鎴愬姛!'
});
- this.refreshTable()()
+ this.refreshTable()
}).catch(err => { });
})
},
@@ -437,7 +437,7 @@
type: 'success',
message: '鎿嶄綔鎴愬姛!'
});
- this.refreshTable()()
+ this.refreshTable()
this.lookDialogVisible = false
}).catch(err => { });
},
diff --git a/src/views/CNAS/systemManagement/documentRecords/regularReviewsRecord.vue b/src/views/CNAS/systemManagement/documentRecords/regularReviewsRecord.vue
index 9bb9cdb..432faea 100644
--- a/src/views/CNAS/systemManagement/documentRecords/regularReviewsRecord.vue
+++ b/src/views/CNAS/systemManagement/documentRecords/regularReviewsRecord.vue
@@ -159,110 +159,6 @@
lookDialogVisible: false,
noCheckLoading: false,
checkLoading: false,
- componentData: {
- entity: {
- documentName: null,
- documentCode: null,
- orderBy: {
- field: 'id',
- order: 'desc'
- }
- },
- isIndex: true,
- showSelect: false,
- select: false,
- // selectMethod: 'handleChangeTask',
- do: [{
- id: 'handleEdit',
- font: '淇敼',
- type: 'text',
- method: 'handleEdit',
- field: [],
- }, {
- id: 'delete',
- font: '鍒犻櫎',
- type: 'text',
- method: 'doDiy',
- }],
- tagField: {
- // documentType:{
- // select: []
- // },
- // receiveUserName:{
- // select: []
- // },
- },
- selectField: {
- // documentType:{
- // select: []
- // },
- // receiveUserName:{
- // select: []
- // },
- },
- addUpload: ['signatoryUrl'],
- requiredAdd: [],
- requiredUp: [],
- datePicker: ['receiveDate'],
- noHead: ['signedUserName', 'signedDate', 'departLims'],//涓嶅弬涓庢柊澧炵紪杈戠殑瀛楁
- needSort: [],
- inputType: ''
- },
- componentData0: {
- entity: {
- year: null,
- orderBy: {
- field: 'id',
- order: 'desc'
- }
- },
- isIndex: true,
- showSelect: false,
- select: false,
- do: [{
- id: 'handleLook',
- font: '鏌ョ湅',
- type: 'text',
- method: 'handleLook',
- disabled: (row, index) => {
- return !row.url
- }
- }, {
- id: 'handleDown0',
- font: '涓嬭浇',
- type: 'text',
- method: 'handleDown0',
- disabled: (row, index) => {
- return !row.url
- }
- },
- {
- id: 'handleSubmit',
- font: '鎻愪氦',
- type: 'text',
- method: 'handleSubmit',
- disabled: (row, index) => {
- return !!row.submitUserName
- }
- }, {
- id: 'handleApproval',
- font: '鎵瑰噯',
- type: 'text',
- method: 'handleApproval',
- disabled: (row, index) => {
- return !row.submitUserName || !!row.ratifyUserName
- }
- }],
- tagField: {},
- selectField: {},
- requiredAdd: [],
- requiredUp: [],
- needSort: [],
- inputType: ''
- },
- entityCopy: {},
- entityCopy0: {},
- upIndex: 0,
addInfo: {},
title: '鏂板',
addInfo: {},
@@ -534,7 +430,7 @@
this.upLoading = false;
if (response.code == 200) {
this.$message.success('涓婁紶鎴愬姛');
- this.refreshTable()()
+ this.refreshTable()
} else {
this.$message.error('涓婁紶澶辫触');
}
--
Gitblit v1.9.3