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

src/App.vue

@@ -45,6 +45,6 @@ export default {
 #app {
   margin: 0px;
   padding: 0px;
-  font-family:arial,"\5B8B\4F53" ;
+  font-family:"微软雅黑";
 }
 </style>

src/components/Finance/Currency.vue

@@ -51,14 +51,14 @@
                             </div>
                         </div>
                     </el-tab-pane>
-                    <el-tab-pane label="行程" name="itinerary">
+                    <!-- <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> -->
                     <el-tab-pane label="车/导游地接" name="guide">
                         <div class="ipt-inif">
                             <div class="ipt" v-for="(item,index) in guideCurrencyArr" :key="index">
@@ -107,14 +107,14 @@
                             </div>
                         </div>
                     </el-tab-pane>
-                    <el-tab-pane label="酒店早餐" name="breakfast">
+                    <!-- <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> -->
                 </el-tabs>
             </div>
         </div>

src/components/Finance/FeesPage.vue

@@ -103,7 +103,7 @@
             </el-table>
         </div>
         <div class="payments">
-            <div class="statistics">该申请团组款项费用统计如下:</div>
+            <div class="statistics">该版块款项费用统计如下：</div>
             <div class="payable"></div>
             <div class="payment"></div>
             <div class="remainder"></div>

src/components/Finance/Sendack.vue

@@ -56,7 +56,8 @@
                     <el-table-column
                         width="120" 
                         prop="price"
-                        label="费用">
+                        label="费用"
+                        :formatter="rounding">
                     </el-table-column>
                     <el-table-column
                         prop="createUserName"
@@ -100,7 +101,7 @@
                       </el-table-column>
                 </el-table>
             </template>
-            <el-dialog width="900px" title="新增数据" :visible.sync="dialogFormVisible">
+            <el-dialog class="sendack-dialog" width="900px" title="新增数据" :visible.sync="dialogFormVisible">
                 <div class="sendack-info">
                     <div class="sendack-info-li">
                         <label>团 号：</label>
@@ -190,7 +191,7 @@ export default {
                 ccpId:0,
                 priceName:'',//费用名称
                 price:0,//费用
-                currencyId:807,//币种Id
+                currencyId:0,//币种Id
                 currencyCode:'',//币种Code
                 payee:'',//收款方
                 payDId:72,//支付方式Id
@@ -252,10 +253,18 @@ export default {
                     that.options=res.data.data.groupNameData;
                     that.value=res.data.data.groupNameData[0].id;
                     that.PostShareGroupInfo();
-                    that.PostPaymentRefundAndOtherMoneyItemByDiId();
-                    that.PostGroupTeamRateByDiIdAndCTableId()
+                    setTimeout(function(){
+                        that.PostPaymentRefundAndOtherMoneyItemByDiId();
+                    },100)
+                    setTimeout(function(){
+                        that.PostGroupTeamRateByDiIdAndCTableId();
+                    },500)
+                    // that.PostGroupTeamRateByDiIdAndCTableId();
+                    // that.PostPaymentRefundAndOtherMoneyItemByDiId();
+                    // setTimeout(that.PostPaymentRefundAndOtherMoneyItemByDiId(),500)
+                    // setTimeout(that.PostGroupTeamRateByDiIdAndCTableId(),10000)
                 }else{
-                    that.$message.error('获取数据源失败！');
+                    that.$message.error(res.data.msg);
                 }
             })
         },
@@ -279,7 +288,7 @@ export default {
                     that.priceTypeDatas=res.data.data.priceTypeDatas;
                     that.orbitalPrivateTransferDatas=res.data.data.orbitalPrivateTransferDatas;
                 }else{
-                    that.$message.error('获取数据源失败！');
+                    that.$message.error(res.data.msg);
                 }
             })
         },
