Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/LeaderManagement/leaderReimbursement.vue

@@ -314,7 +314,12 @@
               <span v-show="subItem.PayStyle==6">付款团号：{{subItem.PayTypeTCNUM}}</span>
             </td>
             <td v-if="childIndex==0" :rowspan="6">
+              <template v-if="IsShowRMB">
+                <span>人民币</span>
+              </template>
+              <template v-else>
                 {{GetCurrency(subItem.CurrencyId)}}
+              </template>
             </td>
             <td v-if="childIndex==0" :rowspan="6">
               <span v-if="subItem.DMCPayType === 1">现付</span>
@@ -358,7 +363,14 @@
         <td>总金额</td>
         <td colspan="24">
           <span v-for="plan in TotalNav.planPriceList" v-if="plan.UserType==1">
-            {{plan.PlanTotalPrice}} <span v-if="plan.CurrencyId>0"> ({{plan.CurrencyName}}) </span>
+            {{plan.PlanTotalPrice}} <span v-if="plan.CurrencyId>0"> (
+              <template v-if="IsShowRMB">
+                <span>人民币</span>
+              </template>
+              <template v-else>
+                {{plan.CurrencyName}}
+              </template>
+            ) </span>
           </span>
         </td>
       </tr>
@@ -433,7 +445,12 @@
               <span v-show="subItem.PayStyle==6">付款团号：{{subItem.PayTypeTCNUM}}</span>
             </td>
             <td v-if="childIndex==0" :rowspan="3">
+              <template v-if="IsShowRMB">
+                <span>人民币</span>
+              </template>
+              <template v-else>
                 {{GetCurrency(subItem.CurrencyId)}}
+              </template>
             </td>
             <td v-if="childIndex==0" :rowspan="3">
               {{subItem.Remarks}}
@@ -445,7 +462,14 @@
         <td>总金额</td>
         <td colspan="12">
           <span v-for="plan in TotalNav.planPriceList" v-if="plan.UserType==2">
-            {{plan.PlanTotalPrice}} <span v-if="plan.CurrencyId>0"> ({{plan.CurrencyName}}) </span>
+            {{plan.PlanTotalPrice}} <span v-if="plan.CurrencyId>0"> (
+              <template v-if="IsShowRMB">
+                <span>人民币</span>
+              </template>
+              <template v-else>
+                {{plan.CurrencyName}}
+              </template>
+            ) </span>
           </span>
         </td>
       </tr>
@@ -520,7 +544,14 @@
         <td>总金额</td>
         <td colspan="11">
           <span v-for="plan in TotalNav.planPriceList" v-if="plan.UserType==3">
-            {{plan.PlanTotalPrice}} <span v-if="plan.CurrencyId>0"> ({{plan.CurrencyName}}) </span>
+            {{plan.PlanTotalPrice}} <span v-if="plan.CurrencyId>0"> (
+              <template v-if="IsShowRMB">
+                <span>人民币</span>
+              </template>
+              <template v-else>
+                {{plan.CurrencyName}}
+              </template>
+              ) </span>
           </span>
         </td>
       </tr>
@@ -571,7 +602,14 @@
         <td>{{item.TCNUMS}}</td>
         <td :rowspan="nav.length * CurrencyListMoney.length" width="180" v-if="index===0">总金额：
           <span v-for="(cur,index) in CurrencyListMoney" :key="index+5000">{{moneyFormat(cur.money)}}
-            <span v-if="cur.CurrencyId>0"> ({{currencyTypeObj[cur.CurrencyId]}}) </span>
+            <span v-if="cur.CurrencyId>0"> (
+              <template v-if="IsShowRMB">
+                <span>人民币</span>
+              </template>
+              <template v-else>
+                {{currencyTypeObj[cur.CurrencyId]}}
+              </template>
+              ) </span>
             </br></span>
         </td>
         <td style="padding: 5px 20px;">
@@ -581,7 +619,14 @@
                 已领款：
                 <span style="color: red;">
                   {{moneyFormat(leadr.LeaderGetPrice)}}
-                  <span v-if="cur.CurrencyId > 0"> ({{currencyTypeObj[leadr.CurrencyId]}}) </span>
+                  <span v-if="cur.CurrencyId > 0"> (
+                    <template v-if="IsShowRMB">
+                      <span>人民币</span>
+                    </template>
+                    <template v-else>
+                      {{currencyTypeObj[leadr.CurrencyId]}}
+                    </template>
+                  ) </span>
                 </span>
               </p>
               <el-input class="w300" v-if="leadr.LeaderGetPrice < leadr.PlanPrice" type="number"
@@ -744,6 +789,8 @@
         },
         CurrencyListMoney: [],
         currencyTypeObj: [],
+        //判断是否显示人民币
+        IsShowRMB:false,
       }
     },
     components: {
@@ -1238,6 +1285,9 @@
       this.isUpdate = this.$route.query.isUpdate;
       this.msg.TCIDs = this.$route.query.id;
       this.NewCombinationNum = this.$route.query.NewCombinationNum;
+      if(this.$route.query.OutBranchId==1216){
+        this.IsShowRMB=true;
+      }
       this.getList();
       this.getTotalNav();
       this.getHangingAccountByTCIDList()

src/components/PersonalInfoSet.vue

@@ -7,8 +7,9 @@
     }
     .PerSon_LeftNav{
         width:418px;
-        height:91%;
-        position: fixed;
+        height:96%;
+        position: absolute;
+        overflow-y: auto;
         background-color: #fff;
         display: inline-block;
     }
