Эх сурвалжийг харах

需要改了X类试用申请转正

bding 1 сар өмнө
parent
commit
f4a960b0aa

+ 1 - 1
src/views/custom_manage/approvalTurn.vue

@@ -271,7 +271,7 @@ export default {
 		ContractTermTxt(){
 			let date = `${this.contractInfo.StartDate}-${this.contractInfo.EndDate}`;
 			let calculation = CalculationDate(this.contractInfo.StartDate,this.contractInfo.EndDate);
-			let str = this.contractInfo.Quarter ? this.contractInfo.Quarter + `(${date})` : date + `(${calculation})`;
+			let str = date + `(${calculation})`;
 			return str
 		}
 	},

+ 4 - 4
src/views/custom_manage/customList/applyTurn.vue

@@ -39,7 +39,7 @@
 			<div class="apply_info">
 				<h3 style="fontSize:16px;">申请信息</h3>
 				<div class="info_cont">
-					<span style="display:block;marginBottom:30px;color:#333;paddingLeft:10px;">申请内容:试用转正式</span>
+					<span v-if="!isRaiSellerShow" style="display:block;marginBottom:30px;color:#333;paddingLeft:10px;">申请内容:试用转正式</span>
 					<el-form 
 					@submit.native.prevent 
 					inline 
@@ -77,7 +77,7 @@
 						   	@select="handleSelectCreditCode"
 						></el-autocomplete>
 						</el-form-item>
-						<el-form-item label="合同期限" prop="term" style="marginRight:60px;" :rules="{ required: true, message: '合同期限不能为空', trigger: 'blur' }" v-if="!isXClassCustom">
+						<el-form-item label="合同期限" prop="term" style="marginRight:60px;" :rules="{ required: true, message: '合同期限不能为空', trigger: 'blur' }">
 							<i style="color:#f00;fontSize:20px;position:absolute;left:-90px;top:10%;">*</i>
 							<el-date-picker
 							v-model="formData.term"
@@ -91,7 +91,7 @@
 							style="width:400px;">
 							</el-date-picker>
 						</el-form-item>
-						<el-form-item label="合同期限" prop="term" :rules="{ required: true, message: '合同期限不能为空', trigger: 'change' }" style="marginRight:60px;" v-if="isXClassCustom">
+						<!-- <el-form-item label="合同期限" prop="term" :rules="{ required: true, message: '合同期限不能为空', trigger: 'change' }" style="marginRight:60px;" v-if="isXClassCustom">
 							<i style="color:#f00;fontSize:20px;position:absolute;left:-90px;top:10%;">*</i>
 							<div class="quarters-content">
 								<el-checkbox-group v-model="selectedQuarters" @input="checkboxInputHandler">
@@ -103,7 +103,7 @@
 										{{ selectedDateRange }}
 								</div>
 							</div>
-						</el-form-item>
+						</el-form-item> -->
 						<el-form-item label="合同金额" prop="amount" style="marginRight:60px;">
 							<i style="color:#f00;fontSize:20px;position:absolute;left:-90px;top:10%;">*</i>
 							<el-input