Browse Source

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

xiaowang-bug
是小王呀\24601 2 years ago
parent
commit
8abf4138dd
  1. BIN
      src/assets/img/QRcode.jpg
  2. 3
      src/assets/scss/modules/management/form-main.scss
  3. 155
      src/views/components/addResi.vue
  4. 44
      src/views/components/editResi.vue
  5. 140
      src/views/components/resiExpand/editExpand.vue
  6. 57
      src/views/components/resiExpand/index.vue
  7. 29
      src/views/components/resiSearch.vue
  8. 55
      src/views/modules/base/community/communityTable.vue
  9. 78
      src/views/modules/base/community/roomForm.vue
  10. 12
      src/views/modules/base/organization/organization.vue
  11. 75
      src/views/modules/base/resi.vue
  12. 453
      src/views/modules/communityParty/comPromotion/index.vue
  13. 2
      src/views/modules/communityParty/regionalParty/units.vue
  14. 13
      src/views/modules/communityParty/regionalParty/unitsForm.vue
  15. 9
      src/views/modules/communityService/fuwuzhaoren/addForm.vue
  16. 12
      src/views/modules/communityService/fuwuzhaoren/personList.vue
  17. 10
      src/views/modules/communityService/gangweizhaoren/personList.vue
  18. 23
      src/views/modules/communityService/gxxq/addForm.vue
  19. 20
      src/views/modules/communityService/gxxq/index.vue
  20. 10
      src/views/modules/communityService/jinengzhaoren/personList.vue
  21. 3
      src/views/modules/communityService/labelConfig/addForm.vue
  22. 47
      src/views/modules/communityService/measure/index.vue
  23. 16
      src/views/modules/communityService/policy/addPolicy.vue
  24. 11
      src/views/modules/communityService/policy/personList.vue
  25. 14
      src/views/modules/communityService/policy/policyList.vue
  26. 13
      src/views/modules/communityService/wennuanzhaoren/personList.vue
  27. 6
      src/views/modules/cpts/base/index.vue
  28. 17
      src/views/modules/home/index.vue
  29. 32
      src/views/modules/portrayal/jumin/cpts/staffTag.vue
  30. 16
      src/views/modules/portrayal/jumin/index.vue
  31. 6
      src/views/modules/shequzhili/tuceng/yingji/zizuzhi/addForm.vue

BIN
src/assets/img/QRcode.jpg

Binary file not shown.

After

Width:  |  Height:  |  Size: 92 KiB

3
src/assets/scss/modules/management/form-main.scss

@ -111,4 +111,7 @@
left: 5px;
display: flex;
justify-content: flex-start;
}
.m-table{
margin: 20px;
}

155
src/views/components/addResi.vue

