jiangyy 3 years ago
parent
commit
d50258c7d3
  1. 3
      src/assets/scss/modules/management/list-main.scss
  2. 2
      src/element-ui/theme/index.css
  3. 21
      src/views/components/editResi.vue
  4. 1814
      src/views/components/resiForm.vue
  5. 28
      src/views/components/resiSearch.vue
  6. 60
      src/views/modules/base/resi.vue
  7. 1
      src/views/modules/home/cpts/people-more.vue
  8. 36
      src/views/modules/shequ/cpts/people-more.vue

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

@ -47,7 +47,7 @@
// 搜索栏高度控制显示隐藏 // 搜索栏高度控制显示隐藏
.m-form-box-height{ .m-form-box-height{
max-height: 153px; max-height: 100px;
overflow: hidden; overflow: hidden;
} }
.m-form-box-height-auto{ .m-form-box-height-auto{
@ -109,7 +109,6 @@
display: flex; display: flex;
flex-wrap: nowrap; flex-wrap: nowrap;
} }
.f-hflex { .f-hflex {
display: flex; display: flex;
flex-flow: column; flex-flow: column;

2
src/element-ui/theme/index.css

File diff suppressed because one or more lines are too long

21
src/views/components/editResi.vue

@ -164,14 +164,14 @@
</el-row> </el-row>
<el-row v-for="(item, index) in sliceList(formList, columns)" <el-row v-for="(item, index) in sliceList(formList, columns)"
:key="index" :key="index"
class="resi-row"> class="resi-row" :class="{'width-40':index==3||index==2||index==4||index==5}">
<!-- <el-col v-for="n in item" :key="n.id" :span="n.itemType === 'textarea'&&24 || (24/columns)"> --> <!-- <el-col v-for="n in item" :key="n.id" :span="n.itemType === 'textarea'&&24 || (24/columns)"> -->
<el-col v-for="n in item" <el-col v-for="n in item"
:key="n.itemId" :key="n.itemId"
:span="item.length === 1 ? 24 : (24/columns)" :span="item.length === 1 ? 24 : (24/columns) "
:style="n.itemType === 'divider' && 'display: none;'"> :style="n.itemType === 'divider' && 'display: none;'">
<el-form-item :prop="n.columnName" <el-form-item :prop="n.columnName"
:label="n.label"> :label="n.itemType != 'radio'?n.label:''">
<!-- <div class="resi-cell"> --> <!-- <div class="resi-cell"> -->
<!-- <div class="resi-cell-label">{{n.label}}</div> --> <!-- <div class="resi-cell-label">{{n.label}}</div> -->
<div class="resi-cell-value"> <div class="resi-cell-value">
@ -279,13 +279,20 @@
class="resi-cell-select"> class="resi-cell-select">
</el-cascader> </el-cascader>
<template v-else-if="n.itemType === 'radio'"> <template v-else-if="n.itemType === 'radio'">
<el-radio v-for="ns in n.options" <!-- <el-radio v-for="ns in n.options"
:key="ns.value" :key="ns.value"
v-model.trim="form[n.columnName]" v-model.trim="form[n.columnName]"
:disabled="disabled" :disabled="disabled"
:label="ns.value"> :label="ns.value">
{{ ns.label }} {{ ns.label }}
</el-radio> </el-radio> -->
<el-checkbox-group v-model.trim="form[n.columnName]">
<el-checkbox
:key="n.value"
:label="n.value"
:disabled="disabled">{{n.label}}</el-checkbox>
<!-- <el-checkbox label="n.la"></el-checkbox> -->
</el-checkbox-group>
<!-- <el-radio v-model.trim="form[n.columnName]" label="1">备选项</el-radio> --> <!-- <el-radio v-model.trim="form[n.columnName]" label="1">备选项</el-radio> -->
</template> </template>
<template v-else-if="n.itemType === 'checkbox'"> <template v-else-if="n.itemType === 'checkbox'">
@ -356,7 +363,7 @@ export default {
// //
columns: { columns: {
type: Number, type: Number,
default: 4 default: 3
}, },
supportAdd: { // supportAdd: { //
type: Boolean, type: Boolean,
@ -890,7 +897,7 @@ export default {
} }
} }
.resi-cell-value .resi-cell-input { .resi-cell-value .resi-cell-input {
width: 190px; width: 168px;
} }
</style> </style>
<style lang="scss" scoped> <style lang="scss" scoped>

1814
src/views/components/resiForm.vue

File diff suppressed because it is too large

28
src/views/components/resiSearch.vue

@ -88,27 +88,27 @@
</div> </div>
</div> </div>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div>
</div>
<el-row v-if="showSmartSearchForm" class="resi-row-more f-m0"> <el-row v-if="showSmartSearchForm" class="resi-row-more f-m0">
<el-col :span="24">
<el-col :span="24"> <span style="width:100px;display: inline-block;text-align: right;padding-right: 18px;">智能查询:</span>
<span style="width:100px;display: inline-block;text-align: right;padding-right: 18px;">智能查询</span> <el-button v-for="btnItem in btnList" :key="btnItem.index" size="small"
<el-button v-for="btnItem in btnList" :key="btnItem.index" size="small" :class="selBtnIndex === btnItem.index ? 'diy-button--white' : 'diy-button--common'"
:class="selBtnIndex === btnItem.index ? 'diy-button--white' : 'diy-button--common'" @click="handelSelSmartBtn(btnItem.index)">{{ btnItem.name }}</el-button>
@click="handelSelSmartBtn(btnItem.index)">{{ btnItem.name }}</el-button>
</el-col>
</el-col> <el-col>
<el-col> <smart-search-rule ref="ref_rule" :formType="formType"></smart-search-rule>
<smart-search-rule ref="ref_rule" :formType="formType"></smart-search-rule> </el-col>
</el-col>
</el-row> </el-row>
<el-row v-if="isArrow" class="resi-search"> <el-row v-if="isArrow" class="resi-search">
<el-col :span="24"> <el-col :span="24">
<el-button type="primary" size="small" plain class="diy-button--blue" <el-button type="primary" size="small" plain class="diy-button--blue"
@click="handleSmartSearch">智能查询</el-button> @click="handleSmartSearch"><span>{{showSmartSearchForm?'关闭智能查询':'智能查询'}}</span></el-button>
<el-button style="margin-left:10px" size="small" class="diy-button--white" type="primary" plain <el-button style="margin-left:10px" size="small" class="diy-button--white" type="primary" plain
@click="resetForm">重置</el-button> @click="resetForm">重置</el-button>
<el-button type="primary" size="small" class="diy-button--blue" @click="handleSearch" plain>查询 </el-button> <el-button type="primary" size="small" class="diy-button--blue" @click="handleSearch" plain>查询 </el-button>
@ -802,7 +802,7 @@ export default {
flex-wrap: wrap; flex-wrap: wrap;
} }
.resi-search { .resi-search {
// padding-right: 20px; padding-bottom: 14px;
.el-col { .el-col {
text-align: right; text-align: right;
} }

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

@ -113,25 +113,26 @@
@selection-change="selectionChange"> @selection-change="selectionChange">
<el-table-column type="selection" <el-table-column type="selection"
fixed="left" fixed="left"
align="center" align="left"
:selectable="checkSelect" :selectable="checkSelect"
width="55" /> width="55" />
<el-table-column label="序号" <el-table-column label="序号"
type="index" type="index"
fixed="left" fixed="left"
align="center" align="left"
width="50"> width="50">
</el-table-column> </el-table-column>
<el-table-column v-for="item in tableHeader" <el-table-column v-for="item in tableHeader"
:key="item.columnName" :key="item.columnName"
:prop="item.columnName" :prop="item.columnName"
:label="item.label" :label="item.label"
align="center" align="left"
:fixed="item.columnName == 'NAME' ? 'left' : false" :fixed="item.columnName == 'NAME' ? 'left' : false"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
:width="item.width || computedWidth(item.label, item.itemType)"> :width="item.width || computedWidth(item.label, item.itemType)">
<!-- :width="item.itemType === 'radio' ? computedWidth(item.label) : 180" --> <!-- :width="item.itemType === 'radio' ? computedWidth(item.label) : 180" -->
<template slot-scope="scope"> <template slot-scope="scope">
<a v-if="item.columnName == 'NAME' && btnAuths.ic_resi_view" <a v-if="item.columnName == 'NAME' && btnAuths.ic_resi_view"
class="name-a" class="name-a"
@click="handleLook(scope.row)"> @click="handleLook(scope.row)">
@ -142,7 +143,7 @@
</el-table-column> </el-table-column>
<el-table-column fixed="right" <el-table-column fixed="right"
label="操作" label="操作"
align="center" align="left"
width="260"> width="260">
<template slot-scope="scope"> <template slot-scope="scope">
<!-- <el-button @click="handleLook(scope.row)" <!-- <el-button @click="handleLook(scope.row)"
@ -161,7 +162,7 @@
class="div-table-button--blue" class="div-table-button--blue"
size="small" size="small"
type="text" type="text"
icon="el-icon-edit">编辑</el-button> >编辑</el-button>
<el-popconfirm v-if="btnAuths.ic_resi_del" <el-popconfirm v-if="btnAuths.ic_resi_del"
title="删除之后无法回复,确认删除?" title="删除之后无法回复,确认删除?"
@onConfirm="handleDel(scope.row)"> @onConfirm="handleDel(scope.row)">
@ -175,12 +176,10 @@
<el-button @click="handleChangeTransfer(scope.row)" <el-button @click="handleChangeTransfer(scope.row)"
type="text" type="text"
class="div-table-button--blue" class="div-table-button--blue"
icon="el-icon-tickets"
size="small">迁出登记</el-button> size="small">迁出登记</el-button>
<el-button @click="handleDeath(scope.row)" <el-button @click="handleDeath(scope.row)"
class="div-table-button--blue" class="div-table-button--blue"
type="text" type="text"
icon="el-icon-tickets"
size="small">死亡登记</el-button> size="small">死亡登记</el-button>
</template> </template>
</el-table-column> </el-table-column>
@ -225,7 +224,7 @@
:fixed="true" :fixed="true"
:form-list="formList" :form-list="formList"
@changegroup="handleChangeGroup" /> @changegroup="handleChangeGroup" />
<div v-if="dialogVisible" <!-- <div v-if="dialogVisible"
class="resi-other"> class="resi-other">
<div class="tabs-other-info"> <div class="tabs-other-info">
<el-tabs v-model="activeName" <el-tabs v-model="activeName"
@ -243,7 +242,7 @@
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
</div> </div>
</div> </div> -->
</div> </div>
<div class="resi-btns"> <div class="resi-btns">
@ -260,10 +259,11 @@
<el-dialog :title="formName" <el-dialog :title="formName"
:visible.sync="dialogEditVisible" :visible.sync="dialogEditVisible"
width="80%" width="986px"
top="5vh"
height="750px"
append-to-body append-to-body
class="dialog-h" class="dialog-h"
top="5vh"
:close-on-click-modal="false" :close-on-click-modal="false"
:before-close="handlerEditCancle"> :before-close="handlerEditCancle">
<div class="dialog-h-content scroll-h"> <div class="dialog-h-content scroll-h">
@ -963,7 +963,6 @@ export default {
async handleChangeGroup (val) { async handleChangeGroup (val) {
console.log("changeguoprrrrr----", val); console.log("changeguoprrrrr----", val);
let { childGroup, value, partyInfo } = val; let { childGroup, value, partyInfo } = val;
let hasT = false; let hasT = false;
let i = 0; let i = 0;
let list = [...this.tabsList]; let list = [...this.tabsList];
@ -973,7 +972,7 @@ export default {
i = index; i = index;
} }
}); });
if (value === 1 || value === "1") { if (value === true || value === "true") {
// console.log('changegroup----999', value) // console.log('changegroup----999', value)
if (!hasT) { if (!hasT) {
childGroup.itemList.forEach(async (item) => { childGroup.itemList.forEach(async (item) => {
@ -1059,8 +1058,11 @@ export default {
if (arr) this.submitEdit(arr); if (arr) this.submitEdit(arr);
}, },
async handleSUbmit () { async handleSUbmit () {
const arr = await this.formetForm(); // console.log(this,$refs.baseForm);
if (arr) this.submitAdd(arr); // const arr = await this.formetForm();
// if (arr) this.submitAdd(arr);
this.dialogVisible = false;
}, },
handleDel (row) { handleDel (row) {
let params = { let params = {
@ -1096,10 +1098,10 @@ export default {
this.dialogEditVisible = false; this.dialogEditVisible = false;
}, },
handlerCancle () { handlerCancle () {
this.$refs.baseForm.resetForm(); // this.$refs.baseForm.resetForm();
this.tabsList.forEach((item) => { // this.tabsList.forEach((item) => {
this.$refs["group" + item.groupId][0].resetForm(); // this.$refs["group" + item.groupId][0].resetForm();
}); // });
this.dialogVisible = false; this.dialogVisible = false;
}, },
async submitAdd (arr) { async submitAdd (arr) {
@ -1187,7 +1189,6 @@ export default {
pageSize: this.pageSize, pageSize: this.pageSize,
conditions: this.conditions, conditions: this.conditions,
}; };
// debugger
await this.$http await this.$http
.post("/epmetuser/icresiuser/listresi", params) .post("/epmetuser/icresiuser/listresi", params)
.then(({ data: res }) => { .then(({ data: res }) => {
@ -1224,6 +1225,8 @@ export default {
this.$http this.$http
.post("/epmetuser/icresiuser/detail", params) .post("/epmetuser/icresiuser/detail", params)
.then(({ data: res }) => { .then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg); return this.$message.error(res.msg);
} else { } else {
@ -1367,7 +1370,6 @@ export default {
return arr; return arr;
}, },
async getFormList (type) { async getFormList (type) {
// debugger
await this.$http await this.$http
.post("/oper/customize/icform/getcustomerform", { .post("/oper/customize/icform/getcustomerform", {
formCode: "resi_base_info", formCode: "resi_base_info",
@ -1478,6 +1480,12 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
@import "@/assets/scss/modules/management/list-main.scss"; @import "@/assets/scss/modules/management/list-main.scss";
::v-deep .el-tabs__nav-next{
box-shadow: 2px 0px 9px 0px;
}
::v-deep .el-tabs__nav-prev{
box-shadow: -1px 0px 7px 0px;
}
.dialog-h { .dialog-h {
.el-dialog__body { .el-dialog__body {
position: relative; position: relative;
@ -1502,16 +1510,6 @@ export default {
::v-deep .el-tabs__active-bar_active { ::v-deep .el-tabs__active-bar_active {
background-color: #0055d7; background-color: #0055d7;
} }
::v-deep .el-tabs__nav-next,
::v-deep .el-tabs__nav-prev {
// width: 12px;
// height: 12px;
color: rgba(30, 122, 254, 1);
line-height: 20px;
background: rgba(30, 122, 254, 0.2);
// border-radius: 50%;
}
} }
::v-deep .el-tabs__item { ::v-deep .el-tabs__item {
// width: 50px; // width: 50px;

1
src/views/modules/home/cpts/people-more.vue

@ -540,7 +540,6 @@ export default {
// //
async getInfo () { async getInfo () {
const url = "/epmetuser/icresiuser/detail"; const url = "/epmetuser/icresiuser/detail";
const { data, code, msg } = await requestPost(url, { const { data, code, msg } = await requestPost(url, {
icResiUserId: this.userId, icResiUserId: this.userId,
formCode: "resi_base_info", formCode: "resi_base_info",

36
src/views/modules/shequ/cpts/people-more.vue

@ -38,7 +38,7 @@
<span>{{ homeName }}</span> <span>{{ homeName }}</span>
</div> </div>
<div class="item" <div class="item"
:class="{'width-40':index==1}" :class="{'width-40':index==1}"
:key="field.itemId" :key="field.itemId"
v-for="field in fieldSubList" v-for="field in fieldSubList"
v-if="info[field.columnName]!=0" v-if="info[field.columnName]!=0"
@ -46,7 +46,7 @@
<span :class="field.itemType=='radio'?'':'item-field'">{{field.label}}<span v-if="field.itemType!='radio'"> </span> </span> <span :class="field.itemType=='radio'?'':'item-field'">{{field.label}}<span v-if="field.itemType!='radio'"> </span> </span>
<span v-if="field.columnName==='MOBILE' && info[field.columnName] != null||field.columnName==='ID_CARD' && info[field.columnName] != null"> <el-button type="text" class="div-table-button--blue" style="float: right" @click="handleTuomin(field)"> <span v-if="field.columnName==='MOBILE' && info[field.columnName] != null||field.columnName==='ID_CARD' && info[field.columnName] != null"> <el-button type="text" class="div-table-button--blue" style="float: right" @click="handleTuomin(field)">
<i class="el-icon-view"></i> 显示</el-button> <span >{{ info[field.columnName]||'--'}}</span> </span> <i class="el-icon-view"></i> 显示</el-button> <span >{{ info[field.columnName]||'- -'}}</span> </span>
<span v-else-if=" <span v-else-if="
field.itemType == 'select' || field.itemType == 'select' ||
field.itemType == 'radio' || field.itemType == 'radio' ||
@ -57,7 +57,7 @@
field.columnName=='GENDER' || field.columnName=='GENDER' ||
field.columnName=='MZ'"> field.columnName=='MZ'">
{{ {{
info[field.columnName] == null info[field.columnName] == null
? "--" ? "--"
: getOptionLabel( : getOptionLabel(
field.options, field.options,
@ -75,7 +75,7 @@
</div> </div>
<div class="title-small f-top40 div-mult-table "> {{index==0? '分类信息':'其他信息'}} <div class="title-small f-top40 div-mult-table "> {{index==0? '分类信息':'其他信息'}}
<section v-show="index==0 " class="f-font14">居民分类: </section> <section v-show="index==0 " class="f-font14">居民分类: <span style="font-weight: 400;font-family: PingFang SC;">&nbsp;{{infoContext}}</span> </section>
</div> </div>
</div> </div>
<!-- 详情下方tab --> <!-- 详情下方tab -->
@ -344,6 +344,32 @@ export default {
isShundeju () { isShundeju () {
return this.$store.state.user.customerId == "1550309684576591874"; return this.$store.state.user.customerId == "1550309684576591874";
}, },
infoContext(){
let arr = []
let textList = []
for (const item of this.fieldList) {
for (const key in item) {
let s = item[key]
if(Array.isArray(s.columnName.match(/^IS/))){
arr.push(s.columnName.match(/^IS/))
}
}
}
let obj = {}
let num = 0
for (const c of arr) {
num+=1
obj[num] = c.input
if(this.info[c['input']] == 0 || this.info[c['input']] == null){
textList.push('--')
}else{
textList.push(this.info[c['input']])
}
}
let flag =textList.filter((item,index)=>index!=0).every(item=>item === '--')
return flag?'--':''
},
xiaoquName () { xiaoquName () {
const { const {
@ -568,11 +594,11 @@ export default {
// //
async getInfo () { async getInfo () {
const url = "/epmetuser/icresiuser/detail"; const url = "/epmetuser/icresiuser/detail";
const { data, code, msg } = await requestPost(url, { const { data, code, msg } = await requestPost(url, {
icResiUserId: this.userId, icResiUserId: this.userId,
formCode: "resi_base_info", formCode: "resi_base_info",
}); });
console.log(data,'qweqwe');
if (code === 0) { if (code === 0) {
this.info = data.ic_resi_user[0]; this.info = data.ic_resi_user[0];

Loading…
Cancel
Save