liuhj hace 1 año
padre
commit
1bff468413

+ 163 - 2
src/components/Finance/Collection.vue

@@ -1,13 +1,122 @@
 <template>
     <div>
         <div class="collection-all">
-
+            <div class="collection-head">
+                <div class="collection-head-li">
+                    <label>团组名称:</label>
+                    <el-select v-model="value" filterable placeholder="请选择">
+                        <el-option
+                        v-for="item in options"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value">
+                        </el-option>
+                    </el-select>
+                </div>
+                <div class="collection-head-li">
+                    <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="collection-info">
+                <div class="collection-info-li">
+                    <label>团 号:</label>
+                    <span>A57WU4</span>
+                </div>
+                <div class="collection-info-li">
+                    <label>客 户:</label>
+                    <span>徐薇</span>
+                </div>
+                <div class="collection-info-li">
+                    <label>出访国家:</label>
+                    <span>德国、法国、马来西亚</span>
+                </div>
+                <div class="collection-info-li">
+                    <label>起止日期:</label>
+                    <span> 2023-10-15 ~ 2023-10-24 </span>
+                </div>
+                <div class="collection-info-li">
+                    <label>天数/人数:</label>
+                    <span>10天/6人</span>
+                </div>
+            </div>
+            <div class="collection-ipt">
+                <div class="collection-ipt-li">
+                    <label>付款方信息(TO):</label>
+                    <el-input
+                    style="width: 222px;"
+                    size="mini"
+                    placeholder="请输入内容"
+                    v-model="input"
+                    clearable>
+                    </el-input>
+                </div>
+                <div class="collection-ipt-li">
+                    <label>付款方电话(TEL):</label>
+                    <el-input
+                    style="width: 222px;"
+                    size="mini"
+                    placeholder="请输入内容"
+                    v-model="input2"
+                    clearable>
+                    </el-input>
+                </div>
+                <div class="collection-ipt-li">
+                    <label>付款日期(DATE):</label>
+                    <el-input
+                    style="width: 222px;"
+                    size="mini"
+                    placeholder="请输入内容"
+                    v-model="input3"
+                    clearable>
+                    </el-input>
+                </div>
+            </div>
+            <div class="collection-text">
+                <div class="collection-text-li">
+                    <label>注(ATTENTION):</label>
+                    <el-input
+                    style="width: 935px;"
+                    size="mini"
+                    type="textarea"
+                    autosize
+                    placeholder="请输入内容"
+                    v-model="textarea1">
+                    </el-input>
+                </div>
+            </div>
         </div>
     </div>
 </template>
 <script>
 export default {
-    
+    data() {
+      return {
+        options: [{
+          value: '选项1',
+          label: '黄金糕'
+        }, {
+          value: '选项2',
+          label: '双皮奶'
+        }, {
+          value: '选项3',
+          label: '蚵仔煎'
+        }, {
+          value: '选项4',
+          label: '龙须面'
+        }, {
+          value: '选项5',
+          label: '北京烤鸭'
+        }],
+        value: '',
+        input:'',
+        input2:'',
+        input3:'',
+        textarea:''
+      }
+    }
 }
 </script>
 <style>
@@ -19,4 +128,56 @@ export default {
     height: 100%;
     min-height: 840px;
 }
+.collection-head-li label{
+    color: #606266;
+    font-size: 15px;
+    font-weight: 600;
+}
+.collection-head{
+    display: flex;
+    justify-content: space-between;
+}
+.collection-info{
+    display: flex;
+    margin-top: 10px;
+}
+.collection-info-li{
+    margin-right: 30px;
+}
+.collection-info-li label{
+    color: #606266;
+    font-size: 15px;
+    font-weight: 600;
+}
+.collection-info-li span{
+    color: #606266;
+    font-size: 14px;
+}
+.collection-ipt{
+    display: flex;
+    margin-top: 10px;
+}
+.collection-ipt-li{
+    width: 22%;
+    display: flex;
+    align-items: center;
+    margin-right: 10px;
+}
+.collection-ipt-li label{
+    color: #606266;
+    font-size: 15px;
+    font-weight: 600;
+}
+.collection-text-li{
+    display: flex;
+    align-items: center;
+}
+.collection-text-li label{
+    color: #606266;
+    font-size: 15px;
+    font-weight: 600;
+}
+.collection-text{
+    margin-top: 10px;
+}
 </style>

+ 377 - 24
src/components/Finance/Currency.vue

