Browse Source

低保人员联调,党员bug,党组织列表样式修改

feature
mk 2 years ago
parent
commit
dac7a87287
  1. 90
      src/views/modules/base/residentManagement/subsistenceAllowance/addForm.vue
  2. 44
      src/views/modules/base/residentManagement/subsistenceAllowance/subsistenceAllowance.vue
  3. 69
      src/views/modules/communityParty/members/memberList.vue
  4. 6
      src/views/modules/communityParty/partyOrg/orgTree.vue

90
src/views/modules/base/residentManagement/subsistenceAllowance/addForm.vue

@ -11,6 +11,26 @@
:rules="dataRule"
class="div_form"
>
<el-row>
<el-col :span="24">
<div class="info-prop" v-if="formType == 'detail'">
<span class="info-title-2">所属组织: </span>
<span>{{ formData.agencyName || "--" }}</span>
</div>
<el-form-item label="所属组织" prop="agencyId" label-width="100px" v-else>
<el-cascader class="u-item-width-normal"
size="small"
ref="myCascader"
v-model="agencyIdTemp"
:options="orgOptions"
:props="orgOptionProps"
:show-all-levels="false"
@change="handleChangeAgency"
clearable>
</el-cascader>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="info-prop" v-if="formType == 'detail'">
@ -340,10 +360,6 @@
export default {
props: {
formType:{
type:String,
default:'add'
},
source: {
//manage visiual
type: String,
@ -352,9 +368,16 @@
},
data() {
let orgOptionProps = {
multiple: false,
value: 'agencyId',
label: 'agencyName',
children: 'subAgencyList',
checkStrictly: true
}
return {
formType:'',
btnDisable: false,
formData: {
name: "",
idType: null,
@ -373,8 +396,11 @@
occupation: "",
retireTime: "",
remark: "",
agencyId: this.$store.state.user.agencyId,
agencyId:'',
},
agencyIdTemp:[],
orgOptionProps ,
orgOptions: [],
genderList,
binaryOptionList,
dataRule: {
@ -400,8 +426,9 @@
watch: {},
components: {},
async created() {
await this.getDicts();
created() {
this.getDicts();
this.getOrgTreeList()
},
async mounted() {
this.startLoading();
@ -418,8 +445,9 @@
const url = `/actual/base/resiCategorized/subsistenceAllowance/detail/${categorizedResiId}`;
const { data, code, msg } = await requestGet(url);
if (code === 0) {
console.log(data);
this.formData = { ...data };
await this.setAgencyIdFromLastLayerId(data.agencyId)
console.log(this.agencyIdTemp);
} else {
this.$message.error(msg);
}
@ -491,6 +519,48 @@
resetData() {
this.formData = {};
},
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('网络错误')
})
},
findPathInOptions(agencyId, options) {
console.log(agencyId,options);
for (let i = 0; i < options.length; i++) {
console.log(options[i]);
if (options[i].agencyId === agencyId) {
console.log(agencyId);
return [agencyId];
} else if (options[i].subAgencyList) {
const pathFromChild = this.findPathInOptions(agencyId, options[i].subAgencyList
);
if (pathFromChild.length) {
return [options[i].agencyId].concat(pathFromChild);
}
}
}
return [];
},
async setAgencyIdFromLastLayerId(lastLayerId) {
console.log(lastLayerId,'事件');
this.agencyIdTemp = await this.findPathInOptions(lastLayerId, this.orgOptions);
},
handleChangeAgency(val){
this.formData.agencyId = val[val.length -1]
console.log(this.formData.agencyId);
},
//
startLoading() {
loading = Loading.service({
@ -509,7 +579,7 @@
};
</script>
<style lang="scss" scoped>
<style lang="scss" scoped>
@import "@/assets/scss/modules/management/form-main.scss";
@import "@/assets/scss/modules/visual/a_customize.scss";
@import "@/assets/scss/modules/management/detail-main.scss";

44
src/views/modules/base/residentManagement/subsistenceAllowance/subsistenceAllowance.vue

@ -332,7 +332,6 @@
>
<add-form
ref="ref_add_form"
:formType="formType"
@handleComfirm="handleComfirm"
@handleClose="handleClose"
></add-form>
@ -421,6 +420,8 @@
educationList: [],
nationList: [],
}, //
importCode:[],
dataList:[]
};
},
computed: {
@ -515,15 +516,15 @@
});
const formData = new FormData(); //FormDataappend('key', value)
formData.append("file", file.file); //
formData.append("fileMode",'SUBSISTENCE_ALLOWANCE');
await this.$http
.post("/actual/base/resiCategorized/disability/import", formData)
.post("/actual/base/importExcelData/extractExcelHead", formData)
.then((res) => {
console.log("res-up", res);
if (res.data.code == 0 && res.data.msg == "success") {
this.$message.success("导入成功");
this.getTableData();
this.$refs.upload.clearFiles();
} else this.$message.error(res.data.msg);
const { metaListData, fileCode, msg } = res.data.data;
this.dataList = metaListData;
// forfilter, O(1) itemGroupId
this.importCode = fileCode;
this.handleComfirmUpload()
})
.catch((err) => {
console.log("失败", err);
@ -531,6 +532,28 @@
// this.$message.error('')
});
},
async handleComfirmUpload () {
this.importLoading = true;
this.importBtnTitle = "正在上传中...";
const { importOption, importCode, dataList } = this;
const formData = new FormData();
formData.append("columnMateJson", JSON.stringify(dataList));
formData.append("fileCode", importCode);
await this.$http
.post("/actual/base/importExcelData/importResiHouseExcel", formData)
.then((res) => {
console.log("res-up", res);
if (res.data.code == 0 && res.data.msg == "success") {
this.getTableData();
} else this.$message.error(res.data.msg);
})
.catch((err) => {
console.log("失败", err);
file.onError(); //
});
this.importLoading = false;
this.importBtnTitle = "导入";
},
//
handleSearch(val) {
console.log(this.formData);
@ -597,7 +620,7 @@
const url = "/actual/base/resiCategorized/subsistenceAllowance/deleteBatch";
const { data, code, msg } = await requestPost(url, id);
if (code === 0) {
this.$message.success("取消成功!");
this.$message.success("删除成功!");
this.getTableData();
} else {
this.$message.error("操作失败!");
@ -622,9 +645,10 @@
this.$message.error(msg);
}
},
//
async handleExport() {
const url = "";
const url = "/actual/base/resiCategorized/subsistenceAllowance/export";
const { pageSize, pageNo, formData } = this;
axios({
url: window.SITE_CONFIG["apiURL"] + url,

69
src/views/modules/communityParty/members/memberList.vue

@ -1,7 +1,7 @@
<template>
<div class="g-main">
<div class="m-search">
<el-form class="header_form_box" ref="searchForm" :model="searchForm" :inline="true" :label-width="'105px'">
<el-form class="header_form_box" ref="searchForm" :model="searchForm" :inline="true" :label-width="'100px'">
<el-form-item label="所属党组织" >
<el-cascader :options="partyOrgTree"
clearable
@ -30,7 +30,7 @@
class="u-item-width-normal" clearable></el-input>
</el-form-item>
<el-form-item label="职务">
<el-select v-model="searchForm.partyJob" placeholder="请选择" size="small"
<el-select v-model="searchForm.partyJob" placeholder="请选择" clearable size="small"
class="u-item-width-normal">
<el-option v-for="e in partyJobOptions"
:key="e.value"
@ -39,16 +39,25 @@
</el-select>
</el-form-item>
<el-form-item label="入党日期">
<el-date-picker
type="daterange"
size="small"
class="u-item-width-daterange2"
clearable
@change="handleJoinTimeChange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期">
</el-date-picker>
<el-date-picker v-model="searchForm.joinTimeStart"
:picker-options="startPickerOptions"
class="u-item-width-daterange"
size="small"
type="date"
value-format="yyyy-MM-dd"
value="yyyy-MM-dd"
placeholder="开始时间">
</el-date-picker>
<span class="u-data-tag"></span>
<el-date-picker v-model="searchForm.joinTimeEnd"
:picker-options="endPickerOptions"
class="u-item-width-daterange u-data-tag"
size="small"
type="date"
value-format="yyyy-MM-dd"
value="yyyy-MM-dd"
placeholder="结束时间">
</el-date-picker>
</el-form-item>
<!--党员中心户-->
@ -76,7 +85,7 @@
<!--流动党员证号-->
<el-form-item prop="flowActNum" label="流动党员证号" >
<el-input v-model="searchForm.flowActNum" clearable size="small"
class="u-item-width-normal"></el-input>
class="u-item-width-normal" placeholder="请输入"></el-input>
</el-form-item>
<!--免学习-->
@ -89,6 +98,36 @@
:label="e.label"></el-option>
</el-select>
</el-form-item>
<el-form-item prop="studyNotNeed" label="是否缴费">
<el-select v-model="searchForm.isPay" placeholder="请选择" clearable size="small"
class="u-item-width-normal">
<el-option v-for="e in studyNotNeedOptions"
:key="e.value"
:value="e.value"
:label="e.label"></el-option>
</el-select>
</el-form-item>
<el-form-item label="最近缴费日期">
<el-date-picker v-model="searchForm.isPayTimeStart"
:picker-options="startPickerOptions"
class="u-item-width-daterange"
size="small"
type="date"
value-format="yyyy-MM-dd"
value="yyyy-MM-dd"
placeholder="开始时间">
</el-date-picker>
<span class="u-data-tag"></span>
<el-date-picker v-model="searchForm.isPayTimeEnd"
:picker-options="endPickerOptions"
class="u-item-width-daterange u-data-tag"
size="small"
type="date"
value-format="yyyy-MM-dd"
value="yyyy-MM-dd"
placeholder="结束时间">
</el-date-picker>
</el-form-item>
</el-form>
<el-row type="flex" >
<el-col :span="24" align="right">
@ -391,6 +430,9 @@ export default {
flowFlag: null,
flowActNum: null,
studyNotNeed: null,
isPay:null,
isPayTimeEnd:null,
isPayTimeStart:null,
pageNo: 0, //
pageSize: 0, //
},
@ -687,6 +729,7 @@ export default {
*/
handleReset() {
this.searchForm = this.searchFormClear;
this.search()
},
/**

6
src/views/modules/communityParty/partyOrg/orgTree.vue

@ -35,6 +35,7 @@
style="width: 100%"
row-key="id"
:key="tableKey"
class="m-table-item"
border
lazy
:load="handleTreeNodeExpand"
@ -67,7 +68,10 @@
</el-table-column>
<el-table-column
label="操作">
label="操作"
fixed="right"
width="315"
>
<template slot-scope="scope">
<el-button type="text"
@click="handlePrincipalBtnClick(scope.row)"

Loading…
Cancel
Save