no message

src/components/Hotel/reservation/HotelOrderList.vue

@@ -233,7 +233,7 @@
           this.loading = true
           let url
           // 销售 OP
-          if(this.pagesTitle){
+          if(this.pagesTitle=='销售'){
             url = "dict_post_GetMySaleCustomerOrderPageList"
           }else{
             url = "dict_post_GetAdminCustomerOrderPageList"

src/components/Hotel/reservation/OrderList.vue

@@ -349,8 +349,8 @@
           <span class="mr">
             {{ item.SaleName }}
           </span>
-          <span class="mr" v-if="!pagesTitle&&item.CustomerName">创建人：</span>
-          <span class="mr" v-if="!pagesTitle&&item.CustomerName"
+          <span class="mr" v-if="item.CustomerName">创建人：</span>
+          <span class="mr" v-if="item.CustomerName"
             >{{ item.CustomerName }} ({{ item.CustomerContact }}/{{
               item.CustomerTel
             }})</span
@@ -681,18 +681,22 @@
           <div class="row-c justify-sb borderD pb5">
             <span class="fz12 c9e">订单总金额</span>
             <div class="ml">
-              <span class="fz12 ml">¥</span>
+              <span class="fz12 ml">
+                <!-- ¥ -->円
+              </span>
               <span class="fz15 fbold">{{ item.Money.toFixed(2) }}</span>
               <span class="fz15">{{ item.CurrencyName }}</span>
             </div>
           </div>
           <div
             class="row-c justify-sb borderD py5"
-            v-if="(item.CustomerPayType == 1 || item.CustomerPayType == 3)&&!pagesTitle"
+            v-if="(item.CustomerPayType == 1 || item.CustomerPayType == 3)&&pagesTitle!='销售'"
           >
             <span class="fz12 c9e">到店自付</span>
             <div class="ml">
-              <span class="fz10 ml">¥</span>
+              <span class="fz10 ml">
+                <!-- ¥ -->円
+              </span>
               <span class="fz14">{{ item.SelfPayMoney.toFixed(2) }}</span>
               <span class="fz14">{{ item.CurrencyName }}</span>
             </div>
@@ -703,7 +707,9 @@
           >
             <span class="fz12 c9e">出发前付款</span>
             <div class="ml">
-              <span class="fz10 ml">¥</span>
+              <span class="fz10 ml">
+                <!-- ¥ -->円
+              </span>
               <span class="fz14">{{ item.BeforeMoney.toFixed(2) }}</span>
               <span class="fz14">{{ item.CurrencyName }}</span>
             </div>
@@ -1007,6 +1013,8 @@ export default {
           name: path,
           query: {
             id: obj.OrderId,
+            pagesTitle: this.pagesTitle,
+            blank: "y",
             tab: title
           }
         });
@@ -1016,8 +1024,8 @@ export default {
       // 0取消订单 1确认订单
       if (type == 0) {
         if (!this.loading0) {
-          this.cancelOrderDialog = true;
           this.cancelOrderId = item.OrderId
+          this.cancelOrderDialog = true;
         }
       } else if (type == 1) {
         if (!this.loading1) {
@@ -1052,28 +1060,62 @@ export default {
       }
       if (this.loading0) return;
       this.loading0 = true
-      this.apipost(
-        "dict_post_CancelAdminCustomerOrder",
-        {
-          OrderId: this.cancelOrderId,
-          CancelRemark: this.cancelRemark
-        },
-        res => {
-          if (res.data.resultCode == 1) {
-            this.Success(res.data.message);
-            this.cancelOrderDialog=false
-            this.cancelOrderId=0
-            this.cancelRemark=''
-            this.$emit("success");
-          } else {
-            this.Error(res.data.message);
+      // 地接 销售 OP
+      if(this.pagesTitle!='销售'){
+          this.apipost(
+          "dict_post_CancelAdminCustomerOrder",
+          {
+            OrderId: this.cancelOrderId,
+            CancelRemark: this.cancelRemark
+          },
+          res => {
+            if (res.data.resultCode == 1) {
+              this.Success(res.data.message);
+              this.cancelOrderDialog=false
+              this.cancelOrderId=0
+              this.cancelRemark=''
+              this.$emit("success");
+            } else {
+              this.Error(res.data.message);
+            }
+            this.loading0 = false;
+          },
+          err => {
+            this.loading0 = false;
           }
-          this.loading0 = false;
-        },
-        err => {
-          this.loading0 = false;
-        }
-      );
+        );
+      }else{
+        this.cancelOrder()
+      }
+      
+    },
+    // 销售 OP 取消订单
+    cancelOrder() {
+      let that = this
+      that.$confirm(`是否确定取消订单？`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+      }).then(() => {
+          this.apipost("dict_post_CancelSaleCustomerOrder", {
+              OrderId: this.cancelOrderId,
+              CancelRemark: this.cancelRemark
+          },
+          res => {
+              this.loading0= false
+              if (res.data.resultCode == 1) {
+                  this.Success(res.data.message);
+                  this.$emit("success");
+              } else {
+                  this.Error(res.data.message);
+              }
+          }).catch(err=>{
+              this.Error(err.message) 
+              this.loading0= false
+          })
+      }).catch(()=>{
+          this.loading0 = false
+      })
     },
     saveUpdate() {
       this.$confirm("是否确认设置收损?", "提示", {

src/components/Hotel/singleProduct/HotelList.vue

@@ -47,7 +47,7 @@
             <span>
               <em>酒店</em>
               <el-select v-model="msg.HotelChooseArray" :placeholder="$t('pub.pleaseSel')" class="multiple_input w300"
-                filterable multiple :multiple-limit="3">
+                filterable multiple collapse-tags :multiple-limit="3">
                 <el-option v-for="item in HotelList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
               </el-select>
             </span>
@@ -697,20 +697,23 @@
         let newCars = []
         let states = true
         oldCars = JSON.parse(localStorage.getItem("cars"))
-        oldCars.forEach(item=>{
+        if(oldCars){
+          oldCars.forEach(item=>{
             if(item.Date<this.getBeforeDate(-20,new Date().Format("yyyy-MM-dd"))){
                 states = false
             }else{
               newCars.push(item)
             }
-        })
-        if(!states){
-            this.HotelLength = newCars.length
-            localStorage.removeItem("cars")
-            localStorage.setItem("cars",JSON.stringify(newCars))
-            localStorage.removeItem('HotelLength')
-            localStorage.setItem('HotelLength',JSON.stringify(this.HotelLength))
+          })
+          if(!states){
+              this.HotelLength = newCars.length
+              localStorage.removeItem("cars")
+              localStorage.setItem("cars",JSON.stringify(newCars))
+              localStorage.removeItem('HotelLength')
+              localStorage.setItem('HotelLength',JSON.stringify(this.HotelLength))
+          }
         }
+        
         this.HotelLength = localStorage.getItem("HotelLength")?localStorage.getItem("HotelLength"):0
 
 

src/components/Hotel/singleProduct/components/ListCar.vue

@@ -105,7 +105,7 @@
                         <div>
                             <span class="coloref1416c fz12">订单总金额：</span>
                             <span class="coloref1416c fbold">
-                                <span class="fz13">¥</span>
+                                <span class="fz13"><!-- ¥ -->円</span>
                                 <span class="fz18">{{parameters.Money}}</span>
                             </span>
                         </div>

src/components/Hotel/singleProduct/components/TableOperation.vue

@@ -37,7 +37,7 @@
                 {{ item.RoomName }}
             </el-col>
             <el-col :span="9">
-                <span class="fz10 colorf44336">¥</span>
+                <span class="fz10 colorf44336"><!-- ¥ -->円</span>
                 <span class="din colorf44336">{{ item.UPriceFormat }}</span>
                 <span class="text-dark" style="font-size: 12px">/人</span>
             </el-col>