1

src/pages/vehicle/addEditVehicle.vue

@@ -44,8 +44,8 @@
                         :label="$t('v102.vehicle.title11')" />
                     <div class="q-my-md">
                         <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')"
-                            standout />
+                            option-label="Name" option-value="Id" map-options clearable
+                            :label="$t('v102.vehicle.title13')" standout />
                     </div>
                 </div>
                 <!-- 表格 -->
@@ -102,7 +102,8 @@
                 <!-- 表格 -->
             </q-card-section>
             <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-card-actions>
         </q-card>
@@ -121,13 +122,13 @@ import message from '../../utils/message'
 import { currentRouter } from 'src/router'
 import { useRouter } from 'vue-router'
 export default defineComponent({
-    props: {
-        Id: {
-            type: Number,
-            default: 0,
-            require: true
-        }
-    },
+    // props: {
+    //     Id: {
+    //         type: Number,
+    //         default: 0,
+    //         require: true
+    //     }
+    // },
     setup(props, context) {
         const $router = useRouter()
         const qDateProxy = ref(null) as any
@@ -168,7 +169,7 @@ export default defineComponent({
             scrollStyle: {} as any,
             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
         }
 
@@ -177,14 +178,15 @@ export default defineComponent({
         onMounted(() => {
             methods.vehicleinit()
             methods.vehicleList()
-            if (props.Id && props.Id > 0) {
+            if (data.search.Id && data.search.Id > 0) {
+                console.log('444')
                 methods.details()
             }
         })
         const methods = {
             // 获取修改详情
             details() {
-                HotelService.VehicleDetails(props.Id)
+                HotelService.VehicleDetails(data.search.Id)
                     .then(r => {
                         if (r.data.resultCode == ApiResult.SUCCESS) {
                             data.search.UseCompName = r.data.data.UseCompName
@@ -314,7 +316,7 @@ export default defineComponent({
             },
             // 关闭
             down() {
-                $router.push({ path: `/vehicle/order/0`})
+                $router.push({ path: `/vehicle/order/0` })
             },
             // 确定
             join() {
@@ -322,6 +324,7 @@ export default defineComponent({
                     .then(r => {
                         if (r.data.resultCode == ApiResult.SUCCESS) {
                             context.emit('refresh')
+                            $router.push({ path: '/vehicle/order' })
                         } else {
                             message.errorMsg(r.data.message)
                         }

src/pages/vehicle/teamOrder.vue

@@ -37,7 +37,8 @@
                                     :label="$t('v102.vehicle.list.s5')" />
                             </span>
                             <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 v-if="props.row.OfferState == 1 && props.row.Status == 0"
@@ -286,7 +287,7 @@ export default defineComponent({
             },
             mask(val: any) {
                 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
             }
         }