更改多日请假，监控，态势

src/api/peopleChuRu/bdglLeave.js

@@ -75,4 +75,12 @@ export function ZhengZhiUSer(query) {
     method: 'get',
     params: query
   })
+}
+
+// 查询审批人全部
+export function getBdglList(id) {
+  return request({
+    url: '/system/user/list',
+    method: 'get'
+  })
 }

src/components/flv/index.vue

@@ -28,6 +28,7 @@ export default {
     this.singleplayvideo();
   },
   methods: {
+    reloadVideo(flvPlayer) {},
     // 初始化视频
     singleplayvideo() {
       if (flvjs.isSupported()) {

src/views/barracksManagement/barracks/index.vue

@@ -121,7 +121,7 @@
           >删除</el-button
         >
       </el-col>
-      <!-- <el-col :span="1.5">
+      <el-col :span="1.5">
         <el-button
           type="warning"
           plain
@@ -130,8 +130,9 @@
           :loading="exportLoading"
           @click="handleExport"
           v-hasPermi="['barracksManagement:barracks:export']"
-        >导出</el-button>
-      </el-col> -->
+          >导出</el-button
+        >
+      </el-col>
       <!-- <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"

src/views/barracksManagement/checkin/index.vue

@@ -98,7 +98,7 @@
           >删除</el-button
         >
       </el-col>
-      <!-- <el-col :span="1.5">
+      <el-col :span="1.5">
         <el-button
           type="warning"
           plain
@@ -109,7 +109,7 @@
           v-hasPermi="['barracksManagement:checkin:export']"
           >导出</el-button
         >
-      </el-col> -->
+      </el-col>
       <!-- <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"

src/views/barracksManagement/flat/index.vue

@@ -149,7 +149,7 @@
           >删除</el-button
         >
       </el-col>
-      <!--
+
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -159,8 +159,9 @@
           :loading="exportLoading"
           @click="handleExport"
           v-hasPermi="['barracksManagement:flat:export']"
-        >导出</el-button>
-      </el-col> -->
+          >导出</el-button
+        >
+      </el-col>
       <!-- <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"

src/views/barracksManagement/flats/index.vue

@@ -93,7 +93,7 @@
           >删除</el-button
         >
       </el-col>
-      <!-- <el-col :span="1.5">
+      <el-col :span="1.5">
         <el-button
           type="warning"
           plain
@@ -102,8 +102,9 @@
           :loading="exportLoading"
           @click="handleExport"
           v-hasPermi="['barracksManagement:flats:export']"
-        >导出</el-button>
-      </el-col> -->
+          >导出</el-button
+        >
+      </el-col>
       <!-- <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"

src/views/barracksManagement/maintenanceRecord/index.vue

@@ -64,7 +64,7 @@
           >删除</el-button
         >
       </el-col>
-      <!-- <el-col :span="1.5">
+      <el-col :span="1.5">
         <el-button
           type="warning"
           plain
@@ -75,7 +75,7 @@
           v-hasPermi="['barracksManagement:maintenanceRecord:export']"
           >导出</el-button
         >
-      </el-col> -->
+      </el-col>
     </el-row>
 
     <el-table
@@ -410,7 +410,7 @@ export default {
     handleDelete(row) {
       const ids = row.id || this.ids;
       this.$modal
-        .confirm('是否确认删除五小工维修记录')
+        .confirm("是否确认删除五小工维修记录")
         .then(function () {
           return delMaintenanceRecord(ids);
         })
@@ -602,7 +602,7 @@ export default {
   background-color: transparent !important;
 }
 ::v-deep .el-form-item__content .el-textarea .el-textarea__inner {
-    width: 916px;
-    min-height: 120px !important;
+  width: 916px;
+  min-height: 120px !important;
 }
 </style>

src/views/grassrootsregistration/bdgleven/index.vue

@@ -8,7 +8,11 @@
       label-width="68px"
     >
       <el-form-item prop="unitName">
-      <el-input placeholder="请输入单位" v-model="queryParams.unitName" @input="handleQuery"/>
+        <el-input
+          placeholder="请输入单位"
+          v-model="queryParams.unitName"
+          @input="handleQuery"
+        />
       </el-form-item>
 
       <el-form-item label="" prop="compereId">
@@ -243,6 +247,7 @@
               multiple
               placeholder="请选择出席人"
               class="input_xiala"
+              filterable
             >
               <el-option
                 v-for="(item, i) in renYuan"
@@ -866,4 +871,7 @@ export default {
 #chakan /deep/ .el-dialog__body {
   padding: 30px 0px 30px 0px;
 }
+::v-deep .el-select__input {
+  color: #fff !important;
+}
 </style>

src/views/grassrootsregistration/bdglmeeting/index.vue

@@ -7,8 +7,12 @@
       v-show="showSearch"
       label-width="68px"
     >
-     <el-form-item prop="deptName">
-      <el-input placeholder="请输入单位" v-model="queryParams.deptName" @input="handleQuery"/>
+      <el-form-item prop="deptName">
+        <el-input
+          placeholder="请输入单位"
+          v-model="queryParams.deptName"
+          @input="handleQuery"
+        />
       </el-form-item>
 
       <el-form-item label="" prop="compereId">
@@ -246,6 +250,7 @@
               v-model="form.joinId"
               multiple
               placeholder="请选择参加人"
+              filterable
             >
               <el-option
                 v-for="(item, i) in renYuan"
@@ -264,6 +269,7 @@
               v-model="form.peopleIds"
               multiple
               placeholder="请选择列席人"
+              filterable
             >
               <el-option
                 v-for="(item, i) in renYuan"
@@ -282,6 +288,7 @@
               v-model="form.absentIds"
               multiple
               placeholder="请选择缺席人"
+              filterable
             >
               <el-option
                 v-for="(item, i) in renYuan"
@@ -919,4 +926,7 @@ export default {
 #chakan /deep/ .el-dialog__body {
   padding: 30px 0px 30px 0px;
 }
+::v-deep .el-select__input {
+  color: #fff !important;
+}
 </style>

src/views/grassrootsregistration/bdglparty/index.vue

@@ -7,8 +7,12 @@
       v-show="showSearch"
       label-width="68px"
     >
-     <el-form-item prop="unitName">
-      <el-input placeholder="请输入单位" v-model="queryParams.unitName" @input="handleQuery"/>
+      <el-form-item prop="unitName">
+        <el-input
+          placeholder="请输入单位"
+          v-model="queryParams.unitName"
+          @input="handleQuery"
+        />
       </el-form-item>
       <el-form-item label="" prop="compereId">
         <el-select
@@ -240,6 +244,7 @@
               multiple
               placeholder="请选择参加人"
               class="input_xiala"
+              filterable
             >
               <el-option
                 v-for="item in renYuan"
@@ -258,6 +263,7 @@
               multiple
               placeholder="请选择列席人"
               class="input_xiala"
+              filterable
             >
               <el-option
                 v-for="item in renYuan"
@@ -276,6 +282,7 @@
               multiple
               placeholder="请选择缺席人"
               class="input_xiala"
+              filterable
             >
               <el-option
                 v-for="item in renYuan"
@@ -912,4 +919,7 @@ export default {
 #chakan /deep/ .el-dialog__body {
   padding: 30px 0px 30px 0px;
 }
+::v-deep .el-select__input {
+  color: #fff !important;
+}
 </style>

src/views/grassrootsregistration/bdglsoldier/index.vue

@@ -8,7 +8,11 @@
       label-width="68px"
     >
       <el-form-item prop="deptName">
-      <el-input placeholder="请输入单位" v-model="queryParams.deptName" @input="handleQuery"/>
+        <el-input
+          placeholder="请输入单位"
+          v-model="queryParams.deptName"
+          @input="handleQuery"
+        />
       </el-form-item>
       <el-form-item label="" prop="compereId">
         <el-select
@@ -236,6 +240,7 @@
               v-model="form.joinId"
               multiple
               placeholder="请选择参加人"
+              filterable
             >
               <el-option
                 v-for="item in renYuan"
@@ -253,6 +258,7 @@
               v-model="form.peopleIds"
               multiple
               placeholder="请选择列席人"
+              filterable
             >
               <el-option
                 v-for="item in renYuan"
@@ -270,6 +276,7 @@
               v-model="form.absentIds"
               multiple
               placeholder="请选择缺席人"
+              filterable
             >
               <el-option
                 v-for="item in renYuan"
@@ -899,4 +906,7 @@ export default {
 #chakan /deep/ .el-dialog__body {
   padding: 30px 0px 30px 0px;
 }
+::v-deep .el-select__input {
+  color: #fff !important;
+}
 </style>

src/views/militaryvehicleManagement/driver/index.vue

@@ -80,7 +80,7 @@
           >删除</el-button
         >
       </el-col>
-      <!-- <el-col :span="1.5">
+      <el-col :span="1.5">
         <el-button
           class="box"
           type="warning"
@@ -92,7 +92,7 @@
           v-hasPermi="['militaryvehicleManagement:driver:export']"
           >导出</el-button
         >
-      </el-col> -->
+      </el-col>
     </el-row>
 
     <el-table

src/views/militaryvehicleManagement/privateCar/index.vue

@@ -80,7 +80,7 @@
           >删除</el-button
         >
       </el-col>
-      <!-- <el-col :span="1.5">
+      <el-col :span="1.5">
         <el-button
           class="box"
           type="warning"
@@ -92,7 +92,7 @@
           v-hasPermi="['militaryvehicleManagement:privateCar:export']"
           >导出</el-button
         >
-      </el-col> -->
+      </el-col>
     </el-row>
 
     <el-table
@@ -132,7 +132,12 @@
         prop="certificatenumber"
         width="170"
       />
-      <el-table-column label="备注" align="center" prop="remarks"  show-overflow-tooltip />
+      <el-table-column
+        label="备注"
+        align="center"
+        prop="remarks"
+        show-overflow-tooltip
+      />
       <!-- <el-table-column label="创建人" align="center" prop="adminId" />
       <el-table-column label="创建时间" align="center" prop="createtime" /> -->
 

src/views/militaryvehicleManagement/thebus/index.vue

@@ -239,7 +239,7 @@
           >删除</el-button
         >
       </el-col>
-      <!-- <el-col :span="1.5">
+      <el-col :span="1.5">
         <el-button
           class="box"
           type="warning"
@@ -251,7 +251,7 @@
           v-hasPermi="['medicalhealth:bdgldurgarchives:export']"
           >导出</el-button
         >
-      </el-col> -->
+      </el-col>
       <!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
     </el-row>
 
@@ -301,7 +301,12 @@
       />
       <el-table-column label="发动机号" align="center" prop="engineNumber" />
       <el-table-column label="车架号" align="center" prop="frameNumber" />
-      <el-table-column label="车辆来源" align="center" prop="source" width="200"/>
+      <el-table-column
+        label="车辆来源"
+        align="center"
+        prop="source"
+        width="200"
+      />
       <el-table-column label="车辆颜色" align="center" prop="vehiclecolor" />
       <el-table-column label="出厂日期" align="center" prop="date1" width="100">
         <template slot-scope="scope">
@@ -336,7 +341,7 @@
         prop="seatCount"
         width="120"
       />
-       <el-table-column
+      <el-table-column
         label="备注"
         align="center"
         prop="remarks"

src/views/monitoring/camera/index.vue

@@ -90,8 +90,7 @@ export default {
     return {
       isfour: false,
       onevideoUrl: {
-        caddr:
-          "https://sf1-hscdn-tos.pstatp.com/obj/media-fe/xgplayer_doc_video/flv/xgplayer-demo-360p.flv",
+        caddr: "./shipin.flv",
         name: "摄像头1",
       },
       fourVideo: [],
@@ -99,9 +98,6 @@ export default {
       arr: [],
     };
   },
-  mounted() {
-    this.jiekou();
-  },
   created() {
     this.jiekou();
   },
@@ -116,14 +112,8 @@ export default {
     jiekou() {
       var index = this.$route.path.split("/")[2];
       listCamera({ belongLocal: index }).then((response) => {
-        // console.log(response.rows);
-
         this.fourVideo = response.rows;
-        // this.fourVideo = {
-        //   caddr:
-        //     "https://sf1-hscdn-tos.pstatp.com/obj/media-fe/xgplayer_doc_video/flv/xgplayer-demo-360p.flv",
-        //   name: "摄像头",
-        // };
+        console.log(response.rows);
         if (this.fourVideo.length >= 4) {
           this.fourVideo.forEach((item, i) => {
             if (i <= 3) {
@@ -138,7 +128,6 @@ export default {
           });
         }
         if (response.rows.lenght > 0) {
-          console.log(response.rows);
           this.onevideoUrl = [...response.rows][0];
         }
       });

src/views/peopleChuRu/bdglLeave/index.vue

@@ -313,9 +313,12 @@
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
-        width="210"
+        width="300"
       >
         <template slot-scope="scope">
+          <el-button size="btc" type="text" @click="handleSee(scope.row)"
+            >查看</el-button
+          >
           <el-button
             v-if="scope.row.common == '1'"
             size="btc"
@@ -454,12 +457,12 @@
           >
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="连级审批人" prop="peopleId2">
+        <el-form-item label="一级审批人" prop="peopleId2">
           <!-- <el-input v-model="form.peopleId2" placeholder="请输入二级审批人" /> -->
           <el-select
             v-model="form.peopleId1"
             filterable
-            placeholder="请选择连级审批人"
+            placeholder="请选择一级审批人"
             ref="abcdef"
             clearable
             @clear="peopleIdOne"
@@ -475,12 +478,12 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="营级审批人" prop="peopleId2">
+        <el-form-item label="二级审批人" prop="peopleId2">
           <!-- <el-input v-model="form.peopleId2" placeholder="请输入二级审批人" /> -->
           <el-select
             v-model="form.peopleId2"
             filterable
-            placeholder="请选择营级审批人"
+            placeholder="请选择二级审批人"
             ref="abcde"
             clearable
             @clear="peopleIdTwo"
@@ -496,12 +499,12 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="政治审批人" prop="peopleId3">
+        <el-form-item label="三级审批人" prop="peopleId3">
           <!-- <el-input v-model="form.peopleId3" placeholder="请输入三级审批人" /> -->
           <el-select
             v-model="form.peopleId3"
             filterable
-            placeholder="请选择政治审批人"
+            placeholder="请选择三级审批人"
             ref="abcd"
             clearable
             @clear="peopleIdThere"
@@ -522,7 +525,7 @@
           <el-select
             v-model="form.peopleId4"
             filterable
-            placeholder="请输入四级审批人"
+            placeholder="请选择四级审批人"
             ref="abc"
             disabled
           >
@@ -663,12 +666,12 @@
           >
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="连级审批人" prop="peopleId2">
+        <el-form-item label="一级审批人" prop="peopleId2">
           <!-- <el-input v-model="form.peopleId2" placeholder="请输入二级审批人" /> -->
           <el-select
             v-model="form.peopleId1"
             filterable
-            placeholder="请选择连级审批人"
+            placeholder="请输入一级审批人"
             ref="abcdef"
             :disabled="xiugai"
             clearable
@@ -684,12 +687,12 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="营级审批人" prop="peopleId2">
+        <el-form-item label="二级审批人" prop="peopleId2">
           <!-- <el-input v-model="form.peopleId2" placeholder="请输入二级审批人" /> -->
           <el-select
             v-model="form.peopleId2"
             filterable
-            placeholder="请选择营级审批人"
+            placeholder="请输入二级审批人"
             ref="abcde"
             :disabled="xiugai"
             clearable
@@ -705,12 +708,12 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="政治审批人" prop="peopleId3">
+        <el-form-item label="三级审批人" prop="peopleId3">
           <!-- <el-input v-model="form.peopleId3" placeholder="请输入三级审批人" /> -->
           <el-select
             v-model="form.peopleId3"
             filterable
-            placeholder="请选择政治审批人"
+            placeholder="请输入三级审批人"
             ref="abcd"
             :disabled="xiugai"
             clearable
@@ -881,12 +884,12 @@
           >
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="连级审批人" prop="peopleId2">
+        <el-form-item label="一级审批人" prop="peopleId2">
           <!-- <el-input v-model="form.peopleId2" placeholder="请输入二级审批人" /> -->
           <el-select
             v-model="form.peopleId1"
             filterable
-            placeholder=""
+            placeholder="请输入一级审批人"
             ref="abcdef"
             disabled
             clearable
@@ -902,12 +905,12 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="营级审批人" prop="peopleId2">
+        <el-form-item label="二级审批人" prop="peopleId2">
           <!-- <el-input v-model="form.peopleId2" placeholder="请输入二级审批人" /> -->
           <el-select
             v-model="form.peopleId2"
             filterable
-            placeholder=""
+            placeholder="请输入二级审批人"
             ref="abcde"
             disabled
             clearable
@@ -923,12 +926,12 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="政治审批人" prop="peopleId3">
+        <el-form-item label="三级审批人" prop="peopleId3">
           <!-- <el-input v-model="form.peopleId3" placeholder="请输入三级审批人" /> -->
           <el-select
             v-model="form.peopleId3"
             filterable
-            placeholder=""
+            placeholder="请输入三级审批人"
             ref="abcd"
             disabled
           >
@@ -1015,6 +1018,7 @@
       :visible.sync="opens"
       width="500px"
       append-to-body
+      :close-on-click-modal="false"
     >
       <el-form
         ref="forms"
@@ -1100,11 +1104,11 @@
           >
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="连级审批人" prop="peopleId1">
+        <el-form-item label="一级审批人" prop="peopleId1">
           <el-select
             v-model="form.peopleId1"
             filterable
-            placeholder=""
+            placeholder="请输入一级审批人"
             ref="abcdef"
             disabled
           >
@@ -1118,11 +1122,11 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="营级审批人" prop="peopleId2">
+        <el-form-item label="二级审批人" prop="peopleId2">
           <el-select
             v-model="form.peopleId2"
             filterable
-            placeholder=""
+            placeholder="请输入二级审批人"
             ref="abcde"
             disabled
           >
@@ -1136,11 +1140,11 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="政治审批人" prop="peopleId3">
+        <el-form-item label="三级审批人" prop="peopleId3">
           <el-select
             v-model="form.peopleId3"
             filterable
-            placeholder=""
+            placeholder="请输入三级审批人"
             ref="abcd"
             disabled
           >
@@ -1224,6 +1228,240 @@
         <el-button @click="TSboHui" size="btn">驳回</el-button>
       </div>
     </el-dialog>
+
+    <!-- 查看对话框 -->
+    <el-dialog
+      :title="title"
+      :visible.sync="opensee"
+      width="500px"
+      append-to-body
+      :close-on-click-modal="false"
+    >
+      <el-form
+        ref="form"
+        :model="form"
+        :rules="rules"
+        label-width="80px"
+        inline
+      >
+        <div class="jiben">基本信息</div>
+
+        <el-form-item label="单位" prop="unitId">
+          <treeselect
+            v-model="form.unitId"
+            :options="deptOptions"
+            placeholder="请选择单位"
+            @select="selectPeo"
+            @open="blurSelect"
+            disabled
+          />
+        </el-form-item>
+
+        <el-form-item label="请假开始时间" prop="startTime">
+          <el-date-picker
+            clearable
+            size="small"
+            v-model="form.startTime"
+            type="datetime"
+            default-time="00:00:00"
+            placeholder="选择请假开始时间"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            disabled
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="请假结束时间" prop="endTime">
+          <el-date-picker
+            clearable
+            size="small"
+            v-model="form.endTime"
+            type="datetime"
+            default-time="00:00:00"
+            placeholder="选择请假结束时间"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            disabled
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="请假类型" prop="leaveType">
+          <el-select
+            v-model="form.leaveType"
+            placeholder="请选择请假类型"
+            disabled
+          >
+            <!-- <el-option label="请选择字典生成" value="" /> -->
+            <el-option
+              v-for="item in ziDian"
+              :key="item.dictCode"
+              :label="item.dictLabel"
+              :value="item.dictValue"
+              class="input_xiala"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="离队时间" prop="departureTime">
+          <!-- <el-input v-model="form.departureTime" placeholder="请输入离队时间" /> -->
+          <el-date-picker
+            clearable
+            size="small"
+            v-model="form.departureTime"
+            type="datetime"
+            default-time="00:00:00"
+            placeholder="选择离队时间"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            disabled
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="归队时间" prop="returnTime">
+          <!-- <el-input v-model="form.returnTime" placeholder="请输入归队时间" /> -->
+          <el-date-picker
+            clearable
+            size="small"
+            v-model="form.returnTime"
+            type="datetime"
+            default-time="00:00:00"
+            placeholder="选择归队时间"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            disabled
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="一级审批人" prop="peopleId2">
+          <!-- <el-input v-model="form.peopleId2" placeholder="请输入二级审批人" /> -->
+          <el-select
+            v-model="form.peopleId1"
+            filterable
+            placeholder="请输入一级审批人"
+            ref="abcdef"
+            disabled
+            clearable
+          >
+            <el-option
+              v-for="(item, i) in yingJiRen1"
+              :key="i"
+              :label="item.nickName"
+              :value="item.userId"
+              @click.native="oneRen(item.nickName)"
+              class="input_xiala"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="二级审批人" prop="peopleId2">
+          <!-- <el-input v-model="form.peopleId2" placeholder="请输入二级审批人" /> -->
+          <el-select
+            v-model="form.peopleId2"
+            filterable
+            placeholder="请输入二级审批人"
+            ref="abcde"
+            disabled
+            clearable
+          >
+            <el-option
+              v-for="(item, i) in yingJiRen1"
+              :key="i"
+              :label="item.nickName"
+              :value="item.userId"
+              @click.native="twoRen(item.nickName)"
+              class="input_xiala"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="三级审批人" prop="peopleId3">
+          <!-- <el-input v-model="form.peopleId3" placeholder="请输入三级审批人" /> -->
+          <el-select
+            v-model="form.peopleId3"
+            filterable
+            placeholder="请输入三级审批人"
+            ref="abcd"
+            disabled
+          >
+            <el-option
+              v-for="(item, i) in yingJiRen1"
+              :key="i"
+              :label="item.nickName"
+              :value="item.userId"
+              @click.native="thereRen(item.nickName)"
+              class="input_xiala"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="请假人员" prop="peopleId">
+          <!-- <el-input v-model="form.peopleId" placeholder="请输入请假人员" /> -->
+          <el-select
+            v-model="form.peopleId"
+            placeholder="请输入请假人员"
+            ref="headerSearchSelect"
+            disabled
+            multiple
+            class="ren_yuan"
+          >
+            <el-option
+              v-for="(item, i) in renYuan"
+              :key="i"
+              :label="item.name"
+              :value="item.id"
+              @click.native="qingRen(item.name)"
+              class="input_xiala"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+
+        <div class="jiben">请假原因</div>
+        <el-form-item prop="leaveReason">
+          <el-input
+            v-model="form.leaveReason"
+            type="textarea"
+            placeholder="请输入内容"
+            disabled
+          />
+        </el-form-item>
+        <div class="jiben">驳回原因</div>
+        <el-form-item prop="reasons">
+          <el-input
+            v-model="form.reasons"
+            type="textarea"
+            placeholder="请输入内容"
+            disabled
+          />
+        </el-form-item>
+        <div class="jiben" v-if="oneShenPi">一级特殊审批原因</div>
+        <el-form-item prop="reasons" v-if="oneShenPi">
+          <el-input
+            type="textarea"
+            placeholder="请输入内容"
+            disabled
+            v-model="shenPiQuan.one"
+          />
+        </el-form-item>
+        <div class="jiben" v-if="twoShenPi">二级特殊审批原因</div>
+        <el-form-item prop="reasons" v-if="twoShenPi">
+          <el-input
+            type="textarea"
+            placeholder="请输入内容"
+            disabled
+            v-model="shenPiQuan.two"
+          />
+        </el-form-item>
+        <div class="jiben" v-if="thereShenPi">三级特殊审批原因</div>
+        <el-form-item prop="reasons" v-if="thereShenPi">
+          <el-input
+            type="textarea"
+            placeholder="请输入内容"
+            disabled
+            v-model="shenPiQuan.there"
+          />
+        </el-form-item>
+      </el-form>
+      <div class="dialog-footer" slot="footer">
+        <el-button type="primary" @click="cancel">取消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -1238,6 +1476,7 @@ import {
   YingJIUSer,
   LIanJIUSer,
   ZhengZhiUSer,
+  getBdglList,
 } from "@/api/peopleChuRu/bdglLeave";
 
 import {
@@ -1329,18 +1568,6 @@ export default {
         leaveType: [
           { required: true, message: "请假类型不能为空", trigger: "blur" },
         ],
-        // peopleId1: [
-        //   { required: true, message: "审批人不能为空", trigger: "blur" },
-        // ],
-        // peopleId2: [
-        //   { required: true, message: "审批人不能为空", trigger: "blur" },
-        // ],
-        // peopleId3: [
-        //   { required: true, message: "审批人不能为空", trigger: "blur" },
-        // ],
-        // peopleId4: [
-        //   { required: true, message: "审批人不能为空", trigger: "blur" },
-        // ],
       },
       // 特殊审批表单验证
       rulesform: {
@@ -1391,6 +1618,21 @@ export default {
       lianJiRen: [],
       // 政治人员
       zhengZhiRen: [],
+      // 查看弹出层的显示与隐藏
+      opensee: false,
+      // 所有审批人
+      yingJiRen1: [],
+      // 一级特殊审批原因
+      oneShenPi: false,
+      // 二级特殊审批原因
+      twoShenPi: false,
+      // 三级特殊审批原因
+      thereShenPi: false,
+      shenPiQuan: {
+        one: null,
+        two: null,
+        there: null,
+      },
     };
   },
   created() {
@@ -1402,6 +1644,7 @@ export default {
     this.getYing();
     this.getLiai();
     this.getZheng();
+    this.getSuoYou();
   },
   methods: {
     // 一级审批人清除按钮触发
@@ -1434,6 +1677,12 @@ export default {
         this.zhengZhiRen = res.data;
       });
     },
+    // 审批人所有
+    getSuoYou() {
+      getBdglList().then((res) => {
+        this.yingJiRen1 = res.rows;
+      });
+    },
 
     // 归队按钮
     handleGuiDui(row) {
@@ -1575,6 +1824,7 @@ export default {
       this.open1 = false;
       this.open2 = false;
       this.opens = false;
+      this.opensee = false;
       this.reset();
     },
     //审批通过按钮
@@ -1605,16 +1855,16 @@ export default {
         if (valid) {
           if (this.shenPis.shenPiJiBie == "一级") {
             this.form.status1 = 2;
-            return (this.shenPis.form.contents = "一级审批驳回");
-          } else if (item.shenPiJiBie == "二级") {
+            this.form.contents = "一级审批驳回";
+          } else if (this.shenPis.shenPiJiBie == "二级") {
             this.form.status2 = 2;
-            return (this.shenPis.form.contents = "二级审批驳回");
-          } else if (item.shenPiJiBie == "三级") {
+            this.form.contents = "二级审批驳回";
+          } else if (this.shenPis.shenPiJiBie == "三级") {
             this.form.status3 = 2;
-            return (this.shenPis.form.contents = "三级审批驳回");
-          } else if (item.shenPiJiBie == "四级") {
+            this.form.contents = "三级审批驳回";
+          } else if (this.shenPis.shenPiJiBie == "四级") {
             this.form.status4 = 2;
-            return (this.shenPis.form.contents = "四级审批驳回");
+            this.form.contents = "四级审批驳回";
           }
           this.form.peopleId = this.form.peopleId.join(",");
           updateBdglLeave(this.form).then((response) => {
@@ -1816,6 +2066,34 @@ export default {
         }
       });
     },
+    // 点击查看按钮触发
+    handleSee(row) {
+      if (row.status1 == 3) {
+        this.shenPiQuan.one = row.bdglLeaveFus[0].specialApproval;
+        this.oneShenPi = true;
+      } else if (row.status2 == 3) {
+        this.shenPiQuan.two = row.bdglLeaveFus[1].specialApproval;
+        this.twoShenPi = true;
+      } else if (row.status3 == 3) {
+        this.shenPiQuan.there = row.bdglLeaveFus[3].specialApproval;
+        this.thereShenPi = true;
+      }
+      this.getBuMeng();
+      // 获取字典类型
+      this.getdict();
+      this.reset();
+      const id = row.id || this.ids;
+      getBdglLeave(id).then((response) => {
+        this.result = response.data;
+        this.result.peopleId = this.result.peopleId.split(",");
+        this.result.peopleId = this.result.peopleId.map(Number);
+        this.form = this.result;
+        this.getYong(this.form.unitId);
+        this.getRen(this.form.unitId);
+        this.opensee = true;
+        this.title = "查看人员请假";
+      });
+    },
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;

src/views/peopleChuRu/leaveOne/index.vue

@@ -42,279 +42,6 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <!-- <el-form-item label="单位" prop="unitId">
-        <el-input
-          v-model="queryParams.unitId"
-          placeholder="请输入单位"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="请假开始时间" prop="startTime">
-        <el-date-picker clearable size="small"
-          v-model="queryParams.startTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择请假开始时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="请假结束时间" prop="endTime">
-        <el-date-picker clearable size="small"
-          v-model="queryParams.endTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择请假结束时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="请假类型" prop="leaveType">
-        <el-select v-model="queryParams.leaveType" placeholder="请选择请假类型" clearable size="small">
-          <el-option
-            v-for="dict in dict.type.people_state"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="离队时间" prop="departureTime">
-        <el-input
-          v-model="queryParams.departureTime"
-          placeholder="请输入离队时间"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="归队时间" prop="returnTime">
-        <el-input
-          v-model="queryParams.returnTime"
-          placeholder="请输入归队时间"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="归队状态" prop="returnStatus">
-        <el-select v-model="queryParams.returnStatus" placeholder="请选择归队状态" clearable size="small">
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="修改时间" prop="updatetime">
-        <el-input
-          v-model="queryParams.updatetime"
-          placeholder="请输入修改时间"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="创建人ID" prop="adminId">
-        <el-input
-          v-model="queryParams.adminId"
-          placeholder="请输入创建人ID"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="创建时间" prop="createtime">
-        <el-input
-          v-model="queryParams.createtime"
-          placeholder="请输入创建时间"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="批准人id" prop="peopleId1">
-        <el-input
-          v-model="queryParams.peopleId1"
-          placeholder="请输入批准人id"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="职务" prop="postId">
-        <el-input
-          v-model="queryParams.postId"
-          placeholder="请输入职务"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="二级审批人id" prop="peopleId2">
-        <el-input
-          v-model="queryParams.peopleId2"
-          placeholder="请输入二级审批人id"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="三级审批人id" prop="peopleId3">
-        <el-input
-          v-model="queryParams.peopleId3"
-          placeholder="请输入三级审批人id"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="四级审批人id" prop="peopleId4">
-        <el-input
-          v-model="queryParams.peopleId4"
-          placeholder="请输入四级审批人id"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="四级审批人id" prop="status1">
-        <el-input
-          v-model="queryParams.status1"
-          placeholder="请输入四级审批人id"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="四级审批人id" prop="status2">
-        <el-input
-          v-model="queryParams.status2"
-          placeholder="请输入四级审批人id"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="四级审批人id" prop="status3">
-        <el-input
-          v-model="queryParams.status3"
-          placeholder="请输入四级审批人id"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="四级审批人id" prop="status4">
-        <el-input
-          v-model="queryParams.status4"
-          placeholder="请输入四级审批人id"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="总审批状态" prop="contents">
-        <el-input
-          v-model="queryParams.contents"
-          placeholder="请输入总审批状态"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="总审批状态" prop="statusd">
-        <el-input
-          v-model="queryParams.statusd"
-          placeholder="请输入总审批状态"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="归队状态" prop="rejoin">
-        <el-input
-          v-model="queryParams.rejoin"
-          placeholder="请输入归队状态"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="单位名称" prop="unitName">
-        <el-input
-          v-model="queryParams.unitName"
-          placeholder="请输入单位名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="请假人姓名" prop="peopleName">
-        <el-input
-          v-model="queryParams.peopleName"
-          placeholder="请输入请假人姓名"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="一级审批人姓名" prop="peopleName1">
-        <el-input
-          v-model="queryParams.peopleName1"
-          placeholder="请输入一级审批人姓名"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="二级审批人姓名" prop="peopleName2">
-        <el-input
-          v-model="queryParams.peopleName2"
-          placeholder="请输入二级审批人姓名"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="三级审批人姓名" prop="peopleName3">
-        <el-input
-          v-model="queryParams.peopleName3"
-          placeholder="请输入三级审批人姓名"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="四级审批人姓名" prop="peopleName4">
-        <el-input
-          v-model="queryParams.peopleName4"
-          placeholder="请输入四级审批人姓名"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="驳回原因" prop="reasons">
-        <el-input
-          v-model="queryParams.reasons"
-          placeholder="请输入驳回原因"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="特殊审批原因" prop="specialApproval">
-        <el-input
-          v-model="queryParams.specialApproval"
-          placeholder="请输入特殊审批原因"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="实际归队时间" prop="actualreturntime">
-        <el-date-picker clearable size="small"
-          v-model="queryParams.actualreturntime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择实际归队时间">
-        </el-date-picker>
-      </el-form-item>  -->
       <el-form-item>
         <!-- <el-button type="primary" size="btn" @click="handleQuery"
           >搜索</el-button
@@ -385,7 +112,7 @@
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="主键ID" align="center" prop="id" /> -->
       <el-table-column label="序号" align="center" type="index" />
-      <el-table-column label="请假人员" align="center" prop="peopleName" />
+      <el-table-column label="请假人员" align="center" prop="peopleId" />
       <el-table-column
         label="单位"
         align="center"
@@ -425,7 +152,12 @@
           />
         </template>
       </el-table-column>
-      <el-table-column label="请假原因" align="center" prop="leaveReason"  show-overflow-tooltip/>
+      <el-table-column
+        label="请假原因"
+        align="center"
+        prop="leaveReason"
+        show-overflow-tooltip
+      />
       <el-table-column
         label="离队时间"
         align="center"
@@ -537,29 +269,17 @@
             @open="blurSelect"
           />
         </el-form-item>
-        <el-form-item label="请假人员" prop="peopleId">
+        <el-form-item label="请假类型" prop="leaveType">
           <el-select
-            v-model="form.peopleId"
-            placeholder="请选择请假人员"
-            ref="headerSearchSelect"
+            v-model="form.leaveType"
+            placeholder="请选择请假类型"
+            clearable
           >
             <el-option
-              v-for="(item, i) in renYuan"
-              :key="i"
-              :label="item.name"
-              :value="item.id"
-              @click.native="qingRen(item.name)"
-            >
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="请假类型" prop="leaveType">
-          <el-select v-model="form.leaveType" placeholder="请选择请假类型">
-            <el-option
-              v-for="dict in dict.type.people_state"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
+              v-for="dict in ziDian"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
             ></el-option>
           </el-select>
         </el-form-item>
@@ -617,6 +337,23 @@
           >
           </el-date-picker>
         </el-form-item>
+        <el-form-item label="请假人员" prop="peopleId">
+          <el-select
+            v-model="form.peopleId"
+            placeholder="请选择请假人员"
+            ref="headerSearchSelect"
+            class="ren_yuan"
+            multiple
+          >
+            <el-option
+              v-for="(item, i) in renYuan"
+              :key="i"
+              :label="item.name"
+              :value="item.id"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
         <!-- <el-form-item label="离队时间" prop="departureTime">
           <el-input v-model="form.departureTime" placeholder="请输入离队时间" />
         </el-form-item>
@@ -631,83 +368,6 @@
             placeholder="请输入内容"
           />
         </el-form-item>
-        <!-- 
-        <el-form-item label="归队状态">
-          <el-radio-group v-model="form.returnStatus">
-            <el-radio label="1">请选择字典生成</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="创建人ID" prop="adminId">
-          <el-input v-model="form.adminId" placeholder="请输入创建人ID" />
-        </el-form-item>
-        <el-form-item label="批准人id" prop="peopleId1">
-          <el-input v-model="form.peopleId1" placeholder="请输入批准人id" />
-        </el-form-item>
-        <el-form-item label="职务" prop="postId">
-          <el-input v-model="form.postId" placeholder="请输入职务" />
-        </el-form-item>
-        <el-form-item label="二级审批人id" prop="peopleId2">
-          <el-input v-model="form.peopleId2" placeholder="请输入二级审批人id" />
-        </el-form-item>
-        <el-form-item label="三级审批人id" prop="peopleId3">
-          <el-input v-model="form.peopleId3" placeholder="请输入三级审批人id" />
-        </el-form-item>
-        <el-form-item label="四级审批人id" prop="peopleId4">
-          <el-input v-model="form.peopleId4" placeholder="请输入四级审批人id" />
-        </el-form-item>
-        <el-form-item label="四级审批人id" prop="status1">
-          <el-input v-model="form.status1" placeholder="请输入四级审批人id" />
-        </el-form-item>
-        <el-form-item label="四级审批人id" prop="status2">
-          <el-input v-model="form.status2" placeholder="请输入四级审批人id" />
-        </el-form-item>
-        <el-form-item label="四级审批人id" prop="status3">
-          <el-input v-model="form.status3" placeholder="请输入四级审批人id" />
-        </el-form-item>
-        <el-form-item label="四级审批人id" prop="status4">
-          <el-input v-model="form.status4" placeholder="请输入四级审批人id" />
-        </el-form-item>
-        <el-form-item label="总审批状态" prop="contents">
-          <el-input v-model="form.contents" placeholder="请输入总审批状态" />
-        </el-form-item>
-        <el-form-item label="总审批状态" prop="statusd">
-          <el-input v-model="form.statusd" placeholder="请输入总审批状态" />
-        </el-form-item>
-        <el-form-item label="归队状态" prop="rejoin">
-          <el-input v-model="form.rejoin" placeholder="请输入归队状态" />
-        </el-form-item>
-        <el-form-item label="单位名称" prop="unitName">
-          <el-input v-model="form.unitName" placeholder="请输入单位名称" />
-        </el-form-item>
-        <el-form-item label="请假人姓名" prop="peopleName">
-          <el-input v-model="form.peopleName" placeholder="请输入请假人姓名" />
-        </el-form-item>
-        <el-form-item label="一级审批人姓名" prop="peopleName1">
-          <el-input v-model="form.peopleName1" placeholder="请输入一级审批人姓名" />
-        </el-form-item>
-        <el-form-item label="二级审批人姓名" prop="peopleName2">
-          <el-input v-model="form.peopleName2" placeholder="请输入二级审批人姓名" />
-        </el-form-item>
-        <el-form-item label="三级审批人姓名" prop="peopleName3">
-          <el-input v-model="form.peopleName3" placeholder="请输入三级审批人姓名" />
-        </el-form-item>
-        <el-form-item label="四级审批人姓名" prop="peopleName4">
-          <el-input v-model="form.peopleName4" placeholder="请输入四级审批人姓名" />
-        </el-form-item>
-        <el-form-item label="驳回原因" prop="reasons">
-          <el-input v-model="form.reasons" placeholder="请输入驳回原因" />
-        </el-form-item>
-        <el-form-item label="特殊审批原因" prop="specialApproval">
-          <el-input v-model="form.specialApproval" placeholder="请输入特殊审批原因" />
-        </el-form-item>
-        <el-form-item label="实际归队时间" prop="actualreturntime">
-          <el-date-picker clearable size="small"
-            v-model="form.actualreturntime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择实际归队时间">
-          </el-date-picker>
-        </el-form-item> -->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -736,6 +396,8 @@ import {
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import Cookies from "js-cookie";
+// 查询字典
+import { getDicts } from "@/api/system/dict/data";
 
 export default {
   name: "LeaveOne",
@@ -812,6 +474,14 @@ export default {
       deptOptions: [],
       renYuan: [],
       unitlist: [],
+      // 查询字典请假列表
+      dictType: {
+        dictType: "people_state",
+      },
+      // 字典的列表
+      ziDian: [],
+      // 修改拿到的数据
+      result: {},
     };
   },
   created() {
@@ -822,6 +492,7 @@ export default {
     this.getList();
     // 获取单位树形
     this.getBuMeng();
+    this.getdict();
   },
   mounted() {
     getDept2().then((res) => {
@@ -829,6 +500,13 @@ export default {
     });
   },
   methods: {
+    // 查询请假类型
+    getdict() {
+      getDicts(this.dictType.dictType).then((res) => {
+        res.data.splice(0, 1);
+        this.ziDian = res.data;
+      });
+    },
     unit3Format(row, column) {
       var deptName = "";
       this.unitlist.map((item) => {
@@ -836,7 +514,6 @@ export default {
           deptName = item.deptName;
         }
       });
-
       return deptName;
     },
     // 获取部门列表
@@ -854,7 +531,8 @@ export default {
     },
     // 重置表单人员
     ChongZhiRen() {
-      (this.form.peopleId = null), (this.form.peopleId1 = null);
+      this.form.peopleId = null;
+      this.form.peopleId1 = null;
       this.form.peopleId2 = null;
       this.form.peopleId3 = null;
       this.form.peopleId4 = null;
@@ -969,7 +647,10 @@ export default {
       this.reset();
       const id = row.id || this.ids;
       getLeaveOne(id).then((response) => {
-        this.form = response.data;
+        this.result = response.data;
+        this.result.peopleId = this.result.peopleId.split(",");
+        this.result.peopleId = this.result.peopleId.map(Number);
+        this.form = this.result;
         // 获取单位树形
         this.getBuMeng();
         this.getRen(this.form.unitId);
@@ -982,12 +663,16 @@ export default {
       this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
+            this.form.peopleId = this.form.peopleId.join(",");
             updateLeaveOne(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
+            if (this.form.peopleId.length > 0) {
+              this.form.peopleId = this.form.peopleId.join(",");
+            }
             addLeaveOne(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
@@ -1001,7 +686,7 @@ export default {
     handleDelete(row) {
       const ids = row.id || this.ids;
       this.$modal
-        .confirm('是否确认删除人员请假编号为"' + ids + '"的数据项？')
+        .confirm("是否确认删除人员请假的数据项？")
         .then(function () {
           return delLeaveOne(ids);
         })
@@ -1192,7 +877,7 @@ export default {
 ::v-deep .vue-treeselect__control {
   background-color: transparent !important;
 }
-::v-deep .el-table__row .el-table_4_column_41  .el-input__inner{
+::v-deep .el-table__row .el-table_4_column_41 .el-input__inner {
   background: transparent !important;
 }
 </style>

src/views/pt.vue

@@ -823,9 +823,8 @@ export default {
     // 手机柜线S地址console
     xianShang() {
       axios
-          // 线上地址
-           .post("http://172.4.5.232:12092/wl/api/getAccessToken", {
-          
+        // 线上地址
+        .post("http://172.4.5.232:12092/wl/api/getAccessToken", {
           password: "super123fs456wl",
           username: "admin",
         })
@@ -993,7 +992,7 @@ export default {
       Cookies.set("shuaxin", "false");
     },
     taishifun() {
-      this.$router.push({ path: "/taishi" }).catch(() => {});
+      this.$router.push({ path: "/taishi1" }).catch(() => {});
       Cookies.set("shuaxin", "false");
       // window.open(`/taishi`,'_self');
     },