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

src/components/Hotel/HotelManagement.vue

@@ -330,11 +330,13 @@
             </el-tooltip>
           </div>
         </div>
-        <div style="padding-left:15px;padding-top:5px;">
+        <el-tooltip class="item" effect="dark" :content="item.UpdateName+''+item.UpdateTimeStr" placement="top-start">
+          <div style="padding-left:15px;padding-top:5px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;">
             <i style="top:2px" class="iconfont icon-renyuanguanli"></i>
             <span v-if="item.UpdateName && item.UpdateName!=''">{{item.UpdateName}}</span>
             {{item.UpdateTimeStr}}
           </div>
+        </el-tooltip>
         <div class="btnList">
           <button @click="goSubInfo('HotelInfo',item.ID)" class="hotelBtnMan">{{$t('pub.updateMsg')}}</button>
           <button @click="CopyHotel(item.ID)" class="hotelBtnMan">复制</button>

src/components/LeaderManagement/CarDetails.vue

@@ -17,6 +17,7 @@
           <th>金额</th>
           <th>币种</th>
           <th>支付方式</th>
+          <th>附件</th> 
           <th>备注</th>
         </tr>
         <tr>
@@ -54,6 +55,16 @@
               <p v-if="item.ReimburseList.SettlementType==1">现金支付</p>
               <p v-if="item.ReimburseList.SettlementType==2">公司结算</p>
           </td>
+          <td >
+            <div v-if="item.ReimburseList.VoucherPicList.length">
+              <div v-for="(vou, vouIndex) in item.ReimburseList.VoucherPicList" :key="vouIndex">
+                <img @click="openImg(vou.url)" style="width: 20px;height: 20px;" :src="vou.url" alt="">
+              </div>
+            </div>
+            <div v-else>
+              无
+            </div>
+          </td> 
           <td>{{item.ReimburseList.Remarks}}</td>
         </tr>
         
@@ -113,6 +124,9 @@ export default {
         query: { id: id, blank: "y", tab: name }
       });
     },
+    openImg(src){
+      window.open(src, "_blank");
+    },
     handleCurrentChange(val) {
       this.msg.pageIndex = val;
       this.getList();

src/components/LeaderManagement/DinningDetails.vue

@@ -16,6 +16,7 @@
           <th>实付</th>
           <th>币种</th>
           <th>支付方式</th>
+          <th>附件</th> 
           <th>备注</th>
         </tr>
         <tr>
@@ -60,6 +61,16 @@
                     <td v-if="childIndex==0" :rowspan="subItem.DiningPriceList.length">
                     {{urrencyTypeObj[subItem.ReimburseList.CurrencyId]}}
                     </td> 
+                    <td v-if="childIndex==0" :rowspan="subItem.ReimburseList.ReimburseDetailsList.length">
+                      <div v-if="subItem.ReimburseList.VoucherPicList.length">
+                        <div v-for="(vou, vouIndex) in subItem.ReimburseList.VoucherPicList" :key="vouIndex">
+                          <img @click="openImg(vou.url)" style="width: 20px;height: 20px;" :src="vou.url" alt="">
+                        </div>
+                      </div>
+                      <div v-else>
+                        无
+                      </div>
+                    </td> 
                     <td v-if="childIndex==0" :rowspan="subItem.DiningPriceList.length">
                     {{subItem.ReimburseList.Remarks}}
                     </td> 
@@ -153,6 +164,9 @@ export default {
       this.msg.pageIndex = 1;
       this.currentPage = 1;
     },
+    openImg(src){
+      window.open(src, "_blank");
+    },
     getList() {
       
       this.loading = true;

src/components/LeaderManagement/leaderPayHotelDetail.vue

@@ -15,6 +15,7 @@
         <th>金额小计</th>
         <th>支付方式</th>
         <th>币种</th> 
+        <th>附件</th> 
         <th>备注</th> 
       </tr>
      <template v-for='(item,index) in dataList'>
@@ -48,6 +49,16 @@
             <td v-if="childIndex==0" :rowspan="item.ReimburseList.ReimburseDetailsList.length">
               {{getCurrencyStr(item.ReimburseList.CurrencyId)}}
             </td> 
+            <td v-if="childIndex==0" :rowspan="item.ReimburseList.ReimburseDetailsList.length">
+              <div v-if="item.ReimburseList.VoucherPicList.length">
+                <div v-for="(vou, vouIndex) in item.ReimburseList.VoucherPicList" :key="vouIndex">
+                  <img @click="openImg(vou.url)" style="width: 20px;height: 20px;" :src="vou.url" alt="">
+                </div>
+              </div>
+              <div v-else>
+                无
+              </div>
+            </td> 
             <td v-if="childIndex==0" :rowspan="item.ReimburseList.ReimburseDetailsList.length">
               {{item.ReimburseList.Remarks}}
             </td> 
@@ -94,6 +105,9 @@ export default {
         }
       }
     },
