车辆报价修改

src/components/Ticketing/airlineManagement.vue

 <style>
-.airlineMg .addCompany {
+  .airlineMg .addCompany {
     width: 440px;
     max-height: 600px;
-}
-.airlineMg .addCompany .el-dialog__body {
+  }
+
+  .airlineMg .addCompany .el-dialog__body {
     height: 486px;
     overflow: auto;
-}
-.airlineMg .airline_item_box {
+  }
+
+  .airlineMg .airline_item_box {
     padding-left: 50px;
     padding-top: 30px;
-}
-.airlineMg .airline_item_box .item {
+  }
+
+  .airlineMg .airline_item_box .item {
     width: 208px;
     float: left;
     padding: 14px 14px 20px 14px;
     margin-right: 30px;
     text-align: center;
     color: #333333;
-  border:1px solid #DDDDDD;
+    border: 1px solid #DDDDDD;
     background-color: white;
     position: relative;
     margin-bottom: 20px;
-}
-.airlineMg .airline_item_box .item .tit {
+  }
+
+  .airlineMg .airline_item_box .item .tit {
     font-size: 12px;
-  color:#333333;
+    color: #333333;
     white-space: nowrap;
-  margin-top:10px;
+    margin-top: 10px;
     text-overflow: ellipsis;
     overflow: hidden;
-}
-.airlineMg .airline_item_box .item .logo img {
-    width:100px;
-    height:100px;
+  }
+
+  .airlineMg .airline_item_box .item .logo img {
+    width: 100px;
+    height: 100px;
     display: block;
     border-radius: 50%;
     border: 1px solid #F4F4F4;
     margin: 0 auto;
-}
-.airlineMg .airline_item_box .item .info {
+  }
+
+  .airlineMg .airline_item_box .item .info {
     display: block;
     flex-direction: row;
     margin-bottom: 20px;
-}
-.airlineMg .airline_item_box .item .info div {
+  }
+
+  .airlineMg .airline_item_box .item .info div {
     width: 84px;
     height: 50px;
     float: left;
     background-color: #f9f9f9;
-}
-.airlineMg .airline_item_box .item .info div:nth-child(2) {
+  }
+
+  .airlineMg .airline_item_box .item .info div:nth-child(2) {
     float: right;
-  margin-left:10px;
-}
-.airlineMg .airline_item_box .item .edit {
+    margin-left: 10px;
+  }
+
+  .airlineMg .airline_item_box .item .edit {
     background-color: rgba(0, 0, 0, 0.5);
     height: 50px;
     width: 200px;
@@ -64,44 +73,53 @@
     color: white;
     font-size: 12px;
     cursor: pointer;
-}
-.airlineMg .airline_item_box .item .edit p {
+  }
+
+  .airlineMg .airline_item_box .item .edit p {
     display: flex;
     justify-content: center;
     padding: 15px;
-}
-.airlineMg .airline_item_box .item .edit:hover {
+  }
+
+  .airlineMg .airline_item_box .item .edit:hover {
     color: #fc6262;
-}
-.airlineMg .airline_item_box .item .edit i {
+  }
+
+  .airlineMg .airline_item_box .item .edit i {
     font-size: 18px;
-}
-.airlineMg .airline_item_box .item .phone {
+  }
+
+  .airlineMg .airline_item_box .item .phone {
     font-size: 12px;
-  color:#333333;
-  margin-bottom:15px;
-  height:37px;
-  padding-bottom:12px;
-  border-bottom:1px solid #DDDDDD;
-}
-.airlineMg {
+    color: #333333;
+    margin-bottom: 15px;
+    height: 37px;
+    padding-bottom: 12px;
+    border-bottom: 1px solid #DDDDDD;
+  }
+
+  .airlineMg {
     background-color: #f9f9f9;
-}
-.airlineMg .IATA {
+  }
+
+  .airlineMg .IATA {
     padding-bottom: 5px;
     margin-top: 5px;
-  font-size:14px;
-  color:#333333;
-}
-.airlineMg .IATAs {
+    font-size: 14px;
+    color: #333333;
+  }
+
+  .airlineMg .IATAs {
     color: #999999;
     font-size: 12px;
-}
-.airlineMg .el-switch.is-checked .el-switch__core:after {
+  }
+
+  .airlineMg .el-switch.is-checked .el-switch__core:after {
     left: 100%;
     margin-left: -17px;
-}
-.airlineMg .el-switch__core:after {
+  }
+
+  .airlineMg .el-switch__core:after {
     content: "";
     position: absolute;
     top: 1px;
@@ -111,33 +129,39 @@
     width: 16px;
     height: 16px;
     background-color: #fff;
-}
-.airlineMg .el-switch.is-checked .el-switch__core {
+  }
+
+  .airlineMg .el-switch.is-checked .el-switch__core {
     border-color: #4bca81;
     background-color: #4bca81;
-}
-.airlineMg .query-box .el-input,
-.airlineMg .query-box .el-input .el-input__inner,
-.airlineMg .el-select .el-input {
+  }
+
+  .airlineMg .query-box .el-input,
+  .airlineMg .query-box .el-input .el-input__inner,
+  .airlineMg .el-select .el-input {
     height: 34px !important;
     width: 208px !important;
     border-radius: 17px;
-}
-.airlineMg .query-box li label {
+  }
+
+  .airlineMg .query-box li label {
     display: inline-block;
     min-width: 80px;
     text-align: right;
     font-style: normal;
     margin: 0 20px 0 0;
-}
-.airlineMg .el-dialog .el-form-item__label {
+  }
+
+  .airlineMg .el-dialog .el-form-item__label {
     width: 100px !important;
-}
-.airlineMg .addCompany input {
+  }
+
+  .airlineMg .addCompany input {
     width: 208px;
-}
-/* 上传样式 */
-.airlineMg .avatar-uploader .el-upload {
+  }
+
+  /* 上传样式 */
+  .airlineMg .avatar-uploader .el-upload {
     border: 1px dashed #d9d9d9;
     cursor: pointer;
     position: relative;
@@ -145,11 +169,13 @@
     width: 100px;
     height: 100px;
     border-radius: 50%;
-}
-.airlineMg .avatar-uploader .el-upload:hover {
+  }
+
+  .airlineMg .avatar-uploader .el-upload:hover {
     border-color: #409eff;
-}
-.airlineMg .avatar-uploader-icon {
+  }
+
+  .airlineMg .avatar-uploader-icon {
     font-size: 28px;
     color: white;
     width: 100px;
@@ -160,23 +186,26 @@
     left: 0;
     top: 0;
     background: rgba(0, 0, 0, 0.5);
-}
-.airlineMg .avatar {
+  }
+
+  .airlineMg .avatar {
     width: 100px;
     height: 100px;
     display: block;
     position: absolute;
     left: 0;
     top: 0;
-}
-.airlineMg .repUp {
+  }
+
+  .airlineMg .repUp {
     font-size: 12px;
     position: absolute;
     left: 25px;
     bottom: 10px;
     color: white;
-}
-.airlineMg .tips {
+  }
+
+  .airlineMg .tips {
     width: 85px;
     color: #e95252;
     font-size: 12px;
@@ -184,39 +213,57 @@
     position: absolute;
     top: 30px;
     right: 90px;
-}
-.airlineMg .el-checkbox .el-checkbox,
-.el-checkbox + .el-checkbox {
+  }
+
+  .airlineMg .el-checkbox .el-checkbox,
+  .el-checkbox+.el-checkbox {
     margin: 0;
     margin-left: 10px;
-}
-.airlineMg .el-checkbox {
+  }
+
+  .airlineMg .el-checkbox {
     margin: 0;
     width: 90px;
     margin-left: 10px;
-}
-.airlineMg .ckek_box {
+  }
+
+  .airlineMg .ckek_box {
     position: relative;
-}
-.airlineMg .chekAll {
+  }
+
+  .airlineMg .chekAll {
     position: absolute;
     left: -67px;
     top: 45px;
     margin: 0;
-}
-.airlineMg .query-box li label {
+  }
+
+  .airlineMg .query-box li label {
     display: inline-block;
     min-width: 80px;
     text-align: right;
     font-style: normal;
     margin: 0 20px 0 0;
-}
-.airlineMg .el-dialog .el-form-item__label {
+  }
+
+  .airlineMg .el-dialog .el-form-item__label {
     width: 100px !important;
-}
-.airlineMg .airUpBtn{float:left;margin-left:0!important;}
-.airlineUpbtn{margin-right:7px;}
-.airlineMg .icon-weibiaoti-{position: relative;top:2px;}
+  }
+
+  .airlineMg .airUpBtn {
+    float: left;
+    margin-left: 0 !important;
+  }
+
+  .airlineUpbtn {
+    margin-right: 7px;
+  }
+
+  .airlineMg .icon-weibiaoti- {
+    position: relative;
+    top: 2px;
+  }
+
 </style>
 <template>
   <div class="flexOne airlineMg">
