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

src/components/EditTemplate.vue

@@ -608,14 +608,14 @@
         }
       }
     },
-    watch: {
-      editValue: {
-        handler: function (val, oldVal) {
-          this.quillValue = val
-        },
-        deep: true
-      },
-    },
+    // watch: {
+    //   editValue: {
+    //     handler: function (val, oldVal) {
+    //       this.quillValue = val
+    //     },
+    //     deep: true
+    //   },
+    // },
     methods: {
       onEditorChange({
         editor,

src/components/FinancialModule/CapitalAllocation.vue

@@ -15,7 +15,7 @@
 .page_CapitalAllocation .page_CapitalAllocation_list {
   width: 100%;
 }
-.page_CapitalAllocation i.icon-sousuo,.page_CapitalAllocation i.el-icon-edit{
+.page_CapitalAllocation i.icon-sousuo,.page_CapitalAllocation i.el-icon-edit,.page_CapitalAllocation i.el-icon-coin{
     width: 30px;
     height: 30px;
     display: inline-block;
@@ -27,9 +27,9 @@
     cursor: pointer;
     outline: none;
 }
-.page_CapitalAllocation i.el-icon-edit{background-color: #00C6FF;font-size: 16px;}
-.page_CapitalAllocation i.el-icon-edit:hover{background-color: #59daff}
-.page_CapitalAllocation i.el-icon-edit:active{background-color: #00b8ec}
+.page_CapitalAllocation i.el-icon-edit,.page_CapitalAllocation i.el-icon-coin{background-color: #00C6FF;font-size: 16px;}
+.page_CapitalAllocation i.el-icon-edit:hover,.page_CapitalAllocation i.el-icon-coin:hover{background-color: #59daff}
+.page_CapitalAllocation i.el-icon-edit:active,.page_CapitalAllocation i.el-icon-coin:active{background-color: #00b8ec}
 .page_CapitalAllocation i.icon-sousuo{background-color: #47BF8C;}
 .page_CapitalAllocation i.icon-sousuo:hover{background-color: #66bb97}
 .page_CapitalAllocation i.icon-sousuo:active{background-color: #35ab79}
@@ -194,6 +194,10 @@
             <el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')"  placement="top" v-if="(item.Status===1 || item.Status===3) && item.CreateBy===EmId && item.InOrNotProcess===-1">
               <i class="edit el-icon-edit" @click="goURL('addCapitalAllocation', 1, item.FrID)"></i>
             </el-tooltip>
+            <el-tooltip class="item" effect="dark" content="修改汇率"  placement="top" 
+            v-if="F_Update_CurrencyRate">
+              <i class="edit el-icon-coin" @click="editRate(item.FrID)"></i>
+            </el-tooltip>
             <el-tooltip class="item" effect="dark" :content="$t('fnc.xiangqing')"  placement="top">
               <i class="iconfont icon-sousuo" @click="goDetail('CapitalAllocationDetail', item.FrID)"></i>
             </el-tooltip>
@@ -224,12 +228,21 @@
         <el-button size="mini" @click="isCapitalAllocation = false">取 消</el-button>
       </span>
     </el-dialog>
+    <editCapitalAllocationDetail :isEditRate="isEditRate" :id="EditId" 
+    @cancel="isEditRate=false" @success="getList"></editCapitalAllocationDetail>
   </div>
 </template>
 <script>
+import editCapitalAllocationDetail from "./editCapitalAllocationDetail.vue";
 export default {
+  components:{
+    editCapitalAllocationDetail,
+    },
   data(){
     return {
+      EditId: 0,
+      isEditRate: false,
+      F_Update_CurrencyRate:false,//修改汇率权限
       isCapitalAllocation: false,
       msg: {
         pageIndex: 1,
@@ -288,12 +301,24 @@ export default {
     if(ActionMenuCode.indexOf('F_CreateBranchMoneyAllot')!=-1){
       this.btnShow=true;
     }
+    if(ActionMenuCode.indexOf('F_Update_CurrencyRate')!=-1){
+        this.F_Update_CurrencyRate=true;
+    }
   },
   methods:{
+    submit(){
+
+    },
+    editRate(id) {
+       this.isEditRate = true
+       this.EditId = id
+    },
     addBtn(){
       this.isCapitalAllocation = true
     },
     getList: function () {  // 获取列表数据
+      this.EditId = 0
+      this.isEditRate = false
       if (this.msg.FrID === '') {
         this.msg.FrID = 0
       }

src/components/FinancialModule/FinancialDocumentsDetail.vue

@@ -733,10 +733,16 @@
                                             <p>{{son.Remark!=''?son.Remark:'无'}}</p>
                                             <div class="_info_img" v-if="son.Image!=null&&son.AuditStatus==2" >
                                                 <ul class="clearfix"  v-if="son.Image.length&&son.Image.length>=1">
-                                                    <li v-for="(img,imgI) in son.Image">
-                                                        <img v-if="!img" src="../../assets/img/Travelslider.png" alt="">
-                                                        <img v-else :src="img" alt="">
-                                                        <div class="_see_img" @click="showImg(img,2)">
+                                                    <li v-for="(img,imgI) in son.Image" style="margin-right: 5px;">
+                                                        <img v-if="!img" 
+                                                        src="../../assets/img/Travelslider.png" alt="">
+                                                        <img v-if="img&&verificationFile(img,3)" :src="img" alt="">
+                                                        <div v-if="img&&verificationFile(img,1)"
+                                                         style="width: 88px; line-height: 59px;text-align: center;">
+                                                            <span class="_wenjian_P iconfont"
+                                                            :class="img.substring(img.lastIndexOf('.')+1,img.length).toUpperCase()=='PDF'? 'icon-pdf' : 'icon-excel'"></span>
+                                                        </div>
+                                                        <div class="_see_img" @click="verificationFile(img,3)?showImg(img,2):showUpLoadFile2(img)">
                                                             <i class="iconfont icon-sousuo"></i>
                                                         </div>
                                                     </li>
@@ -1040,6 +1046,13 @@ export default {
         }
     },
     methods:{
+        showUpLoadFile2(i){  // 预览上传文件
+            if(i.substring(i.lastIndexOf('.')+1,i.length).toUpperCase()=='PDF'){
+                this.previewPDF(i)
+            }else{
+                window.open("https://view.officeapps.live.com/op/view.aspx?src="+i)
+            }
+            },
         // 单项服务提成
         ImpressionSingleCommissionDetails(path,type){
             this.$router.push({

src/components/FinancialModule/ReportForm/TeamRevenueReport.vue

@@ -464,32 +464,7 @@ tr._item_list td:last-child {
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="4">
-            <el-form-item label="目的地">
-              <el-select filterable v-model="msg.PlaceId" @change="getLineTeamList(msg.LineId,msg.PlaceId)">
-                <el-option :value="0" label="不限"></el-option>
-                <el-option
-                  v-for="(item,index) in PlaceList"
-                  :label="item.PlaceName"
-                  :value="item.PlaceID"
-                  :key="index+1000"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="4">
-            <el-form-item label="系列：">
-              <el-select filterable v-model="msg.LineTeamId" class>
-                <el-option :value="0" label="不限"></el-option>
-                <el-option
-                  v-for="item in LineTeamList"
-                  :label="item.LtName"
-                  :value="item.LtID"
-                  :key="item.LtName"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
+          
           <el-col :span="4">
             <el-form-item label="团号：">
               <el-input v-model="msg.TCNUM" class></el-input>
@@ -544,7 +519,54 @@ tr._item_list td:last-child {
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="4">
+            <el-form-item label="结团状态 ：">
+              <el-select v-model="msg.TravelStatus" class="w150">
+                <el-option value="-1" label="不限"></el-option>
+                <el-option value="1" label="未结团"></el-option>
+                <el-option value="2" label="已结团"></el-option>
+                <el-option value="5" label="待结团审核"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="毛利率 ：">
+              <el-select v-model="msg.Q_MaoLi" class="w150">
+                <el-option value="-1" label="不限"></el-option>
+                <el-option value="5" label=">=5%"></el-option>
+                <el-option value="10" label=">=10%"></el-option>
+                <el-option value="15" label=">=15%"></el-option>
+                <el-option value="20" label=">=20%"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
           <template v-if="heightQueryBox">
+            <el-col :span="4">
+              <el-form-item label="目的地">
+                <el-select filterable v-model="msg.PlaceId" @change="getLineTeamList(msg.LineId,msg.PlaceId)">
+                  <el-option :value="0" label="不限"></el-option>
+                  <el-option
+                    v-for="(item,index) in PlaceList"
+                    :label="item.PlaceName"
+                    :value="item.PlaceID"
+                    :key="index+1000"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-form-item label="系列：">
+                <el-select filterable v-model="msg.LineTeamId" class>
+                  <el-option :value="0" label="不限"></el-option>
+                  <el-option
+                    v-for="item in LineTeamList"
+                    :label="item.LtName"
+                    :value="item.LtID"
+                    :key="item.LtName"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
             <el-col :span="4">
               <el-form-item label="状态：">
                 <el-select v-model="msg.QueryCondition" filterable class="w150">
@@ -946,6 +968,24 @@ Vue.component("TCStatusport", {
     }
   }
 });
+Vue.component("clumpingStatus", {
+  template: `<span>
+          <span v-if="rowData.TravelStatus==1" style="color: red;">未结团</span>
+          <span v-if="rowData.TravelStatus==2" style="color: #47BF8C;">已结团</span>
+          <span v-if="rowData.TravelStatus==5">待结团审核</span>
+          </span>`,
+  props: {
+    rowData: {
+      type: Object
+    },
+    field: {
+      type: String
+    },
+    index: {
+      type: Number
+    }
+  }
+});
 Vue.component("Transport", {
   //  是否联运团
   template: `<span><span v-if="rowData.Is_Transport==='是'" style="color: red;">{{rowData.Is_Transport}}</span><span v-else>{{rowData.Is_Transport}}</span></span>`,
@@ -1005,6 +1045,8 @@ export default {
       isShowType:true,
       isShowGrounding:true,
       msg: {
+        TravelStatus: '-1',
+        Q_MaoLi: '-1',
         Is_Open:-1,
         pageIndex: 1,
         pageSize: 16,
@@ -1139,6 +1181,16 @@ export default {
           isFrozen: true,
           componentName: "TCStatusport"
         },
+        {
+          field: "TravelStatus",
+          title: "结团状态",
+          width: 80,
+          titleAlign: "left",
+          columnAlign: "left",
+          isResize: true,
+          isFrozen: true,
+          componentName: "clumpingStatus"
+        },
         {
           field: "LeaderName",
           title: "领队",
@@ -1148,7 +1200,7 @@ export default {
           isResize: true,
           result: [],
           type: "select",
-          isFrozen: true
+          // isFrozen: true,
         },
         {
           field: "GuideName",
@@ -1159,7 +1211,7 @@ export default {
           isResize: true,
           result: [],
           type: "select",
-          isFrozen: true
+          // isFrozen: true
         },
         {
           field: "Is_Transport",
@@ -1168,7 +1220,7 @@ export default {
           titleAlign: "left",
           columnAlign: "left",
           isResize: true,
-          isFrozen: true,
+          // isFrozen: true,
           componentName: "Transport"
         },
         {
@@ -2474,9 +2526,14 @@ export default {
       if(rowData.MaoLiRate < 0 && columnName=="MaoLiRate"){
             return "column-cell-class-name-test-red"
       }
-       if(rowData.ShiJiLiRun < 0 && columnName=="ShiJiLiRun"){
+       if((rowData.ShiJiLiRun < 0||rowData.MaoLiRate.split('%')[0] >=15) && columnName=="ShiJiLiRun"){
+          if(rowData.MaoLiRate.split('%')[0] >=15){
+            return "column-cell-class-name-test"
+          }else{
             return "column-cell-class-name-test-red"
+          } 
       }
+      
       if(rowData.TransportCD < 0 && columnName=="TransportCD"){
             return "column-cell-class-name-test-red"
       }

src/components/FinancialModule/addReceivablesDocuments.vue

@@ -1347,7 +1347,20 @@
           this.msg.ReFinanceId = this.orderObj.ReFinanceId ? this.orderObj.ReFinanceId : 0;
           this.msg.ReFinanceId2 = this.orderObj.ReFinanceId2 ? this.orderObj.ReFinanceId2 : 0;
           this.msg.ECOrderList = this.orderObj.ECOrderList ? this.orderObj.ECOrderList : [];
+          this.msg.StandardCurrencyName = this.orderObj.StandardCurrencyName?this.orderObj.StandardCurrencyName:'';
         }
+        // 原币总金验证
+        if(this.orderObj&&this.orderObj.Money){
+               let yballPrice = 0
+               this.msg&&this.msg.detailList&&this.msg.detailList.forEach((item,i)=>{
+                   yballPrice += Number(yballPrice)+Number(item.UnitPrice)
+               })
+               this.yballPriceTo = yballPrice
+               if(this.orderObj.Money!=this.yballPriceTo){
+                   this.Error(`原币总金额需等于${this.orderObj.Money}！`)
+                   return
+               }
+          }
         // crm自动登陆传过来的参数
         if(this.crmOrderObj){
           this.msg.OtherType = this.crmOrderObj.OtherType
@@ -1897,6 +1910,9 @@
         this.tradeObj = JSON.parse(this.$route.query.tradeObj);
       }else{
         this.orderObj = this.$route.query.orderObj ? JSON.parse(this.$route.query.orderObj) : null;
+        if(this.orderObj&&this.orderObj.Money){
+          this.detailList.UnitPrice = this.orderObj.Money
+        }
       }
       
       let TCID = (this.orderObj && this.orderObj.TCIDList && this.orderObj.TCIDList.length>0) ? this.orderObj.TCIDList[0] : 0

src/components/FinancialModule/editCapitalAllocationDetail.vue

+<style>
+  .Ca_Span{
+    display:block;
+    padding-left: 10px;
+    font-size:14px;
+    padding: 10px;
+    color:#333333;
+    background-color: #eeeeee;
+    /* border-left:3px solid #E95252; */
+  }
+  .blue0070D9{
+    color: #0070D9;
+    cursor: pointer;
+  }
+</style>
+<template>
+  <div>
+    <el-dialog title="修改汇率" :visible.sync="isShow" @closed="clickcancel" width="900px">
+      <div class="editCapitalAllocationDetail" v-loading="loading">
+        <span class="Ca_Span">收款</span>
+        <el-table
+        :data="dataList.SBankList"
+        style="width: 100%">
+        <el-table-column
+          prop="TypeName"
+          label="收款方式"
+          width="180">
+        </el-table-column>
+        <el-table-column
+          label="账户"
+          width="180">
+          <template slot-scope="scope">
+            {{scope.row.Alias}}-{{scope.row.AccountType}}-{{scope.row.BankNo}}
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="OriginalMoney"
+          label="金额">
+        </el-table-column>
+        <el-table-column
+          prop="CurrencyName"
+          label="币种">
+        </el-table-column>
+        <el-table-column
+          prop="Rate"
+          label="汇率">
+          <template slot-scope="scope">
+            <el-input :min="0" type="Number" v-model="scope.row.Rate" placeholder="汇率"/>
+            <!-- <el-popover trigger="click" placement="top" @show="setShow(scope.row.Rate,scope.$index)">
+              <el-form label-width="50px">
+                <el-form-item label="汇率" style="margin-bottom:0">
+                  <el-input-number :min="0" type="Number" v-model="Rate" placeholder="汇率" @change="change('SK')"/>
+                </el-form-item>
+              </el-form>
+              <div slot="reference" class="name-wrapper">
+                <span class="blue0070D9">{{scope.row.Rate}}</span>
+              </div>
+            </el-popover> -->
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="汇兑收益">
+          <template slot-scope="scope">
+            <span v-if="scope.row.IsExChange==1">是</span>
+            <span v-if="scope.row.IsExChange==0">否</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="Money"
+          label="本位币金额">
+        </el-table-column>
+        </el-table>
+        <span class="Ca_Span">付款</span>
+        <el-table
+        :data="dataList.FBankList"
+        style="width: 100%">
+        <el-table-column
+          prop="TypeName"
+          label="付款方式"
+          width="180">
+        </el-table-column>
+        <el-table-column
+          label="账户"
+          width="180">
+          <template slot-scope="scope">
+            {{scope.row.Alias}}-{{scope.row.AccountType}}-{{scope.row.BankNo}}
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="OriginalMoney"
+          label="金额">
+        </el-table-column>
+        <el-table-column
+          prop="CurrencyName"
+          label="币种">
+        </el-table-column>
+        <el-table-column
+          prop="Rate"
+          label="汇率">
+          <template slot-scope="scope">
+            <el-input :min="0" type="Number" v-model="scope.row.Rate" placeholder="汇率"/>
+            <!-- <el-popover trigger="click" placement="top" @show="setShow(scope.row.Rate,scope.$index)">
+              <el-form label-width="50px">
+                <el-form-item label="汇率" style="margin-bottom:0">
+                  <el-input-number :min="0" type="Number" v-model="Rate" placeholder="汇率" @change="change('FK')"/>
+                </el-form-item>
+              </el-form>
+              <div slot="reference" class="name-wrapper">
+                <span class="blue0070D9">{{scope.row.Rate}}</span>
+              </div>
+            </el-popover> -->
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="汇兑收益">
+          <template slot-scope="scope">
+            <span v-if="scope.row.IsExChange==1">是</span>
+            <span v-if="scope.row.IsExChange==0">否</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="Money"
+          label="本位币金额">
+        </el-table-column>
+        </el-table>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="mini" @click="clickcancel">取 消</el-button>
+        <el-button class="normalBtn" size="mini" @click="submit">保 存</el-button>
+      </span>
+    </el-dialog>
+  </div>
+    
+</template>
+<script>
+export default {
+   props:['isEditRate','id'],
+  data(){
+    return {
+      msg:{
+        ID:0
+      },
+      parameters:{
+        FrId: 0,
+        TradeWay: []
+      },
+      dataList:[],
+      Rate: 0,
+      index: 0,
+      isShow: false,
+      loading: true
+    }
+  },
+  watch: {
+    id:{
+      handler(val, oldVal){
+        this.msg.ID = val
+        this.parameters.FrId = val
+        this.getList();
+      },
+      // immediate: true
+    },
+    isEditRate:{
+      handler(val, oldVal){
+        this.isShow = val
+      },
+    }
+  },
+  created(){
+    let userinfo = this.getLocalStorage();
+    this.bossID = userinfo.EmployeeId;
+    let ActionMenuCode=userinfo.ActionMenuCode;
+      if(ActionMenuCode.indexOf('F_Update_KJCostType')!=-1){
+        this.huijiShow=true;
+      }
+  },
+  methods:{
+    clickcancel(){
+      this.parameters.TradeWay = []
+      this.isShow = false
+      this.$emit('cancel')
+    },
+    setShow(Rate,index){
+      this.Rate = Rate
+      this.index = index
+    },
+    change(type){
+      if(this.Rate){
+        if(type=='FK'){
+          this.dataList.FBankList[this.index].Rate = this.Rate
+        }else{
+          this.dataList.SBankList[this.index].Rate = this.Rate
+        }
+      }
+    },
+    submit(){
+      this.dataList.FBankList.forEach(x => {
+          let datas= {
+            ID: x.ID,
+            Rate: x.Rate
+          }
+          this.parameters.TradeWay.push(datas)
+      });
+      this.dataList.SBankList.forEach(x => {
+          let datas= {
+            ID: x.ID,
+            Rate: x.Rate
+          }
+          this.parameters.TradeWay.push(datas)
+      });
+      this.apipost('Financial_post_UpdateCapitalAllocationRate', this.parameters, res => {   
+        if(res.data.resultCode == 1) {
+          this.isShow = false
+          this.$emit('success')
+        }else{
+          this.Error(res.data.message);
+        }
+      }, err => {})
+    },
+    getList(){
+      this.apipost('Financial_get_GetFundTransfer', this.msg, res => {   
+        if(res.data.resultCode == 1) {
+            this.dataList = res.data.data;
+        }else{
+          this.Error(res.data.message);
+        }
+        this.loading = false
+      }, err => {})
+    },
+  },
+  mounted(){
+    
+  }
+}
+</script>