Browse Source

修改请假信息

root 3 months ago
parent
commit
95e6851f79
2 changed files with 25 additions and 27 deletions
  1. 13 15
      src/components/CpdmLeave.vue
  2. 12 12
      src/components/CpdmLeaveEdit.vue

+ 13 - 15
src/components/CpdmLeave.vue

@@ -56,9 +56,9 @@ const ruleForm = reactive<RuleForm>({
     isKnow: '1',
     //同行人电话
     companionsPhone: '',
-    //母亲电话
+    //家长电话
     motherPhone: '',
-    //父亲电话
+    //紧急联系人电话
     fatherPhone: '',
     //出行方式
     travelMode: '',
@@ -97,16 +97,15 @@ const rules = reactive<FormRules<RuleForm>>({
     ],
 
     companionsPhone: [
-        { required: false, message: '请填写同行人电话', trigger: 'blur' },
         { pattern: /^1[3456789]\d{9}$/, message: '手机号码格式不正确', trigger: 'blur' }
     ],
 
     motherPhone: [
-        { required: true, message: '请填写母亲电话', trigger: 'blur' },
+        { required: true, message: '请填写家长电话', trigger: 'blur' },
         { pattern: /^1[3456789]\d{9}$/, message: '手机号码格式不正确', trigger: 'blur' }
     ],
     fatherPhone: [
-        { required: true, message: '请填写父亲电话', trigger: 'blur' },
+        { required: true, message: '请填写紧急联系人电话', trigger: 'blur' },
         { pattern: /^1[3456789]\d{9}$/, message: '手机号码格式不正确', trigger: 'blur' }
     ],
     travelMode: [
@@ -206,7 +205,7 @@ const subLeaveInfo = async () => {
             isKnow: ruleForm.isKnow,//父母是否知情
             leaveType: ruleForm.leaveType,//请假类型--离郑不离郑
             // monitorName: ruleForm.monitorName,//班长名字
-            motherPhone: ruleForm.motherPhone,//母亲电话
+            motherPhone: ruleForm.motherPhone,//家长电话
             reason: ruleForm.reason,//请假原因
             startTime: format(ruleForm.startTime, 'yyyy-MM-dd HH:mm:ss'),//请假开始时间
             travelMode: ruleForm.travelMode,//出行方式
@@ -223,7 +222,7 @@ const subLeaveInfo = async () => {
             isKnow: ruleForm.isKnow,//父母是否知情
             leaveType: ruleForm.leaveType,//请假类型--离郑不离郑
             monitorName: ruleForm.monitorName,//班长名字
-            motherPhone: ruleForm.motherPhone,//母亲电话
+            motherPhone: ruleForm.motherPhone,//家长电话
             reason: ruleForm.reason,//请假原因
             startTime: format(ruleForm.startTime, 'yyyy-MM-dd HH:mm:ss'),//请假开始时间
             travelMode: ruleForm.travelMode,//出行方式
@@ -270,7 +269,6 @@ const leaveStatus = (val: string) => {
             { required: true, message: '请填写班长姓名', trigger: 'blur' },
         ]
         rules.companionsPhone = [
-            { required: true, message: '请填写同行人电话', trigger: 'blur' },
             { pattern: /^1[3456789]\d{9}$/, message: '手机号码格式不正确', trigger: 'blur' }
         ]
         //这样回触发校验
@@ -430,11 +428,11 @@ defineExpose({ open })
                             <el-input v-model="ruleForm.companionsPhone" placeholder="请输入同行人电话" />
                         </el-form-item>
 
-                        <el-form-item label="母亲电话" prop="motherPhone">
-                            <el-input v-model="ruleForm.motherPhone" placeholder="请输入母亲电话" />
+                        <el-form-item label="家长电话" prop="motherPhone">
+                            <el-input v-model="ruleForm.motherPhone" placeholder="请输入家长电话" />
                         </el-form-item>
-                        <el-form-item label="父亲电话" prop="fatherPhone">
-                            <el-input v-model="ruleForm.fatherPhone" placeholder="请输入父亲电话" />
+                        <el-form-item label="紧急联系人电话" prop="fatherPhone">
+                            <el-input v-model="ruleForm.fatherPhone" placeholder="请输入紧急联系人电话" />
                         </el-form-item>
                         <el-form-item label="出行方式" prop="travelMode">
                             <el-input v-model="ruleForm.travelMode" placeholder="请输入出行方式" />
@@ -455,7 +453,7 @@ defineExpose({ open })
                         <el-button type="success" @click="submitForm(ruleFormRef)" :disabled="buttonStatus"
                             style="border-radius: 40px;padding:10px 40px">提交</el-button>
                     </div>
-                    <div class="leave_tip"> 温馨提示:(天气寒冷,晚上行人少,为保证大家安全,返校时间尽量在21:00之前)
+                    <div class="leave_tip"> 温馨提示:(天气寒冷,晚上行人少,为保证大家安全,返校时间尽量在21:00之前。如需纸质假条,请到辅导员办公室办理。
                     </div>
                 </div>
                 <div v-show="type == '2'" style="padding:10px 20px">
@@ -472,8 +470,8 @@ defineExpose({ open })
                             align="center" />
                         <!-- <el-table-column prop="isKnow" label="父母是否知情" width="" :formatter="isKnowFormatter" /> -->
                         <!-- <el-table-column prop="companionsPhone" label="同行人电话" width="" /> -->
-                        <!-- <el-table-column prop="motherPhone" label="母亲电话" width="" />
-                        <el-table-column prop="fatherPhone" label="父亲电话" width="" /> -->
+                        <!-- <el-table-column prop="motherPhone" label="家长电话" width="" />
+                        <el-table-column prop="fatherPhone" label="紧急联系人电话" width="" /> -->
                         <el-table-column prop="travelMode" label="出行方式" width="" show-overflow-tooltip align="center" />
                         <el-table-column prop="startTime" label="请假时间" width="" show-overflow-tooltip align="center" />
                         <el-table-column prop="endTime" label="返校时间" width="" show-overflow-tooltip align="center" />

+ 12 - 12
src/components/CpdmLeaveEdit.vue

@@ -55,9 +55,9 @@ const ruleForm = reactive<any>({
     isKnow: '1',
     //同行人电话
     companionsPhone: '',
-    //母亲电话
+    //家长电话
     montherPhone: '',
-    //父亲电话
+    //紧急联系人电话
     fatherPhone: '',
     //出行方式
     travelMode: '',
@@ -98,11 +98,11 @@ const rules = reactive<FormRules<any>>({
     ],
 
     motherPhone: [
-        { required: true, message: '请填写母亲电话', trigger: 'blur' },
+        { required: true, message: '请填写家长电话', trigger: 'blur' },
         { pattern: /^1[3456789]\d{9}$/, message: '手机号码格式不正确', trigger: 'blur' }
     ],
     fatherPhone: [
-        { required: true, message: '请填写父亲电话', trigger: 'blur' },
+        { required: true, message: '请填写紧急联系人电话', trigger: 'blur' },
         { pattern: /^1[3456789]\d{9}$/, message: '手机号码格式不正确', trigger: 'blur' }
     ],
     travelMode: [
@@ -206,7 +206,7 @@ const subLeaveInfo = async () => {
             // isKnow: ruleForm.isKnow,//父母是否知情
             // leaveType: ruleForm.leaveType,//请假类型--离郑不离郑
             // // monitorName: ruleForm.monitorName,//班长名字
-            // motherPhone: ruleForm.motherPhone,//母亲电话
+            // motherPhone: ruleForm.motherPhone,//家长电话
             // reason: ruleForm.reason,//请假原因
             // startTime: format(ruleForm.startTime, 'yyyy-MM-dd HH:mm:ss'),//请假开始时间
             // travelMode: ruleForm.travelMode,//出行方式
@@ -237,7 +237,7 @@ const subLeaveInfo = async () => {
             // isKnow: ruleForm.isKnow,//父母是否知情
             // leaveType: ruleForm.leaveType,//请假类型--离郑不离郑
             // monitorName: ruleForm.monitorName,//班长名字
-            // motherPhone: ruleForm.motherPhone,//母亲电话
+            // motherPhone: ruleForm.motherPhone,//家长电话
             // reason: ruleForm.reason,//请假原因
             // startTime: format(ruleForm.startTime, 'yyyy-MM-dd HH:mm:ss'),//请假开始时间
             // travelMode: ruleForm.travelMode,//出行方式
@@ -300,7 +300,7 @@ const leaveStatus = (val: string) => {
             { required: true, message: '请填写班长姓名', trigger: 'blur' },
         ]
         rules.companionsPhone = [
-            { required: true, message: '请填写同行人电话', trigger: 'blur' },
+            { required: false, message: '请填写同行人电话', trigger: 'blur' },
             { pattern: /^1[3456789]\d{9}$/, message: '手机号码格式不正确', trigger: 'blur' }
         ]
         //这样回触发校验
@@ -368,11 +368,11 @@ defineExpose({ open })
                         <el-input v-model="ruleForm.companionsPhone" placeholder="请输入同行人电话" :disabled="flagView" />
                     </el-form-item>
 
-                    <el-form-item label="母亲电话" prop="motherPhone">
-                        <el-input v-model="ruleForm.motherPhone" placeholder="请输入母亲电话" :disabled="flagView" />
+                    <el-form-item label="家长电话" prop="motherPhone">
+                        <el-input v-model="ruleForm.motherPhone" placeholder="请输入家长电话" :disabled="flagView" />
                     </el-form-item>
-                    <el-form-item label="父亲电话" prop="fatherPhone">
-                        <el-input v-model="ruleForm.fatherPhone" placeholder="请输入父亲电话" :disabled="flagView" />
+                    <el-form-item label="紧急联系人电话" prop="fatherPhone">
+                        <el-input v-model="ruleForm.fatherPhone" placeholder="请输入紧急联系人电话" :disabled="flagView" />
                     </el-form-item>
                     <el-form-item label="出行方式" prop="travelMode">
                         <el-input v-model="ruleForm.travelMode" placeholder="请输入出行方式" :disabled="flagView" />
@@ -393,7 +393,7 @@ defineExpose({ open })
                     <el-button type="success" @click="submitForm(ruleFormRef)" :disabled="buttonStatus"
                         style="border-radius: 40px;padding:10px 40px">提交</el-button>
                 </div>
-                <div class="leave_tip"> 温馨提示:(天气寒冷,晚上行人少,为保证大家安全,返校时间尽量在21:00之前)
+                <div class="leave_tip"> 温馨提示:(天气寒冷,晚上行人少,为保证大家安全,返校时间尽量在21:00之前。如需纸质假条,请到辅导员办公室办理。
                 </div>
             </div>
         </template>