mk 1 year ago
parent
commit
60f70078d9
  1. BIN
      src/assets/images/home/gridGreen.png
  2. BIN
      src/assets/images/home/gridRed.png
  3. BIN
      src/assets/images/home/gridYellow.png
  4. 24
      src/assets/scss/pages/resiAdd.scss
  5. 3
      src/components/GridTree/nodeWrap.vue
  6. 4
      src/utils/desensitization.js
  7. 9
      src/views/components/addResi.vue
  8. 6
      src/views/components/editResi.vue
  9. 26
      src/views/components/resiExpand/index.vue
  10. 88
      src/views/dataBoard/overview/components/ResourceScheduling.vue
  11. 2
      src/views/dataBoard/renfang/house/list.vue
  12. 12
      src/views/modules/base/organization/organization.vue
  13. 2
      src/views/modules/communityParty/regionalParty/units.vue
  14. 17
      src/views/modules/communityParty/regionalParty/unitsForm.vue
  15. 11
      src/views/modules/communityService/gxxq/addForm.vue
  16. 11
      src/views/modules/home/index.vue
  17. 12
      src/views/modules/portrayal/jumin/index.vue

BIN
src/assets/images/home/gridGreen.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.1 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
src/assets/images/home/gridRed.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
src/assets/images/home/gridYellow.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.1 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

24
src/assets/scss/pages/resiAdd.scss

