1

src/views/manage/leaveManage.vue

@@ -4,10 +4,8 @@
       <el-row>
         <el-col :span="24">
           <div class="search-head" style="padding-bottom: 10px">
-            <el-input v-model="userName" clearable placeholder="请输入姓名"></el-input
-            >&nbsp;&nbsp;&nbsp;&nbsp;
-            <el-input v-model="userNo" clearable placeholder="请输入学号"></el-input
-            >&nbsp;&nbsp;&nbsp;&nbsp;
+            <el-input v-model="userName" clearable placeholder="请输入姓名"></el-input>&nbsp;&nbsp;&nbsp;&nbsp;
+            <el-input v-model="userNo" clearable placeholder="请输入学号"></el-input>&nbsp;&nbsp;&nbsp;&nbsp;
             <!--    <el-select
               v-model="group3"
               clearable
@@ -32,12 +30,7 @@
             ></el-cascader>
             &nbsp;&nbsp;&nbsp;&nbsp; -->
             <el-select v-model="auditStatusObj" clearable placeholder="请选择状态">
-              <el-option
-                v-for="item in listOption"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              >
+              <el-option v-for="item in listOption" :key="item.value" :label="item.label" :value="item.value">
               </el-option>
             </el-select>
             <!-- &nbsp;&nbsp;&nbsp;&nbsp;
@@ -56,53 +49,25 @@
               <el-radio v-model="sex" label="0">女</el-radio>
             </div> -->
             &nbsp;&nbsp;&nbsp;&nbsp;
-            <el-button type="primary" round icon="el-icon-search" @click="searchTarget"
-              >搜索</el-button
-            >
+            <el-button type="primary" round icon="el-icon-search" @click="searchTarget">搜索</el-button>
             <el-button type="info" round @click="clearSearch">清空</el-button>
           </div>
         </el-col>
       </el-row>
 
       <div class="table-content" style="flex: 1; overflow: auto">
-        <el-table
-          height="100%"
-          :data="tableData"
-          :row-style="{ height: '0px' }"
-          :cell-style="{ padding: '5px' }"
-          :header-cell-style="{ background: '#F8F8F8', color: '#606266' }"
-        >
-          <el-table-column
-            show-overflow-tooltip
-            prop="userName"
-            label="姓名"
-            align="center"
-            width=""
-          >
+        <el-table height="100%" :data="tableData" :row-style="{ height: '0px' }" :cell-style="{ padding: '5px' }"
+          :header-cell-style="{ background: '#F8F8F8', color: '#606266' }">
+          <el-table-column show-overflow-tooltip prop="userName" label="姓名" align="center" width="">
           </el-table-column>
           <el-table-column prop="userNo" label="学号" align="center" width="">
           </el-table-column>
-          <el-table-column
-            prop="leaveType"
-            label="是否离郑"
-            width=""
-            :formatter="leaveTypeFormatter"
-          />
+          <el-table-column prop="leaveType" label="是否离郑" width="" :formatter="leaveTypeFormatter" />
           <!-- <el-table-column prop="userPhone" label="本人手机号码" width="" /> -->
           <!-- <el-table-column prop="monitorName" label="班长姓名" width="" />
           <el-table-column prop="dormitory" label="宿舍" width="" /> -->
-          <el-table-column
-            prop="reason"
-            label="请假原因"
-            :show-overflow-tooltip="true"
-            width=""
-          />
-          <el-table-column
-            prop="destination"
-            label="出行目的地"
-            :show-overflow-tooltip="true"
-            width=""
-          />
+          <el-table-column prop="reason" label="请假原因" :show-overflow-tooltip="true" width="" />
+          <el-table-column prop="destination" label="出行目的地" :show-overflow-tooltip="true" width="" />
           <!-- <el-table-column
             prop="isKnow"
             label="父母是否知情"
@@ -113,26 +78,11 @@
           <el-table-column prop="motherPhone" label="母亲电话" width="" />
           <el-table-column prop="fatherPhone" label="父亲电话" width="" /> -->
           <!-- <el-table-column prop="travelMode" label="出行方式" width="" /> -->
-          <el-table-column
-            prop="startTime"
-            label="请假时间"
-            :show-overflow-tooltip="true"
-            width=""
-          />
+          <el-table-column prop="startTime" label="请假时间" :show-overflow-tooltip="true" width="" />
 
