07151436xiugai

src/components/OP/AirTicketRes.vue

@@ -51,9 +51,42 @@
                             <!-- <el-table-column width="100" property="name" label="姓名"></el-table-column> -->
                             <el-table-column width="400" property="itinerary" label="ITIN"></el-table-column>
                         </el-table>
-                        <!-- <el-button slot="reference">click 激活</el-button> -->
                         <span slot="reference" style="cursor: pointer;">"移上查看详细"</span>
                         </el-popover>
+                        <!-- 客户名单 -->
+                        <el-popover
+                        placement="bottom"
+                        width="662"
+                        trigger="hover">
+                        <el-table max-height="600" border :data="rollcallarr">
+                            <el-table-column width="100" property="date" label="姓名">
+                                <template slot-scope="scope">
+                                    {{ scope.row.lastName}}{{scope.row.firstName}}
+                                </template>
+                            </el-table-column>
+                            <el-table-column width="200" property="lastName" label="拼音">
+                                <template slot-scope="scope">
+                                    {{ pinyingxing(scope.row.lastName) }}/{{  pinyingxing(scope.row.firstName) }}
+                                </template>
+                            </el-table-column>
+                            <el-table-column width="50" property="sex" label="性别">
+                                <template slot-scope="scope">
+                                    {{ scope.row.sex==0?'男':'女'}}
+                                </template>
+                            </el-table-column>
+                            <el-table-column width="110" property="birthDay" label="生日">
+                                <template slot-scope="scope">
+                                    {{ fgarr(scope.row.birthDay) }}
+                                </template>
+                            </el-table-column>
+                            <el-table-column width="200" property="idCardNo" label="身份证号码">
+                                <template slot-scope="scope">
+                                    {{ scope.row.idCardNo }}
+                                </template>
+                            </el-table-column>
+                        </el-table>
+                        <span slot="reference" style="cursor: pointer;margin-left: 20px;">"移上查看客户名单"</span>
+                        </el-popover>
                     </div>
                 </div>
                 <div v-if="budgeting.length<=1">
@@ -71,6 +104,40 @@
                         <!-- <el-button slot="reference">click 激活</el-button> -->
                         <span slot="reference" style="cursor: pointer;">"移上查看详细"</span>
                         </el-popover>
+                        <!-- 客户名单 -->
+                        <el-popover
+                        placement="bottom"
+                        width="662"
+                        trigger="hover">
+                        <el-table max-height="600" border :data="rollcallarr">
+                            <el-table-column width="100" property="date" label="姓名">
+                                <template slot-scope="scope">
+                                    {{ scope.row.lastName}}{{scope.row.firstName}}
+                                </template>
+                            </el-table-column>
+                            <el-table-column width="200" property="birthDay" label="拼音">
+                                <template slot-scope="scope">
+                                    {{ pinyingxing(scope.row.lastName) }}/{{  pinyingxing(scope.row.firstName) }}
+                                </template>
+                            </el-table-column>
+                            <el-table-column width="50" property="sex" label="性别">
+                                <template slot-scope="scope">
+                                    {{ scope.row.sex==0?'男':'女'}}
+                                </template>
+                            </el-table-column>
+                            <el-table-column width="110" property="birthDay" label="生日">
+                                <template slot-scope="scope">
+                                    {{ fgarr(scope.row.birthDay) }}
+                                </template>
+                            </el-table-column>
+                            <el-table-column width="200"  label="身份证号码">
+                                <template slot-scope="scope">
+                                    {{ scope.row.idCardNo==""?'-':scope.row.idCardNo }}
+                                </template>
+                            </el-table-column>
+                        </el-table>
+                        <span slot="reference" style="cursor: pointer;margin-left: 20px;">"移上查看客户名单"</span>
+                        </el-popover>
                     </div>
                 </div>
                 <div v-if="budgeting.length==0">
@@ -133,6 +200,7 @@
 </template>
 <script>
 import { el } from '@fullcalendar/core/internal-common';
