Skip to content

H
housing-estate
提交 d57a4bbf authored 作者: 宋雄's avatar 宋雄
浏览文件
操作

修改bug

上级 06520d8d
显示空白字符变更
内嵌 并排
正在显示 包含 85 行增加 和 42 行删除
.env.development
浏览文件 @ d57a4bbf
NODE_ENV=development
# VUE_APP_API_BASE_URL='http://192.168.0.119:9999'
VUE_APP_API_BASE_URL='http://192.168.0.103:9999'
VUE_APP_API_BASE_URL='http://192.168.0.102:9999'
# VUE_APP_API_BASE_URL='http://220.203.25.212:9999'
VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas
VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview
......
src/views/information/building/modules/NoticeForm.vue
浏览文件 @ d57a4bbf
......@@ -13,13 +13,6 @@
<j-date placeholder="请选择建成日期" v-model="model.completedDate" style="width: 100%" />
</a-form-model-item>
</a-col>
<a-col :span="12">
<a-form-model-item label="房屋用途" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="useTo">
<a-select style="width: 100%" v-model="model.useTo" placeholder="请选择房屋用途">
<a-select-option v-for="item in dictOptions" :key="item.value" :value="item.value">{{item.label}}</a-select-option>
</a-select>
</a-form-model-item>
</a-col>
<a-col :span="12">
<a-form-model-item label="楼宇面积" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="buildingArea">
<a-input type="number" v-model="model.buildingArea" placeholder="请输入楼宇面积"></a-input>
......@@ -138,11 +131,9 @@
}
}
return {
dictOptions: [],
model:{
buildingName: '',
completedDate: '',
useTo: '',
buildingArea: '',
communityUnitList: [],
haveLift: '1',
......@@ -162,7 +153,6 @@
validatorRules: {
buildingName: [{ required: true, message: '请输入楼宇名称', trigger: 'blur' }],
communityUnitList: [{ required: true, message: '请输入单元数量', trigger: 'change' }],
useTo: [{ required: true, message: '请选择房屋用途', trigger: 'change' }],
buildingAdmin: [{ required: true, message: '请输入楼栋管理员', trigger: 'blur' }],
adminPhone: [
{ required: true, message: '请输入管理员联系电话', trigger: 'blur' },
......@@ -186,22 +176,8 @@
created () {
//备份model原始值
this.modelDefault = JSON.parse(JSON.stringify(this.model));
this.initDictData()
},
methods: {
initDictData() {
//优先从缓存中读取字典配置
if(getDictItemsFromCache('house_purpose')){
this.dictOptions = getDictItemsFromCache('house_purpose');
return
}
// //根据字典Code, 初始化字典数组
ajaxGetDictItems('house_purpose', null).then((res) => {
if (res.success) {
this.dictOptions = res.result;
}
})
},
ruleNumberInput(event) {
let rateValue = event.target.value.replace(/[^\d]/g,"");//清除"数字"和"."和"-"以外的字符
this.model['empowerDays'] = rateValue
......
src/views/information/owner/modules/NoticeForm.vue
浏览文件 @ d57a4bbf
......@@ -32,13 +32,26 @@
<a-input v-model="model.ownerPhone" placeholder="请输入业主联系方式"></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<!-- <a-col :span="24">
<a-form-model-item label="性别" :labelCol=" { xs: { span: 24 }, sm: { span: 3 } }" :wrapperCol="wrapperCol" prop="sex">
<a-radio-group v-model="model.sex">
<a-radio :value="1">男</a-radio>
<a-radio :value="2">女</a-radio>
</a-radio-group>
</a-form-model-item>
</a-col> -->
<a-col :span="12">
<a-form-model-item label="性别" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sex">
<a-radio-group v-model="model.sex">
<a-radio :value="1">男</a-radio>
<a-radio :value="2">女</a-radio>
</a-radio-group>
</a-form-model-item>
</a-col>
<a-col :span="12">
<a-form-model-item label="年龄" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="age">
<a-input-number v-model="model.age" style="width:100%" placeholder="请输入年龄" :min="0" />
</a-form-model-item>
</a-col>
<a-col :span="12">
<a-form-model-item label="证件类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="certificateType">
......@@ -121,6 +134,7 @@
floorSpace: '',
ownerName: '',
sex: 1,
age: undefined,
ownerPhone: '',
certificateType: '1',
certificateNo: '',
......
src/views/information/owner/owner-add.vue
浏览文件 @ d57a4bbf
......@@ -81,9 +81,17 @@
</a-row>
</a-form-model>
</j-form-container>
<h4 style="padding:20px 0 0 50px;line-height:30px;">审核意见</h4>
<div class="row-box">
<a-textarea style="width:500px" v-model="auditOpinion" placeholder="请输入" allow-clear />
<!-- <h4 style="padding:20px 0 0 50px;line-height:30px;">审核意见</h4> -->
<div>
<a-form-model>
<a-row>
<a-col :span="12">
<a-form-model-item label="审核意见" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-textarea style="width:600px" v-model="auditOpinion" placeholder="请输入" allow-clear />
</a-form-model-item>
</a-col>
</a-row>
</a-form-model>
<a-row type="flex" justify="end">
<a-button @click="onCancel">取消</a-button>
<a-button @click="onSubmit('auditPass')" type="primary" style="margin-left: 10px;">审核通过</a-button>
......@@ -210,7 +218,7 @@
},
async getPageDetail() {
let {result} = await geCommunityOwnertInfoApi({id: this.$route.query.id})
this.edit(result)
this.edit(result.communityOwner)
},
async edit(record) {
if(record.buildingId) {
......
src/views/information/owner/owner-setting.vue
浏览文件 @ d57a4bbf
......@@ -78,17 +78,18 @@
</a-form-model>
</j-form-container>
<a-divider />
<h4 style="padding:0 50px;line-height:30px;">{{labelType === '1' ? '业主委员会信息' : '贫困人员信息'}}</h4>
<j-form-container v-if="labelType === '1'">
<template v-if="labelType === '1' || (labelType === '3' && formParamas.labelCode)">
<h4 style="padding:0 50px;line-height:30px;">业主委员会信息</h4>
<j-form-container :disabled="labelType === '3'">
<a-form-model ref="form" :model="formParamas" :rules="validatorRules" slot="detail">
<a-row>
<a-col :span="12">
<a-col :span="12" style="position:relative">
<a-form-model-item label="访问域名前缀" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="accessAddress">
<a-input v-model="formParamas.accessAddress" placeholder="请输入访问域名前缀" addon-after=".committee.hjxbc.cn" disabled></a-input>
<p v-if="model.accessAddress">访问域名：{{ formParamas.accessAddress }}.committee.hjxbc.cn</p>
</a-form-model-item>
<a @click="onCopyLink" v-if="formParamas.accessAddress" style="position:absolute;top:0;right:-10px;line-height:40px;z-index:999;pointer-events:auto;">复制</a>
</a-col>
<a-button type="link" style="line-height:40px" @click="onCopyLink">复制</a-button>
</a-row>
<a-row>
<a-col :span="12">
......@@ -123,13 +124,16 @@
<a-col :span="24">
<a-form-model-item label="说明" :labelCol="{ xs:{ span: 24 }, sm:{ span: 3 } }" :wrapperCol="wrapperCol" prop="labelRemark">
<!-- <a-textarea style="width:500px" v-model="formParamas.labelRemark" placeholder="请输入" allow-clear /> -->
<j-editor placeholder="请输入内容" v-model="formParamas.labelRemark"/>
<j-editor placeholder="请输入内容" :disabled="labelType === '3'" v-model="formParamas.labelRemark"/>
</a-form-model-item>
</a-col>
</a-row>
</a-form-model>
</j-form-container>
<j-form-container v-else>
</template>
<template v-if="labelType === '2' || (labelType === '3' && formModel.labelCode)">
<h4 style="padding:0 50px;line-height:30px;">贫困人员信息</h4>
<j-form-container :disabled="labelType === '3'">
<a-form-model ref="form" :model="formModel" :rules="validatorRules" slot="detail">
<a-row>
<a-col :span="12">
......@@ -147,16 +151,17 @@
<a-col :span="24">
<a-form-model-item label="说明" :labelCol="{ xs:{ span: 24 }, sm:{ span: 3 } }" :wrapperCol="wrapperCol" prop="labelRemark">
<!-- <a-textarea style="width:500px" v-model="formModel.labelRemark" placeholder="请输入" allow-clear /> -->
<j-editor placeholder="请输入内容" v-model="formModel.labelRemark"/>
<j-editor placeholder="请输入内容" v-model="formModel.labelRemark" :disabled="labelType === '3'"/>
</a-form-model-item>
</a-col>
</a-row>
</a-form-model>
</j-form-container>
</template>
<div class="row-box">
<a-row type="flex" justify="end">
<a-button @click="onCancel">返回</a-button>
<a-button @click="onSubmit" type="primary" style="margin-left: 10px;">确认</a-button>
<a-button v-if="labelType !== '3'" @click="onSubmit" type="primary" style="margin-left: 10px;">确认</a-button>
</a-row>
</div>
</a-spin>
......@@ -204,6 +209,7 @@
confirmLoading: false,
formModel: {
labelCode: '',
potions: [],
labelImg: '',
labelRemark: ''
......@@ -258,6 +264,36 @@
if(this.labelType === '1') {
this.formParamas.adminLoginName = result.communityOwner.ownerPhone
this.formParamas.accessAddress = result.communityVo.accessAddress
this.formParamas.committeeName = result.committee ? result.committee.committeeName : ''
}
if(this.labelType === '3') {
let formParamas = {
accessAddress: result.communityVo.accessAddress,
labelCode: result.committeeInfo ? result.committeeInfo.labelCode : null,
committeeName: result.committee.committeeName,
adminLoginName: result.communityOwner.ownerPhone,
adminPassword: result.communityVo.adminPassword,
labelImg: result.committeeInfo ? result.committeeInfo.labelImg : null,
labelRemark: result.committeeInfo ? result.committeeInfo.labelRemark : null
}
this.formParamas = {...formParamas}
if(result.destituteInfo && result.destituteInfo.labelCode) {
let labelCodes = result.destituteInfo.labelCode.split(',')
let labelDescs = result.destituteInfo.labelDesc.split(',')
let potions = labelCodes.map((item, index)=> {
return {
key: item,
label: labelDescs[index]
}
})
let formModel = {
potions,
labelCode: result.destituteInfo ? result.destituteInfo.labelCode : null,
labelImg: result.destituteInfo ? result.destituteInfo.labelImg : null,
labelRemark: result.destituteInfo ? result.destituteInfo.labelRemark : null
}
this.formModel = {...formModel}
}
}
},
onCancel() {
......@@ -299,8 +335,12 @@
labelCode,
labelDesc
}).then(res=> {
if(res.code === 200) {
this.$message.success(res.message);
this.closeCurrent()
} else {
this.$message.warning(res.message);
}
})
}
}
......
src/views/information/owner/owner.vue
浏览文件 @ d57a4bbf
......@@ -113,12 +113,12 @@
<a @click="handlePerssion(record.id)">授权</a>
</a-menu-item>
<a-menu-item>
<a href="javascript:;" @click="handleDetail(record)">详情</a>
<a href="javascript:;" @click="onHandleSetting(record.id, '3')">详情</a>
</a-menu-item>
<a-menu-item v-if="!record.labelCommitteeCode">
<a href="javascript:;" @click="onHandleSetting(record.id, '1')">设置业委会</a>
</a-menu-item>
<a-menu-item>
<a-menu-item v-if="record.destituteAuditStatus !== 'auditPass'">
<a href="javascript:;" @click="onHandleSetting(record.id, '2')">设置特困人员</a>
</a-menu-item>
<a-menu-item v-if="!!record.labelCommitteeCode">
......
src/views/property/complaint/complaint.vue
浏览文件 @ d57a4bbf
......@@ -93,7 +93,8 @@
dataIndex: 'complaintNo',
key: 'complaintNo',
align: 'center',
width: 270
width: 270,
ellipsis: true
},
{
title: '投诉主题',
......
src/views/property/record/RecordList.vue
浏览文件 @ d57a4bbf
......@@ -141,6 +141,7 @@ const columns = [
title: '公司审核状态',
dataIndex: 'companyAuditStatus',
key: 'companyAuditStatus',
align: 'center',
// customRender: function (text) {
// return filterDictTextByCache('companyAuditStatus', text)
// },
......@@ -249,6 +250,9 @@ export default {
},
handlePerssion(roleId) {
this.$refs.modalUserRole.show(roleId)
},
loadData() {
console.log('不请求')
}
},
}
......
src/views/user/LoginAccount.vue
浏览文件 @ d57a4bbf
......@@ -2,7 +2,7 @@
<div>
<a-form-model ref="form" :model="model" :rules="validatorRules">
<a-form-model-item required prop="username">
<a-input v-model="model.username" size="large" placeholder="请输入帐户">
<a-input v-model="model.username" size="large" placeholder="请输入帐号">
<a-icon slot="prefix" type="user" :style="{ color: 'rgba(0,0,0,.25)' }"/>
</a-input>
</a-form-model-item>
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论