更改安防监控，更改多人请假，更改基层值班，更改基层登记，更改车辆管理，更改医疗，新增一个用来免登陆的网址，更改全局样式，更改所有导出按钮隐藏

src/App.vue

@@ -32,8 +32,6 @@ export default {
     var url = window.document.location.pathname;
     // 获取当前地址之后的目录
     var url1 = window.document.location.hash;
-    console.log( window.document.location);
-    console.log( url );
     if (url === "/admin") {
       this.getloing();
     }

src/api/barracksManagement/maintenanceRecord.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询五小工维修记录列表
+export function listMaintenanceRecord(query) {
+  return request({
+    url: '/barracksManagement/maintenanceRecord/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询五小工维修记录详细
+export function getMaintenanceRecord(id) {
+  return request({
+    url: '/barracksManagement/maintenanceRecord/' + id,
+    method: 'get'
+  })
+}
+
+// 新增五小工维修记录
+export function addMaintenanceRecord(data) {
+  return request({
+    url: '/barracksManagement/maintenanceRecord',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改五小工维修记录
+export function updateMaintenanceRecord(data) {
+  return request({
+    url: '/barracksManagement/maintenanceRecord',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除五小工维修记录
+export function delMaintenanceRecord(id) {
+  return request({
+    url: '/barracksManagement/maintenanceRecord/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出五小工维修记录
+export function exportMaintenanceRecord(query) {
+  return request({
+    url: '/barracksManagement/maintenanceRecord/export',
+    method: 'get',
+    params: query
+  })
+}

src/api/materialManagement/distribution.js

@@ -67,4 +67,13 @@ export function treeselect(query) {
     method: 'get',
     params: query
   })
+}
+
+// 物资接收
+export function jieshou(data) {
+  return request({
+    url: '/materialManagement/distribution/jieshou',
+    method: 'put',
+    data
+  })
 }

src/api/militaryvehicleManagement/thebusApply.js

@@ -144,4 +144,21 @@ export function sb(query) {
     method: 'get',
     params: query
   })
+}
+// 批量审批
+export function examine(data) {
+  return request({
+    url: '/militaryvehicleManagement/thebusApply/examine',
+    method: 'post',
+    data
+  })
+}
+
+// 出车归队
+export function guiDui(data) {
+  return request({
+    url: '/militaryvehicleManagement/thebusApply/guiDui',
+    method: 'put',
+    data
+  })
 }

src/api/peopleChuRu/bdglLeave.js

@@ -50,4 +50,29 @@ export function exportBdglLeave(query) {
     method: 'get',
     params: query
   })
+}
+
+// 营级审批人
+export function YingJIUSer(query) {
+  return request({
+    url: '/peopleChuRu/bdglLeave/getYingJIUSer',
+    method: 'get',
+    params: query
+  })
+}
+// 连级审批人
+export function LIanJIUSer(query) {
+  return request({
+    url: '/peopleChuRu/bdglLeave/getLIanJIUSer',
+    method: 'get',
+    params: query
+  })
+}
+// 政治审批人
+export function ZhengZhiUSer(query) {
+  return request({
+    url: '/peopleChuRu/bdglLeave/getZhengZhiUSer',
+    method: 'get',
+    params: query
+  })
 }

src/assets/styles/global.css

@@ -1203,6 +1203,26 @@ input:-moz-placeholder {
   color: black !important;
 }
 
+/* 军事月统计训练报表弹框样式 */
+#fileinfodocxs .el-dialog__body {
+  height: 650px !important;
+  overflow-x: hidden !important;
+}
+
+
+#fileinfodocxs .el-dialog {
+  background-color: white !important;
+}
+
+#fileinfopdf .el-dialog {
+  background-color: white !important;
+}
+
+#fileinfodocxs .el-dialog__title {
+  color: black !important;
+}
+
+
 /*定义滚动条宽高及背景，宽高分别对应横竖滚动条的尺寸*/
 #fileinfopdf .el-dialog__body::-webkit-scrollbar {
   width: 14px;

src/views/barracksManagement/barracks/index.vue

@@ -421,17 +421,18 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
+      console.log(this.ids);
       const ids = row.id || this.ids;
-      this.$modal
-        .confirm("是否确认删除？")
-        .then(function () {
-          return delBarracks(ids);
-        })
-        .then(() => {
-          this.getList();
-          this.$modal.msgSuccess("删除成功");
-        })
-        .catch(() => {});
+      // this.$modal
+      //   .confirm("是否确认删除？")
+      //   .then(function () {
+      //     return delBarracks(ids);
+      //   })
+      //   .then(() => {
+      //     this.getList();
+      //     this.$modal.msgSuccess("删除成功");
+      //   })
+      //   .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {

src/views/barracksManagement/checkin/index.vue

@@ -25,12 +25,12 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item> -->
-      <el-form-item prop="occupant">
+      <el-form-item prop="unitName">
         <el-input
-          v-model="queryParams.occupant"
+          v-model="queryParams.unitName"
           clearable
           size="small"
-          placeholder="请输入入住人姓名"
+          placeholder="请输入单位名称"
           @input="handleQuery"
         />
       </el-form-item>
@@ -122,7 +122,14 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="序号" type="index" width="50"> </el-table-column>
+      <el-table-column label="序号" type="index" width="50">
+        <template scope="scope">
+          <span>{{
+            (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
+          }}</span>
+        </template>
+      </el-table-column>
+
       <el-table-column label="单位名称" align="center" prop="unitName" />
       <el-table-column label="位置" align="center" prop="common" />
       <el-table-column label="入住人姓名" align="center" prop="occupant" />

src/views/barracksManagement/flats/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form
+    <!-- <el-form
       :model="queryParams"
       ref="queryForm"
       :inline="true"
@@ -8,13 +8,6 @@
       label-width="100px"
     >
       <el-form-item prop="unitId" style="margin-left: -40px" label-width="50px">
-        <!-- <el-input
-          v-model="queryParams.unitId"
-          placeholder="请输入单位"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        /> -->
         <treeselect
           v-model="queryParams.unitId"
           :options="users"
@@ -28,13 +21,6 @@
         label-width="50px"
         style="margin-left: -23px"
       >
-        <!-- <el-input
-          v-model="queryParams.peopleId"
-          placeholder="请输入人员"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        /> -->
         <el-select
           v-model="queryParams.peopleName"
           ref="peoplenames"
@@ -49,34 +35,12 @@
           />
         </el-select>
       </el-form-item>
-      <!-- <el-form-item label="部职别" prop="duty" label-width="110px">
-        <el-input
-          v-model="queryParams.duty"
-          placeholder="请输入部职别"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="住房待遇等级" prop="grade">
-        <el-input
-          v-model="queryParams.grade"
-          placeholder="请输入住房待遇等级"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
       <el-form-item style="margin-left: 0px" prop="type">
-        <!-- <el-select v-model="queryParams.type" placeholder="请选择申请住房类别" clearable size="small">
-          <el-option label="请选择字典生成" value="" />
-        </el-select> -->
         <el-select
           v-model="queryParams.type"
           placeholder="请选择申请住房类别"
           @change="leibie"
         >
-          <!-- <el-option label="请选择字典生成" value="" /> -->
           <el-option
             v-for="(item, i) in ziDian"
             :key="i"
@@ -88,10 +52,10 @@
       </el-form-item>
 
       <el-form-item>
-        <!-- <el-button size="btn" @click="handleQuery">搜索</el-button> -->
+        <el-button size="btn" @click="handleQuery">搜索</el-button>
         <el-button size="btr" @click="resetQuery">重置</el-button>
       </el-form-item>
-    </el-form>
+    </el-form> -->
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">

src/views/barracksManagement/maintenanceRecord/index.vue

@@ -0,0 +1,608 @@
+<template>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
+      <el-form-item label="" prop="unitName">
+        <el-input
+          v-model="queryParams.unitName"
+          placeholder="请输入单位名称"
+          clearable
+          size="small"
+          @input="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <!-- <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        > -->
+        <el-button size="btr" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['barracksManagement:maintenanceRecord:add']"
+          >新增</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['barracksManagement:maintenanceRecord:edit']"
+          >修改</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['barracksManagement:maintenanceRecord:remove']"
+          >删除</el-button
+        >
+      </el-col>
+      <!-- <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['barracksManagement:maintenanceRecord:export']"
+          >导出</el-button
+        >
+      </el-col> -->
+    </el-row>
+
+    <el-table
+      v-loading="loading"
+      :data="maintenanceRecordList"
+      @selection-change="handleSelectionChange"
+      :header-cell-style="{ background: '#003C69', color: 'white' }"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="序号" align="center" prop="">
+        <template scope="scope">
+          <span>{{
+            (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
+          }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="单位名称"
+        align="center"
+        prop="unitName"
+        width="200"
+      />
+      <el-table-column label="负责人" align="center" prop="personCharge" />
+      <el-table-column label="材料" align="center" prop="materialScience" />
+      <el-table-column label="发现时间" align="center" prop="time" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.time, "{y}-{m}-{d}") }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="整改时间"
+        align="center"
+        prop="rectificationTime"
+        width="180"
+      >
+        <template slot-scope="scope">
+          <span>{{
+            parseTime(scope.row.rectificationTime, "{y}-{m}-{d}")
+          }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="问题"
+        align="center"
+        prop="problem"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        label="备注"
+        align="center"
+        prop="remark"
+        show-overflow-tooltip
+      />
+      <el-table-column label="经费情况" align="center" prop="funding" />
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
+        <template slot-scope="scope">
+          <el-button
+            size="btu"
+            type="text"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['barracksManagement:maintenanceRecord:edit']"
+            >修改</el-button
+          >
+          <el-button
+            size="btd"
+            type="text"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['barracksManagement:maintenanceRecord:remove']"
+            >删除</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改五小工维修记录对话框 -->
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="900px"
+      append-to-body
+      :close-on-click-modal="false"
+    >
+      <el-form
+        ref="form"
+        :model="form"
+        :rules="rules"
+        label-width="80px"
+        :inline="true"
+      >
+        <el-form-item label="单位名称" prop="unitName">
+          <treeselect
+            v-model="form.unitId"
+            :options="treeList"
+            placeholder="选择单位"
+            @select="selectPeo"
+          />
+        </el-form-item>
+        <el-form-item label="负责人" prop="personCharge">
+          <el-input v-model="form.personCharge" placeholder="请输入负责人" />
+        </el-form-item>
+        <el-form-item label="发现时间" prop="time">
+          <el-date-picker
+            clearable
+            size="small"
+            v-model="form.time"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择发现时间"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="整改时间" prop="rectificationTime">
+          <el-date-picker
+            clearable
+            size="small"
+            v-model="form.rectificationTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择整改时间"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="材料" prop="materialScience">
+          <el-input v-model="form.materialScience" placeholder="请输入材料" />
+        </el-form-item>
+        <el-form-item label="经费情况" prop="funding">
+          <el-input v-model="form.funding" placeholder="请输入经费情况" />
+        </el-form-item>
+        <div class="jiben">问题</div>
+        <el-form-item label="" prop="problem">
+          <el-input
+            v-model="form.problem"
+            type="textarea"
+            placeholder="请输入内容"
+            autosize
+          />
+        </el-form-item>
+        <div class="jiben">备注</div>
+        <el-form-item label="" prop="remark">
+          <el-input
+            v-model="form.remark"
+            placeholder="请输入备注"
+            type="textarea"
+            autosize
+          />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  listMaintenanceRecord,
+  getMaintenanceRecord,
+  delMaintenanceRecord,
+  addMaintenanceRecord,
+  updateMaintenanceRecord,
+  exportMaintenanceRecord,
+} from "@/api/barracksManagement/maintenanceRecord";
+import { getDept } from "@/api/militaryvehicleManagement/thebus";
+// 导入树形结构
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
+export default {
+  name: "MaintenanceRecord",
+  components: {
+    Treeselect,
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 五小工维修记录表格数据
+      maintenanceRecordList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        unitName: null,
+        unitId: null,
+        problem: null,
+        time: null,
+        personCharge: null,
+        rectificationTime: null,
+        materialScience: null,
+        funding: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {},
+      // 树形列表
+      treeList: [],
+      // 人员列表
+      renYuan: [],
+    };
+  },
+  created() {
+    this.getList();
+    this.getTreeList();
+  },
+  methods: {
+    // 选择部门单位触发
+    selectPeo(data) {
+      this.form.unitName = data.label;
+    },
+    //  获取单位列表
+    getTreeList() {
+      getDept().then((res) => {
+        this.treeList = res.data;
+      });
+    },
+    /** 查询五小工维修记录列表 */
+    getList() {
+      this.loading = true;
+      listMaintenanceRecord(this.queryParams).then((response) => {
+        this.maintenanceRecordList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        unitName: null,
+        unitId: null,
+        problem: null,
+        time: null,
+        personCharge: null,
+        rectificationTime: null,
+        materialScience: null,
+        remark: null,
+        funding: null,
+        createTime: null,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加五小工维修记录";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.getTreeList();
+      this.reset();
+      const id = row.id || this.ids;
+      getMaintenanceRecord(id).then((response) => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改五小工维修记录";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateMaintenanceRecord(this.form).then((response) => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addMaintenanceRecord(this.form).then((response) => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal
+        .confirm('是否确认删除五小工维修记录')
+        .then(function () {
+          return delMaintenanceRecord(ids);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$modal
+        .confirm("是否确认导出所有五小工维修记录数据项？")
+        .then(() => {
+          this.exportLoading = true;
+          return exportMaintenanceRecord(queryParams);
+        })
+        .then((response) => {
+          this.$download.name(response.msg);
+          this.exportLoading = false;
+        })
+        .catch(() => {});
+    },
+  },
+};
+</script>
+<style scoped>
+/* 对话框背景颜色 */
+::v-deep .el-dialog {
+  background: #004d86 !important;
+  width: 800px !important;
+}
+::v-deep .el-textarea__inner {
+  width: 920px;
+  height: 104px;
+  margin: auto;
+}
+::v-deep .el-dialog__header {
+  border-bottom: 1px solid #718a9d;
+}
+::v-deep .el-dialog__title {
+  color: #fff;
+  font: 18px;
+}
+::v-deep .el-dialog__headerbtn .el-dialog__close {
+  color: #fff;
+}
+::v-deep .el-form-item__label {
+  font: 16px;
+  color: #fff;
+  width: 100px !important;
+}
+::v-deep .el-input__inner {
+  /* width: 200px !important;
+  height: 36px; */
+  background: transparent;
+  color: #fff;
+  border: 1px solid white !important;
+}
+/* 单位框背景颜色 */
+::v-deep .vue-treeselect__control {
+  background: #004d86 !important;
+}
+/* 基本信息背景 */
+.jiben {
+  width: 920px;
+  height: 32px;
+  background-image: url(../../../images/小标题底.png);
+  background-size: 100%;
+  margin-bottom: 25px;
+  color: #fff;
+  padding-left: 16px;
+  line-height: 32px;
+}
+/*调整表单间距 */
+::v-deep .el-form-item__content {
+  width: 200px;
+}
+::v-deep .el-input__inner {
+  cursor: pointer !important;
+}
+/* 底部确定取消按钮 */
+::v-deep .el-dialog__footer {
+  padding: 18px 50px !important;
+  margin-right: 24px !important;
+}
+::v-deep .el-dialog__body {
+  margin: 10px 0px 20px 51px;
+  padding-top: 20px !important;
+  box-sizing: border-box;
+  /* padding: 30px 12px 30px 28px; */
+}
+.contents {
+  padding: 0px 40px !important;
+}
+/* 下拉菜单 */
+.el-dropdown-link {
+  cursor: pointer;
+  color: #409eff;
+}
+.el-icon-arrow-down {
+  font-size: 12px;
+}
+.el-select-dropdown__item:hover {
+  color: #000 !important;
+}
+.el-select-dropdown__item {
+  color: #000 !important;
+}
+/* 下拉菜单字体/背景颜色 */
+.el-select-dropdown__item.hover,
+.el-select-dropdown__item:hover {
+  background-color: #004d86;
+  color: #fff;
+}
+.el-select-dropdown__item {
+  color: #fff;
+}
+/* 时间选择 */
+::v-deep .el-input--small .el-input__inner {
+  width: 200px;
+  height: 36px;
+  line-height: 36px;
+}
+.el-date-editor.el-input {
+  width: 200px;
+  height: 36px;
+  line-height: 36px;
+}
+::v-deep .el-date-editor.el-input .el-input__inner {
+  height: 36px;
+  line-height: 36px;
+}
+/* 单位框背景颜色 */
+::v-deep .vue-treeselect__control {
+  background: #004d86 !important;
+  color: #fff;
+}
+/* 单位下拉菜单选中字体颜色 */
+::v-deep .vue-treeselect__single-value {
+  color: #fff !important;
+}
+/* 分页按钮 */
+::v-deep .el-pagination.is-background .el-pager li {
+  background-color: #004d86;
+  color: #fff;
+}
+::v-deep .el-pagination.is-background .btn-next {
+  background-color: #004d86;
+  color: #fff;
+}
+/* 底部确定取消按钮 */
+::v-deep .el-dialog__footer {
+  padding: 18px 50px;
+  margin-right: 42px;
+}
+/* 增加按钮弹框 */
+::v-deep .el-dialog {
+  width: 1060px !important;
+}
+::v-deep .el-dialog__body {
+  padding: none !important;
+}
+/* 小手样式 */
+::v-deep .el-table__cell {
+  cursor: pointer;
+}
+.el-button--mini {
+  width: 80px !important;
+  border: 1px solid transparent;
+  padding: 3px 8px;
+  font-size: 14px;
+  line-height: 1.5;
+  border-radius: 3px;
+  color: #fff;
+  background-color: #1890ff;
+}
+/* ::v-deep .el-table__body tr.hover-row > td.el-table__cell {
+  background-color: none;
+} */
+::v-deep .el-table .el-table__body .el-table__row.hover-row td {
+  background-color: #004d86;
+}
+::v-deep .el-table__fixed-right {
+  height: 100% !important;
+}
+::v-deep .vue-treeselect__control {
+  background-color: transparent !important;
+}
+::v-deep .el-form-item__content .el-textarea .el-textarea__inner {
+    width: 916px;
+    min-height: 120px !important;
+}
+</style>

src/views/combatduty/basedutyinfo/index.vue

@@ -28,8 +28,15 @@
           @change="handleQuery"
         ></el-date-picker>
       </el-form-item>
-      <el-form-item label="" prop="chiefDutyId">
-        <el-select
+      <el-form-item label="" prop="chiefDutyName">
+        <el-input
+          v-model="queryParams.chiefDutyName"
+          placeholder="请输入值班首长"
+          clearable
+          size="small"
+          @input="handleQuery"
+        />
+        <!-- <el-select
           v-model="queryParams.chiefDutyId"
           filterable
           clearable
@@ -42,7 +49,7 @@
             :label="item.name"
             :value="item.id"
           ></el-option>
-        </el-select>
+        </el-select> -->
       </el-form-item>
       <!-- <el-form-item label="值班首长ID" prop="chiefDutyId">
         <el-input
@@ -421,7 +428,8 @@
           ></el-date-picker>
         </el-form-item>
         <el-form-item label="值班首长" prop="chiefDutyName">
-          <el-select
+           <el-input v-model="form.chiefDutyName" placeholder="" />
+          <!-- <el-select
             v-model="form.chiefDutyName"
             @change="chiefDutyNamefun"
             filterable
@@ -434,7 +442,7 @@
               :label="item.name"
               :value="item"
             ></el-option>
-          </el-select>
+          </el-select> -->
         </el-form-item>
         <!-- <el-form-item label="值班首长ID" prop="chiefDutyId">
           <el-input v-model="form.chiefDutyId" placeholder="请输入值班首长ID" />
@@ -443,7 +451,8 @@
           <el-input v-model="form.chiefDutyPhone" placeholder="" />
         </el-form-item>
         <el-form-item label="作战值班员" prop="combatDutyName">
-          <el-select
+            <el-input v-model="form.combatDutyName" placeholder="" />
+          <!-- <el-select
             v-model="form.combatDutyName"
             @change="combatDutyNamefun"
             filterable
@@ -456,7 +465,7 @@
               :label="item.name"
               :value="item"
             ></el-option>
-          </el-select>
+          </el-select> -->
         </el-form-item>
         <!-- <el-form-item label="作战值班员Id" prop="combatDutyId">
           <el-input v-model="form.combatDutyId" placeholder="请输入作战值班员Id" />
@@ -465,7 +474,8 @@
           <el-input v-model="form.combatDutyPhone" placeholder="" />
         </el-form-item>
         <el-form-item label="总值班员" prop="dutyOffierName">
-          <el-select
+           <el-input v-model="form.dutyOffierName" placeholder="" />
+          <!-- <el-select
             v-model="form.dutyOffierName"
             @change="dutyOffierNamefun"
             filterable
@@ -478,7 +488,7 @@
               :label="item.name"
               :value="item"
             ></el-option>
-          </el-select>
+          </el-select> -->
         </el-form-item>
         <!-- <el-form-item label="总值班员ID" prop="dutyOffierId">
           <el-input v-model="form.dutyOffierId" placeholder="请输入总值班员ID" />
@@ -487,7 +497,8 @@
           <el-input v-model="form.dutyOffierPhone" placeholder="" />
         </el-form-item>
         <el-form-item label="值班分队1" prop="detachmentoneName">
-          <el-select
+            <el-input v-model="form.detachmentoneName" placeholder="" />
+          <!-- <el-select
             v-model="form.detachmentoneName"
             @change="detachmentoneNamechange"
             clearable
@@ -499,7 +510,7 @@
               :label="dict.deptName"
               :value="dict"
             ></el-option>
-          </el-select>
+          </el-select> -->
         </el-form-item>
         <!-- <el-form-item label="值班分队1ID" prop="detachmentoneId">
           <el-input v-model="form.detachmentoneId" placeholder="请输入值班分队1ID" />
@@ -520,7 +531,8 @@
           />-->
         </el-form-item>
         <el-form-item label="值班分队1指挥员" prop="detachmentonePeopleName">
-          <el-select
+           <el-input v-model="form.detachmentonePeopleName" placeholder="" />
+          <!-- <el-select
             v-model="form.detachmentonePeopleName"
             filterable
             clearable
@@ -533,7 +545,7 @@
               :label="item.name"
               :value="item"
             ></el-option>
-          </el-select>
+          </el-select> -->
         </el-form-item>
         <!-- <el-form-item label="值班分队1指挥员ID" prop="detachmentonePeopleId">
           <el-input v-model="form.detachmentonePeopleId" placeholder="请输入值班分队1指挥员ID" />
@@ -545,7 +557,8 @@
           <el-input v-model="form.detachmentonePeoplePhone" placeholder="" />
         </el-form-item>
         <el-form-item label="值班分队2" prop="detachmentwoName">
-          <el-select
+            <el-input v-model="form.detachmentwoName" placeholder="" />
+          <!-- <el-select
             v-model="form.detachmentwoName"
             @change="detachmentwoNamechange"
             clearable
@@ -557,7 +570,7 @@
               :label="dict.deptName"
               :value="dict"
             ></el-option>
-          </el-select>
+          </el-select> -->
         </el-form-item>
         <!-- <el-form-item label="值班分队2ID" prop="detachmentwoId">
           <el-input v-model="form.detachmentwoId" placeholder="请输入值班分队2ID" />
@@ -577,7 +590,8 @@
           />-->
         </el-form-item>
         <el-form-item label="值班分队2指挥员" prop="detachmentwoPeopleName">
-          <el-select
+           <el-input v-model="form.detachmentwoPeopleName" placeholder="" />
+          <!-- <el-select
             v-model="form.detachmentwoPeopleName"
             filterable
             clearable
@@ -590,7 +604,7 @@
               :label="item.name"
               :value="item"
             ></el-option>
-          </el-select>
+          </el-select> -->
         </el-form-item>
         <!-- <el-form-item label="值班分队2指挥员ID" prop="detachmentwoPeopleId">
           <el-input v-model="form.detachmentwoPeopleId" placeholder="请输入值班分队2指挥员ID" />
@@ -917,36 +931,36 @@ export default {
     caoZuoTypefun() {
       this.getList();
     },
-    //首长电话
-    chiefDutyNamefun(val) {
-      this.form.chiefDutyId = val.id;
-      this.form.chiefDutyName = val.name;
-      this.form.chiefDutyPhone = val.phone;
-    },
-    //作战值班电话
-    combatDutyNamefun(val) {
-      this.form.combatDutyId = val.id;
-      this.form.combatDutyName = val.name;
-      this.form.combatDutyPhone = val.phone;
-    },
-    //总值班员
-    dutyOffierNamefun(val) {
-      this.form.dutyOffierId = val.id;
-      this.form.dutyOffierName = val.name;
-      this.form.dutyOffierPhone = val.phone;
-    },
-    //值班分队1指挥员
-    detachmentonePeopleNamefun(val) {
-      this.form.detachmentonePeopleId = val.id;
-      this.form.detachmentonePeopleName = val.name;
-      this.form.detachmentonePeoplePhone = val.phone;
-    },
-    //值班分队2指挥员
-    detachmentwoPeopleNamefun(val) {
-      this.form.detachmentwoPeopleId = val.id;
-      this.form.detachmentwoPeopleName = val.name;
-      this.form.detachmentwoPeoplePhone = val.phone;
-    },
+    // //首长电话
+    // chiefDutyNamefun(val) {
+    //   this.form.chiefDutyId = val.id;
+    //   this.form.chiefDutyName = val.name;
+    //   this.form.chiefDutyPhone = val.phone;
+    // },
+    // //作战值班电话
+    // combatDutyNamefun(val) {
+    //   this.form.combatDutyId = val.id;
+    //   this.form.combatDutyName = val.name;
+    //   this.form.combatDutyPhone = val.phone;
+    // },
+    // //总值班员
+    // dutyOffierNamefun(val) {
+    //   this.form.dutyOffierId = val.id;
+    //   this.form.dutyOffierName = val.name;
+    //   this.form.dutyOffierPhone = val.phone;
+    // },
+    // //值班分队1指挥员
+    // detachmentonePeopleNamefun(val) {
+    //   this.form.detachmentonePeopleId = val.id;
+    //   this.form.detachmentonePeopleName = val.name;
+    //   this.form.detachmentonePeoplePhone = val.phone;
+    // },
+    // //值班分队2指挥员
+    // detachmentwoPeopleNamefun(val) {
+    //   this.form.detachmentwoPeopleId = val.id;
+    //   this.form.detachmentwoPeopleName = val.name;
+    //   this.form.detachmentwoPeoplePhone = val.phone;
+    // },
     detachmentoneNamechange(val) {
       this.form.detachmentoneId = val.deptId;
       this.form.detachmentoneName = val.deptName;

src/views/combatduty/grassdutyinfo/index.vue

@@ -11,6 +11,20 @@
     <hr />
     <el-row :gutter="20">
       <el-col :span="4" :xs="24">
+        <div class="data">
+          <p>日期</p>
+          <div class="a1"></div>
+          <el-date-picker
+            v-model="tiem"
+            type="date"
+            :editable="false"
+            placeholder="选择日期"
+            value-format="yyyy-MM-dd"
+            clearable
+            @change="tiemes"
+          >
+          </el-date-picker>
+        </div>
         <div class="dadui">
           <img src="../../../images/星星.png" alt />
           大队
@@ -51,7 +65,19 @@
           >删除</el-button
         >
       </el-col>
-      <el-col :span="1.5"> </el-col>
+         <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['combatduty:grassdutyinfo:export']"
+          >导出</el-button
+        >
+      </el-col>
+
       <el-col :span="1.5"> </el-col>
       <el-col :span="20" :xs="24">
         <el-table
@@ -428,19 +454,6 @@
           >删除</el-button
         >
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          :loading="exportLoading"
-          @click="handleExport"
-          v-hasPermi="['combatduty:grassdutyinfo:export']"
-          >导出</el-button
-        >
-      </el-col>
-
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row> -->
 
@@ -674,7 +687,7 @@ export default {
         dutyOffierPhone: null,
         dutyPhone: null,
         dutyGangwei: null,
-        type: null,
+        type: 1,
       },
       // 表单参数
       form: {},
@@ -694,6 +707,8 @@ export default {
       },
       danWie: "",
       deptId: null,
+      // 外面时间选择
+      tiem: "",
     };
   },
   created() {
@@ -704,6 +719,11 @@ export default {
     this.treeselect();
   },
   methods: {
+    // 点击外面时间触发
+    tiemes() {
+      this.queryParams.attendedTime = this.tiem;
+      this.getList();
+    },
     // 获取登录信息
     getUser() {
       getUserProfile().then((response) => {
@@ -1169,4 +1189,55 @@ hr {
 ::v-deep .el-input__suffix-inner {
   margin-right: -80px;
 }
+.app-container .data {
+  height: 40px;
+  background: #003156;
+  margin-bottom: 12px;
+  color: #fff;
+  display: flex;
+  font-size: 13px;
+  line-height: 25px;
+  position: relative;
+}
+.data p {
+  position: absolute;
+  top: -5px;
+  left: 15px;
+}
+.data .a1 {
+  width: 128px;
+  height: 26px;
+  background: rgba(23, 74, 112, 0.4);
+  border-radius: 13px;
+  position: absolute;
+  top: 7px;
+  left: 60px;
+}
+::v-deep .data .el-date-editor.el-input {
+  width: 100%;
+  border: none;
+}
+::v-deep .data .el-input__inner {
+  width: 100% !important;
+  border: none;
+}
+::v-deep .data .el-input--medium .el-input__icon {
+  line-height: 36px;
+  position: absolute;
+  right: -232px;
+  top: 2px;
+}
+::v-deep .data .el-input__inner {
+  background-color: transparent;
+  color: #fff;
+  text-align: center;
+  margin-top: 2px;
+}
+::v-deep .data .el-input__suffix {
+  position: absolute;
+  right: 281px;
+}
+::v-deep .data .el-icon-date:before {
+  content: none;
+}
 </style>

src/views/grassrootsregistration/statistics/index.vue

@@ -123,11 +123,9 @@
           }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="单位名称" align="center" prop="id" />
-      <el-table-column label="单位" align="center" prop="unitId" />
-      <el-table-column label="应到" align="center" prop="shouldBeTo" />
-      <el-table-column label="实到" align="center" prop="actualArrival" />
       <el-table-column label="单位名称" align="center" prop="unitName" />
+      <el-table-column label="标题" align="center" prop="title" />
+      <el-table-column label="时间" align="center" prop="time" />
       <el-table-column
         label="操作"
         align="center"
@@ -141,6 +139,11 @@
             v-hasPermi="['grassrootsregistration:bdgldiary:edit']"
             ><span class="chakan">查看</span></el-button
           > -->
+          <el-button size="btc" type="text" @click.native="ViewRead(scope.row)">
+            <span>
+              <a target="_blank">阅读</a>
+            </span>
+          </el-button>
           <el-button
             size="btu"
             type="text"
@@ -186,17 +189,32 @@
         :inline="true"
       >
         <el-form-item label="单位" prop="unitId">
-          <el-input v-model="form.unitId" placeholder="请输入单位" />
+          <treeselect
+            v-model="form.unitId"
+            :options="deptOptions"
+            placeholder="请选择单位"
+            @select="selectPeo"
+          />
         </el-form-item>
-        <el-form-item label="应到" prop="shouldBeTo">
-          <el-input v-model="form.shouldBeTo" placeholder="请输入应到" />
+        <el-form-item label="标题" prop="title">
+          <el-input v-model="form.title" placeholder="请输入标题" />
         </el-form-item>
-        <el-form-item label="实到" prop="actualArrival">
-          <el-input v-model="form.actualArrival" placeholder="请输入实到" />
+        <el-form-item label="时间" prop="time">
+          <el-date-picker
+            clearable
+            size="small"
+            v-model="form.time"
+            type="date"
+            placeholder="选择时间"
+            class="text"
+            value-format="yyyy-MM-dd"
+          >
+          </el-date-picker>
         </el-form-item>
-        <el-form-item label="单位名称" prop="unitName">
+        <FileUpload v-model="fielList" :limit="1" />
+        <!-- <el-form-item label="上传文件" prop="unitName">
           <el-input v-model="form.unitName" placeholder="请输入单位名称" />
-        </el-form-item>
+        </el-form-item> -->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -216,6 +234,23 @@
         :message="wordInfo"
       ></statistics>
     </el-dialog>
+
+     <!-- 添加预览doc文件弹框 -->
+      <el-dialog
+        style="color: pink;"
+        :title="title3"
+        :visible.sync="open33"
+        width="850px"
+        append-to-body
+        id="fileinfodocxs"
+        class="el-dialog__header "
+        :close-on-click-modal="false"
+      >
+        <div ref="file"></div>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="open33 = false">关 闭</el-button>
+        </div>
+      </el-dialog>
   </div>
 </template>
 
@@ -229,10 +264,21 @@ import {
   updateStatistics,
   exportStatistics,
 } from "@/api/grassrootsregistration/statistics";
+import { getDept } from "@/api/grassrootsregistration/bdgleven";
+// 导入树形结构
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import axios from "axios";
+import PDF from "vue-pdf";
+const docx = require("docx-preview");
+window.JSZip = require("jszip");
 
 export default {
   name: "Statistics",
-  components: { statistics },
+  components: {
+    Treeselect,
+    statistics,
+  },
   data() {
     return {
       //查看页面
@@ -271,12 +317,48 @@ export default {
       form: {},
       // 表单校验
       rules: {},
+      // 获取部门列表
+      deptOptions: [],
+      // 获取文件的数组
+      fielList: [],
+         open33: false,
+             title3: "预览文件",
     };
   },
   created() {
     this.getList();
+    this.getTreeselect();
   },
   methods: {
+    // 阅读按钮操作
+    ViewRead(row) {
+      console.log(row);
+      if (row.actualArrival == ".doc"||row.actualArrival ==".docx"||row.actualArrival=='.pdf') {
+        this.open33 = true;
+        axios({
+          method: "get",
+          responseType: "blob", // 设置响应文件格式
+          url: process.env.VUE_APP_BASE_API + row.filePath,
+        }).then(({ data }) => {
+          console.log(process.env.VUE_APP_BASE_API + row.filePath);
+          $(".doc").attr("id", "printArea");
+
+          docx.renderAsync(data, this.$refs.file); // 渲染到页面预览
+        });
+      } else  {
+         this.$modal.msgWarning("只能阅读word文档");
+      }
+    },
+    // 选择单位触发
+    selectPeo(val) {
+      this.form.unitName = val.label;
+    },
+    /** 查询部门下拉树结构 */
+    getTreeselect() {
+      getDept().then((response) => {
+        this.deptOptions = response.data;
+      });
+    },
     /** 查询军事训练月统计班列表 */
     getList() {
       this.loading = true;
@@ -300,6 +382,7 @@ export default {
         actualArrival: null,
         unitName: null,
       };
+      this.fielList = [];
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
@@ -329,7 +412,11 @@ export default {
       this.reset();
       const id = row.id || this.ids;
       getStatistics(id).then((response) => {
+        console.log(response.data);
         this.form = response.data;
+        this.fielList = [
+          { name: response.data.fileName, url: response.data.filePath },
+        ];
         this.open = true;
         this.title = "修改军事训练月统计表";
       });
@@ -356,6 +443,12 @@ export default {
               this.getList();
             });
           } else {
+            if (this.fielList.length > 0) {
+              console.log(this.fielList);
+              this.form.fileName = this.fielList[0].name;
+              this.form.filePath = this.fielList[0].url;
+              this.form.actualArrival =this.fielList[0].houZUI
+            }
             addStatistics(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
@@ -476,4 +569,33 @@ export default {
 ::v-deep ::-webkit-input-placeholder {
   color: #bdbdbd4f !important;
 }
+::v-deep .vue-treeselect__control {
+  width: 260px;
+}
+::v-deep .vue-treeselect__menu-container {
+  width: 260px;
+}
+::v-deep .vue-treeselect__single-value {
+  color: #fff;
+}
+::v-deep .upload-file {
+  padding-left: 35px;
+}
+::v-deep .el-upload__tip {
+  color: #fff;
+}
+::v-deep .el-icon-document {
+  color: #fff;
+}
+
+::v-deep .docx-wrapper{
+  background: none;
+  padding:0;
+}
+::v-deep .docx-wrapper>section.docx {
+  box-shadow:none
+}
+::v-deep .docx-wrapper section{
+  padding: 0pt 90pt !important;
+}
 </style>

src/views/materialManagement/archives/index.vue

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

src/views/materialManagement/distribution/index.vue

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

src/views/materialManagement/equipmentReceiving/index.vue

@@ -290,6 +290,7 @@
         label="发放单位"
         align="center"
         prop="responsibilityUnit"
+        width="200"
       />
       <el-table-column label="发放对象" align="center" prop="outPeople">
       </el-table-column>
@@ -299,7 +300,7 @@
         prop="outUnit"
         width="120"
       />
-      <el-table-column label="接收人" align="center" prop="resipient" />
+      <el-table-column label="接收人" align="center" prop="recipient" />
       <!-- <el-table-column label="存放位置" align="center" prop="storageLocation" /> -->
       <!-- <el-table-column label="备注" align="center" prop="remark" /> -->
       <el-table-column label="库房" align="center" prop="warehouse">
@@ -311,29 +312,37 @@
         </template>
       </el-table-column>
       <el-table-column label="库存数量" align="center" prop="total" />
-      <!-- <el-table-column
+      <el-table-column
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
         width="120"
       >
         <template slot-scope="scope">
-          <el-button
+          <!-- <el-button
             size="btu"
             type="text"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['materialManagement:distribution:edit']"
             >修改</el-button
-          >
+          > -->
           <el-button
+            v-if="scope.row.common == '1'"
+            size="btu"
+            type="text"
+            @click="receive(scope.row)"
+            v-hasPermi="['materialManagement:distribution:edit']"
+            >接收</el-button
+          >
+          <!-- <el-button
             size="btd"
             type="text"
             @click="handleDelete(scope.row)"
             v-hasPermi="['materialManagement:distribution:remove']"
             >删除</el-button
-          >
+          > -->
         </template>
-      </el-table-column> -->
+      </el-table-column>
     </el-table>
 
     <pagination
@@ -547,11 +556,13 @@ import {
   updateDistribution,
   exportDistribution,
   exportMaterialRegWuPingList,
+  jieshou,
 } from "@/api/materialManagement/distribution";
 // 导入树形结构
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import { getDept, getZhuChiRen } from "@/api/materialManagement/archives";
+import { getUserProfile } from "@/api/system/user";
 
 export default {
   components: {
@@ -622,12 +633,38 @@ export default {
       renYuan: [],
       // 总数量
       yinJunShu: "",
+      // 用户名称
+      yongHu: "",
     };
   },
   created() {
     this.getList();
+    this.getUser();
   },
   methods: {
+    // 获取登陆人信息
+    getUser() {
+      getUserProfile().then((response) => {
+        this.yongHu = response.data.nickName;
+      });
+    },
+    // 接收按钮触发
+    receive(row) {
+      this.form = row;
+      this.form.recipient = this.yongHu;
+      this.$confirm("是否确认接收该数据", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          jieshou(this.form).then((res) => {
+            this.getList();
+            this.$modal.msgSuccess("接收成功");
+          });
+        })
+        .catch(() => {});
+    },
     // 数量的判断
     shuLiang() {
       if (this.form.putOut > this.yinJunShu) {

src/views/materialManagement/materialRegistration/index.vue

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

src/views/materialManagement/propertyChange/index.vue

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

src/views/medicalhealth/announcement/index.vue

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

src/views/medicalhealth/antiepidemicamount/index.vue

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

src/views/medicalhealth/antiepidemicarchives/index.vue

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

src/views/medicalhealth/antiepidemicputin/index.vue

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

src/views/medicalhealth/antiepidemicputout/index.vue

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

src/views/medicalhealth/archives/index.vue

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

src/views/medicalhealth/bdgldurgarchives/index.vue

@@ -150,7 +150,7 @@
           >删除</el-button
         >
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="warning"
           plain
@@ -161,7 +161,7 @@
           v-hasPermi="['medicalhealth:bdgldurgarchives:export']"
           >导出</el-button
         >
-      </el-col>
+      </el-col> -->
       <!-- <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
@@ -182,7 +182,7 @@
           }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="单位" align="center" prop="unitName" />
+      <!-- <el-table-column label="单位" align="center" prop="unitName" /> -->
       <el-table-column label="药品名称" align="center" prop="durgName" />
       <el-table-column label="品牌" align="center" prop="durgBrand" />
       <el-table-column label="规格" align="center" prop="specifications" />
@@ -257,13 +257,13 @@
         <el-form-item label="药品名称" prop="durgName">
           <el-input v-model="form.durgName" placeholder="请输入药品名称" />
         </el-form-item>
-        <el-form-item label="单位" prop="unitId">
+        <!-- <el-form-item label="单位" prop="unitId">
           <treeselect
             v-model="form.unitId"
             :options="deptOptions"
             placeholder="选择单位"
           />
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="库房" prop="storeHouse">
           <el-select v-model="form.storeHouse" placeholder="请选择库房">
             <el-option

src/views/medicalhealth/bdgldurgputin/index.vue

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

src/views/medicalhealth/bdgldurgputout/index.vue

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

src/views/medicalhealth/consumeputin/index.vue

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

src/views/medicalhealth/consumeputout/index.vue

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

src/views/medicalhealth/consumeruin/index.vue

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

src/views/medicalhealth/diagnose/index.vue

@@ -7,9 +7,9 @@
       v-show="showSearch"
       label-width="68px"
     >
-      <el-form-item label="" prop="unitId">
+      <el-form-item label="" prop="unitName">
         <el-input
-          v-model="queryParams.unitId"
+          v-model="queryParams.unitName"
           placeholder="请输入单位"
           clearable
           size="small"
@@ -74,7 +74,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item> -->
-      <el-form-item label="" prop="createtime">
+      <!-- <el-form-item label="" prop="createtime">
         <el-input
           v-model="queryParams.createtime"
           placeholder="请输入登记时间"
@@ -82,7 +82,7 @@
           size="small"
           @input="handleQuery"
         />
-      </el-form-item>
+      </el-form-item> -->
       <!-- <el-form-item label="更新时间" prop="updatetime">
         <el-input
           v-model="queryParams.updatetime"
@@ -136,7 +136,7 @@
           >删除</el-button
         >
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="warning"
           plain
@@ -147,7 +147,7 @@
           v-hasPermi="['medicalhealth:diagnose:export']"
           >导出</el-button
         >
-      </el-col>
+      </el-col> -->
       <!-- <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
@@ -181,7 +181,11 @@
           <span>{{ parseTime(scope.row.startTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="时长" align="center" prop="duration" />
+      <el-table-column label="时长" align="center" prop="duration" >
+        <template slot-scope="scope">
+          <span>{{scope.row.duration+"天"}}</span>
+        </template>
+      </el-table-column>
       <el-table-column
         label="返回日期"
         align="center"
@@ -297,7 +301,7 @@
           <el-input v-model="form.address" placeholder="请输入地点" />
         </el-form-item>
         <el-form-item label="时长" prop="duration">
-          <el-input v-model="form.duration" placeholder="请输入时长" />
+          <el-input v-model="form.duration" placeholder="请输入时长" disabled />
         </el-form-item>
         <el-form-item label="外诊日期" prop="startTime">
           <el-date-picker
@@ -307,6 +311,7 @@
             type="date"
             value-format="yyyy-MM-dd"
             placeholder="选择外诊日期"
+            @change="changeTiem"
           >
           </el-date-picker>
         </el-form-item>
@@ -318,6 +323,7 @@
             type="date"
             value-format="yyyy-MM-dd"
             placeholder="选择返回日期"
+            @change="fanChangeTiem"
           >
           </el-date-picker>
         </el-form-item>
@@ -434,6 +440,26 @@ export default {
     this.getList();
   },
   methods: {
+    // 外诊时间计算离队时长
+    changeTiem() {
+      if (this.form.startTime != null && this.form.endTime != null) {
+        // 外出
+        var Outside = new Date(this.form.startTime);
+        // 返回
+        var returns = new Date(this.form.endTime);
+        this.form.duration = (returns - Outside) / 86400000;
+      }
+    },
+    // 返回时间计算时长
+    fanChangeTiem() {
+      if (this.form.startTime != null && this.form.endTime != null) {
+        // 外出
+        var Outside1 = new Date(this.form.startTime);
+        // 返回
+        var returns1 = new Date(this.form.endTime);
+        this.form.duration = (returns1 - Outside1) / 86400000;
+      }
+    },
     // 归队按钮触发
     handleUpdateGuiDui(row) {
       this.reset();
@@ -663,4 +689,8 @@ export default {
 ::v-deep .el-dialog__body {
   padding: 30px 0px 0px 65px;
 }
+::v-deep .el-input.is-disabled .el-input__inner {
+  background-color: transparent;
+  color: #fff;
+}
 </style>

src/views/medicalhealth/examine/index.vue

@@ -7,46 +7,53 @@
       v-show="showSearch"
       label-width="68px"
     >
-      <!-- <el-form-item label="" prop="unitId">
+      <el-form-item label="" prop="unitName">
         <el-input
-          v-model="queryParams.unitId"
+          v-model="queryParams.unitName"
           placeholder="请输入单位"
           clearable
           size="small"
-          @keyup.enter.native="handleQuery"
         />
-      </el-form-item> -->
-      <el-form-item label="" prop="peopleId">
+      </el-form-item>
+      <!-- <el-form-item label="" prop="peopleName">
         <el-input
-          v-model="queryParams.peopleId"
+          v-model="queryParams.peopleName"
           placeholder="请输入姓名"
           clearable
           size="small"
           @input="handleQuery"
         />
-      </el-form-item>
-      <!-- <el-form-item label="" prop="job">
+      </el-form-item> -->
+      <el-form-item label="" prop="job">
         <el-input
           v-model="queryParams.job"
           placeholder="请输入工作岗位"
           clearable
           size="small"
-          @keyup.enter.native="handleQuery"
         />
-      </el-form-item> -->
-      <!-- <el-form-item label="" prop="classId">
-        <el-input
+      </el-form-item>
+      <el-form-item label="" prop="classId">
+        <el-select
           v-model="queryParams.classId"
-          placeholder="请输入人员类别"
+          placeholder="请选择人员类别"
           clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
+        >
+          <el-option
+            v-for="(item, i) in renLie"
+            :key="i"
+            :label="item.dictLabel"
+            :value="item.dictValue"
+          >
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <input class="input" v-model.number="queryParams.minAge" placeholder="输⼊年龄段" type="number"/>
+      <span class="span">----</span>
+      <input class="input1" v-model.number="queryParams.maxAge" placeholder="输⼊年龄段" type="number"/>
       <el-form-item>
-        <!-- <el-button type="primary" size="btn" @click="handleQuery"
+        <el-button type="primary" size="btn" @click="handleQuery"
           >搜索</el-button
-        > -->
+        >
         <el-button size="btr" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
@@ -121,6 +128,13 @@
       </el-table-column>
       <el-table-column label="单位" align="center" prop="unitName" />
       <el-table-column label="姓名" align="center" prop="peopleName" />
+      <el-table-column label="年龄" align="center" prop="age" />
+      <el-table-column
+        label="身份证号"
+        align="center"
+        prop="idMunber"
+        width="170"
+      />
       <el-table-column label="工作岗位" align="center" prop="job" />
       <el-table-column label="人员类别" align="center" prop="classId">
         <template slot-scope="scope">
@@ -195,12 +209,15 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <!-- <el-form-item label="工作岗位" prop="job">
-          <el-input v-model="form.job" placeholder="请输入工作岗位" />
-        </el-form-item>
-        <el-form-item label="人员类别" prop="classId">
-          <el-input v-model="form.classId" placeholder="请输入人员类别" />
-        </el-form-item> -->
+          <el-form-item label="工作岗位" prop="job">
+            <el-input v-model="form.job" placeholder="" />
+          </el-form-item>
+          <el-form-item label="年龄" prop="age">
+            <el-input v-model="form.age" placeholder="" disabled />
+          </el-form-item>
+          <el-form-item label="身份证号" prop="idMunber">
+            <el-input v-model="form.idMunber" placeholder="" disabled />
+          </el-form-item>
         </el-form>
       </div>
       <div slot="footer" class="dialog-footer">
@@ -326,6 +343,9 @@ import "quill/dist/quill.snow.css";
 import "quill/dist/quill.bubble.css";
 import { quillEditor } from "vue-quill-editor";
 
+// 查询字典
+import { getDicts } from "@/api/system/dict/data";
+
 export default {
   name: "Examine",
   components: {
@@ -376,12 +396,22 @@ export default {
       deptOptions: [],
       // 人员列表
       renYuan: [],
+      // 人员类别
+      renLie: [],
     };
   },
   created() {
     this.getList();
+    this.getRenLei();
   },
   methods: {
+    // 获取人员类别
+    getRenLei() {
+      // 字典查询数据
+      this.getDicts("personnel_type").then((response) => {
+        this.renLie = response.data;
+      });
+    },
     // 点击查看人员体检信息
     handleUpdates(row) {
       this.reset();
@@ -403,8 +433,10 @@ export default {
     },
     // 点击人员触发
     xingMing(data) {
+      console.log(data);
+      this.$set(this.form, "age", data.age);
+      this.$set(this.form, "idMunber", data.idcard);
       this.classId = data.classId;
-      this.job = data.job;
       this.form.peopleName = data.name;
     },
     /** 查询部门下拉树结构 */
@@ -445,6 +477,8 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams.minAge=null
+      this.queryParams.maxAge=null
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -539,7 +573,7 @@ export default {
           return exportExamine(queryParams);
         })
         .then((response) => {
-          this.download(response.msg);
+          this.$download.name(response.msg);
           this.exportLoading = false;
         })
         .catch(() => {});
@@ -603,7 +637,7 @@ export default {
   color: #fff !important;
 }
 ::v-deep .qq > .el-form-item__content > .vue-treeselect__control {
-  width: 175% !important;
+  width: 280px !important;
 }
 /* 富文本删除功能 */
 ::v-deep .ql-blockquote {
@@ -672,4 +706,43 @@ export default {
 .el-select-dropdown__item.selected {
   color: #111;
 }
+::v-deep .el-input.is-disabled .el-input__inner {
+  background-color: transparent;
+  color: #fff;
+}
+.input{
+  width: 150px;
+  height: 36px;
+  line-height: 36px;
+  border: 1px solid #fff;
+  background-color: transparent;
+  outline: none;
+  color: #fff;
+  padding: 0 20px;
+  font-size: 14px;
+  border-radius: 4px;
+}
+.input1{
+  width: 150px;
+  height: 36px;
+  line-height: 36px;
+  border: 1px solid #fff;
+  background-color: transparent;
+  outline: none;
+  color: #fff;
+  padding: 0 20px;
+  font-size: 14px;
+  margin-right: 10px;
+   border-radius: 4px;
+}
+.span {
+  margin: 0 5px;
+  color: #fff;
+}
+.input,.input1::-webkit-outer-spin-button,input::-webkit-inner-spin-button{
+-webkit-appearance:none;
+}
+ .input,.input1[type="number"]{
+-moz-appearance: textfield;
+ }
 </style>

src/views/medicalhealth/recuperate/index.vue

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

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/privateAccessLog/index.vue

@@ -170,7 +170,7 @@
           >删除</el-button
         >
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           class="box"
           type="warning"
@@ -182,7 +182,7 @@
           v-hasPermi="['militaryvehicleManagement:privateAccessLog:export']"
           >导出</el-button
         >
-      </el-col>
+      </el-col> -->
       <!-- <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
@@ -196,8 +196,8 @@
       :header-cell-style="{ background: '#003C69', color: 'white' }"
     >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="序号" align="center" prop="id">
-        <template scope="scope">
+      <el-table-column label="序号" align="center" prop="">
+          <template scope="scope">
           <span>{{
             (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
           }}</span>

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

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>
 
@@ -694,6 +694,7 @@ export default {
     // 获取人员列表
     getRen(id) {
       getRen(id).then((res) => {
+        console.log(res);
         this.renYuan = res.rows;
       });
     },

src/views/militaryvehicleManagement/thebusAccessLog/index.vue

@@ -63,7 +63,7 @@
           >删除</el-button
         >
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           class="box"
           type="warning"
@@ -75,7 +75,7 @@
           v-hasPermi="['militaryvehicleManagement:thebusAccessLog:export']"
           >导出</el-button
         >
-      </el-col>
+      </el-col> -->
       <!-- <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
@@ -89,7 +89,13 @@
       :header-cell-style="{ background: '#003C69', color: 'white' }"
     >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="序号" align="center" prop="id" />
+      <el-table-column label="序号" align="center" prop="" >
+          <template scope="scope">
+          <span>{{
+            (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
+          }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="车牌号" align="center" prop="vehiclenumber" />
       <el-table-column
         label="车辆型号"

src/views/militaryvehicleManagement/thebusApply/index.vue

@@ -8,7 +8,14 @@
       label-width="68px"
     >
       <el-form-item prop="unitId">
-        <el-select
+        <el-input
+          v-model="queryParams.peopleName"
+          placeholder="请输入用车人姓名"
+          clearable
+          size="small"
+          @input="handleQuery"
+        />
+        <!-- <el-select
           v-model="queryParams.peopleId"
           placeholder="请选择用车人姓名"
           @change="handleQuery"
@@ -23,7 +30,7 @@
             class="input_xiala"
           >
           </el-option>
-        </el-select>
+        </el-select> -->
       </el-form-item>
       <el-form-item>
         <!-- <el-button
@@ -73,7 +80,7 @@
           >删除</el-button
         >
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           class="box"
           type="warning"
@@ -85,6 +92,17 @@
           v-hasPermi="['militaryvehicleManagement:thebusApply:export']"
           >导出</el-button
         >
+      </el-col> -->
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          size="mini"
+          :disabled="piliang"
+          @click="piliangList"
+          v-hasPermi="['militaryvehicleManagement:thebusApply:examine']"
+          >批量审批</el-button
+        >
       </el-col>
       <!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
     </el-row>
@@ -117,7 +135,12 @@
         prop="contact"
         width="130"
       />
-      <el-table-column label="外出事由" align="center" prop="cause" />
+      <el-table-column
+        label="外出事由"
+        align="center"
+        prop="cause"
+        show-overflow-tooltip
+      />
       <el-table-column
         label="申请时间"
         align="center"
@@ -524,6 +547,13 @@
             :disabled="dislable"
           />
         </el-form-item>
+        <el-form-item label="用车型号" prop="model">
+          <el-input
+            v-model="form.model"
+            placeholder="请输入用车型号"
+            :disabled="dislable"
+          />
+        </el-form-item>
         <el-form-item label="出车路线" prop="route">
           <el-input
             v-model="form.route"
@@ -686,6 +716,13 @@
             :disabled="dislable"
           />
         </el-form-item>
+        <el-form-item label="用车型号" prop="model">
+          <el-input
+            v-model="form.model"
+            placeholder="请输入用车型号"
+            :disabled="dislable"
+          />
+        </el-form-item>
         <el-form-item label="出车路线" prop="route">
           <el-input
             v-model="form.route"
@@ -844,6 +881,13 @@
             :disabled="dislable"
           />
         </el-form-item>
+        <el-form-item label="用车型号" prop="model">
+          <el-input
+            v-model="form.model"
+            placeholder="请输入用车型号"
+            :disabled="dislable"
+          />
+        </el-form-item>
         <el-form-item label="出车路线" prop="route">
           <el-input
             v-model="form.route"
@@ -966,6 +1010,7 @@ import {
   exportThebusOne,
   exportThebusTwo,
   exportThebusThree,
+  examine,
 } from "@/api/militaryvehicleManagement/thebusApply";
 // 导入树形结构
 import Treeselect from "@riophae/vue-treeselect";
@@ -994,6 +1039,8 @@ export default {
       single: true,
       // 非多个禁用
       multiple: true,
+      // 批量多个禁用
+      piliang: true,
       // 显示搜索条件
       showSearch: true,
       // 总条数
@@ -1085,6 +1132,8 @@ export default {
       renYuans: [],
       // 禁止输入
       dislable: false,
+      // 批量审批数组
+      examine: [],
     };
   },
   created() {
@@ -1447,15 +1496,17 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.queryParams.peopleId = null;
+      this.queryParams.peopleName = null;
       this.resetForm("queryForm");
       this.handleQuery();
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
+      this.examine = selection;
       this.ids = selection.map((item) => item.id);
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
+      this.piliang = !selection.length;
     },
     /** 新增按钮操作 */
     handleAdd() {
@@ -1530,8 +1581,24 @@ export default {
         }
       });
     },
+    // 批量审批
+    piliangList() {
+      this.$confirm("是否确认批量审批", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          examine(this.examine).then((res) => {
+            this.$modal.msgSuccess("审批成功");
+            this.getList();
+          });
+        })
+        .catch(() => {});
+    },
     /** 删除按钮操作 */
     handleDelete(row) {
+      console.log(row);
       const ids = row.id || this.ids;
       this.$modal
         .confirm("是否确认删除用车申请的数据项？")

src/views/militaryvehicleManagement/thebusConfig/index.vue

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

src/views/militaryvehicleManagement/thebusList/index.vue

@@ -17,23 +17,14 @@
       v-show="showSearch"
       label-width="68px"
     >
-      <el-form-item prop="peopleId">
-        <el-select
-          v-model="queryParams.peopleId"
-          placeholder="请选择用车人姓名"
-          @change="handleQuery"
-          filterable
-          class="input_xiala"
+      <el-form-item prop="unitName">
+        <el-input
+          v-model="queryParams.unitName"
+          placeholder="请输入单位"
+          @input="handleQuery"
+          clearable
         >
-          <el-option
-            v-for="item in renYuans"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id"
-            class="input_xiala"
-          >
-          </el-option>
-        </el-select>
+        </el-input>
       </el-form-item>
       <el-form-item>
         <!-- <el-button
@@ -75,7 +66,12 @@
           }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="车辆型号" align="center" prop="unitName" />
+      <el-table-column
+        label="车辆型号"
+        align="center"
+        prop="vehiclecolor"
+        :formatter="vehiclecolor"
+      />
       <el-table-column label="用车人员单位" align="center" prop="unitName" />
       <el-table-column label="用车人员姓名" align="center" prop="peopleName" />
       <el-table-column label="联系方式" align="center" prop="contact" />
@@ -109,6 +105,13 @@
           >
         </template>
       </el-table-column>
+      <el-table-column label="流程" align="center" prop="placeState">
+        <template slot-scope="scope">
+          <span v-if="scope.row.placeState == '1'" style="color: #13ce66"
+            >已归队</span
+          >
+        </template>
+      </el-table-column>
       <el-table-column
         label="操作"
         align="center"
@@ -133,6 +136,15 @@
             v-hasPermi="['militaryvehicleManagement:thebusApply:edit']"
             >查看</el-button
           >
+          <el-button
+            v-if="scope.row.placeState == 2"
+            class="a1"
+            size=""
+            type="text"
+            @click="returnCar(scope.row)"
+            v-hasPermi="['militaryvehicleManagement:thebusApply:edit']"
+            >归队</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
@@ -206,7 +218,7 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item label="用车结束时间" prop="authEtime">
-          <el-date-picker
+          <!-- <el-date-picker
             clearable
             size="small"
             v-model="fomr1.authEtime"
@@ -214,6 +226,16 @@
             placeholder="用车结束时间"
             value-format="yyyy-MM-dd HH:mm:ss"
           >
+          </el-date-picker> -->
+          <el-date-picker
+            clearable
+            size="small"
+            v-model="fomr1.authEtime"
+            type="datetime"
+            default-time="00:00:00"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="用车结束时间"
+          >
           </el-date-picker>
         </el-form-item>
         <div class="box3">
@@ -229,7 +251,6 @@
                   :key="i"
                   :label="item.vehiclenumber"
                   :value="item.id"
-                  @click.native="chuche"
                 >
                 </el-option>
               </el-select>
@@ -354,7 +375,6 @@
                   :key="i"
                   :label="item.vehiclenumber"
                   :value="item.id"
-                  @click.native="chuche"
                 >
                 </el-option>
               </el-select>
@@ -424,19 +444,19 @@
         inline
       >
         <el-form-item label="单位" prop="unitId">
-          <el-input v-model="forms.unitName"></el-input>
+          <el-input v-model="forms.unitName" disabled></el-input>
         </el-form-item>
         <el-form-item label="人员名称" prop="peopleId">
-          <el-input v-model="forms.peopleName"></el-input>
+          <el-input v-model="forms.peopleName" disabled></el-input>
         </el-form-item>
         <el-form-item label="人数" prop="peopleCount">
-          <el-input v-model="forms.peopleCount" />
+          <el-input v-model="forms.peopleCount" disabled />
         </el-form-item>
         <el-form-item label="联系方式" prop="contact">
-          <el-input v-model="forms.contact" />
+          <el-input v-model="forms.contact" disabled />
         </el-form-item>
         <el-form-item label="外出事由" prop="cause">
-          <el-input v-model="forms.cause" />
+          <el-input v-model="forms.cause" disabled />
         </el-form-item>
         <div class="box4">
           <table
@@ -467,10 +487,20 @@
                 v-for="(item, i) in chaCarLists"
                 :key="i"
               >
-                <td width="220" height="40">
-                  <template>
-                    {{ names }}
-                  </template>
+                <td width="220" height="40" class="tds">
+                  <el-select
+                    v-model="item.vehiclemodel"
+                    placeholder=""
+                    disabled
+                  >
+                    <el-option
+                      v-for="(item1, i) in brand"
+                      :key="i"
+                      :label="item1.dictLabel"
+                      :value="item1.dictValue"
+                    >
+                    </el-option>
+                  </el-select>
                 </td>
                 <td width="220" height="40">{{ item.vehiclenumber }}</td>
                 <td width="220" height="40">{{ item.driverName }}</td>
@@ -495,6 +525,7 @@ import {
   chuCarList,
   addKeChuChe,
   sb,
+  guiDui,
 } from "@/api/militaryvehicleManagement/thebusApply";
 // 查询字典
 import { getDicts } from "@/api/system/dict/data";
@@ -508,6 +539,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import { getZhuChiRen, getDept } from "@/api/militaryvehicleManagement/thebus";
 export default {
   name: "ThebusList",
+  dicts: ["brand"],
   components: {
     Treeselect,
   },
@@ -574,6 +606,7 @@ export default {
       treeList: [],
       // 新增参数
       fomr1: {},
+      arr: [],
       rules1: {
         bdglDepartureYuanyin: [
           { required: true, message: "请填写原因", trigger: "blur" },
@@ -589,6 +622,24 @@ export default {
     });
   },
   methods: {
+    // 归队按钮触发
+    returnCar(row) {
+      this.form = row;
+      this.$confirm("是否确认归队", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.form.placeState = "1";
+          guiDui(this.form).then((res) => {
+            this.$modal.msgSuccess("归队成功");
+            this.getList();
+          });
+        })
+        .catch(() => {});
+    },
+    // 获取人
     getRen(id) {
       getZhuChiRen(id).then((res) => {
         this.renYuan = res.data;
@@ -629,7 +680,15 @@ export default {
         }
       });
     },
-    chuche(data) {},
+    vehiclecolor(row) {
+      var vehiclecolor = "";
+      this.brand.map((item) => {
+        if (item.dictValue == row.vehiclecolor) {
+          vehiclecolor = item.dictLabel;
+        }
+      });
+      return vehiclecolor;
+    },
     // 获取搜索所有人
     getSuo() {
       getAll().then((res) => {
@@ -643,7 +702,6 @@ export default {
         this.forms = res.data;
         this.opens = true;
         this.chaCarLists = res.data.bdglDepartureInfos;
-        this.car(this.chaCarLists[0].vehiclemodel);
       });
     },
     // 获取司机
@@ -739,7 +797,6 @@ export default {
       var h = today.getHours();
       var m = today.getMinutes();
       var s = today.getSeconds();
-      var w = today.getDay();
       if (M < 10) {
         M = "0" + M;
       }
@@ -755,10 +812,10 @@ export default {
       if (s < 10) {
         s = "0" + s;
       }
-      this.fomr1.authStime =
-        y + "-" + M + "-" + d + " " + h + ":" + m + ":" + s;
-      this.fomr1.authEtime =
-        y + "-" + M + "-" + d + " " + h + ":" + m + ":" + s;
+      // this.fomr1.authStime =
+      //   y + "-" + M + "-" + d + " " + h + ":" + m + ":" + s;
+      // this.fomr1.authEtime =
+      //   y + "-" + M + "-" + d + " " + h + ":" + m + ":" + s;
       this.getTreeList();
     },
     /** 修改按钮操作 */
@@ -773,26 +830,44 @@ export default {
         this.title = "修改可出车列表";
       });
     },
-    /** 提交按钮 */
+    /** 出车提交按钮 */
     submitForm() {
-      this.form.bdglDepartureInfos = this.checkShop;
+      if (this.checkShop.length) {
+        this.form.bdglDepartureInfos = this.checkShop;
+        this.checkShop.forEach((item) => {
+          this.arr.push(item.bdglThebusId);
+        });
+      }
+      if (this.arr.length) {
+        this.form.thebusId = this.arr.join(",");
+      }
       this.form.outstatus = "1";
       exportThebusCar(this.form).then((response) => {
         this.$modal.msgSuccess("新增成功");
         this.open = false;
         this.getList();
+        this.arr = [];
       });
     },
     // 新增提交按钮
     submitForm1() {
       this.$refs["form1"].validate((valid) => {
         if (valid) {
-          this.fomr1.bdglDepartureInfos = this.checkShop;
+          if (this.checkShop.length) {
+            this.fomr1.bdglDepartureInfos = this.checkShop;
+            this.checkShop.forEach((item) => {
+              this.arr.push(item.bdglThebusId);
+            });
+          }
+          if (this.arr.length) {
+            this.fomr1.thebusId = this.arr.join(",");
+          }
           this.fomr1.outstatus = "1";
           addKeChuChe(this.fomr1).then((response) => {
             this.$modal.msgSuccess("新增成功");
             this.openes = false;
             this.getList();
+            this.arr = [];
           });
         }
       });
@@ -1057,5 +1132,12 @@ hr {
   height: 1px;
   background-color: rgba(204, 204, 204, 0.5);
 }
+::v-deep .tds .el-input__inner {
+  border: none !important;
+}
+::v-deep .el-input.is-disabled .el-input__inner {
+  background: transparent;
+  color: #fff;
+}
 </style>
 

src/views/militaryvehicleManagement/thebusThemplate/index.vue

@@ -111,7 +111,7 @@
           >删除</el-button
         >
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
         class="box"
           type="warning"
@@ -123,7 +123,7 @@
           v-hasPermi="['militaryvehicleManagement:thebusThemplate:export']"
           >导出</el-button
         >
-      </el-col>
+      </el-col> -->
       <!-- <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"

src/views/monitor/job/index.vue

@@ -69,7 +69,7 @@
           v-hasPermi="['monitor:job:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="warning"
           plain
@@ -79,7 +79,7 @@
           @click="handleExport"
           v-hasPermi="['monitor:job:export']"
         >导出</el-button>
-      </el-col>
+      </el-col> -->
       <el-col :span="1.5">
         <el-button
           type="info"

src/views/monitor/job/log.vue

@@ -83,7 +83,7 @@
           v-hasPermi="['monitor:job:remove']"
         >清空</el-button>
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="warning"
           plain
@@ -93,7 +93,7 @@
           @click="handleExport"
           v-hasPermi="['monitor:job:export']"
         >导出</el-button>
-      </el-col>
+      </el-col> -->
       <el-col :span="1.5">
         <el-button
           type="warning"

src/views/monitor/logininfor/index.vue

@@ -97,7 +97,7 @@
           >清空</el-button
         >
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="warning"
           plain
@@ -108,7 +108,7 @@
           v-hasPermi="['monitor:logininfor:export']"
           >导出</el-button
         >
-      </el-col>
+      </el-col> -->
       <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"

src/views/monitor/operlog/index.vue

@@ -113,7 +113,7 @@
           >清空</el-button
         >
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="warning"
           plain
@@ -124,7 +124,7 @@
           v-hasPermi="['monitor:operlog:export']"
           >导出</el-button
         >
-      </el-col>
+      </el-col> -->
       <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"

src/views/peopleChuRu/bdglLeave/index.vue

@@ -36,7 +36,7 @@
           >删除</el-button
         >
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           class="box"
           type="warning"
@@ -48,7 +48,7 @@
           v-hasPermi="['peopleChuRu:bdglLeave:export']"
           >导出</el-button
         >
-      </el-col>
+      </el-col> -->
       <!-- <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
@@ -464,7 +464,7 @@
             ref="abcdef"
           >
             <el-option
-              v-for="(item, i) in yongHu"
+              v-for="(item, i) in yingJiRen"
               :key="i"
               :label="item.nickName"
               :value="item.userId"
@@ -483,7 +483,7 @@
             ref="abcde"
           >
             <el-option
-              v-for="(item, i) in yongHu"
+              v-for="(item, i) in lianJiRen"
               :key="i"
               :label="item.nickName"
               :value="item.userId"
@@ -502,7 +502,7 @@
             ref="abcd"
           >
             <el-option
-              v-for="(item, i) in yongHu"
+              v-for="(item, i) in zhengZhiRen"
               :key="i"
               :label="item.nickName"
               :value="item.userId"
@@ -519,6 +519,7 @@
             filterable
             placeholder="请输入四级审批人"
             ref="abc"
+            disabled
           >
             <el-option
               v-for="(item, i) in yongHu"
@@ -561,7 +562,7 @@
           />
         </el-form-item>
       </el-form>
-      <div slot="footer" class="dialog-footer" >
+      <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
@@ -764,7 +765,7 @@
           />
         </el-form-item>
       </el-form>
-      <div slot="footer" class="dialog-footer" >
+      <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
@@ -977,7 +978,7 @@
           />
         </el-form-item>
         <div class="jiben">驳回原因</div>
-        <el-form-item  prop="reasons">
+        <el-form-item prop="reasons">
           <el-input
             v-model="form.reasons"
             type="textarea"
@@ -985,7 +986,7 @@
           />
         </el-form-item>
       </el-form>
-      <div  class="dialog-footer" slot="footer">
+      <div class="dialog-footer" slot="footer">
         <el-button type="primary" @click="submitForms">通过</el-button>
         <el-button @click="boHui" size="btn">驳回</el-button>
       </div>
@@ -1212,6 +1213,9 @@ import {
   addBdglLeave,
   updateBdglLeave,
   exportBdglLeave,
+  YingJIUSer,
+  LIanJIUSer,
+  ZhengZhiUSer,
 } from "@/api/peopleChuRu/bdglLeave";
 
 import {
@@ -1356,6 +1360,12 @@ export default {
       result: {},
       // 审批弹出层显示与隐藏
       open2: false,
+      // 营级人员
+      yingJiRen: [],
+      // 连级人员
+      lianJiRen: [],
+      // 政治人员
+      zhengZhiRen: [],
     };
   },
   created() {
@@ -1364,8 +1374,30 @@ export default {
     this.getDicts("approve").then((response) => {
       this.ziDians = response.data;
     });
+    this.getYing();
+    this.getLiai();
+    this.getZheng();
   },
   methods: {
+    // 营级人员
+    getYing() {
+      YingJIUSer().then((res) => {
+        this.yingJiRen=res.data
+      });
+    },
+    // 连级人员
+    getLiai() {
+      LIanJIUSer().then((res) => {
+        this.lianJiRen=res.data
+      });
+    },
+    // 政治人员
+    getZheng() {
+      ZhengZhiUSer().then((res) => {
+        this.zhengZhiRen=res.data
+      });
+    },
+
     // 归队按钮
     handleGuiDui(row) {
       const id = row.id || this.ids;
@@ -1442,6 +1474,7 @@ export default {
     // 查询请假类型
     getdict() {
       getDicts(this.dictType.dictType).then((res) => {
+        res.data.splice(0,1)
         this.ziDian = res.data;
       });
     },
@@ -1522,7 +1555,7 @@ export default {
         this.form.status4 = 1;
         this.form.contents = "四级审批通过";
       }
-      this.form.peopleId =this.form.peopleId.join(',')
+      this.form.peopleId = this.form.peopleId.join(",");
       updateBdglLeave(this.form).then((response) => {
         this.$modal.msgSuccess("审批成功");
         this.open2 = false;
@@ -1546,7 +1579,7 @@ export default {
             this.form.status4 = 2;
             return (this.shenPis.form.contents = "四级审批驳回");
           }
-           this.form.peopleId =this.form.peopleId.join(',')
+          this.form.peopleId = this.form.peopleId.join(",");
           updateBdglLeave(this.form).then((response) => {
             this.$modal.msgSuccess("审批成功");
             this.open2 = false;
@@ -1577,7 +1610,7 @@ export default {
             this.form.contents = "四级审批通过";
           }
           if (this.form.id != null) {
-             this.form.peopleId =this.form.peopleId.join(',')
+            this.form.peopleId = this.form.peopleId.join(",");
             updateBdglLeave(this.form).then((response) => {
               this.$modal.msgSuccess("审批成功");
               this.opens = false;
@@ -1609,7 +1642,7 @@ export default {
             this.form.contents = "四级审批驳回";
           }
           if (this.form.id != null) {
-             this.form.peopleId =this.form.peopleId.join(',')
+            this.form.peopleId = this.form.peopleId.join(",");
             updateBdglLeave(this.form).then((response) => {
               this.$modal.msgSuccess("审批成功");
               this.opens = false;
@@ -1687,12 +1720,14 @@ export default {
         row.status4 != 0
       ) {
         this.xiugai = true;
-      }else if( row.status1 == 0 ||
+      } else if (
+        row.status1 == 0 ||
         row.status2 == 0 ||
         row.status3 == 0 ||
-        row.status4 == 0) {
-          this.xiugai=false
-        }
+        row.status4 == 0
+      ) {
+        this.xiugai = false;
+      }
       this.getBuMeng();
       // 获取字典类型
       this.getdict();

src/views/peopleChuRu/leaveOne/index.vue

@@ -425,7 +425,7 @@
           />
         </template>
       </el-table-column>
-      <el-table-column label="请假原因" align="center" prop="leaveReason" />
+      <el-table-column label="请假原因" align="center" prop="leaveReason"  show-overflow-tooltip/>
       <el-table-column
         label="离队时间"
         align="center"
@@ -434,7 +434,7 @@
       >
         <template slot-scope="scope">
           <span>{{
-            parseTime(scope.row.departureTime, "{y}-{m}-{d} {h}-{m}-{s}")
+            parseTime(scope.row.departureTime, "{y}-{m}-{d} {h}:{m}:{s}")
           }}</span>
         </template>
       </el-table-column>
@@ -446,7 +446,7 @@
       >
         <template slot-scope="scope">
           <span>{{
-            parseTime(scope.row.returnTime, "{y}-{m}-{d} {h}-{m}-{s}")
+            parseTime(scope.row.returnTime, "{y}-{m}-{d} {h}:{m}:{s}")
           }}</span>
         </template>
       </el-table-column>

src/views/peopleChuRu/peopleBorrow/index.vue

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

src/views/peopleManage/transfer/index.vue

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

src/views/pt.vue

@@ -374,7 +374,7 @@
                 <a href="#" class="a">营具管理</a>
               </div>
             </li>
-            <li v-if="str.includes('医疗卫生管理') || str.includes('admin')">
+            <li v-if="str.includes('医疗卫生') || str.includes('admin')">
               <div class="demo-box">
                 <div
                   class="demo active"

src/views/regulations/directoryinfo/index.vue

@@ -121,7 +121,7 @@
           v-hasPermi="['regulations:directoryinfo:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="warning"
           plain
@@ -131,7 +131,7 @@
           @click="handleExport"
           v-hasPermi="['regulations:directoryinfo:export']"
         >导出</el-button>
-      </el-col>
+      </el-col> -->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 

src/views/system/config/index.vue

@@ -100,7 +100,7 @@
           >删除</el-button
         >
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="warning"
           plain
@@ -111,7 +111,7 @@
           v-hasPermi="['system:config:export']"
           >导出</el-button
         >
-      </el-col>
+      </el-col> -->
       <el-col :span="1.5">
         <el-button
           type="danger"

src/views/system/cookcategory/index.vue

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

src/views/system/dict/data.vue

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

src/views/system/dict/index.vue

@@ -102,7 +102,7 @@
           >删除</el-button
         >
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="warning"
           plain
@@ -113,7 +113,7 @@
           v-hasPermi="['system:dict:export']"
           >导出</el-button
         >
-      </el-col>
+      </el-col> -->
       <el-col :span="1.5">
         <el-button
           type="danger"

src/views/system/post/index.vue

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

src/views/system/role/index.vue

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

src/views/system/user/index.vue

@@ -133,7 +133,7 @@
               >删除</el-button
             >
           </el-col>
-          <el-col :span="1.5">
+          <!-- <el-col :span="1.5">
             <el-button
               type="info"
               plain
@@ -143,8 +143,8 @@
               v-hasPermi="['system:user:import']"
               >导入</el-button
             >
-          </el-col>
-          <el-col :span="1.5">
+          </el-col> -->
+          <!-- <el-col :span="1.5">
             <el-button
               type="warning"
               plain
@@ -155,7 +155,7 @@
               v-hasPermi="['system:user:export']"
               >导出</el-button
             >
-          </el-col>
+          </el-col> -->
           <!-- <right-toolbar
             :showSearch.sync="showSearch"
             @queryTable="getList"

src/views/taishi/tanshi1.vue

@@ -241,15 +241,19 @@
             </div>
             <div class="center4_b">
               总计
-              <span style="color: #30fdff">71</span>
+              <span style="color: #30fdff;float: right;  margin-right: 20px;">71</span>
             </div>
             <div class="center4_b">
               在位
-              <span style="color: #fde17b">52</span>
+              <span style="color: #fde17b;float: right;  margin-right: 20px;">52</span>
             </div>
             <div class="center4_b">
               外出
-              <span style="color: #f0422a">19</span>
+              <span style="color: #f0422a;float: right;  margin-right: 20px;">19</span>
+            </div>
+              <div class="center4_b">
+              出车统计
+              <span style="color: #f0422a;float: right;  margin-right: 20px;">3</span>
             </div>
             <table class="center4_s">
               <tr>
@@ -2241,16 +2245,16 @@ export default {
   font-size: 1rem;
   background-color: rgba(3, 58, 93, 0.3);
   border: 0.1px solid #052c41;
-  height: 6vh;
+  height: 4vh;
   width: 35%;
-  line-height: 6vh;
+  line-height: 4vh;
   text-align: center;
 }
 
 .center4_b span {
   font-family: "IMPACT";
   font-size: 1.6rem;
-  margin-left: 20px;
+    /* margin-left: 20px; */
 }
 .center4_s {
   /* transform: scale(0.8); */

src/views/thought/planFujian/index.vue

@@ -67,7 +67,7 @@
           v-hasPermi="['thought:planFujian:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="warning"
           plain
@@ -77,7 +77,7 @@
           @click="handleExport"
           v-hasPermi="['thought:planFujian:export']"
         >导出</el-button>
-      </el-col>
+      </el-col> -->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 

src/views/thought/responsefu/index.vue

@@ -67,7 +67,7 @@
           v-hasPermi="['thought:responsefu:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="warning"
           plain
@@ -77,7 +77,7 @@
           @click="handleExport"
           v-hasPermi="['thought:responsefu:export']"
         >导出</el-button>
-      </el-col>
+      </el-col> -->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 

src/views/thought/thoughtPlan/index.vue

@@ -36,7 +36,7 @@
           >删除</el-button
         >
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="warning"
           plain
@@ -47,7 +47,7 @@
           v-hasPermi="['thought:responses:export']"
           >导出</el-button
         >
-      </el-col>
+      </el-col> -->
     </el-row>
 
     <el-table