@@ -228,11 +275,13 @@
         </li>
         <li>
           <label class="">{{$t('system.query_IATA')}}</label>
-          <el-input v-model="msg.AlCode" :placeholder="$t('system.ph_in')" maxlength="3" @keyup.native.enter="getList"></el-input>
+          <el-input v-model="msg.AlCode" :placeholder="$t('system.ph_in')" maxlength="3" @keyup.native.enter="getList">
+          </el-input>
         </li>
         <li>
           <label class="">{{$t('system.query_ICAO')}}</label>
-          <el-input v-model="msg.TicketCode" :placeholder="$t('system.ph_in')" maxlength="4" @keyup.native.enter="getList"></el-input>
+          <el-input v-model="msg.TicketCode" :placeholder="$t('system.ph_in')" maxlength="4"
+            @keyup.native.enter="getList"></el-input>
         </li>
         <li>
           <input type="button" class="hollowFixedBtn" value="查询" @click="resetPageIndex(),getList()" /> &nbsp;
@@ -262,15 +311,16 @@
         <!-- <div class="edit" v-show="chosenIndex==index" @click="outerVisible = true,dialogTitle='修改航空公司',updateData(index)">
           <p><i class='el-icon-edit-outline'></i>{{$t('system.table_edit')}}</p>
         </div> -->
