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

src/components/Finance/Cost.vue

@@ -318,7 +318,7 @@
                                             </div>
                                         </div>
                                     </div>
-                                    <el-input size="mini" slot="reference" placeholder="请输入内容"
+                                    <el-input size="mini" slot="reference"
                                         v-model="scope.row[item.prop]">
                                     </el-input>
                                 </el-popover>
@@ -339,13 +339,13 @@
                                             </div>
                                         </div>
                                     </div>
-                                    <el-input size="mini" slot="reference" placeholder="请输入内容"
+                                    <el-input size="mini" slot="reference" 
                                         v-model="scope.row[item.prop]">
                                     </el-input>
                                 </el-popover>
                             </div>
                             <span v-else :title="scope.row[item.prop]">
-                                <el-input size="mini" placeholder="请输入内容" v-model="scope.row[item.prop]">
+                                <el-input size="mini"  v-model="scope.row[item.prop]">
                                 </el-input></span>
                         </template>
                     </el-table-column>
@@ -2881,39 +2881,39 @@ export default {
                     "date": dataStr,
                     "itin": "",
                     "carType": "",
-                    "carCost": 0,
-                    "carNumber": 0,
-                    "carTiming": 0,
-                    "tgs": 0,
-                    "tgwh": 0,
-                    "tgn": 0,
-                    "tgof": 0,
-                    "tgm": 0,
-                    "tga": 0,
-                    "tgtf": 0,
-                    "tgef": 0,
-                    "cfs": 0,
-                    "cfm": 0,
-                    "cfof": 0,
-                    "b": 0,
-                    "l": 0,
-                    "d": 0,
-                    "tbr": 0,
-                    "sgr": 0,
-                    "jS_ES": 0,
-                    "suite": 0,
+                    "carCost": "",
+                    "carNumber": "",
+                    "carTiming": "",
+                    "tgs": "",
+                    "tgwh": "",
+                    "tgn": "",
+                    "tgof": "",
+                    "tgm": "",
+                    "tga": "",
+                    "tgtf": "",
+                    "tgef": "",
+                    "cfs": "",
+                    "cfm": "",
+                    "cfof": "",
+                    "b": "",
+                    "l": "",
+                    "d": "",
+                    "tbr": "",
+                    "sgr": "",
+                    "jS_ES": "",
+                    "suite": "",
                     "accon": "",
-                    "tv": 0,
-                    "iL": 0,
-                    "if": 0,
-                    "ef": 0,
-                    "b_R_F": 0,
-                    "te": 0,
-                    "tgTips": 0,
-                    "drvTips": 0,
-                    "pc": 0,
-                    "tlf": 0,
-                    "ect": 0,
+                    "tv": "",
+                    "iL": "",
+                    "if": "",
+                    "ef": "",
+                    "b_R_F": "",
+                    "te": "",
+                    "tgTips": "",
+                    "drvTips": "",
+                    "pc": "",
+                    "tlf": "",
+                    "ect": "",
                     "id": 1,
                 }
             )
