|
|
|
@ -36,17 +36,17 @@
|
|
|
|
</el-col>
|
|
|
|
</el-col>
|
|
|
|
<el-col :span="24" >
|
|
|
|
<el-col :span="24" >
|
|
|
|
<jnpf-form-tip-item
|
|
|
|
<jnpf-form-tip-item
|
|
|
|
label="所属回收站" prop="stationCode" >
|
|
|
|
label="站点编号" tipLabel="绑定站点编码" prop="stationCode" >
|
|
|
|
<JnpfSelect v-model="dataForm.stationCode" @change="changeData('stationCode',-1)"
|
|
|
|
<JnpfPopupSelect v-model="dataForm.stationCode" @change="changeData('stationCode',-1)"
|
|
|
|
placeholder="选择本组织回收站进行绑定" clearable :style='{"width":"100%"}' :options="stationCodeOptions" :props="stationCodeProps" >
|
|
|
|
:rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.stationCode" placeholder="请选择为那个站点绘制区域" hasPage propsValue="station_code" popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='station_name' field='stationCode' interfaceId="520259300875047493" :pageSize="20" :columnOptions="stationCodecolumnOptions" clearable :style='{"width":"100%"}'>
|
|
|
|
</JnpfSelect>
|
|
|
|
</JnpfPopupSelect>
|
|
|
|
</jnpf-form-tip-item>
|
|
|
|
</jnpf-form-tip-item>
|
|
|
|
</el-col>
|
|
|
|
</el-col>
|
|
|
|
<el-col :span="24" >
|
|
|
|
<el-col :span="24" >
|
|
|
|
<jnpf-form-tip-item
|
|
|
|
<jnpf-form-tip-item
|
|
|
|
label="地图信息" tipLabel="在地图上绘制电子围栏" prop="areaMapInfo" >
|
|
|
|
label="地图信息" tipLabel="在地图上绘制电子围栏" prop="areaMapInfo" >
|
|
|
|
<JnpfInput v-model="dataForm.areaMapInfo" @change="changeData('areaMapInfo',-1)"
|
|
|
|
<JnpfInput v-model="dataForm.areaMapInfo" @change="changeData('areaMapInfo',-1)"
|
|
|
|
placeholder="绘制电子围栏区域" disabled :maxlength="65539" clearable prefix-icon='ym-custom ym-custom-google-maps' :style='{"width":"100%"}' show-password >
|
|
|
|
placeholder="绘制电子围栏区域" disabled :maxlength="65539" clearable prefix-icon='el-icon-map-location' :style='{"width":"100%"}' show-password >
|
|
|
|
</JnpfInput>
|
|
|
|
</JnpfInput>
|
|
|
|
</jnpf-form-tip-item>
|
|
|
|
</jnpf-form-tip-item>
|
|
|
|
</el-col>
|
|
|
|
</el-col>
|
|
|
|
@ -54,8 +54,24 @@
|
|
|
|
<jnpf-form-tip-item
|
|
|
|
<jnpf-form-tip-item
|
|
|
|
label="区域描述" tipLabel="请输入区域描述" prop="areaDesc" >
|
|
|
|
label="区域描述" tipLabel="请输入区域描述" prop="areaDesc" >
|
|
|
|
<JnpfTextarea v-model="dataForm.areaDesc" @change="changeData('areaDesc',-1)"
|
|
|
|
<JnpfTextarea v-model="dataForm.areaDesc" @change="changeData('areaDesc',-1)"
|
|
|
|
placeholder="请输入不超过两百字的标题描述" :style='{"width":"100%"}' true type="textarea" :autosize='{"minRows":4,"maxRows":4}' >
|
|
|
|
placeholder="请输入不超过两百字的区域描述" :style='{"width":"100%"}' true type="textarea" :autosize='{"minRows":4,"maxRows":4}' >
|
|
|
|
</JnpfTextarea>
|
|
|
|
</JnpfTextarea>
|
|
|
|
|
|
|
|
</jnpf-form-tip-item>
|
|
|
|
|
|
|
|
</el-col>
|
|
|
|
|
|
|
|
<el-col :span="24" >
|
|
|
|
|
|
|
|
<jnpf-form-tip-item
|
|
|
|
|
|
|
|
label="修改用户" prop="lastModifyUserId" >
|
|
|
|
|
|
|
|
<JnpfInput v-model="dataForm.lastModifyUserId" @change="changeData('lastModifyUserId',-1)"
|
|
|
|
|
|
|
|
placeholder="系统自动生成" readonly :style='{"width":"100%"}'>
|
|
|
|
|
|
|
|
</JnpfInput>
|
|
|
|
|
|
|
|
</jnpf-form-tip-item>
|
|
|
|
|
|
|
|
</el-col>
|
|
|
|
|
|
|
|
<el-col :span="24" >
|
|
|
|
|
|
|
|
<jnpf-form-tip-item
|
|
|
|
|
|
|
|
label="修改时间" prop="lastModifyTime" >
|
|
|
|
|
|
|
|
<JnpfInput v-model="dataForm.lastModifyTime" @change="changeData('lastModifyTime',-1)"
|
|
|
|
|
|
|
|
placeholder="系统自动生成" readonly :style='{"width":"100%"}'>
|
|
|
|
|
|
|
|
</JnpfInput>
|
|
|
|
</jnpf-form-tip-item>
|
|
|
|
</jnpf-form-tip-item>
|
|
|
|
</el-col>
|
|
|
|
</el-col>
|
|
|
|
<!-- 表单结束 -->
|
|
|
|
<!-- 表单结束 -->
|
|
|
|
@ -123,11 +139,15 @@
|
|
|
|
currVmodel:"",
|
|
|
|
currVmodel:"",
|
|
|
|
dataForm: {
|
|
|
|
dataForm: {
|
|
|
|
areaName : undefined,
|
|
|
|
areaName : undefined,
|
|
|
|
areaType : "1",
|
|
|
|
areaType : undefined,
|
|
|
|
status : "1",
|
|
|
|
status : "1",
|
|
|
|
stationCode : undefined,
|
|
|
|
stationCode : undefined,
|
|
|
|
areaMapInfo : undefined,
|
|
|
|
areaMapInfo : undefined,
|
|
|
|
areaDesc : undefined,
|
|
|
|
areaDesc : undefined,
|
|
|
|
|
|
|
|
creatorUserId : undefined,
|
|
|
|
|
|
|
|
deleteTime : undefined,
|
|
|
|
|
|
|
|
lastModifyUserId : undefined,
|
|
|
|
|
|
|
|
lastModifyTime : undefined,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
tableRequiredData: {},
|
|
|
|
tableRequiredData: {},
|
|
|
|
dataRule:
|
|
|
|
dataRule:
|
|
|
|
@ -142,7 +162,7 @@
|
|
|
|
areaType: [
|
|
|
|
areaType: [
|
|
|
|
{
|
|
|
|
{
|
|
|
|
required: true,
|
|
|
|
required: true,
|
|
|
|
message: '请至少选择一个',
|
|
|
|
message: '请选择围栏类型',
|
|
|
|
trigger: 'change'
|
|
|
|
trigger: 'change'
|
|
|
|
},
|
|
|
|
},
|
|
|
|
],
|
|
|
|
],
|
|
|
|
@ -156,7 +176,7 @@
|
|
|
|
stationCode: [
|
|
|
|
stationCode: [
|
|
|
|
{
|
|
|
|
{
|
|
|
|
required: true,
|
|
|
|
required: true,
|
|
|
|
message: '选择本组织回收站进行绑定',
|
|
|
|
message: '请选择为那个站点绘制区域',
|
|
|
|
trigger: 'change'
|
|
|
|
trigger: 'change'
|
|
|
|
},
|
|
|
|
},
|
|
|
|
],
|
|
|
|
],
|
|
|
|
@ -172,8 +192,7 @@
|
|
|
|
areaTypeProps:{"label":"fullName","value":"enCode" },
|
|
|
|
areaTypeProps:{"label":"fullName","value":"enCode" },
|
|
|
|
statusOptions:[],
|
|
|
|
statusOptions:[],
|
|
|
|
statusProps:{"label":"fullName","value":"enCode" },
|
|
|
|
statusProps:{"label":"fullName","value":"enCode" },
|
|
|
|
stationCodeOptions:[],
|
|
|
|
stationCodecolumnOptions:[ {"label":"站点编码","value":"station_code"}, {"label":"站点名称","value":"station_name"},],
|
|
|
|
stationCodeProps:{"label":"fullName","value":"id" },
|
|
|
|
|
|
|
|
childIndex:-1,
|
|
|
|
childIndex:-1,
|
|
|
|
isEdit:false,
|
|
|
|
isEdit:false,
|
|
|
|
interfaceRes: {
|
|
|
|
interfaceRes: {
|
|
|
|
@ -183,6 +202,10 @@
|
|
|
|
stationCode:[] ,
|
|
|
|
stationCode:[] ,
|
|
|
|
areaMapInfo:[] ,
|
|
|
|
areaMapInfo:[] ,
|
|
|
|
areaDesc:[] ,
|
|
|
|
areaDesc:[] ,
|
|
|
|
|
|
|
|
creatorUserId:[] ,
|
|
|
|
|
|
|
|
deleteTime:[] ,
|
|
|
|
|
|
|
|
lastModifyUserId:[] ,
|
|
|
|
|
|
|
|
lastModifyTime:[] ,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
}
|
|
|
|
},
|
|
|
|
},
|
|
|
|
@ -276,7 +299,6 @@
|
|
|
|
dataAll(){
|
|
|
|
dataAll(){
|
|
|
|
this.getareaTypeOptions();
|
|
|
|
this.getareaTypeOptions();
|
|
|
|
this.getstatusOptions();
|
|
|
|
this.getstatusOptions();
|
|
|
|
this.getstationCodeOptions();
|
|
|
|
|
|
|
|
},
|
|
|
|
},
|
|
|
|
getareaTypeOptions() {
|
|
|
|
getareaTypeOptions() {
|
|
|
|
getDictionaryDataSelector('560423985691492677').then(res => {
|
|
|
|
getDictionaryDataSelector('560423985691492677').then(res => {
|
|
|
|
@ -288,31 +310,6 @@
|
|
|
|
this.statusOptions = res.data.list
|
|
|
|
this.statusOptions = res.data.list
|
|
|
|
})
|
|
|
|
})
|
|
|
|
},
|
|
|
|
},
|
|
|
|
getstationCodeOptions() {
|
|
|
|
|
|
|
|
const index = this.childIndex
|
|
|
|
|
|
|
|
let templateJsonList = JSON.parse(JSON.stringify(this.interfaceRes.stationCode))
|
|
|
|
|
|
|
|
for (let i = 0; i < templateJsonList.length; i++) {
|
|
|
|
|
|
|
|
let json = templateJsonList[i];
|
|
|
|
|
|
|
|
if(json.relationField){
|
|
|
|
|
|
|
|
let relationFieldAll = json.relationField.split("-");
|
|
|
|
|
|
|
|
let val = json.defaultValue;
|
|
|
|
|
|
|
|
if(relationFieldAll.length>1 && index>-1){
|
|
|
|
|
|
|
|
val = this.dataForm[relationFieldAll[0]+'List']&&this.dataForm[relationFieldAll[0]+'List'].length?this.dataForm[relationFieldAll[0]+'List'][index][relationFieldAll[1]]:''
|
|
|
|
|
|
|
|
}else {
|
|
|
|
|
|
|
|
val = this.dataForm[relationFieldAll]
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
json.defaultValue = val
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
let template ={
|
|
|
|
|
|
|
|
paramList:templateJsonList
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
getDataInterfaceRes('520259300875047493',template).then(res => {
|
|
|
|
|
|
|
|
let data = res.data
|
|
|
|
|
|
|
|
this.stationCodeOptions = data
|
|
|
|
|
|
|
|
this.changeDataFormData(1,'stationCode','stationCode',index,'')
|
|
|
|
|
|
|
|
})
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
clearData(){
|
|
|
|
clearData(){
|
|
|
|
this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll))
|
|
|
|
this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll))
|
|
|
|
},
|
|
|
|
},
|
|
|
|
|
guochaojie
5 months ago