From 262119fd58357f1d930d65a6e3252176d29b2ce5 Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期四, 28 一月 2021 18:54:48 +0800
Subject: [PATCH] 朔黄人员管理页面调试
---
src/pages/shuohuangMonitorAnalyze/components/memberManage.vue | 84 +++++++++++++++++++++++++----------------
1 files changed, 51 insertions(+), 33 deletions(-)
diff --git a/src/pages/shuohuangMonitorAnalyze/components/memberManage.vue b/src/pages/shuohuangMonitorAnalyze/components/memberManage.vue
index 6a03a59..fb52efc 100644
--- a/src/pages/shuohuangMonitorAnalyze/components/memberManage.vue
+++ b/src/pages/shuohuangMonitorAnalyze/components/memberManage.vue
@@ -98,6 +98,15 @@
</template>
</el-table-column>
</el-table>
+ <el-pagination
+ @size-change="handleTableSizeChange"
+ @current-change="renderMemberTable"
+ :current-page.sync="PageIndex"
+ :page-size="PageSize"
+ :page-sizes="pageSizes"
+ layout="total,sizes, prev, pager, next"
+ :total="tableTotal"
+ ></el-pagination>
</div>
</div>
<el-dialog
@@ -196,12 +205,16 @@
<p class="tip">
*璇锋彁鍓嶆牴鎹枃浠舵ā鏉夸腑鐨勮姹傛敹闆嗕汉鍛樹俊鎭紝鍦ㄤ竴涓枃浠跺す涓瓨鏀句汉鍛樼収鐗囧拰EXCEL鏂囦欢
(
- <a href="javascript:;" @mouseover="showDemo=true" @mouseout="showDemo=false">绀轰緥</a>),鐐瑰嚮
+ <a
+ href="javascript:;"
+ @mouseover="showDemo=true"
+ @mouseout="showDemo=false"
+ >绀轰緥</a>),鐐瑰嚮
<a href="javascript:;">涓嬭浇妯℃澘.excel</a>
<img class="tip-demo" v-if="showDemo" :src="`${publicPath}images/shuohuang/tip.jpg`" alt />
</p>
<div class="flex-box">
- <label>涓婁紶鏂囦欢:</label>
+ <label>涓婁紶鏂囦欢澶�:</label>
<el-button size="mini" type="primary" @click="uploadDirectoryTrigger">鐐瑰嚮涓婁紶</el-button>
<input ref="directoryInput" @change="importDirectory" hidden type="file" webkitdirectory />
</div>
@@ -211,15 +224,6 @@
<el-table-column prop="time" label="涓婁紶鏃堕棿"></el-table-column>
<el-table-column prop="state" label="鐘舵��"></el-table-column>
</el-table>
- <el-pagination
- @size-change="handleTableSizeChange"
- @current-change="renderMemberTable"
- :current-page.sync="PageIndex"
- :page-size="PageSize"
- :page-sizes="pageSizes"
- layout="total,sizes, prev, pager, next"
- :total="tableTotal"
- ></el-pagination>
</div>
</el-dialog>
</div>
@@ -227,7 +231,7 @@
<script>
-import { getShuohuangDepartTree, getOrganizeTree, getMemberList, updateMemberInfo, addMember, updateUnit, uploadMemberPic, uploadDirectory } from '@/api/shuohuang'
+import { getShuohuangDepartTree, getOrganizeTree, getMemberList, updateMemberInfo, addMember, updateUnit, uploadMemberPic, uploadDirectory, uploadFile } from '@/api/shuohuang'
export default {
data () {
@@ -276,7 +280,6 @@
},
methods: {
nodeContextMenu (e, data, node, comp) {
- debugger
this.showMenu = true;
this.menuTop = e.pageY;
this.menuLeft = e.pageX;
@@ -310,8 +313,9 @@
memberSave () {
this.$refs['memberForm'].validate((valid) => {
if (valid) {
+ let params = Object.assign({DeptID:this.curLeftTreeNode.id},this.memberEditForm);
if (this.memberEditForm.ID) {
- updateMemberInfo(this.memberEditForm).then(res => {
+ updateMemberInfo(params).then(res => {
if (res.success) {
this.$notify({
type: 'success',
@@ -319,16 +323,19 @@
});
this.memberEditDialogVisible = false;
this.renderMemberTable();
+ this.searchLeftTreeData();
}
})
} else {
- addMember(this.memberEditForm).then(res => {
+ addMember(params).then(res => {
if (res.success) {
this.$notify({
type: 'success',
message: res.msg
})
this.renderMemberTable();
+ this.memberEditDialogVisible = false;
+ this.searchLeftTreeData();
}
})
}
@@ -338,11 +345,10 @@
})
},
delMember (member) {
- member.IsDel = true;
+ member.IsDel = '1';
this.memberUpdate(member);
},
editMember (member) {
- debugger
this.memberEditDialogVisible = true;
this.memberEditForm = member;
},
@@ -354,11 +360,12 @@
message: res.msg
});
this.renderMemberTable();
+ this.searchLeftTreeData();
}
})
},
checkNode (a, b, c) {
- if (a.children) {
+ if (a.hasOwnProperty('children')) {
this.curLeftTreeNode = a;
this.deptId = a.id;
this.renderMemberTable();
@@ -379,6 +386,7 @@
}
getMemberList(params).then(res => {
_this.tableData = res.data;
+ _this.tableTotal = res.total;
})
},
uploadPic () {
@@ -387,19 +395,18 @@
uploadDirectoryTrigger () {
this.$refs['directoryInput'].click();
},
- // uploadExeclTrigger(){
- // this.$refs['excelInput'].click();
- // },
importDirectory () {
//this.$refs['directoryInput'].files //鏂囦欢澶筸ap
let formData = new FormData;
- formData.append('File', this.$refs['directoryInput'].files)
- debugger
- // uploadDirectory(formData).then(res=>{
- // debugger
+ for(var file in this.$refs['directoryInput'].files){
+ formData.append('files', this.$refs['directoryInput'].files[file])
+ }
+ //formData.append('files', this.$refs['directoryInput'].files)
- // })
-
+ uploadDirectory(formData).then(res=>{
+ debugger
+
+ })
},
handleRemove () {
@@ -423,8 +430,10 @@
},
deepNodeChildren (node) {
+ var arr1 = [];
+ var arr2 = [];
if (node.ChildDept && node.ChildDept.length > 0) {
- return node.ChildDept.map(child => {
+ arr1 = node.ChildDept.map(child => {
let childObj = {};
childObj.id = child.ID;
childObj.label = child.Name;
@@ -437,8 +446,9 @@
}
return childObj;
});
- } else if (node.UserLst && node.UserLst.length > 0) {
- return node.UserLst.map(child => {
+ }
+ if (node.UserLst && node.UserLst.length > 0) {
+ arr2 = node.UserLst.map(child => {
let childObj = {};
childObj.id = child.ID;
childObj.label = child.Name;
@@ -446,6 +456,7 @@
return childObj;
});
}
+ return arr1.concat(arr2)
},
getOrganizeTreeData () {
let _this = this;
@@ -472,9 +483,13 @@
return obj
});
this.$nextTick(() => {
- _this.$refs['leftTreeNodes'].setCurrentNode(_this.treeData[0]);
- _this.curLeftTreeNode = _this.treeData[0];
- _this.checkNode(_this.treeData[0]);
+ if(!Object.keys(_this.curLeftTreeNode).length){
+ _this.curLeftTreeNode = _this.treeData[0];
+ _this.$refs['leftTreeNodes'].setCurrentNode(_this.treeData[0]);
+ }else{
+ _this.$refs['leftTreeNodes'].setCurrentNode(_this.curLeftTreeNode);
+ }
+ _this.checkNode(_this.curLeftTreeNode);
})
})
@@ -542,6 +557,9 @@
.el-form-item__label {
width: 100px;
}
+ .el-form-item__error {
+ left: 120px;
+ }
}
}
.el-input {
--
Gitblit v1.8.0