Merge branch 'master' of http://132.232.92.186:3000/XinXiBu/oa-system

src/components/Finance/Collection.vue

@@ -0,0 +1,22 @@
+<template>
+    <div>
+        <div class="collection-all">
+
+        </div>
+    </div>
+</template>
+<script>
+export default {
+    
+}
+</script>
+<style>
+.collection-all{
+    background-color: #fff;
+    padding: 10px;
+    box-shadow: 0 0 5px #0005;
+    border-radius: 10px;
+    height: 100%;
+    min-height: 840px;
+}
+</style>

src/components/Finance/Currency.vue

@@ -0,0 +1,170 @@
+<template>
+    <div>
+        <div class="currency-all">
+            <div class="currency-head">
+                <div class="head-ipt">
+                    <div class="name-ipt">
+                        <label>团组名称:</label>
+                        <el-select v-model="state1" filterable placeholder="请选择">
+                            <el-option
+                              v-for="item in restaurants"
+                              :key="item.id"
+                              :label="item.groupName"
+                              :value="item.id">
+                            </el-option>
+                          </el-select>
+                    </div>
+                    <div class="preserve-btn">
+                        <el-button class="preserve" type="primary">保存数据</el-button>
+                    </div>
+                </div>
+                <div class="currency-info">
+                    <div class="currency-info-li">
+                        <label>团 号：</label>
+                        <span>9XGYL</span>
+                    </div>
+                    <div class="currency-info-li">
+                        <label>客 户：</label>
+                        <span>小熟悉熟悉</span>
+                    </div>
+                    <div class="currency-info-li">
+                        <label>出访国家：</label>
+                        <span>新加坡</span>
+                    </div>
+                    <div class="currency-info-li">
+                        <label>起止日期：</label>
+                        <span>2023-05-18 ～ 2023-05-27</span>
+                    </div>
+                    <div class="currency-info-li">
+                        <label>天数/人数：</label>
+                        <span>10天/6人</span>
+                    </div>
+                </div>
+            </div>
+            <div class="currency-com">
+                <el-tabs v-model="activeName" @tab-click="handleClick">
+                    <el-tab-pane label="酒店预订" name="hotel">
+                        <div class="ipt-inif">
+                            <div class="ipt" v-for="(item,index) in currencyArr" :key="index">
+                                <label>{{item.remark}}({{item.name}})：</label>
+                                <el-input v-model="item.rate" oninput="value=value.replace(/[^\d.]/g,'')" placeholder="请输入内容"></el-input>
+                            </div>
+                        </div>
+                    </el-tab-pane>
+                    <el-tab-pane label="行程" name="itinerary">行程</el-tab-pane>
+                    <el-tab-pane label="车/导游地接" name="guide">车/导游地接</el-tab-pane>
+                    <el-tab-pane label="签证" name="visa">签证</el-tab-pane>
+                    <el-tab-pane label="邀请/公务活动" name="business">邀请/公务活动</el-tab-pane>
+                    <el-tab-pane label="团组客户保险" name="insurance">团组客户保险</el-tab-pane>
+                    <el-tab-pane label="机票预订" name="ticket">机票预订</el-tab-pane>
+                    <el-tab-pane label="团组增减款项" name="payments">团组增减款项</el-tab-pane>
+                    <el-tab-pane label="酒店早餐" name="breakfast">酒店早餐</el-tab-pane>
+                </el-tabs>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+export default {
+    data() {
+      return {
+        restaurants: [],
+        state1: '',
+        activeName: 'hotel',
+        currencyArr:[]
+      };
+    },
+    methods: {
+      //面包页
+      handleClick(tab, event) {
+        console.log(tab, event);
+      },
+      //获取团组汇率
+      GetCurrency(){
+        var url = "/api/Financial/GetGroupRateDataSources"
+        var that = this
+        this.$axios({
+            method: 'post',
+            url: url,
+            headers: {
+                Authorization: 'Bearer ' + this.token
+            },
+            data: {
+                portType: 1,
+                pageIndex: 0,
+                pageSize: 0,
+            }
+        }).then(function (res) {
+            console.log(res)
+                that.restaurants = res.data.data.groupData
+                that.currencyArr = res.data.data.teamRateData
+                for (let i = 0; i < that.currencyArr.length; i++) {
+                    that.currencyArr[i]["rate"] = "0.0000";
+                }
+                console.log(that.currencyArr)
+        })
+      }
+    },
+    mounted() {
+      this.GetCurrency();
+    }
+}
+</script>
+<style>
+    .currency-all{
+        background-color: #fff;
+        padding: 10px;
+        box-shadow: 0 0 5px #0005;
+        border-radius: 10px;
+        height: 100%;
+    }
+    .currency-info{
+        display: flex;
+    }
+    .currency-info-li{
+        margin-right: 30px;
+    }
+    .currency-info-li label{
+        color: #606266;
+        font-size: 15px;
+        font-weight: 600;
+    }
+    .currency-info-li span{
+        color: #606266;
+        font-size: 14px;
+    }
+    .name-ipt label{
+        color: #606266;
+        font-size: 15px;
+        font-weight: 600;
+    }
+    .head-ipt{
+        display: flex;
+        justify-content: space-between;
+        margin-bottom: 10px;
+    }
+    .currency-head{
+        margin-bottom: 10px;
+    }
+    .ipt-inif{
+        display: flex;
+        flex-wrap: wrap;
+    }
+    .ipt-inif .el-input__inner{
+        width: 150px;
+    }
+    .ipt{
+        display: flex;
+        align-items: center;
+        margin-bottom: 10px;
+    }
+    .ipt label{
+        width: 150px;
+        text-align: end;
+        font-size: 12px;
+        font-weight: 600;
+    }
+    .ipt .el-input{
+        width: 150px;
+    }
+</style>

