取消权限

src/components/OP/EntryDetails.vue

@@ -360,7 +360,7 @@
                         </div>
                     </div>
                     <div class="Entry-li-inif">
-                         <label>城市区间交通费:&nbsp; &nbsp; &nbsp; </label>
+                        <label>城市区间交通费:&nbsp; &nbsp; &nbsp; </label>
                         <div class="Entry-inif-box">
                             <label>（经济舱）:</label>
                             <el-input-number size="mini" :controls="false" :precision="2"
@@ -3218,7 +3218,24 @@ export default {
                     that.TotalExpenses.TravellingExpensesJJ=that.numFilters(that.Transportationdatatotal + that.pullCartFeeTotal + that.trainFeeTotal + that.cityAirTicketFeeTotal);
                     that.TotalExpenses.TravellingExpensesGW=that.numFilters(that.Transportationdatatotal + that.pullCartFeeTotal + that.trainFeeTotal + that.cityAirTicketFeeTotal);
                     that.TotalExpenses.TravellingExpensesTD=that.numFilters(that.Transportationdatatotal + that.pullCartFeeTotal + that.trainFeeTotal + that.cityAirTicketFeeTotal);
-                    that.TotalExpenses.twoItemRemark=res.data.data.label;
+                    if (that.TotalExpenses.twoItemRemark=='') {
+                        that.TotalExpenses.twoItemRemark=res.data.data.label;
+                    }else{
+                        if (that.TotalExpenses.twoItemRemark.split("、").length > 1) {
+                            that.TotalExpenses.twoItemRemark.split("、")[1] = res.data.data.label;
+                            that.TotalExpenses.twoItemRemark = that.TotalExpenses.twoItemRemark.split("、")[0] + '、' + that.TotalExpenses.twoItemRemark.split("、")[1];
+                            that.TransportationVisible = false;
+                            that.$message.success(res.data.msg);
+                            return;
+                        }
+                        if (that.TotalExpenses.twoItemRemark.includes('接送机')) {
+                            console.log(1);
+                            
+                            that.TotalExpenses.twoItemRemark=res.data.data.label
+                        }else{
+                            that.TotalExpenses.twoItemRemark=that.TotalExpenses.twoItemRemark+'、'+res.data.data.label;
+                        }
+                    }
                     that.TransportationVisible=false;
                     that.$message.success(res.data.msg);
                 }else {
@@ -3240,7 +3257,6 @@ export default {
                 // this.UrbanTotal();
             }
         },
-
         choiceOne(val) {//境内费用(其他费用)选择框
             this.calculation();
         },

src/components/OP/EntryDetailsdraft.vue

@@ -1,6 +1,159 @@
 <template>
     <div v-loading.fullscreen.lock="fullscreenLoading">
         <div class="Entrydraft-all">
