From e5454b769d44a34af423bf87ac8a740bf8c20341 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期二, 29 四月 2025 13:25:29 +0800
Subject: [PATCH] Merge branch 'dev' into dev_tides
---
src/views/CNAS/resourceDemand/facilitiesEnvironment/component/Personnel-management-dia.vue | 56 +++++++++++++++++++++++++++++++++-----------------------
1 files changed, 33 insertions(+), 23 deletions(-)
diff --git a/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/Personnel-management-dia.vue b/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/Personnel-management-dia.vue
index 14d2b3b..191c4b3 100644
--- a/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/Personnel-management-dia.vue
+++ b/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/Personnel-management-dia.vue
@@ -71,6 +71,14 @@
</template>
<script>
+import {
+ getForeignRegisterOne,
+ selectUserCondition,
+ addForeignRegister,
+ updateForeignRegister
+} from '@/api/cnas/resourceDemand/foreignRegister/foreignRegister'
+import {mapGetters} from "vuex";
+
export default {
name: 'Personnel-management-dia',
// import 寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
@@ -110,6 +118,9 @@
mounted() {
},
+ computed: {
+ ...mapGetters(["userId"]),
+ },
// 鏂规硶闆嗗悎
methods: {
// 鎵撳紑寮规
@@ -120,16 +131,22 @@
if (type !== 'add') {
this.searchInfo(row)
} else {
- this.form.accompanyingId = JSON.parse(localStorage.getItem("user")).userId
+ this.form.accompanyingId = this.userId
+ this.form.area = '瑁呭鐢电紗璇曢獙瀹�'
+ this.form.reason = '鍙傝瀹為獙瀹�'
+ this.form.accompanyingId = 64
+ this.form.approveId = 65
+ this.form.confidentiality = '绗﹀悎'
}
},
// 鏌ヨ璇︽儏
searchInfo (row) {
this.diaLoading = true
- this.$axios(this.$api.foreignRegister.getForeignRegisterOne + '?registerId=' + row.registerId).then(res => {
+ getForeignRegisterOne({registerId : row.registerId}).then(res =>{
this.diaLoading = false
- if (res.code === 201) return
- this.form = res.data
+ if (res.code === 200){
+ this.form = res.data
+ }
}).catch(err => {
console.log(err)
this.diaLoading = false
@@ -150,31 +167,24 @@
internalImplementDto.approveName = this.personList[index].label
}
if (this.operationType === 'add') {
- this.$axios.post(this.$api.foreignRegister.addForeignRegister, internalImplementDto, {
- headers: {
- "Content-Type": "application/json"
- },
- noQs: true
- }).then(res => {
+ addForeignRegister(internalImplementDto).then(res => {
this.loading = false
- if (res.code === 201) return
- this.$message.success('鎿嶄綔鎴愬姛')
- this.closeThreeWastesDia()
+ if (res.code === 200){
+ this.$message.success('鎿嶄綔鎴愬姛')
+ this.closeThreeWastesDia()
+ }
}).catch(err => {
console.log('err---', err);
this.loading = false
})
} else if (this.operationType === 'edit') {
- this.$axios.post(this.$api.foreignRegister.updateForeignRegister, internalImplementDto, {
- headers: {
- "Content-Type": "application/json"
- },
- noQs: true
- }).then(res => {
+ updateForeignRegister(internalImplementDto).then(res => {
this.loading = false
- if (res.code === 201) return
- this.$message.success('鎿嶄綔鎴愬姛')
- this.closeThreeWastesDia()
+ if (res.code === 200){
+ this.$message.success('鎿嶄綔鎴愬姛')
+ this.closeThreeWastesDia()
+ }
+
}).catch(err => {
console.log('err---', err);
this.loading = false
@@ -192,7 +202,7 @@
this.$emit('closeThreeWastesDia')
},
getAuthorizedPerson() {
- this.$axios.get(this.$api.user.getUserMenu).then(res => {
+ selectUserCondition().then(res => {
let data = []
res.data.forEach(a => {
data.push({
--
Gitblit v1.9.3