Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system-vue

# Conflicts:
#	src/views/login.vue

src/views/login.vue

@@ -133,8 +133,8 @@ export default {
   },
   data() {
     return {
+      // tenantCode:"lighting",
       tenantCode:"lanan",
-      // tenantCode:"lanan",
       codeUrl: "",
       //是否开启图形验证码
       captchaEnable: false,

src/views/repair/tickets/Components/UserInfo.vue

@@ -92,6 +92,14 @@
         </template>
         <el-input v-model="selectCar.newMaintenanceMileage"/>
       </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">
+          预约订单选择
+        </template>
+        <el-select v-model="formData.bookingId" size="small">
+          <el-option v-for="item in bookingList" :key="item.id" :value="item.id" :label="item.bookingTime" />
+        </el-select>
+      </el-descriptions-item>
       <!--      <el-descriptions-item :span="3">-->
       <!--        <template slot="label">-->
       <!--          备注-->
@@ -218,6 +226,7 @@ import {createTickets, getTicketsById} from "@/api/repair/tickets/Tickets";
 import RepairAdvice from "@/views/repair/tickets/form/RepairAdvice.vue";
 import QualityExplain from "@/views/repair/tickets/form/QualityExplain.vue";
 import TicketChoose from "@/views/repair/tickets/Components/TicketChoose.vue";
+import request from "@/utils/request";
 
 export default {
   name: "UserInfo",
@@ -232,6 +241,8 @@ export default {
     selectUser(val) {
       if (!val) {
         this.selectUser = {}
+      }else {
+        this.getBooking(val.userId)
       }
     },
     selectCar(val) {
@@ -278,13 +289,15 @@ export default {
         ticketType: "01",
         itemList: [],
         ticketsStatus: "01",
+        bookingId: null,
       },
       selectUser: {},
       selectCar: {},
       selectStaff: {},
       projectList: [],
       partList: [],
-      otherList: []
+      otherList: [],
+      bookingList: [],
     }
   },
   methods: {
@@ -410,6 +423,7 @@ export default {
     },
     // 新增基础信息init
     createInit() {
+      this.formData.bookingId = this.formData?.bookingId.toString() || null
       // 生成工单号
       this.formData.ticketNo = this.formData.ticketNo || createUniqueCodeByHead("GD")
       // 质保说明
@@ -508,6 +522,14 @@ export default {
     handlePaid() {
       this.formData.ticketsStatus = '02'
       this.handleSave()
+    },
+    // 查看用户的预约记录
+    async getBooking(userId){
+      const res = await request({
+        url: "/repair/booking/list?userId=" + userId,
+        method: "get"
+      })
+      this.bookingList = res.data
     }
   }
 }