06241554lhjqzfybz

src/components/MCR/DownloadOpitinerary.vue

@@ -3,8 +3,8 @@
         <div class="DownloadOpitinerary-search-head">
             <el-form label-width="75px">
                 <el-form-item label="国家:">
-                    <el-select filterable v-model="companyname" placeholder="请选择国家">
-                        <el-option v-for="(item,index) in companynamearr" :key="index" :label="item.name" :value="item.id"></el-option>
+                    <el-select filterable v-model="countryData" placeholder="请选择国家">
+                        <el-option v-for="(item,index) in countryDatas" :key="index" :label="item" :value="item"></el-option>
                     </el-select>
                 </el-form-item>
             </el-form>
@@ -17,8 +17,8 @@
             </el-form>
             <el-form label-width="75px">
                 <el-form-item label="团组名:">
-                    <el-select filterable v-model="companyname" placeholder="请选择团组名">
-                        <el-option v-for="(item,index) in companynamearr" :key="index" :label="item.year" :value="item.year"></el-option>
+                    <el-select filterable v-model="teamNameData" placeholder="请选择团组名">
+                        <el-option v-for="(item,index) in teamNameDatas" :key="index" :label="item" :value="item"></el-option>
                     </el-select>
                 </el-form-item>
             </el-form>
@@ -31,20 +31,77 @@
                 :data="tableData"
                 border
                 style="width: 100%">
-                <el-table-column
-                prop="date"
-                label="日期"
-                width="180">
-                </el-table-column>
-                <el-table-column
-                prop="name"
-                label="姓名"
-                width="180">
-                </el-table-column>
-                <el-table-column
-                prop="address"
-                label="地址">
-                </el-table-column>
+                    <!-- <el-table-column
+                        prop="num"
+                        label="序 号"
+                        width="55">
+                        <template slot-scope="scope">
+                            {{(currentPage - 1) * pageSize + scope.$index + 1}}
+                        </template>
+                    </el-table-column> -->
+                    <el-table-column
+                        prop="teamLev"
+                        label="级 别"
+                        width="70">
+                        <template slot-scope="scope">
+                            {{ scope.row.teamLev=='暂未定级'?'-':scope.row.teamLev }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                        prop="tourCode"
+                        width="100"
+                        label="团 号">
+                    </el-table-column>
+                    <el-table-column
+                        prop="teamType"
+                        label="团组类型"
+                        width="110">
+                    </el-table-column>
+                    
+                    <el-table-column
+                        prop="teamName"
+                        label="团队名称"
+                        >
+                    </el-table-column>
+                    <el-table-column
+                        prop="clientName"
+                        label="客户名称"
+                        width="100">
+                    </el-table-column>
+                    <el-table-column
+                        prop="clientUnit"
+                        label="客户单位">
+                    </el-table-column>
+                    <el-table-column
+                        prop="visitDate"
+                        :formatter="filteryear"
+                        label="出访时间"
+                        width="110">
+                    </el-table-column>
+                    <el-table-column
+                        prop="visitDays"
+                        label="天数"
+                        width="50">
+                    </el-table-column>
+                    <el-table-column
+                        prop="visitPNumber"
+                        label="人数"
+                        width="50">
+                    </el-table-column>
+                    <el-table-column
+                        prop="jietuanOperator"
+                        label="接团操作人"
+                        width="110">
+                    </el-table-column>
+                    <el-table-column label="操作"  width="200">
+                        <template slot-scope="scope">
+                            <el-button
+                            size="mini"
+                            title="下载OP行程单"
+                            type="primary"
+                            @click="handleEdit(scope.$index, scope.row)">下载OP行程单</el-button>
+                        </template>
+                    </el-table-column>
             </el-table>
             <div class="block">
                 <el-pagination
@@ -64,60 +121,15 @@
 export default {
     data () {
         return {
+            userId:'',
             companyname:'',
             companynamearr:[],
+            countryData:'',
+            countryDatas:[],
+            teamNameData:'',
+            teamNameDatas:[],
             currentPage4: 4,
-            tableData: [
-                {
-                date: '2016-05-02',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1518 弄'
-                }, {
-                date: '2016-05-04',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1517 弄'
-                }, {
-                date: '2016-05-01',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1519 弄'
-                }, {
-                date: '2016-05-03',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1516 弄'
-                },{
-                date: '2016-05-02',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1518 弄'
-                }, {
-                date: '2016-05-04',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1517 弄'
-                }, {
-                date: '2016-05-01',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1519 弄'
-                }, {
-                date: '2016-05-03',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1516 弄'
-                },{
-                date: '2016-05-01',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1519 弄'
-                }, {
-                date: '2016-05-03',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1516 弄'
-                },{
-                date: '2016-05-01',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1519 弄'
-                }, {
-                date: '2016-05-03',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1516 弄'
-                },
-            ]
+            tableData: [],
         }
     },
     methods: {
@@ -126,8 +138,72 @@ export default {
         },
         handleCurrentChange(val) {
             console.log(`当前页: ${val}`);
-        }
+        },
+        //获取下拉框
+        PostMateOpGroupInit() {
+            var url = "/api/Groups/PostMateOpGroupInit"
+            var that = this
+            this.$axios({
+                method: 'post',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer '
+                }
+            }).then(function (res) {
+                if (res.data.code == 200) {
+                    that.countryDatas=res.data.data.countryDatas;
+                    that.teamNameDatas=res.data.data.teamNameDatas;
+                }else{
+                    that.$message({
+                        message:res.data.msg,
+                        duration:1000,
+                        type:"error"
+                    });
+                }
+            }).catch(function (error) {
+                that.$message.error('请联系信息部！');
+            });
+        },
+        //获取表格
+        PostMateOpGroupPageList() {
+            var url = "/api/Groups/PostMateOpGroupPageList"
+            var that = this
+            this.$axios({
+                method: 'post',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer '
+                },
+                data:{
+                    portType:1,
+                    userId:that.userId,
+                    pageId:183,
+                    pageIndex:1,
+                    pageSize:10,
+                    country:'',
+                    area:'',
+                    teamName:''
+                }
+            }).then(function (res) {
+                if (res.data.code == 200) {
+                    that.tableData=res.data.data
+                }else{
+                    that.$message({
+                        message:res.data.msg,
+                        duration:1000,
+                        type:"error"
+                    });
+                }
+            }).catch(function (error) {
+                that.$message.error('请联系信息部！');
+            });
+        },
     },