-          <el-table-column
-            prop="endTime"
-            label="返校时间"
-            :show-overflow-tooltip="true"
-            width=""
-          />
+          <el-table-column prop="endTime" label="返校时间" :show-overflow-tooltip="true" width="" />
           <!-- <el-table-column prop="auditSuggest" label="审核建议" width="" /> -->
-          <el-table-column
-            prop="auditStatus"
-            label="审核状态"
-            width=""
-            :formatter="auditStatusFormatter"
-          />
+          <el-table-column prop="auditStatus" label="审核状态" width="" :formatter="auditStatusFormatter" />
           <!-- <el-table-column
            
             prop="auditResult"
@@ -142,17 +92,13 @@
           /> -->
           <el-table-column prop="auditResult" label="审核结果" width="100" align="center">
             <template slot-scope="scope">
-              <div
-                style="display: flex; justify-content: center; align-items: center"
-                v-show="scope.row.auditResult == '1'"
-              >
+              <div style="display: flex; justify-content: center; align-items: center"
+                v-show="scope.row.auditResult == '1'">
                 <img style="width: 14px" src="../../assets/img/table/dui.png" alt="" />&nbsp;
                 <div>通过</div>
               </div>
-              <div
-                style="display: flex; justify-content: center; align-items: center"
-                v-show="scope.row.auditResult == '0'"
-              >
+              <div style="display: flex; justify-content: center; align-items: center"
+                v-show="scope.row.auditResult == '0'">
                 <img style="width: 14px" src="../../assets/img/table/cuo.png" alt="" />&nbsp;
                 <div>驳回</div>
               </div>
@@ -161,19 +107,11 @@
           <el-table-column label="操作" width="150" align="center">
             <template slot-scope="scope">
               <div class="detail_button_out">
-                <div
-                  class="detail_button"
-                  @click="viewUser(scope.row)"
-                  v-show="scope.row.auditStatus == '1'"
-                >
+                <div class="detail_button" @click="viewUser(scope.row)" v-show="scope.row.auditStatus == '1'">
                   <img src="../../assets/img/table/search.png" />
                   <span> 查看 </span>
                 </div>
-                <div
-                  class="detail_button"
-                  @click="viewUser(scope.row)"
-                  v-show="scope.row.auditStatus == '0'"
-                >
+                <div class="detail_button" @click="viewUser(scope.row)" v-show="scope.row.auditStatus == '0'">
                   <img src="../../assets/img/table/pass.png" />
                   <span> 驳回/通过 </span>
                 </div>
@@ -204,30 +142,16 @@
         </el-table>
       </div>
       <!-- small -->
-      <el-pagination
-        class="pag_class"
-        background
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-        :current-page.sync="pageNum"
-        layout="total, sizes, prev, pager, next"
-        :page-size="pageSize"
-        :page-sizes="[10, 20, 50, 100]"
-        :total="total"
-      >
+      <el-pagination class="pag_class" background @size-change="handleSizeChange" @current-change="handleCurrentChange"
+        :current-page.sync="pageNum" layout="total, sizes, prev, pager, next" :page-size="pageSize"
+        :page-sizes="[10, 20, 50, 100]" :total="total">
       </el-pagination>
       <!-- <el-pagination small background layout="total prev, pager, next" :total="36">
       </el-pagination> -->
     </div>
     <Register ref="register" @search="searchTarget" />
-    <el-dialog
-      class="dig_update"
-      :visible.sync="centerDialogVisible"
-      width="90%"
-      center
-      top="5vh"
-      style="border-radius: 40px"
-    >
+    <el-dialog class="dig_update" :visible.sync="centerDialogVisible" width="90%" center top="5vh"
+      style="border-radius: 40px">
       <div slot="title">
         <div class="demo-ruleForm">
           <p class="dig_title" v-show="view.auditStatus == '1'">详情</p>
@@ -288,18 +212,18 @@
                 {{ view.isKnow == "1" ? "知情" : "不知情" }}
               </div>
             </div>
-            <div class="user_out">
+            <div class="user_out" v-if="view.leaveType == 1">
               <div class="user_out_sub">同行人电话</div>
               <div class="user_out_subNext">{{ view.companionsPhone }}&nbsp;</div>
             </div>
             <div class="user_out">