+            <el-dialog  width="1400px" title="交通费详细" :visible.sync="TransportationVisible" :close-on-click-modal="false">
+                <div style="display: flex;justify-content: space-between;align-items: center;margin: 5px 0;">
+                    <div>接送机(合计)：{{ numFilters(Transportationdatatotal) }}&nbsp;CNY</div>
+                    <el-button size="mini" @click="addTransportationdata" type="primary">添加一行</el-button>
+                </div>
+                <el-table border :data="Transportationdata">
+                    <el-table-column property="no" label="序号" width="50"></el-table-column>
+                    <el-table-column property="ovId" label="城市" width="150">
+                        <template slot-scope="scope">
+                            <el-select size="mini"
+                                @change="UrbanSelect(scope.row, $event, scope.$index)"
+                                v-model="scope.row.ovId" filterable placeholder="请选择">
+                                <el-option v-for="item in fulecao" :key="item.id" :label="item.area"
+                                    :value="item.id">
+                                    <span style="float: left">{{ item.area }}</span>
+                                    <!-- <span style="float: right; color: #8492a6; font-size: 13px">{{item.city}}</span> -->
+                                </el-option>
+                            </el-select>
+                            <!-- <el-input disabled size="mini" v-model="scope.row.b"></el-input> -->
+                        </template>
+                    </el-table-column>
+                    <el-table-column property="cost" label="成本价(要除以团组人数)" width="180">
+                        <template slot-scope="scope">
+                            <div>{{reservetwo(scope.row.cost/Basicdata.groupSize)}}&nbsp;{{scope.row.currencyName}}&nbsp;({{scope.row.cost+'/'}}
+                                <el-input-number @blur="UrbanModify(scope.row,scope.row.currencyName)" style="width:40px" size="mini" class="inputNumberClassS ppnum"
+                                        :controls="false" v-model="Basicdata.groupSize"></el-input-number>)
+                            </div>
+                            <!-- <el-input size="mini" v-model="Basicdata.groupSize"></el-input> -->
+                        </template>
+                    </el-table-column>
+                    <el-table-column property="guideCost" label="接送机导游" width="140">
+                        <template slot-scope="scope">
+                            <el-input-number disabled style="width:100%" size="mini" :class-unit="scope.row.currencyName" :precision="2" class="inputNumberClassS"
+                                        :controls="false" v-model="scope.row.guideCost"></el-input-number>
+                        </template>
+                    </el-table-column>
+                    <el-table-column property="otherCost" label="其他费用(只有澳大利亚有这个数据)" width="150">
+                        <template slot-scope="scope">
+                            <el-input-number @blur="UrbanModify(scope.row,scope.row.currencyName)" style="width:100%" size="mini" :class-unit="scope.row.currencyName" :precision="2" class="inputNumberClassS"
+                                        :controls="false" v-model="scope.row.otherCost"></el-input-number>
+                        </template>
+                    </el-table-column>
+                    <el-table-column property="serviceCount" label="服务次数(默认为1)" width="150">
+                        <template slot-scope="scope">
+                            <el-input-number @blur="UrbanModify(scope.row,scope.row.currencyName)" style="width:100%" size="mini"  :precision="2" class="inputNumberClassS"
+                                        :controls="false" v-model="scope.row.serviceCount"></el-input-number>
+                        </template>
+                    </el-table-column>
+                    <el-table-column property="coefficient" label="系数(默认2.5)" width="110">
+                        <template slot-scope="scope">
+                            <el-input-number @blur="UrbanModify(scope.row,scope.row.currencyName)" style="width:100%" size="mini" :precision="2" class="inputNumberClassS"
+                                        :controls="false" v-model="scope.row.coefficient"></el-input-number>
+                        </template>
+                    </el-table-column>
+                    <el-table-column property="quote" label="报价" width="200">
+                        <template slot-scope="scope">
+                            <el-input-number disabled style="width:100%" size="mini" class-unit="CNY" :precision="2" class="inputNumberClassS"
+                                        :controls="false" v-model="scope.row.quote"></el-input-number>
+
+                        </template>
+                    </el-table-column>
+                    <el-table-column property="i" label="备注">
+                        <template slot-scope="scope">
+                            <el-input size="mini" v-model="scope.row.remark"></el-input>
+                        </template>
+                    </el-table-column>
+                </el-table>
+                <div class="jiaotongfeiS-ul">
+                    <div class="jiaotongfeiS-li">
+                        <div style="display: flex;justify-content: space-between;align-items: center;margin: 5px 0;">
+                            <div>拉车(合计)：{{ numFilters(pullCartFeeTotal) }}&nbsp;CNY</div>
+                            <el-button @click="addpullCartFeeDetails" size="mini" type="primary">添加一行</el-button>
+                        </div>
+                        <!-- <div>拉车(合计)</div> -->
+                        <el-table border :data="pullCartFeeDetails">
+                            <el-table-column property="cost" label="成本价" width="150">
+                                <template slot-scope="scope">
+                                    <el-input-number @blur="UrbanModifyLC(scope.row)" style="width:100%" size="mini" :class-unit="scope.row.currencyName" :precision="2" class="inputNumberClassS"
+                                        :controls="false" v-model="scope.row.cost"></el-input-number>
+                                </template>
+                            </el-table-column>
+                            <el-table-column property="coefficient" label="系数" width="150">
+                                <template slot-scope="scope">
+                                    <el-input-number @blur="UrbanModifyLC(scope.row)" style="width:100%" size="mini"  :precision="2" 
+                                        :controls="false" v-model="scope.row.coefficient"></el-input-number>
+                                </template>
+                            </el-table-column>
+                            <el-table-column property="remark" label="备注">
+                                <template slot-scope="scope">
+                                    <el-input size="mini" v-model="scope.row.remark"></el-input>
+                                </template>
+                            </el-table-column>
+                        </el-table>
+                    </div>
+                    <div class="jiaotongfeiS-li">
+                        <div style="display: flex;justify-content: space-between;align-items: center;margin: 5px 0;">
+                            <div>火车(合计)：{{ numFilters(trainFeeTotal) }}&nbsp;CNY</div>
+                            <el-button @click="addtrainFeeDetails" size="mini" type="primary">添加一行</el-button>
+                        </div>
+                        <el-table border :data="trainFeeDetails">
+                            <el-table-column property="cost" label="成本价" width="150">
+                                <template slot-scope="scope">
+                                    <el-input-number @blur="UrbanModifyHC(scope.row)" style="width:100%" size="mini" :class-unit="scope.row.currencyName" :precision="2" class="inputNumberClassS"
+                                        :controls="false" v-model="scope.row.cost"></el-input-number>
+                                </template>
+                            </el-table-column>
+                            <el-table-column property="coefficient" label="系数" width="150">
+                                <template slot-scope="scope">
+                                    <el-input-number @blur="UrbanModifyHC(scope.row)" style="width:100%" size="mini"  :precision="2" 
+                                        :controls="false" v-model="scope.row.coefficient"></el-input-number>
+                                </template>
+                            </el-table-column>
+                            <el-table-column property="remark" label="备注">
+                                <template slot-scope="scope">
+                                    <el-input size="mini" v-model="scope.row.remark"></el-input>
+                                </template>
+                            </el-table-column>
+                        </el-table>
+                    </div>
+                    <div class="jiaotongfeiS-li">
+                        <div style="display: flex;justify-content: space-between;align-items: center;margin: 5px 0;">
+                            <div>城市机票(合计)：{{ numFilters(cityAirTicketFeeTotal) }}&nbsp;CNY</div>
+                            <el-button @click="addcityAirTicketFeeDetails" size="mini" type="primary">添加一行</el-button>
+                        </div>
+                        <el-table border :data="cityAirTicketFeeDetails">
+                            <el-table-column property="cost" label="成本价" width="150">
+                                <template slot-scope="scope">
+                                    <el-input-number @blur="UrbanModifyJP(scope.row)" style="width:100%" size="mini" :class-unit="scope.row.currencyName" :precision="2" class="inputNumberClassS"
+                                        :controls="false" v-model="scope.row.cost"></el-input-number>
+                                </template>
+                            </el-table-column>
+                            <el-table-column property="coefficient" label="系数" width="150">
+                                <template slot-scope="scope">
+                                    <el-input-number @blur="UrbanModifyJP(scope.row)" style="width:100%" size="mini"  :precision="2" 
+                                        :controls="false" v-model="scope.row.coefficient"></el-input-number>
+                                </template>
+                            </el-table-column>
+                            <el-table-column property="remark" label="备注">
+                                <template slot-scope="scope">
+                                    <el-input size="mini" v-model="scope.row.remark"></el-input>
+                                </template>
+                            </el-table-column>
+                        </el-table>
+                    </div>
+                </div>
+                <div style="margin-top: 20px;font-weight: 600;">
+                    城市交通费合计：{{ numFilters(Transportationdatatotal + pullCartFeeTotal + trainFeeTotal + cityAirTicketFeeTotal) }}&nbsp;CNY
+                </div>
+                <div style="text-align: right;margin-top: 20px;">
+                    <el-button @click="TransportationVisible=false">取消</el-button>
+                    <el-button @click="EnterExitCostDraftOVFeeSave" type="primary">保 存</el-button>
+                </div>
+            </el-dialog>
             <el-dialog v width="400px" title="设置查看权限" class="permissionsbox" :visible.sync="setpermissions"  :close-on-click-modal="false">
                 <el-checkbox-group v-model="viewUsers" @change="handleCheckAllChange">
                     <el-checkbox v-for="item in viewUsersarr" :label="item.id" :key="item.id">{{item.name}}</el-checkbox>
