页面修改

src/components/Hotel/HotelSupplierHotel.vue

 <style>
-  .CM_look {
+.CM_look {
   padding: 4px !important;
   position: relative;
   top: 1px;
-  }
-
+}
 </style>
 <template>
   <div class="flexOne">
     <div class="query-box">
       <ul>
         <li>
-          <input type="button" class="normalBtn" :value="$t('pub.addBtn')" @click="isShow=true,dialogTitle=$t('ground.xinzengjdgyfs')" />
+          <input
+            type="button"
+            class="normalBtn"
+            :value="$t('pub.addBtn')"
+            @click="(isShow = true), (dialogTitle = $t('ground.xinzengjdgyfs'))"
+          />
         </li>
       </ul>
-      <el-dialog :title="dialogTitle" :visible.sync="isShow" center custom-class="w460">
+      <el-dialog
+        :title="dialogTitle"
+        :visible.sync="isShow"
+        center
+        custom-class="w460"
+      >
         <el-form :model="addMsg" label-width="100px">
           <el-form-item :label="$t('hotel.suplier_name')" prop="Name">
-            {{SupplierName}}
+            {{ SupplierName }}
           </el-form-item>
           <el-form-item :label="$t('hotel.hotel')">
-            <el-select v-model="addMsg.HotelId" filterable :placeholder="$t('pub.pleaseSel')" class="w220">
+            <el-select
+              v-model="addMsg.HotelId"
+              filterable
+              :placeholder="$t('pub.pleaseSel')"
+              class="w220"
+            >
               <el-option :label="$t('pub.pleaseSel')" :value="0"></el-option>
-              <el-option v-for='item in HotelList' :key="item.ID" :label="item.Name" :value="item.ID">
+              <el-option
+                v-for="item in HotelList"
+                :key="item.ID"
+                :label="item.Name"
+                :value="item.ID"
+              >
               </el-option>
             </el-select>
           </el-form-item>
           <el-form-item :label="$t('fnc.fkfangshi')">
-            <el-select v-model="addMsg.SubPayType" filterable :placeholder="$t('pub.pleaseSel')" class="w220">
+            <el-select
+              v-model="addMsg.SubPayType"
+              filterable
+              :placeholder="$t('pub.pleaseSel')"
+              class="w220"
+            >
               <el-option :label="$t('pub.pleaseSel')" :value="0"></el-option>
-              <el-option v-for='item in PayTypeList' :key="item.Id" :label="item.name" :value="item.Id">
+              <el-option
+                v-for="item in PayTypeList"
+                :key="item.Id"
+                :label="item.name"
+                :value="item.Id"
+              >
               </el-option>
             </el-select>
           </el-form-item>
           <el-form-item :label="$t('hotel.hotel_StartDate')">
-            <el-date-picker class="w220" type="date" v-model="addMsg.StartDate" :picker-options="pickerBeginDateBefore"
-              value-format="yyyy-MM-dd" placeholder></el-date-picker>
+            <el-date-picker
+              class="w220"
+              type="date"
+              v-model="addMsg.StartDate"
+              :picker-options="pickerBeginDateBefore"
+              value-format="yyyy-MM-dd"
+              placeholder
+            ></el-date-picker>
           </el-form-item>
 
           <el-form-item :label="$t('hotel.hotel_EndDate')">
-            <el-date-picker class="w220" type="date" v-model="addMsg.EndDate" :picker-options="pickerBeginDateAfter"
-              value-format="yyyy-MM-dd" placeholder></el-date-picker>
+            <el-date-picker
+              class="w220"
+              type="date"
+              v-model="addMsg.EndDate"
+              :picker-options="pickerBeginDateAfter"
+              value-format="yyyy-MM-dd"
+              placeholder
+            ></el-date-picker>
           </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <button class="hollowFixedBtn" @click="initData(),isShow = false">{{$t('pub.cancelBtn')}}</button> &nbsp;
-          <button class="normalBtn" type="primary" @click="SaveData()">{{$t('pub.sureBtn')}}</button>
+          <button class="hollowFixedBtn" @click="initData(), (isShow = false)">
+            {{ $t("pub.cancelBtn") }}
+          </button>
+          &nbsp;
+          <button class="normalBtn" type="primary" @click="SaveData()">
+            {{ $t("pub.sureBtn") }}
+          </button>
         </div>
       </el-dialog>
     </div>
-    <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
+    <table
+      class="singeRowTable"
+      border="0"
+      cellspacing="0"
+      cellpadding="0"
+      v-loading="loading"
+    >
       <tr>
-        <th>{{$t('hotel.hotel')}}</th>
-        <th>{{$t('hotel.hotel_StartDate')}}</th>
-        <th>{{$t('hotel.hotel_EndDate')}}</th>
-        <th>{{$t('fnc.fkfangshi')}}</th>
-        <th>{{$t('system.table_operation')}}</th>
+        <th>{{ $t("hotel.hotel") }}</th>
+        <th>{{ $t("hotel.hotel_StartDate") }}</th>
+        <th>{{ $t("hotel.hotel_EndDate") }}</th>
+        <th>{{ $t("fnc.fkfangshi") }}</th>
+        <th>{{ $t("system.table_operation") }}</th>
       </tr>
       <tr v-for="item in dataList">
-        <td>{{item.HotelName}}</td>
-        <td>{{item.StartDateStr}}</td>
-        <td>{{item.EndDateStr}}</td>
-        <td>{{item.SubPayTypeStr}}</td>
+        <td>{{ item.HotelName }}</td>
+        <td>{{ item.StartDateStr }}</td>
+        <td>{{ item.EndDateStr }}</td>
+        <td>{{ item.SubPayTypeStr }}</td>
         <td>
