yunxi
/
ningxiaWeb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

回收站接单范围单位问题修复

Browse Source
master
LI-CCONG\李聪聪 7 months ago
parent b7ba20cc87
commit face525539
1 changed files with 316 additions and 257 deletions
Show Stats Download Patch File Download Diff File

117
jnpf-java-boot/jnpf-web/src/views/enterpriserecyclestation/form.vue
Unescape View File

@ -17,16 +17,19 @@
{{'下一条'}}
</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>
</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-form ref="formRef" :model="dataForm" :rules="dataRule" size="default"
label-width="100px" label-position="right">
<template v-if="!loading">
<!-- 具体表单 -->
<el-col :span="24">
@ -37,68 +40,87 @@
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="回收站编号" prop="stationCode">
<JnpfInput v-model="dataForm.stationCode" @change="changeData('stationCode',-1)" placeholder="请输入" clearable :style='{"width":"100%"}'>
<JnpfInput v-model="dataForm.stationCode" @change="changeData('stationCode',-1)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="回收站名称" prop="stationName">
<JnpfInput v-model="dataForm.stationName" @change="changeData('stationName',-1)" placeholder="请输入" clearable :style='{"width":"100%"}'>
<JnpfInput v-model="dataForm.stationName" @change="changeData('stationName',-1)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item class="site-item" label="详细地址" prop="stationName">
<JnpfInput class="input" disabled v-model="dataForm.address" @change="changeData('stationName',-1)" placeholder="请选择详细地址" clearable :style='{"width":"100%"}'>
<JnpfInput class="input" disabled v-model="dataForm.address"
@change="changeData('stationName',-1)" placeholder="请选择详细地址" clearable
:style='{"width":"100%"}'>
</JnpfInput>
<el-button @click="handleShowMap">选择地址</el-button>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="回收站简称" prop="shortName">
<JnpfInput v-model="dataForm.shortName" @change="changeData('shortName',-1)" placeholder="请输入" clearable :style='{"width":"100%"}'>
<JnpfInput v-model="dataForm.shortName" @change="changeData('shortName',-1)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="经营模式" prop="managementModel">
<JnpfSelect v-model="dataForm.managementModel" @change="changeData('managementModel',-1)" placeholder="请选择" clearable :style='{"width":"100%"}' :options="managementModelOptions" :props="managementModelProps">
<JnpfSelect v-model="dataForm.managementModel"
@change="changeData('managementModel',-1)" placeholder="请选择" clearable
:style='{"width":"100%"}' :options="managementModelOptions"
:props="managementModelProps">
</JnpfSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="所在城市" prop="city">
<JnpfAreaSelect v-model="dataForm.city" @change="changeData('city',-1)" placeholder="请选择" clearable :style='{"width":"100%"}' :level="1">
<JnpfAreaSelect v-model="dataForm.city" @change="changeData('city',-1)"
placeholder="请选择" clearable :style='{"width":"100%"}' :level="1">
</JnpfAreaSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="回收类目" prop="recycleTypeIds">
<JnpfSelect v-model="dataForm.recycleTypeIds" @change="changeData('recycleTypeIds',-1)" placeholder="请选择" clearable :style='{"width":"100%"}' :options="recycleTypeIdsOptions" :props="recycleTypeIdsProps">
<JnpfSelect v-model="dataForm.recycleTypeIds"
@change="changeData('recycleTypeIds',-1)" placeholder="请选择" clearable
:style='{"width":"100%"}' :options="recycleTypeIdsOptions"
:props="recycleTypeIdsProps">
</JnpfSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="首联系人" prop="firstContactPerson">
<JnpfInput v-model="dataForm.firstContactPerson" @change="changeData('firstContactPerson',-1)" placeholder="请输入" clearable :style='{"width":"100%"}'>
<JnpfInput v-model="dataForm.firstContactPerson"
@change="changeData('firstContactPerson',-1)" placeholder="请输入" clearable
:style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="职位" prop="firstContactPersonPosition">
<JnpfInput v-model="dataForm.firstContactPersonPosition" @change="changeData('firstContactPersonPosition',-1)" placeholder="请输入" clearable :style='{"width":"100%"}'>
<JnpfInput v-model="dataForm.firstContactPersonPosition"
@change="changeData('firstContactPersonPosition',-1)" placeholder="请输入" clearable
:style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="手机号码" prop="firstContactPersonTel">
<JnpfInput v-model="dataForm.firstContactPersonTel" @change="changeData('firstContactPersonTel',-1)" placeholder="请输入" clearable :style='{"width":"100%"}'>
<JnpfInput v-model="dataForm.firstContactPersonTel"
@change="changeData('firstContactPersonTel',-1)" placeholder="请输入" clearable
:style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="回收站状态" prop="stationStatus">
<JnpfSwitch v-model="dataForm.stationStatus" @change="changeData('stationStatus',-1)" :active-value="1" :inactive-value="0">
<JnpfSwitch v-model="dataForm.stationStatus"
@change="changeData('stationStatus',-1)" :active-value="1" :inactive-value="0">
</JnpfSwitch>
</jnpf-form-tip-item>
</el-col>
@ -110,7 +132,8 @@
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="回收站照片" prop="stationImg">
<JnpfUploadImg v-model="dataForm.stationImg" @change="changeData('stationImg',-1)" :fileSize="10" sizeUnit="MB" :limit="1" pathType="defaultPath" :isAccount="0">
<JnpfUploadImg v-model="dataForm.stationImg" @change="changeData('stationImg',-1)"
:fileSize="10" sizeUnit="MB" :limit="1" pathType="defaultPath" :isAccount="0">
</JnpfUploadImg>
</jnpf-form-tip-item>
</el-col>
@ -122,13 +145,16 @@
</el-col> -->
<el-col :span="8">
<jnpf-form-tip-item label="回收电话" prop="recycleTel">
<JnpfInput v-model="dataForm.recycleTel" @change="changeData('recycleTel',-1)" placeholder="请输入" clearable :style='{"width":"100%"}'>
<JnpfInput v-model="dataForm.recycleTel" @change="changeData('recycleTel',-1)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="16">
<jnpf-form-tip-item label="回收站介绍" prop="stationDescription">
<JnpfTextarea v-model="dataForm.stationDescription" @change="changeData('stationDescription',-1)" placeholder="请输入" clearable :style='{"width":"100%"}' :autosize='{"minRows":4,"maxRows":4}'>
<JnpfTextarea v-model="dataForm.stationDescription"
@change="changeData('stationDescription',-1)" placeholder="请输入" clearable
:style='{"width":"100%"}' :autosize='{"minRows":4,"maxRows":4}'>
</JnpfTextarea>
</jnpf-form-tip-item>
</el-col>
@ -144,7 +170,11 @@
<span class="required-sign">*</span>回收类目
</template>
<template slot-scope="scope">
<JnpfSelect v-model="scope.row.recycleTypeId" @change="changeData('recyclestationprice-recycleTypeId',scope.$index)" placeholder="请选择" clearable :style='{"width":"100%"}' :options="recyclestationpricerecycleTypeIdOptions" :props="recyclestationpricerecycleTypeIdProps">
<JnpfSelect v-model="scope.row.recycleTypeId"
@change="changeData('recyclestationprice-recycleTypeId',scope.$index)"
placeholder="请选择" clearable :style='{"width":"100%"}'
:options="recyclestationpricerecycleTypeIdOptions"
:props="recyclestationpricerecycleTypeIdProps">
</JnpfSelect>
</template>
</el-table-column>
@ -153,13 +183,16 @@
<span class="required-sign">*</span>单价(kg)
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.unitPrice" @change="changeData('recyclestationprice-unitPrice',scope.$index)" placeholder="请输入" clearable :style='{"width":"100%"}'>
<JnpfInput v-model="scope.row.unitPrice"
@change="changeData('recyclestationprice-unitPrice',scope.$index)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="操作" width="50">
<template slot-scope="scope">
<el-button size="mini" type="text" class="JNPF-table-delBtn" @click="delrecyclestationpriceList(scope.$index)">删除</el-button>
<el-button size="mini" type="text" class="JNPF-table-delBtn"
@click="delrecyclestationpriceList(scope.$index)">删除</el-button>
</template>
</el-table-column>
</el-table>
@ -177,21 +210,32 @@
<el-card class="mb-20" shadow="never" header="营业时间配置">
<el-col :span="12">
<jnpf-form-tip-item label="营业时间" prop="businessDays">
<JnpfCheckbox v-model="dataForm.businessDays" @change="changeData('businessDays',-1)" optionType="default" direction="horizontal" :style='{"width":"100%"}' :options="businessDaysOptions" :props="businessDaysProps">
<JnpfCheckbox v-model="dataForm.businessDays"
@change="changeData('businessDays',-1)" optionType="default"
direction="horizontal" :style='{"width":"100%"}' :options="businessDaysOptions"
:props="businessDaysProps">
</JnpfCheckbox>
</jnpf-form-tip-item>
</el-col>
<el-col :span="6">
<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 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="6">
<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>
@ -199,7 +243,9 @@
<el-card class="mb-20" shadow="never" header="接单范围配置">
<el-col :span="8">
<jnpf-form-tip-item label="接单范围" prop="acceptRange">
<JnpfSelect v-model="dataForm.acceptRange" @change="changeData('acceptRange',-1)" placeholder="请选择" clearable :style='{"width":"100%"}' :options="acceptRangeOptions" :props="acceptRangeProps">
<JnpfSelect v-model="dataForm.acceptRange" @change="changeData('acceptRange',-1)"
placeholder="请选择" clearable :style='{"width":"100%"}'
:options="acceptRangeOptions" :props="acceptRangeProps">
</JnpfSelect>
</jnpf-form-tip-item>
</el-col>
@ -216,13 +262,23 @@
<span class="required-sign">*</span>小区id
</template>
<template slot-scope="scope">
<JnpfPopupSelect v-model="scope.row.housingEstateId" @change="changeData('recyclestationhousingestate-housingEstateId',scope.$index)" :rowIndex="scope.$index" :formData="dataForm" :templateJson="interfaceRes.recyclestationhousingestatehousingEstateId" placeholder="请选择" propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='name' :field="'housingEstateId'+scope.$index" interfaceId="520155939362312325" :pageSize="20" :columnOptions="recyclestationhousingestatehousingEstateIdcolumnOptions" clearable :style='{"width":"100%"}'>
<JnpfPopupSelect v-model="scope.row.housingEstateId"
@change="changeData('recyclestationhousingestate-housingEstateId',scope.$index)"
:rowIndex="scope.$index" :formData="dataForm"
:templateJson="interfaceRes.recyclestationhousingestatehousingEstateId"
placeholder="请选择" propsValue="id" popupWidth="800px" popupTitle="选择数据"
popupType="dialog" relationField='name'
:field="'housingEstateId'+scope.$index" interfaceId="520155939362312325"
:pageSize="20"
:columnOptions="recyclestationhousingestatehousingEstateIdcolumnOptions"
clearable :style='{"width":"100%"}'>
</JnpfPopupSelect>
</template>
</el-table-column>
<el-table-column label="操作" width="50">
<template slot-scope="scope">
<el-button size="mini" type="text" class="JNPF-table-delBtn" @click="delrecyclestationhousingestateList(scope.$index)">删除</el-button>
<el-button size="mini" type="text" class="JNPF-table-delBtn"
@click="delrecyclestationhousingestateList(scope.$index)">删除</el-button>
</template>
</el-table-column>
</el-table>
@ -234,8 +290,11 @@
<!-- 表单结束 -->
</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>
<SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm" ref="selectDialog" @select="addForSelect" @close="selectDialogVisible=false" />
<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" />
</el-row>
</div>
</transition>
@ -402,7 +461,7 @@ export default {
recycleTypeIdsProps: { "label": "fullName", "value": "id" },
businessDaysOptions: [{ "fullName": "周一", "id": "1" }, { "fullName": "周二", "id": "2" }, { "fullName": "周三", "id": "3" }, { "fullName": "周四", "id": "4" }, { "fullName": "周五", "id": "5" }, { "fullName": "周六", "id": "6" }, { "fullName": "周日", "id": "7" }],
businessDaysProps: { "label": "fullName", "value": "id" },
acceptRangeOptions: [{ "fullName": "无限制", "id": "0" }, { "fullName": "1KM", "id": "1" }, { "fullName": "3KM", "id": "3" }, { "fullName": "5KM", "id": "5" }],
acceptRangeOptions: [{ "fullName": "5KM以内", "id": 5000 }, { "fullName": "10KM以内", "id": 100000 }, { "fullName": "20KM以内", "id": 200000 }],
acceptRangeProps: { "label": "fullName", "value": "id" },
recyclestationpricerecycleTypeIdOptions: [],
recyclestationpricerecycleTypeIdProps: { "label": "fullName", "value": "id" },

Write Preview
Loading…
Cancel
Save