From 20834c7cd2e0cf1713fa29a4f7c12396b1e50f27 Mon Sep 17 00:00:00 2001
From: lSun <15893999301@qq.com>
Date: Thu, 21 Nov 2024 09:44:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=B7=AE=EF=BC=8C=E8=AF=B7=E5=81=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/process/evection/index.vue       | 38 ++++++++++++---------
 src/views/process/leaveReporting/index.vue | 39 ++++++++++++----------
 2 files changed, 44 insertions(+), 33 deletions(-)

diff --git a/src/views/process/evection/index.vue b/src/views/process/evection/index.vue
index 2ec1a76..832ac5c 100644
--- a/src/views/process/evection/index.vue
+++ b/src/views/process/evection/index.vue
@@ -61,8 +61,8 @@
       <el-table-column label="出差开始时间" align="center" prop="leaveStartDate" :show-overflow-tooltip="true" width="180">
         <template slot-scope="scope">
           <div>{{ scope.row.leaveStartDate }}
-            <span v-show="scope.row.leaveStartInterval=='1'">上午</span>
-            <span v-show="scope.row.leaveStartInterval=='2'">下午</span>
+<!--            <span v-show="scope.row.leaveStartInterval=='1'">上午</span>-->
+<!--            <span v-show="scope.row.leaveStartInterval=='2'">下午</span>-->
           </div>
         </template>
       </el-table-column>
@@ -70,8 +70,8 @@
       <el-table-column label="出差结束时间" align="center" prop="leaveEndDate" :show-overflow-tooltip="true" width="180">
         <template slot-scope="scope">
           <div>{{ scope.row.leaveEndDate }}
-            <span v-show="scope.row.leaveEndInterval=='1'">上午</span>
-            <span v-show="scope.row.leaveEndInterval=='2'">下午</span>
+<!--            <span v-show="scope.row.leaveEndInterval=='1'">上午</span>-->
+<!--            <span v-show="scope.row.leaveEndInterval=='2'">下午</span>-->
           </div>
         </template>
       </el-table-column>
@@ -150,7 +150,7 @@
         </el-row>
 
         <el-row>
-          <el-col :span="8">
+          <el-col :span="12">
             <el-form-item label="出差开始时间：" prop="leaveStartDate">
               <el-date-picker
                 v-model="form.leaveStartDate" :clearable="false"
@@ -159,7 +159,7 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-          <el-col :span="4">
+<!--          <el-col :span="4">
             <el-form-item prop="leaveStartInterval" label-width="0px">
               <el-select v-model="form.leaveStartInterval" style="width: 80%;margin-left: 30px;"
                          @change="handleDateChange">
@@ -171,8 +171,8 @@
                 />
               </el-select>
             </el-form-item>
-          </el-col>
-          <el-col :span="8">
+          </el-col>-->
+          <el-col :span="12">
             <el-form-item label="出差结束时间:" prop="leaveEndDate">
               <el-date-picker
                 v-model="form.leaveEndDate" :clearable="false"
@@ -181,7 +181,7 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-          <el-col :span="4">
+<!--          <el-col :span="4">
             <el-form-item prop="leaveEndInterval" label-width="0px">
               <el-select v-model="form.leaveEndInterval" style="width: 80%;margin-left: 30px;"
                          @change="handleDateChange">
@@ -193,7 +193,7 @@
                 />
               </el-select>
             </el-form-item>
-          </el-col>
+          </el-col>-->
         </el-row>
         <el-row>
           <el-col :span="12">
@@ -241,7 +241,7 @@
 
         <el-row>
           <el-col :span="24">
-            <el-form-item label="休假事由：" prop="leaveReason">
+            <el-form-item label="出差事由：" prop="leaveReason">
               <el-input type="textarea" v-model="form.leaveReason" maxlength="200"></el-input>
             </el-form-item>
           </el-col>
