From a9ca5dafb781919fe8a24cd586258e9144966271 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期三, 19 十一月 2025 11:07:38 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/system/user/xtUserList.vue | 29 ++++++++++++++++++++---------
1 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/src/views/system/user/xtUserList.vue b/src/views/system/user/xtUserList.vue
index 2672ee6..35f1494 100644
--- a/src/views/system/user/xtUserList.vue
+++ b/src/views/system/user/xtUserList.vue
@@ -105,8 +105,7 @@
@click="handleEdit(row = rowForm, OperationType = 3)">缂栬緫</el-button>
</el-col>
<el-col :span="1.5">
- <el-button type="primary" icon="el-icon-share" size="mini" :disabled="single"
- @click="openQuery = true">鏉冮檺</el-button>
+ <el-button type="primary" icon="el-icon-share" size="mini" :disabled="single" @click="queryClick">鏉冮檺</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-delete" size="mini" :disabled="single" @click="handleDelete">鍒犻櫎
@@ -147,7 +146,7 @@
:copyType="copyType" @editClose="editClose" v-if="editShow" />
</el-dialog>
<el-dialog title="鐢ㄦ埛鏉冮檺" :visible.sync="openQuery" width="1480px" append-to-body class="xsckdBox">
- <Query />
+ <Query HSouceBillType="yh" @editQueryClose="editQueryClose" :linterid=this.rowForm.鐢ㄦ埛缂栫爜 v-if="queryShow" />
</el-dialog>
</div>
</div>
@@ -157,7 +156,7 @@
import axios from 'axios'
import RowSettings from '@/views/component/rowSettings'
import Edit from '@/views/system/user/xtUserListEdit.vue'
-import Query from '@/views/system/user/xtUserRightQuery.vue'
+import Query from '@/views/system/user/powerInformation.vue'
export default {
@@ -172,6 +171,7 @@
activeSeach: '',
HModName: 'Xt_UserList',
editShow: false,
+ queryShow: false,
openEdit: false,
totalNameList: [],
tableShow: true,
@@ -213,7 +213,7 @@
open: false,
// 鏌ヨ鍙傛暟
queryParams: {
- HUSEORGID: null,
+ HUSEORGID: sessionStorage["OrganizationID"] - 0,
HName: null,
HNumber: null,
Comparator1: '',
@@ -350,7 +350,6 @@
if (this.pageSize == 0) {
this.pageSize = 50
}
- this.queryParams.HUSEORGID = sessionStorage["OrganizationID"] - 0
// this.sWhere += " and HUSEORGID = '" + this.queryParams.HUSEORGID + "'"
//鍒楄〃
axios.get(this.baseURL + '/Xt_User/list', {
@@ -667,7 +666,7 @@
resetQuery() {
this.sWhere = ''
this.queryParams = {
- // HOrgID: null,
+ HOrgID: null,
HName: null,
HNumber: null,
Comparator1: '',
@@ -684,6 +683,7 @@
//閫�鍑�
close() {
this.tableShow = true
+ this.single= true
this.openEdit = false
this.editShow = false
this.getList()
@@ -695,7 +695,6 @@
this.openEdit = true
this.editShow = true
})
-
},
//鎵撳紑淇敼缁勪欢寮圭獥
handleEdit() {
@@ -708,7 +707,19 @@
editClose(val) {
this.editShow = false
this.openEdit = false
- this.multiple = true
+ this.single= true
+ this.ids = []
+ this.getList()
+ },
+ queryClick() {
+ this.queryShow = true
+ this.openQuery = true
+ },
+ editQueryClose(val) {
+ this.queryShow = false
+ this.openQuery = false
+ this.single= true
+ this.ids = []
this.getList()
},
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
--
Gitblit v1.9.1