|
@@ -533,7 +533,7 @@
|
|
<el-option key="1" label="Insecticidal lamp" value="1"></el-option>
|
|
<el-option key="1" label="Insecticidal lamp" value="1"></el-option>
|
|
</el-select>
|
|
</el-select>
|
|
|
|
|
|
- <el-select v-model="lightControlData[item.model]" placeholder="please choose" v-if="item.type == 'select' && item.model == 'fiscal_year'" @keyup.native="lampKeydown($event)">
|
|
|
|
|
|
+ <el-select v-model="lightControlData[item.model]" placeholder="please choose" v-if="item.type == 'select' && item.model == 'fascal_year'" @keyup.native="lampKeydown($event)">
|
|
<el-option key="2019-20" label="2019-20" value="2019-20"></el-option>
|
|
<el-option key="2019-20" label="2019-20" value="2019-20"></el-option>
|
|
<el-option key="2020-21" label="2020-21" value="2020-21"></el-option>
|
|
<el-option key="2020-21" label="2020-21" value="2020-21"></el-option>
|
|
<el-option key="2021-22" label="2021-22" value="2021-22"></el-option>
|
|
<el-option key="2021-22" label="2021-22" value="2021-22"></el-option>
|
|
@@ -544,7 +544,7 @@
|
|
<el-option key="2026-27" label="2026-27" value="2026-27"></el-option>
|
|
<el-option key="2026-27" label="2026-27" value="2026-27"></el-option>
|
|
<el-option key="2027-28" label="2027-28" value="2027-28"></el-option>
|
|
<el-option key="2027-28" label="2027-28" value="2027-28"></el-option>
|
|
</el-select>
|
|
</el-select>
|
|
- <el-select v-model="lightControlData[item.model]" placeholder="please choose" v-if="item.type == 'select' && item.model == 'fiscal_year_phase'" @keyup.native="lampKeydown($event)">
|
|
|
|
|
|
+ <el-select v-model="lightControlData[item.model]" placeholder="please choose" v-if="item.type == 'select' && item.model == 'fascal_year_phase'" @keyup.native="lampKeydown($event)">
|
|
<el-option key="Phase1" label="Phase1" value="Phase1"></el-option>
|
|
<el-option key="Phase1" label="Phase1" value="Phase1"></el-option>
|
|
<el-option key="Phase2" label="Phase2" value="Phase2"></el-option>
|
|
<el-option key="Phase2" label="Phase2" value="Phase2"></el-option>
|
|
</el-select>
|
|
</el-select>
|
|
@@ -1222,8 +1222,8 @@
|
|
supplierName:'',
|
|
supplierName:'',
|
|
protocoltype:'',
|
|
protocoltype:'',
|
|
loadtype:'0',
|
|
loadtype:'0',
|
|
- fiscal_year:'',
|
|
|
|
- fiscal_year_phase:'',
|
|
|
|
|
|
+ fascal_year:'',
|
|
|
|
+ fascal_year_phase:'',
|
|
street_light_SN:'',
|
|
street_light_SN:'',
|
|
customer_name:'',
|
|
customer_name:'',
|
|
customer_ID:'',
|
|
customer_ID:'',
|
|
@@ -1244,8 +1244,8 @@
|
|
|
|
|
|
{model:'protocoltype',label:'Network protocol type',type:"select",unit:''},
|
|
{model:'protocoltype',label:'Network protocol type',type:"select",unit:''},
|
|
{model:'section',label:'Road',unit:''},
|
|
{model:'section',label:'Road',unit:''},
|
|
- {model:'fiscal_year',label:'Fiscal year',type:"select",unit:''},
|
|
|
|
- {model:'fiscal_year_phase',label:'Fiscal year phase',type:"select",unit:''},
|
|
|
|
|
|
+ {model:'fascal_year',label:'Fiscal year',type:"select",unit:''},
|
|
|
|
+ {model:'fascal_year_phase',label:'Fiscal year phase',type:"select",unit:''},
|
|
|
|
|
|
{model:'lamptype',label:'Lamp type',type:"select_filterable",unit:''},
|
|
{model:'lamptype',label:'Lamp type',type:"select_filterable",unit:''},
|
|
{model:'boardtype',label:'Solar panel type',type:"select_filterable",unit:''},
|
|
{model:'boardtype',label:'Solar panel type',type:"select_filterable",unit:''},
|
|
@@ -1272,8 +1272,8 @@
|
|
|
|
|
|
{model:'protocoltype',label:'Network protocol type',type:"select",unit:''},
|
|
{model:'protocoltype',label:'Network protocol type',type:"select",unit:''},
|
|
{model:'section',label:'Road',unit:''},
|
|
{model:'section',label:'Road',unit:''},
|
|
- {model:'fiscal_year',label:'Fiscal year',type:"select",unit:''},
|
|
|
|
- {model:'fiscal_year_phase',label:'Fiscal year phase',type:"select",unit:''},
|
|
|
|
|
|
+ {model:'fascal_year',label:'Fiscal year',type:"select",unit:''},
|
|
|
|
+ {model:'fascal_year_phase',label:'Fiscal year phase',type:"select",unit:''},
|
|
|
|
|
|
{model:'lamptype',label:'Lamp type',type:"select_filterable",unit:''},
|
|
{model:'lamptype',label:'Lamp type',type:"select_filterable",unit:''},
|
|
{model:'boardtype',label:'Solar panel type',type:"select_filterable",unit:''},
|
|
{model:'boardtype',label:'Solar panel type',type:"select_filterable",unit:''},
|
|
@@ -1322,10 +1322,10 @@
|
|
{ required: true, message: 'Not null', trigger: 'blur' }
|
|
{ required: true, message: 'Not null', trigger: 'blur' }
|
|
],
|
|
],
|
|
|
|
|
|
- fiscal_year: [
|
|
|
|
|
|
+ fascal_year: [
|
|
{ required: true, message: 'Not null', trigger: 'change' }
|
|
{ required: true, message: 'Not null', trigger: 'change' }
|
|
],
|
|
],
|
|
- fiscal_year_phase: [
|
|
|
|
|
|
+ fascal_year_phase: [
|
|
{ required: true, message: 'Not null', trigger: 'change' }
|
|
{ required: true, message: 'Not null', trigger: 'change' }
|
|
],
|
|
],
|
|
|
|
|