@@ -5,7 +5,7 @@
                 <div class="head-ipt">
                     <div class="name-ipt">
                         <label>团组名称:</label>
-                        <el-select v-model="state1" filterable placeholder="请选择">
+                        <el-select @change="chkg" v-model="state1" filterable placeholder="请选择">
                             <el-option
                               v-for="item in restaurants"
                               :key="item.id"
@@ -15,29 +15,29 @@
                           </el-select>
                     </div>
                     <div class="preserve-btn">
-                        <el-button class="preserve" type="primary">保存数据</el-button>
+                        <el-button class="preserve" @click="Savedata()" type="primary">保存数据</el-button>
                     </div>
                 </div>
                 <div class="currency-info">
                     <div class="currency-info-li">
                         <label>团 号:</label>
-                        <span>9XGYL</span>
+                        <span>{{groupInfo.salesQuoteNo}}</span>
                     </div>
                     <div class="currency-info-li">
                         <label>客 户:</label>
-                        <span>小熟悉熟悉</span>
+                        <span>{{groupInfo.clientUnit}}</span>
                     </div>
                     <div class="currency-info-li">
                         <label>出访国家:</label>
-                        <span>新加坡</span>
+                        <span>{{groupInfo.specialNeeds}}</span>
                     </div>
                     <div class="currency-info-li">
                         <label>起止日期:</label>
-                        <span>2023-05-18 ~ 2023-05-27</span>
+                        <span>{{groupInfo.tontractTime|filter_time}} ~ {{groupInfo.visitDate|filter_time}}</span>
                     </div>
                     <div class="currency-info-li">
                         <label>天数/人数:</label>
-                        <span>10天/6人</span>
+                        <span>{{groupInfo.visitDays}}天/{{groupInfo.visitPNumber}}人</span>
                     </div>
                 </div>
             </div>
@@ -45,33 +45,110 @@
                 <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>
