From b84687c39b240a47fb238285fa28f533a22e4ee8 Mon Sep 17 00:00:00 2001
From: fl <3098731433@qq.com>
Date: Tue, 4 Mar 2025 13:51:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E5=A4=96=E5=87=BA=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=9F=B9=E8=AE=AD=E6=8A=A5=E5=A4=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/process/outApply/index.vue | 122 ++++++++++++++++++---------
 1 file changed, 82 insertions(+), 40 deletions(-)

diff --git a/src/views/process/outApply/index.vue b/src/views/process/outApply/index.vue
index 2a3ade6..47424aa 100644
--- a/src/views/process/outApply/index.vue
+++ b/src/views/process/outApply/index.vue
@@ -1,7 +1,18 @@
 <template>
   <div class="app-container" id="outApply">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="申请时间" prop="leaveDate">
+      <el-form-item label="姓名" prop="userName">
+        <el-input v-model="queryParams.userName" placeholder="请输入姓名" clearable style="width: 240px"
+                  @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="是否培训" prop="isTrain">
+        <el-select v-model="queryParams.isTrain" placeholder="是否培训" clearable style="width: 240px">
+          <el-option label="是" value="1"/>
+          <el-option label="否" value="0"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="日期">
         <el-date-picker
           v-model="queryParams.leaveDate" :clearable="false"
           type="date" value-format="yyyy-MM-dd" style="width: 95%"
@@ -84,6 +95,11 @@
       </el-table-column>
       <el-table-column label="外出时长(天)" align="center" prop="leaveDuration" :show-overflow-tooltip="true"
                        width="180"/>