@@ -16,6 +17,7 @@
         margin-left:440px;
         width:100%;
         height:100%;
+        overflow-y: auto;
         background-color: #fff;
     }
     .PerSon_Edit{
@@ -34,7 +36,7 @@
     .Person_Header{
         width:120px;
         height:120px;
-        margin:39px auto;
+        margin:30px auto;
         border:1px solid #F4F4F4;
         padding:3px;
         border-radius: 50%;
@@ -51,7 +53,7 @@
         text-align: center;
     }
     .Person_MenuList{
-        margin-top:60px;
+        margin-top:45px;
     }
     .Person_MenuList li{
         list-style-type: none;
@@ -838,7 +840,7 @@
                             </div>
                         </el-radio>
                     </div>
-                    <button class="normalBtn" style="margin:30px 0 0 20px;" @click="SureType">确定</button>
+                    <button class="normalBtn" style="margin:30px 0 20px 20px;" @click="SureType">确定</button>
                 </div>
 
             </div>
@@ -851,7 +853,7 @@
                     <button type="button" id="button" style="bottom:-50px;" @click="crop">确定</button>
                 </div>	
             </div>
-            <div style="padding:20px;">
+            <div style="padding:20px;display:none;">
                 <div class="show">
                 <div class="picture" :style="'backgroundImage:url('+headerImage+')'">
                 </div>

src/components/dmc/manager/dmcTotalTable.vue

@@ -315,7 +315,7 @@
                 </div>
               </td>
               <td>
-                <div class="fz16 fbold linkspan" @click="goUrlLeaderIsApply('leaderReimbursement',item,outItem,'用款计划')">
+                <div class="fz16 fbold linkspan" @click="goUrlYongKuan('leaderReimbursement',item,outItem,'用款计划')">
                   <span style="color: #4BCA81;" v-if="item.UseMoney==1">√</span>
                   <span class="colorE95252" v-else>{{item.UseMoney=='-1'?"x":"O"}}</span>
                 </div>
@@ -911,6 +911,20 @@
           }
         })
       },
+      //跳转用款计划
+      goUrlYongKuan(path, obj, outItem, title){
+        this.$router.push({
+          name: path,
+          query: {
+            "id": outItem.TCIDS,
+            NewCombinationNum: outItem.NewCombinationNum,
+            isUpdate: true,
+            OutBranchId:obj.OutBranchId,
+            blank: 'y',
+            tab: title
+          }
+        })
+      },
       handleCurrentChange(val) {
         this.msg.pageIndex = val;
         this.getList();

src/components/leaderPay2.vue

@@ -1765,38 +1765,38 @@
                 HotelList.push(res.data.data.HotelOrderListReport[i].HotelOrderList[o])
               }
             }
-            var Hotelmap = {},Hotelmap2 = {},
+            console.log(HotelList)
+            var Hotelmap = {},
               Hoteldest = [];
-
             for (var i = 0; i < HotelList.length; i++) {
               var ai = HotelList[i];
+              console.log(ai.NewHotelId, ai.CheckInDateStr, i)
               if (!Hotelmap[ai.CheckInDateStr]) {
                     Hoteldest.push({
                       CheckInDateStr: ai.CheckInDateStr,
                       NewHotelId: ai.NewHotelId,
+                      id: ai.NewHotelId + ai.CheckInDateStr,
                       data: [ai]
                     });
                     Hotelmap[ai.CheckInDateStr] = ai;
-                    Hotelmap2[ai.NewHotelId] = ai;
-                
-              }
-              else if (Hotelmap[ai.CheckInDateStr] && !Hotelmap2[ai.NewHotelId]) {
-                    Hoteldest.push({
-                      CheckInDateStr: ai.CheckInDateStr,
-                      NewHotelId: ai.NewHotelId,
-                      data: [ai]
-                    });
-                    Hotelmap2[ai.NewHotelId] = ai;
-                
-              }
-               else {
+              } else {
+                let list = []
                 for (var j = 0; j < Hoteldest.length; j++) {
                   var dj = Hoteldest[j];
                   if (dj.CheckInDateStr == ai.CheckInDateStr && dj.NewHotelId == ai.NewHotelId) {
                     dj.data.push(ai);
                     break;
+                  } else {
+                    list.push(ai)
                   }
-                  
+                }
+                for (let i = 0; i < list.length; i++) {
+                  Hoteldest.push({
+                    CheckInDateStr: ai.CheckInDateStr,
+                    NewHotelId: ai.NewHotelId,
+                    id: ai.NewHotelId + ai.CheckInDateStr,
+                    data: [ai]
+                  });
                 }
               }
             }
@@ -1807,7 +1807,7 @@
               }
               Hoteldest[i].row = row
             }
-            this.HotelDataList = Hoteldest;
+            this.HotelDataList = this.unique(Hoteldest, 'id');
           } else {
             this.$message.error(res.data.message);
           }