From a4989ac2090626b23c630a097f5f773f08f8f949 Mon Sep 17 00:00:00 2001
From: 陈婷婷 <506607603@qq.com>
Date: 星期一, 30 三月 2026 09:35:09 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/system/user/GyDriver.vue | 38 ++++++++++++++++++++++++++++++--------
1 files changed, 30 insertions(+), 8 deletions(-)
diff --git a/src/views/system/user/GyDriver.vue b/src/views/system/user/GyDriver.vue
index d8b9a4a..c51a9cd 100644
--- a/src/views/system/user/GyDriver.vue
+++ b/src/views/system/user/GyDriver.vue
@@ -437,9 +437,11 @@
);
if (userRes.data.data && userRes.data.data[0]) {
const userData = userRes.data.data[0];
- this.user = userData.Czymc || "admin";
+ this.user = sessionStorage["HUserName"] ;
this.Organization = userData.HUSEORGID;
- this.queryParams.HUSEORGID = userData.HUSEORGID;
+ const orgId = sessionStorage["OrganizationID"];
+ this.queryParams.HUSEORGID = orgId ? Number(orgId) : null;
+ this.$forceUpdate();
}
const orgRes = await axios.get(`${this.$baseUrl}/Web/GetOrganizations`);
@@ -460,7 +462,8 @@
async getList() {
this.tableShow = false;
this.loading = true;
- console.log("鑾峰彇鍒楄〃鏁版嵁...", this.sWhere);
+ this.sWhere=this.sWhere+"and 浣跨敤缁勭粐 ="+sessionStorage["OrganizationID"]
+ await this.set_ModCheck("GyDriver_SUPQuery")
try {
const params = {
sWhere: this.sWhere || "",
@@ -617,8 +620,27 @@
console.error("鍔犺浇鍒楅厤缃け璐�:", error);
}
},
+ async set_ModCheck(ModRightNameCheck)
+ {
+ var Permission = false;
+ const res=await axios.get(this.$baseUrl + '/LMES/getReportByModRightNameCheck', {
+ params: {
+ "ModRightNameCheck": ModRightNameCheck,
+ "user": sessionStorage["HUserName"],
+
+ },
+ }).then(result=>{
+ if (result.data.count != 1) {
+ Permission = true;
+ this.sWhere=this.sWhere+"and 鎵�灞炲叕鍙窱D ="+sessionStorage["HSupID"]
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
- handleQuery() {
+ async handleQuery() {
+
this.sWhere = "";
const conditions = [];
@@ -628,9 +650,9 @@
if (this.queryParams.HName) {
conditions.push(`椹鹃┒鍛樺悕绉� like '%${this.queryParams.HName}%'`);
}
- // if (this.queryParams.HUSEORGID) {
- // conditions.push(`HUSEORGID = '${this.queryParams.HUSEORGID}'`);
- // }
+ if (this.queryParams.HUSEORGID) {
+ conditions.push(`浣跨敤缁勭粐 = '${this.queryParams.HUSEORGID}'`);
+ }
if (this.queryParams.ColName !== "0" && this.queryParams.Comparator !== "0") {
@@ -707,7 +729,7 @@
resetQuery() {
this.queryParams = {
- HUSEORGID: this.Organization,
+ HUSEORGID: sessionStorage["OrganizationID"],
HName: "",
HNumber: "",
HSyncNumber: "",
--
Gitblit v1.9.1