旅游

@@ -510,7 +510,7 @@
             </el-button>
             </el-button>
             
             
             <el-button
             <el-button
-              v-if="(form.viewStatus=='1'||form.viewStatus=='5')&&(type=='makeUp'||type=='hotel'||type=='ticket'||type=='car'||type=='travel')&&language != 0"
+              v-if="(form.viewStatus=='1'||form.viewStatus=='5')&&(type=='makeUp'||type=='hotel'||type=='ticket'||type=='car'||type=='travel'||type=='photography')&&language != 0"
               class="btn-lineG w200px" round
               class="btn-lineG w200px" round
               type="primary"
               type="primary"
               @click="downInvoice"
               @click="downInvoice"
@@ -724,6 +724,7 @@ function getData() {
   }
   }
   if (type.value == 'photography') {
   if (type.value == 'photography') {
     photographyOrder()
     photographyOrder()
+    checkReceipt()
     // photographyInfo()
     // photographyInfo()
   }
   }
   if (type.value == 'ticket') {
   if (type.value == 'ticket') {

@@ -8,18 +8,28 @@
         <!--        <el-button class="fr" type="primary" plain @click="toInvoice">{{ language==0?'发票开具':'Invoice' }}</el-button>-->
         <!--        <el-button class="fr" type="primary" plain @click="toInvoice">{{ language==0?'发票开具':'Invoice' }}</el-button>-->
         <!--        <el-button class="fr" type="primary" plain @click="toInvoice">{{ language==0?'我的发票':'My Invoice' }}</el-button>-->
         <!--        <el-button class="fr" type="primary" plain @click="toInvoice">{{ language==0?'我的发票':'My Invoice' }}</el-button>-->
       </div>
       </div>
+      <div style="">
+        <el-form-item label="订单类型" style="padding-left: 20px">
+          <el-select v-model="orderType" style="width: 200px;" @change="getList">
+            <el-option
+              v-for="val in cardList" :key="val.label" :label="language==0?val.label:val.labelEn"
+              :value="val.val"
+            />
+          </el-select>
+        </el-form-item>
+      </div>
       <el-empty v-if="list?.length == 0" :image="`/img/order_no.png`" :image-size="228" />
       <el-empty v-if="list?.length == 0" :image="`/img/order_no.png`" :image-size="228" />
       
       
       <div class="pd20">
       <div class="pd20">
-        <div v-for="b in list" class="item">
+        <div v-for="b in list" :key="b.id" class="item">
           <div class="title">
           <div class="title">
             <label v-if="b.orderType == 0" class="blueTag"> {{ language == 0 ? '酒店' : 'HOTEL' }} </label>
             <label v-if="b.orderType == 0" class="blueTag"> {{ language == 0 ? '酒店' : 'HOTEL' }} </label>
             <label v-if="b.orderType == 1" class="purpleTag"> {{ language == 0 ? '车辆' : 'TRANSPORTATION' }} </label>
             <label v-if="b.orderType == 1" class="purpleTag"> {{ language == 0 ? '车辆' : 'TRANSPORTATION' }} </label>
             <label v-if="b.orderType == 2" class="blueTag"> {{ language == 0 ? '餐饮' : 'DINING' }} </label>
             <label v-if="b.orderType == 2" class="blueTag"> {{ language == 0 ? '餐饮' : 'DINING' }} </label>
-            <label v-if="b.orderType == 3" class="purpleTag"> {{ language == 0 ? '化妆' : 'MakeUp' }} </label>
-            <label v-if="b.orderType == 4" class="orangeTag"> {{ language == 0 ? '拍摄' : 'Shooting ' }} </label>
+            <label v-if="b.orderType == 3" class="purpleTag"> {{ language == 0 ? '化妆' : 'MAKEUP' }} </label>
+            <label v-if="b.orderType == 4" class="orangeTag"> {{ language == 0 ? '拍摄' : 'SHOOTING ' }} </label>
             <label v-if="b.orderType == 5" class="greenTag"> {{ language == 0 ? '票务' : 'TICKETING ' }} </label>
             <label v-if="b.orderType == 5" class="greenTag"> {{ language == 0 ? '票务' : 'TICKETING ' }} </label>
-            <label v-if="b.orderType == 6" class="orangeTag"> {{ language == 0 ? '旅游' : 'Travel ' }} </label>
+            <label v-if="b.orderType == 6" class="orangeTag"> {{ language == 0 ? '旅游' : 'TRAVEL' }} </label>
             
             
             <span>{{ language == 0 ? '订单编号：' : 'No.' }} {{ b.id }}</span>
             <span>{{ language == 0 ? '订单编号：' : 'No.' }} {{ b.id }}</span>
           </div>
           </div>
@@ -178,7 +188,7 @@
 </template>
 </template>
 
 
 <script setup>
 <script setup>
-import { onMounted, getCurrentInstance } from '@vue/runtime-core'
+import { onMounted, getCurrentInstance, ref } from '@vue/runtime-core'
 import { useStorage } from '@vueuse/core/index'
 import { useStorage } from '@vueuse/core/index'
 import { newbilllist } from '@/apiPc/common'
 import { newbilllist } from '@/apiPc/common'
 import useUserStore from '@/store/modules/user'
 import useUserStore from '@/store/modules/user'
@@ -191,8 +201,18 @@ const router = useRouter()
 const language = useStorage('language', 0)
 const language = useStorage('language', 0)
 const list = ref([])
 const list = ref([])
 const user = useUserStore().user
 const user = useUserStore().user
+const orderType = ref('')
 const { proxy } = getCurrentInstance()
 const { proxy } = getCurrentInstance()
-
+const cardList = ref([
+  { val: '', label: '全部', labelEn: 'ALL' },
+  { val: '0', label: '酒店', labelEn: 'HOTEL' },
+  { val: '1', label: '车辆', labelEn: 'TRANSPORTATION' },
+  { val: '2', label: '餐饮', labelEn: 'DINING' },
+  { val: '3', label: '化妆', labelEn: 'MAKEUP' },
+  { val: '4', label: '拍摄', labelEn: 'SHOOTING' },
+  { val: '5', label: '票务', labelEn: 'TICKETING' },
+  { val: '6', label: '旅游', labelEn: 'TRAVEL' }
+])
 onMounted(() => {
 onMounted(() => {
   getList()
   getList()
 })
 })
@@ -203,7 +223,7 @@ function finish(bill) {
 }
 }
 
 
 function getList() {
 function getList() {
-  newbilllist({ createById: user.userId }).then(res => {
+  newbilllist({ createById: user.userId, orderType: orderType.value }).then(res => {
     list.value = res.rows || []
     list.value = res.rows || []
     for (const b of list.value) {
     for (const b of list.value) {
       b.messageObj = JSON.parse(b.message) || {}
       b.messageObj = JSON.parse(b.message) || {}