+      <el-table-column label="是否培训" align="center" prop="isTrain" width="100">
+        <template slot-scope="scope">
+          <span>{{ scope.row.isTrain === '1' ? '是' : '否' }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="审批状态" align="center" prop="examineStatus" :show-overflow-tooltip="true" width="100">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.apply_status" :value="scope.row.examineStatus"/>
@@ -253,6 +269,18 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="是否培训：" prop="isTrain">
+              <el-radio-group v-model="form.isTrain">
+                <el-radio
+                  v-for="item in isAgreeList"
+                  :key="item.id"
+                  :label="item.id"
+                >{{ item.name }}
+                </el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="24">
@@ -307,8 +335,8 @@ export default {
   components: {Treeselect},
   data() {
     return {
-      userInfo: this.$store.state.user,
-      orgList: this.$store.state.user.orgList,
+      userInfo: {},
+      orgList: [],
       // 遮罩层
       loading: false,
       // 选中数组
@@ -322,19 +350,7 @@ export default {
       // 总条数
       total: 0,
       // 表格数据
-      tableList: [
-        {
-          userName: "张三",
-          orgName: "公司机关/分公司机关/×××项目部",
-          createTime: "2024-08-28 17：28",
-          leaveStartDate: "2024-08-29",
-          leaveStartInterval: "1",
-          leaveEndDate: "2024-08-29",
-          leaveEndInterval: "2",
-          leaveDuration: "1",
-          examineStatus: "0",
-        }
-      ],
+      tableList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -350,9 +366,9 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        leaveType: "临时外出",
-        leaveDate: undefined,
-        examineStatus: undefined
+        userName: undefined,
+        attStatus: undefined,
+        isTrain: undefined
       },
       personOptions: [],
       typeList: [{value: '1', label: '固定班制'}, {value: '2', label: '自由工时'}],
@@ -361,44 +377,64 @@ export default {
         label: '周四'
       }, {id: 4, label: '周五'}, {id: 5, label: '周六'}, {id: 6, label: '周日'}],
       // 表单参数
-      form: {},
+      form: {
+        userId: undefined,
+        userName: undefined,
+        orgId: undefined,
+        leaveStartDate: undefined,
+        leaveStartInterval: undefined,
+        leaveEndDate: undefined,
+        leaveEndInterval: undefined,
+        leaveDuration: undefined,
+        leaveType: "临时外出",
+        examineStatus: "0",
+        isAgree: "0",
+        isTrain: "0",
+        hostUserId: [],
+        leaveReason: undefined,
+        location: undefined,
+        remark: undefined
+      },
       // 表单校验
       rules: {
         userName: [
-          {required: true, message: "申请人不能为空", trigger: "blur"}
+          { required: true, message: "申请人不能为空", trigger: "blur" }
         ],
         postName: [
-          {required: true, message: "职务不能为空", trigger: "blur"}
+          { required: true, message: "职务不能为空", trigger: "blur" }
         ],
         orgId: [
-          {required: true, message: "所属部门不能为空", trigger: "blur"}
+          { required: true, message: "所属部门不能为空", trigger: "blur" }
         ],
         leaveStartDate: [
-          {required: true, message: "外出开始时间不能为空", trigger: "blur"}
+          { required: true, message: "外出开始时间不能为空", trigger: "blur" }
         ],
         leaveStartInterval: [
-          {required: true, message: "不能为空", trigger: "change"}
+          { required: true, message: "不能为空", trigger: "change" }
         ],
         leaveEndDate: [
-          {required: true, message: "外出结束时间不能为空", trigger: "blur"}
+          { required: true, message: "外出结束时间不能为空", trigger: "blur" }
         ],
         leaveEndInterval: [
-          {required: true, message: "不能为空", trigger: "change"}
+          { required: true, message: "不能为空", trigger: "change" }
         ],
         leaveDuration: [
-          {required: true, message: "外出时长不能为空", trigger: "blur"}
+          { required: true, message: "外出时长不能为空", trigger: "blur" }
         ],
         location: [
-          {required: true, message: "是否请示领导不能为空", trigger: "blur"}
+          { required: true, message: "地点不能为空", trigger: "blur" }
         ],
         isAgree: [
-          {required: true, message: "是否请示领导不能为空", trigger: "blur"}
+          { required: true, message: "是否请示领导不能为空", trigger: "blur" }
+        ],
+        isTrain: [
+          { required: true, message: "是否培训不能为空", trigger: "blur" }
         ],
         hostUserId: [
-          {required: true, message: "代理主持工作人员不能为空", trigger: "blur"}
+          { required: true, message: "代理主持工作人员不能为空", trigger: "blur" }
         ],
         leaveReason: [
-          {required: true, message: "外出事由不能为空", trigger: "blur"}
+          { required: true, message: "外出事由不能为空", trigger: "blur" }
         ]
       },
       // 开始日期选择限制
@@ -432,11 +468,18 @@ export default {
     };
   },
   created() {
+    this.initUserInfo();
     this.getList();
     this.getUserLists();
     this.getDeptList();
   },
   methods: {
+    initUserInfo() {
+      this.userInfo = this.$store.state.user;
+      this.orgList = this.$store.state.user.orgList;
+      this.form.userId = this.userInfo.id;
+      this.form.userName = this.userInfo.name;
+    },
     async handleDateChange() {
       if (this.form.leaveStartDate && this.form.leaveEndDate) {
         await this.daysBetween(this.form.leaveStartDate, this.form.leaveEndDate)
@@ -468,11 +511,6 @@ export default {
       await getDaysDate(data).then(response => {
         this.daysNumber = response.data.date;
       });
-      // const oneDay = 24 * 60 * 60 * 1000;
-      // const date1Ms = new Date(date1).getTime()
-      // const date2Ms = new Date(date2).getTime()
-      // const diff = Math.abs(date1Ms - date2Ms); // 计算两日期的差值
-      // return diff / oneDay; // 返回天数
     },
     /** 查询列表 */
     getList() {
@@ -499,8 +537,8 @@ export default {
     // 表单重置
     reset() {
       this.form = {
-        userId: this.userInfo.id,
-        userName: this.userInfo.name,
+        userId: undefined,
+        userName: undefined,
         orgId: undefined,
         leaveStartDate: undefined,
         leaveStartInterval: undefined,
@@ -510,8 +548,11 @@ export default {
         leaveType: "临时外出",
         examineStatus: "0",
         isAgree: "0",
+        isTrain: "0",
         hostUserId: [],
         leaveReason: undefined,
+        location: undefined,
+        remark: undefined
       };
       this.resetForm("form");
     },
@@ -524,6 +565,7 @@ export default {
     resetQuery() {
       this.dateRange = [];
       this.resetForm("queryForm");
+      this.queryParams.isTrain = undefined;
       this.handleQuery();
     },
     /** 新增按钮操作 */
@@ -624,7 +666,7 @@ export default {
           const containsZero = userIdArray.includes('0');
           const containsOtherValues = userIdArray.some(id => id !== '0');
           if (containsZero && containsOtherValues) {
-            this.$modal.msgError("选择’/‘后不能在选择其他人员");
+            this.$modal.msgError("选择'/'后不能在选择其他人员");
             return;
           }