页面修改

src/components/Hotel/roomReservationsDetails.vue

@@ -22,7 +22,8 @@
       <ul>
         <li>
           <input v-if="IsOperation!=1" type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" />
-          <input  v-if="IsOperation==1&&CurrentUserInfo.EmployeeId==615" type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" />
+          <input v-if="IsOperation==1&&CurrentUserInfo.EmployeeId==615" type="button" class="fr normalBtn mb30"
+            value="保存" @click="saveList(1)" />
           <span v-if="IsOperation==1" style="color:red;font-size:14px;">已制单，不能再修改!</span>
         </li>
       </ul>
@@ -143,7 +144,8 @@
                       供应商
                     </td>
                     <td>
-                      <el-select class='w120 sel' v-model='subItem.SupplierId' @change="getSupplierShoupei(subItem)" filterable placeholder="请选择供应商">
+                      <el-select class='w120 sel' v-model='subItem.SupplierId' @change="getSupplierShoupei(subItem)"
+                        filterable placeholder="请选择供应商">
                         <el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
                         <el-option v-for="(SupplierItem,Supplierindex) in SupplierList" :key="Supplierindex"
                           :label="SupplierItem.Name" :value="SupplierItem.ID">
@@ -281,6 +283,20 @@
               <!-- 付款方式 -->
               <td v-if="childIndex==0" :rowspan="6">
                 <table class="hotelTable">
+                  <tr>
+                    <td width="70" style="text-align:right;">币种：</td>
+                    <td>
+                      <el-select v-model="subItem.CurrencyId" placeholder="请选择" class='w135 sel' style="display:none;">
+                        <el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
+                        <el-option v-for="(item,index) in allCurrencyList" :key="index" :label="item.Name"
+                          :value="item.ID">
+                        </el-option>
+                      </el-select>
+                    </td>
+                  </tr>
+                  <tr>
+                    <td colspan="2" style="height:5px;"></td>
+                  </tr>
                   <tr>
                     <td width="70" style="text-align:right;">订房状态：</td>
                     <td>
@@ -406,10 +422,10 @@
                   <tr v-if="CurrentUserInfo.EmployeeId == 615">
                     <td width="70" style="text-align:right;">是否同步更新房间数:</td>
                     <td>
-                       <el-select class='w135 sel' v-model='subItem.IsSyncHotelCount'>
+                      <el-select class='w135 sel' v-model='subItem.IsSyncHotelCount'>
                         <el-option label='同步更新' :value='0'></el-option>
                         <el-option label='不更新' :value='1'></el-option>
-                       </el-select>
+                      </el-select>
                     </td>
                   </tr>
                 </table>
@@ -495,6 +511,7 @@
         GuideName: "", //导游名称
         IsEditHotelPeople: 0, //是否有修改人数权限[0-不能修改，1-可以修改]
         IsCombine: false, //是否是合团，true-是合团，false-不是合团
+        allCurrencyList: [], //币种列表
       }
     },
     components: {
@@ -718,8 +735,8 @@
                   subItem.isShowPop = false;
                   subItem.ckedHotelName = "";
                   //遍历手配
-                  this.SupplierList.forEach(x=>{
-                    if(x.ID==subItem.SupplierId){
+                  this.SupplierList.forEach(x => {
+                    if (x.ID == subItem.SupplierId) {
                       subItem.IsHaveShouPeiFee = x.IsHaveShouPeiFee;
                       subItem.ShouPeiMoney = x.ShouPeiMoney;
                     }
@@ -913,16 +930,25 @@
         }, err => {});
       },
       //改变id获取手配价格
-      getSupplierShoupei(SubItem){
-        this.SupplierList.forEach(x=>{
-          if(x.ID==SubItem.SupplierId){
-            SubItem.IsHaveShouPeiFee=x.IsHaveShouPeiFee;
-            SubItem.ShouPeiMoney=x.ShouPeiMoney;
+      getSupplierShoupei(SubItem) {
+        this.SupplierList.forEach(x => {
+          if (x.ID == SubItem.SupplierId) {
+            SubItem.IsHaveShouPeiFee = x.IsHaveShouPeiFee;
+            SubItem.ShouPeiMoney = x.ShouPeiMoney;
           }
         })
+      },
+      //获取所有币种
+      getAllCurrency() {
+        this.apipost("financeinfo_post_GetList", {}, res => {
+          if (res.data.resultCode === 1) {
+            this.allCurrencyList = res.data.data;
+          }
+        }, err => {});
       }
     },
     mounted() {
+      this.getAllCurrency();
       let userInfo = this.getLocalStorage()
       this.CurrentUserInfo = userInfo;
       this.LeaderName = this.$route.query.LeaderName;

src/components/LeaderManagement/leaderPerformance.vue

@@ -298,12 +298,12 @@
         <li>
           <span v-if="msg.Type==3||msg.Type==1">
             <em>年份：</em>
-            <el-date-picker v-model="msg.MonthStr" type="year" placeholder="选择年">
+            <el-date-picker v-model="msg.MonthStr" type="year" value-format="yyyy" placeholder="选择年">
             </el-date-picker>
           </span>
           <span v-else-if="msg.Type==2">
             <em>月份：</em>
-            <el-date-picker v-model="msg.MonthStr" type="month" placeholder="选择月">
+            <el-date-picker v-model="msg.MonthStr" type="month" value-format="yyyy-MM" placeholder="选择月">
             </el-date-picker>
           </span>
           <span v-else>
@@ -459,8 +459,8 @@
           MonthStr: "",
           //领队类型
           QLeaderType: 0,
-          Year: new Date().getFullYear(),
-          Month: new Date().getMonth() + 1,
+          Year: 0,
+          Month: 0,
           ShoppingID: 0, //购物店编号
         },
         //工作类型
@@ -550,6 +550,8 @@
     },
     mounted() {
       var Year = new Date().getFullYear();
+      this.msg.Year= new Date().getFullYear();
+      this.msg.Month= new Date().getMonth() + 1;
       let count = Year - (Year - 8);
       for (let i = 0; i <= count; i++) {
         this.yearList.push(Year - i);