From 8f1189eb086f8383188b5f4b9d73988a14f2e255 Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期三, 19 十一月 2025 11:22:31 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/system/user/xtUserList.vue | 85 +++++++++++++++++++++++++-----------------
1 files changed, 50 insertions(+), 35 deletions(-)
diff --git a/src/views/system/user/xtUserList.vue b/src/views/system/user/xtUserList.vue
index 2a2cec0..35f1494 100644
--- a/src/views/system/user/xtUserList.vue
+++ b/src/views/system/user/xtUserList.vue
@@ -96,7 +96,7 @@
</el-collapse>
</el-form>
<el-row :gutter="10" class="mb8" style="margin-top: 10px;">
- <!-- <el-col :span="1.5">
+ <el-col :span="1.5">
<el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAddEdit(OperationType = 1)"
id="btn-Add">鏂板</el-button>
</el-col>
@@ -105,9 +105,8 @@
@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="handleEdit(row = rowForm, OperationType = 2)">鏉冮檺</el-button>
- </el-col> -->
+ <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">鍒犻櫎
</el-button>
@@ -142,9 +141,12 @@
<RowSettings :colName="btResList" :HModName="HModName" @rowEditClose="rowSetClose" v-if="rowHideShow" />
</el-dialog>
<!-- 缂栬緫 -->
- <el-dialog title="鏂板/b缂栬緫鐢ㄦ埛" :visible.sync="openEdit" width="1480px" append-to-body class="xsckdBox" @close="close">
- <edit :OperationType=OperationType :linterid=this.rowForm.HEmpID :HSouceBillType=this.rowForm.HSourceBillType
- :copyType="copyType" @editCloseGy="editGyClose" v-if="editShow" />
+ <el-dialog title="鏂板/缂栬緫鐢ㄦ埛" :visible.sync="openEdit" width="1480px" append-to-body class="xsckdBox" @close="close">
+ <edit :OperationType=OperationType :linterid=this.rowForm.鐢ㄦ埛缂栫爜 :HSouceBillType=this.rowForm.HSourceBillType
+ :copyType="copyType" @editClose="editClose" v-if="editShow" />
+ </el-dialog>
+ <el-dialog title="鐢ㄦ埛鏉冮檺" :visible.sync="openQuery" width="1480px" append-to-body class="xsckdBox">
+ <Query HSouceBillType="yh" @editQueryClose="editQueryClose" :linterid=this.rowForm.鐢ㄦ埛缂栫爜 v-if="queryShow" />
</el-dialog>
</div>
</div>
@@ -153,19 +155,23 @@
<script>
import axios from 'axios'
import RowSettings from '@/views/component/rowSettings'
-import Edit from '@/views/basic/production/gySourceEdit.vue'
+import Edit from '@/views/system/user/xtUserListEdit.vue'
+import Query from '@/views/system/user/powerInformation.vue'
+
export default {
name: 'XtUserList',
- components: { RowSettings, Edit },
+ components: { RowSettings, Edit, Query },
props: {
openPage: { type: String, },
},
data() {
return {
+ openQuery: false,
activeSeach: '',
HModName: 'Xt_UserList',
editShow: false,
+ queryShow: false,
openEdit: false,
totalNameList: [],
tableShow: true,
@@ -207,7 +213,7 @@
open: false,
// 鏌ヨ鍙傛暟
queryParams: {
- HUSEORGID: null,
+ HUSEORGID: sessionStorage["OrganizationID"] - 0,
HName: null,
HNumber: null,
Comparator1: '',
@@ -344,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', {
@@ -360,7 +365,7 @@
if (data1.code == 1) {
this.total = data1.data.length;
for (var i = 1; i < this.btList.length; i++) {
- this.btResList.push({ ColmCols: this.btList[i].field})
+ this.btResList.push({ ColmCols: this.btList[i].field })
}
var col = [];
col = this.btList
@@ -501,7 +506,7 @@
this.tableData = this.getPage(this.page, this.allTableData)//鏃犲垎椤垫帴鍙ｅ垎椤�
this.tableShow = true
this.loading = false
- }
+ }
}).catch(error => {
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
});
@@ -535,7 +540,7 @@
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
// this.rowForm = {}
- this.ids = selection.map(item => item.HEmpID)
+ this.ids = selection.map(item => item.鐢ㄦ埛缂栫爜)
this.single = selection.length != 1
this.multiple = !selection.length
if (!this.single) {
@@ -661,7 +666,7 @@
resetQuery() {
this.sWhere = ''
this.queryParams = {
- // HOrgID: null,
+ HOrgID: null,
HName: null,
HNumber: null,
Comparator1: '',
@@ -678,6 +683,7 @@
//閫�鍑�
close() {
this.tableShow = true
+ this.single= true
this.openEdit = false
this.editShow = false
this.getList()
@@ -689,7 +695,6 @@
this.openEdit = true
this.editShow = true
})
-
},
//鎵撳紑淇敼缁勪欢寮圭獥
handleEdit() {
@@ -699,28 +704,40 @@
})
},
//鍏抽棴缂栬緫椤甸潰
- editGyClose(val) {
+ editClose(val) {
this.editShow = false
this.openEdit = false
- this.multiple = true,
- this.getList()
+ 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()
},
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete() {
this.$modal.confirm('纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠').then(() => {
- var HCzybm = this.rowForm.鐢ㄦ埛缂栫爜.toString();
- axios.get(this.baseURL + "/Xt_User/DeltetUser", {
- params: { "HCzybm": HCzybm }
- }).then(response => {
- if (response.data.count == 1) {
- this.getList()
- this.$modal.msgSuccess("鍒犻櫎鎴愬姛")
- } else {
- this.$modal.msgError("閿欒:" + result.code + result.Message);
- }
- }).catch(error => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
+ var HCzybm = this.rowForm.鐢ㄦ埛缂栫爜.toString();
+ axios.get(this.baseURL + "/Xt_User/DeltetUser", {
+ params: { "HCzybm": HCzybm }
+ }).then(response => {
+ if (response.data.count == 1) {
+ this.getList()
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛")
+ } else {
+ this.$modal.msgError("閿欒:" + result.code + result.Message);
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
}).catch(() => { })
},
//瀵煎嚭
@@ -729,16 +746,14 @@
const wb = this.$XLSX.utils.book_new(); // 鍒涘缓涓�涓柊鐨勫伐浣滅翱
this.$XLSX.utils.book_append_sheet(wb, ws, "Sheet1"); // 灏嗗伐浣滆〃娣诲姞鍒板伐浣滅翱涓紝骞跺懡鍚嶄负"Sheet1"
this.$XLSX.writeFile(wb, `xtUsetList_${new Date().getTime()}.xlsx`); // 瀵煎嚭鏂囦欢
- },
+ },
getPage(page, list) {
let sindex = (parseInt(page) - 1) * this.pageSize
let eindex = parseInt(page) * this.pageSize
let newList = list.slice(sindex, eindex)
- console.log(newList)
return newList
},
currentPage(val) {
- console.log(val)
this.page = val.page
setTimeout(() => {
this.tableData = this.getPage(this.page, this.allTableData)
--
Gitblit v1.9.1