领队奖励金

src/components/TravelManager/TravelLeader/Leader.vue

@@ -71,6 +71,7 @@
   margin: 0 40px 40px 0;
   float: left;
   border-radius: 4px;
+  position: relative;
 }
 .Leader .topInfo {
   width: 100%;
@@ -181,6 +182,30 @@
 .Leader .leftCode canvas {
   height: 60px;
 }
+.Leader ._sanjiao_{
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 0;
+  height: 0;
+  border-top: 20px solid #e73828;
+  border-bottom: 20px solid transparent;
+  border-left: 20px solid #e73828;
+  border-right: 20px solid transparent;
+  z-index: 20;
+}
+.Leader ._sanjiao_:after {
+  content: '外';
+  position: absolute;
+  top: -15px;
+  left: -14px;
+  white-space: nowrap;
+  color: #FFFFFF;
+  font-size: 12px;
+}
+.Leader ._sanjiao_._sanjiao_lin:after{
+ content: '临';
+}
 </style>
 <template>
   <div class="flexOne Leader">
@@ -220,6 +245,8 @@
     </div>
     <div class="contentDiv clearfix">
       <div class="listDiv" v-for="item in DataList" :key="item.Code">
+        <div class="_sanjiao_" v-if="item.LeaderGuidClass==1"></div>
+        <div class="_sanjiao_ _sanjiao_lin" v-if="item.LeaderGuidClass==2"></div>
         <div class="topInfo clearfix">
           <div class="leftImg">
             <div class="">
@@ -263,9 +290,10 @@
     <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_workType')" prop="Type">
-          <el-select v-model="addMsg.Type" :placeholder="$t('admin.admin_workType')" class="w210">
-            <el-option v-for='item in workTypeList' :key="item.Value" :label="item.Key" :value="item.Value">
-            </el-option>
+          <el-select v-model="addMsg.LeaderGuidClass" :placeholder="$t('admin.admin_workType')" class="w210">
+            <el-option key="0" label="公司领队" :value="0"></el-option>
+            <el-option key="1" label="同行领队" :value="1"></el-option>
+            <el-option key="2" label="临时领队" :value="2"></el-option>
           </el-select>
         </el-form-item>
         <div class="cn_name clearfix">
@@ -366,6 +394,18 @@
             <el-radio label="1">{{$t('pub.singleTime')}}</el-radio>
           </el-radio-group>
         </el-form-item>
+        <template>
+          <el-form-item label="账号过期" v-if="addMsg.LeaderGuidClass!== '0'" prop="ValidDate" class='time'>
+            <el-date-picker class="w210" v-model="addMsg.ValidDate" type="date" :placeholder="$t('admin.admin_choDate')"
+              value-format="yyyy-MM-dd">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="账号过期" v-else class='time'>
+            <el-date-picker class="w210" v-model="addMsg.ValidDate" type="date" :placeholder="$t('admin.admin_choDate')"
+              value-format="yyyy-MM-dd">
+            </el-date-picker>
+          </el-form-item>
+        </template>
         <el-form-item :label="$t('hotel.hotel_remark')">
           <el-input type="textarea" v-model="addMsg.Remarks" class="w210"></el-input>
         </el-form-item>
@@ -405,7 +445,7 @@ export default {
       },
       addMsg: {
         ID: "0",
-        Type: "",
+        Type: 1,
         EmployeeId: "",
         Surname: "",
         Name: "",
@@ -425,7 +465,9 @@ export default {
         LanguageId: "",
         Remarks: "",
         VisaNumber: "",
-        LeaderGuidType: ""
+        LeaderGuidType: "",
+        LeaderGuidClass: "",
+        ValidDate: "",
       },
       SexOptions: [
         {
@@ -597,6 +639,13 @@ export default {
             trigger: "change"
           }
         ],
+        ValidDate: [
+          {
+            required: true,
+            message: "请选择过期日",
+            trigger: "change"
+          }
+        ],
         BirthPlace: [
           {
             required: true,

src/components/TravelManager/TravelList/TeamBalancePayment.vue

@@ -1191,7 +1191,7 @@
             <th width="200">当前审核人</th>
           </tr>
           <template v-for="item in DataList.FinicePayList">
-            <tr v-if="isExists(item.CostTypeList,'领队佣金')">
+            <tr v-if="isExists(item.CostTypeList,'领队佣金') || isExists(item.CostTypeList,'领队奖励金')">
               <td>
                 <el-checkbox v-model="item.checked"></el-checkbox>
                 <span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span>

src/components/administrative/Temporarystaff.vue

@@ -79,7 +79,7 @@
 				<th>{{$t('system.table_acc')}}</th>
 				<th>{{$t('adm.adm_logintel')}}</th>
 				<th>{{$t('admin.admin_Entrytime')}}</th>
-				<th>{{$t('admin.admin_Departuretime')}}</th>
+				<th>{{$t('hotel.hotel_status')}}</th>
 				<th>{{$t('admin.admin_operate')}}</th>
 			</tr>
 			<tr v-for="(item,index) in DataList" v-loading='loading'>
@@ -185,7 +185,7 @@
 									:value='item.PostId'
 									:key='item.PostId'>
 								</el-option>
-							  </el-select>	                 
+							  </el-select>
 			                </el-form-item>	
 				       </td>
 				       <td>