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

src/components/TravelManager/TravelList/TeamBalancePayment.vue

@@ -102,7 +102,7 @@
   }
 
   .Team_ComCoin {
-    width: 60%;
+    width: 70%;
     margin: auto;
     text-align: left;
   }
@@ -903,8 +903,9 @@
           <tr>
             <th width="180">单号</th>
             <th width="200">费用类型</th>
-            <th width="500">交易明细</th>
-            <th width="300">金额</th>
+            <th width="200">付款对象</th>
+            <th width="400">交易明细</th>
+            <th width="300">本位币</th>
             <th width="200">交易日期</th>
             <th width="250">制单人员</th>
             <th width='180'>审核状态</th>
@@ -917,6 +918,7 @@
                 <span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span>
               </td>
               <td><span v-for="subItem in item.CostTypeList" :key="subItem.subCode">{{subItem}}<br /></span></td>
+              <td>{{item.ClientName}}</td>
               <td>
                 <div class="Team_ComCoin" v-for="childItem in item.TradeWayList">
                   支付方式：{{childItem.Alias}}&nbsp;币种：{{childItem.CurrencyName}}
@@ -925,6 +927,7 @@
                 </div>
               </td>
               <td style="font-size:14px;">
+                <span v-if="item.Rate !=1">原币：{{item.WBMoney}}<br /></span>
                 应付：{{item.Money}}<br />
                 实付：{{item.PayMoney}}
               </td>
@@ -955,7 +958,8 @@
           <tr>
             <th width="180">单号</th>
             <th width="200">费用类型</th>
-            <th width="500">交易明细</th>
+            <th width="200">付款对象</th>
+            <th width="400">交易明细</th>
             <th width="300">金额</th>
             <th width="200">交易日期</th>
             <th width="250">制单人员</th>
@@ -969,6 +973,7 @@
                 <span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span>
               </td>
               <td><span v-for="subItem in item.CostTypeList" :key="subItem.subCode">{{subItem}}<br /></span></td>
+              <td>{{item.ClientName}}</td>
               <td>
                 <div class="Team_ComCoin" v-for="childItem in item.TradeWayList">
                   支付方式：{{childItem.Alias}}&nbsp;币种：{{childItem.CurrencyName}}
@@ -977,8 +982,8 @@
                 </div>
               </td>
               <td style="font-size:14px;">
-                应付：{{item.Money}}<br />
-                实付：{{item.PayMoney}}
+                <span v-if="item.Rate !=1">原币：{{item.WBMoney}}<br /> 本位币：{{item.Money}}  实付：{{item.PayMoney}}</span>
+                <span v-else>应付：{{item.Money}}<br />实付：{{item.PayMoney}}</span>
               </td>
               <td>{{item.TradeDate}}</td>
               <td>
@@ -1007,7 +1012,8 @@
           <tr>
             <th width="180">单号</th>
             <th width="200">费用类型</th>
-            <th width="500">交易明细</th>
+            <th width="200">付款对象</th>
+            <th width="400">交易明细</th>
             <th width="300">金额</th>
             <th width="200">交易日期</th>
             <th width="250">制单人员</th>
@@ -1023,6 +1029,7 @@
                 <span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span>
               </td>
               <td><span v-for="subItem in item.CostTypeList" :key="subItem.subCode">{{subItem}}<br /></span></td>
+              <td>{{item.ClientName}}</td>
               <td>
                 <div class="Team_ComCoin" v-for="childItem in item.TradeWayList">
                   支付方式：{{childItem.Alias}}&nbsp;币种：{{childItem.CurrencyName}}
@@ -1031,6 +1038,7 @@
                 </div>
               </td>
               <td style="font-size:14px;">
+                <span v-if="item.Rate !=1">原币：{{item.WBMoney}}<br /></span>
                 应付：{{item.Money}}<br />
                 实付：{{item.PayMoney}}
               </td>
@@ -1061,7 +1069,8 @@
           <tr>
             <th width="180">单号</th>
             <th width="200">费用类型</th>
-            <th width="500">交易明细</th>
+            <th width="200">付款对象</th>
+            <th width="400">交易明细</th>
             <th width="300">金额</th>
             <th width="200">交易日期</th>
             <th width="250">制单人员</th>
@@ -1075,6 +1084,7 @@
                 <span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span>
               </td>
               <td><span v-for="subItem in item.CostTypeList" :key="subItem.subCode">{{subItem}}<br /></span></td>
+              <td>{{item.ClientName}}</td>
               <td>
                 <div class="Team_ComCoin" v-for="childItem in item.TradeWayList">
                   支付方式：{{childItem.Alias}}&nbsp;币种：{{childItem.CurrencyName}}
@@ -1083,6 +1093,7 @@
                 </div>
               </td>
               <td style="font-size:14px;">
+                <span v-if="item.Rate !=1">原币：{{item.WBMoney}}<br /></span>
                 应付：{{item.Money}}<br />
                 实付：{{item.PayMoney}}
               </td>
@@ -1497,7 +1508,8 @@
           <tr>
             <th width="180">单号</th>
             <th width="200">费用类型</th>
-            <th width="500">交易明细</th>
+            <th width="200">付款对象</th>
+            <th width="400">交易明细</th>
             <th width="300">金额</th>
             <th width="200">交易日期</th>
             <th width="250">制单人员</th>
@@ -1537,6 +1549,7 @@
                 <span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span>
               </td>
               <td><span v-for="subItem in item.CostTypeList" :key="subItem.subCode">{{subItem}}<br /></span></td>