@ -52,18 +52,18 @@ h5 {
color:#ff5107 ;
}
}
.font-color-blue{
::v-deep .el-form-item__label{
color:#3876f2;
position: relative;
&::before{
content: '*';
position: absolute;
top: 0px;
left: 16px;
}
}
}
// .font-color-blue{
// ::v-deep .el-form-item__label{
// color:#3876f2;
// position: relative;
// &::before{
// content: '*';
// position: absolute;
// top: 0px;
// left: 16px;
// }
// }
// }
.font-color-blue2{
::v-deep .el-form-item__label{
&::before{

3
src/components/GridTree/nodeWrap.vue

@ -263,16 +263,19 @@ export default {
@include lastLevel;
background-image: url(~@/assets/images/home/gridGreen.png);
background-repeat: no-repeat;
background-size: 100% 100%;
}
.dyzxhRed {
@include lastLevel;
background-image: url(~@/assets/images/home/gridRed.png);
background-repeat: no-repeat;
background-size: 100% 100%;
}
.dyzxhYellow {
@include lastLevel;
background-image: url(~@/assets/images/home/gridYellow.png);
background-repeat: no-repeat;
background-size: 100% 100%;
}
.lxjt {
@include spanLevel;

4
src/utils/desensitization.js

@ -1,6 +1,6 @@
export default function desensitizeSubstring(inputString, start, end) {
if (!inputString) {
return ''
if (!inputString||inputString.length<11) {
return '--'
}
if (end >= inputString.length) {
end = inputString.length - 1

9
src/views/components/addResi.vue

@ -162,7 +162,6 @@
</el-button>
</div>
<div class="flex_box">
<el-form-item label="人房关系" class="font-color-blue flex_item_width1">
<el-select v-model.trim="form.resideInfoDtos[index].resiHouseRel" placeholder="请选择"
size="small" class="list_item_width_1"
@ -611,7 +610,7 @@ export default {
},
{
label: "高龄补助",
check:'fourFont',
// check:'fourFont',
itemType: "inputNum",
formName: "oldSubsidy",
},
@ -866,7 +865,7 @@ export default {
},
{//2
label: "子女性别",
check:'fourFont',
// check:'fourFont',
itemType: "select1",
formName: "childGender",
opction: [
@ -882,7 +881,7 @@ export default {
},
{
label: "子女死亡日期",
check:'sixFont',
// check:'sixFont',
itemType: "datepicker1",
formName: "certificateDate",
opction: [],
@ -898,7 +897,7 @@ export default {
},
{
label: "子女伤残等级",
check:'sixFont',
// check:'sixFont',
itemType: "select1",
formName: "childDisabilityLevel",
opctionUrl: 'sys/dict/data/dictlist',

6
src/views/components/editResi.vue

@ -1129,7 +1129,7 @@ export default {
label: "高龄补助",
itemType: "inputNum",
formName: "oldSubsidy",
check:'fourFont',
// check:'fourFont',
pformName: "oldPeopleDto",
},
],
@ -1406,7 +1406,6 @@ export default {
//2
label: "子女性别",
itemType: "select1",
check:'fourFont',
formName: "childGender",
pformName: "specialSupportDto",
opction: [
@ -1423,7 +1422,6 @@ export default {
{
label: "子女死亡日期",
itemType: "datepicker1",
check:'sixFont',
formName: "childDeathDate",
pformName: "specialSupportDto",
opction: [],
@ -1431,7 +1429,6 @@ export default {
{
label: "子女伤残类别",
itemType: "select1",
check:'sixFont',
formName: "childDisabilityCategoryCode",
opctionUrl: "sys/dict/data/dictlist",
pformName: "specialSupportDto",
@ -1441,7 +1438,6 @@ export default {
{
label: "子女伤残等级",
itemType: "select1",
check:'sixFont',
pformName: "specialSupportDto",
formName: "childDisabilityLevel",
opctionUrl: "sys/dict/data/dictlist",

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

@ -17,7 +17,7 @@
<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">
class="list_item_width_1" @change="handelChangeSelsect(itemj.id,itemk.formName)">
<el-option v-for="items in itemk.opction" :key="items.value" :label="items.label"
:value="items.value">
</el-option>
@ -206,6 +206,15 @@ export default {
mounted() {
},
methods: {
handelChangeSelsect(pname,cname){
if(pname === 'specialSupportDto' && cname === 'specialSupportType'){
if(this.form.specialSupportDto.specialSupportType === '2'){
this.formList[0].children[4].check = 'sixFont'
}else{
this.formList[0].children[4].check = null;
}
}
},
checkNumberInput(itemj, itemk) {
if (this.form[itemj][itemk]) {
if (isNaN(this.form[itemj][itemk])) {
@ -256,7 +265,20 @@ export default {
this.$emit('hideExpand', this.formType)
},
handleClickSUbmitExpand() {
this.$emit('submitExpand', this.form, this.formType)
console.log(this.formList);
console.log(this.form);
this.formList.forEach((group) => {
group.children.forEach((item) => {
if (item.check && !this.form[group.id][item.formName]) {
this.$message.error(`${item.label}不能为空`);
throw new Error(`${item.label}不能为空`);
}
});
});
if (this.formType === 'add') {
this.form.id = this.form.partyOrgId;
}
// this.$emit('submitExpand', this.form, this.formType)
},
handlePartyOrgCascadarChange(selectedNode) {
this.form.parymemberInfoDto.partyOrgId = selectedNode[selectedNode.length - 1];

88
src/views/dataBoard/overview/components/ResourceScheduling.vue

@ -1,74 +1,73 @@
<template>
<div>
<el-dialog
:before-close="handleClose"
:modal="true"
:modal-append-to-body="false"
:visible.sync="dialogVisible"
class="dissatisfied-detail"
title=""
width="1366px"
>
<el-dialog :before-close="handleClose" :modal="true" :modal-append-to-body="false" :visible.sync="dialogVisible"
class="dissatisfied-detail" title="" width="1366px">
<div class="content">
<div class="main-title main-title2">
<Title text="资源调度"/>
<Title text="资源调度" />
</div>
<div class="contents">
<el-row :gutter="30">
<el-col :span="5">
<div class="tree">
<el-tree
:data="data"
:default-expand-all="true"
:props="defaultProps"
highlight-current
icon-class="el-icon-arrow-right"
node-key="value"
@node-click="handleNodeClick"
/>
<el-tree :data="data" :default-expand-all="true" :props="defaultProps" highlight-current
icon-class="el-icon-arrow-right" node-key="value" @node-click="handleNodeClick" />
</div>
</el-col>
<el-col :span="19">
<div class="table">
<el-table v-loading="loading" :data="list" element-loading-background="rgba(0, 0, 0, 0.3)"
max-height="600px">
<el-table-column label="资源类型" min-width="120" prop="personnelType">
max-height="600px">
<el-table-column label="资源类型" min-width="120" prop="personnelType" v-if="peopleType!='4'">
<template slot-scope="{row}">
{{
(row.personnelType ?
data[0].children.filter(item => item.value === row.personnelType)[0].label : '') || peopleTypeLabel
(row.personnelType ?
data[0].children.filter(item => item.value === row.personnelType)[0].label : '') ||
peopleTypeLabel
}}
</template>
</el-table-column>
<el-table-column v-if="peopleType !== '4' && peopleType !== '5'&& peopleType !== 'volunteer'&& peopleType !== 'publicWelfareNum'" label="所属组织" min-width="180"
prop="orgName"/>
<el-table-column v-if="peopleType !== '4' && peopleType !== '5'&& peopleType !== 'volunteer'&& peopleType !== 'publicWelfareNum'" label="姓名/名称" min-width="120"
prop="name"/>
<el-table-column v-if="peopleType !== '4' && peopleType !== '5'&& peopleType !== 'volunteer'&& peopleType !== 'publicWelfareNum'" label="联系电话" min-width="120"
prop="mobile">
<template slot-scope="scope">
<el-table-column v-if="peopleType !== '4'" label="所属组织" min-width="180"
:prop="peopleType === '5'?'agencyName':'orgName'" />
<el-table-column v-if="peopleType !== '4'" label="姓名/名称" min-width="120"
:prop="peopleType === '5'?'unitName':'name'" />
<el-table-column v-if="peopleType !== '4'&&peopleType !== '5'" label="联系电话" min-width="120"
:prop="peopleType === '5'?'unitName':'name'">
<template slot-scope="scope" v-if="peopleType !== '4'">
{{ $sensitive(scope.row.mobile, 3, 7) }}
</template>
</el-table-column>
<el-table-column v-if="peopleType === '5'" label="联系人" min-width="120"
prop="contact" />
<el-table-column v-if="peopleType === '5'" label="联系电话" min-width="120" prop="contactMobile">
<template slot-scope="scope">
{{ $sensitive(scope.row.contactMobile, 3, 7) }}
</template>
</el-table-column>
<!-- <el-table-column label="状态" prop="" width="120"/>-->
<!-- <el-table-column label="距离" prop="" width="120"/>-->
<el-table-column v-if="peopleType === '4'" label="所属组织" min-width="180" prop="agencyName"/>
<el-table-column v-if="peopleType === '4'" label="负责人" min-width="120" prop="principalName"/>
<el-table-column v-if="peopleType === '4'" label="名称" min-width="180" prop="organizationName" />
<el-table-column v-if="peopleType === '4'" label="类别" min-width="180" prop="categoryName" />
<el-table-column v-if="peopleType === '4'" label="所属组织" min-width="180" prop="agencyName" />
<el-table-column v-if="peopleType === '4'" label="负责人" min-width="120" prop="principalName" />
<el-table-column v-if="peopleType === '4'" label="联系电话" min-width="120" prop="principalPhone">
<template slot-scope="scope">
{{ $sensitive(scope.row.principalPhone, 3, 7) }}
</template>
</el-table-column>
<el-table-column v-if="peopleType === 'publicWelfareNum' || peopleType=== 'volunteer'" label="所属组织" min-width="180" prop="agencyName">
<el-table-column v-if="peopleType === 'publicWelfareNum' || peopleType=== 'volunteer'" label="所属组织"
min-width="180" prop="agencyName">
<template scope-row="row">
{{this.$store.state.user.agencyName}}
{{this.$store.state.user.agencyName}}
</template>
</el-table-column>
<el-table-column v-if="peopleType === 'publicWelfareNum' || peopleType=== 'volunteer'" label="联系人" min-width="120" prop="name"/>
<el-table-column v-if="peopleType === 'publicWelfareNum' || peopleType=== 'volunteer'" label="联系电话" min-width="120" prop="mobile">
<el-table-column v-if="peopleType === 'publicWelfareNum' || peopleType=== 'volunteer'" label="联系人"
min-width="120" prop="name" />
<el-table-column v-if="peopleType === 'publicWelfareNum' || peopleType=== 'volunteer'" label="联系电话"
min-width="120" prop="mobile">
<template slot-scope="scope">
{{ $sensitive(scope.row.mobile, 3, 7) }}
</template>
@ -76,27 +75,22 @@
<el-table-column label="操作" prop="op" width="250">
<template slot-scope="scope">
<CallPhone :mobile="scope.row.mobile" text="拨打电话"/>
<CallPhone :mobile="scope.row.mobile" text="拨打电话" />
<span class="handle" @click="handleHandle">处理</span>
<span class="view" @click="handleViews(scope.row)">查看</span>
</template>
</el-table-column>
</el-table>
</div>
<Pagination
v-if="peopleType === '5' || peopleType === '4'"
v-show="total > 0"
:limit.sync="queryParams.pageSize"
:page.sync="queryParams.pageNo"
:total="total"
@pagination="pageChange"
/>
<Pagination v-if="peopleType === '5' || peopleType === '4'" v-show="total > 0"
:limit.sync="queryParams.pageSize" :page.sync="queryParams.pageNo" :total="total"
@pagination="pageChange" />
</el-col>
</el-row>
</div>
</div>
</el-dialog>
<ResourceInfo ref="ResourceInfo" :currentLevelData="currentLevelData" @ok="handleHandle"/>
<ResourceInfo ref="ResourceInfo" :currentLevelData="currentLevelData" @ok="handleHandle" />
</div>
</template>

2
src/views/dataBoard/renfang/house/list.vue

@ -178,7 +178,7 @@ export default {
// this.displayedHouseId = item.houseId;
// this.$router.push(`/homeDetails/index?id=${item.neighborHoodId}&buildingId=${item.buildingId}&unitId=${item.unitNumKey}`)
console.log(item);
this.$router.push(`/dataBoard/overview/familyPortrait/?name=${item.neighborHoodName}-${item.houseName}&buId=${item.buildingId}&type=renfang&orgId=${this.org_id}&type_name=${this.typeName}&name2=${ this.tableTitle }`)
this.$router.push(`/dataBoard/overview/familyPortrait/?name=${item.neighborHoodName}-${item.houseName}&buId=${item.buildingId}&type=renfang&orgId=${this.org_id}&type_name=${this.typeName}&name2=${ this.tableTitle }&houseId=${item.houseId}`)
},

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);

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

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

@ -76,8 +76,8 @@
class="u-item-width-normal"
></el-cascader>
</el-form-item>
<el-form-item label="联系人" prop="contact">
<el-select v-model.trim="formData.contact" class="u-item-width-normal" size="small" clearable
<el-form-item label="联系人" prop="principalId">
<el-select v-model.trim="formData.principalId" class="u-item-width-normal" size="small" clearable
placeholder="请选择联系人" @change="handelChangeStaff">
<el-option v-for="item in dicts.stafflist"
:key="item.value"
@ -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() {
@ -510,7 +511,7 @@ export default {
unitName: "",
serviceMatterList: [],
type: "",
contact: "",
principalId: "",
contactMobile: "",
memberCount: 0,
remark: "", //500
@ -543,7 +544,7 @@ export default {
],
type: [{ required: true, message: "分类不能为空", trigger: "blur" }],
contact: [
principalId: [
{ required: true, message: "联系人不能为空", trigger: "blur" },
],
contactMobile: [

11
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" },
@ -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(

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

@ -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()
},

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

@ -26,7 +26,7 @@
>
<span>{{ item.name }}</span
><span
v-if="item.id != 'businessRecord' && item.id != 'updateRecord' "
v-if="item.id != 'businessRecord' && item.id != 'updateRecord'&& item.id != 'reside' && item.id != 'ext'"
:class="{
incomplete: item.filledQty != item.totalQty && index != active,
full: item.filledQty == item.totalQty,
@ -250,8 +250,8 @@
</div>
<div class="flex_box">
<div class="f-flex">
<div class="f-label"><b>人房关系</b></div>
<span class="f-left8 f-font-color">
<div class="f-label">人房关系</div>
<span class="f-left8 ">
{{
item.resiHouseRel != null
? item.resiHouseRel === 0
@ -264,7 +264,7 @@
</span>
</div>
<div class="f-flex">
<div class="f-label"><b>人户状况</b></div>
<div class="f-label">人户状况</div>
<span class="f-left8 f-font-color">{{
householdSituationText(indexK)
}}</span>
@ -276,7 +276,7 @@
</div>
</div>
<div class="f-flex">
<div class="f-label"><b>与户主关系</b></div>
<div class="f-label">与户主关系</div>
<span class="f-left8 f-font-color">{{
houseHolderRelText(indexK)
}}</span>
@ -296,7 +296,7 @@
</div>
<div class="f-flex">
<div class="f-label"><b>就业状态</b></div>
<div class="f-label">就业状态</div>
<span class="f-left8 f-font-color" v-if="resiDetailObj.workInfoDto">
{{ careerStatusText() }}
</span>

Loading…
Cancel
Save