+                            <div class="ipt" v-for="(item,index) in hotelCurrencyArr" :key="index">
+                                <label>{{item.currencyName}}({{item.currencyCode}}):</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">
+                        <div class="ipt-inif">
+                            <div class="ipt" v-for="(item,index) in itineraryCurrencyArr" :key="index">
+                                <label>{{item.currencyName}}({{item.currencyCode}}):</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="guide">
+                        <div class="ipt-inif">
+                            <div class="ipt" v-for="(item,index) in guideCurrencyArr" :key="index">
+                                <label>{{item.currencyName}}({{item.currencyCode}}):</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="visa">
+                        <div class="ipt-inif">
+                            <div class="ipt" v-for="(item,index) in visaCurrencyArr" :key="index">
+                                <label>{{item.currencyName}}({{item.currencyCode}}):</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="business">
+                        <div class="ipt-inif">
+                            <div class="ipt" v-for="(item,index) in inviteCurrencyArr" :key="index">
+                                <label>{{item.currencyName}}({{item.currencyCode}}):</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="insurance">
+                        <div class="ipt-inif">
+                            <div class="ipt" v-for="(item,index) in insuranceCurrencyArr" :key="index">
+                                <label>{{item.currencyName}}({{item.currencyCode}}):</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="ticket">
+                        <div class="ipt-inif">
+                            <div class="ipt" v-for="(item,index) in ticketCurrencyArr" :key="index">
+                                <label>{{item.currencyName}}({{item.currencyCode}}):</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="payments">
+                        <div class="ipt-inif">
+                            <div class="ipt" v-for="(item,index) in paymentsCurrencyArr" :key="index">
+                                <label>{{item.currencyName}}({{item.currencyCode}}):</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="breakfast">
+                        <div class="ipt-inif">
+                            <div class="ipt" v-for="(item,index) in breakfastCurrencyArr" :key="index">
+                                <label>{{item.currencyName}}({{item.currencyCode}}):</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>
+import { co } from '@fullcalendar/core/internal-common';
 export default {
     data() {
       return {
+        userid:'',
         restaurants: [],
         state1: '',
         activeName: 'hotel',
-        currencyArr:[]
+        hotelCurrencyArr:[],//酒店预订
+        itineraryCurrencyArr:[],//行程
+        guideCurrencyArr:[],//车/导游地接
+        visaCurrencyArr:[],//签证
+        inviteCurrencyArr:[],//>邀请/公务活动
+        insuranceCurrencyArr:[],//团组客户保险
+        ticketCurrencyArr:[],//机票预订
+        paymentsCurrencyArr:[],//团组增减款项
+        breakfastCurrencyArr:[],//酒店早餐
+        groupInfo:{},
+        allcurrency:[],
+        hotel:{},//酒店预订
+        itinerary:{},//行程
+        guide:{},//车/导游地接
+        visa:{},//签证
+        invite:{},//>邀请/公务活动
+        insurance:{},//团组客户保险
+        ticket:{},//机票预订
+        payments:{},//团组增减款项
+        breakfast:{}//酒店早餐
       };
     },
     methods: {
@@ -79,6 +156,12 @@ export default {
       handleClick(tab, event) {
         console.log(tab, event);
       },
+      //选择团组
+      chkg(val){
+        console.log(val)
+        this.state1=val
+        this.GetCurrency()
+      },
       //获取团组汇率
       GetCurrency(){
         var url = "/api/Financial/GetGroupRateDataSources"
@@ -95,18 +178,287 @@ export default {
                 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";
+                // for (let i = 0; i < res.data.data.teamRateData.length; i++) {
+                //     res.data.data.teamRateData[i]["rate"] = "0.0000";
+                // }
+                that.hotelCurrencyArr = JSON.parse(JSON.stringify(res.data.data.teamRateData));
+                that.itineraryCurrencyArr = JSON.parse(JSON.stringify(res.data.data.teamRateData));
+                that.guideCurrencyArr = JSON.parse(JSON.stringify(res.data.data.teamRateData));
+                that.visaCurrencyArr = JSON.parse(JSON.stringify(res.data.data.teamRateData));
+                that.inviteCurrencyArr = JSON.parse(JSON.stringify(res.data.data.teamRateData));
+                that.insuranceCurrencyArr = JSON.parse(JSON.stringify(res.data.data.teamRateData));
+                that.ticketCurrencyArr = JSON.parse(JSON.stringify(res.data.data.teamRateData));
+                that.paymentsCurrencyArr = JSON.parse(JSON.stringify(res.data.data.teamRateData));
+                that.breakfastCurrencyArr = JSON.parse(JSON.stringify(res.data.data.teamRateData));
+                if(that.state1==''){
+                    that.state1=res.data.data.groupData[0].id;
                 }
-                console.log(that.currencyArr)
+                console.log(res.data.data.teamRateData)
+                that.GetGroupRateInfo();
+        })
+      },
+      //获取默认团组汇率
+      GetGroupRateInfo(){
+        var url = "/api/Financial/GetGroupRateInfo"
+        var that = this
+        this.$axios({
+            method: 'post',
+            url: url,
+            headers: {
+                Authorization: 'Bearer ' + this.token
+            },
+            data: {
+                portType: 1,
+                pageIndex: 0,
+                pageSize: 0,
+                diid:that.state1
+            }
+        }).then(function (res) {
+            that.groupInfo=res.data.data.groupInfo;
+            that.allcurrency=res.data.data.teamRateData;
+            for(let j=0;j<that.allcurrency.length;j++){
+                if(that.allcurrency[j].cTableId == 76) {
+                    that.hotel=that.allcurrency[j]
+                }
+                if(that.allcurrency[j].cTableId == 77) {
+                    that.itinerary=that.allcurrency[j]
+                }
+                if(that.allcurrency[j].cTableId == 79) {
+                    that.guide=that.allcurrency[j]
+                }
+                if(that.allcurrency[j].cTableId == 80) {
+                    that.visa=that.allcurrency[j]
+                }
+                if(that.allcurrency[j].cTableId == 81) {
+                    that.invite=that.allcurrency[j]
+                }
+                if(that.allcurrency[j].cTableId == 82) {
+                    that.insurance=that.allcurrency[j]
+                }
+                if(that.allcurrency[j].cTableId == 85) {
+                    that.ticket=that.allcurrency[j]
+                }
+                if(that.allcurrency[j].cTableId == 98) {
+                    that.payments=that.allcurrency[j]
+                }
+                if(that.allcurrency[j].cTableId == 751) {
+                    that.breakfast=that.allcurrency[j]
+                }
+            }
+            console.log(that.hotel)
+            for(let x=0;x<that.hotelCurrencyArr.length;x++){
+                for(let y=0;y<that.hotel.teamRates.length;y++){
+                    if(that.hotelCurrencyArr[x].currencyCode==that.hotel.teamRates[y].currencyCode){
+                        that.hotelCurrencyArr[x].rate=that.hotel.teamRates[y].rate
+                    }
+                }
+            }
+            for(let x=0;x<that.itineraryCurrencyArr.length;x++){
+                for(let y=0;y<that.itinerary.teamRates.length;y++){
+                    if(that.itineraryCurrencyArr[x].currencyCode==that.itinerary.teamRates[y].currencyCode){
+                        that.itineraryCurrencyArr[x].rate=that.itinerary.teamRates[y].rate
+                    }
+                }
+            }
+            for(let x=0;x<that.guideCurrencyArr.length;x++){
+                for(let y=0;y<that.guide.teamRates.length;y++){
+                    if(that.guideCurrencyArr[x].currencyCode==that.guide.teamRates[y].currencyCode){
+                        that.guideCurrencyArr[x].rate=that.guide.teamRates[y].rate
+                    }
+                }
+            }
+            for(let x=0;x<that.visaCurrencyArr.length;x++){
+                for(let y=0;y<that.visa.teamRates.length;y++){
+                    if(that.visaCurrencyArr[x].currencyCode==that.visa.teamRates[y].currencyCode){
+                        that.visaCurrencyArr[x].rate=that.visa.teamRates[y].rate
+                    }
+                }
+            }
+            for(let x=0;x<that.inviteCurrencyArr.length;x++){
+                for(let y=0;y<that.invite.teamRates.length;y++){
+                    if(that.inviteCurrencyArr[x].currencyCode==that.invite.teamRates[y].currencyCode){
+                        that.inviteCurrencyArr[x].rate=that.invite.teamRates[y].rate
+                    }
+                }
+            }
+            for(let x=0;x<that.insuranceCurrencyArr.length;x++){
+                for(let y=0;y<that.insurance.teamRates.length;y++){
+                    if(that.insuranceCurrencyArr[x].currencyCode==that.insurance.teamRates[y].currencyCode){
+                        that.insuranceCurrencyArr[x].rate=that.insurance.teamRates[y].rate
+                    }
+                }
+            }
+            for(let x=0;x<that.ticketCurrencyArr.length;x++){
+                for(let y=0;y<that.ticket.teamRates.length;y++){
+                    if(that.ticketCurrencyArr[x].currencyCode==that.ticket.teamRates[y].currencyCode){
+                        that.ticketCurrencyArr[x].rate=that.ticket.teamRates[y].rate
+                    }
+                }
+            }
+            for(let x=0;x<that.paymentsCurrencyArr.length;x++){
+                for(let y=0;y<that.payments.teamRates.length;y++){
+                    if(that.paymentsCurrencyArr[x].currencyCode==that.payments.teamRates[y].currencyCode){
+                        that.paymentsCurrencyArr[x].rate=that.payments.teamRates[y].rate
+                    }
+                }
+            }
+
+            for(let x=0;x<that.breakfastCurrencyArr.length;x++){
+                for(let y=0;y<that.breakfast.teamRates.length;y++){
+                    if(that.breakfastCurrencyArr[x].currencyCode==that.breakfast.teamRates[y].currencyCode){
+                        that.breakfastCurrencyArr[x].rate=that.breakfast.teamRates[y].rate
+                    }
+                }
+            }
+            console.log(that.allcurrency)
+        })
+      },
+      //保存数据
+      Savedata(){
+        var hotelCurrencyArrer=[]
+        for(let a =0;a<this.hotelCurrencyArr.length;a++){
+            if(this.hotelCurrencyArr[a].rate!=0){
+                delete this.hotelCurrencyArr[a].id
+                hotelCurrencyArrer.push(this.hotelCurrencyArr[a])
+            }
+        }
+        var itineraryCurrencyArrer=[]
+        for(let s =0;s<this.itineraryCurrencyArr.length;s++){
+            if(this.itineraryCurrencyArr[s].rate!=0){
+                delete this.itineraryCurrencyArr[s].id
+                itineraryCurrencyArrer.push(this.itineraryCurrencyArr[s])
+            }
+        }
+        var guideCurrencyArrer=[]
+        for(let d =0;d<this.guideCurrencyArr.length;d++){
+            if(this.guideCurrencyArr[d].rate!=0){
+                delete this.guideCurrencyArr[d].id
+                guideCurrencyArrer.push(this.guideCurrencyArr[d])
+            }
+        }
+        var visaCurrencyArrer=[]
+        for(let f =0;f<this.visaCurrencyArr.length;f++){
+            if(this.visaCurrencyArr[f].rate!=0){
+                delete this.visaCurrencyArr[f].id
+                visaCurrencyArrer.push(this.visaCurrencyArr[f])
+            }
+        }
+        var inviteCurrencyArrer=[]
+        for(let g =0;g<this.inviteCurrencyArr.length;g++){
+            if(this.inviteCurrencyArr[g].rate!=0){
+                delete this.inviteCurrencyArr[g].id
+                inviteCurrencyArrer.push(this.inviteCurrencyArr[g])
+            }
+        }
+        var insuranceCurrencyArrer=[]
+        for(let h =0;h<this.insuranceCurrencyArr.length;h++){
+            if(this.insuranceCurrencyArr[h].rate!=0){
+                delete this.insuranceCurrencyArr[h].id
+                insuranceCurrencyArrer.push(this.insuranceCurrencyArr[h])
+            }
+        }
+        var ticketCurrencyArrer=[]
+        for(let j =0;j<this.ticketCurrencyArr.length;j++){
+            if(this.ticketCurrencyArr[j].rate!=0){
+                delete this.ticketCurrencyArr[j].id
+                ticketCurrencyArrer.push(this.ticketCurrencyArr[j])
+            }
+        }
+        var paymentsCurrencyArrer=[]
+        for(let k =0;k<this.paymentsCurrencyArr.length;k++){
+            if(this.paymentsCurrencyArr[k].rate!=0){
+                delete this.paymentsCurrencyArr[k].id
+                paymentsCurrencyArrer.push(this.paymentsCurrencyArr[k])
+            }
+        }
+        var breakfastCurrencyArrer=[]
+        for(let l =0;l<this.breakfastCurrencyArr.length;l++){
+            if(this.breakfastCurrencyArr[l].rate!=0){
+                delete this.breakfastCurrencyArr[l].id
+                breakfastCurrencyArrer.push(this.breakfastCurrencyArr[l])
+            }
+        }
+        console.log(hotelCurrencyArrer)
+        var url = "/api/Financial/PostGroupRateUpdate"
+        var that = this
+        this.$axios({
+            method: 'post',
+            url: url,
+            headers: {
+                Authorization: 'Bearer ' + this.token
+            },
+            data: {
+                portType: 1,
+                pageIndex: 0,
+                pageSize: 0,
+                createUserId:that.userid,
+                diId:that.state1,
+                teamRateUpdateInfos:[
+                    {
+                        id:3750,
+                        cTable:76,
+                        teamRates:hotelCurrencyArrer
+                    },
+                    {
+                        id:3751,
+                        cTable:77,
+                        teamRates:itineraryCurrencyArrer
+                    },
+                    {
+                        id:3752,
+                        cTable:79,
+                        teamRates:guideCurrencyArrer
+                    },
+                    {
+                        id:3753,
+                        cTable:80,
+                        teamRates:visaCurrencyArrer
+                    },
+                    {
+                        id:3754,
+                        cTable:81,
+                        teamRates:inviteCurrencyArrer
+                    },
+                    {
+                        id:3755,
+                        cTable:82,
+                        teamRates:insuranceCurrencyArrer
+                    },
+                    {
+                        id:3756,
+                        cTable:85,
+                        teamRates:ticketCurrencyArrer
+                    },
+                    {
+                        id:3757,
+                        cTable:98,
+                        teamRates:paymentsCurrencyArrer
+                    },
+                    {
+                        id:3758,
+                        cTable:751,
+                        teamRates:breakfastCurrencyArrer
+                    },
+                ]
+            }
+        }).then(function (res) {
+            console.log(res)
+            that.$message({
+                message: res.data.msg,
+                type: 'success'
+            });
         })
       }
     },
+    filters:{
+        filter_time(value){
+            return value
+        }
+    },
     mounted() {
-      this.GetCurrency();
+        this.userid=JSON.parse(localStorage.getItem('userinif')).userInfo.userId;
+        this.GetCurrency();
     }
 }
 </script>