-        <input type="button" class="normalBtn airUpBtn airlineUpbtn" value="修改信息" @click="outerVisible = true,dialogTitle='修改航空公司',updateData(index)"  />
+        <input type="button" class="normalBtn airUpBtn airlineUpbtn" value="修改信息"
+          @click="outerVisible = true,dialogTitle='修改航空公司',updateData(index)" />
         <input type="button" class="normalBtn airUpBtn" value="账户管理" @click="goBackAccount(item)" />
       </div>
     </div>
     <div class="noData" v-show="noData">
       {{$t('system.content_noData')}}
     </div>
-    <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage" layout="total,prev, pager, next, jumper"
-      :page-size=msg.pageSize :total=total>
+    <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
+      layout="total,prev, pager, next, jumper" :page-size=msg.pageSize :total=total>
     </el-pagination>
     <el-dialog center custom-class='insideDialog' width="100" title="提示信息" :visible.sync="innerVisible" append-to-body>
       {{this.insideDialogTxt}}
@@ -278,29 +328,34 @@
         <button class="normalBtn" type="primary" @click="innerVisible=false">{{$t('pub.sureBtn')}}</button>
       </div>
     </el-dialog>
-    <el-dialog custom-class='addCompany' :title="dialogTitle" :visible.sync="outerVisible" center :before-close="closeChangeMachie">
+    <el-dialog custom-class='addCompany' :title="dialogTitle" :visible.sync="outerVisible" center
+      :before-close="closeChangeMachie">
       <el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="100px">
         <el-form-item :label="$t('system.query_airName')" prop="AlName">
-          <el-input type="text" v-model="addMsg.AlName" :placeholder="$t('system.ph_airName')" maxlength="20"></el-input>
+          <el-input type="text" v-model="addMsg.AlName" :placeholder="$t('system.ph_airName')" maxlength="20">
+          </el-input>
         </el-form-item>
         <el-form-item :label="$t('system.query_IATA')" prop="AlCode">
           <el-input type="text" v-model="addMsg.AlCode" :placeholder="$t('system.ph_IATA')" maxlength="3"></el-input>
         </el-form-item>
         <el-form-item :label="$t('system.query_ICAO')" prop="TicketCode">
-          <el-input type="text" v-model="addMsg.TicketCode" :placeholder="$t('system.ph_ICAO')" maxlength="4"></el-input>
+          <el-input type="text" v-model="addMsg.TicketCode" :placeholder="$t('system.ph_ICAO')" maxlength="4">
+          </el-input>
         </el-form-item>
         <el-form-item label="父级公司" prop="TicketCode">
           <el-select v-model="addMsg.ParentId" filterable placeholder="请选择">
             <el-option label="无" value='0'></el-option>
-            <el-option :label="item.AlName" :value='item.AirLineId' v-for="item in allCompanyData" :key="item.ID"></el-option>
+            <el-option :label="item.AlName" :value='item.AirLineId' v-for="item in allCompanyData" :key="item.ID">
+            </el-option>
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('system.table_kfPhone')" prop="ServiceTel">
-          <el-input type="text" v-model="addMsg.ServiceTel" :placeholder="$t('system.ph_kfphone')" maxlength="12"></el-input>
+          <el-input type="text" v-model="addMsg.ServiceTel" :placeholder="$t('system.ph_kfphone')" maxlength="12">
+          </el-input>
         </el-form-item>
         <el-form-item :label="$t('system.table_logoImg')">
-          <el-upload class="avatar-uploader" :action="importFileUrl" :show-file-list="false" :on-success="handleAvatarSuccess"
-            :before-upload="beforeAvatarUpload">
+          <el-upload class="avatar-uploader" :action="importFileUrl" :show-file-list="false"
+            :on-success="handleAvatarSuccess" :before-upload="beforeAvatarUpload">
             <img v-if="imageUrl" :src="imageUrl" class="avatar">
             <i class="el-icon-upload2  avatar-uploader-icon"></i>
             <span v-if="imageUrl" class="repUp">{{$t('system.up_againUp')}}</span>
@@ -314,7 +369,8 @@
           <el-switch v-model="addMsg.AutomaticGeneration" active-value="1" inactive-value="0"></el-switch>
         </el-form-item>
         <el-form-item :label="$t('system.table_ticketCont')" calss="ckek_box" v-if='addMsg.AutomaticGeneration=="1"'>
-          <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange" class="chekAll">{{$t('system.table_chekAll')}}</el-checkbox>
+          <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange"
+            class="chekAll">{{$t('system.table_chekAll')}}</el-checkbox>
           <el-checkbox-group v-model="checkedCities" @change="handleCheckedCitiesChange">
             <el-checkbox v-for="city in cities" :label="city" :key="city">{{city}}</el-checkbox>
           </el-checkbox-group>
@@ -323,13 +379,14 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <button class="normalBtn" type="primary" @click="submitForm('addMsg')">{{$t('pub.saveBtn')}}</button> &nbsp;
-        <button class="hollowFixedBtn" @click="outerVisible = false,resetForm('addMsg')">{{$t('pub.cancelBtn')}}</button>
+        <button class="hollowFixedBtn"
+          @click="outerVisible = false,resetForm('addMsg')">{{$t('pub.cancelBtn')}}</button>
       </div>
     </el-dialog>
   </div>
 </template>
 <script>
