liuhj 1 vuosi sitten
vanhempi
commit
58aa1ae4d5

+ 7 - 7
src/components/Finance/Cost.vue

@@ -243,7 +243,7 @@
                 <el-checkbox v-for="(  item, index  ) in    checkOptions  " :key="index" :title="item.tips"
                     :label="item.label" @change="(val) => { topcheckboxChange(val, item.label) }"></el-checkbox>
             </el-checkbox-group>
-            <el-table class="tables" style="font-size:10px" :summary-method="getSummaries" show-summary show-overflow-tooltip :data="tableData" :border="true"
+            <el-table class="tables" style="font-size:12px" :summary-method="getSummaries" show-summary show-overflow-tooltip :data="tableData" :border="true"
                 size="small" row-class-name="row" cell-class-name="column" :highlight-current-row="true" :fit="true">
                 <!-- :height="centerheight" -->
 
@@ -388,7 +388,7 @@
                                 </el-table>
 
                             </div>
-                            <div v-for="(      sheetitem, index      ) in       sheetDatal      " :key="index">
+                            <div v-for="(sheetitem, index) in sheetDatal" :key="index">
                                 <div class="biaoge" :class="{ 'biaogeKz': costTypevalue == 'B' }"
                                     v-if="CheckBoxListSelect.filter(item => item.cbType == 'Left')[0].cbValues.includes(sheetitem.label)">
                                     <el-table :data="[{ a: 1 }]" border style="width: 100%">
@@ -479,7 +479,7 @@
                                     <el-table :data="[{ a: 1 }]" border style="width: 100%"
                                         :class="{ 'hiddenElement': (sheetitem.EnLabel == 'visa' || sheetitem.EnLabel == 'bx') ? true : false }">
                                         <el-table-column
-                                            v-for="(      itemsheetone, index      ) in       sheetitem.childList      "
+                                            v-for="(itemsheetone, index) in sheetitem.childList"
                                             :key="index" :prop="itemsheetone.prop" :label="itemsheetone.childLabel">
                                             <!-- eslint-disable-next-line -->
                                             <template slot-scope="scope">
@@ -727,7 +727,7 @@ export default {
             ],
             tableLabel: [
                 { label: 'DAY', width: '85', prop: 'day', describe: '天数(DAY)' },
-                { label: 'DATE', width: '75', prop: 'date', describe: '时间(DATE)' },
+                { label: 'DATE', width: '85', prop: 'date', describe: '时间(DATE)' },
                 { label: 'ITIN', width: '100', prop: 'itin', describe: '行程描述(ITINERARY)' },
                 { label: 'VA', width: '77', prop: 'sale', describe: '车服务区域(Vehicle Area)' }, // ??????????????
                 { label: 'VT', width: '100', prop: 'carType', describe: '车型(VEHICLE TYPE)' },
@@ -4823,7 +4823,7 @@ export default {
     width: 70px;
 }
 .tables .el-textarea{
-    font-size: 10px;
+    font-size: 12px;
 }
 .tables .el-button--mini{
     font-size: 12px;
@@ -4839,9 +4839,9 @@ export default {
     display: none;
 }
 .form-ss .el-checkbox__label{
-    font-size: 10px;
+    font-size: 12px;
 }
 .tables .el-input--mini{
-    font-size: 10px;
+    font-size: 12px;
 }
 </style>

+ 1 - 0
src/components/Finance/DailyFeePayment.vue

@@ -75,6 +75,7 @@
         <div class="dailyment-box">
             <template>
                 <el-table
+                height="700"
                 :data="tableData"
                 border
                 style="width: 100%">

+ 26 - 18
src/components/Finance/PayReceived.vue

@@ -20,16 +20,16 @@
             <div class="received-info">
                 <div class="received-info-li">
                     <label>团 号:</label>
-                    <span v-if="this.groupInfo.tourCode!=''">{{groupInfo=={}?'暂无':groupInfo.tourCode==""?'暂无':groupInfo.tourCode}}</span>
-                    <!-- <span>{{groupInfo?'暂无':groupInfo.tourCode}}</span> -->
+                    <span>{{groupInfo.tourCode}}</span>
+
                 </div>
                 <div class="received-info-li">
                     <label>客 户:</label>
-                    <span>{{groupInfo=={}?'暂无':groupInfo.clientName==""?'暂无':groupInfo.clientName}}</span>
+                    <span>{{groupInfo.clientName}}</span>
                 </div>
                 <div class="received-info-li">
                     <label>出访国家:</label>
-                    <span>{{groupInfo=={}?'暂无':groupInfo.visitCountry==""?'暂无':groupInfo.visitCountry}}</span>
+                    <span>{{groupInfo.visitCountry}}</span>
                 </div>
                 <div class="received-info-li">
                     <label>起止日期:</label>
@@ -37,7 +37,7 @@
                 </div>
                 <div class="received-info-li">
                     <label>天数/人数:</label>
-                    <span>{{groupInfo=={}?'暂无':groupInfo.visitDays+'天/'+groupInfo.visitPNumber+'人'}}</span>
+                    <span>{{groupInfo.visitDays+'天/'+groupInfo.visitPNumber+'人'}}</span>
                 </div>
             </div>
             <div class="received-checked">
@@ -52,7 +52,7 @@
                 tooltip-effect="dark"
                 style="width: 100%"
                 >
-                    <el-table-column
+                    <!-- <el-table-column
                     label="付款时间"
                     width="165">
                         <template slot-scope="scope">
@@ -62,9 +62,9 @@
                             type="date"
                             placeholder="选择日期">
                             </el-date-picker>
-                            <!-- <el-input v-model="scope.row.sectionTime"></el-input> -->
+                           
                         </template>
-                    </el-table-column>
+                    </el-table-column> -->
                     <el-table-column
                         label="付款方信息"
                         >
@@ -92,7 +92,7 @@
                         <template slot-scope="scope">
                             <el-date-picker
                             style="width: 100%;"
-                            v-model="scope.row.customerName"
+                            v-model="scope.row.sectionTime"
                             type="date"
                             placeholder="选择日期">
                             </el-date-picker>
@@ -172,14 +172,14 @@ export default {
             ],
             typeoptions:[],
             groupInfo:{
-                clientName:'',
-                id:'',
-                tourCode:'',
-                visitCountry:'',
-                visitDays:'',
-                visitEndDate:'',
-                visitPNumber:'',
-                visitStartDate:'',
+                // clientName:'',
+                // id:'',
+                // tourCode:'',
+                // visitCountry:'',
+                // visitDays:'',
+                // visitEndDate:'',
+                // visitPNumber:'',
+                // visitStartDate:'',
             },
         }
     },
