票务

@@ -113,16 +113,19 @@
             <div v-if="type == 'ticket'">
               <div class="leftboderTT">{{ language == 0 ? '购票信息' : 'Ticket Information' }}</div>
               <div class="border-info mt20">
-                <h3>{{ form?.extJson?.ticketType?.name }}</h3>
+                <h3>{{ matchForm.name }}</h3>
                 <el-row>
                   <el-col>
                     {{ language == 0 ? '地址' : 'Address' }}：
-                    <span v-if="language == 0">{{ form.provinceName }} {{ form.cityName }} {{ form.areaName }} </span>
                     {{ matchForm.address }}
                   </el-col>
                   <el-col>
-                    {{ language == 0 ? '票档' : 'Check-in&Check-out' }}：{{ form?.extJson?.ticketDate?.name }} x 1
-                    {{ language == 0 ? '张' : 'Tickets' }}
+                    {{ language == 0 ? '票档' : 'Check-in&Check-out' }}：{{ form?.extJson?.ticketType?.name }}
+                  </el-col>
+                  <el-col>
+                    {{
+                      language == 0 ? '时间' : 'Room Information'
+                    }}：{{ dayjs(form?.extJson?.ticketDate?.ticketStart).format('YYYY-MM-DD') }}
                   </el-col>
                   <el-col>
                     {{
@@ -132,11 +135,7 @@
                     }}{{ language == 0 ? '元' : 'Euro' }} x 1
                     {{ language == 0 ? '张' : 'Tickets' }}
                   </el-col>
-                  <el-col>
-                    {{
-                      language == 0 ? '时间' : 'Room Information'
-                    }}：{{ dayjs(form?.extJson?.ticketDate?.ticketStart).format('YYYY-MM-DD') }}
-                  </el-col>
+
                 </el-row>
               </div>
             </div>
@@ -648,11 +647,13 @@ async function getTicketOrderInfoFN() {
 
   }
   console.log(form.value)
+
 }
 
 async function getDetail(activeId) {
   const res = await getTicketInfoByActivityId({activityId: activeId})
   matchForm.value = res.data
+  console.log(matchForm.value)
 }
 
 

@@ -48,15 +48,15 @@
             <el-col :lg="9" :md="12" :sm="12" :xs="24">
               <h3 class="m0">{{ b.name }}</h3>
               <p> {{ language == 0 ? "时间" : "Event Date & Time" }}：{{
-                  b.dateStr
+                  b.messageObj.ticketDate.name
                 }}</p>
               <p class="common">
-                {{ language == 0 ? "张数" : "Location" }}：{{ b.ticketNum }}{{ language == 0 ? "张" : "tickets" }}
+                {{ language == 0 ? "张数" : "Location" }}：{{ b.messageObj.num }}{{ language == 0 ? "张" : "tickets" }}
               </p>
             </el-col>
             <el-col :lg="3" :md="6" :sm="6" :xs="6" class="text-center">
               <span class="text-warning"> {{ b.payType == '2' ? '€' : '￥' }}
-                <span class="bigMoney">{{ b.payAmount }}</span>
+                <span class="bigMoney">{{ b.total }}</span>
               </span>
             </el-col>
             <el-col :lg="6" :md="16" :sm="16" :xs="16">
@@ -281,9 +281,13 @@ const getList = () => {
     }).then(res => {
       list.value = res.rows
       for (let b of list.value) {
-        b.messageObj = JSON.parse(b.message)
+        b.messageObj = JSON.parse(b.extJson)
+        b.messageObj.ticketDate = JSON.parse(b.messageObj.ticketDate)
+        b.messageObj.ticketType = JSON.parse(b.messageObj.ticketType)
       }
       loading.value = false
+      console.log(list.value)
+
     })
   } else {
     getCanInvoiceBills(query.value).then(res => {
@@ -327,7 +331,8 @@ const gokp = (item) => {
     query: {
       orders: encodeURIComponent(JSON.stringify(item)),
       totalMoney: item.totalStr || item.totalPayAmount || item.payAmount || item.totalAmount,
-      paymentType: query.value.orderType == 6 || query.value.orderType == 5 ? item.payType : item.paymentType,
+      orderId: item.id,
+      paymentType: query.value.orderType == 5 ? item.payType : item.paymentType,
       orderType: query.value.orderType,
       orderSn: query.value.orderType == 6 ? item.orderSn : null
     }
@@ -338,11 +343,12 @@ const editkp = (item) => {
     name: 'addInvoice',
     query: {
       invoiceId: query.value.orderType == 6 ? item.invoiceIdStr : item.invoiceId,
+      orderId: item.id,
       type: activeName.value,
       isEdit: true,
       orderType: query.value.orderType,
-      paymentType: query.value.orderType == 6 || query.value.orderType == 5 ? item.payType : item.paymentType,
-      orderSn: query.value.orderType == 6 ? item.orderSn : null
+      paymentType: query.value.orderType == 5 ? item.payType : item.paymentType,
+      // orderSn: query.value.orderType == 6 ? item.orderSn : null
     }
   })
 }
@@ -354,7 +360,7 @@ const showDetail = (item) => {
       type: activeName.value,
       orderType: query.value.orderType,
       paymentType: query.value.orderType == 6 || query.value.orderType == 5 ? item.payType : item.paymentType,
-      orderSn: query.value.orderType == 6 ? item.orderSn : null
+      // orderSn: query.value.orderType == 6 ? item.orderSn : null
     }
   })
 }

@@ -18,8 +18,8 @@
             <label v-if="b.orderType == 2" class="orangeTag"> {{ language == 0 ? '餐饮' : 'DINING' }} </label>
             <label v-if="b.orderType == 3" class="orangeTag"> {{ language == 0 ? '化妆' : 'MakeUp' }} </label>
             <label v-if="b.orderType == 4" class="orangeTag"> {{ language == 0 ? '拍摄' : 'Shooting ' }} </label>
-            <span>{{ language == 0 ? '订单编号：' : 'No.' }} {{ b.id }}</span>
             <label v-if="b.orderType == 5" class="orangeTag"> {{ language == 0 ? '票务' : 'TICKETING ' }} </label>
+
             <span>{{ language == 0 ? '订单编号：' : 'No.' }} {{ b.id }}</span>
           </div>