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

src/components/OP/CarTouristGuideGrounContent.vue

@@ -10,48 +10,48 @@
                 <el-table-column width="100" property="date" label="日期"></el-table-column>
                 <el-table-column width="100" label="车费用">
                     <template slot-scope="scope">
-                        {{ townum(scope.row.carFee)+' '+bizhong  }}
+                        {{ townum(scope.row.carFee) + ' ' + bizhong }}
                     </template>
                 </el-table-column>
                 <el-table-column width="100" label="导游费用">
                     <template slot-scope="scope">
-                        {{ townum(scope.row.guideFee)+' '+bizhong }}
+                        {{ townum(scope.row.guideFee) + ' ' + bizhong }}
                     </template>
                 </el-table-column>
                 <el-table-column width="100" label="餐食费">
                     <template slot-scope="scope">
-                        {{ townum(scope.row.mealFee)+' '+bizhong }}
+                        {{ townum(scope.row.mealFee) + ' ' + bizhong }}
                     </template>
                 </el-table-column>
                 <el-table-column width="100" label="门票费">
                     <template slot-scope="scope">
-                        {{ townum(scope.row.ticketFee)+' '+bizhong }}
+                        {{ townum(scope.row.ticketFee) + ' ' + bizhong }}
                     </template>
                 </el-table-column>
                 <el-table-column width="100" label="小费">
                     <template slot-scope="scope">
-                        {{ townum(scope.row.tipFee)+' '+bizhong }}
+                        {{ townum(scope.row.tipFee) + ' ' + bizhong }}
                     </template>
                 </el-table-column>
                 <el-table-column width="110" label="饮料零食水果">
                     <template slot-scope="scope">
-                        {{ townum(scope.row.drinksSnacksFruitFee)+' '+bizhong }}
+                        {{ townum(scope.row.drinksSnacksFruitFee) + ' ' + bizhong }}
                     </template>
                 </el-table-column>
                 <el-table-column width="100" label="出行物资">
                     <template slot-scope="scope">
-                        {{ townum(scope.row.travelSupplies)+' '+bizhong }}
+                        {{ townum(scope.row.travelSupplies) + ' ' + bizhong }}
                     </template>
                 </el-table-column>
                 <el-table-column property="carType" width="100" label="车型"></el-table-column>
                 <el-table-column width="100" label="领队费">
                     <template slot-scope="scope">
-                        {{ townum(scope.row.leadersFee)+' '+bizhong }}
+                        {{ townum(scope.row.leadersFee) + ' ' + bizhong }}
                     </template>
                 </el-table-column>
                 <el-table-column width="100" label="零用金">
                     <template slot-scope="scope">
-                        {{ townum(scope.row.spentCash)+' '+bizhong }}
+                        {{ townum(scope.row.spentCash) + ' ' + bizhong }}
                     </template>
                 </el-table-column>
             </el-table>
@@ -93,7 +93,7 @@
                 <span style="color:#606266;">{{ delegationInfo.visitDate }}&nbsp;&nbsp;&nbsp;</span>
                 <span style="font-weight: bold;">天数/人数：</span>
                 <span style="color:#606266;">{{ delegationInfo.visitDays }}天/{{
-            delegationInfo.visitPNumber }}人</span>
+                delegationInfo.visitPNumber }}人</span>
             </div>
             <hr style='background-color:#5555; height:1px; border:none;' />
             <div>
@@ -112,8 +112,8 @@
                         </el-table-column>
                         <el-table-column prop="datePrice" label="日期" width="170">
                             <template slot-scope="scope">
-                                <el-date-picker size="small" style="width: 100%;" v-model="scope.row.datePrice" type="date"
-                                    :picker-options="startPickerOptions" value-format="yyyy-MM-dd HH:mm:ss"
+                                <el-date-picker size="small" style="width: 100%;" v-model="scope.row.datePrice"
+                                    type="date" :picker-options="startPickerOptions" value-format="yyyy-MM-dd HH:mm:ss"
                                     placeholder="选择日期">
                                 </el-date-picker>
                             </template>
