Browse Source

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

yuanrf 11 months ago
parent
commit
0f2b39be7a

+ 44 - 10
src/components/Finance/Cost.vue

@@ -1,6 +1,17 @@
 <template>
     <div class="cost-all" v-loading.fullscreen.lock="costloading">
         <div class="cost-box">
+            <el-dialog width="500" title="机票行程数据" :visible.sync="dialogTableVisible">
+                <el-table border :data="gridData">
+                  <el-table-column property="day" label="DAY" width="150"></el-table-column>
+                  <el-table-column property="date" label="DATE" width="200"></el-table-column>
+                  <el-table-column property="itin" label="ITIN"></el-table-column>
+                </el-table>
+                <div class="btn-dialog-cost">
+                    <el-button @click="confirmationTP" size="small" type="primary">行程确认</el-button>
+                    <el-button @click="dialogTableVisible=false" size="small">取消</el-button>
+                </div>
+              </el-dialog>
             <div class="cost-haed">
                 <div class="ser-btn">
                     <div class="ser-btn-li Cost_topFlex" style="display: flex;">
@@ -2654,6 +2665,8 @@ export default {
             acconarrs: [],
             isShare: 0,
             blackCodeIsTrue: false,
+            dialogTableVisible:false,
+            gridData:[],
             //监听变量
             //count: 0,
             x: 0,
@@ -5486,6 +5499,7 @@ export default {
             }
         },
         importBlackCode() {
+            this.gridData=[];
             var url = "/api/Groups/CraeteGroupCostTravel"
             var that = this
             this.$axios({
@@ -5495,27 +5509,44 @@ export default {
                     Authorization: 'Bearer ' + that.token
                 },
                 data: {
-                    "diid": this.diid,
+                    "diid": that.diid,
                 }
             }).then(function (resp) {
                 if (resp.data.code == 200) {
                     console.log('CraeteGroupCostTravelResponse', resp.data.data);
+                    that.gridData=resp.data.data.groupCost;
                     that.blackCodeIsTrue = resp.data.data.blackCodeIsTrue;
-                    that.tableData = resp.data.data.groupCost;
-                    for (var i = 0; i < that.tableData.length; i++) {
-                        for (var prop in that.tableData[i]) {
-                            console.log(that.tableData[i][prop]);
-                            if (that.tableData[i][prop] == 0) {
-                                that.tableData[i][prop] = ''
-                            }
-                        }
+                    if (that.blackCodeIsTrue) {
+                        that.dialogTableVisible=true;
+                    }else{
+                        that.$message.error("机票数据未录入!");
                     }
+                    // that.tableData = resp.data.data.groupCost;
+                    // for (var i = 0; i < that.tableData.length; i++) {
+                    //     for (var prop in that.tableData[i]) {
+                    //         if (that.tableData[i][prop] == 0) {
+                    //             that.tableData[i][prop] = ''
+                    //         }
+                    //     }
+                    // }
                 } else {
                     that.$message.error("黑屏代码有误!" + resp.data.msg);
                 }
             })
 
         },
+        //机票行程确认赋值
+        confirmationTP(){
+            this.tableData = this.gridData;
+            for (var i = 0; i < this.tableData.length; i++) {
+                for (var prop in this.tableData[i]) {
+                    if (this.tableData[i][prop] == 0) {
+                        this.tableData[i][prop] = ''
+                    }
+                }
+            }
+            this.dialogTableVisible=false;
+        },
         //监听鼠标
         MonitorMouse() {
             document.onmousemove = (event) => {
@@ -5570,7 +5601,6 @@ export default {
                 clearInterval(this.autoSave);
             })
         }
-
     },
     updated() {
         this.$emit('transfer', true)
@@ -5937,4 +5967,8 @@ export default {
 .accon-ul:last-child {
     bottom: 15px;
 }
+.btn-dialog-cost{
+    margin-top: 20px;
+    text-align: right;
+}
 </style>

+ 16 - 4
src/components/OP/AirTicketRes.vue

@@ -41,20 +41,32 @@
                     <div class="costbudgeting-li" v-for="(item,index) in budgeting" :key="index">
                         <span>({{item.costType}}段)</span>
                         <span>时间:{{item.costTypeStartTime}} ~ {{item.costTypeEndTime}}</span>
-                        <span v-for="(items,index) in item.data" :key="index">&nbsp;&nbsp;&nbsp;{{items.airType}}:{{townum(items.airDRCB)}}元/人&nbsp;&nbsp;&nbsp;{{items.airNum}}人&nbsp;&nbsp;&nbsp;共:{{townum(items.airZCB)}}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
+                        <span v-for="(items,index) in item.data.airFeeData" :key="index">&nbsp;&nbsp;&nbsp;{{items.airType}}:{{townum(items.airDRCB)}}元/人&nbsp;&nbsp;&nbsp;{{items.airNum}}人&nbsp;&nbsp;&nbsp;共:{{townum(items.airZCB)}}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
+                        <el-popover
+                        placement="right"
+                        width="452"
+                        trigger="hover">
+                        <el-table border :data="item.data.airInitData">
+                            <el-table-column width="150" property="date" label="DATE"></el-table-column>
+                            <!-- <el-table-column width="100" property="name" label="姓名"></el-table-column> -->
+                            <el-table-column width="300" 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>
                     </div>
                 </div>
                 <div v-if="budgeting.length<=1">
                     <div class="costbudgeting-li" v-for="(item,index) in budgeting" :key="index">
-                        <span v-for="(items,index) in item.data" :key="index">{{items.airType}}:{{townum(items.airDRCB)}}元/人&nbsp;&nbsp;&nbsp;{{items.airNum}}人&nbsp;&nbsp;&nbsp;共:{{townum(items.airZCB)}}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
+                        <span v-for="(items,index) in item.data.airFeeData" :key="index">{{items.airType}}:{{townum(items.airDRCB)}}元/人&nbsp;&nbsp;&nbsp;{{items.airNum}}人&nbsp;&nbsp;&nbsp;共:{{townum(items.airZCB)}}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
                         <el-popover
                         placement="right"
                         width="452"
                         trigger="hover">
-                        <el-table border :data="gridData">
+                        <el-table border :data="item.data.airInitData">
                             <el-table-column width="150" property="date" label="DATE"></el-table-column>
                             <!-- <el-table-column width="100" property="name" label="姓名"></el-table-column> -->
-                            <el-table-column width="300" property="address" label="ITIN"></el-table-column>
+                            <el-table-column width="300" property="itinerary" label="ITIN"></el-table-column>
                         </el-table>
                         <!-- <el-button slot="reference">click 激活</el-button> -->
                         <span slot="reference" style="cursor: pointer;">"移上查看详细"</span>

+ 22 - 2
src/components/OP/OpAirTicketRes.vue

@@ -11,12 +11,32 @@
                 <div class="opcostbudgeting-li" v-for="(item,index) in budgeting" :key="index">
                     <span>({{item.costType}}段)</span>
                     <span>时间:{{item.costTypeStartTime}} ~ {{item.costTypeEndTime}}</span>
-                    <span v-for="(items,index) in item.data" :key="index">&nbsp;&nbsp;&nbsp;{{items.airType}}:{{townum(items.airDRCB)}}元/人&nbsp;&nbsp;&nbsp;{{items.airNum}}人&nbsp;&nbsp;&nbsp;共:{{townum(items.airZCB)}}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
+                    <span v-for="(items,index) in item.data.airFeeData" :key="index">&nbsp;&nbsp;&nbsp;{{items.airType}}:{{townum(items.airDRCB)}}元/人&nbsp;&nbsp;&nbsp;{{items.airNum}}人&nbsp;&nbsp;&nbsp;共:{{townum(items.airZCB)}}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
+                    <el-popover
+                        placement="right"
+                        width="452"
+                        trigger="hover">
+                        <el-table border :data="item.data.airInitData">
+                            <el-table-column width="150" property="date" label="DATE"></el-table-column>
+                            <el-table-column width="300" property="itinerary" label="ITIN"></el-table-column>
+                        </el-table>
+                        <span slot="reference" style="cursor: pointer;">"移上查看详细"</span>
+                    </el-popover>
                 </div>
             </div>
             <div v-if="budgeting.length<=1">
                 <div class="opcostbudgeting-li" v-for="(item,index) in budgeting" :key="index">
-                    <span v-for="(items,index) in item.data" :key="index">{{items.airType}}:{{townum(items.airDRCB)}}元/人&nbsp;&nbsp;&nbsp;{{items.airNum}}人&nbsp;&nbsp;&nbsp;共:{{townum(items.airZCB)}}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
+                    <span v-for="(items,index) in item.data.airFeeData" :key="index">{{items.airType}}:{{townum(items.airDRCB)}}元/人&nbsp;&nbsp;&nbsp;{{items.airNum}}人&nbsp;&nbsp;&nbsp;共:{{townum(items.airZCB)}}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
+                    <el-popover
+                        placement="right"
+                        width="452"
+                        trigger="hover">
+                        <el-table border :data="item.data.airInitData">
+                            <el-table-column width="150" property="date" label="DATE"></el-table-column>
+                            <el-table-column width="300" property="itinerary" label="ITIN"></el-table-column>
+                        </el-table>
+                        <span slot="reference" style="cursor: pointer;">"移上查看详细"</span>
+                    </el-popover>
                 </div>
             </div>
             <div v-if="budgeting.length==0">