-          <el-tooltip class="item" effect="dark" :content="$t('system.table_edit')" placement="top-start">
-            <el-button type="primary" class="iconfont icon-bianji-smal"
-              @click="GetData(item.Id),isShow=true,dialogTitle=$t('ground.xinzengjdgyfs')"></el-button>
+          <el-tooltip
+            class="item"
+            effect="dark"
+            :content="$t('system.table_edit')"
+            placement="top-start"
+          >
+            <el-button
+              type="primary"
+              class="iconfont icon-bianji-smal"
+              @click="
+                GetData(item.Id),
+                  (isShow = true),
+                  (dialogTitle = $t('ground.xinzengjdgyfs'))
+              "
+            ></el-button>
           </el-tooltip>
         </td>
       </tr>
@@ -74,17 +138,17 @@
 </template>
 
 <script>
-  export default {
+export default {
   data() {
     return {
       msg: {
-          SupplierId: 0,
+        SupplierId: 0
       },
       loading: false,
       isShow: false, //是否显示新增修改
       //供应商名称
       SupplierName: "",
-        dialogTitle: this.$t('ground.xinzengjdgyfs'),
+      dialogTitle: this.$t("ground.xinzengjdgyfs"),
       //数据源
       dataList: [],
       HotelList: [], //酒店列表
@@ -95,33 +159,37 @@
         HotelId: 0,
         StartDate: "",
         EndDate: "",
-          SubPayType: 0,
+        SubPayType: 0
       },
       //付款方式
-        PayTypeList: [{
-          name: this.$t('ground.xianfu'),
+      PayTypeList: [
+        {
+          name: this.$t("ground.xianfu"),
           Id: 1
-        }, {
-          name: this.$t('ground.qiandan'),
+        },
+        {
+          name: this.$t("ground.qiandan"),
           Id: 2
-        }],
+        },
+        { name: this.$t("ground.yufu"), Id: 4 }
+      ],
       pickerBeginDateBefore: {
         disabledDate: time => {
           if (this.addMsg.EndDate == null) {
             return false;
           } else {
-              let endTime = new Date(this.addMsg.EndDate)
-              return endTime.getTime() < time.getTime()
+            let endTime = new Date(this.addMsg.EndDate);
+            return endTime.getTime() < time.getTime();
           }
         }
       },
       pickerBeginDateAfter: {
         disabledDate: time => {
-            let startTime = new Date(this.addMsg.StartDate)
-            return startTime.getTime() >= time.getTime()
-          }
+          let startTime = new Date(this.addMsg.StartDate);
+          return startTime.getTime() >= time.getTime();
         }
       }
+    };
   },
   mounted() {
     this.msg.SupplierId = this.$route.query.ID;
@@ -142,19 +210,19 @@
     },
     SaveData() {
       if (this.addMsg.HotelId <= 0) {
-          this.Info(this.$t('ground.qingxuanzejiud'));
+        this.Info(this.$t("ground.qingxuanzejiud"));
         return;
       }
       if (this.addMsg.SubPayType <= 0) {
-          this.Info(this.$t('ground.qingxuanzefkfs'));
+        this.Info(this.$t("ground.qingxuanzefkfs"));
         return;
       }
       if (this.addMsg.StartDate == "") {
-          this.Info(this.$t('ground.qingxuanzekssjs'));
+        this.Info(this.$t("ground.qingxuanzekssjs"));
         return;
       }
       if (this.addMsg.EndDate == "") {
-          this.Info(this.$t('ground.qingxuanzejssjs'));
+        this.Info(this.$t("ground.qingxuanzejssjs"));
         return;
       }
       this.apipost(
@@ -177,7 +245,8 @@
     //根据编号获取实体
     GetData(Id) {
       this.apipost(
-          "supplier_post_GetEntityService", {
+        "supplier_post_GetEntityService",
+        {
           Id: Id
         },
         res => {
@@ -217,7 +286,8 @@
     getHotelList() {
       this.loading = true;
       this.apipost(
-          "hotel_post_GetList", {
+        "hotel_post_GetList",
+        {
           QCountry: 651
         },
         res => {
@@ -230,8 +300,7 @@
         },
         null
       );
-      },
     }
   }
-
+};
 </script>

src/components/LeaderManagement/leaderReimbursement.vue

@@ -363,13 +363,24 @@
               <span v-else-if="subItem.DMCPayType === 9">月结</span>
               <span v-else-if="subItem.DMCPayType === 11">刷卡</span>
               <span v-else-if="subItem.DMCPayType === 10">领队导游垫付</span>
-              </br>
+              <br/>
               <span v-show="subItem.DMCPayType==6">付款团号：{{subItem.PayTypeTCNUM}}</span>
             </td>
             <td v-if="childIndex==0" :rowspan="6">
-              <span>{{subItem.SupplierName}} <span v-if="subItem.SupplierPayType !== 0"
-                  :style="{'color': subItem.SupplierPayType == 2 ? '#E95252': '#111111'}">{{subItem.SupplierPayType == 2 ? '签单' : '现付'}}</span></span>
-
+              <span>{{subItem.SupplierName}} 
+                <br/>
+                <template v-if="subItem.SupplierPayType !== 0">
+                  <span  v-if="subItem.SupplierPayType == 1">
+                      现付
+                  </span>
+                  <span  v-else-if="subItem.SupplierPayType == 2">
+                      签单
+                  </span>
+                  <span  v-else-if="subItem.SupplierPayType == 4">
+                      预付
+                  </span>
+                </template>
+              </span>
               <div v-if="subItem.IsHaveShouPeiFee==0" style="color:red;">无手配费</div>
               <div v-if="subItem.IsHaveShouPeiFee==1" style="color:red;">手配费:{{subItem.ShouPeiMoney}}</div>