Commit 42e6d1e0 authored by mzx's avatar mzx

bug修改

parent 4bfdd383
......@@ -826,6 +826,12 @@ export default {
const id = row.id || this.ids
getBusInfo(id).then(response => {
this.form = response.data
if (this.form.isNewEnergy !== null) {
this.form.isNewEnergy = Number(response.data.isNewEnergy)
}
if (this.form.hasGps !== null) {
this.form.hasGps = Number(response.data.hasGps)
}
this.disabledon = true
this.open = true
this.title = '查看所属公交车辆'
......
......@@ -133,7 +133,7 @@
style="width: 100%"
type="datetime"
:disabled="disabledon"
value-format="yyyy-MM-dd HH:mm"
value-format="yyyy-MM-dd HH:mm:ss"
/>
</el-form-item>
<el-form-item label="事故上报时间" prop="accidentEscalationTime">
......@@ -144,7 +144,7 @@
style="width: 100%"
type="datetime"
:disabled="disabledon"
value-format="yyyy-MM-dd HH:mm"
value-format="yyyy-MM-dd HH:mm:ss"
/>
</el-form-item>
<el-form-item label="本次扣分" prop="score">
......
......@@ -145,7 +145,7 @@
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button v-if="disabledon == false" type="primary" @click="submitForm"> </el-button>
<el-button v-if="disabledon == false" type="primary" v-no-more-click @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</el-dialog>
......
......@@ -253,7 +253,7 @@
<el-form-item label="证件吊销原因" prop="revokeReason">
<el-input
v-model="form.revokeReason"
:disabled="form.postStatus == undefined || form.postStatus == '1'"
:disabled="form.postStatus == undefined || form.postStatus == '1' || title === '查看从业人员资质'"
placeholder="请输入证件吊销原因"
style="width: 100%"
/>
......
......@@ -276,7 +276,7 @@ export default {
{ required: true, message: '船检登记号不能为空', trigger: 'blur' }
],
shipNetTonnage: [
{ required: true, message: '船净吨位不能为空', trigger: 'blur' }
{ required: true, message: '船净吨位不能为空', trigger: 'blur' }
]
}
}
......
......@@ -265,8 +265,8 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button v-if="disabledon == false" type="primary" @click="submitForm">确 定</el-button>
<el-button v-if="disabledon == false && title !== '修改站点'" type="primary" @click="submitForm('ContinueFill')">确定并继续填写</el-button>
<el-button v-if="disabledon == false" type="primary" v-no-more-click @click="submitForm">确 定</el-button>
<el-button v-if="disabledon == false && title !== '修改站点'" v-no-more-click type="primary" @click="submitForm('ContinueFill')">确定并继续填写</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
......
......@@ -151,7 +151,7 @@
v-for="dict in dict.type.bhxq_bus_line_status"
:key="dict.value"
:label="dict.label"
:value="parseInt(dict.value)"
:value="dict.value"
/>
</el-select>
</el-form-item>
......@@ -291,8 +291,9 @@
</el-table-column>
<el-table-column label="站点名称" align="center" prop="stationName" />
<el-table-column label="上下行" align="center" prop="upDown">
<template slot-scope="scope">
<span>{{ scope.row.upDown == '0' ? '下行' : '下行' }}</span>
<template>
<!-- <span>{{ scope.row.upDown == '0' ? '下行' : '下行' }}</span>-->
<span>{{ upDowntitle == '配置上行线路站点' ? '上行' : '下行' }}</span>
</template>
</el-table-column>
<el-table-column label="操作" width="150">
......@@ -546,6 +547,7 @@ export default {
getList() {
this.loading = true
listBusLine(this.queryParams).then(response => {
console.log('response.rows', response.rows)
this.busLineList = response.rows
this.total = response.total
this.loading = false
......@@ -636,9 +638,9 @@ export default {
if (this.form.busLineOperatingtype !== null) {
this.form.busLineOperatingtype = Number(response.data.busLineOperatingtype)
}
if (this.form.busLineStatus !== null) {
this.form.busLineStatus = Number(response.data.busLineStatus)
}
// if (this.form.busLineStatus !== null) {
// this.form.busLineStatus = Number(response.data.busLineStatus)
// }
this.disabledon = false
this.open = true
this.title = '修改线路'
......@@ -656,6 +658,7 @@ export default {
})
} else {
addBusLine(this.form).then(response => {
console.log('form', this.form)
this.$modal.msgSuccess('新增成功')
// 当点击确认确定并继续填写时 模态框不关闭
if (type === 'ContinueFill') {
......@@ -692,6 +695,15 @@ export default {
const id = row.id || this.ids
getBusLine(id).then(response => {
this.form = response.data
if (this.form.busLineOperatinglinetype !== null) {
this.form.busLineOperatinglinetype = Number(response.data.busLineOperatinglinetype)
}
if (this.form.busLineOperatingtype !== null) {
this.form.busLineOperatingtype = Number(response.data.busLineOperatingtype)
}
// if (this.form.busLineStatus !== null) {
// this.form.busLineStatus = Number(response.data.busLineStatus)
// }
this.disabledon = true
this.open = true
this.title = '查看线路'
......
......@@ -250,6 +250,7 @@ export default {
getList() {
this.loading = true
problemList(this.addDateRange(this.queryParams)).then(response => {
console.log('rows', response.rows)
this.typeList = response.rows
this.total = response.total
this.loading = false
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment