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

src/components/Finance/Cost.vue

@@ -355,6 +355,50 @@
                         <label>天数/人数：</label>
                         <span>{{ grouptitleinfo.visitDays }}天/{{ grouptitleinfo.visitPNumber }}人</span>
                     </div>
+                    <div class="cost-info-li">
+                        <!-- 客户名单 -->
+                        <el-popover placement="bottom" width="1062" 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="200" property="companyFullName" label="单位">
+                                    <template slot-scope="scope">
+                                        {{ scope.row.companyFullName }}
+                                    </template>
+                                </el-table-column>
+                                <el-table-column width="200" property="job" label="职位">
+                                    <template slot-scope="scope">
+                                        {{ scope.row.job }}
+                                    </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-column width="110" property="birthDay" label="生日">
+                                    <template slot-scope="scope">
+                                        {{ fgarr(scope.row.birthDay) }}
+                                    </template>
+                                </el-table-column>
+                            </el-table>
+                            <span slot="reference"
+                                style="cursor: pointer;margin-left: 20px;color:red;font-size:14px">"移上查看客户名单"</span>
+                        </el-popover>
+                    </div>
                 </div>
             </div>
             <div style="color: #606266;font-size: 15px;font-weight: 600;">请选择要显示的项：</div>
@@ -450,7 +494,7 @@
                                 </div>
                             </div>
                             <div v-else-if="item.prop == 'b' || item.prop == 'l' || item.prop == 'd'">
-                                <el-popover placement="top-start" title="餐食报批费用:" width="200" trigger="hover">
+                                <el-popover placement="top-start" title="餐食报批费用:" trigger="hover">
                                     <div>
                                         <span style="color:red;">*具体价格以当前货币汇率为准!</span><br />
                                         <div v-if="ShowMeals.length == 0">
@@ -460,7 +504,12 @@
                                         <div v-else>
                                             <div v-for="(  item, index  ) in ShowMeals" :key="index">
                                                 {{ item.countryOrCity }} &nbsp;&nbsp; <span style="color:green;">{{
-                                                    item.price }}</span>元/人<br>
+                                                    item.price }}</span>元/人
+                                                <span v-if="item.currPrice">(<span style="color:green;">{{
+                                                    item.currPrice }}</span> </span>
+                                                <span v-if="item.currStr">{{
+                                                    item.currStr }})</span>
+                                                <br>
                                             </div>
                                         </div>
                                     </div>
@@ -470,7 +519,7 @@
                             </div>
                             <div
                                 v-else-if="item.prop == 'suite' || item.prop == 'jS_ES' || item.prop == 'sgr' || item.prop == 'tbr'">
-                                <el-popover placement="top-start" title="酒店报批费用:" width="200" trigger="hover">
+                                <el-popover placement="top-start" title="酒店报批费用:" trigger="hover">
                                     <div>
                                         <span style="color:red;">*具体价格以当前货币汇率为准!</span><br />
                                         <div v-if="ShowHotel.length == 0">
@@ -480,7 +529,12 @@
                                         <div v-else>
                                             <div v-for="(  item, index  ) in ShowHotel" :key="index">
                                                 {{ item.countryOrCity }} &nbsp;&nbsp; <span style="color:green;">{{
-                                                    item.price }}</span>元/人<br>
+                                                    item.price }}</span>元/人
+                                                <span v-if="item.currPrice">(<span style="color:green;">{{
+                                                    item.currPrice }}</span> </span>
+                                                <span v-if="item.currStr">{{
+                                                    item.currStr }})</span>
+                                                <br>
                                             </div>
                                         </div>
                                     </div>
@@ -882,8 +936,7 @@
     </div>
 </template>
 <script>
-import { elementMatches } from '@fullcalendar/core/internal';
-
+import { pinyin } from 'pinyin-pro';
 export default {
     data() {
         return {
@@ -2824,6 +2877,7 @@ export default {
             historyCarSelectObject: {},
             historyCarIndex: -1,
             hotelIsTrue: false,
+            rollcallarr: []
         };
     },
     watch: {
@@ -3227,6 +3281,9 @@ export default {
                     'Authorization': that.token,
                 }
             }).then(resp => {
+                setTimeout(() => {
+                    that.PostTourClientListByDiId(id);
+                }, 100)
                 //////console.log(resp.data.data, '------------------------------------');
                 if (resp.data.code == 200) {
 
@@ -5881,7 +5938,40 @@ export default {
                 this.tableData[this.historyCarIndex].carCost = this.historyCarSelectObject.dayPrice;
             }
             this.historyCarDialog = false;
-        }
+        },
+        //获取客户名单info
+        PostTourClientListByDiId(id) {
+            var that = this
+            var url = "/api/Groups/PostTourClientListByDiId"
+            this.$axios({
+                method: 'post',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer ' + that.token
+                },
+                data: {
+                    portType: 1,
+                    diid: id,
+                    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);
+                }
+            })
+        },
+        //fenge
+        fgarr(val) {
+            val = val + ""
+            return val.split(' ')[0]
+        },
+        //拼音
+        pinyingxing(val) {
+            return pinyin(val, { toneType: 'none' }).toUpperCase();
+        },
     },
     updated() {
         this.$emit('transfer', true)