+    openImg(src){
+      window.open(src, "_blank");
+    },
     //获取数据
     getList(TCIDs, date) {
       this.loading = true;

src/components/LeaderManagement/leaderPayTicketDetail.vue

@@ -15,6 +15,7 @@
         <th>金额小计</th>
         <th>支付方式</th>
         <th>币种</th> 
+        <th>附件</th> 
         <th>备注</th> 
       </tr>
      <template v-for='(item,index) in dataList'>
@@ -48,6 +49,16 @@
             <td v-if="childIndex==0" :rowspan="subItem.ReimburseList.ReimburseDetailsList.length">
               {{getCurrencyStr(subItem.ReimburseList.CurrencyId)}}
             </td> 
+            <td v-if="childIndex==0" :rowspan="subItem.ReimburseList.ReimburseDetailsList.length">
+              <div v-if="subItem.ReimburseList.VoucherPicList.length">
+                <div v-for="(vou, vouIndex) in subItem.ReimburseList.VoucherPicList" :key="vouIndex">
+                  <img @click="openImg(vou.url)" style="width: 20px;height: 20px;" :src="vou.url" alt="">
+                </div>
+              </div>
+              <div v-else>
+                无
+              </div>
+            </td> 
             <td v-if="childIndex==0" :rowspan="subItem.ReimburseList.ReimburseDetailsList.length">
               {{subItem.ReimburseList.Remarks}}
             </td> 
@@ -88,6 +99,9 @@ export default {
         }
       }
     },
+    openImg(src){
+      window.open(src, "_blank");
+    },
     //获取数据
     getList(TCIDs, date) {
       this.loading = true;
@@ -109,6 +123,7 @@ export default {
               dataList = data
             }
             this.dataList = dataList;
+            console.log(dataList)
           } else {
             this.Error(res.data.message);
           }

src/components/scenicSpot/scenicSpotList.vue

@@ -312,11 +312,13 @@
         <el-tooltip class="item" effect="dark" :content="item.Name" placement="top-start" popper-class="max-w250">
           <div class="hotelTitle">{{item.Name}}</div>
         </el-tooltip>
-        <div style="padding-left:15px;margin:10px 0;">
+        <el-tooltip class="item" effect="dark" :content="item.UpdateName+''+item.UpdateTimeStr" placement="top-start" popper-class="max-w250">
+          <div style="padding-left:15px;margin:10px 0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;">
             <i style="top: 1px;position: relative;" class="iconfont icon-renyuanguanli"></i>
             <span v-if="item.UpdateName && item.UpdateName!=''">{{item.UpdateName}}</span>
             {{item.UpdateTimeStr}}
           </div>
+        </el-tooltip>
         <div class="btnList">
           <button @click="goUrl('scenicSpotInfoManage',item.ID)" class="hotelBtn">{{$t('pub.updateMsg')}}</button>
           <button @click="CopyScenic(item.ID)" class="hotelBtn">复制</button>

src/components/work/workManager2.vue

@@ -54,7 +54,7 @@
             ></el-option>
           </el-select>
         </li>
-        <li>
+        <li v-if="false">
           <span>
             <em>审批状态</em>
             <el-select class="w200" v-model="msg.examineStatus">