解決衝突

src/@types/index.ts

@@ -33,7 +33,7 @@ export type ModalOpenMode = 'edit' | 'add' | 'other'
 //TODO: 请根据实际情况调整定义的实体对象
 /**
  * @description 模拟定义菜单信息
- * 
+ *
  */
 export interface AuthMenuType {
   menuId: number
@@ -210,10 +210,11 @@ export type StandardStatus = {
 
 export type RoomType = {
   TypeId:number,
-  TypeName:string
+  TypeName:string,
+  Filed?:string
 }
 
 export type OrderType={
   TypeId:number,
   TypeName:string
-}
\ No newline at end of file
+}

src/components/hotel/list/ListCar.vue

@@ -253,7 +253,7 @@ export default defineComponent({
       removeHotelHandler(x:number,y:number){
         $q.dialog({
           title: t('dialog.titles.hotel'),
-          message: t('dialog.contents.hotel',{day:cars.value[x].Date,hotel:cars.value[x].Hotels[y].HotelName}),
+          message: `${t('dialog.contents.hotel.t1')} ${cars.value[x].Date} ${t('dialog.contents.hotel.t2')}${cars.value[x].Hotels[y].HotelName}`,
           cancel: true,
           persistent: true
         }).onOk(() => {

src/i18n/zh-TW/index.ts

 export default {
-  failed: '執行失敗',
-  success: '執行成功',
-  appsuffix: 'JVS同業預定系統',
-  siteName: '同業預定系統',
-  lanuage: '系統語言',
-  loginout: '登錄信息失效，請重新登錄',
-  timeout: '當前網絡環境異常，請求超時',
-  syslog: '系統升級告示',
-  sysmsg: '系統通知',
-  daterange: '請選擇檢索日期',
-  morequery: '更多篩選項',
-  query: '檢索',
-  noneData: '沒有找到相關的數據',
-  loading: '正在加載數據',
+  failed: "執行失敗",
+  success: "執行成功",
+  appsuffix: "JVS同業預定系統",
+  siteName: "同業預定系統",
+  lanuage: "系統語言",
+  loginout: "登錄信息失效，請重新登錄",
+  timeout: "當前網絡環境異常，請求超時",
+  syslog: "系統升級告示",
+  sysmsg: "系統通知",
+  daterange: "請選擇檢索日期",
+  morequery: "更多篩選項",
+  query: "檢索",
+  noneData: "沒有找到相關的數據",
+  loading: "正在加載數據",
   upload:{
-    'success':'上傳成功',
-    'failed':'上傳失敗',
-    'down':'下載',
-    'reload':'重新上傳'
+    "success":"上傳成功",
+    "failed":"上傳失敗",
+    "down":"下載",
+    "reload":"重新上傳"
   },
   dialog:{
     titles:{
-      hotel:'移除酒店警示',
-      horder:'取消订单警示'
+      hotel:"移除酒店警示",
+      horder:"取消订单警示"
     },
     contents:{
-      hotel:'你確定要移除{day}的酒店{hotel}?',
-      horder:'你确定需要取消此订单吗？'
+      hotel:{
+        t1:'你確定要移除',
+        t2:'的酒店'
+      },
+      horder:"你确定需要取消此订单吗？"
     }
   },
-  close:'關閉',
+  close:"關閉",
   unit: {
-    jian: '間',
-    ren: '人',
-    jp: '円',
-    jpc: '¥',
-    night: '晚',
-    jf:'間房'
+    jian: "間",
+    ren: "人",
+    jp: "円",
+    jpc: "¥",
+    night: "晚",
+    jf:"間房"
   },
   expends:{
-    on:'展開',
-    off:'收起'
+    on:"展開",
+    off:"收起"
   },
   hotelm:{
-    pageTitle:'酒店訂單變更'
+    pageTitle:"酒店訂單變更",
+    otherRoom:"添加其他房型",
   },
   hotelorder: {
     dialog:{
-      title: '您的專屬付款賬戶如下',
-      AccountName: '戶名',
-      account: '賬號',
-      prompt: '我們將會在您付款後的1-2個工作日內完成確認,確認後自動更新訂單入款',
-      copy: '複製'
+      title: "您的專屬付款賬戶如下",
+      AccountName: "戶名",
+      account: "賬號",
+      prompt: "我們將會在您付款後的1-2個工作日內完成確認,確認後自動更新訂單入款",
+      copy: "複製"
     },
     pay: {
-      t1: '出發前收款酒店，請您於 ',
-      t11: '前支付訂金，並且於 ',
-      t12:' 日前支付尾款',
-      t2: '到店自付酒店，需要您於 ',
-      t21: ' 前上傳旅客名單'
+      t1: "出發前收款酒店，請您於 ",
+      t11: "前支付訂金，並且於 ",
+      t12:" 日前支付尾款",
+      t2: "到店自付酒店，需要您於 ",
+      t21: " 前上傳旅客名單"
     },
     hands:'手配費',
     payinfo: '查看支付方式',
@@ -79,235 +83,235 @@ export default {
     taxed: '含稅',
     handFee: '手配費',
     check: {
-      un: '未確認',
-      ok: '確認'
+      un: "未確認",
+      ok: "確認"
     },
     opera: {
-      normal: '訂單操作',
-      cancel: '取消訂單',
-      edit: '訂單變更',
-      view: '查看詳情'
+      normal: "訂單操作",
+      cancel: "取消訂單",
+      edit: "訂單變更",
+      view: "查看詳情"
     },
     payType: {
-      t1: '到店自付',
-      t2: '出發前付款'
+      t1: "到店自付",
+      t2: "出發前付款"
     },
     col: {
-      hn: '酒店名稱',
-      d: '入住日期',
-      r: '入住信息',
-      n: '訂房號',
-      t: '城市税',
-      t2: '入湯税',
-      m: '小計',
-      noRoomNo: '訂房號',
-      noneTax: '税入',
-      pt:'付款方式'
+      hn: "酒店名稱",
+      d: "入住日期",
+      r: "入住信息",
+      n: "訂房號",
+      t: "城市税",
+      t2: "入湯税",
+      m: "小計",
+      noRoomNo: "訂房號",
+      noneTax: "税入",
+      pt:"付款方式"
     },
     search: {
-      status: '訂單狀態',
-      orderNum: '訂單編號',
-      daterange: '下單時間',
-      roomType: '酒店房型',
-      orderId: '訂單流水號',
-      orderType: '訂單類型',
-      tcNum: '組團號',
-      contactInfo: '聯繫人信息',
-      contactInfoHolder: '請輸入聯繫人/聯繫電話'
+      status: "訂單狀態",
+      orderNum: "訂單編號",
+      daterange: "下單時間",
+      roomType: "酒店房型",
+      orderId: "訂單流水號",
+      orderType: "訂單類型",
+      tcNum: "組團號",
+      contactInfo: "聯繫人信息",
+      contactInfoHolder: "請輸入聯繫人/聯繫電話"
     },
     orderType: {
-      default: '所有類型',
-      tour: '團隊訂房',
-      guest: '散拼訂房'
+      default: "所有類型",
+      tour: "團隊訂房",
+      guest: "散拼訂房"
     },
     orderStatus: {
-      normal: '全部訂單',
-      apply: '待確認',
-      check: '已確認',
-      cancel: '已取消',
-      sun: '收損訂單'
+      normal: "全部訂單",
+      apply: "待確認",
+      check: "已確認",
+      cancel: "已取消",
+      sun: "收損訂單"
     }
   },
   dayOfWeek: {
-    mon: '一',
-    tues: '二',
-    wed: '三',
-    thur: '四',
-    fri: '五',
-    sat: '六',
-    sun: '日'
+    mon: "一",
+    tues: "二",
+    wed: "三",
+    thur: "四",
+    fri: "五",
+    sat: "六",
+    sun: "日"
   },
   Notifications: {
-    title: '通知',
-    subtitle: '條新消息',
-    more: '更多',
-    time: 'h'
+    title: "通知",
+    subtitle: "條新消息",
+    more: "更多",
+    time: "h"
   },
   hotel: {
-    groupPrice:'合計',
-    pageTitle: '酒店檢索',
-    area: '檢索區域',
-    searchName: '酒店名稱',
-    hotelRate: '酒店星級',
-    minPrice: '最低價格',
-    maxPrice: '最高價格',
-    waringTips:'注意：以下計費與報價均是按照人數進行計費',
-    inHouseDate:'入住日期',
-    inhouseDays:'共計',
-    bigTips:'本房型不同的酒店入住人數限制不同，系統默認該房型只能入住一人',
-    yg:'預計 ',
-    outbind:'超出現有的庫存預定，我們會即時與酒店協商，請保證收訊通暢',
+    groupPrice:"合計",
+    pageTitle: "酒店檢索",
+    area: "檢索區域",
+    searchName: "酒店名稱",
+    hotelRate: "酒店星級",
+    minPrice: "最低價格",
+    maxPrice: "最高價格",
+    waringTips:"注意：以下計費與報價均是按照人數進行計費",
+    inHouseDate:"入住日期",
+    inhouseDays:"共計",
+    bigTips:"本房型不同的酒店入住人數限制不同，系統默認該房型只能入住一人",
+    yg:"預計 ",
+    outbind:"超出現有的庫存預定，我們會即時與酒店協商，請保證收訊通暢",
     car: {
-      shoppingTitle: '購物車',
-      addShopping: '暫存購物車',
-      orderTitle: '訂單',
-      people: '人',
-      between: '间',
-      submit: '確認下單',
-      tax: '税',
-      soup: '入汤',
-      OrderType: '訂單類型',
-      TCNum: '组团号',
-      ContactName: '联系人名稱',
-      ContactNumber: '联系人电话',
-      inputText: '請輸入',
-      Remark: '備註',
-      scattered: '散客',
-      group: '團',
-      title:'本次行程',
-      title1:'天，入住',
-      title2:'個酒店',
-      subtitle:'酒店採購單',
-      sumPrice:'訂單總金額'
+      shoppingTitle: "購物車",
+      addShopping: "暫存購物車",
+      orderTitle: "訂單",
+      people: "人",
+      between: "间",
+      submit: "確認下單",
+      tax: "税",
+      soup: "入汤",
+      OrderType: "訂單類型",
+      TCNum: "组团号",
+      ContactName: "联系人名稱",
+      ContactNumber: "联系人电话",
+      inputText: "請輸入",
+      Remark: "備註",
+      scattered: "散客",
+      group: "團",
+      title:"本次行程",
+      title1:"天，入住",
+      title2:"個酒店",
+      subtitle:"酒店採購單",
+      sumPrice:"訂單總金額"
     },
     shopping:{
-      labelNum: '房數',
-      peopleNum: '人數',
-      small: '數量不能小於',
-      big: '大於剩餘數嘚',
-      StandardRooms: '標間',
-      maxRooms: '大床間',
-      naturalRooms: '自然間',
-      ThreeRooms: '三人間',
-      driverRoom: '司機間',
-      only: '僅剩',
-      between: '間',
-      TheSelected: '已选'
+      labelNum: "房數",
+      peopleNum: "人數",
+      small: "數量不能小於",
+      big: "大於剩餘數嘚",
+      StandardRooms: "標間",
+      maxRooms: "大床間",
+      naturalRooms: "自然間",
+      ThreeRooms: "三人間",
+      driverRoom: "司機間",
+      only: "僅剩",
+      between: "間",
+      TheSelected: "已选"
     },
-    pricetips: '酒店報價表',
-    buy: '預定',
+    pricetips: "酒店報價表",
+    buy: "預定",
     table: {
-      price: '價格(標準間)',
-      ins: '總/用/剩',
-      limit: '超定'
+      price: "價格(標準間)",
+      ins: "總/用/剩",
+      limit: "超定"
     },
     rooms: {
-      default: '全部房型',
-      normal: '標準間',
-      big: '大床房',
-      sing: '自然單間',
-      three: '三人間',
-      driver: '司導間'
+      default: "全部房型",
+      normal: "標準間",
+      big: "大床房",
+      sing: "自然單間",
+      three: "三人間",
+      driver: "司導間"
     },
     col: {
-      first: '酒店名稱',
-      second: '價格&庫存',
-      three: '總庫存',
-      four: '價格',
-      five: '標準間價格',
-      low: '起',
-      ins: '庫存',
-      sins: '剩餘庫存',
-      uins: '已預訂',
-      more: '更多房型報價',
-      noMore: '沒有其他房型報價'
+      first: "酒店名稱",
+      second: "價格&庫存",
+      three: "總庫存",
+      four: "價格",
+      five: "標準間價格",
+      low: "起",
+      ins: "庫存",
+      sins: "剩餘庫存",
+      uins: "已預訂",
+      more: "更多房型報價",
+      noMore: "沒有其他房型報價"
     },
     datetype: {
-      red: '紅日',
-      pink: '旺季',
-      avg: '平日',
-      dan: '淡日',
-      spe: '特別日',
-      xing: '行前日'
+      red: "紅日",
+      pink: "旺季",
+      avg: "平日",
+      dan: "淡日",
+      spe: "特別日",
+      xing: "行前日"
     },
     rates: {
-      normal: '所有等級',
-      low: '三星或商務',
-      middle: '四星',
-      hight: '五星'
+      normal: "所有等級",
+      low: "三星或商務",
+      middle: "四星",
+      hight: "五星"
     }
   },
   userMenu: {
-    mypro: '個人檔案',
-    myfinace: '請求書',
-    fapiao: '索取發票',
-    lang: '系統語言',
-    signOut: '登出'
+    mypro: "個人檔案",
+    myfinace: "請求書",
+    fapiao: "索取發票",
+    lang: "系統語言",
+    signOut: "登出"
   },
   menu: {
     hotel: {
-      first: '酒店預訂',
-      second: '酒店檢索',
-      three: '酒店訂單'
+      first: "酒店預訂",
+      second: "酒店檢索",
+      three: "酒店訂單"
     },
     car: {
-      first: '車輛預定',
-      second: '車輛預定',
-      three: '用車訂單'
+      first: "車輛預定",
+      second: "車輛預定",
+      three: "用車訂單"
     },
     ticket: {
-      first: '門票預訂',
-      second: '門票檢索',
-      three: '門票訂單'
+      first: "門票預訂",
+      second: "門票檢索",
+      three: "門票訂單"
     },
     finance: {
-      first: '帳單',
-      second: '月度請求書',
-      three: '匯款說明'
+      first: "帳單",
+      second: "月度請求書",
+      three: "匯款說明"
     }
   },
   login: {
-    notaccess: '沒有同業會員帳戶？',
-    registlink: '申請註冊',
-    title: '登入',
-    subTitle: '歡迎您的到來，開啟急速採購',
-    account: '帳戶（EMail）',
-    password: '密碼',
-    forgot: '忘記密碼？',
-    signin: '登入',
-    pageTitle: '登入',
-    ruleTipsAccount: '請填寫正確的郵箱帳號',
-    ruleTipsPwd: '請填寫密碼',
-    formTips: '請填寫登陸信息',
-    success: '登陸成功'
+    notaccess: "沒有同業會員帳戶？",
+    registlink: "申請註冊",
+    title: "登入",
+    subTitle: "歡迎您的到來，開啟急速採購",
+    account: "帳戶（EMail）",
+    password: "密碼",
+    forgot: "忘記密碼？",
+    signin: "登入",
+    pageTitle: "登入",
+    ruleTipsAccount: "請填寫正確的郵箱帳號",
+    ruleTipsPwd: "請填寫密碼",
+    formTips: "請填寫登陸信息",
+    success: "登陸成功"
   },
   forget: {
-    pageTitle: '忘记密码',
-    title: '忘記密碼',
-    subtitle: '輸入您的郵箱，以重置密碼',
-    notaccess: '已經是會員了？',
-    registlink: '登入',
-    account: '帳戶（EMail）',
-    submit: '提交',
-    cancel: '取消',
-    goback: '返回',
-    mailResult: '郵件已發送到您的郵箱，請根據郵件提示修改密碼',
-    resultBtn: '我已知曉'
+    pageTitle: "忘记密码",
+    title: "忘記密碼",
+    subtitle: "輸入您的郵箱，以重置密碼",
+    notaccess: "已經是會員了？",
+    registlink: "登入",
+    account: "帳戶（EMail）",
+    submit: "提交",
+    cancel: "取消",
+    goback: "返回",
+    mailResult: "郵件已發送到您的郵箱，請根據郵件提示修改密碼",
+    resultBtn: "我已知曉"
   },
   newpwd: {
-    pageTitle: '設置新密碼',
-    title: '設置新密碼',
-    subtitle: '為了您的帳戶安全，建議您定期修改密碼',
-    notaccess: '你已經重置密碼了嗎？',
-    registlink: '登入',
-    pass: '新密碼',
-    passTips: '使用8個或8個以上的字母、數字和符號的組合',
-    passvalidate: '請按照提示要求設置密碼',
-    repeatPassvalidate: '兩次輸入密碼不一致',
-    repeatPass: '再次輸入密碼',
-    notEmptyPass: '新密碼最少為8位',
-    maxLengthPass: '密碼長度應為8-16位',
-    updateResult: '新密碼已經設置成功，可以立即登入',
-    resultBtn: '立即登入'
+    pageTitle: "設置新密碼",
+    title: "設置新密碼",
+    subtitle: "為了您的帳戶安全，建議您定期修改密碼",
+    notaccess: "你已經重置密碼了嗎？",
+    registlink: "登入",
+    pass: "新密碼",
+    passTips: "使用8個或8個以上的字母、數字和符號的組合",
+    passvalidate: "請按照提示要求設置密碼",
+    repeatPassvalidate: "兩次輸入密碼不一致",
+    repeatPass: "再次輸入密碼",
+    notEmptyPass: "新密碼最少為8位",
+    maxLengthPass: "密碼長度應為8-16位",
+    updateResult: "新密碼已經設置成功，可以立即登入",
+    resultBtn: "立即登入"
   }
 }

src/pages/hotel/ModifyHotelOrder.vue

@@ -23,12 +23,17 @@
           <q-btn color="negative" icon="delete" rounded dense size="sm" flat />
         </div>
         <div class="q-pa-sm rounded-borders bg-blue-grey-1 q-mt-sm" v-for="y in x.data">
-          <div class="text-subtitle1 text-primary" style="border-bottom: 1px dashed #607d8b">{{ y.HotelName }}</div>
+          <div class="row items-center item-hide-opera" style="border-bottom: 1px dashed #607d8b33">
+            <div class="text-subtitle1 text-primary ellipsis col">{{ y.HotelName }}</div>
+            <div class="q-ml-sm opera-box-item">
+              <q-btn color="negative" icon="delete" rounded dense size="sm" flat />
+            </div>
+          </div>
           <div v-for="(z,i) in y.RoomList" class="q-mb-md">
             <div class="row no-wrap items-center q-mt-sm f12">
               <span class="col">
                 {{ z.RoomInfo.TypeName }}
-                <div>{{ z.Unit_Price }}/{{ $t('unit.ren') }}</div>
+                <div class="text-blue-grey-6">{{ moneyFormat(z.Unit_Price) }}/{{ $t('unit.ren') }}</div>
               </span>
               <div class="col">
                 <div class="f12 text-grey-6 text-center col">
@@ -48,11 +53,15 @@
               </span>
             </div>
           </div>
-          <div class="row items-center justify-between" style="border-top: 1px dashed #607d8b">
-            <div class="q-mt-sm">{{ $t('hotelorder.col.t') }}：{{ moneyFormat(y.TaxesPrice) }}/{{ $t('unit.ren') }}</div>
-            <div class="q-mt-sm">{{ $t('hotelorder.col.t2') }}：{{ moneyFormat(y.PriceInTangTax) }}/{{ $t('unit.ren') }}</div>
+          <div class="text-right q-mb-sm">
+            <span class="q-mr-md f12">暫無其他可用房型</span>
+            <q-btn color="accent" dense outline :label="$t('hotelm.otherRoom')" size="sm" />
+          </div>
+          <div class="row items-center justify-between" style="border-top: 1px dashed #607d8b33">
+            <div class="q-mt-sm text-blue-grey-6">{{ $t('hotelorder.col.t') }}：{{ moneyFormat(y.TaxesPrice) }}/{{ $t('unit.ren') }}</div>
+            <div class="q-mt-sm text-blue-grey-6">{{ $t('hotelorder.col.t2') }}：{{ moneyFormat(y.PriceInTangTax) }}/{{ $t('unit.ren') }}</div>
           </div>
-          <div class="text-right text-primary q-mt-sm" style="border-top: 1px dashed #607d8b">
+          <div class="text-right text-primary q-mt-sm" style="border-top: 1px dashed #607d8b33">
             <span class="text-weight-thin">{{ $t('hotel.groupPrice') }}：</span>
             <span class="fz14">¥</span>
             <span class="text-subtitle1">{{ moneyFormat(y.HotelMoeny) }}</span>
@@ -169,4 +178,11 @@ export default defineComponent({
 })
 </script>
 
-<style></style>
+<style>
+.opera-box-item{
+  display: none !important;
+}
+.item-hide-opera:hover .opera-box-item{
+  display: block !important;
+}
+</style>

src/utils/tools.ts

@@ -131,10 +131,12 @@ export function getHotelRoomType(getNormal:boolean = false):Array<RoomType>{
     })
   }
   let roomLangs=[t('hotel.rooms.normal'),t('hotel.rooms.big'),t('hotel.rooms.sing'),t('hotel.rooms.three'),t('hotel.rooms.driver')]
+  let fileds = ['CostPrice', 'BidroomPrice', 'SingleroomPrice', 'AddBedPrice', 'GuideRoomPrice']
   roomLangs.forEach((x:string,i:number)=>{
     rooms.push({
       TypeId:(i+1),
-      TypeName:x
+      TypeName:x,
+      Filed:fileds[i]
     })
   })
   return rooms