@@ -146,7 +299,7 @@
                                 <label>(经济舱)</label>
                                 <div class="sub-boxs">
                                     {{ TotalExpenses.EconomyClasstotal=(TotalExpenses.EconomyClass +
-                                        TotalExpenses.TravellingExpenses) | numFilter }}
+                                        TotalExpenses.TravellingExpensesJJ) | numFilter }}
                                 </div>
                                 <span>元/人</span>
                             </div>
@@ -156,7 +309,7 @@
                                 <label>(公务舱)</label>
                                 <div class="sub-boxs">
                                     {{ TotalExpenses.BusinessClasstotal=(TotalExpenses.BusinessClass +
-                                        TotalExpenses.TravellingExpenses) | numFilter }}
+                                        TotalExpenses.TravellingExpensesGW) | numFilter }}
                                 </div>
                                 <span>元/人</span>
                             </div>
@@ -166,7 +319,7 @@
                                 <label>(头等舱)</label>
                                 <div class="sub-boxs">
                                     {{ TotalExpenses.Firstclasstotal=(TotalExpenses.Firstclass +
-                                        TotalExpenses.TravellingExpenses) | numFilter }}
+                                        TotalExpenses.TravellingExpensesTD) | numFilter }}
                                 </div>
                                 <span>元/人</span>
                             </div>
@@ -203,18 +356,40 @@
                         </div>
                     </div>
                     <div class="Entrydraft-li-inif">
-                        <div class="Entrydraft-inif-box">
+                        <!-- <div class="Entrydraft-inif-box">
                             <label>城市区间交通费:</label>
                             <el-input-number size="mini" :controls="false" :precision="2"
                                 v-model="TotalExpenses.TravellingExpenses"></el-input-number>
                             <span>元/人;</span>
+                        </div> -->
+                        <label>城市区间交通费:&nbsp; &nbsp; &nbsp; </label>
+                        <div class="Entrydraft-inif-box">
+                            <label>（经济舱）:</label>
+                            <el-input-number size="mini" :controls="false" :precision="2"
+                                v-model="TotalExpenses.TravellingExpensesJJ"></el-input-number>
+                            <span>元/人;</span>
+                        </div>
+                        <div class="Entrydraft-inif-box">
+                            <label>（公务舱）:</label>
+                            <el-input-number size="mini" :controls="false" :precision="2"
+                                v-model="TotalExpenses.TravellingExpensesGW"></el-input-number>
+                            <span>元/人;</span>
+                        </div>
+                        <div class="Entrydraft-inif-box">
+                            <label>（头等舱）:</label>
+                            <el-input-number size="mini" :controls="false" :precision="2"
+                                v-model="TotalExpenses.TravellingExpensesTD"></el-input-number>
+                            <span>元/人;</span>
+                        </div>
+                        <div class="Entrydraft-inif-box">
+                            <el-button @click="openTransportation" type="primary" size="mini">交通费明细</el-button>
                         </div>
                     </div>