src/components/Finance/PaymentFiled.vue

@@ -0,0 +1,120 @@
+<template>
+    <div>
+        <div class="paymentfiled-all">
+            <div class="paymentfiled-haed">
+                <el-date-picker
+                v-model="value2"
+                type="monthrange"
+                align="left"
+                unlink-panels
+                range-separator="至"
+                start-placeholder="开始月份"
+                end-placeholder="结束月份"
+                :picker-options="pickerOptions">
+                </el-date-picker>
+                <div class="haed-btn">
+                    <el-button type="primary">全选</el-button>
+                    <el-button type="primary">查看勾选</el-button>
+                    <el-button type="primary">生成(成都)</el-button>
+                    <el-button type="primary">生成(四川)</el-button>
+                    <el-button type="primary">清空上一次勾选</el-button>
+                    <el-button type="primary">付款</el-button>
+                </div>
+            </div>
+            <div class="paymentfiled-info">
+                <div class="paymentfiled-info-li">
+                    <label>付款申请人:</label>
+                    <span>AS</span>
+                </div>
+                <div class="paymentfiled-info-li">
+                    <label>申请付款日期:</label>
+                    <span>小熟悉熟悉</span>
+                </div>
+                <div class="paymentfiled-info-li">
+                    <label>申请付款金额:</label>
+                    <span>新加坡</span>
+                </div>
+            </div>
+            <div class="paymentfiled-form">
+                <div class="paymentfiled-form-li">
+                    <input type="checkbox"/>
+                    <span>【转账】1、[申请人：邓梦秋][收款方：]北京东方君悦大酒店（团组：产投 加拿大 巴西 智利[酒店预订]）：RMB -9000.00、RMB：-9000.00</span>
+                </div>
+                <div class="paymentfiled-form-li">
+                    <input type="checkbox"/>
+                    <span>【转账】1、[申请人：邓梦秋][收款方：]北京东方君悦大酒店（团组：产投 加拿大 巴西 智利[酒店预订]）：RMB -9000.00、RMB：-9000.00</span>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+export default {
+    data() {
+      return {
+        pickerOptions: {
+          shortcuts: [{
+            text: '本月',
+            onClick(picker) {
+              picker.$emit('pick', [new Date(), new Date()]);
+            }
+          }, {
+            text: '今年至今',
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date(new Date().getFullYear(), 0);
+              picker.$emit('pick', [start, end]);
+            }
+          }, {
+            text: '最近六个月',
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setMonth(start.getMonth() - 6);
+              picker.$emit('pick', [start, end]);
+            }
+          }]
+        },
+        value2: ''
+      };
+    }
+}
+</script>
+<style>
+    .paymentfiled-all{
+        background-color: #fff;
+        padding: 10px;
+        box-shadow: 0 0 5px #0005;
+        border-radius: 10px;
+        height: 100%;
+        min-height: 840px;
+    }
+    .paymentfiled-haed{
+        display: flex;
+        justify-content: space-between;
+        margin-bottom: 10px;
+    }
+    .paymentfiled-info{
+        display: flex;
+        margin-bottom: 15px;
+    }
+    .paymentfiled-info-li{
+        margin-right: 30px;
+    }
+    .paymentfiled-info-li label{
+        color: #606266;
+        font-size: 15px;
+        font-weight: 600;
+    }
+    .paymentfiled-info-li span{
+        color: #606266;
+        font-size: 14px;
+    }
+    .paymentfiled-form-li:nth-child(1){
+        border-top:2px solid #409EFF ;
+    }
+    .paymentfiled-form-li{
+        border-bottom:1px solid #ccc ;
+        padding: 10px 0;
+    }
+</style>