@ -321,7 +321,7 @@
</div>
<h5>人员标签</h5>
<div class="stafftag">
<stafftag :formType="'add'" @showDialog="showDialog"></stafftag>
<stafftag :formType="'add'" ref="stafftag" @showDialog="showDialog"></stafftag>
</div>
</el-form>
<el-row style="margin:24px">
@ -338,6 +338,18 @@
<resi-expand ref="resiExpand" @submitExpand="submitExpand" @hideExpand="hideExpand"
:operationType="'add'"></resi-expand>
</el-dialog>
<el-dialog title="密码验证" :visible.sync="showCheckPassword">
<el-form :model="checkPasswordFrom" :rules="checkPasswordRulse" ref="checkPasswordFrom">
<el-form-item label="密码" prop="password">
<el-input v-model.trim="checkPasswordFrom.password" autocomplete="off" type="password" placeholder="请输入当前账号密码"
@keydown.native.enter="handelClickCheckPassword"></el-input>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="showCheckPassword = false"> </el-button>
<el-button type="primary" @click="handelClickCheckPassword"> </el-button>
</div>
</el-dialog>
</div>
</template>
@ -364,20 +376,35 @@ import resiExpand from "./resiExpand";
export default {
data() {
return {
dialogVisible: false,
dialogTitle: "",
formList: [],
orgOptions: [],
orgOptionProps: {
value: 'agencyId',
label: 'agencyName',
children: 'subAgencyList',
emitPath: false,
multiple: false,
checkStrictly: true
},
form: {
resiId:null,
showCheckPassword:false,
checkPasswordFrom: {
password: "",
},
checkPasswordRulse: {
password: [
{ required: true, message: "请输入密码", trigger: "blur" },
{
min: 6,
max: 18,
message: "长度在 6 到 18 个字符",
trigger: "blur",
},
],
},
dialogVisible: false,
dialogTitle: "",
formList: [],
orgOptions: [],
orgOptionProps: {
value: 'agencyId',
label: 'agencyName',
children: 'subAgencyList',
emitPath: false,
multiple: false,
checkStrictly: true
},
form: {
baseInfoDto: {
name: null,//
idType: null,//
@ -475,9 +502,14 @@ export default {
},
economyDto: {
monthIncome: null,//
},
oldPeopleDto:{
oldPeopleCategories:[],
resideSituation: null,
oldSubsidy:null
}
},
footerInputList: [
},
footerInputList: [
{
id: 'healthDto',
children: [
@ -577,12 +609,12 @@ export default {
]
},
{
id: 'deathDto',
id: 'baseInfoDto',
children: [
{
label: "死亡时间",
itemType: "datepicker1",
formName: "deathTime",
formName: "deathDate",
check:'fourFont'
},
]
@ -598,7 +630,6 @@ export default {
opctionUrl: 'sys/dict/data/dictlist',
opctionParams: { dictType: 'oldPeople_categories' },
opction:[]
},
{
label: "居住情况",
@ -607,6 +638,7 @@ export default {
formName: "resideSituation",
opctionUrl: 'sys/dict/data/dictlist',
opctionParams: { dictType: 'reside_situation' },
opction:[]
},
{
label: "高龄补助",
@ -626,6 +658,7 @@ export default {
formName: "category",
opctionUrl: 'sys/dict/data/dictlist',
opctionParams: { dictType: 'subsistence_allowance_category' },
opction:[]
},
{
label: "低保享受原因",
@ -857,11 +890,10 @@ export default {
},
{//1
label: "子女姓名",
check:'fourFont',
// check:'fourFont',
itemType: "input1",
formName: "childName",
opction: [
]
opction: []
},
{//2
label: "子女性别",
@ -907,14 +939,13 @@ export default {
]
},
],
idTypeList,
genderList,
hasOptions,
disabilityFlagList,
btnLoading: false,
rules: {
],
idTypeList,
genderList,
hasOptions,
disabilityFlagList,
btnLoading: false,
rules: {
"baseInfoDto.name": [
{ required: true, message: "请输入姓名", trigger: "blur" },
],
@ -930,8 +961,8 @@ export default {
"baseInfoDto.nationality": [
{ required: true, message: "请选择国籍", trigger: "blur" },
],
},
dicts: {
},
dicts: {
educationList: [], //
nationList: [], //
nationalityList: [], //
@ -952,8 +983,8 @@ export default {
value: 1,
},
],
},
logLevelChecked: 0,
},
logLevelChecked: 0,
};
},
created() {
@ -963,6 +994,33 @@ export default {
this.initHouseBind();
},
methods: {
handelClickCheckPassword() {
this.$refs.checkPasswordFrom.validate((vali) => {
if (vali) {
this.saveCheckPassword(this.checkPasswordFrom.password);
} else {
return false;
}
});
},
async saveCheckPassword(password){
const url = `/actual/base/residentBaseInfo/getResiUserInfo/${this.resiId}`;
let parm = {
password,
};
const { data, code, msg } = await requestPost(url, parm);
if (code === 0) {
this.showCheckPassword = false;
this.$router.push({
name: "edit-resi",
query: { id: this.resiId },
params: { idNum: data.idNum, mobile: data.mobile, name: data.name, nationality: data.nationality },
});
this.checkPasswordFrom.password = "";
} else {
this.$message.error(msg);
}
},
//
initHouseBind() {
for (let i in this.form.resideInfoDtos) {
@ -1202,10 +1260,13 @@ export default {
if (this.form.baseInfoDto.idNum.length === 18 || this.form.baseInfoDto.idNum.length === 15) {
const _id = this.form.baseInfoDto.idNum.substr(0, 6)
const { sex, birth, age } = computedCard(this.form.baseInfoDto.idNum)
this.form.baseInfoDto.birthday = birth
this.form.baseInfoDto.gender = sex == 1 ? '1' : '2'
this.form.baseInfoDto.categoryInfo.oldPeopleFlag = age >= 60 ? 1 : 0
const { sex, birth, age } = computedCard(this.form.baseInfoDto.idNum);
this.form.baseInfoDto.birthday = birth;
this.form.baseInfoDto.gender = sex == 1 ? '1' : '2';
// this.form.baseInfoDto.categoryInfo.oldPeopleFlag = age >= 60 ? 1 : 0;
let obj = {oldPeopleFlag:age >= 60 ? 1 : 0,fertileWomanFlag:this.form.baseInfoDto.gender == 2 && (age >= 18 && age < 49)? 1 : 0}
this.$refs['stafftag'].updatedForm(obj);
this.form.oldPeopleDto.oldPeopleCategories = ['oldPeopleFlag'];
// this.form.IS_BDHJ = huji == _id ? '1' : ''
//
// this.validateIdcard(this.form.idNum)
@ -1227,7 +1288,8 @@ export default {
cancelButtonText: '继续填写',
type: 'warning'
}).then(() => {
this.$router.push({ name: 'edit-resi', query: { id: data.id }, params: { idNum: data.idNum, mobile: data.mobile } });
this.resiId = data.id
this.showCheckPassword = true;
}).catch(() => {
@ -1346,6 +1408,11 @@ export default {
this.form.baseInfoDto.categoryInfo.partyFlag = 2;
}
if (index != 3 && index) {
if(value === 'deathFlag'){
this.form.baseInfoDto.deathFlag = event?1:0
}else{
this.form.baseInfoDto.categoryInfo[value] = event ? 1 : 0;
}
this.form.baseInfoDto.categoryInfo[value] = event ? 1 : 0;
} else if (index == 3) {
if (event) {
@ -1366,7 +1433,7 @@ export default {
'disabilityFlag': { formId: 'healthDto', formType: 'healthDto', title: '残疾信息' },
'seriousIllnessFlag': { formId: 'seriousIllnessDto', formType: 'seriousIllnessDto', title: '大病信息' },
'chronicDiseaseFlag': { formId: 'chronicDiseaseDto', formType: 'chronicDiseaseDto', title: '慢病信息' },
'deathFlag': { formId: 'deathDto', formType: 'deathDto', title: '死亡' },
'deathFlag': { formId: 'baseInfoDto', formType: 'baseInfoDto', title: '死亡' },
'oldPeopleFlag': { formId: 'oldPeopleDto', formType: 'oldPeopleDto', title: '老年人信息' },
'subsistenceAllowanceFlag': { formId: 'subsistenceAllowanceDto', formType: 'subsistenceAllowanceDto', title: '低保人员信息' },
'veteranFlag': { formId: 'veteranDto', formType: 'veteranDto', title: '退役军人信息' },
@ -1396,7 +1463,11 @@ export default {
this.dialogVisible = false;
},
hideExpand(formType) {
delete this.form[formType];
if(formType!= 'baseInfoDto'){
delete this.form[formType];
}else{
this.form['baseInfoDto'].deathFlag = 0;
}
this.dialogVisible = false;
},
},

44
src/views/components/editResi.vue

@ -889,7 +889,9 @@ export default {
nation: null, //
localResidenceFlag: 0, //
nativePlace: null, //,
remark: null, //
remark: null, //,
deathFlag:0,//
deathDate:null,//
categoryInfo: {
partyFlag: 0,
subsistenceAllowanceFlag: 0,
@ -1092,14 +1094,14 @@ export default {
],
},
{
id: "deathDto",
id: "baseInfoDto",
children: [
{
label: "死亡时间",
itemType: "datepicker1",
formName: "deathTime",
formName: "deathDate",
check:'fourFont',
pformName: "deathDto",
pformName: "baseInfoDto",
},
],
},
@ -1124,6 +1126,7 @@ export default {
opctionUrl: "sys/dict/data/dictlist",
opctionParams: { dictType: "reside_situation" },
pformName: "oldPeopleDto",
opction:[]
},
{
label: "高龄补助",
@ -1145,6 +1148,7 @@ export default {
opctionUrl: "sys/dict/data/dictlist",
opctionParams: { dictType: "subsistence_allowance_category" },
pformName: "subsistenceAllowanceDto",
opction: [],
},
{
label: "低保享受原因",
@ -1396,7 +1400,7 @@ export default {
{
//1
label: "子女姓名",
check:'fourFont',
// check:'fourFont',
itemType: "input1",
formName: "childName",
pformName: "specialSupportDto",
@ -1514,7 +1518,7 @@ export default {
formType: "chronicDiseaseDto",
title: "慢病信息",
},
deathFlag: { formId: "deathDto", formType: "deathDto", title: "死亡" },
deathFlag: { formId: "baseInfoDto", formType: "baseInfoDto", title: "死亡信息" },
oldPeopleFlag: {
formId: "oldPeopleDto",
formType: "oldPeopleDto",
@ -2172,7 +2176,11 @@ export default {
this.form.baseInfoDto.categoryInfo.partyFlag = 2;
}
if (index != 3 && index) {
this.form.baseInfoDto.categoryInfo[value] = event ? 1 : 0;
if(value === 'deathFlag'){
this.form.baseInfoDto.deathFlag = event?1:0
}else{
this.form.baseInfoDto.categoryInfo[value] = event ? 1 : 0;
}
} else if (index == 3) {
if (event) {
@ -2193,7 +2201,7 @@ export default {
'disabilityFlag': { formId: 'healthDto', formType: 'healthDto', title: '残疾信息' },
'seriousIllnessFlag': { formId: 'seriousIllnessDto', formType: 'seriousIllnessDto', title: '大病信息' },
'chronicDiseaseFlag': { formId: 'chronicDiseaseDto', formType: 'chronicDiseaseDto', title: '慢病信息' },
'deathFlag': { formId: 'deathDto', formType: 'deathDto', title: '死亡' },
'deathFlag': { formId: 'baseInfoDto', formType: 'baseInfoDto', title: '死亡' },
'oldPeopleFlag': { formId: 'oldPeopleDto', formType: 'oldPeopleDto', title: '老年人信息' },
'subsistenceAllowanceFlag': { formId: 'subsistenceAllowanceDto', formType: 'subsistenceAllowanceDto', title: '低保人员信息' },
'veteranFlag': { formId: 'veteranDto', formType: 'veteranDto', title: '退役军人信息' },
@ -2226,15 +2234,29 @@ export default {
});
}
});
delete this.form[this.incidence[value].formType];
if(value === 'deathFlag'){
this.form.baseInfoDto.deathFlag = 0;
this.form.baseInfoDto.deathDate = null;
}else{
delete this.form[this.incidence[value].formType];
}
}
},
submitExpandAdd(form, formType) {
this.form[formType] = form[formType];
if(formType === 'baseInfoDto' ){
this.form.baseInfoDto.deathDate = form[formType].deathDate;
this.form.baseInfoDto.deathFlag = 1;
}else{
this.form[formType] = form[formType];
}
this.dialogVisible = false;
},
hideExpand(formType) {
delete this.form[formType];
if(formType!= 'baseInfoDto'){
delete this.form[formType];
}else{
this.form['baseInfoDto'].deathFlag = 0;
}
this.dialogVisible = false;
},
//

140
src/views/components/resiExpand/editExpand.vue

@ -19,7 +19,7 @@
<template v-else-if="itemk.itemType == 'select1' && itemk.showFlag !== '0'">
<el-select v-model.trim="form[itemj.id][itemk.formName]" :placeholder="`请选择${itemk.label}`"
size="small" :multiple="itemk.multiple" :collapse-tags="itemk.collapseTags"
size="small" :multiple="itemk.multiple" :disabled="itemk.disabled" :collapse-tags="itemk.collapseTags"
clearable
:style="{ 'width': itemk.formName == 'specialCategoryCode' ? '183px' : '' }"
class="list_item_width_1">
@ -43,19 +43,21 @@
</el-input>
</template>
<template v-else-if="itemk.itemType == 'inputNum'">
<el-input :placeholder="`请输入${itemk.label}`" size="small" class="list_item_width_1-text"
<template v-else-if="itemk.itemType == 'inputNum'" style="display:flex">
<div style="display: flex;">
<el-input :placeholder="`请输入${itemk.label}`" size="small" class="list_item_width_1-text"
:style="{ 'margin-right': itemk.label == '备注' ? '50px' : '' }"
v-model.trim="form[itemj.id][itemk.formName]" clearable
@blur="checkNumberInput(itemj.id, itemk.formName)" @change.native="handleFormChange(itemj.id,itemk.formName,itemk.itemType)">
</el-input><span class="u-data-tag"></span>
</el-input><span class="u-data-tag" style="margin-left: 10px;"></span>
</div>
</template>
<template v-else-if="itemk.itemType == 'checkbox'">
<el-checkbox-group size="small" v-model.trim="form[itemj.id][itemk.formName]">
<el-checkbox v-for="items in itemk.opction" :label="items.value"
:style="{ 'margin-right': items.label != itemk.label ? '' : '19px' }"
:key="items.value" :value="items.value" @click.native="handleFormChange(itemj.id,itemk.formName,itemk.itemType)">{{ items.label }}</el-checkbox>
:key="items.value" :value="items.value" @click.native="handleFormChange(itemj.id,itemk.formName,itemk.itemType)" :disabled="items.disabled">{{ items.label }}</el-checkbox>
</el-checkbox-group>
</template>
@ -70,7 +72,6 @@
<el-cascader v-model.trim="form[itemj.id].partyOrgId" :props="casProps"
:options="itemk.opction" class="list_item_width_1" clearable size="small"
@change="handlePartyOrgCascadarChange" ></el-cascader>
<!-- {{form[itemj.id].partyOrgId}} -->
</template>
<template v-else-if="itemk.itemType == 'number'">
@ -182,6 +183,10 @@ export default {
volunteerDto: {
volunteerCategory: []
},
//
baseInfoDto:{
deathDate:null
}
},
casProps: {
value: 'id',
@ -202,16 +207,62 @@ export default {
},
created() { },
activated() {
this.getOrgTree()
},
mounted() {
},
methods: {
handleFormChange(pid,id,type){
console.log(pid,id,type,'拓展组件');
console.log(this.formList);
this.changPid = pid;
this.changId = id;
this.changType = type;
nextTick(1000)
this.$emit('submitExpand', this.form,{changId:this.changId,changPid:this.changPid,changType:this.changType})
// let index = this.formList.findIndex(item=>item.formId === "oldPeopleDto")
if (pid === 'oldPeopleDto' && id === 'oldPeopleCategories') {
this.formList.forEach((item,index) => {
item.form[0].children.forEach(async (itemC,indexC) => {
if (itemC.formName === "oldPeopleCategories") {
await nextTick(500)
if (itemC.value.findIndex(itemK => itemK === "liveAloneFlag") != -1) {
itemC.opction.forEach(itemJ => {
if (itemJ.value === "emptyNesterFlag") {
itemJ.disabled = true;
this.form[pid].resideSituation = 'duju'
item.form[0].children[1].disabled = true;
this.$forceUpdate()
} else {
itemJ.disabled = false;
this.$forceUpdate()
}
})
} else if (itemC.value.findIndex(itemK => itemK === "emptyNesterFlag") != -1) {
itemC.opction.forEach(itemJ => {
if (itemJ.value === "liveAloneFlag") {
itemJ.disabled = true;
this.form[pid].resideSituation = 'kongchao'
item.form[0].children[1].disabled = true;
this.$forceUpdate()
} else {
itemJ.disabled = false;
this.$forceUpdate()
}
})
} else {
this.form[pid].resideSituation = 'duju'
item.form[0].children[1].disabled = false;
itemC.opction.forEach(itemJ => {
itemJ.disabled = false;
})
this.$forceUpdate()
}
}
})
})
}
},
checkNumberInput(itemj, itemk) {
if (this.form[itemj][itemk]) {
@ -225,41 +276,50 @@ export default {
}
}
},
showForm() {
this.$nextTick(() => {
// console.log(this.form,'form');
const promises = this.formList.forEach((item) => {
item.form.map(async (group) => {
return group.children.reduce(async (accPromise, item) => {
const acc = await accPromise;
acc[item.formName] = null;
this.form[item.pformName].id = item.id
if (item.itemType == 'checkbox') {
this.form[item.pformName][item.formName] = item.value || []
} else if (item.itemType == 'cascader1' && item.orgPath) {
await this.getOrgTree()
this.form[item.pformName][item.formName] = item.orgPath.split(':') || null
} else{
this.form[item.pformName][item.formName] = item.value != null?item.value:null;
}
if (item.opctionUrl) {
try {
item.opction = await this.getDictDataForm(item.opctionUrl, item.opctionParams);
} catch (error) {
console.error('Error fetching options:', error);
}
}
return acc;
}, Promise.resolve({}));
})
})
Promise.all(promises).then((results) => {
async showForm() {
await this.$nextTick();
console.log(this.form, '拓展组件form');
console.log(this.formList, '拓展组件formList');
const promises = this.formList.map(async (item) => {
const groupPromises = item.form.map(async (group) => {
await group.children.reduce(async (accPromise, childItem) => {
const acc = await accPromise;
acc[childItem.formName] = null;
this.form[childItem.pformName].id = childItem.id;
if (childItem.itemType === 'checkbox') {
this.form[childItem.pformName][childItem.formName] = childItem.value || [];
} else if (childItem.itemType === 'cascader1') {
await this.getOrgTree();
let maxId = this.formList.filter(item => item.formId == 'parymemberInfoDto')[0].form[0].children.filter(item => item.formName == 'partyOrgId')[0].opction[0].id;
let orgId = JSON.parse(JSON.stringify(childItem.orgPath.split(':')));
orgId = orgId.slice(orgId.findIndex(item => item === maxId), orgId.length - 1)
this.form[childItem.pformName][childItem.formName] = orgId;
} else {
this.form[childItem.pformName][childItem.formName] = childItem.value != null ? childItem.value : null;
}
if (childItem.opctionUrl) {
try {
childItem.opction = await this.getDictDataForm(childItem.opctionUrl, childItem.opctionParams);
} catch (error) {
console.error('Error fetching options:', error);
}
}
return acc;
}, Promise.resolve({}));
});
return Promise.all(groupPromises);
});
try {
await Promise.all(promises);
console.log('Form processing complete');
} catch (error) {
console.error('Error processing form:', error);
}
},
}).catch((error) => {
console.error('Error fetching options:', error);
});
})
},
async getDictDataForm(url, params) {
try {
const { data } = await this.$http.post(url, params);

57
src/views/components/resiExpand/index.vue

@ -17,9 +17,9 @@
<el-select v-model.trim="form[itemj.id][itemk.formName]" :placeholder="`请选择${itemk.label}`"
size="small" :multiple="itemk.multiple" :collapse-tags="itemk.collapseTags" clearable
:style="{ 'width': itemk.formName == 'specialCategoryCode' ? '183px' : '' }"
class="list_item_width_1" @change="handelChangeSelsect(itemj.id,itemk.formName)">
class="list_item_width_1" @change="handelChangeSelsect(itemj.id,itemk.formName)" :disabled="itemk.disabled">
<el-option v-for="items in itemk.opction" :key="items.value" :label="items.label"
:value="items.value">
:value="items.value" >
</el-option>
</el-select>
</template>
@ -35,18 +35,20 @@
v-model.trim="form[itemj.id][itemk.formName]" clearable>
</el-input>
</template>
<template v-else-if="itemk.itemType == 'inputNum'">
<el-input :placeholder="`请输入${itemk.label}`" size="small" class="list_item_width_1-text"
<template v-else-if="itemk.itemType == 'inputNum'" >
<div style="display:flex">
<el-input :placeholder="`请输入${itemk.label}`" size="small" class="list_item_width_1-text"
:style="{ 'margin-right': itemk.label == '备注' ? '50px' : '' }"
v-model.trim="form[itemj.id][itemk.formName]" clearable
@blur="checkNumberInput(itemj.id, itemk.formName)">
</el-input><span class="u-data-tag"></span>
</el-input><span class="u-data-tag" style="margin-left: 10px;"></span>
</div>
</template>
<template v-else-if="itemk.itemType == 'checkbox'">
<el-checkbox-group size="small" v-model.trim="form[itemj.id][itemk.formName]">
<el-checkbox-group size="small" v-model.trim="form[itemj.id][itemk.formName]" @change="handelChangeCheckBox(itemj)">
<el-checkbox v-for="items in itemk.opction" :label="items.value"
:style="{ 'margin-right': items.label != itemk.label ? '' : '19px' }" :key="items.value"
:value="items.value">{{ items.label }}</el-checkbox>
:value="items.value" :disabled="items.disabled">{{ items.label }}</el-checkbox>
</el-checkbox-group>
</template>
<template v-else-if="itemk.itemType == 'datepicker1' && itemk.showFlag !== '0'">
@ -80,7 +82,7 @@
<script>
import { requestPost, requestGet } from "@/js/dai/request";
import nextTick from "dai-js/tools/nextTick";
export default {
data() {
return {
@ -121,10 +123,6 @@ export default {
chronicDiseaseDto: {
chronicDiseaseCodes: []
},
//
deathDto: {
deathTime: null
},
//
oldPeopleDto: {
oldPeopleCategories:[],
@ -170,7 +168,9 @@ export default {
volunteerDto: {
volunteerCategory: []
},
baseInfoDto:{
deathDate:null
}
},
casProps: {
value: 'id',
@ -206,6 +206,33 @@ export default {
mounted() {
},
methods: {
handelChangeCheckBox(itemJ){
if(itemJ.id === "oldPeopleDto"){
if(this.form.oldPeopleDto.oldPeopleCategories.findIndex(item=>item === "liveAloneFlag") != -1){
itemJ.children[0].opction.forEach(item=>{
if(item.value === "emptyNesterFlag"){
item.disabled = true;
itemJ.children[1].disabled = true;
this.form.oldPeopleDto.resideSituation = 'duju';
this.$forceUpdate();
}
})
}else if(this.form.oldPeopleDto.oldPeopleCategories.findIndex(item=>item === "emptyNesterFlag") != -1){
itemJ.children[0].opction.forEach(item=>{
if(item.value === "liveAloneFlag"){
item.disabled = true;
itemJ.children[1].disabled = true;
this.form.oldPeopleDto.resideSituation = 'kongchao';
this.$forceUpdate()
}
})
}else{
itemJ.children[1].disabled = false;
itemJ.children[0].opction.forEach(item=>{item.disabled = false})
this.$forceUpdate()
}
}
},
handelChangeSelsect(pname,cname){
if(pname === 'specialSupportDto' && cname === 'specialSupportType'){
if(this.form.specialSupportDto.specialSupportType === '2'){
@ -249,8 +276,6 @@ export default {
console.error('Error fetching options:', error);
});
this.getOrgTree()
console.log(this.form, '子组件form');
console.log(this.formList, '子组件formList');
})
},
async getDictDataForm(url, params) {
@ -278,7 +303,7 @@ export default {
if (this.formType === 'add') {
this.form.id = this.form.partyOrgId;
}
// this.$emit('submitExpand', this.form, this.formType)
this.$emit('submitExpand', this.form, this.formType)
},
handlePartyOrgCascadarChange(selectedNode) {
this.form.parymemberInfoDto.partyOrgId = selectedNode[selectedNode.length - 1];

29
src/views/components/resiSearch.vue

@ -290,6 +290,16 @@ export default {
"label": "失智老人",
"value": "DEMENTED_FLAG",
"children": null
},
{
"label": "独居老人",
"value": "LIVE_ALONE_FLAG",
"children": null
},
{
"label": "普通老年人",
"value": "OLD_PEOPLE_FLAG",
"children": null
},
]
},
@ -318,6 +328,14 @@ export default {
"label": "特扶人员",
"value": "SPECIAL_SUPPORT_FLAG",
"children": null
},{
"label": "新阶层人士",
"value": "NEW_STRATUM_FLAG",
"children": null
},{
"label": "流动人员",
"value": "FLOATING_FLAG",
"children": null
}
],
itemList,
@ -410,6 +428,16 @@ export default {
value: "xiejiaorenyuan",
children: null
},
{
label: "统战人员",
value: "tongzhanrenyuan",
children: null
},
{
label: "信访人员",
value: "xinfangrenyaun",
children: null
}
],
careerStatusList: [],
form: {
@ -422,6 +450,7 @@ export default {
ageEnd: '',
integrityScoreFrom: null,//
integrityScoreTo: null,//end
identity:'',
gender: '',
cultureLevel: '',
localResidenceFlag: '',

55
src/views/modules/base/community/communityTable.vue

@ -77,6 +77,10 @@
<el-button :headers="$getElUploadHeaders()" class="diy-button--other" size="small" type="text"
@click="handleExportModule('room')">下载房屋模板</el-button>
</div>
<div class="table-more-btn">
<el-button :headers="$getElUploadHeaders()" class="diy-button--other" size="small" type="text"
@click="handleExportIDCard()">下载电子门牌二维码</el-button>
</div>
<!-- <div
v-if="
showYhymInfo && customerId !== '1535072605621841922'
@ -123,8 +127,8 @@
>社区二维码</el-button
>
</div> -->
<el-button size="small" style="float: right" class="diy-button--white" slot="reference">更多<i
class="el-icon-arrow-down el-icon--right"></i></el-button>
<el-button size="small" style="float: right" class="diy-button--white" slot="reference">更多
<i class="el-icon-arrow-down el-icon--right"></i></el-button>
</el-popover>
</div>
</div>
@ -384,6 +388,7 @@ export default {
}
});
this.getQueryConditions();
},
methods: {
@ -426,6 +431,7 @@ export default {
updateStartDate: this.updateStartDate,
updateEndDate: this.updateEndDate,
};
this.$refs.baobiao.init({
elseParams: {
categoryKeys: ["house_info"],
@ -863,7 +869,52 @@ export default {
}
);
},
//
handleExportIDCard() {
let title = this.agencyObj.label;
title = title + "电子门牌信息";
let url = "/actual/base/communityHouse/downloadZip";
console.log(this.agencyObj)
let params = {
pageSize:this.pageSize,
pageNo:this.pageNo,
level:this.agencyObj.level ,
id:this.agencyObj.id,
ownerName: this.ownerName,
ownerPhone: this.ownerPhone,
rentFlag: this.rentFlag,
purpose: this.purpose,
remark: this.remark,
updateStartDate: this.updateStartDate,
updateEndDate: this.updateEndDate,
sortType:"asc",
neighborHoodId:"",
buildingId:"",
buildingUnitId:"",
houseId:"",
};
// if (this.agencyObj.level === "grid") {
// params.gridId = this.agencyObj.id;
// params.agencyId = "";
// } else {
// params.gridId = "";
// params.agencyId = this.agencyObj.id;
// }
app.ajax.exportFilePost(
url,
params,
(data, rspMsg) => {
console.log(data)
this.download(data, title + ".zip");
},
(rspMsg, data) => {
this.$message.error(rspMsg);
}
);
},
//
handleExportYihuyidang() {
this.yihuyidangDisabled = true;

78
src/views/modules/base/community/roomForm.vue

@ -37,7 +37,7 @@
v-model.trim="dataForm.doorName">
</el-input>
</el-form-item>
<el-form-item label="房屋编码"
<!-- <el-form-item label="房屋编码"
prop="coding"
style="display: block">
<el-input class="u-edit-width-normal"
@ -53,7 +53,7 @@
size="small"
@click="handleCode">生成</el-button>
</el-form-item>
</el-form-item> -->
<!-- <el-form-item label="房屋编码"
prop="houseCode"
@ -63,20 +63,21 @@
v-model.trim="dataForm.houseCode">
</el-input>
</el-form-item> -->
<el-form-item v-if="dataForm.houseQrcodeUrl"
label="二维码"
<el-form-item
label=""
prop="coding"
style="display: block">
<div style="display: flex; align-items:center">
<div class="u-edit-width-normal">
<!-- <div class="u-edit-width-normal">
<img style="margin-left: 30px;width: 200px;"
:src="dataForm.houseQrcodeUrl">
</div>
</div> -->
<!-- -->
<a style="margin-left: 10px;"
class="div-table-button--blue"
class="div-table-button--blue"
:href="dataForm.houseQrcodeUrl"
target="_blank"><i class="el-icon-download"></i>下载</a>
target="_blank" @click="downloadQR"><i class="el-icon-download"></i>下载电子门牌二维码</a>
</div>
</el-form-item>
@ -283,23 +284,66 @@ export default {
},
downloadQR(){
let title = "房屋二维码";
console.log(this.houseId)
let url = "/actual/base/communityHouse/createHouseQrcode/";
console.log(url)
let params={
id:this.houseId
}
app.ajax.exportFilePost(
url,
params,
(data, rspMsg) => {
console.log(data)
this.download(data, title + ".png");
},
(rspMsg, data) => {
this.$message.error(rspMsg);
}
);
},
//
download(data, downFileName) {
if (!data) {
return;
}
var csvData = new Blob([data]);
if (window.navigator && window.navigator.msSaveOrOpenBlob) {
window.navigator.msSaveOrOpenBlob(csvData, downFileName);
}
// for Non-IE (chrome, firefox etc.)
else {
var a = document.createElement("a");
document.body.appendChild(a);
a.style = "display: none";
var url = window.URL.createObjectURL(csvData);
a.href = url;
a.download = downFileName;
a.click();
a.remove();
window.URL.revokeObjectURL(url);
}
},
async loadHouseInfo () {
const url = "/actual/base/communityHouse/getClearHouseDeatilById/" + this.houseId
let params = {}
const { data, code, msg } = await requestPost(url, params)
console.log(data)
if (code === 0) {
// debugger
this.dataForm = { ...data }
this.houseType = this.dataForm.houseType
this.purpose = this.dataForm.purpose
this.rentFlag = parseInt(this.dataForm.rentFlag)
} else {
this.$message.error(msg)
}
@ -480,9 +524,9 @@ export default {
doorName: [
{ required: true, message: '门牌号不能为空', trigger: 'blur' }
],
coding: [
{ required: true, message: '房屋编码不能为空', trigger: 'blur' }
],
// coding: [
// { required: true, message: '', trigger: 'blur' }
// ],
houseType: [
{ required: true, message: '房屋类型不能为空', trigger: 'blur' }
],

12
src/views/modules/base/organization/organization.vue

@ -1655,6 +1655,16 @@ export default {
//
async submitPeoDo () {
const targetAgencyIds = this.peoForm.manageScopes.map(innerArray => innerArray[innerArray.length - 1]);
// Set
const result = new Set();
// level agencyId
this.extractLevelAndAgencyId(this.orgOptions[0], targetAgencyIds, result);
// Set
const manageScopeArray = Array.from(result);
const url = "/gov/org/staff/addstaffv2";
const {
peoForm: { orgType },
@ -1674,7 +1684,7 @@ export default {
: orgType == "dept"
? this.currentDepartmentId
: this.currentGridOrgId,
manageScopes:this.peoForm.manageScopes
manageScopes:manageScopeArray
};
const { data, code, msg } = await requestPost(url, params);

75
src/views/modules/base/resi.vue

@ -602,48 +602,6 @@ export default {
this.$refs.myResiSearch.form.categoryKey = categoryKey;
this.$refs.myResiSearch.form.agencyId = agencyId;
}
// if (this.valueb == '') {
// _obj.partyFlag = 1
// this.getTableData(_obj);
// // console.log("this.valueb",this.valueb)
// } if (this.valueb == '') {
// _obj.healthStatus.push('DISABILITY_FLAG');
// this.getTableData(_obj);
// } if (this.valueb == '退') {
// _obj.attentionCrowds.push('VETERAN_FLAG');
// _obj.partyFlag = 1
// this.getTableData(_obj);
// }
// else {
// // categoryKey
// if (Array.isArray(categoryKey) && categoryKey.length) {
// _obj.categoryKey = categoryKey.join(",");
// } else {
// _obj.categoryKey = "";
// }
// // agencyId
// if (Array.isArray(agencyId) && agencyId.length) {
// _obj.agencyId = agencyId[agencyId.length - 1];
// } else {
// _obj.agencyId = "";
// }
// _obj.level = level || "";
// _obj.orgType = level || "";
// _obj = { ..._obj, ...this.searchAgencyObj };
// if (type) {
// this.currentPage = 1;
// }
// console.log("this.valueb", _obj)
// this.getTableData(_obj);
// this.searchForm = _obj;
// // form
// this.$refs.myResiSearch.form.categoryKey = categoryKey;
// this.$refs.myResiSearch.form.agencyId = agencyId;
// }
},
//
// checkSelectable (row, index) {
@ -1199,18 +1157,37 @@ export default {
this.$refs.myResiSearch.form.healthStatus = [];
this.$refs.myResiSearch.form.specialCategoryCodes = [];
this.$refs.myResiSearch.form.partyFlag=null;
if (newVal.params.category === 'SPECIAL_SUPPORT_FLAG' ||newVal.params.category === 'SUBSISTENCE_ALLOWANCE_FLAG'|| newVal.params.category === 'VETERAN_FLAG'|| newVal.params.category === 'ENSURE_HOUSE_FLAG'|| newVal.params.category === 'OLD_PEOPLE_FLAG') {
if (newVal.query.category === 'SPECIAL_SUPPORT_FLAG' ||newVal.query.category === 'SUBSISTENCE_ALLOWANCE_FLAG'|| newVal.query.category === 'VETERAN_FLAG'|| newVal.query.category === 'ENSURE_HOUSE_FLAG'|| newVal.query.category === 'OLD_PEOPLE_FLAG'|| newVal.query.category === 'FERTILE_WOMAN_FLAG' || newVal.query.category === 'FLOATING_FLAG' || newVal.query.category === 'NEW_STRATUM_FLAG' || newVal.query.category === 'permanentFlag') {
this.$refs.myResiSearch.form.attentionCrowds.push(
newVal.params.category
newVal.query.category
);
} else if(newVal.params.category === 'CHRONIC_DISEASE_FLAG' ||newVal.params.category === 'SERIOUS_ILLNESS_FLAG'||newVal.params.category === 'DISABILITY_FLAG'){
} else if(newVal.query.category === 'CHRONIC_DISEASE_FLAG' ||newVal.query.category === 'SERIOUS_ILLNESS_FLAG'||newVal.query.category === 'DISABILITY_FLAG'){
this.$refs.myResiSearch.form.healthStatus.push(
newVal.params.category
newVal.query.category
);
}else if(newVal.params.category === 'SPECIAL_CROWD_FLAG'){
this.$refs.myResiSearch.form.specialCategoryCodes = ["anzhibangjiao","shequjiaozheng","xidurenyuan","buliangqingshaonian","zhaoshizhaohuojingshenbing","xiejiaorenyuan"];
}else if(newVal.params.category === 'PARTY_FLAG'){
}else if(newVal.query.category === 'SQJZ_FLAG' || newVal.query.category === 'AZBJ_FLAG' || newVal.query.category === 'DRUG_FLAG' || newVal.query.category === 'XJRY_FLAG' || newVal.query.category === 'ZSZHJSB_FLAG' || newVal.query.category === 'UNITED_FRONT_FLAG'|| newVal.query.category === 'PETITION_OFFICER_FLAG' || newVal.query.category === 'BLQSN_FLAG'){
let obj = {
SQJZ_FLAG:'shequjiaozheng',
AZBJ_FLAG:'anzhibangjiao',
DRUG_FLAG:'xidurenyuan',
XJRY_FLAG:'xiejiaorenyuan',
ZSZHJSB_FLAG:'zhaoshizhaohuojingshenbing',
UNITED_FRONT_FLAG:'tongzhanrenyuan',
PETITION_OFFICER_FLAG:'xinfangrenyaun',
BLQSN_FLAG:'buliangqingshaonian'
}
this.$refs.myResiSearch.form.specialCategoryCodes = [obj[newVal.query.category]];
}else if(newVal.query.category === 'PARTY_FLAG'){
this.$refs.myResiSearch.form.partyFlag =1;
}else if(newVal.query.category === 'BUILDING_CHIEF_FLAG' || newVal.query.category === 'VOLUNTEER_FLAG' || newVal.query.category === 'UNIT_CHIEF_FLAG' || newVal.query.category ==='PUBLIC_WELFARE_FLAG'){
console.log(newVal.query.category);
this.$refs.myResiSearch.form.identity = newVal.query.category;
}else if(newVal.query.category === 'MASS_FLAG'){
this.$refs.myResiSearch.form.partyFlag = 0;
}else if(newVal.query.category === 'LEAGUE_FLAG'){
this.$refs.myResiSearch.form.partyFlag = 2;
} else if(newVal.query.category === 'UNEMPLOYED_FLAG'){
this.$refs.myResiSearch.form.careerStatus = '0';
}
this.handleSearchFrom();
});

453
src/views/modules/communityParty/comPromotion/index.vue

@ -0,0 +1,453 @@
<template>
<div>
<base-page ref="basePage" :tableData="tableData" :searchParams="searchParams" :tableParams="tableParams" :tableUrl="tableUrl"
:addUrl="addUrl" :editUrl="editUrl" :delUrl="delUrl" :editAuth="editAuth" :delAuth="delAuth" :infoUrl="infoUrl"
:exportUrl="exportUrl" :importUrl="importUrl" :mubanUrl="mubanUrl" :editParams="editParams"
:editFixedParams="editFixedParams" :editElseRules="editElseRules" :editConfig="editConfig" :editParamsDiv="5"
:editBtnName="(item) => '修改'" :formBtnFixed="true" idName="articleId">
<template v-slot:editOperateSup="{ id, formType, info }">
<el-button v-if="formType == 'add'" type="warning" size="small" :disabled="draftBtnDisable"
@click="handleClickDraft(info)">存草稿</el-button>
</template>
<template v-slot:listBtnSup="{ item }">
<el-button v-if="item.statusFlag == 'published' &&
item.agencyId == $store.state.user.agencyId
" @click="handleOfflineShow(item)" type="text" size="small" style="color: #666">下线</el-button>
</template>
<template v-slot:listBtnbefore="{ item }">
<el-button v-if="item.isTop == '1'" v-show="item.statusFlag == 'published'"
@click="handleCancleTopArticle(item, 'cancel_top')" type="text" size="small"
style="color: #fe6252">取消置顶</el-button>
<el-button v-show="item.statusFlag == 'published'" v-else @click="handleTopArticle(item, 'top')" type="text"
size="small" style="color: #22c1c3">置顶</el-button>
</template>
</base-page>
</div>
</template>
<script>
import basePage from "@/views/modules/cpts/base/index";
import { getItemByIdInCascader, collapse } from "@/utils/cascader";
import dateFormat from "dai-js/tools/dateFormat.js";
export default {
data() {
return {
offlineShowed: false,
draftBtnDisable: false,
searchParams: [
{ field: "文章标题", keyName: "title", type: "input" },
{
field: "标签",
keyName: "tagIds",
type: "select",
multiple: true,
optionUrl: "/gov/voice/tag/taglist",
optionUrlParams: {},
optionList: [],
optionCook(list) {
return list.map((item) => ({
label: item.tagName,
value: item.tagId,
}));
},
},
{
field: "状态",
keyName: "statusFlag",
value: "",
type: "select",
optionUrl: "",
optionUrlParams: {},
optionList: [
{
label: "已发布",
value: "published",
},
{
label: "已下线",
value: "offline",
},
],
},
{
field: "发布范围",
keyName: "publishRangeIds",
type: "cascader",
optionUrl: "/gov/org/customeragency/agencygridtree",
optionUrlParams: {
agencyId: this.$store.state.user.agencyId,
},
optionList: [],
optionProps: {
multiple: false,
value: "agencyId",
label: "agencyName",
children: "subAgencyList",
checkStrictly: true,
},
optionCook(obj) {
return [obj];
},
supKeys: ["publishRangeId", "publishRangeType"],
supValues: ["", ""],
handleChangeFn(vals, item) {
const { optionList } = item;
if (vals.length > 0) {
item["supValues"][0] = vals[vals.length - 1];
item["supValues"][1] = getItemByIdInCascader(
optionList,
vals,
"agencyId",
"subAgencyList"
)[vals.length - 1]["level"];
item["supValues"][1] =
item["supValues"][1] == "grid" ? "grid" : "agency";
} else {
item["supValues"][0] = "";
item["supValues"][1] = "";
}
},
},
{
field: "发布时间",
keyName: "publishTime",
type: "date-range",
supKeys: ["startDate", "endDate"],
supValues: ["", ""],
},
],
tableParams: [
{ field: "序号", keyName: "", type: "no" },
{ field: "文章标题", keyName: "title", type: "text" },
{
field: "标签",
keyName: "tagNameList",
type: "array",
arrayDiv: "、",
},
{ field: "状态", keyName: "statusFlagName", type: "text" },
{ field: "发布单位", keyName: "publisherName", type: "text" },
{ field: "发布时间", keyName: "publishDate", type: "text" },
{
field: "发布范围",
keyName: "publishRangeDesc",
type: "text",
},
{ field: "置顶", keyName: "isTopName", type: "text" },
{ field: "点赞数", keyName: "likeCount", type: "text" },
{ field: "转发量", keyName: "forwardCount", type: "text" },
],
tableUrl: "/gov/voice/article/articleListV2",
mubanUrl: "",
importUrl: "",
exportUrl: "",
addUrl: "/gov/voice/article/addOrSaveDraft",
editUrl: "/gov/voice/article/updateArticle",
infoUrl: "/gov/voice/article/detailV2",
delUrl: "/gov/voice/article/delete批量",
editAuth(item) {
return item.statusFlagName == "已发布";
},
delAuth(item) {
return item.statusFlagName == "已下线";
},
editParams: [
{
field: "文章标题",
keyName: "title",
type: "input",
maxlength: 50,
editDisabled: true,
rules: [
{
required: true,
message: "文章标题不能为空",
trigger: "blur",
},
],
},
{
field: "封面图片",
keyName: "imgArr",
type: "upload",
limit: 1,
listType: "picture-card",
editDisabled: true,
rules: [],
value: () => [],
uploadUrl: window.SITE_CONFIG["apiURL"] + "/oss/file/article/upload",
supKeys: ["imgUrlArr", "imgUrl"],
supValues: [() => [], ""],
beforeImgUpload(file, item, that) {
console.log(file);
const isLt1M = file.size / 1024 / 1024 < 10;
const srcType = file.type;
if (!isLt1M) {
that.$message.error("上传文件大小不能超过 10MB!");
return false;
}
if (srcType.indexOf("image") == -1) {
that.$message.error("仅限图片格式");
return false;
}
return true;
},
},
{
field: "发布范围",
keyName: "gridIdList",
type: "cascader",
value: () => [],
supKeys: ["publishRangeDesc"],
supValues: [""],
optionUrl: "/gov/org/customeragency/agencygridtree",
optionUrlParams: {
agencyId: this.$store.state.user.agencyId,
},
optionList: [],
optionProps: {
multiple: true,
value: "agencyId",
label: "agencyName",
children: "subAgencyList",
checkStrictly: false,
emitPath: false,
},
optionCook(obj) {
return [obj];
},
handleChangeFn(vals, item, that) {
console.log("handleChangeFn", vals);
const { optionList } = item;
const optionPlaneList = collapse(optionList, "subAgencyList");
if (vals.length > 0) {
let selectedList = vals.map(
(v) =>
getItemByIdInCascader(
optionPlaneList,
[v],
"agencyId",
"subAgencyList"
)[0]
);
console.log("handleChangeFn", selectedList);
let selectedFilterList = selectedList.filter(
(a) => a.level == "grid"
);
that.fmData[item["keyName"]] = selectedFilterList.map(
(a) => a.agencyId
);
that.fmData[item["supKeys"][0]] = selectedFilterList
.map((a) => a.agencyName)
.join("、");
} else {
}
},
rules: [
{
required: true,
message: "发布范围不能为空",
trigger: "blur",
},
],
},
{
field: "发布时间",
keyName: "publishDate",
type: "date",
value: dateFormat(new Date(), "yyyy-MM-dd"),
pickerOptions: {
disabledDate(time) {
return time.getTime() > Date.now();
},
},
rules: [
{
required: true,
message: "发布时间不能为空",
trigger: "blur",
},
],
},
{
field: "发布单位",
keyName: "publisher",
type: "select",
optionUrl: "/gov/voice/article/publishagencylist",
optionList: [],
optionType: "group",
supKeys: ["publisherName", "publisherType"],
supValues: ["", ""],
optionCook(data) {
let ret = [];
const { agencyDeptList, agencyGridList, agencyId, agencyName } =
data;
if (agencyId) {
ret.push({
label: "以组织名义",
optionList: [
{
label: agencyName,
value: agencyId,
type: "agency",
},
],
});
}
if (Array.isArray(agencyDeptList) && agencyDeptList.length > 0) {
ret.push({
label: "以部门名义",
optionList: [
...agencyDeptList.map((d) => ({
label: d.agencyDeptName,
value: d.departmentId,
type: "department",
})),
],
});
}
if (Array.isArray(agencyGridList) && agencyGridList.length > 0) {
ret.push({
label: "以网格名义",
optionList: [
...agencyGridList.map((d) => ({
label: d.agencyGridName,
value: d.gridId,
type: "grid",
})),
],
});
}
return ret;
},
handleChangeFn(vals, item, that) {
const { optionList } = item;
let opts = [];
optionList.forEach((g) => {
opts = [...opts, ...g.optionList];
});
let publisher = opts.find((p) => vals == p.value);
that.fmData[item["supKeys"][0]] = publisher.label;
that.fmData[item["supKeys"][1]] = publisher.type;
},
rules: [
{
required: true,
message: "发布单位不能为空",
trigger: "blur",
},
],
},
{
field: "文章标签",
keyName: "tagNameList",
type: "select",
multiple: true,
filterable: true,
allowCreate: true,
optionUrl: "/gov/voice/tag/taglist",
optionUrlParams: {},
optionList: [],
optionCook(list) {
return list.map((item) => ({
label: item.tagName,
value: item.tagName,
}));
},
},
{
field: "内容",
keyName: "content",
type: "rich-text",
rules: [
{
required: true,
message: "内容不能为空",
trigger: "blur",
},
],
},
{
field: "置顶",
keyName: "isTop",
type: "switch",
activeValue: "1",
inactiveValue: "0",
},
{
field: "消息推送",
keyName: "isPush",
type: "checkbox",
optionList:"是否通过公众号推送给社区居民"
},
],
editFixedParams: {
type: "article",
},
editElseRules: {},
editConfig: {
confirmBtnName: "发布",
cookInfoFn(data) {
if (data.richTextFlag == "0") {
data.content = data.contentList
.map((item) => {
if (item.contentType == "text") {
return `<p>${item.content}</p>`;
} else if (item.contentType == "img") {
return `<img src="${item.content}" style="max-width:100%"></img>`;
} else if (item.contentType == "video") {
return `<video src="${item.content}" style="max-width:100%" controls></video>`;
} else if (item.contentType == "file") {
return `<a src="${item.content}" target="_blank">附件:${item.fileName}</a>`;
}
})
.join(" ");
} else {
data.content = data.contentList[0].content;
}
if (data.imgUrl) {
data.imgArr = [
{
name: "封面",
url: data.imgUrl,
},
];
data.imgUrlArr = [data.imgUrl];
}
return data;
},
beforeSubmit(formType, fmData, that) {
if (fmData.isTop == "1" && !fmData.imgUrl) {
that.$message.error("请上传封面图片");
return false;
}
return true;
},
},
formData: {},
showAddImage: false,
uploadUlr: window.SITE_CONFIG["apiURL"] + "/oss/file/uploadvariedfile",
replayImgList: [],
hideUploadBtn: false,
selType: "top",
selArticleId: "",
selImgUrl: "",
};
},
components: { basePage }
}
</script>
<style lang="scss"></style>

2
src/views/modules/communityParty/regionalParty/units.vue

@ -48,7 +48,7 @@
</el-form-item>
<el-form-item label="联系人" prop="contact">
<el-input
v-model.trim="formData.contact"
v-model.trim="formData.contactName"
class="u-item-width-normal"
size="small"
clearable

13
src/views/modules/communityParty/regionalParty/unitsForm.vue

@ -200,7 +200,7 @@ export default {
unitName: "",
serviceMatterList: [],
type: "",
contact: "",
principalId: "",
contactMobile: "",
memberCount: 0,
remark: "", //500
@ -237,15 +237,16 @@ export default {
const { user } = this.$store.state;
this.agencyId = user.agencyId;
this.getStafflist()
},
methods: {
handelChangeStaff(val){
if(val){
this.formData.contactMobile = this.dicts.stafflist.filter(item=>item.staffId === val)[0].mobile
this.formData.contactMobile = this.dicts.stafflist.filter(item=>item.staffId === val)[0].mobile;
this.formData.contact = val;
}else{
this.formData.contactMobile = ''
this.formData.contactMobile = '';
this.formData.contact = '';
}
},
getStafflist() {
@ -511,7 +512,7 @@ export default {
unitName: "",
serviceMatterList: [],
type: "",
contact: "",
principalId: "",
contactMobile: "",
memberCount: 0,
remark: "", //500
@ -544,7 +545,7 @@ export default {
],
type: [{ required: true, message: "分类不能为空", trigger: "blur" }],
contact: [
principalId: [
{ required: true, message: "联系人不能为空", trigger: "blur" },
],
contactMobile: [

9
src/views/modules/communityService/fuwuzhaoren/addForm.vue

@ -6,7 +6,7 @@
<el-form-item label="服务类别" prop="categoryCode" label-width="150px">
<el-cascader v-model.trim="formData.categoryCode" :options="demandOptions"
:props="{ label: 'categoryName', value: 'categoryCode', children: 'childCateList' }" clearable
size="small" class="u-item-width-normal"></el-cascader>
size="small" class="u-item-width-normal" @change="handelChangeCategoryCode"></el-cascader>
</el-form-item>
<el-form-item label="服务事项" prop="serviceName" label-width="150px"
:class="{ 'form-item': source === 'visiual' }" style="display: block">
@ -383,6 +383,13 @@ export default {
},
methods: {
handelChangeCategoryCode(val){
if(val[0] === '1041'){
this.serviceOptions.push({label:'公益岗',value:'public_welfare_post'})
}else{
this.serviceOptions = this.serviceOptions.filter(item=>item.value!='public_welfare_post')
}
},
handelDisabledRules(v) {
if (!v) {
delete this.dataRule.resiSearchTagId;

12
src/views/modules/communityService/fuwuzhaoren/personList.vue

@ -97,11 +97,12 @@
</div>
<div class="div_btn">
<el-button type="primary" size="small" class="diy-button--blue" @click="onMessagePush">公众号消息推送</el-button>
<el-button type="primary" size="small" class="diy-button--blue" @click="handleIncrementServeTimes">标记享受服务人员</el-button>
<el-button type="primary" size="small" class="diy-button--blue" @click="handleSearch">查询</el-button>
</div>
<div class="m-table">
<div class="m-table">
<!--表格-->
<el-table
:data="personList"
@ -162,6 +163,10 @@
prop="serveTimes"
label="享受服务次数">
</el-table-column>
<el-table-column
prop=""
label="公众号消息推送">已推送
</el-table-column>
</el-table>
</div>
@ -293,7 +298,10 @@ export default {
//
this.handleSearch();
},
//
onMessagePush(){
alert("哥哥,点我")
},
/**
* 组织选择触发事件
* @returns {Promise<void>}

10
src/views/modules/communityService/gangweizhaoren/personList.vue

@ -97,6 +97,7 @@
</div>
<div class="div_btn">
<el-button type="primary" size="small" class="diy-button--blue" @click="onMessagePush">公众号消息推送</el-button>
<el-button type="primary" size="small" class="diy-button--blue" @click="handleIncrementServeTimes">标记享受服务人员</el-button>
<el-button type="primary" size="small" class="diy-button--blue" @click="handleSearch">查询</el-button>
</div>
@ -162,6 +163,10 @@
prop="serveTimes"
label="享受服务次数">
</el-table-column>
<el-table-column
prop=""
label="公众号消息推送">已推送
</el-table-column>
</el-table>
</div>
@ -293,7 +298,10 @@ export default {
//
this.handleSearch();
},
//
onMessagePush() {
alert("哥哥,点我")
},
/**
* 组织选择触发事件
* @returns {Promise<void>}

23
src/views/modules/communityService/gxxq/addForm.vue

@ -339,7 +339,7 @@ export default {
{ max: 1000, message: "不能超出1000个字符", trigger: "blur" },
],
resiSearchTagId: [
{ required: false, message: "指派人员不能为空", trigger: "bulr" },
{ required: true, message: "指派人员不能为空", trigger: "bulr" },
],
categoryCode: [
{ required: true, message: "需求分类不能为空", trigger: "bulr" },
@ -365,12 +365,12 @@ export default {
showLabelForm: false,
codeFilters: {
'1038': ['party_unit', 'community_org'],
'1039': ['party_unit', 'community_org'],
'1038': ['party_unit', 'community_org','public_welfare_post'],
'1039': ['party_unit', 'community_org', 'public_welfare_post'],
'1040': ['party_unit', 'community_org'],
'1041': ['party_unit', 'community_org', 'publicWelfare'],
'1042': ['party_unit', 'community_org', 'publicWelfare'],
'1043': ['party_unit', 'community_org', 'publicWelfare'],
'1041': ['party_unit', 'community_org', 'public_welfare_post'],
'1042': ['party_unit', 'community_org'],
'1043': ['party_unit', 'community_org'],
'1044': ['party_unit', 'community_org'],
},
};
@ -383,13 +383,6 @@ export default {
this.formData.serviceTimeEnd = arrayTemp[0] + " 23:59:59";
}
},
"formData.assignFlag"(newValue) {
if (newValue === 1) {
this.dataRule.resiSearchTagId[0].required = true;
} else {
this.dataRule.resiSearchTagId[0].required = false;
}
},
},
components: { labelForm },
created() {},
@ -431,7 +424,7 @@ export default {
this.newFormData.serviceTimeEnd = data.assignInfo.serviceTimeEnd;
this.newFormData.serverOrgType = data.assignInfo.serverOrgType;
this.newFormData.serverOrgId = data.assignInfo.serverOrgId;
this.newFormData.noticeApproches = data.assignInfo.noticeApproches;
this.newFormData.noticeApproches = data.assignInfo.noticeApproches || [];
for (let i in data.assignInfo.serviceScopeList) {
this.newFormData.serviceScopeList.push(
@ -497,9 +490,7 @@ export default {
handelChangeCategoryCode() {
this.serviceOptions = [...this.originalServiceOptions];
const codeFilters = this.codeFilters;
console.log(this.serviceOptions);
const checkedCode = this.$refs['myCategoryCode'].getCheckedNodes()[0].parent.value;
console.log(checkedCode);
if (codeFilters[checkedCode] && Array.isArray(codeFilters[checkedCode])) {
this.serviceOptions = this.serviceOptions.filter(item => codeFilters[checkedCode].includes(item.value));
} else {

20
src/views/modules/communityService/gxxq/index.vue

@ -146,13 +146,13 @@
/>
<el-table-column
label="指派服务"
label="需求状态"
prop="assignFlag"
fixed="left"
align="center"
>
<template slot-scope="scope">
{{ scope.row.assignFlag == "0" ? "未指派" : "已指派" }}
{{ scope.row.assignFlag == "0" ? "未指派" : (scope.row.assignFlag == "1" ? "已指派" : "已完成") }}
</template>
</el-table-column>
<el-table-column
@ -166,7 +166,7 @@
<el-button @click="handleEdit(scope.row)" size="small" type="text"
>查看</el-button
>
<el-button
<el-button v-if="scope.row.assignFlag != 2"
style="margin-right: 10px"
@click="handleAdd(scope.row, 'edit')"
size="small"
@ -178,7 +178,7 @@
title="删除之后无法回复,确认删除?"
@onConfirm="handleDel(scope.row)"
>
<el-button size="small" type="text" slot="reference"
<el-button size="small" type="text" slot="reference" v-if="scope.row.assignFlag != 2"
>删除</el-button
>
</el-popconfirm>
@ -293,13 +293,17 @@ export default {
},
statusArray: [
{
value: 1,
label: "已指派服务",
value: 0,
label: "未指派",
},
{
value: 0,
label: "未指派服务",
value: 1,
label: "已指派",
},
{
value: 2,
label: "已完成",
}
],
endPickerOptions: {
disabledDate: endDisabledDate,

10
src/views/modules/communityService/jinengzhaoren/personList.vue

@ -97,6 +97,7 @@
</div>
<div class="div_btn">
<el-button type="primary" size="small" class="diy-button--blue" @click="onMessagePush">公众号消息推送</el-button>
<el-button type="primary" size="small" class="diy-button--blue" @click="handleIncrementServeTimes">标记享受服务人员</el-button>
<el-button type="primary" size="small" class="diy-button--blue" @click="handleSearch">查询</el-button>
</div>
@ -162,6 +163,10 @@
prop="serveTimes"
label="享受服务次数">
</el-table-column>
<el-table-column
prop=""
label="公众号消息推送">已推送
</el-table-column>
</el-table>
</div>
@ -293,7 +298,10 @@ export default {
//
this.handleSearch();
},
//
onMessagePush() {
alert("哥哥,点我")
},
/**
* 组织选择触发事件
* @returns {Promise<void>}

3
src/views/modules/communityService/labelConfig/addForm.vue

@ -231,10 +231,12 @@
</p>
<div class="div_btn">
<el-button size="small" @click="handleCancle"> </el-button>
<el-button type="success" @click="handlePreview">预览</el-button>
<el-button size="small" type="primary" @click="handleComfirm"
> </el-button
>
</div>
</div>
</template>
@ -675,6 +677,7 @@ export default {
this.formState = false
this.handleClickAddRow();
},
},
props: {},
computed: {},

47
src/views/modules/communityService/measure/index.vue

@ -213,17 +213,9 @@
>指派</el-button
>
<!-- v-if="scope.row.status === 'assigned' || scope.row.status === 'have_order'" -->
<template
v-if="
scope.row.reportType == 'self_help' &&
scope.row.serviceShowFlag
"
>
<template v-if="scope.row.status === 'assigned' || scope.row.status === 'have_order'">
<el-button
v-if="
scope.row.serviceType !== 'volunteer' &&
scope.row.status !== 'finished'
"
v-if="scope.row.status !== 'finished'"
type="text"
size="small"
@click="handleFinish(scope.row, 'finish')"
@ -239,8 +231,8 @@
"
type="text"
size="small"
@click="handleFinish(scope.row, 'finish')"
>完成情况</el-button
@click="handleFinish(scope.row, 'finishNoEvaluate')"
>评价</el-button
>
</template>
<template v-if="scope.row.reportType != 'self_help'">
@ -538,7 +530,8 @@
<template
v-if="
(addType == 'finish' && form.reportType != 'self_help') ||
(addType == 'look' && form.status == 'finished')
(addType == 'look' && form.status == 'finished')||
(addType == 'finishNoEvaluate' && !form.evaluateFlag)
"
>
<el-form-item label="实际服务时间" prop="serviceStartTime">
@ -546,7 +539,7 @@
v-model.trim="finishServiceTime"
class="u-item-width-normal"
clearable
:disabled="disabled && addType != 'finish'"
:disabled="disabled && addType != 'finish' || (addType === 'finishNoEvaluate')"
type="datetimerange"
range-separator="至"
start-placeholder="开始日期"
@ -574,7 +567,6 @@
<el-rate
v-model.trim="form.score"
:allow-half="true"
:disabled="disabled && addType != 'finish'"
></el-rate>
</el-form-item>
<el-form-item
@ -582,12 +574,19 @@
label-width="150px"
style="display: block"
prop="attachments"
v-if="addType != 'finishNoEvaluate'"
>
<UploadImages :fileList="form.attachments" @change="(val) => form.attachments = val" :limit="3"/>
</el-form-item>
<el-form-item
label="上传图片"
label-width="150px"
style="display: block"
prop="attachments"
v-else
>
<el-image :src="item.url" v-for="(item,index) in form.finishAttachments" :key="index" ></el-image>
</el-form-item>
<el-form-item label="备注" prop="finishDesc">
<el-input
v-model.trim="form.finishDesc"
@ -909,6 +908,7 @@ export default {
currDemandId: "",
infoAddType: "look",
detailShow: false,
detailObj:{}
};
},
computed: {
@ -1065,9 +1065,14 @@ export default {
if (addType == "finish") {
if (row.serviceStartTime)
this.finishServiceTime = [row.serviceStartTime, row.serviceEndTime];
this.form.finishResult = "resolved";
this.form.score = 5;
this.form.finishResult = "resolved";
this.form.score = 5;
}
if(addType == 'finishNoEvaluate'){
this.finishServiceTime = [row.serviceStartTime, row.serviceEndTime];
this.form.finishResult = row.finishResult;
this.form.finishDesc = row.finishDesc;
this.form.finishAttachments = row.finishAttachments;
}
if (addType == "appoint" && row.serviceType) {
const type = row.serviceType == "social_org" ? "add_demand" : "";

16
src/views/modules/communityService/policy/addPolicy.vue

@ -150,6 +150,18 @@
<span> <i class="el-icon-plus"></i> 按标签查找 </span>
</el-button>
</el-form-item>
<el-form-item
style="display: block"
label="微信公众号"
:required="true"
label-width="150px"
>
<el-switch
v-model="value"
active-color="#409EFF"
inactive-color="#ff4949">
</el-switch>
</el-form-item>
<el-form-item label="指派服务" label-width="150px">
<el-switch
:active-value="1"
@ -342,7 +354,8 @@ export default {
// statRuleList: []
// }
// ],
//
value: true,
policyLevelArray: [],
//
@ -546,6 +559,7 @@ export default {
//
handleClickLabel() {
this.showLabelForm = true;
//refs访domclearValidate
this.$refs['ref_form'].clearValidate('resiSearchTagId')
this.$nextTick(() => {
this.$refs["ref_label_form"].initForm("info");

11
src/views/modules/communityService/policy/personList.vue

@ -122,6 +122,13 @@
</div>
<div class="div_btn">
<el-button
type="primary"
size="small"
class="diy-button--red"
@click="handleIncrementServeTimes"
>公众号消息推送</el-button
>
<el-button
type="primary"
size="small"
@ -167,6 +174,8 @@
</el-table-column>
<el-table-column prop="serveTimes" label="享受服务次数">
</el-table-column>
<el-table-column prop="" width="100" label="公众号消息推送" >已推送
</el-table-column>
</el-table>
</div>
@ -461,14 +470,12 @@ export default {
<style lang="scss" scoped>
@import "@/assets/scss/modules/management/form-main.scss";
.btn-add-rule {
margin-left: 150px;
display: flex;
justify-content: flex-start;
margin-bottom: 20px;
}
.item_width_short {
width: 380px;
}

14
src/views/modules/communityService/policy/policyList.vue

@ -216,7 +216,17 @@
<span>{{ scope.row.expiredFlag ? "已过期" : "未过期" }}</span>
</template>
</el-table-column>
<el-table-column
prop="createdTimeStart"
align="center"
width="100"
label="政策发布时间"
:show-overflow-tooltip="true"
>
<template slot-scope="scope">
<span>{{ scope.row.createdTimeStart }}</span>
</template>
</el-table-column>
<el-table-column fixed="right" label="操作" align="center" width="220">
<template slot-scope="scope">
<el-button @click="handleDetail(scope.row)" type="text" size="small"
@ -502,6 +512,7 @@ export default {
//-
const url = "/governance/policy/policyExport";
const { pageSize, pageNo, formData } = this;
axios({
url: window.SITE_CONFIG["apiURL"] + url,
method: "post",
@ -638,7 +649,6 @@ export default {
pageNo,
...formData,
});
console.log(this.formData);
this.tableLoading = false;
if (code === 0) {
this.total = data.total || 0;

13
src/views/modules/communityService/wennuanzhaoren/personList.vue

@ -99,7 +99,7 @@
</div>
<div class="div_btn">
<!-- <el-button type="primary" size="small" class="diy-button--blue" @click="handleExport">导出</el-button> -->
<el-button type="primary" size="small" class="diy-button--blue" @click="onMessagePush">公众号消息推送</el-button>
<el-button type="primary" size="small" class="diy-button--blue" @click="handleIncrementServeTimes">标记享受服务人员</el-button>
<el-button type="primary" size="small" class="diy-button--blue" @click="handleSearch">查询</el-button>
</div>
@ -167,6 +167,10 @@
prop="serveTimes"
label="享受服务次数">
</el-table-column>
<el-table-column
prop=""
label="公众号消息推送">已推送
</el-table-column>
</el-table>
</div>
@ -298,6 +302,10 @@ export default {
//
this.handleSearch();
},
//
onMessagePush() {
alert("哥哥,点我")
},
/**
* 组织选择触发事件
@ -487,7 +495,8 @@ export default {
required: true,
}
}
},
}
</script>

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

@ -186,6 +186,8 @@
{{ scope.row[item.keyName].join(item.arrayDiv || ",") }}
</template>
</el-table-column>
</template>
<el-table-column v-if="operateCol"
@ -302,6 +304,7 @@ export default {
tableParams: {
type: Array,
default: () => [],
},
tableUrl: {
@ -416,7 +419,6 @@ export default {
data () {
return {
tableData: [],
pageNo: 1,
pageSize: window.localStorage.getItem("pageSize") || 20,
total: 1,
@ -425,9 +427,7 @@ export default {
formShow: false,
formTitle: "详情",
formType: "", // list add edit info
ref_search_height: 100,
multipleSelection: [],
};
},

17
src/views/modules/home/index.vue

@ -39,14 +39,14 @@
</div>
</div>
<div class="boxss">
<div style="margin-top: 10px;" @click="handelClickToResi">
<div style="margin-top: 10px;" @click="handelClickToResi({residentCategory:'permanentFlag'})">
<span style="color: #2683DB; font-size: 25px;">{{ pandectData.permanentResiCount }}</span>
<br>
<span style="color: #858585; font-size: 12px;">常住人口</span>
</div>
</div>
<div class="boxss">
<div style="margin-top: 10px;" @click="handelClickToResi">
<div style="margin-top: 10px;" @click="handelClickToResi({residentCategory:'FLOATING_FLAG'})">
<span style="color: #2683DB; font-size: 25px;">{{ pandectData.floatingResiCount }}</span>
<br>
<span style="color: #858585; font-size: 12px;">流动人口</span>
@ -503,7 +503,16 @@ export default {
this.$router.push({
path: obj[item.category],
});
}
} else if(item.msgType == "sys_version_upgrade_publish"){
let { targetId } = item
this.$router.push({ path: `notice-version`, query: { version_id: targetId } });
this.$store.state.contentTabs = this.$store.state.contentTabs.map(item => {
if (item.name === "notice-version") {
return { ...item };
}
return item;
});
}
this.getNoticeData()
},
@ -621,7 +630,7 @@ export default {
handelClickToResi(e){
this.$router.push({
name: "base-resi",
params: {
query: {
category: e.residentCategory || null,
},
});

32
src/views/modules/portrayal/jumin/cpts/staffTag.vue

@ -11,7 +11,7 @@
<el-radio-group v-model.trim="scope.row.value" v-for="(item, index) in scope.row.option"
:key="index" @change="handeleClickRadio(item.value)">
<el-radio :label="item.value" :disabled="formType == 'detail'"><span
style="margin-right: 50px;">{{ item.label
style="margin-right: 50px;" :value="item.value">{{ item.label
}}</span></el-radio>
</el-radio-group>
</el-form-item>
@ -104,6 +104,12 @@ export default {
{
label: '特扶人员',
value: 'specialSupportFlag'
},{
label: '流动人员',
value: 'floatingFlag'
},{
label: '新阶层人士',
value: 'newStratumFlag'
}
]
},
@ -164,11 +170,29 @@ export default {
console.log(error);
}
},
updatedForm() {
updatedForm(val) {
this.formData.tableData[0].value = 0;
if(val){
for (let key in val) {
if (val[key] === 1) {
this.formData.tableData[2].value.push(key);
}else{
this.formData.tableData[2].value = this.formData.tableData[2].value.filter(item => item !== key);
}
}
}
if (this.formType == 'add' || !this.userInfo.baseInfoDto.categoryInfo) return;
const updateValue = (flag, dataIndex) => {
const { tableData } = this.formData;
const valueArray = tableData[dataIndex].value;
if(flag === 'deathFlag'){
if(this.userInfo.baseInfoDto.deathFlag !== 1){
this.formData.tableData[dataIndex].value = valueArray.filter(item => item !== flag);
}else{
valueArray.push(flag)
}
return
}
if (this.userInfo.baseInfoDto.categoryInfo[flag] === 1) {
valueArray.push(flag);
} else {
@ -181,7 +205,6 @@ export default {
this.formData.tableData[0].value = this.userInfo.baseInfoDto.categoryInfo.partyFlag;
//keyindex(formData.tableData)
updateValue('disabilityFlag', 1);
updateValue('deathFlag', 1);
updateValue('seriousIllnessFlag', 1);
updateValue('chronicDiseaseFlag', 1);
updateValue('emptyNesterFlag', 2);
@ -193,10 +216,13 @@ export default {
updateValue('specialSupportFlag', 2);
updateValue('fertileWomanFlag', 2);
updateValue('bereavedPersonFlag', 2);
updateValue('floatingFlag', 2);
updateValue('newStratumFlag', 2);
updateValue('volunteerFlag', 4);
updateValue('buildingChiefFlag', 4);
updateValue('unitChiefFlag', 4);
updateValue('publicWelfareFlag', 4);
updateValue('deathFlag', 1);
},
handeleClickRadio(val) {
if (val === 1) {

16
src/views/modules/portrayal/jumin/index.vue

@ -26,7 +26,7 @@
>
<span>{{ item.name }}</span
><span
v-if="item.id != 'businessRecord' && item.id != 'updateRecord'&& item.id != 'reside' && item.id != 'ext'"
v-if="item.id != 'businessRecord'&&item.id != 'deathDto' && item.id != 'updateRecord'&& item.id != 'reside' && item.id != 'ext'"
:class="{
incomplete: item.filledQty != item.totalQty && index != active,
full: item.filledQty == item.totalQty,
@ -721,7 +721,7 @@ export default {
],
},
{
id: "deathDto",
id: "baseInfoDto",
title: "死亡信息",
scrollId: "death",
children: [
@ -1068,7 +1068,7 @@ export default {
formType: "chronicDiseaseDto",
title: "慢病信息",
},
deathFlag: { formId: "deathDto", formType: "deathDto", title: "死亡" },
deathFlag: { formId: "baseInfoDto", formType: "baseInfoDto", title: "死亡" },
oldPeopleFlag: {
formId: "oldPeopleDto",
formType: "oldPeopleDto",
@ -1104,6 +1104,11 @@ export default {
formType: "volunteerDto",
title: "志愿者",
},
deathDto:{
formId: "baseInfoDto",
formType: "baseInfoDto",
title: "死亡信息",
}
},
};
},
@ -1210,6 +1215,7 @@ export default {
id: "updateRecord",
}
);
const orderIds = ["base", "reside", "ext"];
//
let sortedData = [];
@ -1259,6 +1265,10 @@ export default {
this.resiDetailObj = {};
this.$message.error(res.data.msg);
}
if(this.resiDetailObj.baseInfoDto.deathFlag){
this.menuList.push({name:'死亡信息',id:'deathDto'});
this.expandList.push({title:'死亡信息',scrollId:'deathDto',children:[{label:'死亡时间',value:this.resiDetailObj.baseInfoDto.deathDate}]})
}
})
.catch((err) => {
console.log(err);

6
src/views/modules/shequzhili/tuceng/yingji/zizuzhi/addForm.vue

@ -343,9 +343,11 @@ export default {
},
handelChangeStaff(val){
if(val){
this.formData.principalPhone = this.stafflist.filter(item=>item.name === val)[0].mobile
this.formData.principalPhone = this.stafflist.filter(item=>item.name === val)[0].mobile;
this.formData.principalId= this.stafflist.filter(item=>item.name === val)[0].staffId;
}else{
this.formData.principalPhone = ''
this.formData.principalPhone = '';
this.formData.principalId = null;
}
},
async getDemandOptions() {

Loading…
Cancel
Save