From 3e136d18ac8f7a0c6aede92cfdd30206b20417d3 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期三, 02 七月 2025 11:16:03 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/~yxh/opo-web
---
src/store/modules/user.js | 5 +++++
src/views/project/fundcheck/ethicalExpertFeeCheck/index.vue | 2 +-
src/views/project/travelexpenseapply/travelexpensedetail/index.vue | 1 +
src/views/project/fundcheck/officeExpenseCheck/index.vue | 2 +-
src/views/project/fund/performancedetails/index.vue | 2 +-
src/views/project/fund/applyDetail/index.vue | 7 +++++--
src/views/project/fund/expertFeeApply/index.vue | 20 ++++++++++----------
src/views/project/fund/applyDetail0/index.vue | 2 +-
src/views/project/fundcheck/medicalCostCheck/index.vue | 2 +-
src/store/getters.js | 1 +
src/views/project/fundcheck/expertFeeCheck/index.vue | 2 +-
src/views/project/externalperson/index.vue | 2 +-
src/views/project/organallocation/index.vue | 2 +-
src/views/project/fundcheck/performanceCheck/index.vue | 2 +-
14 files changed, 31 insertions(+), 21 deletions(-)
diff --git a/src/store/getters.js b/src/store/getters.js
index 90c8d4e..eef9baa 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -11,6 +11,7 @@
organization: state => state.user.organization,
introduction: state => state.user.introduction,
roles: state => state.user.roles,
+ rolesor: state => state.user.rolesor,
permissions: state => state.user.permissions,
permission_routes: state => state.permission.routes,
topbarRouters:state => state.permission.topbarRouters,
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index f0c77c0..3ec749b 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -13,6 +13,7 @@
code: '',
msg: '',
roles: [],
+ rolesor: [],
permissions: [],
organization:[],
addressArray:[],
@@ -36,6 +37,9 @@
},
SET_ROLES: (state, roles) => {
state.roles = roles
+ },
+ SET_ROLESor: (state, rolesor) => {
+ state.rolesor = rolesor
},
SET_addressArray: (state, addressArray) => {
state.addressArray = addressArray
@@ -89,6 +93,7 @@
commit('SET_ROLES', ['ROLE_DEFAULT'])
}
commit('SET_NAME', user.userName)
+ commit('SET_ROLESor', user.roles)
commit('SET_AVATAR', avatar)
resolve(res)
}).catch(error => {
diff --git a/src/views/project/externalperson/index.vue b/src/views/project/externalperson/index.vue
index 0ece431..a7be87d 100644
--- a/src/views/project/externalperson/index.vue
+++ b/src/views/project/externalperson/index.vue
@@ -452,7 +452,7 @@
getUserProfile().then(res => {
if (
res.data.userName == "admin" ||
- res.data.userName == "001" ||
+ res.data.userName == "053" ||
res.data.userName == "047"
) {
this.ismanager = true;
diff --git a/src/views/project/fund/applyDetail/index.vue b/src/views/project/fund/applyDetail/index.vue
index b930047..a2764f0 100644
--- a/src/views/project/fund/applyDetail/index.vue
+++ b/src/views/project/fund/applyDetail/index.vue
@@ -1287,6 +1287,8 @@
</template>
<script>
+import store from "@/store";
+
// 'sdaad2123UD2',1 'wsadadwsad',4 'sdadaddad',3 'ssaaddxs',2
//杩欓噷鍙互瀵煎叆鍏朵粬鏂囦欢锛堟瘮濡傦細缁勪欢锛屽伐鍏穓s锛岀涓夋柟鎻掍欢js锛宩son鏂囦欢锛屽浘鐗囨枃浠剁瓑绛夛級
//渚嬪锛歩mport 銆婄粍浠跺悕绉般�� from '銆婄粍浠惰矾寰勩��';
@@ -2316,10 +2318,11 @@
getUserProfile().then(res => {
this.userprofile = res.data;
this.standardlevel = res.data.standardlevel;
+
if (
this.userprofile.userName == "admin" ||
- this.userprofile.userName == "001" ||
- this.userprofile.userName == "047"
+ this.userprofile.userName == "053" ||
+ this.userprofile.userName == "047"|| store.getters.rolesor[0].roleSort=='13'
) {
this.ismanager = true;
} else {
diff --git a/src/views/project/fund/applyDetail0/index.vue b/src/views/project/fund/applyDetail0/index.vue
index 3299f69..9671250 100644
--- a/src/views/project/fund/applyDetail0/index.vue
+++ b/src/views/project/fund/applyDetail0/index.vue
@@ -2126,7 +2126,7 @@
this.standardlevel = res.data.standardlevel;
if (
this.userprofile.userName == "admin" ||
- this.userprofile.userName == "001" ||
+ this.userprofile.userName == "053" ||
this.userprofile.userName == "047"
) {
this.ismanager = true;
diff --git a/src/views/project/fund/expertFeeApply/index.vue b/src/views/project/fund/expertFeeApply/index.vue
index 2b0ddc9..54d2a1d 100644
--- a/src/views/project/fund/expertFeeApply/index.vue
+++ b/src/views/project/fund/expertFeeApply/index.vue
@@ -202,10 +202,10 @@
/>
</template>
</el-table-column>
- <!--
- <el-table-column label="鐢宠閲戦" align="center" prop="amountrequested" width="120px" />
+ <!--
+ <el-table-column label="鐢宠閲戦" align="center" prop="amountrequested" width="120px" />
<el-table-column label="鑱旂郴鐢佃瘽" align="center" prop="phone" width="150px" />
- <el-table-column label="宸ヤ綔鍗曚綅" align="center" prop="unitname" width="220px" />
+ <el-table-column label="宸ヤ綔鍗曚綅" align="center" prop="unitname" width="220px" />
-->
<el-table-column
label="鎿嶄綔"
@@ -786,14 +786,14 @@
</el-table>
</el-row>
<!--
- <el-row>
+ <el-row>
<el-col :span="7">
<el-form-item label="棰勬敮閲戦" prop="prepaidamount">
<el-input v-model="form.prepaidamount" placeholder="鐢宠閲戦" />
</el-form-item>
- </el-col>
- </el-row>
- <el-row>
+ </el-col>
+ </el-row>
+ <el-row>
<el-col :span="7">
<el-form-item label="OPO涓績绛惧瓧" prop="opochecker">
<el-input v-model="form.opochecker" placeholder="opo涓績绛惧瓧" />
@@ -1026,7 +1026,7 @@
:value="dict.value"></el-option>
</el-select>
</el-form-item>
- </el-col>
+ </el-col>
</el-row>
-->
<el-row>
@@ -1745,7 +1745,7 @@
}
this.fundDetails[i] = tempDetail;
/*
- //璁＄畻涓◣
+ //璁＄畻涓◣
//if (isNaN(parseFloat(tempDetail.taxedamount)))
//鑾峰彇鍙傛暟
this.taxParam.beneficiaryNo = tempDetail.beneficiaryno;
@@ -2028,7 +2028,7 @@
this.standardlevel = response.data.standardlevel;
if (
this.defaultperson.createBy == "admin" ||
- this.defaultperson.createBy == "001" ||
+ this.defaultperson.createBy == "053" ||
this.defaultperson.createBy == "002"
) {
this.ismanager = true;
diff --git a/src/views/project/fund/performancedetails/index.vue b/src/views/project/fund/performancedetails/index.vue
index 08ebd88..3144c06 100644
--- a/src/views/project/fund/performancedetails/index.vue
+++ b/src/views/project/fund/performancedetails/index.vue
@@ -1821,7 +1821,7 @@
this.standardlevel = res.data.standardlevel;
if (
this.userprofile.userName == "admin" ||
- this.userprofile.userName == "001" ||
+ this.userprofile.userName == "053" ||
this.userprofile.userName == "047"
) {
this.ismanager = true;
diff --git a/src/views/project/fundcheck/ethicalExpertFeeCheck/index.vue b/src/views/project/fundcheck/ethicalExpertFeeCheck/index.vue
index 431132f..9dd649e 100644
--- a/src/views/project/fundcheck/ethicalExpertFeeCheck/index.vue
+++ b/src/views/project/fundcheck/ethicalExpertFeeCheck/index.vue
@@ -1874,7 +1874,7 @@
// this.defaultperson = response.data;
// this.standardlevel = response.data.standardlevel;
if (
- response.data.userName === "001" ||
+ response.data.userName === "053" ||
response.data.userName === "002" ||
response.data.userName === "admin"
) {
diff --git a/src/views/project/fundcheck/expertFeeCheck/index.vue b/src/views/project/fundcheck/expertFeeCheck/index.vue
index 43f9bce..d904327 100644
--- a/src/views/project/fundcheck/expertFeeCheck/index.vue
+++ b/src/views/project/fundcheck/expertFeeCheck/index.vue
@@ -694,7 +694,7 @@
getUsermsg() {
getUserProfile().then(response => {
if (
- response.data.userName === "001" ||
+ response.data.userName === "053" ||
response.data.userName === "002" ||
response.data.userName === "012" ||
response.data.userName === "admin"
diff --git a/src/views/project/fundcheck/medicalCostCheck/index.vue b/src/views/project/fundcheck/medicalCostCheck/index.vue
index 72419c6..05a1b3e 100644
--- a/src/views/project/fundcheck/medicalCostCheck/index.vue
+++ b/src/views/project/fundcheck/medicalCostCheck/index.vue
@@ -1552,7 +1552,7 @@
// this.defaultperson = response.data;
// this.standardlevel = response.data.standardlevel;
if (
- response.data.userName === "001" ||
+ response.data.userName === "053" ||
response.data.userName === "002" ||
response.data.userName === "admin"
) {
diff --git a/src/views/project/fundcheck/officeExpenseCheck/index.vue b/src/views/project/fundcheck/officeExpenseCheck/index.vue
index 98881e2..033cfa3 100644
--- a/src/views/project/fundcheck/officeExpenseCheck/index.vue
+++ b/src/views/project/fundcheck/officeExpenseCheck/index.vue
@@ -1997,7 +1997,7 @@
// this.defaultperson = response.data;
// this.standardlevel = response.data.standardlevel;
if (
- response.data.userName === "001" ||
+ response.data.userName === "053" ||
response.data.userName === "002" ||
response.data.userName === "admin"
) {
diff --git a/src/views/project/fundcheck/performanceCheck/index.vue b/src/views/project/fundcheck/performanceCheck/index.vue
index 041d2d3..9837da9 100644
--- a/src/views/project/fundcheck/performanceCheck/index.vue
+++ b/src/views/project/fundcheck/performanceCheck/index.vue
@@ -501,7 +501,7 @@
// this.defaultperson = response.data;
// this.standardlevel = response.data.standardlevel;
if (
- response.data.userName === "001" ||
+ response.data.userName === "053" ||
response.data.userName === "002" ||
response.data.userName === "admin"
) {
diff --git a/src/views/project/organallocation/index.vue b/src/views/project/organallocation/index.vue
index ada013a..b43cf20 100644
--- a/src/views/project/organallocation/index.vue
+++ b/src/views/project/organallocation/index.vue
@@ -700,7 +700,7 @@
this.queryParams.reportervalue = this.reportervalue;
console.log(JSON.stringify(this.queryParams));
- // this.queryParams.city='001'
+ // this.queryParams.city='053'
//console.log(JSON.stringify(this.queryParams));
if (this.starttime != "") {
this.queryParams.starttime = this.starttime;
diff --git a/src/views/project/travelexpenseapply/travelexpensedetail/index.vue b/src/views/project/travelexpenseapply/travelexpensedetail/index.vue
index fa4a392..83cda4a 100644
--- a/src/views/project/travelexpenseapply/travelexpensedetail/index.vue
+++ b/src/views/project/travelexpenseapply/travelexpensedetail/index.vue
@@ -69,6 +69,7 @@
<el-select
v-model="form.infoid"
@change="selectbaseinfo"
+ clearable
filterable
placeholder="璇烽�夋嫨鎹愮尞鑰�"
>
--
Gitblit v1.9.3