src/components/home.vue

@@ -313,8 +313,6 @@ export default {
   },
   created() {
     this.userinif = JSON.parse(localStorage.getItem('userinif'));
-
-
   },
   computed: {
     filmenuList: function () {
@@ -717,4 +715,5 @@ i.icon-tongzhi {
 
 .el-menu-item-group .el-menu-item-group__title {
   padding: 0;
-}</style>
+}</style>
+>>>>>>> e404fb3287fce3aa4aadbdf14e489aee33358240

src/router/index.js

@@ -57,12 +57,16 @@ import OpAirTicketRes from '@/components/OP/OpAirTicketRes';
 import DecreasePayments from '@/components/OP/DecreasePayments';
 import OpDecreasePayments from '@/components/OP/OpDecreasePayments';
 import Richtext from '@/components/GPT/Richtext';
+import Currency from '@/components/Finance/Currency';
+import PaymentFiled from '@/components/Finance/PaymentFiled';
+import Collection from '@/components/Finance/Collection';
 import InvitationOfficialActivities from '@/components/OP/InvitationOfficialActivities'
 import OpInvitationOfficialActivities from '@/components/OP/OpInvitationOfficialActivities';
 import InvitationOfficialActivityData from '@/components/Resource/InvitationOfficialActivityData';
 import OpInvitationOfficialActivityData from '@/components/Resource/OpInvitationOfficialActivityData';
 import OfficialActivities from '@/components/Resource/OfficialActivities'
 import OpOfficialActivities from '@/components/Resource/OpOfficialActivities'
+
 Vue.use(Router)
 
 export default new Router({
@@ -335,6 +339,21 @@ export default new Router({
           name: 'Richtext',
           component: Richtext
         },
+        {
+          path: '/home/Currency',
+          name: 'Currency',
+          component: Currency
+        },
+        {
+          path: '/home/PaymentFiled',
+          name: 'PaymentFiled',
+          component: PaymentFiled
+        },
+        {
+          path: '/home/Collection',
+          name: 'Collection',
+          component: Collection
+        },
         {
           path: '/home/InvitationOfficialActivities',
           name: 'InvitationOfficialActivities',