-              <div class="user_out_sub">母亲电话</div>
+              <div class="user_out_sub">家长电话</div>
               <div class="user_out_subNext">
                 {{ view.motherPhone }}
               </div>
             </div>
             <div class="user_out">
-              <div class="user_out_sub">父亲电话</div>
+              <div class="user_out_sub">紧急联系人电话</div>
               <div class="user_out_subNext">
                 {{ view.fatherPhone }}
               </div>
@@ -328,28 +252,14 @@
               <div class="user_out_sub">审核结果</div>
               <div class="user_out_subNext">
                 <div style="display: flex; align-items: center">
-                  <img
-                    src="../../assets/img/table/dui.png"
-                    style="width: 20px; height: 20px"
-                    alt=""
-                    v-show="view.auditResult == '1'"
-                  />
-                  <div
-                    v-show="view.auditResult == '1'"
-                    style="color: #12bb65; font-weight: 700"
-                  >
+                  <img src="../../assets/img/table/dui.png" style="width: 20px; height: 20px" alt=""
+                    v-show="view.auditResult == '1'" />
+                  <div v-show="view.auditResult == '1'" style="color: #12bb65; font-weight: 700">
                     &nbsp; 已同意
                   </div>
-                  <img
-                    src="../../assets/img/table/cuo.png"
-                    alt=""
-                    style="width: 20px; height: 20px"
-                    v-show="view.auditResult == '0'"
-                  />
-                  <div
-                    v-show="view.auditResult == '0'"
-                    style="color: #ff9000; font-weight: 700"
-                  >
+                  <img src="../../assets/img/table/cuo.png" alt="" style="width: 20px; height: 20px"
+                    v-show="view.auditResult == '0'" />
+                  <div v-show="view.auditResult == '0'" style="color: #ff9000; font-weight: 700">
                     &nbsp;已驳回
                   </div>
                   &nbsp;
@@ -375,30 +285,16 @@
               <div class="user_out_subNext" v-show="view.auditStatus == '1'">
                 {{ view.auditSuggest }}&nbsp;
               </div>
-              <div
-                class="user_out_subNext record"
-                style="background-color: #ffffff"
-                v-show="view.auditStatus == '0'"
-              >
+              <div class="user_out_subNext record" style="background-color: #ffffff" v-show="view.auditStatus == '0'">
                 <el-input v-model="record" placeholder="请输入审核建议" />
               </div>
             </div>
           </div>
           <div class="user_button_detail" v-show="view.auditStatus == '0'">
-            <el-button
-              type="success"
-              round
-              @click="submitCom(true)"
-              style="padding: 10px 40px"
-            >
+            <el-button type="success" round @click="submitCom(true)" style="padding: 10px 40px">
               通过
             </el-button>
-            <el-button
-              type="info"
-              round
-              @click="submitCom(false)"
-              style="padding: 10px 40px"
-            >
+            <el-button type="info" round @click="submitCom(false)" style="padding: 10px 40px">
               驳回
             </el-button>
           </div>
@@ -406,26 +302,14 @@
       </div>
     </el-dialog>
 
-    <el-dialog
-      class="dig_update"
-      :visible.sync="resetVisible"
-      width="30%"
-      center
-      style="border-radius: 40px"
-    >
+    <el-dialog class="dig_update" :visible.sync="resetVisible" width="30%" center style="border-radius: 40px">
       <div slot="title">
         <div class="demo-ruleForm">
           <p v-show="!isDelete" class="dig_title">审批提示</p>
           <p v-show="isDelete" class="dig_title">审批提示</p>
           <p v-show="!isDelete">确认驳回{{ userName }}的请假审批吗?</p>
-          <el-input
-            v-show="!isDelete"
-            type="textarea"
-            :rows="5"
-            placeholder="请输入驳回内容"
-            style="margin-top: 10px"
-            v-model="record"
-          >
+          <el-input v-show="!isDelete" type="textarea" :rows="5" placeholder="请输入驳回内容" style="margin-top: 10px"
+            v-model="record">
           </el-input>
           <p v-show="isDelete">确认通过{{ userName }}的请假审批吗?</p>
           <div class="dig_button">
@@ -542,7 +426,7 @@ export default {
       currentObj: {},
     };
   },
