tianq 3 years ago
parent
commit
8db49c48d8
  1. BIN
      src/assets/img/yanjing1.png
  2. BIN
      src/assets/img/yanjing2.png
  3. 6
      src/views/business/resi-category-map.js
  4. 3
      src/views/components/resiChangeTransfer.vue
  5. 4
      src/views/components/resiForm.vue
  6. 32
      src/views/components/resiInfo.vue
  7. 9
      src/views/main-navbar.vue
  8. 16
      src/views/modules/base/collect.vue
  9. 34
      src/views/modules/base/community/community.vue
  10. 10
      src/views/modules/base/community/communityTable.vue
  11. 2
      src/views/modules/base/community/roomTable.vue
  12. 26
      src/views/modules/base/huji/immigration/index.vue
  13. 11
      src/views/modules/base/resi.vue
  14. 2
      src/views/modules/home/index.vue
  15. 1
      src/views/modules/home/notice.vue
  16. 22
      src/views/modules/plugins/change/changedeath.vue
  17. 18
      src/views/modules/plugins/change/changerelocation.vue
  18. 4
      src/views/modules/plugins/change/resideathAdd.vue

BIN
src/assets/img/yanjing1.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 321 B

BIN
src/assets/img/yanjing2.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 296 B

6
src/views/business/resi-category-map.js

