liuhj 1 gadu atpakaļ
vecāks
revīzija
89ea618f44

+ 34 - 23
src/components/Finance/Currency.vue

@@ -1,5 +1,5 @@
 <template>
-    <div>
+    <div v-loading.fullscreen.lock="fullscreenLoading">
         <div class="currency-all">
             <div class="currency-head">
                 <div class="head-ipt">
@@ -29,7 +29,7 @@
                     </div>
                     <div class="currency-info-li">
                         <label>出访国家:</label>
-                        <span>{{groupInfo.specialNeeds}}</span>
+                        <span>{{groupInfo.visitCountry}}</span>
                     </div>
                     <div class="currency-info-li">
                         <label>起止日期:</label>
@@ -158,7 +158,8 @@ export default {
         ticket:{},//机票预订
         payments:{},//团组增减款项
         breakfast:{},//酒店早餐
-        overspend:{}//超支费用
+        overspend:{},//超支费用
+        fullscreenLoading:false//加载
       };
     },
     methods: {
@@ -174,6 +175,7 @@ export default {
       },
       //获取团组汇率
       GetCurrency(){
+        this.fullscreenLoading=true;
         var url = "/api/Financial/GetGroupRateDataSources"
         var that = this
         this.$axios({
@@ -188,25 +190,34 @@ export default {
                 pageSize: 0,
             }
         }).then(function (res) {
-                that.restaurants = res.data.data.groupData
-                // 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));
-                that.overspendCurrencyArr = JSON.parse(JSON.stringify(res.data.data.teamRateData));
-                if(that.state1==''){
-                    that.state1=res.data.data.groupData[0].id;
-                }
-                console.log(res.data.data.teamRateData)
-                that.GetGroupRateInfo();
+            if(res.data.code!=200){
+                that.fullscreenLoading=false;
+                that.$message({
+                    message: res.data.msg,
+                    type: 'warning'
+                });
+                return;
+            }
+            that.fullscreenLoading=false;
+            that.restaurants = res.data.data.groupData
+            // 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));
+            that.overspendCurrencyArr = JSON.parse(JSON.stringify(res.data.data.teamRateData));
+            if(that.state1==''){
+                that.state1=res.data.data.groupData[0].id;
+            }
+            console.log(res.data.data.teamRateData)
+            that.GetGroupRateInfo();
         })
       },
       //获取默认团组汇率
@@ -554,7 +565,7 @@ export default {
     },
     filters:{
         filter_time(value){
-            return value
+            return value.split(' ')[0];
         }
     },
     mounted() {

+ 8 - 8
src/components/Finance/ExpenseReview.vue

@@ -43,15 +43,15 @@
                         width="100"
                         label="团 号">
                     </el-table-column>
-                    <el-table-column
+                    <!-- <el-table-column
                         width="100" 
                         prop="salesQuoteNo"
                         label="销售报价号">
-                    </el-table-column>
+                    </el-table-column> -->
                     <el-table-column
                         prop="teamType"
                         label="团组类型"
-                        width="150">
+                        width="110">
                     </el-table-column>
                     <el-table-column
                         prop="teamLev"
@@ -76,17 +76,17 @@
                         prop="visitDate"
                         :formatter="filteryear"
                         label="出访时间"
-                        width="100">
+                        width="110">
                     </el-table-column>
                     <el-table-column
                         prop="visitDays"
-                        label="出访天数"
-                        width="80">
+                        label="天数"
+                        width="50">
                     </el-table-column>
                     <el-table-column
                         prop="visitPNumber"
-                        label="出访人数"
-                        width="80">
+                        label="人数"
+                        width="50">
                     </el-table-column>
                     <el-table-column
                         prop="jietuanOperator"

+ 14 - 9
src/components/Finance/Sendack.vue

@@ -55,9 +55,10 @@
                     </el-table-column>
                     <el-table-column
                         width="120" 
-                        prop="price"
-                        label="费用"
-                        :formatter="rounding">
+                        label="费用">
+                        <template slot-scope="scope">
+                            {{ townum(scope.row.price) }} {{ scope.row.currencyCode }}
+                        </template>
                     </el-table-column>
                     <el-table-column
                         prop="createUserName"
@@ -67,7 +68,7 @@
                     <el-table-column
                         prop="createTime"
                         label="操作时间"
-                        width="160">
+                        width="165">
                     </el-table-column>
                     <el-table-column
                         prop="auditGMName"
@@ -77,23 +78,23 @@
                     <el-table-column
                         prop="auditGMDate"
                         label="审核时间"
-                        width="160">
+                        width="165">
                     </el-table-column>
                     <el-table-column
                         prop="remark"
                         label="备注"
-                        width="600">
+                        >
                     </el-table-column>
-                    <el-table-column label="操作" width="110">
+                    <el-table-column label="操作" width="160">
                         <template slot-scope="scope">
                           <el-button
                             :disabled="scope.row.isAuditGM==1"
-                            type="text"
+                            type="primary"
                             size="mini"
                             @click="Complete(scope.$index, scope.row)">编辑</el-button>
                             <el-button
                             :disabled="scope.row.isAuditGM==1"
-                            type="text"
+                            type="danger"
                             size="mini"
                             @click="Delete(scope.$index, scope.row)"
                            >删除</el-button>
@@ -233,6 +234,10 @@ export default {
         }
     },
     methods:{
+        //保留两位小数
+        townum(val){
+            return val.toFixed(2)
+        },
         filteryear(val){
             let gstime=val.visitDate.split(' ')[0]
             return gstime;

+ 9 - 11
src/components/Login.vue

@@ -161,8 +161,8 @@ export default {
     }
 }
 </script>
-<style scoped>
-.fout-box {
+<style>
+.login-all .fout-box {
     width: 100%;
     text-align: center;
     background-color: #0008;
@@ -170,7 +170,7 @@ export default {
     color: #fff;
     line-height: 34px;
     position: fixed;
-    bottom: 0;
+    bottom:0px;
     font-size: 14px;
 }
 
@@ -308,39 +308,37 @@ export default {
     text-align: center;
     padding: 25px;
 }
-</style>
-<style >
 body {
     margin: 0;
     padding: 0;
 
 }
 
-.login-input .el-input input {
+.login-all .login-input .el-input input {
     border-radius: 20px;
     background-color: transparent;
     color: #fff;
 }
 
-.loginbtn-box .el-button.is-round {
+.login-all .loginbtn-box .el-button.is-round {
     border-radius: 25px;
     padding: 12px 50px;
     font-size: 20px;
 }
 
-.login-input .el-input {
+.login-all .login-input .el-input {
     margin-top: 20px;
 }
 
-.el-input label {
+.login-all .el-input label {
     color: #fff;
 }
 
-.login-input .el-input__prefix {
+.login-all .login-input .el-input__prefix {
     width: 40px;
 }
 
-.login-input .el-input--prefix .el-input__inner {
+.login-all .login-input .el-input--prefix .el-input__inner {
     padding-left: 50px;
 }
 

+ 12 - 7
src/components/OP/OPgroup.vue

@@ -40,9 +40,14 @@
                         </template>
                     </el-table-column>
                     <el-table-column
-                        prop="tourCode"
+                        prop="department"
                         width="100"
                         label="所属部门">
+                        <template slot-scope="scope">
+                            <div v-if="scope.row.department=='市场部'" style="background-color: #67C23A;color:#fff;border-radius: 5px;">市场客户</div>
+                            <div v-if="scope.row.department=='国交部'" style="background-color: #409EFF;color:#fff;border-radius: 5px;">公司客户</div>
+                            <div v-if="scope.row.department!='国交部'&&scope.row.department!='市场部'">{{ scope.row.department }}</div>
+                        </template>
                     </el-table-column>
                     <el-table-column
                         prop="tourCode"
@@ -57,7 +62,7 @@
                     <el-table-column
                         prop="teamType"
                         label="团组类型"
-                        width="150">
+                        width="110">
                     </el-table-column>
                     <!-- <el-table-column
                         prop="teamLev"
@@ -82,17 +87,17 @@
                         prop="visitDate"
                         :formatter="filteryear"
                         label="出访时间"
-                        width="100">
+                        width="110">
                     </el-table-column>
                     <el-table-column
                         prop="visitDays"
-                        label="出访天数"
-                        width="85">
+                        label="天数"
+                        width="50">
                     </el-table-column>
                     <el-table-column
                         prop="visitPNumber"
-                        label="出访人数"
-                        width="85">
+                        label="人数"
+                        width="50">
                     </el-table-column>
                     <el-table-column
                         prop="jietuanOperator"

+ 3 - 2
src/components/OP/OpCarTouristGuideGroundId.vue

@@ -258,6 +258,7 @@ export default {
                 serviceEndTime: { required: true, message: '请输入服务时间止', trigger: ['blur', 'change'] },
                 orbitalPrivateTransfer: { required: true, message: '请选择费用表示', trigger: ['blur', 'change'] },
             },
+            restaurants:[]
         }
     },
     methods: {
@@ -377,8 +378,8 @@ export default {
                     if (CreditCardPayment != null) {
                         that.IsAuditGM = CreditCardPayment.isAuditGM;
                     }
-
-                    that.OpCarTouristGuideGroundData.area = carTouristGuideGround.area
+                    
+                    that.OpCarTouristGuideGroundData.area = parseInt(carTouristGuideGround.area)?Number(carTouristGuideGround.area):"";
                     that.OpCarTouristGuideGroundData.serviceCompany = carTouristGuideGround.serviceCompany
                     that.OpCarTouristGuideGroundData.serviceGuide = carTouristGuideGround.serviceGuide
                     that.OpCarTouristGuideGroundData.serviceTel = carTouristGuideGround.serviceTel

+ 56 - 43
src/components/Resource/InvitationOfficialActivityData.vue

@@ -13,7 +13,7 @@
                     <el-autocomplete style="margin-right: 15px;" class="inline-input" v-model="Contact" :fetch-suggestions="querySearchContact"
                         placeholder="联系人" clearable></el-autocomplete>
                     <el-select  v-model="Delegation" clearable filterable placeholder="团组名称" style="width: 20%;margin-right: 15px;">
-                        <el-option v-for="item in restaurantDelegation" :key="item.id" :label="item.groupName"
+                        <el-option v-for="item in restaurantDelegation" :key="item.id" :label="item.teamName"
                             :value="item.id">
                         </el-option>
                     </el-select>
@@ -42,7 +42,7 @@
                 </div>
             </div>
             <template>
-                <el-table :data="tableDatas.slice((currentPage - 1) * pageSize, currentPage * pageSize)" border
+                <el-table :data="tableData" border
                     style="width: 100%;margin-top: 10px;" v-loading="loading" element-loading-text="拼命加载中...">
                     <el-table-column prop="num" label="序 号" width="55">
                         <template slot-scope="scope">
@@ -83,7 +83,7 @@
             <div class="block">
                 <el-pagination align='center' @size-change="handleSizeChange" @current-change="handleCurrentChange"
                     :current-page="currentPage" :page-sizes="[10, 12, 15, 20]" :page-size="pageSize"
-                    layout="total, sizes, prev, pager, next" :total="tableDatas.length">
+                    layout="total, sizes, prev, pager, next" :total="dataCount">
                 </el-pagination>
             </div>
         </div>
@@ -156,10 +156,12 @@ export default {
         handleSizeChange(val) {
             this.currentPage = 1;
             this.pageSize = val;
+            this.QueryInvitationOfficialActivityData()
         },
         //当前页改变时触发 跳转其他页
         handleCurrentChange(val) {
             this.currentPage = val;
+            this.QueryInvitationOfficialActivityData()
         },
 
         //国家搜索框处理
@@ -240,6 +242,51 @@ export default {
         QueryData() {
             this.QueryInvitationOfficialActivityData()
         },
+        //基础数据
+        QueryIOAInitData() {
+            var url = "/api/Resource/QueryIOAInitData"
+            var that = this
+            this.$axios({
+                method: 'post',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer ' + that.token
+                },
+                data: {
+                    PortType: 1
+                }
+            }).then(function (res) {
+                console.log(res)
+                if (res.data.code == 200) {
+                    res.data.data.countryData.forEach(function (item, index) {
+                        that.restaurantsCountry.push({
+                            value: item,
+                        });
+                    });
+                    res.data.data.contactData.forEach(function (item, index) {
+                        that.restaurantContact.push({
+                            value: item,
+                        });
+                    });
+                    res.data.data.inviterData.forEach(function (item, index) {
+                        that.restaurantsUnitName.push({
+                            value: item,
+                        });
+                    });
+                    res.data.data.domainData.forEach(function (item, index) {
+                        that.restaurantField.push({
+                            value: item,
+                        });
+                    });
+                    that.restaurantDelegation=res.data.data.groupNameData;
+                    that.CreateUserList=res.data.data.userNameData;
+                }else{
+                    that.$message.error(res.data.msg);
+                }
+            }).catch(function (error) {
+                that.$message.error(error);
+            });
+        },
         QueryInvitationOfficialActivityData() {
             console.log(this.Delegation)
             var CreateUser = 0;
@@ -266,8 +313,8 @@ export default {
                 },
                 data: {
                     portType: 1,
-                    pageIndex: 0,
-                    pageSize: 0,
+                    pageIndex: that.currentPage,
+                    pageSize: that.pageSize,
                     Country: that.Country,
                     UnitName: that.UnitName,
                     Contact: that.Contact,
@@ -280,51 +327,16 @@ export default {
             }).then(function (res) {
                 console.log(res)
                 if (res.data.code == 200) {
-                    that.tableData = res.data.data;
-                    //#region 国家输入推荐数据
-                    that.tableData.forEach(function (item, index) {
-                        that.restaurantsCountry.push({
-                            value: item.country,
-                        });
-                    });
                     //#endregion
-                    //#region 邀请方输入推荐数据
-                    that.tableData.forEach(function (item, index) {
-                        that.restaurantsUnitName.push({
-                            value: item.unitName,
-                        });
-                    });
-                    //#endregion
-                    //#region 联系人输入推荐数据
-                    that.tableData.forEach(function (item, index) {
-                        that.restaurantContact.push({
-                            value: item.contact,
-                        });
-                    });
-                    //#endregion
-                    //#region 领域输入推荐数据
-                    that.tableData.forEach(function (item, index) {
-                        that.restaurantField.push({
-                            value: item.field,
-                        });
-                    });
-                    //#endregion
-                    that.tableDatas = that.tableData
-                    if (that.tableDatas.slice((that.currentPage - 1) * that.pageSize, that.currentPage * that.pageSize).length == 0) {
-                        if (that.currentPage > 1) {
-                            that.currentPage = that.currentPage - 1;
-                        }
-                    }
-                    if (that.CreateUserId != 0 && that.CreateUserId != "") {
-                        that.dataCount = that.tableDatas.length
-                    }
+                    that.tableData = res.data.data;
+                    that.dataCount=res.data.count;
                 } else {
                     that.tableDatas = [];
                 }
                 that.loading = false
             }).catch(function (error) {
                 that.loading = false
-                that.$message.error("网络错误,请稍后重试");
+                that.$message.error(error);
             });
         },
         QueryCount() {
@@ -483,6 +495,7 @@ export default {
         },
     },
     mounted() {
+        this.QueryIOAInitData();
         this.token = JSON.parse(localStorage.getItem('userinif')).token;
         this.userId = JSON.parse(localStorage.getItem('userinif')).userInfo.userId
         this.QueryInvitationOfficialActivityData();