|
|
@@ -9,7 +9,7 @@
|
|
|
clearable
|
|
|
size="small"
|
|
|
placeholder="工号"
|
|
|
- v-model="queryFrom.id"
|
|
|
+ v-model="queryFrom.userId"
|
|
|
></el-input>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
@@ -59,10 +59,10 @@
|
|
|
<el-table-column
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
- prop="companyname"
|
|
|
+ prop="deptName"
|
|
|
label="机构名称"
|
|
|
>
|
|
|
- <template slot-scope="scope">
|
|
|
+ <!-- <template slot-scope="scope">
|
|
|
<span
|
|
|
v-for="(companyItem, companyIndex) in ztreeNodes"
|
|
|
:key="companyIndex"
|
|
|
@@ -70,18 +70,18 @@
|
|
|
>
|
|
|
{{ companyItem.name }}
|
|
|
</span>
|
|
|
- </template>
|
|
|
+ </template> -->
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
- prop="deptid"
|
|
|
+ prop="deptId"
|
|
|
label="部门编码"
|
|
|
width="180"
|
|
|
>
|
|
|
</el-table-column>
|
|
|
<!-- <el-table-column header-align="center" align="center" prop="depName" label="部门名称"> </el-table-column> -->
|
|
|
- <el-table-column
|
|
|
+ <!-- <el-table-column
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
prop="jobcode"
|
|
|
@@ -96,7 +96,7 @@
|
|
|
{{ jobItem.label }}
|
|
|
</span>
|
|
|
</template>
|
|
|
- </el-table-column>
|
|
|
+ </el-table-column> -->
|
|
|
|
|
|
<el-table-column
|
|
|
header-align="center"
|
|
|
@@ -743,6 +743,7 @@
|
|
|
export default {
|
|
|
data() {
|
|
|
return {
|
|
|
+ sexoptions:[],
|
|
|
activeTabs: "first",
|
|
|
dialogVisible: false, // 新增编辑界面是否显示
|
|
|
deptInfo: {}, //选中机构的基本信息
|
|
|
@@ -827,7 +828,7 @@ export default {
|
|
|
// 新增或修改的弹出框End
|
|
|
|
|
|
queryFrom: {
|
|
|
- id: "",
|
|
|
+ userId: "",
|
|
|
name: "",
|
|
|
mobile: "",
|
|
|
},
|
|
|
@@ -909,14 +910,23 @@ export default {
|
|
|
this.getDictItems("comattribute");
|
|
|
this.getDictItems("comtype");
|
|
|
|
|
|
+ this.getDictItems("sex");
|
|
|
this.getDictItems("jobcode");
|
|
|
- this.findLeftTreeData();
|
|
|
+ // this.findLeftTreeData();
|
|
|
this.queryTeam();
|
|
|
},
|
|
|
methods: {
|
|
|
queryTeam() {
|
|
|
- this.$api.user.queryTeamNum(this.queryFrom).then((res) => {
|
|
|
- this.tableData = res.data;
|
|
|
+ this.$api.user.newQueryTeamNum(this.queryFrom).then((res) => {
|
|
|
+ if(res.code==200){
|
|
|
+ res.data.forEach(val=>{
|
|
|
+ if(val.sex&& val.sex!==''&& val.sex!==null){
|
|
|
+ val.sex=this.sexoptions.find(ele=>ele.value==val.sex).label
|
|
|
+ }
|
|
|
+ })
|
|
|
+ this.tableData = res.data;
|
|
|
+
|
|
|
+ }
|
|
|
});
|
|
|
},
|
|
|
getDictItems(typeName) {
|
|
|
@@ -931,93 +941,94 @@ export default {
|
|
|
});
|
|
|
},
|
|
|
|
|
|
- findLeftTreeData: function () {
|
|
|
- // 获取数据
|
|
|
- this.$api.dept.findLeftDeptTree("99").then((res) => {
|
|
|
- this.ztreeNodes = res.data;
|
|
|
- });
|
|
|
- },
|
|
|
+ // findLeftTreeData: function () {
|
|
|
+ // // 获取数据
|
|
|
+ // this.$api.dept.findLeftDeptTree("99").then((res) => {
|
|
|
+ // this.ztreeNodes = res.data;
|
|
|
+ // });
|
|
|
+ // },
|
|
|
|
|
|
handleTableEdit(params) {
|
|
|
// 编辑代理人员
|
|
|
this.activeTabs = "first";
|
|
|
- if (params.row.deptid != "") {
|
|
|
- this.$api.dept
|
|
|
- .getDeptById(params.row.deptid.split("D")[0])
|
|
|
- .then((deptRes) => {
|
|
|
- this.deptInfo = deptRes.data;
|
|
|
- this.departmentList = [];
|
|
|
- for (var i = 0; i < this.ztreeNodes.length; i++) {
|
|
|
- if (
|
|
|
- this.ztreeNodes[i].id.indexOf(
|
|
|
- params.row.deptid.split("D")[0] + "D"
|
|
|
- ) >= 0
|
|
|
- ) {
|
|
|
- this.departmentList.push({
|
|
|
- label: this.ztreeNodes[i].name,
|
|
|
- value: this.ztreeNodes[i].id,
|
|
|
- });
|
|
|
- }
|
|
|
- }
|
|
|
- if (params.row.deptid != "") {
|
|
|
- this.$api.user.selectByDeptId(params.row.deptid).then((res2) => {
|
|
|
- console.log(res2);
|
|
|
- if (res2.data != null) {
|
|
|
- if (res2.code == 200) {
|
|
|
- this.teamleaderid = res2.data.id;
|
|
|
- this.teamleadername = res2.data.name;
|
|
|
- }
|
|
|
- }
|
|
|
- });
|
|
|
- }
|
|
|
+ // if (params.row.deptid != "") {
|
|
|
+ // this.$api.dept
|
|
|
+ // .getDeptById(params.row.deptid.split("D")[0])
|
|
|
+ // .then((deptRes) => {
|
|
|
+ // this.deptInfo = deptRes.data;
|
|
|
+ // this.departmentList = [];
|
|
|
+ // for (var i = 0; i < this.ztreeNodes.length; i++) {
|
|
|
+ // if (
|
|
|
+ // this.ztreeNodes[i].id.indexOf(
|
|
|
+ // params.row.deptid.split("D")[0] + "D"
|
|
|
+ // ) >= 0
|
|
|
+ // ) {
|
|
|
+ // this.departmentList.push({
|
|
|
+ // label: this.ztreeNodes[i].name,
|
|
|
+ // value: this.ztreeNodes[i].id,
|
|
|
+ // });
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ // if (params.row.deptid != "") {
|
|
|
+ // this.$api.user.selectByDeptId(params.row.deptid).then((res2) => {
|
|
|
+ // console.log(res2);
|
|
|
+ // if (res2.data != null) {
|
|
|
+ // if (res2.code == 200) {
|
|
|
+ // this.teamleaderid = res2.data.id;
|
|
|
+ // this.teamleadername = res2.data.name;
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ // });
|
|
|
+ // }
|
|
|
|
|
|
- this.$api.user.findById(params.row.id).then((personRes) => {
|
|
|
- Object.assign(this.dataForm, personRes.data.sysUser);
|
|
|
- Object.assign(this.dataForm, personRes.data.esmUserInternal);
|
|
|
- Object.assign(this.dataForm, personRes.data.esmUserAgent);
|
|
|
- this.dataForm.status = personRes.data.sysUser.status;
|
|
|
- this.dataForm.status1 = personRes.data.sysUser.status;
|
|
|
- if (personRes.data.esmUserAgent != null) {
|
|
|
- this.$api.user
|
|
|
- .findBasePersonById(personRes.data.esmUserAgent.recommenderid)
|
|
|
- .then((res1) => {
|
|
|
- if (res1.code == 200) {
|
|
|
- this.dataForm.recommenderid = res1.data.id;
|
|
|
- this.dataForm.recommendername = res1.data.name;
|
|
|
- }
|
|
|
- });
|
|
|
- }
|
|
|
+ // this.$api.user.findById(params.row.id).then((personRes) => {
|
|
|
+ // Object.assign(this.dataForm, personRes.data.sysUser);
|
|
|
+ // Object.assign(this.dataForm, personRes.data.esmUserInternal);
|
|
|
+ // Object.assign(this.dataForm, personRes.data.esmUserAgent);
|
|
|
+ // this.dataForm.status = personRes.data.sysUser.status;
|
|
|
+ // this.dataForm.status1 = personRes.data.sysUser.status;
|
|
|
+ // if (personRes.data.esmUserAgent != null) {
|
|
|
+ // this.$api.user
|
|
|
+ // .findBasePersonById(personRes.data.esmUserAgent.recommenderid)
|
|
|
+ // .then((res1) => {
|
|
|
+ // if (res1.code == 200) {
|
|
|
+ // this.dataForm.recommenderid = res1.data.id;
|
|
|
+ // this.dataForm.recommendername = res1.data.name;
|
|
|
+ // }
|
|
|
+ // });
|
|
|
+ // }
|
|
|
|
|
|
- this.dialogVisible = true;
|
|
|
- });
|
|
|
- });
|
|
|
- } else {
|
|
|
- this.$api.user.findById(params.row.id).then((personRes) => {
|
|
|
- console.log(personRes.data);
|
|
|
- Object.assign(this.dataForm, personRes.data.sysUser);
|
|
|
- Object.assign(this.dataForm, personRes.data.esmUserInternal);
|
|
|
- Object.assign(this.dataForm, personRes.data.esmUserAgent);
|
|
|
- this.dataForm.status = personRes.data.sysUser.status;
|
|
|
- this.dataForm.status1 = personRes.data.sysUser.status;
|
|
|
- if (personRes.data.esmUserAgent != null) {
|
|
|
- this.$api.user
|
|
|
- .findBasePersonById(personRes.data.esmUserAgent.recommenderid)
|
|
|
- .then((res1) => {
|
|
|
- console.log(res1.data);
|
|
|
- if (res1.code == 200) {
|
|
|
- this.dataForm.recommenderid = res1.data.id;
|
|
|
- this.dataForm.recommendername = res1.data.name;
|
|
|
- }
|
|
|
- });
|
|
|
+ // this.dialogVisible = true;
|
|
|
+ // });
|
|
|
+ // });
|
|
|
+ // } else {
|
|
|
+
|
|
|
+ this.$api.user.getUserDatail(params.row.id).then((result) => {
|
|
|
+ // console.log(personRes.data);
|
|
|
+ // Object.assign(this.dataForm, personRes.data.sysUser);
|
|
|
+ // Object.assign(this.dataForm, personRes.data.esmUserInternal);
|
|
|
+ // Object.assign(this.dataForm, personRes.data.esmUserAgent);
|
|
|
+ // this.dataForm.status = personRes.data.sysUser.status;
|
|
|
+ // this.dataForm.status1 = personRes.data.sysUser.status;
|
|
|
+ // if (personRes.data.esmUserAgent != null) {
|
|
|
+ // this.$api.user
|
|
|
+ // .findBasePersonById(personRes.data.esmUserAgent.recommenderid)
|
|
|
+ // .then((res1) => {
|
|
|
+ // console.log(res1.data);
|
|
|
+ // if (res1.code == 200) {
|
|
|
+ // this.dataForm.recommenderid = res1.data.id;
|
|
|
+ // this.dataForm.recommendername = res1.data.name;
|
|
|
+ // }
|
|
|
+ // });
|
|
|
+ // }
|
|
|
+ if(result.code==200){
|
|
|
+ this.dataForm=result.data
|
|
|
}
|
|
|
-
|
|
|
this.dialogVisible = true;
|
|
|
});
|
|
|
- }
|
|
|
+ // }
|
|
|
},
|
|
|
handleDialogBefore(done) {
|
|
|
- // 退出对话框之前确认提示
|
|
|
- var that = this;
|
|
|
this.$confirm("确认关闭?")
|
|
|
.then((_) => {
|
|
|
done();
|