@@ -242,7 +242,7 @@
 export default {
     data() {
         return {
-            bizhong:'',
+            bizhong: '',
             startPickerOptions: {
             },
             pageId: '',
@@ -286,22 +286,22 @@ export default {
                 ]
             },
             unitsArr: [{ id: 0, name: '请选择', remark: '' }],
-            checkItems: ["车费", "导游费", "客户午餐费用", "导游景点费", "导游小费", "接送机费", "其他费用", "司机工资", "司机小费", "司机餐补", "车超时费", "导游餐补", "导游房补", "导游交通", "客户早餐费用", "客户晚餐费用", "景点门票费", "饮料/零食/水果", "住补费用", "翻译费",'导游超时费用'],
+            checkItems: ["车费", "导游费", "客户午餐费用", "导游景点费", "导游小费", "接送机费", "其他费用", "司机工资", "司机小费", "司机餐补", "车超时费", "导游餐补", "导游房补", "导游交通", "客户早餐费用", "客户晚餐费用", "景点门票费", "饮料/零食/水果", "住补费用", "翻译费", '导游超时费用'],
             checkList: [],
             sourceList: [],
             ListCount: 1,
-            budgeting:[]
+            budgeting: []
         }
     },
     methods: {
         //保留两位小数
-        townum(val){
+        townum(val) {
             return val.toFixed(2)
         },
         //获取成本提示
-        getcostbudgeting(){
-            this.budgeting=[];
-            this.bizhong='';
+        getcostbudgeting() {
+            this.budgeting = [];
+            this.bizhong = '';
             var url = "/api/Groups/PostGroupCostModulePrompt"
             var that = this
             this.$axios({
@@ -313,12 +313,12 @@ export default {
                 data: {
                     userId: that.userId,
                     diId: that.diId,
-                    cTable:that.cTable,
+                    cTable: that.cTable,
                 }
             }).then(function (res) {
                 if (res.data.code == 200) {
-                    that.budgeting=res.data.data.modulePromptInfos[0].data;
-                    that.bizhong=res.data.data.modulePromptInfos[0].currencyCode;
+                    that.budgeting = res.data.data.modulePromptInfos[0].data;
+                    that.bizhong = res.data.data.modulePromptInfos[0].currencyCode;
                     console.log(that.budgeting)
                 } else {
                     // that.$message.error(res.data.msg);
@@ -370,7 +370,7 @@ export default {
 
                     var start = new Date(res.data.data.start).getTime();
                     var end = new Date(res.data.data.end).getTime();
-                    that.checkItems =  res.data.data.existItem;
+                    that.checkItems = res.data.data.existItem;
 
                     that.startPickerOptions.disabledDate = (time) => {
                         return time.getTime() < start || time.getTime() > end;
@@ -428,7 +428,7 @@ export default {
                 console.log(res)
                 if (res.data.code == 200) {
                     that.currencyList = res.data.data.teamRates;
-                    if(that.currency==0){
+                    if (that.currency == 0) {
                         that.currency = that.currencyList[0].currencyId;
                     }
                 }
@@ -541,7 +541,7 @@ export default {
                 }
             })
 
-            this.countCost = countCost
+            this.countCost = countCost.toFixed(2);
         },
         checkBoxChange() {
             this.ContentList = [];
@@ -563,13 +563,13 @@ export default {
         objectSpanMethod({ row, column, rowIndex, columnIndex }) {
             if (columnIndex === 1) {
 
-                if(row.sId == 1070 || row.sId == 1071){
+                if (row.sId == 1070 || row.sId == 1071) {
                     return {
                         rowspan: 1,
                         colspan: 1
                     };
                 }
-                
+
                 if (rowIndex % this.ListCount === 0) {
                     return {
                         rowspan: this.ListCount,
@@ -667,15 +667,18 @@ export default {
     width: 120px;
     margin: 10px 10px;
 }
-.opcar_add{
+
+.opcar_add {
     position: relative;
 }
-.oprompt{
+
+.oprompt {
     position: fixed;
     top: 150px;
     right: 57px;
     z-index: 2;
 }
+
 .oprompts .el-button--primary {
     color: #FFF;
     background-color: #007dff;