Merge remote-tracking branch 'origin/master'

src/views/jy/evection/EvectionEditForm.vue

@@ -110,7 +110,7 @@
 				</el-col>
 				<el-col :span="24">
 					<el-form-item label="出差原因" prop="evectionReason"
-								  :rules="[ {required: true, message:'用车原因不能为空', trigger:'blur'}]">
+								  :rules="[ {required: true, message:'出差原因不能为空', trigger:'blur'}]">
 						<el-input :disabled="status === 'audit' || status === 'taskFormDetail' || method === 'view'" type="textarea" placeholder="请输入说明"  maxlength="500"  style="width:100%" v-model="inputForm.evectionReason" show-word-limit></el-input>
 					</el-form-item>
 				</el-col>

src/views/jy/evection/EvectionForm.vue

@@ -101,7 +101,7 @@
 				</el-col>
 				<el-col :span="24">
 					<el-form-item label="出差原因" prop="evectionReason"
-								  :rules="[ {required: true, message:'用车原因不能为空', trigger:'blur'}]">
+								  :rules="[ {required: true, message:'出差原因不能为空', trigger:'blur'}]">
 						<el-input :disabled="status === 'audit' || status === 'taskFormDetail' || method === 'view'" type="textarea" placeholder="请输入说明"  maxlength="500"  style="width:100%" v-model="inputForm.evectionReason" show-word-limit></el-input>
 					</el-form-item>
 				</el-col>

src/views/jy/goOut/GoOutEditForm.vue

@@ -109,8 +109,8 @@
 					</el-form-item>
 				</el-col>
 				<el-col :span="24">
-					<el-form-item label="出差原因" prop="outReason"
-								  :rules="[ {required: true, message:'用车原因不能为空', trigger:'blur'}]">
+					<el-form-item label="外出原因" prop="outReason"
+								  :rules="[ {required: true, message:'外出原因不能为空', trigger:'blur'}]">
 						<el-input :disabled="status === 'audit' || status === 'taskFormDetail' || method === 'view'" type="textarea" placeholder="请输入说明"  maxlength="500"  style="width:100%" v-model="inputForm.outReason" show-word-limit></el-input>
 					</el-form-item>
 				</el-col>

src/views/jy/goOut/GoOutForm.vue

@@ -100,8 +100,8 @@
 					</el-form-item>
 				</el-col>
 				<el-col :span="24">
-					<el-form-item label="出差原因" prop="outReason"
-								  :rules="[ {required: true, message:'用车原因不能为空', trigger:'blur'}]">
+					<el-form-item label="外出原因" prop="outReason"
+								  :rules="[ {required: true, message:'外出原因不能为空', trigger:'blur'}]">
 						<el-input :disabled="status === 'audit' || status === 'taskFormDetail' || method === 'view'" type="textarea" placeholder="请输入说明"  maxlength="500"  style="width:100%" v-model="inputForm.outReason" show-word-limit></el-input>
 					</el-form-item>
 				</el-col>