Skip to content

B
bigwood
Commit ae0fdd1e authored by youjie's avatar youjie
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/bigwood

parents 1b3ee1ab d057850d
Hide whitespace changes
Inline Side-by-side
Showing with 73 additions and 67 deletions
src/pages/vehicle/addEditVehicle.vue
View file @ ae0fdd1e
...@@ -42,67 +42,71 @@ ...@@ -42,67 +42,71 @@
:label="$t('v102.vehicle.title10')" /> :label="$t('v102.vehicle.title10')" />
<q-input class="q-mr-md" style='' v-model="search.TeamName" dense standout <q-input class="q-mr-md" style='' v-model="search.TeamName" dense standout
:label="$t('v102.vehicle.title11')" /> :label="$t('v102.vehicle.title11')" />
<div class="q-my-md"> <div class="q-my-md" style="margin-top: 0px;">
<q-select style="width: 170px;" v-model="search.BusType" dense :options="vehicletop" emit-value <q-select style="width: 170px;" v-model="search.BusType" dense :options="vehicletop" emit-value
option-label="Name" option-value="Id" map-options clearable :label="$t('v102.vehicle.title13')" option-label="Name" option-value="Id" map-options clearable
standout /> :label="$t('v102.vehicle.title13')" standout />
</div> </div>
</div> </div>
<!-- 表格 --> <!-- 表格 -->
<table width="100%" border="1" style="text-align:left;border-collapse:collapse;table-layout:fixed;word-break:break-all;border: 1px solid rgba(0, 0, 0, 0.12); <div style="max-height:600px;overflow: auto;" v-if="search.details && search.details.length > 0">
margin: auto;"> <table width="100%" height='100%' border="1" style="text-align:left;border-collapse:collapse;table-layout:fixed;word-break:break-all;border: 1px solid rgba(0, 0, 0, 0.12);
<tr> margin: auto;">
<th width="15%" align="center" class="td-title">{{ $t('v102.vehicle.tatle.th1') }}</th>
<th width="10%" align="center" class="td-title">{{ $t('v102.vehicle.tatle.th2') }}</th>
<th width="30%" align="center" class="td-title">{{ $t('v102.vehicle.tatle.th3') }}</th>
<th width="45%" align="center" class="td-title">{{ $t('v102.vehicle.tatle.th4') }}</th>
</tr>
<template v-for="(item, i) in search.details" :key="i">
<tr> <tr>
<td> <th width="15%" align="center" class="td-title">{{ $t('v102.vehicle.tatle.th1') }}</th>
{{ item.UseDate }} <th width="10%" align="center" class="td-title">{{ $t('v102.vehicle.tatle.th2') }}</th>
</td> <th width="30%" align="center" class="td-title">{{ $t('v102.vehicle.tatle.th3') }}</th>
<td> <th width="45%" align="center" class="td-title">{{ $t('v102.vehicle.tatle.th4') }}</th>
DAY{{ item.DayNum }}
</td>
<td>
<div class="q-my-md">
<q-select style="width: 180px;" v-model="item.UseType" dense :options="listvehicle"
emit-value option-label="Name" option-value="Id" map-options clearable
:label="$t('v102.vehicle.tatle.th3')" standout />
</div>
<!-- 用车时间 -->
<div v-if="item.UseType == 3 || item.UseType == 4">
<q-input dense standout v-model="item.UseTime" mask="time"
:label="$t('v102.vehicle.title14')" style="width:180px;">
<template v-slot:append>
<q-icon name="access_time" class="cursor-pointer">
<q-popup-proxy transition-show="scale" transition-hide="scale">
<q-time v-model="item.UseTime">
<div class="row items-center justify-end">
<q-btn v-close-popup :label="$t('v102.vehicle.add5')"
color="primary" flat />
</div>
</q-time>
</q-popup-proxy>
</q-icon>
</template>
</q-input>
</div>
</td>
<td>
<div>
<q-input class="q-mr-md" style='' v-model="item.TripInfo" dense standout
:label="$t('v102.vehicle.tatle.th4')" />
</div>
</td>
</tr> </tr>
</template> <template v-for="(item, i) in search.details" :key="i">
</table> <tr>
<td>
{{ item.UseDate }}
</td>
<td>
DAY{{ item.DayNum }}
</td>
<td>
<div class="q-my-md">
<q-select style="width: 180px;" v-model="item.UseType" dense
:options="listvehicle" emit-value option-label="Name" option-value="Id"
map-options clearable :label="$t('v102.vehicle.tatle.th3')" standout />
</div>
<!-- 用车时间 -->
<div v-if="item.UseType == 3 || item.UseType == 4">
<q-input dense standout v-model="item.UseTime" mask="time"
:label="$t('v102.vehicle.title14')" style="width:180px;">
<template v-slot:append>
<q-icon name="access_time" class="cursor-pointer">
<q-popup-proxy transition-show="scale" transition-hide="scale">
<q-time v-model="item.UseTime">
<div class="row items-center justify-end">
<q-btn v-close-popup :label="$t('v102.vehicle.add5')"
color="primary" flat />
</div>
</q-time>
</q-popup-proxy>
</q-icon>
</template>
</q-input>
</div>
</td>
<td>
<div>
<q-input class="q-mr-md" style='' v-model="item.TripInfo" dense standout
:label="$t('v102.vehicle.tatle.th4')" />
</div>
</td>
</tr>
</template>
</table>
</div>
<!-- 表格 --> <!-- 表格 -->
</q-card-section> </q-card-section>
<q-card-actions align="right" class="bg-white"> <q-card-actions align="right" class="bg-white">
<q-btn flat dense color="dark" :label="$t('v102.vehicle.close')" class="q-mr-sm" @click="down" v-close-popup /> <q-btn flat dense color="dark" :label="$t('v102.vehicle.close')" class="q-mr-sm" @click="down"
v-close-popup />
<q-btn unelevated dense color="accent q-pa-lg" :label="$t('v102.to.m.s')" @click="join" /> <q-btn unelevated dense color="accent q-pa-lg" :label="$t('v102.to.m.s')" @click="join" />
</q-card-actions> </q-card-actions>
</q-card> </q-card>
...@@ -121,13 +125,13 @@ import message from '../../utils/message' ...@@ -121,13 +125,13 @@ import message from '../../utils/message'
import { currentRouter } from 'src/router' import { currentRouter } from 'src/router'
import { useRouter } from 'vue-router' import { useRouter } from 'vue-router'
export default defineComponent({ export default defineComponent({
props: { // props: {
Id: { // Id: {
type: Number, // type: Number,
default: 0, // default: 0,
require: true // require: true
} // }
}, // },
setup(props, context) { setup(props, context) {
const $router = useRouter() const $router = useRouter()
const qDateProxy = ref(null) as any const qDateProxy = ref(null) as any
...@@ -168,23 +172,23 @@ export default defineComponent({ ...@@ -168,23 +172,23 @@ export default defineComponent({
scrollStyle: {} as any, scrollStyle: {} as any,
pages: '' pages: ''
}) })
if(currentRouter.currentRoute&&currentRouter.currentRoute.value.params.Id){ if (currentRouter.currentRoute && currentRouter.currentRoute.value.params.Id) {
data.search.Id = currentRouter.currentRoute.value.params.Id data.search.Id = currentRouter.currentRoute.value.params.Id
} }
data.pages = currentRouter.currentRoute.value.params.pages data.pages = currentRouter.currentRoute.value.params.pages
// 获取车型下拉 // 获取车型下拉
onMounted(() => { onMounted(() => {
methods.vehicleinit() methods.vehicleinit()
methods.vehicleList() methods.vehicleList()
if (props.Id && props.Id > 0) { if (data.search.Id && data.search.Id > 0) {
methods.details() methods.details()
} }
}) })
const methods = { const methods = {
// 获取修改详情 // 获取修改详情
details() { details() {
HotelService.VehicleDetails(props.Id) HotelService.VehicleDetails(data.search.Id)
.then(r => { .then(r => {
if (r.data.resultCode == ApiResult.SUCCESS) { if (r.data.resultCode == ApiResult.SUCCESS) {
data.search.UseCompName = r.data.data.UseCompName data.search.UseCompName = r.data.data.UseCompName
...@@ -314,7 +318,7 @@ export default defineComponent({ ...@@ -314,7 +318,7 @@ export default defineComponent({
}, },
// 关闭 // 关闭
down() { down() {
$router.push({ path: `/vehicle/order/0`}) $router.push({ path: `/vehicle/order/0` })
}, },
// 确定 // 确定
join() { join() {
...@@ -322,6 +326,7 @@ export default defineComponent({ ...@@ -322,6 +326,7 @@ export default defineComponent({
.then(r => { .then(r => {
if (r.data.resultCode == ApiResult.SUCCESS) { if (r.data.resultCode == ApiResult.SUCCESS) {
context.emit('refresh') context.emit('refresh')
$router.push({ path: '/vehicle/order' })
} else { } else {
message.errorMsg(r.data.message) message.errorMsg(r.data.message)
} }
......
src/pages/vehicle/teamOrder.vue
View file @ ae0fdd1e
...@@ -37,7 +37,8 @@ ...@@ -37,7 +37,8 @@
:label="$t('v102.vehicle.list.s5')" /> :label="$t('v102.vehicle.list.s5')" />
</span> </span>
<span @click="cancel(props.row.Id)"> <span @click="cancel(props.row.Id)">
<q-btn class="col q-mr-md fz12" color="grey-6" unelevated :label="$t('v102.vehicle.add3')" /> <q-btn class="col q-mr-md fz12" color="grey-6" unelevated
:label="$t('v102.vehicle.add3')" />
</span> </span>
<!--申请报价--> <!--申请报价-->
<span v-if="props.row.OfferState == 1 && props.row.Status == 0" <span v-if="props.row.OfferState == 1 && props.row.Status == 0"
...@@ -140,7 +141,7 @@ export default defineComponent({ ...@@ -140,7 +141,7 @@ export default defineComponent({
const { t } = useI18n() const { t } = useI18n()
const $q = useQuasar() const $q = useQuasar()
const $router = useRouter() const $router = useRouter()
const data = reactive({ const data = reactive({
showdetails: false, showdetails: false,
cancelshow: false, cancelshow: false,
...@@ -286,7 +287,7 @@ export default defineComponent({ ...@@ -286,7 +287,7 @@ export default defineComponent({
}, },
mask(val: any) { mask(val: any) {
data.Id = val data.Id = val
$router.push({ path:`/vehicle/addEditVehicle/0${data.Id?'/'+data.Id:''}`}) $router.push({ path: `/vehicle/addEditVehicle/0${data.Id ? '/' + data.Id : ''}` })
// data.showPriceList = true // data.showPriceList = true
} }
} }
......
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