+
                     <div class="Entrydraft-li-inif">
                         <div class="Entry-inif-box">
                             <label>备注:</label>
-                            <el-input style="width:1000px" size="mini"
-                                v-model="TotalExpenses.twoItemRemark"></el-input>
+                            <el-input style="width:1000px" size="mini" v-model="TotalExpenses.twoItemRemark"></el-input>
                         </div>
                     </div>
                     <div class="Entrydraft-li-inif">
@@ -611,6 +786,7 @@
 
 import { Decimal } from 'decimal.js'
 import { debounce } from '../../store/statice'
+import { el } from '@fullcalendar/core/internal-common'
 export default {
     data() {
         return {
@@ -664,7 +840,10 @@ export default {
                 EconomyClass: 0,//经济舱
                 BusinessClass: 0,//公务舱
                 Firstclass: 0,//头等舱
-                TravellingExpenses: 0,//城市区间交通费
+                // TravellingExpenses: 0,//城市区间交通费
+                TravellingExpensesJJ: 0,//城市区间交通费JJ
+                TravellingExpensesGW: 0,//城市区间交通费GW
+                TravellingExpensesTD: 0,//城市区间交通费TD
                 EconomyClasstotal: 0,//经济舱合计
                 BusinessClasstotal: 0,//公务舱合计
                 Firstclasstotal: 0,//头等舱合计
@@ -726,6 +905,85 @@ export default {
 
             provinceIdarr:[],
             provinceId:'',
+
+            //交通费弹窗
+            Transportationdata:[
+                {
+                    coefficient: 2.5,
+                    cost: 0,
+                    currencyName: "CNY",
+                    guideCost: 0,
+                    no: 1,
+                    otherCost: 0,
+                    ovId: '',
+                    quote: 0,
+                    remark: "",
+                    serviceCount: 1
+                }
+            ],
+            Transportationdatatotal:0,
+            TransportationVisible:false,
+            currencies:[],
+            lache:[
+                {
+                    a:1,
+                    b:"",
+                    c:"",
+                }
+            ],
+            huoche:[
+                {
+                    a:1,
+                    b:"",
+                    c:"",
+                }
+            ],
+            chengshijipiao:[
+                {
+                    a:1,
+                    b:"",
+                    c:"",
+                }
+            ],
+            Basicdata:{},
+            fulecao:[],
+            pullCartFeeTotal:0,
+            pullCartFeeDetails:[
+                {
+                    no: 1,
+                    cost: 0,
+                    coefficient: 2.50,
+                    currencyName: "",
+                    quote: 0,
+                    remark: ""
+                }
+            ],
+            trainFeeTotal:0,
+            trainFeeDetails:[
+                {
+                    no: 1,
+                    cost: 0,
+                    coefficient: 2.50,
+                    currencyName: "",
+                    quote: 0,
+                    remark: ""
+                }
+            ],
+            cityAirTicketFeeTotal:0,
+            cityAirTicketFeeDetails:[
+                {
+                    no: 1,
+                    cost: 0,
+                    coefficient: 2.50,
+                    currencyName: "",
+                    quote: 0,
+                    remark: ""
+                }
+            ],
+            lastUpdateUserName:'',
+            lastUpdateTime:'',
+            createUserName:'',
+            createTime:'',
         }
     },
     methods: {
@@ -1077,7 +1335,10 @@ export default {
                 EconomyClass: 0,//经济舱
                 BusinessClass: 0,//公务舱
                 Firstclass: 0,//TD舱
-                TravellingExpenses: 0,//城市区间交通费
+                // TravellingExpenses: 0,//城市区间交通费
+                TravellingExpensesJJ: 0,//城市区间交通费JJ
+                TravellingExpensesGW: 0,//城市区间交通费GW
+                TravellingExpensesTD: 0,//城市区间交通费TD
                 EconomyClasstotal: 0,//经济舱合计
                 BusinessClasstotal: 0,//公务舱合计
                 Firstclasstotal: 0,//TD舱合计
@@ -1587,7 +1848,9 @@ export default {
                     that.TotalExpenses.EconomyClass = res.data.data.airJJ;
                     that.TotalExpenses.BusinessClass = res.data.data.airGW;
                     that.TotalExpenses.Firstclass = res.data.data.airTD;
-                    that.TotalExpenses.TravellingExpenses = res.data.data.cityTranffic;
+                    that.TotalExpenses.TravellingExpensesJJ = res.data.data.cityTranffic;
+                    that.TotalExpenses.TravellingExpensesGW = res.data.data.cityTranffic1;
+                    that.TotalExpenses.TravellingExpensesTD = res.data.data.cityTranffic2;
                     that.TotalExpenses.twoItemRemark = res.data.data.twoItemRemark;
 
                     //是否计算Checkbox
@@ -1681,7 +1944,10 @@ export default {
                 EconomyClass: 0,//经济舱
                 BusinessClass: 0,//公务舱
                 Firstclass: 0,//TD舱
-                TravellingExpenses: 0,//城市区间交通费
+                TravellingExpensesJJ: 0,//城市区间交通费JJ
+                TravellingExpensesGW: 0,//城市区间交通费GW
+                TravellingExpensesTD: 0,//城市区间交通费TD
+                // TravellingExpenses: 0,//城市区间交通费
                 EconomyClasstotal: 0,//经济舱合计
                 BusinessClasstotal: 0,//公务舱合计
                 Firstclasstotal: 0,//TD舱合计
@@ -2650,7 +2916,9 @@ export default {
                     airJJ: that.TotalExpenses.EconomyClass,
                     airGW: that.TotalExpenses.BusinessClass,
                     airTD: that.TotalExpenses.Firstclass,
-                    cityTranffic: that.TotalExpenses.TravellingExpenses,
+                    cityTranffic: that.TotalExpenses.TravellingExpensesJJ,
+                    cityTranffic1: that.TotalExpenses.TravellingExpensesGW,
+                    cityTranffic2: that.TotalExpenses.TravellingExpensesTD,
                     dayOtherPriceData: arrSeven,
                     currencys: that.currencys,
                     choiceThree: that.choiceThree ? 1 : 0,
@@ -2831,7 +3099,9 @@ export default {
                         airJJ: that.TotalExpenses.EconomyClass,
                         airGW: that.TotalExpenses.BusinessClass,
                         airTD: that.TotalExpenses.Firstclass,
-                        cityTranffic: that.TotalExpenses.TravellingExpenses,
+                        cityTranffic: that.TotalExpenses.TravellingExpensesJJ,
+                        cityTranffic1: that.TotalExpenses.TravellingExpensesGW,
+                        cityTranffic2: that.TotalExpenses.TravellingExpensesTD,
                         dayOtherPriceData: otherDatas,
                         currencys: that.currencys,
                         choiceThree: that.choiceThree ? 1 : 0,
@@ -3203,6 +3473,282 @@ export default {
                 that.$message.error("操作错误，联系信息部!");
             });
         },
+        //交通费基础费用
+        EnterExitCostDraftOVByGroupId() {
+            var url = "/api/Groups/EnterExitCostDraftOVByGroupId/"+this.value
+            var that = this
+            this.$axios({
+                method: 'get',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer ' + this.token
+                },
+            }).then(function (res) {
+                that.fulecao=[];
+                that.currencies=[];
+                if (res.data.code == 200) {
+                    that.currencies=res.data.data.currencies;
+                    that.fulecao=res.data.data.data;
+                }else {
+                    that.$message.error(res.data.msg);
+                }
+            })
+        },
+        //交通费详细
+        EnterExitCostDraftOVFeeDetails() {
+            var url = "/api/Groups/EnterExitCostDraftOVFeeDetails/"+this.value+"?currUserId="+this.userId
+            var that = this
+            this.$axios({
+                method: 'get',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer ' + this.token
+                },
+            }).then(function (res) {
+                that.Transportationdata=[];
+                that.Transportationdatatotal=0;
+                that.pullCartFeeDetails=[];
+                that.pullCartFeeTotal=0;
+                that.trainFeeDetails=[];
+                that.trainFeeTotal=0;
+                that.cityAirTicketFeeDetails=[];
+                that.cityAirTicketFeeTotal=0;
+                that.lastUpdateUserName="";
+                that.lastUpdateTime="";
+                that.createUserName="";
+                that.createTime="";
+                that.Basicdata={};
+                if (res.data.code == 200) {
+                    that.Basicdata=res.data.data;
+                    that.Transportationdata=res.data.data.aptFeeDetails;
+                    that.Transportationdatatotal=res.data.data.aptFeeTotal;
+                    that.pullCartFeeDetails=res.data.data.pullCartFeeDetails;
+                    that.pullCartFeeTotal=res.data.data.pullCartFeeTotal;
+                    that.trainFeeDetails=res.data.data.trainFeeDetails;
+                    that.trainFeeTotal=res.data.data.trainFeeTotal;
+                    that.cityAirTicketFeeDetails=res.data.data.cityAirTicketFeeDetails;
+                    that.cityAirTicketFeeTotal=res.data.data.cityAirTicketFeeTotal;
+                    that.lastUpdateUserName=res.data.data.lastUpdateUserName;
+                    that.lastUpdateTime=res.data.data.lastUpdateTime;
+                    that.createUserName=res.data.data.createUserName;
+                    that.createTime=res.data.data.createTime;
+                    that.EnterExitCostDraftOVByGroupId();
+                }else {
+                    that.$message.error(res.data.msg);
+                }
+            })
+        },
+        //交通费弹窗
+        openTransportation(){
+            this.EnterExitCostDraftOVFeeDetails();
+            this.TransportationVisible=true;
+        },
+        //选择城市交通费
+        UrbanSelect(val, item, index) {
+            var obj = {}
+            obj = this.fulecao.find(function (i,indexs) {
+
+                return i.id === item
+            });
+            val.cost=obj.price;
+            val.otherCost=obj.otherPrice;
+            val.guideCost=obj.guidePrice;
+            val.currencyName=obj.currencyName
+            this.UrbanModify(val,val.currencyName)
+        },
+        numFilters(value) {
+            // 截取当前数据到小数点后两位
+            let tempVal = parseFloat(value).toFixed(3);
+            let realVal = tempVal.substring(0, tempVal.length - 1);
+            return realVal;
+        },
+        //改值计算
+        UrbanModify(val,bizhong){
+            var total=0
+            var obj = {}
+            obj = this.currencies.find(function (i,indexs) {
+                return i.currencyCode === bizhong
+            });
+            total=(Number(val.cost/this.Basicdata.groupSize)+Number(val.otherCost)+Number(val.guideCost))*val.serviceCount*val.coefficient*obj.rate;
+            val.quote=this.numFilters(total)
+            this.UrbanTotal();
+        },
+        //改值计算LC
+        UrbanModifyLC(val){
+            var total=0
+            val.currencyName="CNY"
+            total=Number(val.cost)*val.coefficient;
+            val.quote=this.numFilters(total)
+            this.UrbanTotalLC();
+        },
+        //计算总价LC
+        UrbanTotalLC(){
+            this.pullCartFeeTotal=0
+            for(let i=0;i<this.pullCartFeeDetails.length;i++){
+                this.pullCartFeeTotal+=Number(this.pullCartFeeDetails[i].quote)
+            }
+        },  
+        //改值计算HC
+        UrbanModifyHC(val){
+            var total=0
+            val.currencyName="CNY"
+            total=Number(val.cost)*val.coefficient;
+            val.quote=this.numFilters(total)
+            this.UrbanTotalHC();
+        },
+        //计算总价HC
+        UrbanTotalHC(){
+            this.trainFeeTotal=0
+            for(let i=0;i<this.trainFeeDetails.length;i++){
+                this.trainFeeTotal+=Number(this.trainFeeDetails[i].quote)
+            }
+        },  
+        //改值计算JP
+        UrbanModifyJP(val){
+            var total=0
+            val.currencyName="CNY"
+            total=Number(val.cost)*val.coefficient;
+            val.quote=this.numFilters(total)
+            this.UrbanTotalJP();
+        },
+        //计算总价JP
+        UrbanTotalJP(){
+            this.cityAirTicketFeeTotal=0
+            for(let i=0;i<this.cityAirTicketFeeDetails.length;i++){
+                this.cityAirTicketFeeTotal+=Number(this.cityAirTicketFeeDetails[i].quote)
+            }
+        },  
+        //计算总价
+        UrbanTotal(){
+            this.Transportationdatatotal=0
+            for(let i=0;i<this.Transportationdata.length;i++){
+                this.Transportationdatatotal+=Number(this.Transportationdata[i].quote)
+            }
+            // console.log(total);
+            
+            // this.TotalExpenses.TravellingExpensesJJ=this.numFilters(total)
+            // this.TotalExpenses.TravellingExpensesGW=this.numFilters(total)
+            // this.TotalExpenses.TravellingExpensesTD=this.numFilters(total)
+            // this.calculation();
+        },  
+        //添加一行接送机
+        addTransportationdata(){
+            this.Transportationdata.push({
+                coefficient: 2.5,
+                cost: 0,
+                currencyName: "CNY",
+                guideCost: 0,
+                no: this.Transportationdata.length + 1,
+                otherCost: 0,
+                ovId: '',
+                quote: 0,
+                remark: "",
+                serviceCount: 1
+            });
+        },
+        //添加一行拉车
+        addpullCartFeeDetails(){
+            this.pullCartFeeDetails.push({
+                no: this.pullCartFeeDetails.length + 1,
+                cost: 0,
+                coefficient: 2.50,
+                currencyName: "",
+                quote: 0,
+                remark: ""
+            });
+        },
+        //添加一行火车
+        addtrainFeeDetails(){
+            this.trainFeeDetails.push({
+                no: this.trainFeeDetails.length + 1,
+                cost: 0,
+                coefficient: 2.50,
+                currencyName: "",
+                quote: 0,
+                remark: ""
+            });
+        },
+        //添加一行城市机票(
+        addcityAirTicketFeeDetails(){
+            this.cityAirTicketFeeDetails.push({
+                no: this.cityAirTicketFeeDetails.length + 1,
+                cost: 0,
+                coefficient: 2.50,
+                currencyName: "",
+                quote: 0,
+                remark: ""
+            });
+        },
+        //城市交通费保存
+        EnterExitCostDraftOVFeeSave() {
+            for(let i=0;i<this.Transportationdata.length;i++){
+                if(this.Transportationdata[i].ovId==""){
+                    this.$message.error("请查看是否除备注外的必填项均已填写！");
+                    return;
+                }
+            }
+            var url = "/api/Groups/EnterExitCostDraftOVFeeSave"
+            var that = this
+            this.$axios({
+                method: 'post',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer ' + this.token
+                },
+                data:{
+                    aptFeeTotal:that.Transportationdatatotal,
+                    aptFeeDetails:that.Transportationdata,
+                    pullCartFeeTotal:that.pullCartFeeTotal,
+                    pullCartFeeDetails:that.pullCartFeeDetails,
+                    trainFeeTotal:that.trainFeeTotal,
+                    trainFeeDetails:that.trainFeeDetails,
+                    cityAirTicketFeeTotal:that.cityAirTicketFeeTotal,
+                    cityAirTicketFeeDetails:that.cityAirTicketFeeDetails,
+                    currencies:that.currencies,
+                    lastUpdateUserName:that.lastUpdateUserName,
+                    lastUpdateTime:that.lastUpdateTime,
+                    createUserName:that.createUserName,
+                    createTime:that.createTime,
+                    draftId:that.value,
+                    currUserId:that.userId,
+                    groupSize:that.Basicdata.groupSize,
+                }
+            }).then(function (res) {
+                if (res.data.code == 200) {
+                    that.TotalExpenses.TravellingExpensesJJ=that.numFilters(that.Transportationdatatotal + that.pullCartFeeTotal + that.trainFeeTotal + that.cityAirTicketFeeTotal);
+                    that.TotalExpenses.TravellingExpensesGW=that.numFilters(that.Transportationdatatotal + that.pullCartFeeTotal + that.trainFeeTotal + that.cityAirTicketFeeTotal);
+                    that.TotalExpenses.TravellingExpensesTD=that.numFilters(that.Transportationdatatotal + that.pullCartFeeTotal + that.trainFeeTotal + that.cityAirTicketFeeTotal);
+                    if (that.TotalExpenses.twoItemRemark=='') {
+                        that.TotalExpenses.twoItemRemark=res.data.data.label;
+                    }else{
+                        if (that.TotalExpenses.twoItemRemark.split("、").length > 1) {
+                            that.TotalExpenses.twoItemRemark.split("、")[1] = res.data.data.label;
+                            that.TotalExpenses.twoItemRemark = that.TotalExpenses.twoItemRemark.split("、")[0] + '、' + that.TotalExpenses.twoItemRemark.split("、")[1];
+                            that.TransportationVisible = false;
+                            that.$message.success(res.data.msg);
+                            return;
+                        }
+                        if (that.TotalExpenses.twoItemRemark.includes('接送机')) {
+                            console.log(1);
+                            
+                            that.TotalExpenses.twoItemRemark=res.data.data.label
+                        }else{
+                            that.TotalExpenses.twoItemRemark=that.TotalExpenses.twoItemRemark+'、'+res.data.data.label;
+                        }
+                    }
+                    that.TransportationVisible=false;
+                    that.$message.success(res.data.msg);
+                }else {
+                    that.$message.error(res.data.msg);
+                }
+            })
+        },
+        //baoliuliangweixiaoshu
+        reservetwo(value) {
+            // 截取当前数据到小数点后两位
+            let realVal = new Decimal(value).toFixed(2)
+            return realVal
+        },
     },
     filters: {
         numFilter(value) {
@@ -3341,8 +3887,14 @@ export default {
                 if (newVal.BusinessClass == undefined) {
                     newVal.BusinessClass = 0
                 }
-                if (newVal.TravellingExpenses == undefined) {
-                    newVal.TravellingExpenses = 0
+                if (newVal.TravellingExpensesJJ == undefined) {
+                    newVal.TravellingExpensesJJ = 0
+                }
+                if (newVal.TravellingExpensesGW == undefined) {
+                    newVal.TravellingExpensesGW = 0
+                }
+                if (newVal.TravellingExpensesTD == undefined) {
+                    newVal.TravellingExpensesTD = 0
                 }
             },
             immediate: true,
@@ -3561,4 +4113,42 @@ export default {
     width: 150px;
     margin-right: 0;
 }
+
+.jiaotongfeiS-ul{
+    margin-top: 20px;
+    display: flex;
+    justify-content: space-between;
+}
+.jiaotongfeiS-li{
+    width: 32.5%;
+}
+
+
+
+.inputNumberClassS[class-unit] {
+    --el-input-number-unit-offset-x: 35px;
+    position: relative;
+}
+.inputNumberClassS[class-unit]::after {
+    content: attr(class-unit);
+    height: 100%;
+    display: flex;
+    align-items: center;
+    position: absolute;
+    top: 0;
+    right: 5px;
+    color: #C0C4CC;
+}
+.inputNumberClassS[class-unit] .el-input__inner {
+    padding-right:25px;
+}
+.Entrydraft-all .ppnum{
+    width: 40px;
+}
+.ppnum.el-input-number.is-without-controls .el-input__inner{
+    padding: 0;
+    margin: 0;
+    text-align: center;
+}
+
 </style>

src/components/OP/GroupProgress.vue

@@ -811,13 +811,13 @@ export default {
         },
         //签证添加一行
         addRow(text) {
-            if (text!=this.jobName) {
-                this.$message({
-                    message: '该流程不在此账号的操作权限内！如有疑问联系该流程负责人！',
-                    type: 'warning'
-                });
-                return
-            }
+            // if (text!=this.jobName) {
+            //     this.$message({
+            //         message: '该流程不在此账号的操作权限内！如有疑问联系该流程负责人！',
+            //         type: 'warning'
+            //     });
+            //     return
+            // }
             this.tableData.push({
                 countryName: '',
                 nodeName1: '收集资料',
@@ -843,13 +843,13 @@ export default {
         },
         //签证删除一行
         deleteRow(index, rows,text) {
-            if (text!=this.jobName) {
-                this.$message({
-                    message: '该流程不在此账号的操作权限内！如有疑问联系该流程负责人！',
-                    type: 'warning'
-                });
-                return
-            }
+            // if (text!=this.jobName) {
+            //     this.$message({
+            //         message: '该流程不在此账号的操作权限内！如有疑问联系该流程负责人！',
+            //         type: 'warning'
+            //     });
+            //     return
+            // }
             this.$confirm('此操作将该数据移除并未保存,需要更新数据请点击本流程保存按钮, 是否继续?', '提示', {
                 confirmButtonText: '确定',
                 cancelButtonText: '取消',
@@ -866,13 +866,13 @@ export default {
         },
         //点击确认
         confirmclick(item,text){
-            if (text!=this.jobName) {
-                this.$message({
-                    message: '该流程不在此账号的操作权限内！如有疑问联系该流程负责人！',
-                    type: 'warning'
-                });
-                return
-            }
+            // if (text!=this.jobName) {
+            //     this.$message({
+            //         message: '该流程不在此账号的操作权限内！如有疑问联系该流程负责人！',
+            //         type: 'warning'
+            //     });
+            //     return
+            // }
             this.progressloading=true;
             var url = "/api/Groups/GroupProcessUpdateNodeStatus"
             var that = this
@@ -922,25 +922,25 @@ export default {
         },
         //更改实际操作时间
         GroupProcessSetActualDone(item,text){
-            if (text==undefined) {
-                var qxarr=[187]
-                if (!qxarr.includes(this.userId)) {
-                    item.actualDone='';
-                    this.$message({
-                        message: '该流程不在此账号的操作权限内！如有疑问联系该流程负责人！',
-                        type: 'warning'
-                    });
-                    return
-                }
-            }
-            else if (text!=this.jobName) {
-                item.actualDone='';
-                this.$message({
-                    message: '该流程不在此账号的操作权限内！如有疑问联系该流程负责人！',
-                    type: 'warning'
-                });
-                return
-            }
+            // if (text==undefined) {
+            //     var qxarr=[187]
+            //     if (!qxarr.includes(this.userId)) {
+            //         item.actualDone='';
+            //         this.$message({
+            //             message: '该流程不在此账号的操作权限内！如有疑问联系该流程负责人！',
+            //             type: 'warning'
+            //         });
+            //         return
+            //     }
+            // }
+            // else if (text!=this.jobName) {
+            //     item.actualDone='';
+            //     this.$message({
+            //         message: '该流程不在此账号的操作权限内！如有疑问联系该流程负责人！',
+            //         type: 'warning'
+            //     });
+            //     return
+            // }
             this.progressloading=true;
             var url = "/api/Groups/GroupProcessSetActualDone"
             var that = this
@@ -975,14 +975,14 @@ export default {
         },
         //财务节点点击确认
         financeclick(item){
-            var qxarr=[187]
-            if (!qxarr.includes(this.userId)) {
-                this.$message({
-                    message: '该流程不在此账号的操作权限内！如有疑问联系该流程负责人！',
-                    type: 'warning'
-                });
-                return
-            }
+            // var qxarr=[187]
+            // if (!qxarr.includes(this.userId)) {
+            //     this.$message({
+            //         message: '该流程不在此账号的操作权限内！如有疑问联系该流程负责人！',
+            //         type: 'warning'
+            //     });
+            //     return
+            // }
             this.progressloading=true;
             var url = "/api/Groups/GroupProcessUpdateNodeStatus"
             var that = this
@@ -1012,13 +1012,13 @@ export default {
         },
         //签证保存
         Visaclick(text){
-            if (text!=this.jobName) {
-                this.$message({
-                    message: '该流程不在此账号的操作权限内！如有疑问联系该流程负责人！',
-                    type: 'warning'
-                });
-                return
-            }
+            // if (text!=this.jobName) {
+            //     this.$message({
+            //         message: '该流程不在此账号的操作权限内！如有疑问联系该流程负责人！',
+            //         type: 'warning'
+            //     });
+            //     return
+            // }
             this.progressloading=true;
             var url = "/api/Groups/GroupProcessUpdateVisaNodeDetails"
             var that = this