diff --git a/src/js/dai/request.js b/src/js/dai/request.js
index dc88257c3..455a6fae4 100644
--- a/src/js/dai/request.js
+++ b/src/js/dai/request.js
@@ -64,7 +64,7 @@ const request = curry(
};
const failFn = (err) => {
// console.log(`[request失败] ${url}`, data, err)
- console.log(err);
+ // console.log(err);
reslove(
Object.assign({}, returnIniData, {
httpCode: "9999", //访问出现意外
diff --git a/src/router/index.js b/src/router/index.js
index f1dcdf5e2..4afe3bf5b 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -399,6 +399,8 @@ export function addDynamicRoute(routeParams, router) {
title: `${routeParams.title}`,
},
};
+
+ router.matcher = new Router().matcher
router.addRoutes([{
...moduleRoutes,
name: `main-dynamic__${dynamicRoute.name}`,
diff --git a/src/views/components/resiForm.vue b/src/views/components/resiForm.vue
index cd3a53a9f..df9bbf797 100644
--- a/src/views/components/resiForm.vue
+++ b/src/views/components/resiForm.vue
@@ -1317,31 +1317,34 @@ export default {
await this.getHouseList()
await this.residentEduInfo(this.form.resiId)
},
- getAllDict () {
- // 民族字典
- this.getDictList()
- // 关系字典
- this.getRelationship()
- // 学历信息
- this.getEducation()
- //残疾类别
- this.getdisabilityDict()
- this.getdisabilityDictClass()
- this.getillnessDict()
- this.getchronicDict()
- this.getHouseholdDict()
- this.getMarriageDict()
- this.getResideDict()
- this.getSpouseDict()
- this.getPartyDict()
- this.getResidentDict()
- this.getHousing()
- this.getVolunteerDict()
- this.gethobbyDict()
- this.getWelfareDict()
- this.getUnemployment()
- this.getCareer()
+ async getAllDict() {
+ try {
+ await Promise.all([
+ this.getDictList(),
+ this.getRelationship(),
+ this.getEducation(),
+ this.getdisabilityDict(),
+ this.getdisabilityDictClass(),
+ this.getillnessDict(),
+ this.getchronicDict(),
+ this.getHouseholdDict(),
+ this.getMarriageDict(),
+ this.getResideDict(),
+ this.getSpouseDict(),
+ this.getPartyDict(),
+ this.getResidentDict(),
+ this.getHousing(),
+ this.getVolunteerDict(),
+ this.gethobbyDict(),
+ this.getWelfareDict(),
+ this.getUnemployment(),
+ this.getCareer()
+ ]);
+ } catch (error) {
+ console.error("Error fetching dictionaries: ", error);
+ }
},
+
getGridList () {
const { user } = this.$store.state
this.$http.post('/gov/org/customergrid/gridoption', { agencyId: user.agencyId, purpose: 'addorupdate' }).then(({ data: res }) => {
@@ -1372,237 +1375,67 @@ export default {
this.newForm.nation = val
},
async getdisabilityDict () {
- try {
- const { data } = await this.$http.post('sys/dict/data/dictlist', { 'dictType': 'disability_category_code' })
- this.footerInputList.forEach(c => {
-
- for (let i of c.children) {
- if (i.formName == 'disabilityCategoryCode') {
- i.opction = data.data
- }
- }
- })
-
- } catch (error) {
- console.log(error, '获取残疾字典');
- }
-
+ await this.getDictData('disability_category_code','disabilityCategoryCode')
},
async getVolunteerDict () {
- try {
- const { data } = await this.$http.post('sys/dict/data/dictlist', { 'dictType': 'VOLUNTEER_CATEGORY' })
- this.footerInputList.forEach(c => {
- for (let i of c.children) {
- if (i.formName == 'volunteerCategory') {
- i.opction = data.data
- }
- }
- })
-
- } catch (error) {
- console.log(error, '获取志愿者字典');
- }
-
+ await this.getDictData('VOLUNTEER_CATEGORY','volunteerCategory')
},
async gethobbyDict () {
- try {
- const { data } = await this.$http.post('sys/dict/data/dictlist', { 'dictType': 'SPECIAL_SKILL' })
- this.footerInputList.forEach(c => {
- for (let i of c.children) {
- if (i.formName == 'hobbyCode') {
- i.opction = data.data
- }
- }
- })
-
- } catch (error) {
- console.log(error, '获取兴趣爱好字典');
- }
-
+ await this.getDictData('SPECIAL_SKILL','hobbyCode')
},
async getdisabilityDictClass () {
- try {
- const { data } = await this.$http.post('sys/dict/data/dictlist', { 'dictType': 'disability_level' })
- this.footerInputList.forEach(c => {
-
- for (let i of c.children) {
- if (i.formName == 'disabilityLevel') {
- i.opction = data.data
- }
- }
- })
-
- } catch (error) {
- console.log(error, '获取残疾等级字典');
- }
-
+ await this.getDictData('disability_level','disabilityLevel')
},
async getillnessDict () {
- try {
- const { data } = await this.$http.post('sys/dict/data/dictlist', { 'dictType': 'illness_code' })
- this.footerInputList.forEach(c => {
- for (let i of c.children) {
- if (i.formName == 'illnessCode') {
- i.opction = data.data
- }
- }
- })
-
- } catch (error) {
- console.log(error, '获取所患大病字典');
- }
+ await this.getDictData('illness_code','illnessCode')
},
async getchronicDict () {
- try {
- const { data } = await this.$http.post('sys/dict/data/dictlist', { 'dictType': 'chronic_disease_code' })
- this.footerInputList.forEach(c => {
- for (let i of c.children) {
- if (i.formName == 'chronicDiseaseCode') {
- i.opction = data.data
- }
- }
- })
-
- } catch (error) {
- console.log(error, '获取所患慢病字典');
- }
+ await this.getDictData('chronic_disease_code','chronicDiseaseCode')
},
async getWelfareDict () {
- try {
- const { data } = await this.$http.post('sys/dict/data/dictlist', { 'dictType': 'welfare_post' })
- this.footerInputList.forEach(c => {
- for (let i of c.children) {
- if (i.formName == 'jobPost') {
- i.opction = data.data
- }
- }
- })
-
- } catch (error) {
- console.log(error, '获取公益岗位字典');
- }
+ await this.getDictData('welfare_post','jobPost')
},
async getUnemployment () {
- try {
- const { data } = await this.$http.post('sys/dict/data/dictlist', { 'dictType': 'unemployment_cause' })
- this.footerInputList.forEach(c => {
- for (let i of c.children) {
- if (i.formName == 'unemploymentReason') {
- i.opction = data.data
- }
- }
- })
-
- } catch (error) {
- console.log(error, '获取失业原因字典');
- }
+ await this.getDictData('unemployment_cause','unemploymentReason')
},
async getCareer () {
- try {
- const { data } = await this.$http.post('sys/dict/data/dictlist', { 'dictType': 'career_goals' })
- this.footerInputList.forEach(c => {
- for (let i of c.children) {
- if (i.formName == 'employmentWish') {
- i.opction = data.data
- }
- }
- })
-
- } catch (error) {
- console.log(error, '获取就业愿望字典');
- }
+ await this.getDictData('career_goals','employmentWish')
},
async getHouseholdDict () {
- try {
- const { data } = await this.$http.post('sys/dict/data/dictlist', { 'dictType': 'household_situation' })
- this.footerInputList.forEach(c => {
- for (let i of c.children) {
- if (i.formName == 'householdSituation') {
- i.opction = data.data
- }
- }
- })
-
- } catch (error) {
- console.log(error, '获取人户状况字典');
- }
+ await this.getDictData('household_situation','householdSituation')
},
async getMarriageDict () {
- try {
- const { data } = await this.$http.post('sys/dict/data/dictlist', { 'dictType': 'marriage' })
- this.footerInputList.forEach(c => {
- for (let i of c.children) {
- if (i.formName == 'marriage') {
- i.opction = data.data
- }
- }
- })
-
- } catch (error) {
- console.log(error, '获取婚姻状况字典');
- }
+ await this.getDictData('marriage','marriage')
},
async getResideDict () {
- try {
- const { data } = await this.$http.post('sys/dict/data/dictlist', { 'dictType': 'reside_situation' })
- this.footerInputList.forEach(c => {
- for (let i of c.children) {
- if (i.formName == 'resideSituation') {
- i.opction = data.data
- }
- }
- })
-
- } catch (error) {
- console.log(error, '获取居住情况字典');
- }
+ await this.getDictData('reside_situation','resideSituation')
+ },
+ async getPartyDict () {
+ await this.getDictData('party_job','partyJob')
},
async getSpouseDict () {
- try {
- const { data } = await this.$http.post('sys/dict/data/dictlist', { 'dictType': 'spouse_situation' })
- this.footerInputList.forEach(c => {
- for (let i of c.children) {
- if (i.formName == 'spouseSituation') {
- i.opction = data.data
- }
- }
- })
-
- } catch (error) {
- console.log(error, '获取配偶情况字典');
- }
+ await this.getDictData('spouse_situation','spouseSituation')
},
async getResidentDict () {
- try {
- const { data } = await this.$http.post('sys/dict/data/dictlist', { 'dictType': 'special_resident_category' })
- console.log(data.data, 'see');
- this.footerInputList.forEach(c => {
- for (let i of c.children) {
- if (i.formName == 'specialCategoryCode') {
- i.opction = data.data
- }
- }
- })
-
- } catch (error) {
- console.log(error, '获取配偶情况字典');
- }
+ await this.getDictData('special_resident_category','specialCategoryCode')
},
- async getPartyDict () {
+ // 运营端控制字典统一调用
+ async getDictData(dictType, formName) {
try {
- const { data } = await this.$http.post('sys/dict/data/dictlist', { 'dictType': 'party_job' })
+ const { data } = await this.$http.post('sys/dict/data/dictlist', { 'dictType': dictType });
this.footerInputList.forEach(c => {
for (let i of c.children) {
- if (i.formName == 'partyJob') {
- i.opction = data.data
+ if (i.formName == formName) {
+ i.opction = data.data;
}
}
- })
+ });
} catch (error) {
- console.log(error, '获取职务字典');
+ console.log(error, `获取 ${dictType} 字典`);
}
},
+
getBuildList () {
this.$http.post('/actual/base/communityBuilding/buildingoption', { quartersId: this.form.villageId }).then(({ data: res }) => {
if (res.code !== 0) {
@@ -1663,7 +1496,8 @@ export default {
},
checkNumberInput (itemj, itemk) {
- if (isNaN(this.form[itemj][itemk])) {
+ if(this.form[itemj][itemk]){
+ if (isNaN(this.form[itemj][itemk])) {
this.$message.error("请输入数字");
this.form[itemj][itemk] = "";
} else {
@@ -1671,6 +1505,8 @@ export default {
this.form[itemj][itemk]
);
}
+ }
+
},
handleChangeGrid (val) {
console.log('val', val)
@@ -2282,7 +2118,7 @@ export default {
securityType: '',//保障类型
certificateDate: '',//发证日期yyyy-MM-dd
subsidyNum: '',//补贴编号
- subsidyAmount: '',//补贴金额
+ subsidyAmount: null,//补贴金额
}
this.newForm.ensureHouseDto = this.form.ensureHouseDto
}
diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue
index 0b6475557..fd49ce1ec 100644
--- a/src/views/modules/base/community/community.vue
+++ b/src/views/modules/base/community/community.vue
@@ -773,8 +773,7 @@ export default {
await nextTick(1000);
this.vDisabled = false;
this.bDisabled = false;
-
-
+ console.log(obj);
if (obj.level === "building") {
//点击楼栋
@@ -816,8 +815,6 @@ export default {
this.getValiheList("", "");
this.treeIsOk = true
-
-
}
},
diff --git a/src/views/modules/base/community/communityExportInfo.vue b/src/views/modules/base/community/communityExportInfo.vue
index ffe6dba2b..580ebb354 100644
--- a/src/views/modules/base/community/communityExportInfo.vue
+++ b/src/views/modules/base/community/communityExportInfo.vue
@@ -160,6 +160,10 @@ export default {
type: Object,
default: () => { },
},
+ orgId: {
+ type:String,
+ default:''
+ }
},
components: {
checkBox,
@@ -364,6 +368,7 @@ export default {
};
}),
},
+ orgId:this.orgId || ''
};
await this.$http({
method: "POST",
diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue
index b0e61b62d..e01a120e0 100644
--- a/src/views/modules/base/community/communityTable.vue
+++ b/src/views/modules/base/community/communityTable.vue
@@ -210,8 +210,8 @@
formCode: 'community_info',
pageNo: pageNo,
pageSize: pageSize,
-
- }" @close="handleDiyClose">
+ conditions:queryConditions
+ }" :orgId="treeObj.id" @close="handleDiyClose">
@@ -315,7 +315,7 @@ export default {
diyDialog: false,
- // queryConditions: [],
+ queryConditions: [],
};
},
@@ -362,38 +362,38 @@ export default {
async mounted() {
this.customerId = localStorage.getItem("customerId");
- // this.displayedBaobiaoBtn = await this.$refs.baobiao.existsTemplate({
- // elseParams: {
- // categoryKeys: ['house_info'], categoryKey: 'house_info',
- // }
- // });
- // this.getQueryConditions();
+ this.displayedBaobiaoBtn = await this.$refs.baobiao.existsTemplate({
+ elseParams: {
+ categoryKeys: ['house_info'], categoryKey: 'house_info',
+ }
+ });
+ this.getQueryConditions();
},
methods: {
- // async getQueryConditions() {
- // let params = {
- // formCode: "community_info",
- // customerId: this.$store.state.user.customerId,
- // };
- //
- // const { data } = await this.$http.post(
- // "/oper/customize/icform/queryItems",
- // params
- // );
- //
- // if (data.code === 0) {
- // this.queryConditions = data.data.map((item) => {
- // return {
- // ...item,
- // humpName: util.capitalToHump(item.columnName),
- // };
- // });
- // console.log(this.queryConditions);
- // } else {
- // this.$message.error(data.msg);
- // }
- // },
+ async getQueryConditions() {
+ let params = {
+ formCode: "community_info",
+ customerId: this.$store.state.user.customerId,
+ };
+
+ const { data } = await this.$http.post(
+ "/oper/customize/icform/queryItems",
+ params
+ );
+
+ if (data.code === 0) {
+ this.queryConditions = data.data.map((item) => {
+ return {
+ ...item,
+ humpName: util.capitalToHump(item.columnName),
+ };
+ });
+ console.log(this.queryConditions);
+ } else {
+ this.$message.error(data.msg);
+ }
+ },
reportForm() {
let paramMap = {
@@ -774,67 +774,6 @@ export default {
} else {
this.$message.error(msg);
}
-
- // if (code === 0) {
- // //暂无接口
- // let dataTemp = [
- // {
- // childShowFlag: "0",
- // customerId: "45687aa479955f9d06204d415238f7cc",
- // display: false,
- // formCode: "resi_base_info",
- // formId: "20220422102809_1",
- // groupCode: "jcxx",
- // id: "45687aa479955f9d06204d415238f7cc_0",
- // label: "小区信息",
- // policyFlag: "1",
- // sort: 0,
- // supportAdd: false,
- // tableName: "ic_resi_user"
- // },
- // {
- // childShowFlag: "0",
- // customerId: "45687aa479955f9d06204d415238f7cc",
- // display: true,
- // formCode: "resi_base_info",
- // formId: "20220422102809_1",
- // groupCode: "jyxx",
- // id: "20220422102809_101",
- // label: "楼栋信息",
- // policyFlag: "1",
- // sort: 1,
- // supportAdd: false,
- // tableName: "ic_resi_user",
- // },
- // {
- // childShowFlag: "0",
- // customerId: "45687aa479955f9d06204d415238f7cc",
- // display: true,
- // formCode: "resi_base_info",
- // formId: "20220422102809_1",
- // groupCode: "xqah",
- // id: "20220422102809_102",
- // label: "房屋信息",
- // policyFlag: "1",
- // sort: 2,
- // supportAdd: false,
- // tableName: "ic_resi_user",
- // }
- // ]
- // dataTemp.forEach((item) => {
- // (async (id) => {
- // // item.queryItemList = await this.getExportChildList(id)
- // item.queryItemList = [];
- // })(item.id);
- // });
- // this.exportList = [...dataTemp];
- // this.$nextTick(() => {
- // this.diyDialog = true;
- // });
- // console.log("获取详情成功getExportList----", this.exportList);
- // } else {
- // this.$message.error(msg);
- // }
},
//导出表格 以前是导出 现在改成导出房屋数据
async handleExport() {
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index c6190af1b..4b6156d92 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -51,27 +51,27 @@
class="diy-button--white"
@click="diyExport"
plain>导出
- 核对
+ plain>核对 -->
- 核对
+ class="diy-button--white">核对 -->
批量删除
@@ -86,7 +86,6 @@
:height="tableHeight"
@select-all="selectAll"
@selection-change="selectionChange">
-
+ :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+ ref="table"
+ >
{
this.$message.success('删除成功');
- this.handleLoadTreeRoot();
+ this.handleLoadTreeRoot(true);
}).parse(rst);
});
@@ -245,15 +249,13 @@ export default {
/**
* 加载树根
*/
- async handleLoadTreeRoot() {
+ async handleLoadTreeRoot(status) {
let url = "/actual/base/party/org/listPartyOrgTreeRoot";
-
let rst = await requestGet(url, {})
-
this.epmetResultResolver.success((data) => {
- this.partyOrgTree.length = 0;
+ this.partyOrgTree.length = 0
this.partyOrgTree.push(data);
-
+ this.tableKey = new Date().getTime();
// 默认加载2级，并且展开，从第三级开始，需要展开上一级动态查询得到
console.log(">>>>", this.partyOrgTree)
if (this.partyOrgTree.length > 0) {
diff --git a/src/views/modules/cpts/base/index.vue b/src/views/modules/cpts/base/index.vue
index 43076ec85..269041c4c 100644
--- a/src/views/modules/cpts/base/index.vue
+++ b/src/views/modules/cpts/base/index.vue
@@ -410,7 +410,7 @@ export default {
showSercahStatus:{
type: Boolean,
default: false,
- }
+ },
},
data () {
@@ -436,8 +436,8 @@ export default {
maxTableHeight () {
const { ref_search_height } = this;
return this.$store.state.inIframe
- ? this.clientHeight - ref_search_height - 265 + this.iframeHeight
- : this.clientHeight - ref_search_height - 265;
+ ? this.clientHeight - ref_search_height - 270 + this.iframeHeight
+ : this.clientHeight - ref_search_height - 270;
},
...mapGetters(["clientHeight", "iframeHeight"]),
},