小区加图片

master
CJYXTX\27961 7 months ago
parent 0fab591fa0
commit 5bb2d139af

@ -406,7 +406,7 @@ public class NxWalletController {
//organize表的json赋值出来
OrganizeCrModel organizeCrModel=new OrganizeCrModel();
organizeCrModel= JSONObject.parseObject(organizeEntityList.get(0).getPropertyJson(),OrganizeCrModel.class);
organizeCrModel.getManagerTelePhone();
// organizeCrModel.getManagerTelePhone();
//修改人手机号是否等于商户创建人的手机号
boolean areEqual = userUserAccountId.equals(organizeCrModel.getManagerTelePhone());
if (areEqual==false){

@ -18,6 +18,8 @@ public class HousingEstateEntity {
private String id;
@TableField(value = "NAME" , updateStrategy = FieldStrategy.IGNORED)
private String name;
@TableField(value = "IMAGES" , updateStrategy = FieldStrategy.IGNORED)
private String images;
@TableField(value = "ADDRESS" , updateStrategy = FieldStrategy.IGNORED)
private String address;
@TableField(value = "LONGITUDE" , updateStrategy = FieldStrategy.IGNORED)

@ -25,6 +25,9 @@ public class HousingEstateForm {
/** 小区详细地址 **/
@JsonProperty("address")
private String address;
/** 小区图片 **/
@JsonProperty("images")
private Object images;
/** 启用禁用 **/
@JsonProperty("enabledMark")
private Integer enabledMark;

@ -8,9 +8,8 @@
<el-button @click="goBack"></el-button>
</div>
</div>
<el-row :gutter="15" class=" main" :style="{margin: '0 auto',width: '100%'}">
<el-form ref="formRef" :model="dataForm" size="default" label-width="100px"
label-position="right">
<el-row :gutter="15" class=" main" :style="{ margin: '0 auto', width: '100%' }">
<el-form ref="formRef" :model="dataForm" size="default" label-width="100px" label-position="right">
<template v-if="!loading">
<el-col :span="24">
<jnpf-form-tip-item label-width="0">
@ -20,17 +19,25 @@
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="小区名" prop="name">
<p>{{dataForm.name}}</p>
<p>{{ dataForm.name }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="10">
<jnpf-form-tip-item label="小区详细地址" prop="address">
<p>{{dataForm.address}}</p>
<p>{{ dataForm.address }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item label="小区图片" prop="images">
<JnpfUploadImg v-model="dataForm.images" disabled detailed :fileSize="10" sizeUnit="MB" :limit="1"
pathType="defaultPath" :isAccount="0">
</JnpfUploadImg>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="启用禁用" prop="enabledMark">
<p>{{dataForm.enabledMark}}</p>
<p>{{ dataForm.enabledMark }}</p>
</jnpf-form-tip-item>
</el-col>
<!-- <el-col :span="8">
@ -55,22 +62,22 @@
</el-col>
<el-col :span="24">
<jnpf-form-tip-item label="定时定点回收" prop="hasSchedule">
<p>{{dataForm.hasSchedule}}</p>
<p>{{ dataForm.hasSchedule }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="回收地址" prop="recycleAddress">
<p>{{dataForm.recycleAddress}}</p>
<p>{{ dataForm.recycleAddress }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="回收时间起" prop="appointmentTimeStart">
<p>{{dataForm.appointmentTimeStart}}</p>
<p>{{ dataForm.appointmentTimeStart }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="回收时间止" prop="appointmentTimeEnd">
<p>{{dataForm.appointmentTimeEnd}}</p>
<p>{{ dataForm.appointmentTimeEnd }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">

@ -1,14 +1,8 @@
<template>
<template>
<transition name="el-zoom-in-center">
<div class="JNPF-preview-main">
<div class="JNPF-common-page-header">
<el-page-header
@back="goBack"
:content="!dataForm.id ? '新建' : '编辑'"
/>
<el-page-header @back="goBack" :content="!dataForm.id ? '新建' : '编辑'" />
<div class="options">
<el-dropdown class="dropdown" placement="bottom">
<el-button style="width: 70px">
@ -23,42 +17,21 @@
{{ "下一条" }}
</el-dropdown-item>
</template>
<el-dropdown-item
type="primary"
@click.native="dataFormSubmit(2)"
:loading="continueBtnLoading"
:disabled="btnLoading"
>
<el-dropdown-item type="primary" @click.native="dataFormSubmit(2)" :loading="continueBtnLoading"
:disabled="btnLoading">
{{
!dataForm.id ? "确定并新增" : "确定并继续"
}}</el-dropdown-item
>
!dataForm.id ? "确定并新增" : "确定并继续"
}}</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<el-button
type="primary"
@click="dataFormSubmit()"
:loading="btnLoading"
:disabled="continueBtnLoading"
>
</el-button
>
<el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading" :disabled="continueBtnLoading">
</el-button>
<el-button @click="goBack"> </el-button>
</div>
</div>
<el-row
:gutter="15"
class="main"
:style="{ margin: '0 auto', width: '100%' }"
>
<el-form
ref="formRef"
:model="dataForm"
:rules="dataRule"
size="default"
label-width="100px"
label-position="right"
>
<el-row :gutter="15" class="main" :style="{ margin: '0 auto', width: '100%' }">
<el-form ref="formRef" :model="dataForm" :rules="dataRule" size="default" label-width="100px"
label-position="right">
<template v-if="!loading">
<!-- 具体表单 -->
<el-col :span="24">
@ -69,29 +42,17 @@
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="小区名" prop="name">
<JnpfInput
v-model="dataForm.name"
@change="changeData('name', -1)"
placeholder="请输入"
clearable
:style="{ width: '100%' }"
>
<JnpfInput v-model="dataForm.name" @change="changeData('name', -1)" placeholder="请输入" clearable
:style="{ width: '100%' }">
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<!-- {{ this.$store.getters.userInfo.organizeId }} -->
<jnpf-form-tip-item label="所属商户" prop="enterpriseId">
<JnpfDepSelect
v-model="dataForm.enterpriseId"
@change="changeData('enterpriseId', -1)"
placeholder="请选择"
selectType="all"
:ableIds="ableAll.enterpriseIdableIds"
clearable
disabled="true"
:style="{ width: '100%' }"
>
<JnpfDepSelect v-model="dataForm.enterpriseId" @change="changeData('enterpriseId', -1)"
placeholder="请选择" selectType="all" :ableIds="ableAll.enterpriseIdableIds" clearable disabled="true"
:style="{ width: '100%' }">
</JnpfDepSelect>
</jnpf-form-tip-item>
</el-col>
@ -110,33 +71,26 @@
</el-col> -->
<el-col :span="8">
<jnpf-form-tip-item
class="site-item"
label="详细地址"
prop="address"
>
<JnpfInput
class="input"
disabled
v-model="dataForm.address"
@change="changeData('address', -1)"
placeholder="请选择详细地址"
clearable
:style="{ width: '100%' }"
>
<jnpf-form-tip-item class="site-item" label="详细地址" prop="address">
<JnpfInput class="input" disabled v-model="dataForm.address" @change="changeData('address', -1)"
placeholder="请选择详细地址" clearable :style="{ width: '100%' }">
</JnpfInput>
<el-button @click="handleShowMap"></el-button>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item label="小区图片" prop="images">
<JnpfUploadImg v-model="dataForm.images" @change="changeData('images', -1)" :fileSize="10" sizeUnit="MB"
:limit="1" pathType="defaultPath" :isAccount="0">
</JnpfUploadImg>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="启用禁用" prop="enabledMark">
<JnpfSwitch
v-model="dataForm.enabledMark"
@change="changeData('enabledMark', -1)"
:active-value="1"
:inactive-value="0"
>
<JnpfSwitch v-model="dataForm.enabledMark" @change="changeData('enabledMark', -1)" :active-value="1"
:inactive-value="0">
</JnpfSwitch>
</jnpf-form-tip-item>
</el-col>
@ -162,73 +116,40 @@
</el-col>
<el-col :span="24">
<jnpf-form-tip-item label="定时定点回收" prop="hasSchedule">
<JnpfSwitch
v-model="dataForm.hasSchedule"
@change="changeData('hasSchedule', -1)"
:active-value="1"
:inactive-value="0"
>
<JnpfSwitch v-model="dataForm.hasSchedule" @change="changeData('hasSchedule', -1)" :active-value="1"
:inactive-value="0">
</JnpfSwitch>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="回收地址" prop="recycleAddress">
<JnpfInput
v-model="dataForm.recycleAddress"
@change="changeData('recycleAddress', -1)"
placeholder="请输入"
clearable
:style="{ width: '100%' }"
>
<JnpfInput v-model="dataForm.recycleAddress" @change="changeData('recycleAddress', -1)"
placeholder="请输入" clearable :style="{ width: '100%' }">
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item
label="回收时间起"
prop="appointmentTimeStart"
>
<JnpfTimePicker
v-model="dataForm.appointmentTimeStart"
@change="changeData('appointmentTimeStart', -1)"
:startTime="time(false, 1, 1, '', 'HH:mm', '')"
:endTime="time(false, 1, 1, '', 'HH:mm', '')"
placeholder="请选择"
clearable
:style="{ width: '100%' }"
format="HH:mm"
>
<jnpf-form-tip-item label="回收时间起" prop="appointmentTimeStart">
<JnpfTimePicker v-model="dataForm.appointmentTimeStart" @change="changeData('appointmentTimeStart', -1)"
:startTime="time(false, 1, 1, '', 'HH:mm', '')" :endTime="time(false, 1, 1, '', 'HH:mm', '')"
placeholder="请选择" clearable :style="{ width: '100%' }" format="HH:mm">
</JnpfTimePicker>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="回收时间止" prop="appointmentTimeEnd">
<JnpfTimePicker
v-model="dataForm.appointmentTimeEnd"
@change="changeData('appointmentTimeEnd', -1)"
:startTime="time(false, 1, 1, '', 'HH:mm', '')"
:endTime="time(false, 1, 1, '', 'HH:mm', '')"
placeholder="请选择"
clearable
:style="{ width: '100%' }"
format="HH:mm"
>
<JnpfTimePicker v-model="dataForm.appointmentTimeEnd" @change="changeData('appointmentTimeEnd', -1)"
:startTime="time(false, 1, 1, '', 'HH:mm', '')" :endTime="time(false, 1, 1, '', 'HH:mm', '')"
placeholder="请选择" clearable :style="{ width: '100%' }" format="HH:mm">
</JnpfTimePicker>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="来源" prop="sourceType">
<JnpfSelect
v-model="dataForm.sourceType"
@change="changeData('sourceType', -1)"
placeholder="请选择"
clearable
:style="{ width: '100%' }"
:options="sourceTypeOptions"
:props="sourceTypeProps"
>
<JnpfSelect v-model="dataForm.sourceType" @change="changeData('sourceType', -1)" placeholder="请选择"
clearable :style="{ width: '100%' }" :options="sourceTypeOptions" :props="sourceTypeProps">
</JnpfSelect>
</jnpf-form-tip-item>
</el-col>
@ -236,25 +157,12 @@
</template>
</el-form>
<mapComponent
v-if="visibleMap"
:visibleMap="visibleMap"
:longitude="dataForm.longitude"
:latitude="dataForm.latitude"
:address="dataForm.address"
@chooseMapPoint="getCallMap"
@cancel="cancelMap"
@sure="sureMap"
></mapComponent>
<mapComponent v-if="visibleMap" :visibleMap="visibleMap" :longitude="dataForm.longitude"
:latitude="dataForm.latitude" :address="dataForm.address" @chooseMapPoint="getCallMap" @cancel="cancelMap"
@sure="sureMap"></mapComponent>
<SelectDialog
v-if="selectDialogVisible"
:config="currTableConf"
:formData="dataForm"
ref="selectDialog"
@select="addForSelect"
@close="selectDialogVisible = false"
/>
<SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm" ref="selectDialog"
@select="addForSelect" @close="selectDialogVisible = false" />
</el-row>
</div>
</transition>
@ -307,6 +215,7 @@ export default {
Vmodel: "",
currVmodel: "",
dataForm: {
images: [],
enterpriseId: undefined,
name: undefined,
address: undefined,
@ -356,6 +265,14 @@ export default {
trigger: "blur",
},
],
images: [
{
required: true,
message: '请至少选择一个',
trigger: 'change'
},
],
},
sourceTypeOptions: [
{ fullName: "系统导入", id: "1" },
@ -368,6 +285,7 @@ export default {
enterpriseId: [],
name: [],
address: [],
images: [],
enabledMark: [],
latitude: [],
longitude: [],
@ -388,7 +306,7 @@ export default {
this.initDefaultData();
this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm));
},
mounted() {},
mounted() { },
methods: {
handleShowMap() {
this.visibleMap = true;
@ -482,7 +400,7 @@ export default {
}
}
},
dataAll() {},
dataAll() { },
goBack() {
this.$emit("refresh");
},

Loading…
Cancel
Save