@@ -333,15 +333,15 @@ export default {
         leaveStartDate: [
           {required: true, message: "出差开始时间不能为空", trigger: "blur"}
         ],
-        leaveStartInterval: [
+        /*leaveStartInterval: [
           {required: true, message: "不能为空", trigger: "change"}
-        ],
+        ],*/
         leaveEndDate: [
           {required: true, message: "出差结束时间不能为空", trigger: "blur"}
         ],
-        leaveEndInterval: [
+        /*leaveEndInterval: [
           {required: true, message: "不能为空", trigger: "change"}
-        ],
+        ],*/
         leaveDuration: [
           {required: true, message: "出差时长不能为空", trigger: "blur"}
         ],
@@ -353,7 +353,11 @@ export default {
         ],
         hostUserId: [
           {required: true, message: "代理主持工作人员不能为空", trigger: "blur"}
-        ]
+        ],
+        leaveReason: [
+          {required: true, message: "出差事由不能为空", trigger: "blur"}
+        ],
+
       },
       // 开始日期选择限制
       startPickerOptions: {
@@ -380,6 +384,8 @@ export default {
   },
   methods: {
     handleDateChange() {
+      this.form.leaveStartInterval = 1;
+      this.form.leaveEndInterval = 2;
       if (this.form.leaveStartDate && this.form.leaveEndDate) {
         let daysNumber = this.daysBetween(this.form.leaveStartDate, this.form.leaveEndDate)
         // console.log(daysNumber)
diff --git a/src/views/process/leaveReporting/index.vue b/src/views/process/leaveReporting/index.vue
index f060683..0327c0a 100644
--- a/src/views/process/leaveReporting/index.vue
+++ b/src/views/process/leaveReporting/index.vue
@@ -61,8 +61,8 @@
       <el-table-column label="休假开始时间" align="center" prop="leaveStartDate" :show-overflow-tooltip="true" width="180">
         <template slot-scope="scope">
           <div>{{ scope.row.leaveStartDate }}
-            <span v-show="scope.row.leaveStartInterval=='1'">上午</span>
-            <span v-show="scope.row.leaveStartInterval=='2'">下午</span>
+<!--            <span v-show="scope.row.leaveStartInterval=='1'">上午</span>-->
+<!--            <span v-show="scope.row.leaveStartInterval=='2'">下午</span>-->
           </div>
         </template>
       </el-table-column>
@@ -70,8 +70,8 @@
       <el-table-column label="休假结束时间" align="center" prop="leaveEndDate" :show-overflow-tooltip="true" width="180">
         <template slot-scope="scope">
           <div>{{ scope.row.leaveEndDate }}
-            <span v-show="scope.row.leaveEndInterval=='1'">上午</span>
-            <span v-show="scope.row.leaveEndInterval=='2'">下午</span>
+<!--            <span v-show="scope.row.leaveEndInterval=='1'">上午</span>-->
+<!--            <span v-show="scope.row.leaveEndInterval=='2'">下午</span>-->
           </div>
         </template>
       </el-table-column>
@@ -150,7 +150,7 @@
         </el-row>
 
         <el-row>
-          <el-col :span="8">
+          <el-col :span="12">
             <el-form-item label="休假开始时间：" prop="leaveStartDate">
               <el-date-picker
                 v-model="form.leaveStartDate" :clearable="false"
@@ -159,7 +159,7 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-          <el-col :span="4">
+<!--          <el-col :span="4">
             <el-form-item prop="leaveStartInterval" label-width="0px">
               <el-select v-model="form.leaveStartInterval" style="width: 80%;margin-left: 30px;"
                          @change="handleDateChange">
@@ -171,8 +171,8 @@
                 />
               </el-select>
             </el-form-item>
-          </el-col>
-          <el-col :span="8">
+          </el-col>-->
+          <el-col :span="12">
             <el-form-item label="休假结束时间:" prop="leaveEndDate">
               <el-date-picker
                 v-model="form.leaveEndDate" :clearable="false"
@@ -181,7 +181,7 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-          <el-col :span="4">
+<!--          <el-col :span="4">
             <el-form-item prop="leaveEndInterval" label-width="0px">
               <el-select v-model="form.leaveEndInterval" style="width: 80%;margin-left: 30px;"
                          @change="handleDateChange">
@@ -193,7 +193,7 @@
                 />
               </el-select>
             </el-form-item>
-          </el-col>
+          </el-col>-->
         </el-row>
         <el-row>
           <el-col :span="12">
@@ -333,15 +333,15 @@ export default {
         leaveStartDate: [
           {required: true, message: "休假开始时间不能为空", trigger: "blur"}
         ],
-        leaveStartInterval: [
-          {required: true, message: "不能为空", trigger: "change"}
-        ],
+        // leaveStartInterval: [
+        //   {required: true, message: "不能为空", trigger: "change"}
+        // ],
         leaveEndDate: [
           {required: true, message: "休假结束时间不能为空", trigger: "blur"}
         ],
-        leaveEndInterval: [
-          {required: true, message: "不能为空", trigger: "change"}
-        ],
+        // leaveEndInterval: [
+        //   {required: true, message: "不能为空", trigger: "change"}
+        // ],
         leaveDuration: [
           {required: true, message: "休假时长不能为空", trigger: "blur"}
         ],
@@ -353,7 +353,10 @@ export default {
         ],
         hostUserId: [
           {required: true, message: "代理主持工作人员不能为空", trigger: "blur"}
-        ]
+        ],
+        leaveReason: [
+          {required: true, message: "休假事由不能为空", trigger: "blur"}
+        ],
       },
       // 开始日期选择限制
       startPickerOptions: {
@@ -379,6 +382,8 @@ export default {
   },
   methods: {
     handleDateChange() {
+      this.form.leaveStartInterval = 1;
+      this.form.leaveEndInterval = 2;
       if (this.form.leaveStartDate && this.form.leaveEndDate) {
         let daysNumber = this.daysBetween(this.form.leaveStartDate, this.form.leaveEndDate)
         // console.log(daysNumber)