@@ -117,6 +469,7 @@ export default {
         box-shadow: 0 0 5px #0005;
         border-radius: 10px;
         height: 100%;
+        min-height: 840px;
     }
     .currency-info{
         display: flex;

+ 23 - 5
src/components/Finance/DailyFeeedit.vue

@@ -138,25 +138,24 @@ export default {
     methods:{
         submitForm(formName) {
             this.$refs[formName].validate((valid) => {
+                console.log(valid)
                 if (valid) {
                     console.log(this.itemsArr)
+                    var issubmit=true;
                     for(var g=0;g<this.itemsArr.length;g++){
                         if(this.itemsArr[g].itemTotal!=""&&this.itemsArr[g].price!=0&&this.itemsArr[g].priceName!=""&&this.itemsArr[g].quantity!=""&&this.itemsArr[g].remark!=""){
                             if(!this.thesame){
                                 for(var k=0;k<this.itemsArr.length;k++){
                                     this.SumPrice+=Number(this.itemsArr[k].itemTotal)
                                 }
-                                if(this.editid!=undefined){
-                                    this.UpdateDailyPayment()
-                                }else{
-                                    this.AddDailyPayment()
-                                }
                             }else{
                                 this.$message({
                                     showClose: true,
                                     message: '本申请不是您建立的或已被审核,无法修改!',
                                     type: 'error'
                                 });
+                                issubmit=false;
+                                break;
                             }
                         }else{
                             this.$message({
@@ -164,6 +163,15 @@ export default {
                                 message: '请检查录入具体费用是否填写完整!',
                                 type: 'error'
                             });
+                            issubmit=false;
+                            break;
+                        }
+                    }
+                    if(issubmit){
+                        if(this.editid!=undefined){
+                            this.UpdateDailyPayment()
+                        }else{
+                            this.AddDailyPayment()
                         }
                     }
  
@@ -256,6 +264,16 @@ export default {
         AddDailyPayment(){
             var url = "/api/Financial/PostAddDailyPayment"
             var that = this
+            var data={
+                UserId:that.userid,
+                Instructions:that.ruleForm.desc,
+                SumPrice:that.SumPrice,
+                TransferTypeId:that.ruleForm.identification,
+                PriceTypeId:that.ruleForm.name,
+                CompanyId:that.ruleForm.company,
+                FeeContents:that.itemsArr
+            }
+            console.log(data)
             this.$axios({
                 method: 'post',
                 url: url,

+ 4 - 5
src/components/Finance/PaymentFiled.vue

@@ -37,12 +37,10 @@
             </div>
             <div class="paymentfiled-form">
                 <div class="paymentfiled-form-li">
-                    <input type="checkbox"/>
-                    <span>【转账】1、[申请人:邓梦秋][收款方:]北京东方君悦大酒店(团组:产投 加拿大 巴西 智利[酒店预订]):RMB -9000.00、RMB:-9000.00</span>
+                    <el-checkbox v-model="checked">【转账】1、[申请人:邓梦秋][收款方:]北京东方君悦大酒店(团组:产投 加拿大 巴西 智利[酒店预订]):RMB -9000.00、RMB:-9000.00</el-checkbox>
                 </div>
                 <div class="paymentfiled-form-li">
-                    <input type="checkbox"/>
-                    <span>【转账】1、[申请人:邓梦秋][收款方:]北京东方君悦大酒店(团组:产投 加拿大 巴西 智利[酒店预订]):RMB -9000.00、RMB:-9000.00</span>
+                    <el-checkbox v-model="checked">【转账】1、[申请人:邓梦秋][收款方:]北京东方君悦大酒店(团组:产投 加拿大 巴西 智利[酒店预订]):RMB -9000.00、RMB:-9000.00</el-checkbox>
                 </div>
             </div>
         </div>
@@ -75,7 +73,8 @@ export default {
             }
           }]
         },
-        value2: ''
+        value2: '',
+        checked:''
       };
     }
 }

+ 2 - 2
src/components/GPT/Richtext.vue

@@ -76,8 +76,8 @@
     height: 100%;
 }
 .richtext-box .editor {
-line-height: normal !important;
-height: 800px;
+    line-height: normal !important;
+    height: 800px;
 }
 .richtext-box .ql-snow .ql-tooltip[data-mode=link]::before {
 content: "请输入链接地址:";

+ 4 - 2
src/components/home.vue

@@ -715,5 +715,7 @@ i.icon-tongzhi {
 
 .el-menu-item-group .el-menu-item-group__title {
   padding: 0;
-}</style>
->>>>>>> e404fb3287fce3aa4aadbdf14e489aee33358240
+}
+.delwh::-webkit-scrollbar {display:none}
+</style>
+

+ 2 - 2
src/main.js

@@ -19,8 +19,8 @@ Vue.use(VueQuillEditor);
 
 Vue.use(VueTypedJs)
 import axios from 'axios';
-//axios.defaults.baseURL = 'http://132.232.92.186:8888';
-axios.defaults.baseURL = 'http://localhost:5256/';
+axios.defaults.baseURL = 'http://132.232.92.186:8888';
+// axios.defaults.baseURL = 'http://localhost:5256/';
 import { Message } from "element-ui";
 
 import common from './assets/js/common'//全局