shentun
/
peisweb
1
0
Fork 0
Code Issues Pull Requests Projects 1 Releases Wiki Activity
Browse Source

Merge branch 'master' of http://140.143.162.39:3000/shentun/peisweb

master
pengjun 1 year ago
parent
82ca807802 98fc7c27cd
commit
a469e09ddd
2 changed files with 79 additions and 67 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      public/sysConfig.json
  2. 120
      src/views/user-list/UserList.vue

4
public/sysConfig.json
View File

@ -1,4 +1,4 @@
{
"apiurl": "http://140.143.162.39:9529",
"softName":"神豚体检管理系统"
"apiurl": "http://192.168.2.67:9529",
"softName": "神豚体检管理系统"
}

120
src/views/user-list/UserList.vue
View File

@ -177,7 +177,6 @@
<el-tabs
v-model="activeName"
v-if="title == 2 ? true : false"
@tab-click="handleClick"
style="height: 400px"
>
<el-tab-pane label="用户信息" name="first">
@ -282,14 +281,16 @@
>
<i class="el-icon-plus avatar-uploader-icon"></i>
</el-upload>
<div v-if="form.userSign" style="display: inline-block;position: relative;">
<img
ref="phoUrl"
:src="form.userSign"
class="avatar"
/>
<div
v-if="form.userSign"
style="display: inline-block; position: relative"
>
<img ref="phoUrl" :src="form.userSign" class="avatar" />
<span class="el-upload-delete">
<i class="el-icon-circle-close" @click="handleRemove"></i>
<i
class="el-icon-circle-close"
@click="handleRemove"
></i>
</span>
</div>
</el-form-item>
@ -304,10 +305,16 @@
>
<i class="el-icon-plus avatar-uploader-icon"></i>
</el-upload>
<div v-if="form.userPhoto" style="display: inline-block;position: relative;">
<div
v-if="form.userPhoto"
style="display: inline-block; position: relative"
>
<img ref="phoUrl" :src="form.userPhoto" class="avatar" />
<span class="el-upload-delete">
<i class="el-icon-circle-close" @click="handleRemoves"></i>
<i
class="el-icon-circle-close"
@click="handleRemoves"
></i>
</span>
</div>
</el-form-item>
@ -375,8 +382,7 @@
</el-tabs>
<!-- //新增 -->
<el-form
v-show="title == 1 ? true : false"
v-if="dialogVisible"
v-if="title == 1 ? true : false"
ref="form"
:model="form"
label-width="80px"
@ -474,14 +480,16 @@
>
<i class="el-icon-plus avatar-uploader-icon"></i>
</el-upload>
<div v-if="form.userSign" style="display: inline-block;position: relative;">
<img
ref="phoUrl"
:src="form.userSign"
class="avatar"
/>
<div
v-if="form.userSign"
style="display: inline-block; position: relative"
>
<img ref="phoUrl" :src="form.userSign" class="avatar" />
<span class="el-upload-delete">
<i class="el-icon-circle-close" @click="handleRemove"></i>
<i
class="el-icon-circle-close"
@click="handleRemove"
></i>
</span>
</div>
</el-form-item>
@ -498,10 +506,16 @@
>
<i class="el-icon-plus avatar-uploader-icon"></i>
</el-upload>
<div v-if="form.userPhoto" style="display: inline-block;position: relative;">
<div
v-if="form.userPhoto"
style="display: inline-block; position: relative"
>
<img ref="phoUrl" :src="form.userPhoto" class="avatar" />
<span class="el-upload-delete">
<i class="el-icon-circle-close" @click="handleRemoves"></i>
<i
class="el-icon-circle-close"
@click="handleRemoves"
></i>
</span>
</div>
</el-form-item>
@ -958,11 +972,11 @@ export default {
},
methods: {
handleRemove(){
this.form.userSign=this.$options.data().form.userSign
handleRemove() {
this.form.userSign = this.$options.data().form.userSign;
},
handleRemoves(){
this.form.userPhoto=this.$options.data().form.userPhoto
handleRemoves() {
this.form.userPhoto = this.$options.data().form.userPhoto;
},
quckDepartments(e) {
if (e) {
@ -980,11 +994,9 @@ export default {
) {
this.expandParents(this.$refs["itemType"].getNode(selected).parent);
}
postapi(
"/api/identity/users/getlistinorganizationunit",{
organizationUnitId:currentKey
}
).then((res) => {
postapi("/api/identity/users/getlistinorganizationunit", {
organizationUnitId: currentKey,
}).then((res) => {
if (res.code != -1) {
this.tableData = res.data;
this.tableData.forEach((item, index) => {
@ -1006,8 +1018,9 @@ export default {
this.initTableData.forEach((item) => {
if (
item.userName.toLowerCase().indexOf(keyWords.toLowerCase()) > -1 ||
item.simpleCode.toLowerCase().indexOf(keyWords.toLowerCase()) > -1
|| item.surname.toLowerCase().indexOf(keyWords.toLowerCase()) > -1
item.simpleCode.toLowerCase().indexOf(keyWords.toLowerCase()) >
-1 ||
item.surname.toLowerCase().indexOf(keyWords.toLowerCase()) > -1
) {
this.quckDepartment.push(item);
}
@ -1101,12 +1114,10 @@ export default {
});
},
handleNodeClick(data) {
this.department = data.displayName;
postapi(
"/api/identity/users/getlistinorganizationunit",{
organizationUnitId:data.id
}
).then((res) => {
// this.department = data.displayName;
postapi("/api/identity/users/getlistinorganizationunit", {
organizationUnitId: data.id,
}).then((res) => {
if (res.code != -1) {
this.tableData = res.data;
}
@ -1407,6 +1418,7 @@ export default {
this.department = this.$options.data().department;
this.curRow = this.$options.data().curRow;
this.orgId = this.$options.data().orgId;
this.options = this.$options.data().options;
this.haveitemtype =
this.$options.data().haveitemtype;
this.$refs["tableData"].setCurrentRow("");
@ -1474,6 +1486,7 @@ export default {
this.department = this.$options.data().department;
this.curRow = this.$options.data().curRow;
this.orgId = this.$options.data().orgId;
this.checkList = this.$options.data().checkList;
this.haveitemtype =
this.$options.data().haveitemtype;
this.$refs["tableData"].setCurrentRow("");
@ -1546,19 +1559,6 @@ export default {
roleNames: [],
};
this.form.roleNames = [];
}
});
//获取组织架构
organizationtree().then((res) => {
if (res.code != -1) {
this.organizationalstructure = res.data;
tcdate(this.organizationalstructure);
this.setupdepartments = res.data;
}
});
// postapi(`/api/app/abpuserdepartment/createmany?UserId=${this.form.id}`,{orgId:this.orgId[0]}).then(res=>{
// console.log(res,'wwwwwwwwwwwww');
// })
useraffiliation(this.curRow.id).then((res) => {
if (res.code != -1) {
if (res.data.items && res.data.items.length > 0) {
@ -1571,6 +1571,19 @@ export default {
}
}
});
}
});
//获取组织架构
organizationtree().then((res) => {
if (res.code != -1) {
this.setupdepartments = res.data;
this.organizationalstructure = res.data;
tcdate(this.organizationalstructure);
}
});
// postapi(`/api/app/abpuserdepartment/createmany?UserId=${this.form.id}`,{orgId:this.orgId[0]}).then(res=>{
// console.log(res,'wwwwwwwwwwwww');
// })
//根据用户ID查组织信息
getapi(
@ -1692,7 +1705,7 @@ export default {
:deep .seachinput .el-select {
width: 100%;
}
:deep.avatar-uploader{
:deep.avatar-uploader {
display: inline-block;
}
:deep.avatar-uploader .el-upload {
@ -1718,12 +1731,11 @@ export default {
height: 80px;
display: block;
}
.el-upload-delete{
.el-upload-delete {
position: absolute;
top: 0;
right: 0;
line-height: 0;
font-size: 18px;
}
</style>
Write Preview
Loading…
Cancel
Save