Skip to content

T
total-platform
提交 515bcd55 authored 作者: 宋雄's avatar 宋雄
浏览文件
操作

一期封版

上级 972750af
隐藏空白字符变更
内嵌 并排
正在显示 包含 61 行增加 和 72 行删除
.env.development
浏览文件 @ 515bcd55
NODE_ENV=development
# VUE_APP_API_BASE_URL='http://192.168.0.119: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_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/components/jeecgbiz/modal/JSelectDepartModal.vue
浏览文件 @ 515bcd55
......@@ -72,8 +72,10 @@
this.initDepartComponent()
},
visible: {
handler() {
this.loadDepart();
handler(newV) {
if(newV) {
this.loadDepart();
}
this.initDepartComponent(true)
}
}
......
src/components/page/GlobalHeader.vue
浏览文件 @ 515bcd55
......@@ -17,8 +17,7 @@
:type="collapsed ? 'menu-unfold' : 'menu-fold'"
@click="toggle"/>
<span v-if="device === 'desktop'">欢迎进入 湖北汉江之星科技有限公司 企业平台</span>
<span v-else>Jeecg-Boot</span>
<span>欢迎进入 湖北汉江之星科技有限公司 企业平台</span>
<user-menu :theme="theme"/>
</div>
......
src/components/page/GlobalLayout.vue
浏览文件 @ 515bcd55
......@@ -597,6 +597,8 @@
img {
height: 32px;
width: auto;
position: initial;
}
h1 {
......
src/views/cost/CostList.vue
浏览文件 @ 515bcd55
......@@ -56,16 +56,16 @@
<span v-if="record.chargingStatus === 'freeze'">冻结</span>
</span>
<span slot="action" slot-scope="text, record">
<a @click="handleEdit(record)" v-if="record.auditStatus != 'waitAudit'">编辑</a>
<a @click="handleDetail(record)">详情</a>
<a-divider type="vertical" />
<a-dropdown>
<a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
<a-menu slot="overlay">
<a-menu-item>
<a @click="handleDetail(record)">详情</a>
<a-menu-item v-if="record.auditStatus != 'waitAudit'">
<a @click="handleEdit(record)">编辑</a>
</a-menu-item>
<a-menu-item>
<a-menu-item v-if="record.auditStatus === 'auditPass'">
<a href="javascript:;"
@click="onChargingStatus(record)">{{record.chargingStatus === 'normal' ? '冻结' : '解冻'}}</a>
</a-menu-item>
......@@ -114,12 +114,12 @@ const columns = [
},
align: 'center'
},
{
title: '授权物业数量',
dataIndex: 'empowerNum',
key: 'empowerNum',
align: 'center'
},
// {
// title: '授权物业数量',
// dataIndex: 'empowerNum',
// key: 'empowerNum',
// align: 'center'
// },
{
title: '授权天数',
dataIndex: 'empowerDays',
......
src/views/cost/modules/PropertyChargruleForm.vue
浏览文件 @ 515bcd55
......@@ -15,18 +15,18 @@
</a-select>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-col :span="24" v-if="model.chargingCycle !== '4' && model.chargingCycle !== '5'">
<a-form-model-item label="授权天数" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="empowerDays">
<a-input :disabled="model.chargingCycle !== '4' && model.chargingCycle !== '5'" v-model="model.empowerDays" @blur="ruleNumberInput" placeholder="请输入授权天数">
<div slot="addonAfter">天</div>
</a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<!-- <a-col :span="24">
<a-form-model-item label="授权小区数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="empowerNum">
<a-input-number v-model="model.empowerNum" :min="1" :precision="0" placeholder="请输入授权小区数量" style="width: 100%" />
</a-form-model-item>
</a-col>
</a-col> -->
<a-col :span="24">
<a-form-model-item label="收费金额" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="chargingMoney">
<a-input-number v-model="model.chargingMoney" :min="0.01" :precision="2" placeholder="请输入收费金额" style="width: 100%" />
......@@ -62,7 +62,7 @@
chargingName: '',
chargingMoney: '',
chargingCycle: '',
empowerNum: '',
// empowerNum: '',
empowerDays: ''
},
labelCol: {
......@@ -77,8 +77,8 @@
validatorRules: {
chargingName: [{ required: true, message: '请输入收费名称', trigger: 'blur' }],
chargingCycle: [{ required: true, message: '请选择收费方式', trigger: 'change' }],
empowerDays: [{ required: true, message: '请输入授权日期', trigger: 'blur' }],
empowerNum: [{ required: true, message: '请输入授权小区数量', trigger: 'blur' }],
// empowerDays: [{ required: true, message: '请输入授权日期', trigger: 'blur' }],
// empowerNum: [{ required: true, message: '请输入授权小区数量', trigger: 'blur' }],
chargingMoney: [{ required: true, message: '请输入收费金额', trigger: 'blur' }]
},
url: {
......
src/views/dashboard/IndexChart.vue
浏览文件 @ 515bcd55
......@@ -48,19 +48,19 @@
<h3 class="box-title">待处理事务（入驻待审核）</h3>
<div class="content" v-if="waitAuditList.length > 0">
<div class="item" v-for="(item, index) in waitAuditList" :key="index">
<template v-if="item[0].creditCode">
<p>入驻物业集团名称：{{ item[0].propertyName }}</p>
<p>申请入驻小区数量：{{ item[0].empowerCommunityNum }}</p>
<p>申请入驻物业时间：{{ item[0].createTime }}</p>
<p>添加人：{{ item[0].createBy }}</p>
<a-button type="primary" size="small" @click="toOperation(item[0], 1)">审核</a-button>
<template v-if="item.creditCode">
<p>入驻物业集团名称：{{ item.propertyName }}</p>
<p>申请入驻小区数量：{{ item.empowerCommunityNum }}</p>
<p>申请入驻物业时间：{{ item.createTime }}</p>
<p>添加人：{{ item.createBy }}</p>
<a-button type="primary" size="small" @click="toOperation(item, 1)">审核</a-button>
</template>
<template v-else>
<p>入驻社区名称：{{ item[0].councilsName }}</p>
<p>申请入驻小区数量：{{ item[0].empowerCommunityNum }}</p>
<p>申请入驻社区时间：{{ item[0].createTime }}</p>
<p>添加人：{{ item[0].createBy }}</p>
<a-button type="primary" size="small" @click="toOperation(item[0], 2)">审核</a-button>
<p>入驻社区名称：{{ item.councilsName }}</p>
<p>申请入驻小区数量：{{ item.empowerCommunityNum }}</p>
<p>申请入驻社区时间：{{ item.createTime }}</p>
<p>添加人：{{ item.createBy }}</p>
<a-button type="primary" size="small" @click="toOperation(item, 2)">审核</a-button>
</template>
</div>
</div>
......@@ -169,7 +169,9 @@ export default {
monthOwnerNum: result.monthOwnerNum,
monthSettledNum: result.monthSettledNum,
}
this.waitAuditList = result.waitAuditList
let propertyList = result.waitAuditList[0] || []
let communityList = result.waitAuditList[1] || []
this.waitAuditList = propertyList.concat(communityList)
this.mapData =
result.propertySettledList.map((item) => {
return {
......
src/views/settled/PropertyDetails.vue
浏览文件 @ 515bcd55
......@@ -96,14 +96,14 @@
</a-col>
<a-col :span="12">
<a-form-model-item label="授权小区数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="empowerCommunityNum">
<a-input-number v-model="model.empowerCommunityNum" placeholder="请输入试用小区数量" style="width: 100%" @change="onValidatorInputNum" />
<a-input-number v-model="model.empowerCommunityNum" placeholder="请输入试用小区数量" style="width: 100%" />
</a-form-model-item>
</a-col>
<a-col :span="12">
<a-form-model-item label="收费标准" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="chargingStandardId">
<a-select v-model="model.chargingStandardId" placeholder="请选择收费标准" style="width: 100%" @change="onValidatorNum">
<a-select v-model="model.chargingStandardId" placeholder="请选择收费标准" style="width: 100%">
<a-select-option v-for="item in costList" :key="item.id"
:value="item.id">{{item.chargingName}}（{{item.empowerNum}}个小区）</a-select-option>
:value="item.id">{{item.chargingName}}</a-select-option>
</a-select>
</a-form-model-item>
</a-col>
......@@ -317,22 +317,22 @@ export default {
this.$store.dispatch('tags/delView', this.$route.path)
this.$router.go(-1)
},
onValidatorInputNum(val) {
if(this.model.chargingStandardId) {
let row = this.costList.find(item=>item.id === this.model.chargingStandardId)
if(val > row.empowerNum) {
this.$message.warning('授权小区数量不能大于收费标准规定社区数！')
this.model.empowerCommunityNum = undefined
}
}
},
onValidatorNum(val) {
let row = this.costList.find(item=>item.id === val)
if(this.model.empowerCommunityNum > row.empowerNum) {
this.$message.warning('授权小区数量不能大于收费标准规定社区数！')
this.model.empowerCommunityNum = undefined
}
},
// onValidatorInputNum(val) {
// if(this.model.chargingStandardId) {
// let row = this.costList.find(item=>item.id === this.model.chargingStandardId)
// if(val > row.empowerNum) {
// this.$message.warning('授权小区数量不能大于收费标准规定社区数！')
// this.model.empowerCommunityNum = undefined
// }
// }
// },
// onValidatorNum(val) {
// let row = this.costList.find(item=>item.id === val)
// if(this.model.empowerCommunityNum > row.empowerNum) {
// this.$message.warning('授权小区数量不能大于收费标准规定社区数！')
// this.model.empowerCommunityNum = undefined
// }
// },
contactPhoneChange(e) {
if (!this.model.adminLoginName) {
this.model.adminLoginName = e.target.value
......
src/views/settled/community/communityDetails.vue
浏览文件 @ 515bcd55
......@@ -82,14 +82,14 @@
<a-col :span="12">
<a-form-model-item label="授权小区数量" :labelCol="labelCol" :wrapperCol="wrapperCol"
prop="empowerCommunityNum">
<a-input-number v-model="model.empowerCommunityNum" placeholder="请输入试用小区数量" style="width: 100%" @change="onValidatorInputNum" />
<a-input-number v-model="model.empowerCommunityNum" placeholder="请输入试用小区数量" style="width: 100%" />
</a-form-model-item>
</a-col>
<a-col :span="12">
<a-form-model-item label="收费标准" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="chargingStandardId">
<a-select v-model="model.chargingStandardId" placeholder="请选择收费标准" style="width: 100%" @change="onValidatorNum">
<a-select v-model="model.chargingStandardId" placeholder="请选择收费标准" style="width: 100%">
<a-select-option v-for="item in costList" :key="item.id"
:value="item.id">{{item.chargingName}}（{{item.empowerNum}}个小区）</a-select-option>
:value="item.id">{{item.chargingName}}</a-select-option>
</a-select>
</a-form-model-item>
</a-col>
......@@ -289,22 +289,6 @@ export default {
onCancel() {
this.closeCurrent()
},
onValidatorInputNum(val) {
if(this.model.chargingStandardId) {
let row = this.costList.find(item=>item.id === this.model.chargingStandardId)
if(val > row.empowerNum) {
this.$message.warning('授权小区数量不能大于收费标准规定社区数！')
this.model.empowerCommunityNum = undefined
}
}
},
onValidatorNum(val) {
let row = this.costList.find(item=>item.id === val)
if(this.model.empowerCommunityNum > row.empowerNum) {
this.$message.warning('授权小区数量不能大于收费标准规定社区数！')
this.model.empowerCommunityNum = undefined
}
},
contactPhoneChange(e) {
if (!this.model.adminLoginName) {
this.model.adminLoginName = e.target.value
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论