@@ -333,6 +333,14 @@ export default {
             //     }
             // })
         },
+        //处理日期
+        datetime(val){
+            var date=new Date(val);
+            var y=date.getFullYear();
+            var m=date.getMonth()+1>=10?date.getMonth()+1:'0'+(date.getMonth()+1).toString();
+            var d=date.getDate()>=10?date.getDate():'0'+(date.getDate()).toString();
+            return y+'-'+m+'-'+d
+        },
         //保存已收款项
         ysSaveition(){
             console.log(this.UnassignedData)
@@ -340,7 +348,7 @@ export default {
             var arrnew = this.UnassignedData.map((item,index) => {
                 return Object.assign({},{
                     'id':item.id,
-                    'sectionTime':item.sectionTime,
+                    'sectionTime':this.datetime(item.sectionTime),
                     'price':item.price,
                     'currency':item.currency,
                     'receivablesType':item.receivablesType,

+ 3 - 3
src/components/OP/CarTouristGuideGroundId.vue

@@ -10,7 +10,7 @@
 
                     <div style="width: 80%;display: flex;">
                         <div style="width: 25%;">
-                            <el-select v-model="DiId" placeholder="团组选择" clearable filterable @change="deleSelectChange"
+                            <el-select v-model="DiId" placeholder="团组选择" clearable filterable @change="deleSelect"
                                 style="width: 100%;">
                                 <el-option v-for="item in delegationInfoList" :key="item.id" :label="item.teamName"
                                     :value="item.id">
@@ -162,7 +162,7 @@ export default {
             }).then(function (res) {
                 if (res.data.code == 200) {
                     that.delegationInfoList = res.data.data.groupName;
-                    that.DiId = that.$route.query.diId
+                    
                     if (that.DiId == undefined) {
                         that.delegationInfo = that.delegationInfoList[0]
                         that.DiId = that.delegationInfoList[0].id;
@@ -171,7 +171,6 @@ export default {
                             if (that.delegationInfoList[index].id == that.DiId) {
                                 that.delegationInfo = that.delegationInfoList[index];
                                 that.DiId = that.delegationInfoList[index].id;
-                                break;
                             }
                         }
                     }
@@ -304,6 +303,7 @@ export default {
         },
     },
     mounted() {
+        this.DiId = this.$route.query.diId
         this.token = JSON.parse(localStorage.getItem('userinif')).token;
         this.userId = JSON.parse(localStorage.getItem('userinif')).userInfo.userId
 

+ 4 - 4
src/components/Resource/OpTicketBlackCode.vue

@@ -72,19 +72,19 @@
                         </el-form-item>
                     </div>
                     <div style="width: 40%;">
-                        <el-form-item label="全价说明:" prop="price" label-width="160px">
+                        <el-form-item label="全价说明:" label-width="160px">
                             <el-input type="textarea" :rows="3" placeholder="全价说明"
                                 v-model="OpTicketBlackCodeData.price"></el-input>
                         </el-form-item>
-                        <el-form-item label="现价说明:" prop="nowPrice" label-width="160px">
+                        <el-form-item label="现价说明:"  label-width="160px">
                             <el-input type="textarea" :rows="3" placeholder="现价说明"
                                 v-model="OpTicketBlackCodeData.nowPrice"></el-input>
                         </el-form-item>
-                        <el-form-item label="公务舱单价:" prop="bcPrice" label-width="160px">
+                        <el-form-item label="公务舱单价:" label-width="160px">
                             <el-input placeholder="公务舱单价" v-model="OpTicketBlackCodeData.bcPrice">
                             </el-input>
                         </el-form-item>
-                        <el-form-item label="经济舱单价:" prop="ecPrice" label-width="160px">
+                        <el-form-item label="经济舱单价:" label-width="160px">
                             <el-input placeholder="经济舱单价" v-model="OpTicketBlackCodeData.ecPrice">
                             </el-input>
                         </el-form-item>