@@ -301,15 +310,20 @@ export default {
                 if(res.data.code==200){
                    that.cTable=res.data.data.cTable
                 }else{
-                    that.$message.error('获取数据源失败！');
+                    that.$message.error(res.data.msg);
                 }
             })
         },
         //获取币种数据源
         PostGroupTeamRateByDiIdAndCTableId(){
-            console.log(this.value)
             var url = "/api/Business/PostGroupTeamRateByDiIdAndCTableId"
             var that = this
+            var data={
+                    portType: 1,
+                    diId: that.value,
+                    cTable:that.cTable
+                }
+                console.log(JSON.stringify(data))
             this.$axios({
                 method: 'post',
                 url: url,
@@ -335,7 +349,7 @@ export default {
                     }
                     that.form.currencyId=res.data.data.teamRates[0].currencyId
                 }else{
-                    that.$message.error('获取数据源失败！');
+                    that.$message.error(res.data.msg);
                 }
             })
         },
@@ -358,7 +372,7 @@ export default {
                 if(res.data.code==200){
                     that.groupInfo=res.data.data;
                 }else{
-                    that.$message.error('获取数据源失败！');
+                    that.$message.error(res.data.msg);
                 }
             })
         },
@@ -366,6 +380,13 @@ export default {
         PostPaymentRefundAndOtherMoneyItemByDiId(){
             var url = "/api/Financial/PostPaymentRefundAndOtherMoneyItemByDiId"
             var that = this
+            var data={
+                    portType:1,
+                    userId:that.userid,
+                    pageId:that.pageId,
+                    diId: that.value
+                }
+                console.log(JSON.stringify(data))
             this.$axios({
                 method: 'post',
                 url: url,
@@ -384,7 +405,7 @@ export default {
                     that.groupsendData=res.data.data.data;
                     that.addAuth=res.data.data.pageFuncAuth.addAuth;
                 }else{
-                    that.$message.error('获取数据源失败！');
+                    that.$message.error(res.data.msg);
                 }
             })
         },
@@ -495,7 +516,7 @@ export default {
                 ccpId:0,
                 priceName:'',//费用名称
                 price:0,//费用
-                currencyId:807,//币种Id
+                currencyId:0,//币种Id
                 currencyCode:'',//币种Code
                 payee:'',//收款方
                 payDId:72,//支付方式Id
@@ -537,6 +558,11 @@ export default {
                 }
             })
         },
