取 消
@@ -1142,6 +1165,7 @@ export default {
zuzhi: "",
disableFlag: "",
newRoles: [],
+ manageScopes:[]
},
// 人员调动
transferForm: {
@@ -1248,6 +1272,16 @@ export default {
},
selDeptType: "",
+
+ // 组织树
+ orgOptions: [],
+ orgOptionProps :{
+ multiple: false,
+ value: 'agencyId',
+ label: 'agencyName',
+ children: 'subAgencyList',
+ checkStrictly: true
+ }
};
},
created () {
@@ -1257,6 +1291,7 @@ export default {
this.getAgencyStaffListData();
this.getDutyList();
this.getRoleList();
+ this.getOrgTreeList()
// this.getNavigation()
// 更新顶部面包屑
this.assembleBreadcrumbArr(localStorage.getItem("agencyId"), "agency");
@@ -1302,6 +1337,23 @@ export default {
mounted () {
},
methods: {
+ getOrgTreeList () {
+ this.$http
+ .post('/gov/org/customeragency/agencygridtree', {})
+ .then(({ data: res }) => {
+ if (res.code !== 0) {
+ return this.$message.error(res.msg)
+ } else {
+ console.log('获取组织树成功', res.data)
+ this.orgOptions = []
+ this.orgOptions.push(res.data)
+ }
+ })
+ .catch(() => {
+ return this.$message.error('网络错误')
+ })
+ },
+
// 点击后获取id
handleChangeTransferCascader (e) {
console.log("*********************");
@@ -1560,8 +1612,8 @@ export default {
: orgType == "dept"
? this.currentDepartmentId
: this.currentGridOrgId,
+ manageScopes:this.peoForm.manageScopes
};
-
const { data, code, msg } = await requestPost(url, params);
if (code === 0) {
@@ -1609,9 +1661,9 @@ export default {
roles: this.peoForm.duty,
newRoles: this.peoForm.newRoles,
agencyId: this.currentAgencyId,
- idCard: this.peoForm.idCard
+ idCard: this.peoForm.idCard,
+ manageScopes:this.peoForm.manageScopes
};
-
const { data, code, msg } = await requestPost(url, params);
if (code === 0) {
@@ -1952,12 +2004,14 @@ export default {
}
});
this.peoForm.newRoles = existedRoleArr;
+ this.peoForm.manageScopes = data.manageScopes
} else {
this.$message.error(msg);
}
},
// 修改人员
async xiuPeo (row) {
+ console.log('2');
this.modifyPeo = true;
this.peoForm.orgType = "agency";
@@ -1995,6 +2049,7 @@ export default {
}
});
this.peoForm.newRoles = existedRoleArr;
+ this.peoForm.manageScopes = data.manageScopes
} else {
this.$message.error(msg);
}
diff --git a/src/views/modules/base/residentManagement/publicWelfarePost/addForm.vue b/src/views/modules/base/residentManagement/publicWelfarePost/addForm.vue
new file mode 100644
index 000000000..e9ea05198
--- /dev/null
+++ b/src/views/modules/base/residentManagement/publicWelfarePost/addForm.vue
@@ -0,0 +1,609 @@
+
+
+
+
+
+
+
+ 所属组织:
+ {{ formData.agencyName || "--" }}
+
+
+
+
+
+
+
+
+
+
+ 姓名:
+ {{ formData.name || "--" }}
+
+
+
+
+
+
+
+ 性别:
+ {{
+ formData.gender
+ ? formData.gender == "1"
+ ? "男"
+ : formData.gender == "2"
+ ? "女"
+ : "--"
+ : "--"
+ }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 出生日期:
+ {{formData.birthday||'--'}}
+
+
+
+
+
+
+
+
+ 民族:
+ {{ formData.nationName || "--" }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 证件号:
+ {{ formData.idNum || "--" }}
+
+
+
+
+
+
+
+ 联系电话:
+ {{ formData.mobile || "--" }}
+
+
+
+
+
+
+
+
+
+ 文化程度:
+ {{ cultureLevelName(formData.cultureLevel) }}
+
+
+
+
+
+
+
+
+
+
+ 是否党员:
+ {{
+ formData.isParty != null
+ ? formData.isParty == 1
+ ? "是"
+ : formData.gender == 2
+ ? "否"
+ : "--"
+ : "--"
+ }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 岗位类型:
+ {{ formData.postTypes }}
+
+
+
+
+
+
+
+
+
+
+ 入职时间:
+ {{formData.hireDate||'--'}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 现居地址:
+ {{ formData.currentResidence || "--" }}
+
+
+
+
+
+
+
+
+
+
+ 兴趣特长:
+ {{ formData.hobbyCodes || "--" }}
+
+
+
+
+ {{items.label}}
+
+
+
+
+
+
+
+
+
+
+ 兴趣描述:
+ {{ formData.interestDesc || "--" }}
+
+
+
+
+
+
+
+
+
+
+
+
+ 备注:
+ {{ formData.remark || "--" }}
+
+
+
+
+
+
+
+
+
+
+ 管理范围:
+ {{ formData.manageScopes || "--" }}
+
+
+
+
+
+
+
+
+
+
+ 取 消
+ 确 定
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/modules/base/residentManagement/publicWelfarePost/publicWelfarePost.vue b/src/views/modules/base/residentManagement/publicWelfarePost/publicWelfarePost.vue
new file mode 100644
index 000000000..4e5af3379
--- /dev/null
+++ b/src/views/modules/base/residentManagement/publicWelfarePost/publicWelfarePost.vue
@@ -0,0 +1,790 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 至
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 至
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+
+
+
+ 新增
+
+
导出
+
+ 批量删除
+
+
+ 导入
+
+
下载模板
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.gender?scope.row.gender == "1" ? "男":scope.row.gender == "2"?"女" :'--':"--" }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查看
+ 编辑
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/modules/base/residentManagement/subsistenceAllowance/subsistenceAllowance.vue b/src/views/modules/base/residentManagement/subsistenceAllowance/subsistenceAllowance.vue
index 1f33272a8..d08622c88 100644
--- a/src/views/modules/base/residentManagement/subsistenceAllowance/subsistenceAllowance.vue
+++ b/src/views/modules/base/residentManagement/subsistenceAllowance/subsistenceAllowance.vue
@@ -271,7 +271,6 @@
@@ -530,7 +529,7 @@
console.log("失败", err);
file.onError(); //上传失败的文件会从文件列表中删除
// this.$message.error('导入失败')
- });
+ });//
},
async handleComfirmUpload () {
this.importLoading = true;