elink-star
/
epmet-work-pc
13
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'dev' of http://120.46.222.128:10021/elink-star/epmet-work-pc into dev

V1.0
wxz 3 years ago
parent
bda1a92b2b 69dc3b504e
commit
d6cd43726e
10 changed files with 120 additions and 342 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/js/dai/request.js
  2. 2
      src/router/index.js
  3. 278
      src/views/components/resiForm.vue
  4. 5
      src/views/modules/base/community/community.vue
  5. 5
      src/views/modules/base/community/communityExportInfo.vue
  6. 125
      src/views/modules/base/community/communityTable.vue
  7. 17
      src/views/modules/base/resi.vue
  8. 4
      src/views/modules/base/smartImport.vue
  9. 18
      src/views/modules/communityParty/partyOrg/orgTree.vue
  10. 6
      src/views/modules/cpts/base/index.vue

2
src/js/dai/request.js
View File

@ -64,7 +64,7 @@ const request = curry(
}; };
const failFn = (err) => { const failFn = (err) => {
// console.log(`[request失败] ${url}`, data, err) // console.log(`[request失败] ${url}`, data, err)
console.log(err); // console.log(err);
reslove( reslove(
Object.assign({}, returnIniData, { Object.assign({}, returnIniData, {
httpCode: "9999", //访问出现意外 httpCode: "9999", //访问出现意外

2
src/router/index.js
View File

@ -399,6 +399,8 @@ export function addDynamicRoute(routeParams, router) {
title: `${routeParams.title}`, title: `${routeParams.title}`,
}, },
}; };
router.matcher = new Router().matcher
router.addRoutes([{ router.addRoutes([{
...moduleRoutes, ...moduleRoutes,
name: `main-dynamic__${dynamicRoute.name}`, name: `main-dynamic__${dynamicRoute.name}`,

278
src/views/components/resiForm.vue
View File

@ -1317,31 +1317,34 @@ export default {
await this.getHouseList() await this.getHouseList()
await this.residentEduInfo(this.form.resiId) await this.residentEduInfo(this.form.resiId)
}, },
getAllDict () { async getAllDict() {
// 民族字典 try {
this.getDictList() await Promise.all([
// 关系字典 this.getDictList(),
this.getRelationship() this.getRelationship(),
// 学历信息 this.getEducation(),
this.getEducation() this.getdisabilityDict(),
//残疾类别 this.getdisabilityDictClass(),
this.getdisabilityDict() this.getillnessDict(),
this.getdisabilityDictClass() this.getchronicDict(),
this.getillnessDict() this.getHouseholdDict(),
this.getchronicDict() this.getMarriageDict(),
this.getHouseholdDict() this.getResideDict(),
this.getMarriageDict() this.getSpouseDict(),
this.getResideDict() this.getPartyDict(),
this.getSpouseDict() this.getResidentDict(),
this.getPartyDict() this.getHousing(),
this.getResidentDict() this.getVolunteerDict(),
this.getHousing() this.gethobbyDict(),
this.getVolunteerDict() this.getWelfareDict(),
this.gethobbyDict() this.getUnemployment(),
this.getWelfareDict() this.getCareer()
this.getUnemployment() ]);
this.getCareer() } catch (error) {
console.error("Error fetching dictionaries: ", error);
}
}, },
getGridList () { getGridList () {
const { user } = this.$store.state const { user } = this.$store.state
this.$http.post('/gov/org/customergrid/gridoption', { agencyId: user.agencyId, purpose: 'addorupdate' }).then(({ data: res }) => { 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 this.newForm.nation = val
}, },
async getdisabilityDict () { async getdisabilityDict () {
try { await this.getDictData('disability_category_code','disabilityCategoryCode')
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, '获取残疾字典');
}
}, },
async getVolunteerDict () { async getVolunteerDict () {
try { await this.getDictData('VOLUNTEER_CATEGORY','volunteerCategory')
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, '获取志愿者字典');
}
}, },
async gethobbyDict () { async gethobbyDict () {
try { await this.getDictData('SPECIAL_SKILL','hobbyCode')
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, '获取兴趣爱好字典');
}
}, },
async getdisabilityDictClass () { async getdisabilityDictClass () {
try { await this.getDictData('disability_level','disabilityLevel')
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, '获取残疾等级字典');
}
}, },
async getillnessDict () { async getillnessDict () {
try { await this.getDictData('illness_code','illnessCode')
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, '获取所患大病字典');
}
}, },
async getchronicDict () { async getchronicDict () {
try { await this.getDictData('chronic_disease_code','chronicDiseaseCode')
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, '获取所患慢病字典');
}
}, },
async getWelfareDict () { async getWelfareDict () {
try { await this.getDictData('welfare_post','jobPost')
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, '获取公益岗位字典');
}
}, },
async getUnemployment () { async getUnemployment () {
try { await this.getDictData('unemployment_cause','unemploymentReason')
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, '获取失业原因字典');
}
}, },
async getCareer () { async getCareer () {
try { await this.getDictData('career_goals','employmentWish')
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, '获取就业愿望字典');
}
}, },
async getHouseholdDict () { async getHouseholdDict () {
try { await this.getDictData('household_situation','householdSituation')
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, '获取人户状况字典');
}
}, },
async getMarriageDict () { async getMarriageDict () {
try { await this.getDictData('marriage','marriage')
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, '获取婚姻状况字典');
}
}, },
async getResideDict () { async getResideDict () {
try { await this.getDictData('reside_situation','resideSituation')
const { data } = await this.$http.post('sys/dict/data/dictlist', { 'dictType': 'reside_situation' }) },
this.footerInputList.forEach(c => { async getPartyDict () {
for (let i of c.children) { await this.getDictData('party_job','partyJob')
if (i.formName == 'resideSituation') {
i.opction = data.data
}
}
})
} catch (error) {
console.log(error, '获取居住情况字典');
}
}, },
async getSpouseDict () { async getSpouseDict () {
try { await this.getDictData('spouse_situation','spouseSituation')
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, '获取配偶情况字典');
}
}, },
async getResidentDict () { async getResidentDict () {
try { await this.getDictData('special_resident_category','specialCategoryCode')
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, '获取配偶情况字典');
}
}, },
async getPartyDict () { // 运营端控制字典统一调用
async getDictData(dictType, formName) {
try { 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 => { this.footerInputList.forEach(c => {
for (let i of c.children) { for (let i of c.children) {
if (i.formName == 'partyJob') { if (i.formName == formName) {
i.opction = data.data i.opction = data.data;
} }
} }
}) });
} catch (error) { } catch (error) {
console.log(error, '获取职务字典'); console.log(error, `获取 ${dictType} 字典`);
} }
}, },
getBuildList () { getBuildList () {
this.$http.post('/actual/base/communityBuilding/buildingoption', { quartersId: this.form.villageId }).then(({ data: res }) => { this.$http.post('/actual/base/communityBuilding/buildingoption', { quartersId: this.form.villageId }).then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {
@ -1663,7 +1496,8 @@ export default {
}, },
checkNumberInput (itemj, itemk) { checkNumberInput (itemj, itemk) {
if (isNaN(this.form[itemj][itemk])) { if(this.form[itemj][itemk]){
if (isNaN(this.form[itemj][itemk])) {
this.$message.error("请输入数字"); this.$message.error("请输入数字");
this.form[itemj][itemk] = ""; this.form[itemj][itemk] = "";
} else { } else {
@ -1671,6 +1505,8 @@ export default {
this.form[itemj][itemk] this.form[itemj][itemk]
); );
} }
}
}, },
handleChangeGrid (val) { handleChangeGrid (val) {
console.log('val', val) console.log('val', val)
@ -2282,7 +2118,7 @@ export default {
securityType: '',//保障类型 securityType: '',//保障类型
certificateDate: '',//发证日期yyyy-MM-dd certificateDate: '',//发证日期yyyy-MM-dd
subsidyNum: '',//补贴编号 subsidyNum: '',//补贴编号
subsidyAmount: '',//补贴金额 subsidyAmount: null,//补贴金额
} }
this.newForm.ensureHouseDto = this.form.ensureHouseDto this.newForm.ensureHouseDto = this.form.ensureHouseDto
} }

5
src/views/modules/base/community/community.vue
View File

@ -773,8 +773,7 @@ export default {
await nextTick(1000); await nextTick(1000);
this.vDisabled = false; this.vDisabled = false;
this.bDisabled = false; this.bDisabled = false;
console.log(obj);
if (obj.level === "building") { if (obj.level === "building") {
//点击楼栋 //点击楼栋
@ -816,8 +815,6 @@ export default {
this.getValiheList("", ""); this.getValiheList("", "");
this.treeIsOk = true this.treeIsOk = true
} }
}, },

5
src/views/modules/base/community/communityExportInfo.vue
View File

@ -160,6 +160,10 @@ export default {
type: Object, type: Object,
default: () => { }, default: () => { },
}, },
orgId: {
type:String,
default:''
}
}, },
components: { components: {
checkBox, checkBox,
@ -364,6 +368,7 @@ export default {
}; };
}), }),
}, },
orgId:this.orgId || ''
}; };
await this.$http({ await this.$http({
method: "POST", method: "POST",

125
src/views/modules/base/community/communityTable.vue
View File

@ -210,8 +210,8 @@
formCode: 'community_info', formCode: 'community_info',
pageNo: pageNo, pageNo: pageNo,
pageSize: pageSize, pageSize: pageSize,
conditions:queryConditions
}" @close="handleDiyClose"></community-export-info> }" :orgId="treeObj.id" @close="handleDiyClose"></community-export-info>
</el-dialog> </el-dialog>
<baobiao ref="baobiao" /> <baobiao ref="baobiao" />
@ -315,7 +315,7 @@ export default {
diyDialog: false, diyDialog: false,
// queryConditions: [], queryConditions: [],
}; };
}, },
@ -362,38 +362,38 @@ export default {
async mounted() { async mounted() {
this.customerId = localStorage.getItem("customerId"); this.customerId = localStorage.getItem("customerId");
// this.displayedBaobiaoBtn = await this.$refs.baobiao.existsTemplate({ this.displayedBaobiaoBtn = await this.$refs.baobiao.existsTemplate({
// elseParams: { elseParams: {
// categoryKeys: ['house_info'], categoryKey: 'house_info', categoryKeys: ['house_info'], categoryKey: 'house_info',
// } }
// }); });
// this.getQueryConditions(); this.getQueryConditions();
}, },
methods: { methods: {
// async getQueryConditions() { async getQueryConditions() {
// let params = { let params = {
// formCode: "community_info", formCode: "community_info",
// customerId: this.$store.state.user.customerId, customerId: this.$store.state.user.customerId,
// }; };
//
// const { data } = await this.$http.post( const { data } = await this.$http.post(
// "/oper/customize/icform/queryItems", "/oper/customize/icform/queryItems",
// params params
// ); );
//
// if (data.code === 0) { if (data.code === 0) {
// this.queryConditions = data.data.map((item) => { this.queryConditions = data.data.map((item) => {
// return { return {
// ...item, ...item,
// humpName: util.capitalToHump(item.columnName), humpName: util.capitalToHump(item.columnName),
// }; };
// }); });
// console.log(this.queryConditions); console.log(this.queryConditions);
// } else { } else {
// this.$message.error(data.msg); this.$message.error(data.msg);
// } }
// }, },
reportForm() { reportForm() {
let paramMap = { let paramMap = {
@ -774,67 +774,6 @@ export default {
} else { } else {
this.$message.error(msg); 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() { async handleExport() {

17
src/views/modules/base/resi.vue
View File

@ -51,27 +51,27 @@
class="diy-button--white" class="diy-button--white"
@click="diyExport" @click="diyExport"
plain>导出</el-button> plain>导出</el-button>
<el-button v-if="btnAuths.ic_resi_export" <!-- <el-button v-if="btnAuths.ic_resi_export"
style="margin-left: 10px" style="margin-left: 10px"
size="small" size="small"
class="diy-button--add" class="diy-button--add"
@click="" @click=""
type="parimary" type="parimary"
plain>核对</el-button> plain>核对</el-button> -->
<el-button v-if=" <!-- <el-button v-if="
btnAuths.ic_resi_smart_import && displayedBaobiaoBtn btnAuths.ic_resi_smart_import && displayedBaobiaoBtn
" "
style="margin-left: 10px" style="margin-left: 10px"
size="small" size="small"
@click="reportForm" @click="reportForm"
class="diy-button--white">核对</el-button> class="diy-button--white">核对</el-button> -->
<el-button style="margin-left: 10px" <el-button style="margin-left: 10px"
v-if="btnAuths.ic_resi_batch_del" v-if="btnAuths.ic_resi_batch_del"
size="small" size="small"
class="diy-button--white" class="diy-button--add"
plain type="parimary"
@click="deleteBatch">批量删除</el-button> @click="deleteBatch">批量删除</el-button>
<!-- <el-button type="primary" size="small">下载人口模板</el-button> --> <!-- <el-button type="primary" size="small">下载人口模板</el-button> -->
</div> </div>
@ -86,7 +86,6 @@
:height="tableHeight" :height="tableHeight"
@select-all="selectAll" @select-all="selectAll"
@selection-change="selectionChange"> @selection-change="selectionChange">
<!-- 为啥要谁都能删除居民? -->
<!-- :selectable="checkSelectable" --> <!-- :selectable="checkSelectable" -->
<el-table-column type="selection" <el-table-column type="selection"
fixed="left" fixed="left"
@ -553,7 +552,7 @@ export default {
}, },
category: this.$route.query.category, category: this.$route.query.category,
searchForm:{} searchForm:{},
}; };
}, },
@ -1368,7 +1367,7 @@ export default {
this.handleSearchFrom() this.handleSearchFrom()
}else{ }else{
this.$refs.myResiSearch.form.categoryKey = [] this.$refs.myResiSearch.form.categoryKey = []
this.getTableData() this.getTableData()
} }
}) })
} }