+              <td>{{item.ClientName}}</td>
               <td>
                 <div class="Team_ComCoin" v-for="childItem in item.TradeWayList">
                   支付方式：{{childItem.Alias}}&nbsp;币种：{{childItem.CurrencyName}}
@@ -1545,6 +1558,7 @@
                 </div>
               </td>
               <td style="font-size:14px;">
+                <span v-if="item.Rate !=1">原币：{{item.WBMoney}}<br /></span>
                 应付：{{item.Money}}<br />
                 实付：{{item.PayMoney}}
               </td>

src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/components/featureControls.vue

+<template>
+  <div class="featureControls">
+    <div class="row-aic featureControls-bottom featureControls-bottomOne"
+    v-if="ControlsType=='row'">
+      <div @click="toAddPages">
+        <el-tooltip class="item" effect="dark" content="添加页面" placement="top">
+          <i class="el-icon-plus"></i>
+        </el-tooltip>
+      </div>
+      <div @click="toDeletePages" v-if="isDeletePage">
+        <el-tooltip class="item" effect="dark" content="删除页面" placement="top">
+          <i class="el-icon-delete"></i>
+        </el-tooltip>
+      </div>
+    </div>
+    <div class="column featureControls-bottom featureControls-bottomTwo"
+    v-else>
+      <div v-if="!isTemplate">
+        <el-popover trigger="hover" placement="right">
+          <div class="featureControls-Template">
+            <div class="Template-img relative" v-for="(item,index) in TemplateList"
+            @click="setTemplate(item)">
+              <img :src="item.url"/>
+              <div v-if="item.id==TemplateType" class="Template-imgSelect absolute row-ajc el-icon-success"></div>
+            </div>
+          </div>
+          <div slot="reference" style="padding: 0;">
+            <el-tooltip class="item" effect="dark" content="选模版" placement="top">
+              <i class="el-icon-copy-document"></i>
+            </el-tooltip>
+          </div>
+        </el-popover>
+      </div>
+      <div @click="toUploadImg">
+        <el-tooltip class="item" effect="dark" content="上传图" placement="top">
+          <i class="el-icon-upload2"></i>
+        </el-tooltip>
+      </div>
+      <div @click="toSelectImg">
+        <el-tooltip class="item" effect="dark" content="选图" placement="top">
+          <i class="el-icon-search"></i>
+        </el-tooltip>
+      </div>
+      <div @click="toAddImg" v-if="isAddImg">
+        <el-tooltip class="item" effect="dark" content="添加图" placement="top">
+          <i class="el-icon-plus"></i>
+        </el-tooltip>
+      </div>
+      <div @click="toDeleteImg" v-if="isDeleteImg">
+        <el-tooltip class="item" effect="dark" content="删除图" placement="top">
+          <i class="el-icon-delete"></i>
+        </el-tooltip>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  export default {
+    components: {
+
+    },
+    props: ['ControlsType','pagesType','isDeletePage',
+    'isAddImg','isDeleteImg','isTemplate','Template'],
+    data() {
+      return {
+        TemplateType: 1,
+        TemplateImg: 'http://192.168.10.214:8130/Upload/NewTripFeature/featureTemplateOne.png',
+        TemplateList:[
+          {
+            url:'http://192.168.10.214:8130/Upload/NewTripFeature/featureTemplateOne.png',
+            id:1,
+          },
+          {
+            url:'http://192.168.10.214:8130/Upload/NewTripFeature/featureTemplateTwo.png',
+            id:2,
+          },
+          {
+            url:'http://192.168.10.214:8130/Upload/NewTripFeature/featureTemplateThree.png',
+            id:3,
+          }
+        ]
+      };
+    },
+    methods: {
+      setTemplate(item){
+        this.TemplateType = item.id
+        this.TemplateImg = item.url
+      },
+      toUploadImg(){
+        this.$emit('toUploadImg')
+      },
+      toSelectImg(){
+        this.$emit('toSelectImg')
+      },
+      toAddImg(){
+        this.$emit('toAddImg')
+      },
+      toDeleteImg(){
+        this.$emit('toDeleteImg')
+      },
+      toAddPages(){
+        // this.pagesType 1 首页 2 介绍 3餐食介绍 4宿 5食 6景
+        this.$emit('toAddPages')
+      },
+      toDeletePages(){
+        this.$emit('toDeletePages')
+      },
+    },
+    computed: {},
+    watch: {
+      // FeatureData: {
+      //   handler(val, oldVal) {
+
+      //   },
+      //   deep: true
+      // },
+    },
+    mounted() {
+
+    }
+  };
+
+</script>
+
+<style>
+.featureControls{
+
+}
+.featureControls-bottom{
+  font-size: 20px;
+  color: #fff;
+  cursor: pointer;
+  background: rgba(0, 0, 0, 0.7);
+  border-radius: 2px;
+}
+.featureControls-bottomOne{
+  padding: 1px 10px;
+}
+.featureControls-bottomTwo{
+  padding: 5px 0;
+}
+.featureControls-bottomOne div{
+  padding: 0 5px;
+}
+.featureControls-bottomTwo div{
+  padding: 5px;
+}
+.featureControls-Template{
+  width: 150px;
+  top: -5px;
+  left: 85px;
+  background: #fff;
+  border: 4px;
+}
+.featureControls-Template div{
+  padding: 0;
+}
+.Template-img{
+  background: #e6e6e6;
+  margin: 5px 8px;
+  border-radius: 4px;
+  overflow: hidden;
+}
+.Template-img img{
+  width: 100%;
+  padding: 10px;
+  display: block;
+}
+.Template-imgSelect{
+  background: rgba(0, 0, 0, 0.7);
+  left: 0;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  color: #e95252;
+}
+</style>