Compare commits
No commits in common. "002e3ada78faeb7d424d5493998afa2d5a2d8379" and "8962a40dd3337fe8afc9e497552214c77e3a9d9a" have entirely different histories.
002e3ada78
...
8962a40dd3
|
@ -298,10 +298,6 @@
|
||||||
:value="item.modelId"
|
:value="item.modelId"
|
||||||
></el-option>
|
></el-option>
|
||||||
</el-select>
|
</el-select>
|
||||||
<el-select v-model="form.modelId" filterable placeholder="请选择" :multiple="true">
|
|
||||||
<el-option v-for="item in modelList" :key="item.value" :label="item.label" :value="item.value">
|
|
||||||
</el-option>
|
|
||||||
</el-select>
|
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
|
@ -442,7 +438,6 @@ import { parseTime } from '../../../utils/ruoyi';
|
||||||
// import { listDept2 } from '@/api/system/dept'
|
// import { listDept2 } from '@/api/system/dept'
|
||||||
import { getHardwareVersion, listHardwareVersion } from '@/api/system/hardwareVersion'
|
import { getHardwareVersion, listHardwareVersion } from '@/api/system/hardwareVersion'
|
||||||
import Treeselect from '@riophae/vue-treeselect'
|
import Treeselect from '@riophae/vue-treeselect'
|
||||||
import { listModel, getModel, delModel, addModel, updateModel } from "@/api/rl/model";
|
|
||||||
// import "@riophae/vue-treeselect/dist/vue-treeselect.css";
|
// import "@riophae/vue-treeselect/dist/vue-treeselect.css";
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
|
@ -496,7 +491,6 @@ export default {
|
||||||
hardwareVersionOptions: [],
|
hardwareVersionOptions: [],
|
||||||
// 运营区下拉框
|
// 运营区下拉框
|
||||||
areaOptions: [],
|
areaOptions: [],
|
||||||
modelList:[],
|
|
||||||
// 通过key重新渲染area-map组件
|
// 通过key重新渲染area-map组件
|
||||||
// key: 0,
|
// key: 0,
|
||||||
// 查询参数
|
// 查询参数
|
||||||
|
@ -552,7 +546,6 @@ export default {
|
||||||
window.removeEventListener('scroll', this.handleScroll, true)
|
window.removeEventListener('scroll', this.handleScroll, true)
|
||||||
},
|
},
|
||||||
created() {
|
created() {
|
||||||
this.getlistModel()
|
|
||||||
listHardwareVersion(this.queryParams).then(response => {
|
listHardwareVersion(this.queryParams).then(response => {
|
||||||
this.hardwareVersionOptions = response.rows;
|
this.hardwareVersionOptions = response.rows;
|
||||||
this.loading2 = false;
|
this.loading2 = false;
|
||||||
|
@ -589,23 +582,6 @@ export default {
|
||||||
// this.$eventBus.$off('close-all-dialogs', this.closeDialog);
|
// this.$eventBus.$off('close-all-dialogs', this.closeDialog);
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
getlistModel() {
|
|
||||||
let data = {
|
|
||||||
pageNum: 1,
|
|
||||||
pageSize: 20,
|
|
||||||
|
|
||||||
}
|
|
||||||
listModel(this.addDateRange(data)).then(response => {
|
|
||||||
console.log(response,'responseresponseresponse');
|
|
||||||
// this.modelList = response.rows
|
|
||||||
this.modelList = response.rows.map(item => ({
|
|
||||||
value: item.modelId,
|
|
||||||
label: item.model
|
|
||||||
}));
|
|
||||||
console.log( this.options,' this.options this.options');
|
|
||||||
});
|
|
||||||
|
|
||||||
},
|
|
||||||
handleScroll() {
|
handleScroll() {
|
||||||
let scrollTop = window.scrollY;
|
let scrollTop = window.scrollY;
|
||||||
let heightTop = this.$refs['tableSort'].$parent.$parent.$el.offsetTop; // 距离顶部高度
|
let heightTop = this.$refs['tableSort'].$parent.$parent.$el.offsetTop; // 距离顶部高度
|
||||||
|
|
|
@ -121,10 +121,10 @@
|
||||||
<el-input v-model="form.model" placeholder="请输入车型" />
|
<el-input v-model="form.model" placeholder="请输入车型" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="满电电压" prop="fullVoltage">
|
<el-form-item label="满电电压" prop="fullVoltage">
|
||||||
<el-input v-model="form.fullVoltage" placeholder="请输入满电电压(v)" />
|
<el-input v-model="form.fullVoltage" placeholder="请输入满电电压" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="亏电电压" prop="lowVoltage">
|
<el-form-item label="亏电电压" prop="lowVoltage">
|
||||||
<el-input v-model="form.lowVoltage" placeholder="请输入亏电电压(v)" />
|
<el-input v-model="form.lowVoltage" placeholder="请输入亏电电压" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="满电续航" prop="fullEndurance">
|
<el-form-item label="满电续航" prop="fullEndurance">
|
||||||
<el-input v-model="form.fullEndurance" placeholder="请输入满电续航" />
|
<el-input v-model="form.fullEndurance" placeholder="请输入满电续航" />
|
||||||
|
|
|
@ -136,19 +136,11 @@
|
||||||
<el-form-item label="骑行价格说明" prop="instructions">
|
<el-form-item label="骑行价格说明" prop="instructions">
|
||||||
<el-input v-model="form.instructions" type="textarea" placeholder="请输入内容" />
|
<el-input v-model="form.instructions" type="textarea" placeholder="请输入内容" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<!-- <el-form-item label="超出数量" prop="outNum">
|
<el-form-item label="超出数量" prop="outNum">
|
||||||
<el-input v-model="form.outNum" placeholder="请输入超出数量" />
|
<el-input v-model="form.outNum" placeholder="请输入超出数量" />
|
||||||
</el-form-item> -->
|
</el-form-item>
|
||||||
<el-form-item label="超出单位" prop="outUnit">
|
<el-form-item label="超出单位" prop="outUnit">
|
||||||
<!-- <el-input v-model="form.outUnit" placeholder="请输入超出单位" /> -->
|
<el-input v-model="form.outUnit" placeholder="请输入超出单位" />
|
||||||
<el-select v-model="form.outUnit" placeholder="请选择超出租赁单位">
|
|
||||||
<el-option
|
|
||||||
v-for="dict in dict.type.rl_rental_unit"
|
|
||||||
:key="dict.value"
|
|
||||||
:label="dict.label"
|
|
||||||
:value="dict.value"
|
|
||||||
></el-option>
|
|
||||||
</el-select>
|
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="超出价格" prop="outPrice">
|
<el-form-item label="超出价格" prop="outPrice">
|
||||||
<el-input v-model="form.outPrice" placeholder="请输入超出价格" />
|
<el-input v-model="form.outPrice" placeholder="请输入超出价格" />
|
||||||
|
|
|
@ -101,7 +101,7 @@
|
||||||
</el-table>
|
</el-table>
|
||||||
|
|
||||||
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
|
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
|
||||||
@pagination="getList" />
|
@pagination="getList" />
|
||||||
|
|
||||||
<!-- 添加或修改商户列表对话框 -->
|
<!-- 添加或修改商户列表对话框 -->
|
||||||
<el-dialog :title="title" :visible.sync="open" width="50%" append-to-body :close-on-click-modal="false">
|
<el-dialog :title="title" :visible.sync="open" width="50%" append-to-body :close-on-click-modal="false">
|
||||||
|
@ -117,7 +117,7 @@
|
||||||
</el-select>
|
</el-select>
|
||||||
<!-- <user-input v-model="form.userId" :query="userQuery" :disabled="hasView(views.user)"/> -->
|
<!-- <user-input v-model="form.userId" :query="userQuery" :disabled="hasView(views.user)"/> -->
|
||||||
</form-col>
|
</form-col>
|
||||||
<form-col label="是否在地图展示" prop="show" :span="span" label-width="9em">
|
<form-col label="是否在地图展示" prop="show" :span="span" label-width="9em">
|
||||||
<el-switch v-model="form.show" />
|
<el-switch v-model="form.show" />
|
||||||
</form-col>
|
</form-col>
|
||||||
<form-col label="店铺名称" prop="name" :span="span * 2">
|
<form-col label="店铺名称" prop="name" :span="span * 2">
|
||||||
|
|
Loading…
Reference in New Issue
Block a user