+import { pinyin } from 'pinyin-pro';
 export default {
     data() {
         return {
@@ -165,10 +233,20 @@ export default {
             date: '2016-05-03',
             name: '王小虎',
             address: '上海市普陀区金沙江路 1518 弄'
-            }]
+            }],
+            rollcallarr:[]
         }
     },
     methods: {
+        //拼音
+        pinyingxing(val){
+            return pinyin(val, { toneType: 'none' }).toUpperCase();
+        },
+        //fenge
+        fgarr(val){
+            val=val+""
+            return val.split(' ')[0]
+        },
         btn(){
             console.log(this.budgeting.length)
         },
@@ -237,6 +315,7 @@ export default {
                         }
                         that.AirTicketResList();
                         that.getcostbudgeting();
+                        that.PostTourClientListByDiId();
                     }
 
                 }
@@ -247,6 +326,7 @@ export default {
         AirTicketResSelectChange() {
             this.AirTicketResList();
             this.getcostbudgeting();
+            this.PostTourClientListByDiId();
         },
         //团组信息绑定
         AirTicketResList() {
@@ -292,7 +372,6 @@ export default {
             });
         },
         upDate(index, row) {
-
             this.$router.push({
                 path: "/home/OpAirTicketRes",
                 query: {
@@ -302,6 +381,30 @@ export default {
             })
 
         },
+        //获取客户名单info
+        PostTourClientListByDiId() {
+            var that = this
+            var url = "/api/Groups/PostTourClientListByDiId"
+            this.$axios({
+                method: 'post',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer ' + that.token
+                },
+                data: {
+                    portType:1,
+                    diid: that.DiId,
+                    pageId:104,
+                    userId:that.userId
+                }
+            }).then(function (res) {
+                if (res.data.code == 200) {
+                    that.rollcallarr=res.data.data;
+                } else {
+                    that.$message.error(res.data.smg);
+                }
+            })
+        },
         addIf() {
             if (this.DiId != 0 && this.DiId != '' && this.DiId != undefined) {
                 this.$router.push({

src/components/OP/OpVisaPriec.vue

@@ -365,7 +365,7 @@ export default {
                     { required: true, message: '请输入费用金额', trigger: ['blur', 'change'] },
                 ],
                 visaClient: [
-                    { required: true, message: '请输入费用名称', trigger: ['blur'] },
+                    { required: true, message: '请选择客户名单', trigger: ['blur'] },
                 ],
                 isThird: [
                     { required: true, message: '请选择是否第三方代办', trigger: ['blur', 'change'] },
@@ -529,6 +529,7 @@ export default {
         },
         //获取团组客户名单
         QueryClientInfoByDIID() {
+            // this.OpVisaPriceData.visaClient=[];
             var url = "/api/Groups/QueryClientInfoByDIID"
             var that = this
             this.$axios({
@@ -541,17 +542,20 @@ export default {
                     diid: that.OpVisaPriceData.diId
                 }
             }).then(function (res) {
-                console.log(res);
                 if (res.data.code == 200) {
                     that.fliterClient = res.data.data;
-                    for(var i=0;i<that.fliterClient.length;i++){
-                        that.OpVisaPriceData.visaClient.push(that.fliterClient[i].id)
+                    if(that.OpVisaPriceData.visaClient.length==0){
+                        console.log('jin');
+                        for(var i=0;i<that.fliterClient.length;i++){
+                            that.OpVisaPriceData.visaClient.push(that.fliterClient[i].id)
+                        }
                     }
                 }
             })
         },
         //根据Id获取单挑数据及C表数据
         QueryVisaById() {
+            // this.OpVisaPriceData.visaClient=""
             var url = "/api/Groups/QueryVisaById"
             var that = this
             this.$axios({
@@ -569,6 +573,7 @@ export default {
                     var VisaInfo = res.data.data.visaInfo;
                     that.IsAuditGM = CreditCardPayment.isAuditGM;
                     that.OpVisaPriceData.visaClient = that.ClientFormat(VisaInfo.visaClient);
+                    console.log(that.OpVisaPriceData.visaClient);
                     that.OpVisaPriceData.visaPrice = VisaInfo.visaPrice;
                     that.OpVisaPriceData.visaCurrency = VisaInfo.visaCurrency;
                     that.OpVisaPriceData.isThird = VisaInfo.isThird;