+    mounted(){
+        this.userId = JSON.parse(localStorage.getItem('userinif')).userInfo.userId;
+        this.PostMateOpGroupInit();
+        this.PostMateOpGroupPageList();
+    }
 }
 </script>
 <style>

src/components/Resource/CountryFeeCost.vue

@@ -2,7 +2,7 @@
     <div>
         <div class="communal-list">
             <div class="communal-title">
-                <div>签证费用</div>
+                <div>签证费用标准</div>
                 <div class="communal-box">
                     <el-input @input="Inquireclick()" placeholder="国家" v-model="input" clearable style="width: 350px;">
                     </el-input>
@@ -24,29 +24,37 @@
                     </el-table-column>
                     <el-table-column prop="visaCountry" label="国家" width="150">
                     </el-table-column>
-                    <el-table-column prop="isVisaExemption" label="是否对美免签">
+                    <el-table-column prop="isVisaExemption" label="是否免签" width="80">
                         <template slot-scope="is">
                             <span v-if="is.row.isVisaExemption == 1">否</span>
                             <span v-else>是</span>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="isVisaOnArrival" label="是否落地签">
+                    <el-table-column prop="isVisaOnArrival" label="是否落地签" width="80">
                         <template slot-scope="is">
                             <span v-if="is.row.isVisaOnArrival == 1">否</span>
                             <span v-else>是</span>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="isElectronicSignature" label="是否电子签">
+                    <el-table-column prop="isElectronicSignature" label="是否电子签" width="80">
                         <template slot-scope="is">
                             <span v-if="is.row.isElectronicSignature == 1">否</span>
                             <span v-else>是</span>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="visaTime" label="一般签证时间(天)">
+                    <el-table-column prop="visaTime" label="一般签证时间(天)" width="100">
+                    </el-table-column>
+                    <el-table-column prop="grandBusinessAgencyFee" label="大公务代办费(元)" :formatter="rounding">
+                    </el-table-column>
+                    <el-table-column prop="pettyBusinessAgencyFee" label="小公务代办费(元)" :formatter="rounding">
+                    </el-table-column>
+                    <el-table-column prop="urgentTime" label="加急签证时间(天)">
+                    </el-table-column>
+                    <el-table-column prop="urgentPrice" label="加急签证费用(元)" :formatter="rounding">
                     </el-table-column>
                     <el-table-column prop="visaPrice" label="费用(元)" :formatter="rounding">
                     </el-table-column>
-                    <el-table-column prop="visaPriceDesc" label="费用描述">
+                    <el-table-column prop="visaPriceDesc" label="费用描述" width="110">
                         <template slot-scope="visaPriceDesc">
                             <el-popover placement="top-start" title="费用描述" trigger="hover" width="200"
                                 :content="visaPriceDesc.row.visaPriceDesc">
@@ -74,7 +82,7 @@
                             </el-popover>
                         </template>
                     </el-table-column> -->
-                    <el-table-column label="操作">
+                    <el-table-column label="操作" width="160">
                         <template slot-scope="scope">
                             <el-button size="mini" @click="upDate(scope.$index, scope.row)">编辑</el-button>
                             <el-button size="mini" type="danger" @click="del(scope.$index, scope.row)">删除</el-button>

src/components/Resource/CountryFeeCostOperation.vue

@@ -268,7 +268,6 @@ export default {
             that.addData.CreateUserId = that.userId
             that.$refs.addData.validate((valid) => {
                 if (valid) {
-
                     console.log(that.addData)
                     var url = "/api/Resource/OperationCountryFeeCost"
                     that.$axios({
@@ -303,11 +302,12 @@ export default {
         upData() {
             for (var i = 0; i < this.tableData.length; i++) {
                 if (this.tableData[i].id == parseInt(this.addData.Id)) {
-
+                    
                     this.CountryFeeCostData = this.tableData[i];
                     break;
                 }
             }
+            console.log(this.CountryFeeCostData);
             this.addData.Status = 2;
             this.addData.Id = this.CountryFeeCostData.id;
             this.addData.VisaContinent = this.CountryFeeCostData.visaContinent;