修改基本样式

src/views/manage/leaveManage.vue

@@ -4,16 +4,11 @@
       <el-row>
         <el-col :span="24">
           <div class="search-head" style="padding-bottom: 10px">
-            <!-- <el-input v-model="name" clearable placeholder="请输入姓名"></el-input
+            <el-input v-model="userName" clearable placeholder="请输入姓名"></el-input
             >&nbsp;&nbsp;&nbsp;&nbsp;
-
-            <el-input
-              v-model="studentNumber"
-              clearable
-              placeholder="请输入学号"
-            ></el-input
+            <el-input v-model="userNo" clearable placeholder="请输入学号"></el-input
             >&nbsp;&nbsp;&nbsp;&nbsp;
-            <el-select
+            <!--    <el-select
               v-model="group3"
               clearable
               placeholder="请选择组织架构"
@@ -71,7 +66,7 @@
 
       <div class="table-content" style="flex: 1; overflow: auto">
         <el-table
-           height="100%"
+          height="100%"
           :data="tableData"
           :row-style="{ height: '0px' }"
           :cell-style="{ padding: '5px' }"
@@ -93,12 +88,12 @@
             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="userPhone" label="本人手机号码" width="" /> -->
+          <!-- <el-table-column prop="monitorName" label="班长姓名" width="" />
+          <el-table-column prop="dormitory" label="宿舍" width="" /> -->
           <el-table-column prop="reason" label="请假原因" width="" />
           <el-table-column prop="destination" label="出行目的地" width="" />
-          <el-table-column
+          <!-- <el-table-column
             prop="isKnow"
             label="父母是否知情"
             width=""
@@ -106,11 +101,11 @@
           />
           <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="fatherPhone" label="父亲电话" width="" /> -->
           <el-table-column prop="travelMode" label="出行方式" width="" />
           <el-table-column prop="startTime" label="请假时间" width="" />
           <el-table-column prop="endTime" label="返校时间" width="" />
-          <el-table-column prop="auditSuggest" label="审核建议" width="" />
+          <!-- <el-table-column prop="auditSuggest" label="审核建议" width="" /> -->
           <el-table-column
             fixed="right"
             prop="auditStatus"
@@ -125,19 +120,31 @@
             width=""
             :formatter="auditResultFormatter"
           />
-          <el-table-column label="操作" fixed="right" width="300px" align="center">
+          <el-table-column label="操作" fixed="right" width="150" align="center">
             <template slot-scope="scope">
               <div class="detail_button_out">
-                <div class="detail_button" @click="viewUser(scope.row)">
+                <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'"
+                >
+                  <img src="../../assets/img/table/pass.png" />
+                  <span> 驳回/通过 </span>
+                </div>
 
                 <!-- 弹出提示框 提示是否确认重置-->
 
                 <!-- 弹出提示框 提示是否确认删除-->
 
-                <div
+                <!-- <div
                   class="detail_button"
                   @click="resetUser(true, scope.row)"
                   v-show="scope.row.auditStatus == '0'"
@@ -152,7 +159,7 @@
                 >
                   <img src="../../assets/img/table/noPass.png" />
                   <span> 驳回 </span>
-                </div>
+                </div> -->
               </div>
             </template>
           </el-table-column>
@@ -185,24 +192,28 @@
     >
       <div slot="title">
         <div class="demo-ruleForm">
-          <p class="dig_title">详情</p>
+          <p class="dig_title" v-show="view.auditStatus == '1'">详情</p>
+          <p class="dig_title" v-show="view.auditStatus == '0'">审核/驳回</p>
           <div class="user_out_new">
             <div class="user_out">
               <div class="user_out_sub">姓名</div>
               <div class="user_out_subNext">
                 {{ view.userName }}
+                <!-- <el-input v-model=" view.userName" :disabled="true" placeholder="请输入审核建议" /> -->
               </div>
             </div>
             <div class="user_out">
               <div class="user_out_sub">学号</div>
               <div class="user_out_subNext">
                 {{ view.userNo }}