-const cityOptions = [
+  const cityOptions = [
     "客人姓",
     "客人名",
     "英文姓",
@@ -349,8 +406,8 @@ const cityOptions = [
     "条码号",
     "备注",
     "分房"
-];
-export default {
+  ];
+  export default {
     data() {
       return {
         msg: {
@@ -371,8 +428,7 @@ export default {
           ticket_requirements: "",
           ParentId: "0"
         },
-      importFileUrl:
-        this.domainManager().UploadFileUrl +
+        importFileUrl: this.domainManager().UploadFileUrl +
           "?cmd=User_post_FileUpload&fileType=1&fileLimit=10",
         defaultImg: 'this.src="' + require("../../assets/img/bg_z1@2x.png") + '"',
         checkAll: false,
@@ -391,15 +447,12 @@ export default {
         insideDialogTxt: "保存成功！",
         dialogTitle: "",
         rules: {
-        AlName: [
-          {
+          AlName: [{
             required: true,
             message: "请输入航空公司名称",
             trigger: "blur"
-          }
-        ],
-        AlCode: [
-          {
+          }],
+          AlCode: [{
               required: true,
               message: "请输入IATA",
               trigger: "blur"
@@ -409,8 +462,7 @@ export default {
               message: "请输正确的IATA"
             }
           ],
-        TicketCode: [
-          {
+          TicketCode: [{
               required: true,
               message: "请输入ICAO",
               trigger: "blur"
@@ -438,7 +490,7 @@ export default {
               if (this.total > 0) {
                 res.data.data.pageData.forEach(x => {
                   if (x.image) {
-                  x.image =this.domainManager().ViittoFileUrl+ x.image;
+                    x.image = this.domainManager().ViittoFileUrl + x.image;
                   }
                 });
                 this.noData = false;
@@ -456,8 +508,7 @@ export default {
       },
       getAllAirCompany() {
         this.apipost(
-        "airline_post_GetList",
-        {},
+          "airline_post_GetList", {},
           res => {
             if (res.data.resultCode == 1) {
               this.allCompanyData = res.data.data;
@@ -528,7 +579,6 @@ export default {
           if (valid) {
             this.addAirline();
           } else {
-          console.log("error submit!!");
             return false;
           }
         });
@@ -562,8 +612,6 @@ export default {
         this.$refs[formName].resetFields();
       },
       handleAvatarSuccess(res, file) {
-      //上传
-      console.log("上传文件", res);
         if (res.resultCode == 1) {
           var img_path = res.data.FullFilePath;
           this.addMsg.image = res.data.FilePath;
@@ -603,7 +651,12 @@ export default {
       goBackAccount(item) {
         this.$router.push({
           name: "empBankAccount",
-        query: { id: item.AirLineId, type: 6 ,blank:'y',tab:'账户管理'}
+          query: {
+            id: item.AirLineId,
+            type: 6,
+            blank: 'y',
+            tab: '账户管理'
+          }
         });
       }
     },
@@ -611,5 +664,6 @@ export default {
       this.getList();
       this.getAllAirCompany();
     }
-};
+  };
+
 </script>

src/components/busManagement/busUsePrice.vue

 <style>
-.busUsePrice .busList {
-  width: 200px;
-  height: 280px;
+  .busUsePrice .busList {
+    width: 230px;
+    height: 240px;
     float: left;
-  margin:0 10px 10px 0;
+    margin: 0 10px 10px 0;
     background-color: #fff;
     border-radius: 4px;
     font-size: 12px;
     overflow: hidden;
-}
-.busUsePrice .busListTop {
+  }
+
+ .busUsePrice .busListTable{
+   width: 98%;
+   margin: 0px 2px 0px 2px;
+ }
+  .busUsePrice .busListTable tr td{
+    height: 20px;
+    line-height: 20px;
+ }
+  .busUsePrice .busListTop {
     width: 100%;
     position: relative;
     text-align: center;
-}
-.busUsePrice .usePricediv {
+  }
+
+  .busUsePrice .usePricediv {
     margin: 7px 0 0 20px;
-}
-.busUsePrice .btmAddStore {
+  }
+
+  .busUsePrice .btmAddStore {
     border-top: 1px solid #d1d1d1;
     width: 100%;
     display: none;
@@ -26,86 +37,112 @@
     position: fixed;
     background: #f9f9f9;
     bottom: 0;
-}
-.busUsePrice .changeMsg {
+  }
+
+  .busUsePrice .changeMsg {
     width: 80%;
-}
-.busUsePrice .changeMsg li {
+  }
+
+  .busUsePrice .changeMsg li {
     float: left;
-}
-.busUsePrice .changeMsg li:first-child {
+  }
+
+  .busUsePrice .changeMsg li:first-child {
     margin-left: 20px;
-}
-.busUsePrice .btmTitle {
+  }
+
+  .busUsePrice .btmTitle {
     padding: 0 10px;
     margin: 20px 0 20px 25px;
     border-left: 3px solid #e95252;
     font-size: 14px;
     color: #000000;
-}
-.busUsePrice .busUsePeople .el-input__inner {
+  }
+
+  .busUsePrice .busUsePeople .el-input__inner {
     border-top-right-radius: 0;
     border-bottom-right-radius: 0;
-}
-.busUsePrice .busType {
+  }
+
+  .busUsePrice .busType {
     margin: 10px 0 0 31px;
     font-size: 14px;
     display: inline-block;
-}
-.busUsePrice .cityBtnList {
+  }
+
+  .busUsePrice .cityBtnList {
     margin: 10px 0 20px 20px;
-}
-.busUsePrice .busUserBtnList {
+  }
+
+  .busUsePrice .busUserBtnList {
     width: 100%;
     text-align: center;
     margin-top: 10px;
-}
-.busUsePrice .busListTop img {
+  }
+
+  .busUsePrice .busListTop img {
     width: 100%;
-}
-.busUsePrice .BusTypeStr {
+  }
+
+  .busUsePrice .BusTypeStr {
     position: absolute;
     top: 15px;
     color: #fff;
     font-size: 25px;
     left: 63px;
-}
-.busUsePrice .UPBtn {
+  }
+
+  .busUsePrice .UPBtn {
     width: 70px;
     height: 23px;
-}
-.busUsePrice .topNotice {
+  }
+
+  .busUsePrice .topNotice {
     width: 100%;
     height: 20px;
     font-size: 12px;
     text-align: left;
     margin: 20px 0;
-}
-.busUsePrice .delScien {
+  }
+
+  .busUsePrice .delScien {
     position: absolute;
     right: 10px;
     top: 10px;
     display: none;
-}
-.busUsePrice .delScien:hover {
+  }
+
+  .busUsePrice .delScien:hover {
     color: #f76f6f;
     cursor: pointer;
-}
-.busUsePrice .busList:hover .delScien {
+  }
+
+  .busUsePrice .busList:hover .delScien {
     display: block;
-}
-.busUsePrice .busDiv {
+  }
+
+  .busUsePrice .busDiv {
     margin-top: 20px;
-}
-.busUsePrice .busList:hover {
+  }
+
+  .busUsePrice .busList:hover {
     box-shadow: 0px 0px 20px rgba(191, 191, 191, 1);
     transition: all linear 0.5s;
-}
-.Bus_BtnList{text-align: right;margin-bottom: 10px;}
-.Bus_Spacing{margin-left:24px;}
-.busUsePrice .combottomDiv .el-select{
-  width:100%;
-}
+  }
+
+  .Bus_BtnList {
+    text-align: right;
+    margin-bottom: 10px;
+  }
+
+  .Bus_Spacing {
+    margin-left: 24px;
+  }
+
+  .busUsePrice .combottomDiv .el-select {
+    width: 100%;
+  }
+
 </style>
 <template>
   <div class="flexOne busUsePrice">
@@ -122,26 +159,43 @@
     <div class="busDiv clearfix" v-loading="loading">
       <div class="busList" v-for="item in dataList" :key="item.subCode">
         <div class="busListTop">
-          <img src="../../assets/img/suplier.jpg">
+          <img v-if="item.ShowBusImage" :src="item.ShowBusImage" style="width:230px;height:60px;" />
+          <img v-else src="../../assets/img/suplier.jpg" style="width:200px;height:60px;" />
           <span class="BusTypeStr">{{item.BusTypeStr}}</span>
           <div class="delScien" @click="isdelete(item.Id)">
             <i class="iconfont icon-xingzhuang"></i>
           </div>
         </div>
-        <div class="usePricediv">使用人数：{{item.UseNum}}人</div>
-        <div class="usePricediv">接机报价：{{item.ReceivePrice}}</div>
-        <div class="usePricediv">送机报价：{{item.SendPrice}}</div>
-        <div class="usePricediv">全天报价：{{item.AllDayPrice}}</div>
-        <div class="usePricediv">半天报价：{{item.HalfDayPrice}}</div>
-        <div class="usePricediv">小时报价：{{item.HourPrice}}</div>
-        <div class="usePricediv">地<span class="Bus_Spacing">区</span>：{{getArea(item.AreaType)}}</div>
+        <table class="busListTable">
+          <tr>
+            <td style="width:49%;">使用人数：{{item.UseNum}}人</td>
+            <td style="width:49%;">地<span class="Bus_Spacing">区</span>：{{getArea(item.AreaType)}}</td>
+          </tr>
+          <tr>
+            <td>接送报价：{{item.ReceivePrice}}</td>
+            <td>全天报价：{{item.AllDayPrice}}</td>
+          </tr>
+          <tr>
+            <td colspan="2">
+              半天报价：{{item.HalfDayPrice}}
+            </td>
+          </tr>
+          <tr>
+            <td>全天高速：{{item.AllDayHighSpeedFee}}</td>
+            <td>接送高速：{{item.PickUpHighSpeedFee}}</td>
+          </tr>
+          <tr>
+            <td>全天茶代：{{item.AllDayChaDaiFee}}</td>
+            <td>接送茶代：{{item.PickUpChaDaiFee}}</td>
+          </tr>
+        </table>
         <div class="busUserBtnList">
           <input type="button" class="normalBtn" @click="managePrice(item.Id)" value="管理报价">
         </div>
       </div>
     </div>
-    <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage" layout="total,prev, pager, next, jumper"
-      :page-size="this.msg.pageSize" :total="total">
+    <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
+      layout="total,prev, pager, next, jumper" :page-size="this.msg.pageSize" :total="total">
     </el-pagination>
 
     <div class="combottomDiv" v-if="isShow">
@@ -173,18 +227,19 @@
           </el-col>
           <el-col :span="5">
             <el-form-item label="使用人数" prop="UseNum">
-              <el-input placeholder="人数" v-model="addMsg.UseNum" @keyup.native="checkInteger(addMsg,'UseNum')" class="busUsePeople">
+              <el-input placeholder="人数" v-model="addMsg.UseNum" @keyup.native="checkInteger(addMsg,'UseNum')"
+                class="busUsePeople">
                 <template slot="append">以下</template>
               </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="5">
-            <el-form-item label="接机报价" prop="ReceivePrice">
+            <el-form-item label="接送报价" prop="ReceivePrice">
               <el-input v-model="addMsg.ReceivePrice" @keyup.native="checkPrice(addMsg,'ReceivePrice')"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="5">
-            <el-form-item label="送机报价" prop="SendPrice">
+            <el-form-item label="送机报价" prop="SendPrice" style="display:none;">
               <el-input v-model="addMsg.SendPrice" @keyup.native="checkPrice(addMsg,'SendPrice')"></el-input>
             </el-form-item>
           </el-col>
@@ -198,16 +253,41 @@
               <el-input v-model="addMsg.HalfDayPrice" @keyup.native="checkPrice(addMsg,'HalfDayPrice')"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="5">
+          <el-col :span="5" style="display:none;">
             <el-form-item label="小时报价" prop="HourPrice">
               <el-input v-model="addMsg.HourPrice" @keyup.native="checkPrice(addMsg,'HourPrice')"></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="5">
+            <el-form-item label="全天高速" prop="AllDayHighSpeedFee">
+              <el-input v-model="addMsg.AllDayHighSpeedFee" @keyup.native="checkPrice(addMsg,'HourPrice')"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <el-form-item label="接送高速" prop="PickUpHighSpeedFee">
+              <el-input v-model="addMsg.PickUpHighSpeedFee" @keyup.native="checkPrice(addMsg,'PickUpHighSpeedFee')">
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <el-form-item label="全天茶代" prop="AllDayChaDaiFee">
+              <el-input v-model="addMsg.AllDayChaDaiFee" @keyup.native="checkPrice(addMsg,'AllDayChaDaiFee')">
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <el-form-item label="接送茶代" prop="PickUpChaDaiFee">
+              <el-input v-model="addMsg.PickUpChaDaiFee" @keyup.native="checkPrice(addMsg,'PickUpChaDaiFee')">
+              </el-input>
+            </el-form-item>
+          </el-col>
+
           <el-col :span="5">
             <el-form-item label="币种" prop="CurrencyId">
-                <el-select  filterable  v-model='addMsg.CurrencyId' @change="getRate(addMsg.CurrencyId)" >
+              <el-select filterable v-model='addMsg.CurrencyId' @change="getRate(addMsg.CurrencyId)">
                 <el-option label='不限' :value="selectDefauleValue"></el-option>
-                    <el-option v-for="item in currencyTypeList" :key="item.ID" :value="item.ID" :label="item.Name"></el-option>
+                <el-option v-for="item in currencyTypeList" :key="item.ID" :value="item.ID" :label="item.Name">
+                </el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -216,6 +296,16 @@
               <el-input v-model="addMsg.CurrentRate" @keyup.native="checkRate(addMsg,'CurrentRate')"></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="5">
+            <el-form-item label="车辆图片">
+              <el-upload class="avatar-uploader" :http-request="UploadImage" :multiple="false"
+                accept="image/jpeg,image/gif,image/png,image/bmp" :show-file-list="false" action="">
+                <img v-if="addMsg.ShowBusImage&&addMsg.ShowBusImage!=''" :src="addMsg.ShowBusImage"  
+                  style="width:200px;height:100px">
+                <i class="el-icon-upload2  avatar-uploader-icon"></i>
+              </el-upload>
+            </el-form-item>
+          </el-col>
           <el-col :span="10">
             <el-form-item label="说明" prop="Remark">
               <el-input type="textarea" autosize placeholder="请输入内容" v-model="addMsg.Remark">
@@ -229,7 +319,7 @@
 </template>
 
 <script>
-export default {
+  export default {
     data() {
       var DealAreaValidate = (rule, value, callback) => {
         if (value === 0) {
@@ -252,9 +342,9 @@ export default {
         loading: false,
         isShow: false,
         BusTypeList: "",
-      selectDefauleValue:0,
-      AreaList:[],
-      currencyTypeList:[],
+        selectDefauleValue: 0,
+        AreaList: [],
+        currencyTypeList: [],
         msg: {
           pageIndex: 1,
           pageSize: 18
@@ -270,76 +360,101 @@ export default {
           HalfDayPrice: "",
           HourPrice: "",
           Remark: "",
-        AreaType:0,
-        CurrencyId:0,
-        CurrentRate: 0
+          AreaType: 0,
+          CurrencyId: 0,
+          CurrentRate: 0,
+          AllDayHighSpeedFee: 0, //全天高速费
+          PickUpHighSpeedFee: 0, //接送高速费
+          AllDayChaDaiFee: 0, //全天茶代费
+          PickUpChaDaiFee: 0, //接送茶代费
+          BusImage: '', //车辆图片
+          ShowBusImage: "",
         },
         //表单验证
         rules: {
           AreaType: [{
             validator: DealAreaValidate,
             trigger: "change",
-            required:true
-          }
-        ],
-        CurrencyId:[{
+            required: true
+          }],
+          CurrencyId: [{
             validator: validateCurrency,
             trigger: "change",
-            required:true
+            required: true
           }],
-        BusType: [
-          {
+          BusType: [{
             required: true,
             message: "请选择车辆类型",
             trigger: "change"
-          }
-        ],
-        UseNum: [
-          {
+          }],
+          UseNum: [{
             required: true,
             message: "请输入人数",
             trigger: "change"
-          }
-        ],
-        ReceivePrice: [
-          {
+          }],
+          ReceivePrice: [{
             required: true,
             message: "请输入接机价格",
             trigger: "change"
-          }
-        ],
-        SendPrice: [
-          {
+          }],
+          SendPrice: [{
             required: true,
             message: "请输入送机价格",
             trigger: "change"
-          }
-        ],
-        AllDayPrice: [
-          {
+          }],
+          AllDayPrice: [{
             required: true,
             message: "请输入全天价格",
             trigger: "change"
-          }
-        ],
-        HalfDayPrice: [
-          {
+          }],
+          HalfDayPrice: [{
             required: true,
             message: "请输入全天价格",
             trigger: "change"
-          }
-        ],
-        HourPrice: [
-          {
+          }],
+          HourPrice: [{
             required: true,
             message: "请输入小时价格",
             trigger: "change"
-          }
-        ]
+          }],
+          AllDayHighSpeedFee: [{
+            required: true,
+            message: "请输入全天高速价格",
+            trigger: "change"
+          }],
+          PickUpHighSpeedFee: [{
+            required: true,
+            message: "请输入接送高速价格",
+            trigger: "change"
+          }],
+          AllDayChaDaiFee: [{
+            required: true,
+            message: "请输入全天茶代价格",
+            trigger: "change"
+          }],
+          PickUpChaDaiFee: [{
+            required: true,
+            message: "请输入接送茶代价格",
+            trigger: "change"
+          }]
         }
       };
     },
     methods: {
+      //上传图片
+      UploadImage(file) {
+        let newArr = [];
+        newArr.push(file.file);
+        let fileName = file.file.name;
+        var path = "/Upload/DMC/";
+        this.UploadSelfFileT(path, newArr, x => {
+          var obj = this.$DMCUtils.DMCImageObj();
+          var str = x.name;
+          var imgUrl = this.domainManager().ViittoFileUrl + x.data.FilePath;
+          this.addMsg.BusImage = x.data.FilePath;
+          this.addMsg.ShowBusImage = imgUrl;
+        });
+      },
       handleCurrentChange(val) {
         this.msg.pageIndex = val;
         this.initData();
@@ -355,7 +470,7 @@ export default {
           this.msg,
           res => {
             this.loading = false;
-          if(res.data.resultCode==1){
+            if (res.data.resultCode == 1) {
               this.dataList = res.data.data.pageData;
               this.total = res.data.data.count;
             }
@@ -381,12 +496,11 @@ export default {
         );
       },
       //获取地区下拉
-    getAreaList(){
+      getAreaList() {
         this.apipost(
-        "busprice_get_GetBusAreaType",
-        {},
+          "busprice_get_GetBusAreaType", {},
           res => {
-          if(res.data.resultCode==1){
+            if (res.data.resultCode == 1) {
               this.AreaList = res.data.data;
             }
           },
@@ -394,23 +508,23 @@ export default {
         );
       },
       //根据ID获取地区
-    getArea(AreaType){
-      var AreaName='';
-      this.AreaList.forEach(item=>{
-        if(item.Id==AreaType){
+      getArea(AreaType) {
+        var AreaName = '';
+        this.AreaList.forEach(item => {
+          if (item.Id == AreaType) {
             AreaName = item.Name
           }
         })
         return AreaName;
       },
-    getCurrencyType(){  // 币种类型
-        this.apipost('financeinfo_post_GetList',{Name:''},res=>{
-            if(res.data.resultCode==1){
+      getCurrencyType() { // 币种类型
+        this.apipost('financeinfo_post_GetList', {
+          Name: ''
+        }, res => {
+          if (res.data.resultCode == 1) {
             this.currencyTypeList = res.data.data;
-            }else{
-
           }
-        },err=>{})
+        }, err => {})
       },
 
       //修改管理报价
@@ -472,9 +586,14 @@ export default {
           HalfDayPrice: "",
           HourPrice: "",
           Remark: "",
-        AreaType:0,
-        CurrencyId:0,
-        CurrentRate: 0
+          AreaType: 0,
+          CurrencyId: 0,
+          CurrentRate: 0,
+          AllDayHighSpeedFee: 0,
+          PickUpHighSpeedFee: 0,
+          AllDayChaDaiFee: 0,
+          PickUpChaDaiFee: 0,
+          BusImage: ''
         };
       },
       submitForm(addMsg) {
@@ -494,7 +613,7 @@ export default {
       //删除
       isdelete(ID) {
         var that = this;
-      this.Confirm("是否删除?", function() {
+        this.Confirm("是否删除?", function () {
           var msg = {
             ID: ID
           };
@@ -517,5 +636,6 @@ export default {
       this.getCurrencyType();
       this.getBusTypeList();
     }
-};
+  };
+
 </script>