+        //表格保留两位小数
+        rounding(row,column) {
+            return parseFloat(row[column.property]).toFixed(2)
+        },
+
         //删除
         Delete(index,row){
             this.$confirm('此操作将删除此条数据，是否确认删除?', '提示', {
@@ -587,7 +613,7 @@ export default {
                 ccpId:0,
                 priceName:'',//费用名称
                 price:0,//费用
-                currencyId:807,//币种Id
+                currencyId:0,//币种Id
                 currencyCode:'',//币种Code
                 payee:'',//收款方
                 payDId:72,//支付方式Id
@@ -623,6 +649,7 @@ export default {
         console.log(this.pageId)
         this.PostPageLinkCTable();
         this.GetForeignReceivablesDataSources();
+        // setTimeout(this.PostPaymentRefundAndOtherMoneyInfoDataSource(),500)
         this.PostPaymentRefundAndOtherMoneyInfoDataSource();
         // setTimeout(this.PostGroupTeamRateByDiIdAndCTableId(), 3000);
         // this.PostGroupTeamRateByDiIdAndCTableId();
@@ -676,7 +703,7 @@ export default {
 .sendack-all .fyjeinput input{
     width: 100%;
 }
-.sendack-all .fyjeselect{
+.sendack-all .sendack-dialog .fyjeselect{
     width: 148px;
 }
 .sendack-all .fyjeselect input{
@@ -693,4 +720,7 @@ export default {
 .el-dialog__body .sendack-info-li{
     margin-bottom: 10px;
 }
+.sendack-dialog .el-select{
+    width: 300px;
+}
 </style>

src/components/Login.vue

@@ -18,10 +18,10 @@
                 <div class="login-title">泛美国际 - AI智能办公系统</div>
                 <div class="login-input">
                     <el-input @keyup.enter.native="Login()" class="accounts" placeholder="请输入您的账户" v-model="usernum">
-                        <i slot="prefix" class="el-input__icon icon-zhanghu"></i>
+                        <i slot="prefix" class="iconfont el-input__icon icon-zhanghu"></i>
                     </el-input>
                     <el-input @keyup.enter.native="Login()" class="passwords" placeholder="请输入您的密码" show-password v-model="password">
-                        <i slot="prefix" class="el-input__icon icon-mima"></i>
+                        <i slot="prefix" class="iconfont el-input__icon icon-mima"></i>
                     </el-input>
                     <div class="el-input remembers">
                         <div class="el-input-box">

src/components/MCR/MarketCustomerResourcesHome.vue

@@ -353,7 +353,6 @@ body {
     padding: 0;
 }
 
-.mcr-head {}
 
 .mcr-box {
     background-color: #fff;

src/components/OP/CarTouristGuideGrounContent.vue

@@ -53,15 +53,26 @@
                                 <span style="display: none;">{{ scope.row.sId }}</span>{{ scope.row.sIdName }}
                             </template>
                         </el-table-column>
+                        <el-table-column prop="SIdName" label="日期" width="160">
+                            <template slot-scope="scope">
+                                <el-date-picker
+                                style="width: 100%;"
+                                v-model="scope.row.price"
+                                type="date"
+                                :picker-options="startPickerOptions"
+                                placeholder="选择日期">
+                                </el-date-picker>
+                            </template>
+                        </el-table-column>
                         <el-table-column label="金额/币种" width="400">
                             <template slot-scope="scope">
                                 <div class="el-input-number-style pice-ys">
-                                    <el-input-number placeholder="请输入金额" v-model="scope.row.price" :controls="false"
+                                    <el-input-number size="small" placeholder="请输入金额" v-model="scope.row.price" :controls="false"
                                         @change="PriceChange"></el-input-number>
 
                                     <!-- <el-input placeholder="请输入金额" v-model="scope.row.price" clearable style="width:180px;"
                                     @change="PriceChange" /> -->
-                                    <el-select v-model="currency" placeholder="币种选择" clearable filterable
+                                    <el-select size="small" v-model="currency" placeholder="币种选择" clearable filterable
                                         style="width:120px" :disabled="true">
                                         <el-option v-for="item in currencyList" :key="item.currencyId" :label="item.currencyCode"
                                             :value="item.currencyId">
@@ -70,6 +81,12 @@
                                 </div>
                             </template>
                         </el-table-column>
+                        <el-table-column label="单位" width="100">
+                            <template slot-scope="scope">
+                                    <el-input size="small" style="width: 100%;" placeholder="请输入金额" v-model="scope.row.price"
+                                        @change="PriceChange"></el-input>
+                            </template>
+                        </el-table-column>
                         <el-table-column label="费用明细">
                             <template slot-scope="scope">
                                 <el-input type="textarea" :rows="1" placeholder="费用明细"
@@ -156,6 +173,17 @@ import { dE } from '@fullcalendar/core/internal-common'
 export default {
     data() {
         return {
+            //限制时间
+            startDate:'',//时间
+            minTime:1618891200000,//时间戳，对应时间为：'2021-04-20 12:00:00'
+            maxTime:1619323200000,//时间戳，对应时间为：'2021-04-25 12:00:00'
+            startPickerOptions:{
+                disabledDate: (time) => {
+                    //小于最小时间或者大于最大时间都不可选
+                    return time.getTime() < this.minTime-24*3600000|| time.getTime() > this.maxTime;
+                }
+            },
+
             pageId:'',
             token: '',
             cTable:'',
@@ -216,6 +244,7 @@ export default {
                 }
             }).then(function (res) {
                 if (res.data.code == 200) {
+                    console.log(res)
                     that.delegationInfoList = res.data.data.delegations;
                     for (let index = 0; index < that.delegationInfoList.length; index++) {
                         if (that.delegationInfoList[index].id == that.diId) {

src/components/OP/EntryDetails.vue

@@ -118,7 +118,7 @@
                     <div class="Entry-li-inif">
                         <div v-for="(item,index) in currencys" :key="index" class="Entry-inif-box">
                             <label>{{item.currencyName}}汇率:</label>
-                            <el-input-number size="mini"  :controls="false" :precision="2" v-model="item.rate"></el-input-number>
+                            <el-input-number size="mini"  :controls="false" :precision="4" v-model="item.rate"></el-input-number>
                         </div>
                     </div>
                 </div>
@@ -497,6 +497,7 @@ export default {
             Visafees:'',
             Visadepicted:'',
             currencys: [],
+            currencyss: [],
             DomesticFees:{
                 visafees:'',//签证费
                 visafeesDescription:'',//签证费用描述
@@ -598,6 +599,7 @@ export default {
                 console.log(res)
                 if(res.data.code==200){
                     that.options=res.data.data.groupNameData;
+                    that.currencys=res.data.data.currencyInit;
                     that.value=res.data.data.groupNameData[0].id;
                     that.placeinif=res.data.data.nationalTravelFeeData;
                     that.GetEnterExitCostInfobyDiId()
@@ -633,7 +635,7 @@ export default {
         },
         GetEnterExitCostInfobyDiId(){
             //初始化数据
-            this.currencys=[]
+            // this.currencys=[]
             this.DomesticFees={
                 visafees:'',//签证费
                 visafeesDescription:'',//签证费用描述
@@ -863,7 +865,7 @@ export default {
                     diId:this.value,
                     type:1,
                     days:this.quarterageData.length!=0?(this.quarterageData[this.quarterageData.length-1].days)+1:1,
-                    nationalTravelFeeId:0,
+                    nationalTravelFeeId:'',
                     cost:0,
                     currency:0,
                     subTotal:0,
@@ -876,7 +878,7 @@ export default {
                     diId:this.value,
                     type:2,
                     days:this.boardWagesData.length!=0?(this.boardWagesData[this.boardWagesData.length-1].days)+1:1,
-                    nationalTravelFeeId:0,
+                    nationalTravelFeeId:'',
                     cost:0,
                     currency:0,
                     subTotal:0,
@@ -889,7 +891,7 @@ export default {
                     diId:this.value,
                     type:3,
                     days:this.miscellaneousFeeData.length!=0?(this.miscellaneousFeeData[this.miscellaneousFeeData.length-1].days)+1:1,
-                    nationalTravelFeeId:0,
+                    nationalTravelFeeId:'',
                     cost:0,
                     currency:0,
                     subTotal:0,
@@ -903,7 +905,7 @@ export default {
                     diId:this.value,
                     type:4,
                     days:this.trainingExpenseData.length!=0?(this.trainingExpenseData[this.trainingExpenseData.length-1].days)+1:1,
-                    nationalTravelFeeId:0,
+                    nationalTravelFeeId:'',
                     cost:0,
                     currency:0,
                     subTotal:0,
@@ -991,6 +993,7 @@ export default {
                     id: that.storageid,
                     diId: that.value,
                     choiceOne: that.choiceOne?1:0,
+                    insidePay:0,
                     visa: that.DomesticFees.visafees,
                     visaRemark: that.DomesticFees.visafeesDescription,
                     yiMiao: that.DomesticFees.vaccinefees,
@@ -1033,6 +1036,7 @@ export default {
                     id: that.storageid,
                     diId: that.value,
                     choiceOne: that.choiceOne?1:0,
+                    insidePay:0,
                     visa: that.DomesticFees.visafees,
                     visaRemark: that.DomesticFees.visafeesDescription,
                     yiMiao: that.DomesticFees.vaccinefees,
@@ -1063,9 +1067,17 @@ export default {
             }).then(function (res) {
                 if(res.data.code==200){
                     console.log(res)
+                    that.$message({
+                        type: 'success',
+                        message: res.data.msg
+                    });
                     that.GetEnterExitCostInfobyDiId()
+                }else{
+                    that.$message.error(res.data.msg);
                 }
-            })
+            }).catch(function (error) {
+                that.$message.error(error.message);
+            });
         },
         //选择团组名称调用
         chengvalue(){
@@ -1170,7 +1182,7 @@ export default {
         this.userId=JSON.parse(localStorage.getItem('userinif')).userInfo.userId;
         this.GetEnterExitCostDataSource();
         this.GetNationalTravelFeeData();
-
+        console.log(this.currencys)
     }
 }
 </script>

src/components/OP/Groupedit.vue

@@ -28,10 +28,25 @@
                         <el-input el-input v-model="ruleForm.groupname"></el-input>
                     </el-form-item>
                     <el-form-item label-width="120px" label="客户名称:" prop="customername">
-                        <el-input el-input v-model="ruleForm.customername"></el-input>
+                        <el-autocomplete
+                        style="width: 100%;"
+                        class="inline-input"
+                        v-model="ruleForm.customername"
+                        :fetch-suggestions="querySearch"
+                        placeholder="请输入内容"
+                        @select="handleSelect"
+                        ></el-autocomplete>
+                        <!-- <el-input el-input v-model="ruleForm.customername"></el-input> -->
                     </el-form-item>
                     <el-form-item label-width="120px" label="客户单位:" prop="customerunits">
-                        <el-input el-input v-model="ruleForm.customerunits"></el-input>
+                        <el-autocomplete
+                        style="width: 100%;"
+                        class="inline-input"
+                        v-model="ruleForm.customerunits"
+                        :fetch-suggestions="querySearchdw"
+                        placeholder="请输入内容"
+                        ></el-autocomplete>
+                        <!-- <el-input el-input v-model="ruleForm.customerunits"></el-input> -->
                     </el-form-item>
                     <el-form-item label-width="120px" label="出访国家:" prop="countriesvisited">
                         <el-input el-input v-model="ruleForm.countriesvisited"></el-input>
@@ -62,7 +77,7 @@
                         style="margin-bottom: 22px;display: inline-block;color: #606266;font-size: 14px;">（预付款,请输入RMB）</span>
                 </div>
                 <div style="display: flex;align-items: center;">
-                    <el-form-item label-width="120px" label="OP提成等级" prop="opRoyaltyLv">
+                    <el-form-item style="width:16%" label-width="120px" label="OP提成等级" prop="opRoyaltyLv">
                         <el-select @change="commissionlevel" v-model="ruleForm.opRoyaltyLv" placeholder="OP提成等级" clearable filterable
                             style="width: 100%;">
                             <el-option v-for="item in opRoyaltyLvList" :key="item.id" :label="item.name + '元'"
@@ -112,11 +127,14 @@
                     <el-form-item label-width="120px" label="备注:">
                         <el-input type="textarea" v-model="ruleForm.remark"></el-input>
                     </el-form-item>
+                    <el-form-item label-width="120px" label="微信号:">
+                        <el-input type="textarea" v-model="ruleForm.Wechat"></el-input>
+                    </el-form-item>
                     <el-form-item label-width="120px" label="手机号:">
                         <el-input type="textarea" v-model="ruleForm.phonenumber"></el-input>
                     </el-form-item>
                 </el-form>
-                <el-form-item>
+                <el-form-item style="text-align: right;">
                     <el-button type="primary" @click="submitForm('ruleForm')">确 定</el-button>
                     <el-button @click="resetForm('ruleForm')">重 置</el-button>
                     <el-button @click="clickback()">返 回</el-button>
@@ -160,14 +178,14 @@
 import { el } from '@fullcalendar/core/internal-common';
 import { all } from 'q';
 export default {
-    beforeRouteLeave(to, from, next) {
-        console.log(to);
-        console.log(from);
-        if(to.name=='OPgroup'){
-            to.meta.keepAlive = true;
-        }
-        next()
-    },
+    // beforeRouteLeave(to, from, next) {
+    //     console.log(to);
+    //     console.log(from);
+    //     if(to.name=='OPgroup'){
+    //         to.meta.keepAlive = true;
+    //     }
+    //     next()
+    // },
     data() {
         return {
             editid: '',
@@ -195,6 +213,7 @@ export default {
                 censorshipdepartment: '',
                 remark: '',
                 phonenumber: '',
+                Wechat: '',
                 OP: '',
                 grades: '',
                 person: '',
@@ -212,10 +231,10 @@ export default {
                     { required: true, message: '请输入团组名称', trigger: 'blur' },
                 ],
                 customername: [
-                    { required: true, message: '请输入客户名称', trigger: 'blur' },
+                    { required: true, message: '请输入客户名称', trigger: 'change' },
                 ],
                 customerunits: [
-                    { required: true, message: '请输入客户单位', trigger: 'blur' },
+                    { required: true, message: '请输入客户单位', trigger: 'change' },
                 ],
                 countriesvisited: [
                     { required: true, message: '请输入出访国家', trigger: 'blur' },
@@ -261,9 +280,29 @@ export default {
             fullscreenLoading: false,
             dialogVisible: false,
             opRoyaltyLvList: [],
+            restaurants: [],
+            restaurantss:[],
+            customerunitslist:[],
         };
     },
     methods: {
+        querySearch(queryString, cb) {
+            var restaurants = this.restaurants;
+            var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants;
+            // 调用 callback 返回建议列表的数据
+            cb(results);
+        },
+        querySearchdw(queryString, cb) {
+            var restaurants = this.customerunitslist;
+            var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants;
+            // 调用 callback 返回建议列表的数据
+            cb(results);
+        },
+        createFilter(queryString) {
+            return (restaurant) => {
+                return restaurant.value.replace("  ", "").toLowerCase().match(queryString.toLowerCase());
+            };
+        },
         submitForm(formName) {
             this.$refs[formName].validate((valid) => {
                 if (valid) {
@@ -298,6 +337,18 @@ export default {
                 }
             }).then(function (res) {
                 if (res.data.code == 200) {
+                    console.log(res)
+                    that.restaurantss=res.data.data.clientData;
+                    that.restaurants= that.restaurantss.map((terminal) => {
+                        return {
+                            value: terminal.contact +'  '+ terminal.client +'  '+terminal.telephone+'  '+terminal.wechat,
+                        };
+                    });
+                    that.customerunitslist= that.restaurantss.map((terminal) => {
+                        return {
+                            value:terminal.client,
+                        };
+                    });
                     that.personarr = res.data.data.userData;
                     that.gradearr = res.data.data.teamLevData;
                     that.OPtype = res.data.data.teamTypeData;
@@ -316,7 +367,6 @@ export default {
                 }
             }).then(function (res) {
                 if (res.data.code == 200) {
-                    console.log(res)
                     that.opRoyaltyLvList = res.data.data;
                 }
             })
@@ -407,6 +457,7 @@ export default {
                         that.ruleForm.censorshipdepartment = datagroup.zzscbmmc;
                         that.ruleForm.approvalnumber2 = datagroup.zzscspwh;
                         that.ruleForm.remark = datagroup.remark;
+                        that.ruleForm.Wechat = datagroup.weChatNo;
                         that.ruleForm.phonenumber = datagroup.tellPhone;
                         that.ruleForm.OP = datagroup.teamDid;
                         that.ruleForm.grades = datagroup.teamLevSId;
@@ -462,6 +513,7 @@ export default {
                     zzscbmmc: that.ruleForm.censorshipdepartment,
                     zzscspwh: that.ruleForm.approvalnumber2,
                     tellPhone: that.ruleForm.phonenumber,
+                    weChatNo:that.ruleForm.Wechat,
                     remark: that.ruleForm.remark,
                     opRoyaltyLv: that.ruleForm.opRoyaltyLv,
                     opRoyaltyRemark: that.ruleForm.opRoyaltyRemark,
@@ -485,11 +537,17 @@ export default {
                     that.fullscreenLoading = false;
                 }
             })
+        },
+        handleSelect(item) {
+            // console.log(item.split(' '));
+            console.log(item.value.split('  '));
+            this.ruleForm.customername=item.value.split('  ')[0];
+            this.ruleForm.customerunits=item.value.split('  ')[1];
+            this.ruleForm.phonenumber=item.value.split('  ')[2];
+            this.ruleForm.Wechat=item.value.split('  ')[3];
         }
     },
     beforeRouteEnter(to, from, next) {
-        console.log(to)
-        console.log(from)
         next();
     },
     mounted() {

src/components/OP/OPgroup.vue

@@ -131,14 +131,14 @@
 </template>
 <script>
 export default {
-    beforeRouteLeave(to, from, next) {
-        console.log(to);
-        console.log(from);
-        if(to.name!='Groupedit'){
-            from.meta.keepAlive = false;
-        }
-        next()
-    },
+    // beforeRouteLeave(to, from, next) {
+    //     console.log(to);
+    //     console.log(from);
+    //     if(to.name!='Groupedit'){
+    //         from.meta.keepAlive = false;
+    //     }
+    //     next()
+    // },
     data() {
         return {
             options: [

src/components/OP/PickupList.vue

@@ -1270,7 +1270,7 @@ export default {
                                     lastName:dataarr[i].lastName,
                                     firstName:dataarr[i].firstName,
                                     pinyin:'',
-                                    sex:dataarr[i].sex,
+                                    sex:dataarr[i].sex==0?'男':'女',
                                     companyFullName:dataarr[i].companyFullName,
                                     job:dataarr[i].job,
                                     idCardNo:dataarr[i].iDcard,
@@ -1286,9 +1286,7 @@ export default {
                             // that.tourClientListInfos[i]=dataarrnew[i]
                         }
                         that.tourClientListInfos=dataarrnew
-                        console.log(10-dataarrnew.length)
                         var len = 10 - dataarrnew.length
-                        console.log(len)
                         for(var jk=0;jk<len;jk++){
                             that.tourClientListInfos.push(
                                 {
@@ -1309,6 +1307,7 @@ export default {
                                 }
                             )
                         }
+                        console.log(that.tourClientListInfos)
                         that.$message({
                             type: 'success',
                             message: res.data.msg,

src/components/OP/VisaPriec.vue

@@ -23,7 +23,7 @@
                                 @click="QueryByVisaClient">查询</el-button>
                         </div>
                     </div>
-                    <div style="width: 20%">
+                    <div style="width: 20%;text-align: right;">
                         <el-button type="primary" style="" @click="addIf">新增</el-button>
                     </div>
                 </div>

src/components/OP/visaEdit.vue

@@ -118,7 +118,7 @@
                         <el-date-picker v-model="item.expiryDt" type="date" placeholder="身份证有效期">
                         </el-date-picker>
                     </el-form-item>
-                    <div style="margin-top: 40px;,margin-left: 40px;">
+                    <div style="margin-top: 40px;margin-left: 40px;">
                         <el-button circle icon="el-icon-minus" @click="subcustomerCertsAdd(i, item.id)"
                             v-if="i >= 0"></el-button>
                     </div>
@@ -1126,7 +1126,7 @@ export default {
 
                 }
             }).catch(function (error) {
-                that.$message.error("网络错误，请稍后重试");
+                that.$message.error("获取签证客户公司列表失败！");
             });
         },
         companyChange(Id) {

src/components/child/Aideindex.vue

@@ -22,7 +22,7 @@
                                 v-model="input"
                                 clearable>
                             </el-input>
-                            <el-button type="primary"><i class="icon-sousuo"></i></el-button>
+                            <el-button type="primary"><i class="iconfont icon-sousuo"></i></el-button>
                         </div>
                     </div>
                     <template>

src/components/child/Generalindex.vue

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <div class="num-ul">
+        <!-- <div class="num-ul">
             <div class="num-li">
                 <div class="num-tlite">
                     <div>2442</div>
@@ -41,7 +41,7 @@
                     <i class="iconfont icon-tongjitu"></i>
                 </div>
             </div>
-        </div>
+        </div> -->
         <div class="tabular-all">
             <div class="list-groups">
                 <div class="groups-list">
@@ -99,7 +99,7 @@
                     </div>
                 </div>
                 <div class="sources-ul">
-                    <div class="sources-li">
+                    <div class="sources-li" @click="shortcutlink('/MCR')">
                         <div class="sources-tlite">
                             <p>市场客户资源</p>
                         </div>
@@ -107,7 +107,7 @@
                             <i class="iconfont icon-shichangbu"></i>
                         </div>
                     </div>
-                    <div class="sources-li">
+                    <div class="sources-li" @click="shortcutlink('/LocalGuide')">
                         <div class="sources-tlite">
                             <p>车导地接资源</p>
                         </div>
@@ -115,7 +115,7 @@
                             <i class="iconfont icon-dijie"></i>
                         </div>
                     </div>
-                    <div class="sources-li">
+                    <div class="sources-li" @click="shortcutlink('/DeleClient')">
                         <div class="sources-tlite">
                             <p>策划活动资源</p>
                         </div>
@@ -350,6 +350,11 @@ export default {
         handleDateClick(inif){
             // console.log(info)
         },
+        //快捷跳转
+        shortcutlink(val){
+            this.$router.push({ path: "/home" + val });
+        },
+
         Grouplist(){
             var url="/api/Groups/GetGroupList"
             var that=this
@@ -537,6 +542,7 @@ export default {
         justify-content: space-between;
     }
     .sources-li{
+        cursor: pointer;
         width: 30%;
         display: flex;
         justify-content: space-between;

src/components/child/index.vue

@@ -6,7 +6,7 @@
                 <div class="communal-box">
                     <el-input @input="Inquireclick()" placeholder="请输入内容" v-model="input" clearable>
                     </el-input>
-                    <el-button @click="Inquireclick()" type="primary"><i class="icon-sousuo"></i></el-button>
+                    <el-button @click="Inquireclick()" type="primary"><i class="iconfont icon-sousuo"></i></el-button>
                 </div>
             </div>
             <template>

src/components/home.vue

@@ -122,7 +122,7 @@
       </el-dialog>
     </div>
     <el-container class="all">
-      <el-aside class="delwh menubar">
+      <el-aside ref="haeds" class="delwh menubar">
         <div class="user">
           <div class="user-box">
             <div class="user-img">
@@ -133,7 +133,7 @@
             </div>
           </div>
         </div>
-        <div class="avatar-box">
+        <div ref="avatarhaeds" class="avatar-box">
           <div class="nei-avatar">
             <div class="avatar">
               <div class="avatar-img">
@@ -147,7 +147,7 @@
             </div>
           </div>
         </div>
-        <el-menu :default-active="indexs" class="el-menu-vertical-demo" @open="handleOpen" @close="handleClose"
+        <el-menu :default-active="indexs" class="el-menu-vertical-demo meun-ul" @open="handleOpen" @close="handleClose"
           :collapse="isCollapse">
           <el-menu-item v-for="(item, filindex) in filmenuList" :key="filindex + '/'"
             :index="item.modulid + '-' + item.pageList[0].pageid" @click="toURLs($event.index, item)">
@@ -373,6 +373,7 @@ export default {
       document.querySelector(".menubar").style.height = window.innerHeight + "px";
       document.querySelector(".all").style.height = window.innerHeight + "px";
       document.querySelector(".delwh").style.width = "";
+      console.log(this.$refs.haeds)
     },
     toURLs(val, item) {
       console.log(val)
@@ -578,8 +579,8 @@ export default {
             }
         }).then(function (res) {
             if(res.data.code==200){
-              that.unReadCount=res.data.data.unreadCount
-              if(that.unReadCount!=JSON.parse(localStorage.getItem('unReadCount'))){
+              that.unReadCount=res.data.data;
+              if(that.unReadCount!=localStorage.getItem('unReadCount')){
                 that.PotsMsgTypeData();
                 window.localStorage.removeItem('unReadCount');
                 localStorage.setItem('unReadCount', JSON.stringify(that.unReadCount));
@@ -786,10 +787,10 @@ export default {
 </script>
 <style>
 *{
-  font-family: arial,"\5B8B\4F53";
+  font-family:"微软雅黑";
 }
 .all-box{
-  font-family: arial,"\5B8B\4F53";
+  font-family:"微软雅黑";
 }
 .el-menu .el-menu-item.is-active {
   color: #fff;

src/router/index.js

@@ -184,18 +184,18 @@ export default new Router({
           path: '/home/Groupedit',
           name: 'Groupedit',
           component: Groupedit,
-          meta: {
-            keepAlive: false, //此组件需要被缓存
-            isBack:false, //用于判断上一个页面是哪个
-          }
+          // meta: {
+          //   keepAlive: false, //此组件需要被缓存
+          //   isBack:false, //用于判断上一个页面是哪个
+          // }
         }, {
           path: '/home/OPgroup',
           name: 'OPgroup',
           component: OPgroup,
-          meta: {
-            keepAlive: true, //此组件需要被缓存
-            isBack:false, //用于判断上一个页面是哪个
-          }
+          // meta: {
+          //   keepAlive: true, //此组件需要被缓存
+          //   isBack:false, //用于判断上一个页面是哪个
+          // }
         }, {
           path: '/home/Tourguide',
           name: 'Tourguide',