+                <!-- <el-input v-model=" view.userNo" :disabled="true" placeholder="请输入审核建议" /> -->
               </div>
             </div>
             <div class="user_out">
               <div class="user_out_sub">是否离郑</div>
               <div class="user_out_subNext">
-                {{ view.leaveType=='1'?'离郑':'不离郑' }}
+                {{ view.leaveType == "1" ? "离郑" : "不离郑" }}
+                <!-- <el-input v-model=" view.userNo" :disabled="true" placeholder="请输入审核建议" /> -->
               </div>
             </div>
             <div class="user_out">
@@ -213,9 +224,7 @@
             </div>
             <div class="user_out">
               <div class="user_out_sub">班长姓名</div>
-              <div class="user_out_subNext">
-                {{ view.monitorName }}
-              </div>
+              <div class="user_out_subNext">{{ view.monitorName }}&nbsp;</div>
             </div>
             <div class="user_out">
               <div class="user_out_sub">宿舍</div>
@@ -238,66 +247,102 @@
             <div class="user_out">
               <div class="user_out_sub">父母是否知情</div>
               <div class="user_out_subNext">
-                {{ view.isKnow=='1'?'知情':'不知情'}}
+                {{ view.isKnow == "1" ? "知情" : "不知情" }}
               </div>
             </div>
             <div class="user_out">
               <div class="user_out_sub">同行人电话</div>
-              <div class="user_out_subNext">
-                {{ view.companionsPhone}}
-              </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_subNext">
-                {{ view.motherPhone}}
+                {{ view.motherPhone }}
               </div>
             </div>
             <div class="user_out">
               <div class="user_out_sub">父亲电话</div>
               <div class="user_out_subNext">
-                {{ view.fatherPhone}}
+                {{ view.fatherPhone }}
               </div>
             </div>
             <div class="user_out">
               <div class="user_out_sub">出行方式</div>
               <div class="user_out_subNext">
-                {{ view.travelMode}}
+                {{ view.travelMode }}
               </div>
             </div>
             <div class="user_out">
               <div class="user_out_sub">请假时间</div>
               <div class="user_out_subNext">
-                {{ view.startTime}}
+                {{ view.startTime }}
               </div>
             </div>
 
             <div class="user_out">
               <div class="user_out_sub">返校时间</div>
               <div class="user_out_subNext">
-                {{ view.endTime}}
+                {{ view.endTime }}
               </div>
             </div>
 
             <div class="user_out">
-              <div class="user_out_sub">审核建议</div>
-              <div class="user_out_subNext">
-                {{ view.auditSuggest}}
+              <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;">
+                   &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;">  &nbsp;已驳回</div>
+                  &nbsp;
+                </div>
+                <!-- {{
+                  view.auditResult == null
+                    ? ""
+                    : view.auditResult == "0"
+                    ? "驳回"
+                    : "通过"
+                }}&nbsp; -->
               </div>
             </div>
             <div class="user_out">
               <div class="user_out_sub">审核状态</div>
               <div class="user_out_subNext">
-                {{ view.auditStatus=='0'?'待审批':'已审批'}}
+                {{ view.auditStatus == "0" ? "待审批" : "已审批" }}
               </div>
             </div>
+
             <div class="user_out">
-              <div class="user_out_sub">审核结果</div>
-              <div class="user_out_subNext">
-                {{ view.auditResult==null?'':view.auditResult=='0'?'驳回':'通过'}}
+              <div class="user_out_sub">审核建议</div>
+              <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'"
+              >
+                <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>
+            <el-button type="info" round @click="submitCom(false)" style="padding:10px 40px"> 驳回 </el-button>
+          </div>
         </div>
       </div>
     </el-dialog>