-  created() {},
+  created() { },
   mounted() {
     this.userInfo = JSON.parse(oSessionStorage.getItem("userInfo"));
     this.headers = {
@@ -616,8 +500,7 @@ export default {
         }
         this.filePath =
           basePath +
-          `/user/userImport?orgNo=${
-            this.groupLead[this.groupLead.length - 1]
+          `/user/userImport?orgNo=${this.groupLead[this.groupLead.length - 1]
           }&roleType=1&grade=${this.grade}`;
       } else if (this.userInfo.roleType == "3") {
         for (let i = 0; i < this.options3.length; i++) {
@@ -899,9 +782,8 @@ export default {
       //是通过还是驳回
       let url = "";
 
-      url = `/leave/approvalRecord?auditResult=${this.isDelete ? 1 : 0}&id=${
-        this.view.id
-      }${this.record == "" ? "" : `&auditSuggest=${this.record}`}`;
+      url = `/leave/approvalRecord?auditResult=${this.isDelete ? 1 : 0}&id=${this.view.id
+        }${this.record == "" ? "" : `&auditSuggest=${this.record}`}`;
       this.$http.get(url, {}, (res) => {
         this.centerDialogVisible = false;
         //  this.$toast.success({message:'成功'});
@@ -927,15 +809,12 @@ export default {
       let url = "";
       //测试
 
-      url = `/leave/findAllByCurrentUser?pageNum=${this.pageNum}&pageSize=${
-        this.pageSize
-      }${this.auditStatusObj == "" ? "" : `&auditStatus=${this.auditStatusObj}`}${
-        this.userName == ""
+      url = `/leave/findAllByCurrentUser?pageNum=${this.pageNum}&pageSize=${this.pageSize
+        }${this.auditStatusObj == "" ? "" : `&auditStatus=${this.auditStatusObj}`}${this.userName == ""
           ? ""
-          : `&userName=${this.userName}${
-              this.userNo == "" ? "" : `&userNo=${this.userNo}`
-            }`
-      }`;
+          : `&userName=${this.userName}${this.userNo == "" ? "" : `&userNo=${this.userNo}`
+          }`
+        }`;
       //院管理员进来的时候
 
       this.$http.get(url, {}, (res) => {
@@ -982,6 +861,7 @@ export default {
 .record /deep/ .el-input__inner {
   background-color: #ffffff !important;
 }
+
 .user_button_detail {
   width: 60%;
   margin-left: 20%;
@@ -998,6 +878,7 @@ export default {
 .pag_class /deep/.el-input__inner {
   width: 100% !important;
 }
+
 .pag_class /deep/.el-pagination--small span:not([class*="suffix"]) {
   height: 22px;
   line-height: 28px !important;
@@ -1040,12 +921,14 @@ export default {
 .add_user_class {
   margin-top: 10px;
 }
+
 .user_out_new {
   display: flex;
   flex-direction: row;
   flex-wrap: wrap;
   justify-content: space-between;
 }
+
 .user_out {
   display: flex;
   width: 48%;
@@ -1077,19 +960,23 @@ export default {
   line-height: 40px;
   text-align: left;
 }
+
 .detail_button_out {
   display: flex;
   justify-content: flex-start;
+
   .detail_button {
     margin-left: 20px;
     display: flex;
     align-items: center;
     cursor: pointer;
     letter-spacing: 2px;
+
     img {
       width: 15px;
       margin-right: 5px;
     }
+
     span {
       color: #00bf78;
       // font-weight: 600;
@@ -1105,20 +992,24 @@ export default {
   line-height: 40px;
   width: 100%;
 }
+
 .dig_update /deep/.el-dialog {
   box-shadow: none !important;
   background: transparent !important;
 }
+
 .demo-ruleForm /deep/ .el-form-item {
   margin-right: 10px;
   vertical-align: top;
   display: flex !important;
   flex-direction: column;
 }
+
 .demo-ruleForm /deep/.el-dialog__header {
   background-color: #ffffff;
   padding-left: 140px !important;
 }
+
 .demo-ruleForm /deep/.el-form-item__label {
   text-align: left;
   vertical-align: middle;
@@ -1158,6 +1049,7 @@ export default {
   border-radius: 20px;
   padding-top: 20px;
   padding-bottom: 20px;
+
   .dig_title {
     margin-bottom: 30px;
     text-align: center;