@ -1,8 +1,8 @@
export default {
PARTY_FLAG: "党员",
SUBSISTENCE_ALLOWANCE_FLAG: "低保",
ENSURE_HOUSE_FLAG: "保障房",
UNEMPLOYED_FLAG: "失业",
SUBSISTENCE_ALLOWANCE_FLAG: "低保人员",
ENSURE_HOUSE_FLAG: "保障房人员",
UNEMPLOYED_FLAG: "失业人员",
FERTILE_WOMAN_FLAG: "育龄妇女",
VETERAN_FLAG: "退役军人",
UNITED_FRONT_FLAG: "统战人员",

3
src/views/components/resiChangeTransfer.vue

@ -157,11 +157,10 @@
</el-form>
</div>
<div class="m-edit-btn">
<el-button size="small" @click="handleCancle"> </el-button>
<el-button size="small" @click="handleCancle" class="diy-button-wih" plain> </el-button>
<el-button
type="primary"
size="small"
class="diy-button--blue"
:disabled="btnDisable"
@click="handleComfirm"
> </el-button

4
src/views/components/resiForm.vue

@ -23,7 +23,9 @@
</el-form-item>
<el-form-item label="所属房屋"
label-width="100px">
label-width="100px"
:required="true"
>
<div class="f-flex">
<el-form-item prop="villageId"
class="u-item-width-communitycascader f-bto0"

32
src/views/components/resiInfo.vue

@ -37,25 +37,26 @@
<div class="f-label">联系电话:</div> <div class="f-left8 f-font-color">
{{resiDetailObj.showMobile?resiDetailObj.showMobile:resiDetailObj.mobile?`${resiDetailObj.mobile.substr(0,3)}`+ "****" +`${resiDetailObj.mobile.substr(7,5)}`:'--'}}
</div>
<img v-show="this.showFlagMobileBtn" src="../../assets/img/yanjing1.png" alt="" width="14px" style="margin-left: 10px">
<img v-show="!this.showFlagMobileBtn" src="../../assets/img/yanjing2.png" alt="" width="14px" style="margin-left: 10px">
<el-button v-if="resiDetailObj.mobile"
style="margin-left: 10px"
type="text"
class="div-table-button--blue"
icon="el-icon-view"
size="small"
@click="handleTuomin('mobile')">显示</el-button>
@click="handleTuomin('mobile')">{{showFlagMobileBtn?'显示':'隐藏'}}</el-button>
</el-col>
<el-col :span="12" class="f-flex">
<div class="f-label">证件号: </div>
<div class="f-left8 f-font-color">{{resiDetailObj.showIdNum?resiDetailObj.showIdNum:resiDetailObj.idNum?`${resiDetailObj.idNum.substr(0, 11)}` +"******" +`${resiDetailObj.idNum.substr(16, 2)}`:'--'}}
</div>
<img v-show="this.showFlagIdCardBtn" src="../../assets/img/yanjing1.png" alt="" width="14px" style="margin-left: 10px">
<img v-show="!this.showFlagIdCardBtn" src="../../assets/img/yanjing2.png" alt="" width="14px" style="margin-left: 10px">
<el-button v-if="resiDetailObj.idNum"
style="margin-left: 10px"
type="text"
class="div-table-button--blue"
icon="el-icon-view"
size="small"
@click="handleTuomin('idCard')">显示</el-button>
@click="handleTuomin('idCard')">{{showFlagIdCardBtn?'显示':'隐藏'}}</el-button>
</el-col>
</el-row>
<el-row type="flex" justify="" class="f-m-top29" >
@ -69,7 +70,7 @@
<el-col :span="24" class="f-flex">
<div class="f-label">居民分类:</div>
<section class="f-left15 f-flex f-flex1" v-if="resiDetailObj.categoryInfo&& resiClass" style="flex: 1;flex-wrap: wrap;">
<span class="f-right30 f-w70 f-font-color f-bto16" v-show="resiDetailObj.categoryInfo.bereavedPersonFlag==1">失独老人 </span>
<span class="f-right30 f-w70 f-font-color f-bto16" v-show="resiDetailObj.categoryInfo.bereavedPersonFlag==1">特扶人员 </span>
<span class="f-right30 f-w70 f-font-color f-bto16" v-show="resiDetailObj.categoryInfo.chronicDiseaseFlag==1">慢病</span>
<span class="f-right30 f-w70 f-font-color f-bto16" v-show="resiDetailObj.categoryInfo.dementedFlag==1">失智老人</span>
<span class="f-right30 f-w70 f-font-color f-bto16" v-show="resiDetailObj.categoryInfo.disabilityFlag==1"> 残疾</span>
@ -84,10 +85,10 @@
<span class="f-right30 f-w70 f-font-color f-bto16" v-show="resiDetailObj.categoryInfo.petitionOfficerFlag==1">信访人员</span>
<span class="f-right30 f-w70 f-font-color f-bto16" v-show="resiDetailObj.categoryInfo.seriousIllnessFlag==1"> 大病</span>
<span class="f-right30 f-w70 f-font-color f-bto16" v-show="resiDetailObj.categoryInfo.specialCrowdFlag==1">特殊人群</span>
<span class="f-right30 f-w70 f-font-color f-bto16" v-show="resiDetailObj.categoryInfo.subsistenceAllowanceFlag==1">低保</span>
<span class="f-right30 f-w70 f-font-color f-bto16" v-show="resiDetailObj.categoryInfo.subsistenceAllowanceFlag==1">低保人员</span>
<span class="f-right30 f-w70 f-font-color f-bto16" v-show="resiDetailObj.categoryInfo.unitedFrontFlag==1">统战人员</span>
<span class="f-right30 f-w70 f-font-color f-bto16" v-show="resiDetailObj.categoryInfo.tenantFlag==1">租户</span>
<span class="f-right30 f-w70 f-font-color f-bto16" v-show="resiDetailObj.categoryInfo.unemployedFlag==1">失业</span>
<span class="f-right30 f-w70 f-font-color f-bto16" v-show="resiDetailObj.categoryInfo.unemployedFlag==1">失业人员</span>
<span class="f-right30 f-w70 f-font-color f-bto16" v-show="resiDetailObj.categoryInfo.veteranFlag==1">退役军人</span>
<span class="f-right30 f-w70 f-font-color f-bto16" v-show="resiDetailObj.categoryInfo.volunteerFlag==1">志愿者</span>
@ -924,7 +925,9 @@ export default {
specialDtoArr:[],
spouseArr:[],
relationshipArr:[],
categoryDictArr:[]
categoryDictArr:[],
showFlagIdCardBtn:true,
showFlagMobileBtn:true
}
},
computed: {
@ -1740,14 +1743,21 @@ export default {
},
async handleTuomin (type) {
const url = `/actual/base/residentBaseInfo/getResiUserInfo/${this.resiId}`;
const { data, code, msg } = await requestPost(url);
if (code === 0) {
if (type === 'mobile') {
this.$set(this.resiDetailObj, 'showMobile', data.mobile)
this.showFlagMobileBtn = !this.showFlagMobileBtn
if(this.showFlagMobileBtn){
this.$set(this.resiDetailObj, 'showMobile', data.mobile.substr(0,3) +'****'+ data.mobile.substr(7,4) )
}
}
if (type === 'idCard') {
this.$set(this.resiDetailObj, 'showIdNum', data.idNum)
this.showFlagIdCardBtn = !this.showFlagIdCardBtn
if(this.showFlagIdCardBtn){
this.$set(this.resiDetailObj, 'showIdNum', data.idNum.substr(0,11) +'****'+ data.idNum.substr(16,2) )
}
}

9
src/views/main-navbar.vue

@ -313,6 +313,9 @@ export default {
if (data.unreadNum > 0 && this.unreadMsgNum < data.unreadNum) {
this.getNoticeList();
this.displayedNoticeList = true;
setTimeout(()=>{
this.displayedNoticeList = false;
},5000)
}
this.unreadMsgNum = data.unreadNum;
} else {
@ -383,6 +386,7 @@ export default {
box-shadow: 0px 6px 16px 0px rgba(0, 0, 0, 0.08),
0px 3px 6px -4px rgba(0, 0, 0, 0.12);
border-radius: 4px;
.title {
margin-bottom: 16px;
height: 22px;
@ -435,8 +439,11 @@ export default {
font-size: 14px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: rgba(0, 0, 0, 0.85);
line-height: 22px;
cursor: pointer;
&:hover{
color: #0056d6 !important;
}
}
}
</style>

16
src/views/modules/base/collect.vue

@ -59,18 +59,18 @@
</el-date-picker>
</el-form-item>
<div class="u-search-btn">
<el-button class="diy-button--white"
</el-form>
<el-row>
<el-col :span="24" align="right">
<el-button class="diy-button--white"
size="small"
@click="resetForm('searchForm')">重置</el-button>
<el-button style="margin-left:10px"
size="small"
class="diy-button--blue"
@click="handleSearch">查询</el-button>
</div>
</el-form>
</el-col>
</el-row>
</div>
<div class="m-table">
<div class="u-table-btn1">
@ -421,8 +421,8 @@ export default {
computed: {
...mapGetters(["clientHeight", "iframeHeight"]),
tableHeight () {
const h = this.clientHeight - 360 + this.iframeHeigh;
const _h = this.clientHeight - 360;
const h = this.clientHeight - 400 + this.iframeHeigh;
const _h = this.clientHeight - 400;
return this.$store.state.inIframe ? h : _h;
},
dialogTableHeight () {

34
src/views/modules/base/community/community.vue

@ -26,7 +26,7 @@
>
<span slot-scope="{ node, data }" class="custom-tree-node">
<img
v-if="data.showIcon"
v-if="showIcons(data)"
src="@/assets/images/index/abnormal.png"
style="
height: 14px;
@ -38,12 +38,12 @@
<!-- <span v-if="data.level==='building'&&!data.showIcon"
style="padding-left:20px;">{{ ' ' }}</span> -->
<span v-if="data.showIcon" :id="data.id"
<!-- <span v-if="data.showIcon" :id="data.id"
>{{ data.label + "(" }}
<span style="color: red">{{ data.showNum }}</span>
<span>{{ ")" }}</span>
</span>
<span v-else :id="data.id">{{ data.showName }}</span>
</span> -->
<span :id="data.id">{{ data.showName }}</span>
</span>
</el-tree>
</el-scrollbar>
@ -70,13 +70,13 @@
>
</el-input>
</el-form-item>
<el-form-item label="联系方式" prop="ownerPhone">
<el-form-item label="联系电话" prop="ownerPhone">
<el-input
v-model="ownerPhone"
class="u-item-width-normal"
size="small"
clearable
placeholder="请输入手机"
placeholder="请输入联系电话"
>
</el-input>
</el-form-item>
@ -243,7 +243,7 @@
<el-button
style="margin-left: 10px"
size="small"
class="diy-button--blue"
type="primary"
@click="handleSearch"
>查询</el-button
>
@ -476,8 +476,20 @@ export default {
? this.clientHeight - 245 + this.iframeHeight + "px"
: this.clientHeight - 245 + "px";
},
...mapGetters(["clientHeight", "iframeHeight"]),
showIcons(){
return function(data){
if(data.level=='building'){
let arr = data.showNum.split('/')
console.log(arr);
if(arr[0] !== arr[1]){
return true
}else{
return false
}
}
}
},
},
watch: {
// filterText (val) {
@ -682,8 +694,10 @@ export default {
this.pageSize = 10;
this.pageNo = 1;
// this.handleNodeClick(this.selObj)
// this.loadTable()
},
this.$nextTick(()=>{
this.$refs.ref_buildingTable.loadTable('search',this.selObj)
})
},
async loadOpenNode() {
const url = "/gov/org/building/tree-ids";

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

@ -5,7 +5,7 @@
<el-button
style=""
size="small"
class="diy-button--blue"
type="primary "
icon="el-icon-plus"
@click="handleAdd"
>新增小区</el-button
@ -176,7 +176,7 @@
>下载房屋模板</el-button
>
</div>
<div
<!-- <div
v-if="
showYhymInfo && customerId !== '1535072605621841922'
"
@ -206,7 +206,7 @@
@click="createBatchNeiQrUrl"
>补全小程序小区码</el-button
>
</div>
</div> -->
<div v-if="displayedBaobiaoBtn" class="table-more-btn">
<el-button
size="small"
@ -216,7 +216,7 @@
>智能填报</el-button
>
</div>
<div
<!-- <div
v-if="agencyObj.level == 'community'"
class="table-more-btn"
>
@ -227,7 +227,7 @@
@click="handleDownQr(agencyObj, 'community')"
>社区二维码</el-button
>
</div>
</div> -->
<el-button
size="small"
style="float: right"

2
src/views/modules/base/community/roomTable.vue

@ -481,7 +481,7 @@ export default {
async loadTable (source, treeObj) {
this.source = source;
this.tableLoading = true;
console.log(treeObj,'see');
if (source === "tree") {
//tree
this.sortType = "asc";

26
src/views/modules/base/huji/immigration/index.vue

@ -155,8 +155,9 @@
</el-option>
</el-select>
</el-form-item> -->
<div class="u-search-btn">
</el-form>
<el-row>
<el-col :span="24" align="right">
<el-button
class="diy-button--white"
size="small"
@ -170,8 +171,8 @@
@click="handleSearch"
>查询</el-button
>
</div>
</el-form>
</el-col>
</el-row>
</div>
<div class="m-table">
@ -547,13 +548,16 @@ export default {
importLoading: false,
searchH: 0,
tableHeight: 0,
changeRecordShow: false,
};
},
computed: {
...mapGetters(["clientHeight", "iframeHeight"]),
tableHeight(){
const h = this.clientHeight - 450 + this.iframeHeigh;
const _h = this.clientHeight - 450;
return this.$store.state.inIframe ? h : _h;
},
changeVDisabled() {
return !this.fmData.villageId;
},
@ -563,6 +567,7 @@ export default {
changeDDisabled() {
return !this.fmData.unitId;
},
},
watch: {
rangeTime: function (val) {
@ -575,15 +580,6 @@ export default {
this.fmData.endTime = "";
}
},
searchH() {
const h = this.clientHeight - this.searchH + this.iframeHeight;
const _h = this.clientHeight - this.searchH;
console.log("computed-searchH---_h", _h);
this.$nextTick(() => {
this.tableHeight = this.$store.state.inIframe ? h : _h;
});
},
},
mounted() {
this.getGridList();

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

@ -241,7 +241,7 @@
}}
{{
scope.row.categoryInfo.ensureHouseFlag == 1
? "保障房 "
? "保障房人员 "
: ""
}}
{{
@ -289,7 +289,7 @@
{{
scope.row.categoryInfo
.subsistenceAllowanceFlag == 1
? "低保 "
? "低保人员 "
: ""
}}
{{
@ -2003,4 +2003,11 @@ export default {
margin-left: auto;
}
}
.el-dropdown-menu {
::v-deep .el-dropdown-menu__item{
&:hover{
color: #0056d6;
}
}
}
</style>

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

@ -51,7 +51,7 @@
</div>
<div class="btn2" @click="handleClickSearchBtn">
<img src="@/assets/images/index/i-search.png" />
智能搜索
智能查询
</div>
</div>
</div>

1
src/views/modules/home/notice.vue

@ -201,6 +201,7 @@ export default {
&:hover {
.item-title {
color: #0056d6;
cursor: pointer;
}
.item-btn-clear {
display: block;

22
src/views/modules/plugins/change/changedeath.vue

@ -69,8 +69,11 @@
</el-select>
</el-form-item> -->
<div class="u-search-btn">
<el-button class="diy-button--white" size="small" @click="resetForm"
</el-form>
<el-row>
<el-col :span="24" align="right">
<el-button class="diy-button--white" size="small" @click="resetForm"
>重置</el-button
>
<el-button
@ -80,8 +83,8 @@
@click="getDataList"
>查询</el-button
>
</div>
</el-form>
</el-col>
</el-row>
</div>
<div class="m-table">
<div class="u-table-btn1">
@ -96,6 +99,7 @@
class="m-table-item"
v-loading="dataListLoading"
:data="dataList"
:height="tableHeight"
border
>
<!--<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>-->
@ -277,7 +281,7 @@ import nextTick from "dai-js/tools/nextTick";
import resiChangeRecord from "@/views/components/resiChangeRecord.vue";
import { requestPost } from "@/js/dai/request";
import resiInfo from "@/views/components/resiInfo.vue";
import { mapGetters } from "vuex";
export default {
mixins: [mixinViewModule],
data() {
@ -328,6 +332,14 @@ export default {
resiInfo,
resiChangeRecord,
},
computed:{
...mapGetters(["clientHeight", "iframeHeight"]),
tableHeight(){
const h = this.clientHeight - 410 + this.iframeHeigh;
const _h = this.clientHeight - 410;
return this.$store.state.inIframe ? h : _h;
},
},
methods: {
async handleRecovery(rowData) {
console.log("11111");

18
src/views/modules/plugins/change/changerelocation.vue

@ -164,7 +164,7 @@
<el-button
style="margin-left: 10px"
size="small"
class="diy-button--blue"
type="primary"
@click="getDataList"
>查询</el-button
>
@ -321,7 +321,6 @@
slot="reference"
type="text"
size="small"
class="div-table-button--blue"
>恢复</el-button
>
</el-popconfirm>
@ -442,7 +441,6 @@ export default {
changeRecordShow: false,
searchH: 0,
tableHeight: 0,
};
},
components: {
@ -452,6 +450,11 @@ export default {
},
computed: {
...mapGetters(["clientHeight", "iframeHeight"]),
tableHeight(){
const h = this.clientHeight - 420 + this.iframeHeigh;
const _h = this.clientHeight - 420;
return this.$store.state.inIframe ? h : _h;
},
changeVDisabled() {
return !this.dataForm.villageId;
},
@ -480,15 +483,6 @@ export default {
this.dataForm.endTime = "";
}
},
searchH() {
const h = this.clientHeight - this.searchH + this.iframeHeight;
const _h = this.clientHeight - this.searchH;
console.log("computed-searchH---_h", _h);
this.$nextTick(() => {
this.tableHeight = this.$store.state.inIframe ? h : _h;
});
},
},
methods: {
async handleRecovery(rowData) {

4
src/views/modules/plugins/change/resideathAdd.vue

@ -56,10 +56,10 @@
</el-form>
</div>
<div class="m-edit-btn">
<el-button size="small" class="" @click="handleCancle"> </el-button>
<el-button size="small" class="" @click="handleCancle" plain> </el-button>
<el-button
size="small"
class="diy-button--blue"
type="primary"
:loading="btnDisable"
@click="handleComfirm"
> </el-button

Loading…
Cancel
Save