@@ -348,6 +393,8 @@ export default {
   },
   data() {
     return {
+      userName: "",
+      userNo: "",
       //审核字段
       auditStatusObj: "",
       record: "",
@@ -359,7 +406,7 @@ export default {
       //重置密码需要调用个userId
       userId: "",
       //充值密码使用userName
-      userName: "",
+
       //重置密码弹出框
       resetVisible: false,
       //根据名称搜索
@@ -610,8 +657,9 @@ export default {
       this.resetVisible = false;
     },
     //提交文本
-    submitCom() {
+    submitCom(val) {
       //判断当前是否是  就是通过请假审批
+      this.isDelete = val;
       if (this.isDelete) {
         this.deleteUser();
         //调用删除方法
@@ -751,7 +799,7 @@ export default {
       this.editRegisterUser(row);
     },
     viewUser(row) {
-      console.log(row)
+      this.record = "";
       this.view = row;
       this.centerDialogVisible = true;
     },
@@ -760,6 +808,8 @@ export default {
     },
     clearSearch() {
       this.auditStatusObj = "";
+      this.userNo = "";
+      this.userName = "";
       this.searchTarget();
     },
 
@@ -789,15 +839,12 @@ export default {
       //先判断
       //是通过还是驳回
       let url = "";
-      if (this.isDelete) {
-        url = `/leave/approvalRecord?auditResult=${1}&id=${this.currentObj.id}`;
-      } else {
-        url = `/leave/approvalRecord?auditResult=${0}&id=${this.currentObj.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:'成功'});
         if (res && res.code == 200) {
           if (this.isDelete) {
@@ -823,7 +870,13 @@ export default {
 
       url = `/leave/findAllByCurrentUser?pageNum=${this.pageNum}&pageSize=${
         this.pageSize
-      }${this.auditStatusObj == "" ? "" : `&auditStatus=${this.auditStatusObj}`}`;
+      }${this.auditStatusObj == "" ? "" : `&auditStatus=${this.auditStatusObj}`}${
+        this.userName == ""
+          ? ""
+          : `&userName=${this.userName}${
+              this.userNo == "" ? "" : `&userNo=${this.userNo}`
+            }`
+      }`;
       //院管理员进来的时候
 
       this.$http.get(url, {}, (res) => {
@@ -866,6 +919,19 @@ export default {
 
 <style lang="less" scoped>
 @import "../../styles/theme.less";
+
+.record /deep/ .el-input__inner {
+  background-color: #ffffff !important;
+}
+.user_button_detail {
+  width: 60%;
+  margin-left:20%;
+  display: flex;
+  justify-content: space-around;
+  margin-top: 40px;
+  margin-bottom: 20px;
+}
+
 .pag_class {
   text-align: end;
 }
@@ -915,36 +981,41 @@ export default {
 .add_user_class {
   margin-top: 10px;
 }
-.user_out_new{
+.user_out_new {
   display: flex;
   flex-direction: row;
   flex-wrap: wrap;
   justify-content: space-between;
-  
 }
 .user_out {
   display: flex;
   width: 45%;
   align-items: center;
-  border: 1px solid #eeeeef;
-  line-height: 50px;
+  // border: 1px solid #eeeeef;
+  // line-height: 50px;
   margin-top: 10px;
 }
 
 .user_out_sub {
   flex: 1;
-  background-color: #fafafa;
+  // background-color: #fafafa;
   text-align: center;
   height: 100%;
-    display: flex;
-    justify-content: center;
-    align-items: center;
+  display: flex;
+  justify-content: left;
+  align-items: center;
   // color:#ffffff
 }
 
 .user_out_subNext {
+  border-radius: 40px;
+  border: 1px solid #e6e6e6;
+  background-color: #f7f7f7;
+  color: #999999;
   padding-left: 10px;
   flex: 3;
+  line-height: 40px;
+  text-align: left;
 }
 .detail_button_out {
   display: flex;