@@ -2983,6 +2983,15 @@ export default {
 
                     if (resp.data.data.groupCost.length > 0) {
                         that.tableData = resp.data.data.groupCost;
+                        console.log(that.tableData);
+                        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]=''
+                                }
+                            }
+                        }
                     } else {
                         that.tableData = [
                             {
@@ -2991,39 +3000,39 @@ export default {
                                 "date": "",
                                 "itin": "",
                                 "carType": "",
-                                "carCost": 0,
-                                "carNumber": 0,
-                                "carTiming": 0,
-                                "tgs": 0,
-                                "tgwh": 0,
-                                "tgn": 0,
-                                "tgof": 0,
-                                "tgm": 0,
-                                "tga": 0,
-                                "tgtf": 0,
-                                "tgef": 0,
-                                "cfs": 0,
-                                "cfm": 0,
-                                "cfof": 0,
-                                "b": 0,
-                                "l": 0,
-                                "d": 0,
-                                "tbr": 0,
-                                "sgr": 0,
-                                "jS_ES": 0,
-                                "suite": 0,
+                                "carCost": "",
+                                "carNumber": "",
+                                "carTiming":"",
+                                "tgs": "",
+                                "tgwh": "",
+                                "tgn": "",
+                                "tgof": "",
+                                "tgm": "",
+                                "tga": "",
+                                "tgtf": "",
+                                "tgef": "",
+                                "cfs": "",
+                                "cfm": "",
+                                "cfof": "",
+                                "b": "",
+                                "l": "",
+                                "d": "",
+                                "tbr": "",
+                                "sgr": "",
+                                "jS_ES": "",
+                                "suite": "",
                                 "accon": "",
-                                "tv": 0,
-                                "iL": 0,
-                                "if": 0,
-                                "ef": 0,
-                                "b_R_F": 0,
-                                "te": 0,
-                                "tgTips": 0,
-                                "drvTips": 0,
-                                "pc": 0,
-                                "tlf": 0,
-                                "ect": 0,
+                                "tv": "",
+                                "iL": "",
+                                "if": "",
+                                "ef": "",
+                                "b_R_F":"",
+                                "te": "",
+                                "tgTips": "",
+                                "drvTips": "",
+                                "pc": "",
+                                "tlf": "",
+                                "ect": "",
                                 "id": 1,
                             }
                         ]
@@ -4896,39 +4905,39 @@ export default {
                 "date": "",
                 "itin": "",
                 "carType": "",
-                "carCost": 0,
-                "carNumber": 0,
-                "carTiming": 0,
-                "tgs": 0,
-                "tgwh": 0,
-                "tgn": 0,
-                "tgof": 0,
-                "tgm": 0,
-                "tga": 0,
-                "tgtf": 0,
-                "tgef": 0,
-                "cfs": 0,
-                "cfm": 0,
-                "cfof": 0,
-                "b": 0,
-                "l": 0,
-                "d": 0,
-                "tbr": 0,
-                "sgr": 0,
-                "jS_ES": 0,
-                "suite": 0,
+                "carCost": "",
+                "carNumber": "",
+                "carTiming": "",
+                "tgs": "",
+                "tgwh": "",
+                "tgn": "",
+                "tgof": "",
+                "tgm": "",
+                "tga": "",
+                "tgtf": "",
+                "tgef": "",
+                "cfs": "",
+                "cfm": "",
+                "cfof": "",
+                "b": "",
+                "l": "",
+                "d": "",
+                "tbr": "",
+                "sgr": "",
+                "jS_ES": "",
+                "suite": "",
                 "accon": "",
-                "tv": 0,
-                "iL": 0,
-                "if": 0,
-                "ef": 0,
-                "b_R_F": 0,
-                "te": 0,
-                "tgTips": 0,
-                "drvTips": 0,
-                "pc": 0,
-                "tlf": 0,
-                "ect": 0,
+                "tv": "",
+                "iL": "",
+                "if": "",
+                "ef": "",
+                "b_R_F": "",
+                "te": "",
+                "tgTips": "",
+                "drvTips": "",
+                "pc": "",
+                "tlf": "",
+                "ect": "",
                 "id": 1,
             };
 

src/components/OP/CarTouristGuideGrounContent.vue

@@ -82,7 +82,7 @@
                     <el-checkbox v-for="(item, index) in checkItems" :key="index" :label=item></el-checkbox>
                 </el-checkbox-group>
             </div>
-            <div style="margin:10px 0;color:#606266;font-size:16px;">
+            <div style="margin:10px 0;color:#606266;font-size:15px;">
                 <span style="font-weight: bold;">团队名称：</span>
                 <span style="color:#606266;">{{ delegationInfo.teamName }}&nbsp;&nbsp;&nbsp;</span>
                 <span style="font-weight: bold;">客户：</span>
@@ -608,11 +608,12 @@ export default {
 }
 </script>
 <style>
-.communal-list {
+.car_add {
     background-color: #fff;
     padding: 10px;
     box-shadow: 0 0 5px #0005;
     border-radius: 10px;
+    min-height: 800px;
 }
 
 .car_add .communal-title {

src/components/OP/CarTouristGuideGroundId.vue

@@ -48,7 +48,7 @@
                     </el-table-column>
                     <el-table-column prop="area" label="地区">
                     </el-table-column>
-                    <el-table-column prop="priceTypeStr" label="费用标识">
+                    <el-table-column prop="priceTypeStr" label="款项类型">
                     </el-table-column>
                     <el-table-column prop="serviceGuide" label="服务导游">
                     </el-table-column>

src/components/OP/backwardtabke.vue

@@ -61,14 +61,14 @@
                         <el-date-picker v-model="datainfo.issueApprovalDt" type="date" placeholder="选择日期">
                         </el-date-picker>
                     </div>
-                    <div class="backward-li-span">出批件</div>
+                    <div class="backward-li-span"><p style="line-height: 0px;padding: 0;">出批件</p><p  style="line-height: 0px;padding: 0;">护照办理</p></div>
                     <div class="backward-li-span">
                         <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 2}" placeholder="请输入内容"
                             v-model="datainfo.issueApprovalRemark">
                         </el-input>
                     </div>
                 </div>
-                <div class="backward-table-li">
+                <!-- <div class="backward-table-li">
                     <div class="backward-li-span">
                         <el-date-picker v-model="datainfo.applyPassportDt" type="date" placeholder="选择日期">
                         </el-date-picker>
@@ -79,7 +79,7 @@
                             v-model="datainfo.applyPassportRemark">
                         </el-input>
                     </div>
-                </div>
+                </div> -->
                 <div class="backward-table-li">
                     <div class="backward-li-span">
                         <el-date-picker v-model="datainfo.visaInformationDt" type="date" placeholder="选择日期">