4
src/views/modules/base/smartImport.vue
View File

@ -296,11 +296,9 @@ export default {
async getResident() { async getResident() {
try { try {
const { data } = await this.$http.post("sys/dict/data/dictlist", { const { data } = await this.$http.post("sys/dict/data/dictlist", {
dictType: "resident_category", dictType: "resident_category_import",
}); });
let myObject = { label: "基础信息", value: "BASEINFO" };
this.resiClass = data.data; this.resiClass = data.data;
this.resiClass.unshift(myObject);
} catch (error) { } catch (error) {
console.log(error, "获取居民类别字典"); console.log(error, "获取居民类别字典");
} }

18
src/views/modules/communityParty/partyOrg/orgTree.vue
View File

@ -34,10 +34,13 @@
:data="partyOrgTree" :data="partyOrgTree"
style="width: 100%" style="width: 100%"
row-key="id" row-key="id"
:key="tableKey"
border border
lazy lazy
:load="handleTreeNodeExpand" :load="handleTreeNodeExpand"
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"> :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
ref="table"
>
<el-table-column <el-table-column
prop="partyOrgName" prop="partyOrgName"
@ -119,7 +122,8 @@ export default {
updateDlgShow: false, // 创建对话框是否显示 updateDlgShow: false, // 创建对话框是否显示
editDlgShow: false, // 创建对话框是否显示 editDlgShow: false, // 创建对话框是否显示
partyOrgTree: [], // 党组织树形结构 partyOrgTree: [], // 党组织树形结构
expandedOrgId: [] expandedOrgId: [],
tableKey:''
} }
}, },
components: { components: {
@ -225,7 +229,7 @@ export default {
this.epmetResultResolver.success((data) => { this.epmetResultResolver.success((data) => {
this.$message.success('删除成功'); this.$message.success('删除成功');
this.handleLoadTreeRoot(); this.handleLoadTreeRoot(true);
}).parse(rst); }).parse(rst);
}); });
@ -245,15 +249,13 @@ export default {
/** /**
* 加载树根 * 加载树根
*/ */
async handleLoadTreeRoot() { async handleLoadTreeRoot(status) {
let url = "/actual/base/party/org/listPartyOrgTreeRoot"; let url = "/actual/base/party/org/listPartyOrgTreeRoot";
let rst = await requestGet(url, {}) let rst = await requestGet(url, {})
this.epmetResultResolver.success((data) => { this.epmetResultResolver.success((data) => {
this.partyOrgTree.length = 0; this.partyOrgTree.length = 0
this.partyOrgTree.push(data); this.partyOrgTree.push(data);
this.tableKey = new Date().getTime();
// 默认加载2级，并且展开，从第三级开始，需要展开上一级动态查询得到 // 默认加载2级，并且展开，从第三级开始，需要展开上一级动态查询得到
console.log(">>>>", this.partyOrgTree) console.log(">>>>", this.partyOrgTree)
if (this.partyOrgTree.length > 0) { if (this.partyOrgTree.length > 0) {

6
src/views/modules/cpts/base/index.vue
View File

@ -410,7 +410,7 @@ export default {
showSercahStatus:{ showSercahStatus:{
type: Boolean, type: Boolean,
default: false, default: false,
} },
}, },
data () { data () {
@ -436,8 +436,8 @@ export default {
maxTableHeight () { maxTableHeight () {
const { ref_search_height } = this; const { ref_search_height } = this;
return this.$store.state.inIframe return this.$store.state.inIframe
? this.clientHeight - ref_search_height - 265 + this.iframeHeight ? this.clientHeight - ref_search_height - 270 + this.iframeHeight
: this.clientHeight - ref_search_height - 265; : this.clientHeight - ref_search_height - 270;
}, },
...mapGetters(["clientHeight", "iframeHeight"]), ...mapGetters(["clientHeight", "iframeHeight"]),
}, },

Write Preview
Loading…
Cancel
Save