十率

package-lock.json

@@ -9,6 +9,7 @@
       "version": "3.7.0",
       "license": "MIT",
       "dependencies": {
+        "@jiaminghi/data-view": "^2.10.0",
         "@riophae/vue-treeselect": "^0.4.0",
         "axios": "0.21.0",
         "clipboard": "2.0.6",
@@ -1883,6 +1884,59 @@
         "webpack": "^4.0.0"
       }
     },
+    "node_modules/@jiaminghi/bezier-curve": {
+      "version": "0.0.9",
+      "resolved": "https://registry.npmjs.org/@jiaminghi/bezier-curve/-/bezier-curve-0.0.9.tgz",
+      "integrity": "sha512-u9xJPOEl6Dri2E9FfmJoGxYQY7vYJkURNX04Vj64tdi535tPrpkuf9Sm0lNr3QTKdHQh0DdNRsaa62FLQNQEEw==",
+      "dependencies": {
+        "@babel/runtime": "^7.5.5"
+      }
+    },
+    "node_modules/@jiaminghi/c-render": {
+      "version": "0.4.3",
+      "resolved": "https://registry.npmjs.org/@jiaminghi/c-render/-/c-render-0.4.3.tgz",
+      "integrity": "sha512-FJfzj5hGj7MLqqqI2D7vEzHKbQ1Ynnn7PJKgzsjXaZpJzTqs2Yw5OSeZnm6l7Qj7jyPAP53lFvEQNH4o4j6s+Q==",
+      "dependencies": {
+        "@babel/runtime": "^7.5.5",
+        "@jiaminghi/bezier-curve": "*",
+        "@jiaminghi/color": "*",
+        "@jiaminghi/transition": "*"
+      }
+    },
+    "node_modules/@jiaminghi/charts": {
+      "version": "0.2.18",
+      "resolved": "https://registry.npmjs.org/@jiaminghi/charts/-/charts-0.2.18.tgz",
+      "integrity": "sha512-K+HXaOOeWG9OOY1VG6M4mBreeeIAPhb9X+khG651AbnwEwL6G2UtcAQ8GWCq6GzhczcLwwhIhuaHqRygwHC0sA==",
+      "dependencies": {
+        "@babel/runtime": "^7.5.5",
+        "@jiaminghi/c-render": "^0.4.3"
+      }
+    },
+    "node_modules/@jiaminghi/color": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/@jiaminghi/color/-/color-0.1.1.tgz",
+      "integrity": "sha512-M09+Sb5HGqVim0zo+nG5gU1v+6gXT8ptr0BZR6dMGt83XmCJgnZtO8s7llTW4hLFFFM5co6geZvTekqLpSPAAQ==",
+      "dependencies": {
+        "@babel/runtime": "^7.5.5"
+      }
+    },
+    "node_modules/@jiaminghi/data-view": {
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/@jiaminghi/data-view/-/data-view-2.10.0.tgz",
+      "integrity": "sha512-Cud2MTiMcqc5k2KWabR/svuVQmXHANqURo+yj40370/LdI/gyUJ6LG203hWXEnT1nMCeiv/SLVmxv3PXLScCeA==",
+      "dependencies": {
+        "@babel/runtime": "^7.5.5",
+        "@jiaminghi/charts": "*"
+      }
+    },
+    "node_modules/@jiaminghi/transition": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/@jiaminghi/transition/-/transition-1.1.11.tgz",
+      "integrity": "sha512-owBggipoHMikDHHDW5Gc7RZYlVuvxHADiU4bxfjBVkHDAmmck+fCkm46n2JzC3j33hWvP9nSCAeh37t6stgWeg==",
+      "dependencies": {
+        "@babel/runtime": "^7.5.5"
+      }
+    },
     "node_modules/@mrmlnc/readdir-enhanced": {
       "version": "2.2.1",
       "resolved": "https://registry.nlark.com/@mrmlnc/readdir-enhanced/download/@mrmlnc/readdir-enhanced-2.2.1.tgz",
@@ -18772,6 +18826,59 @@
         "postcss": "^7.0.0"
       }
     },
+    "@jiaminghi/bezier-curve": {
+      "version": "0.0.9",
+      "resolved": "https://registry.npmjs.org/@jiaminghi/bezier-curve/-/bezier-curve-0.0.9.tgz",
+      "integrity": "sha512-u9xJPOEl6Dri2E9FfmJoGxYQY7vYJkURNX04Vj64tdi535tPrpkuf9Sm0lNr3QTKdHQh0DdNRsaa62FLQNQEEw==",
+      "requires": {
+        "@babel/runtime": "^7.5.5"
+      }
+    },
+    "@jiaminghi/c-render": {
+      "version": "0.4.3",
+      "resolved": "https://registry.npmjs.org/@jiaminghi/c-render/-/c-render-0.4.3.tgz",
+      "integrity": "sha512-FJfzj5hGj7MLqqqI2D7vEzHKbQ1Ynnn7PJKgzsjXaZpJzTqs2Yw5OSeZnm6l7Qj7jyPAP53lFvEQNH4o4j6s+Q==",
+      "requires": {
+        "@babel/runtime": "^7.5.5",
+        "@jiaminghi/bezier-curve": "*",
+        "@jiaminghi/color": "*",
+        "@jiaminghi/transition": "*"
+      }
+    },
+    "@jiaminghi/charts": {
+      "version": "0.2.18",
+      "resolved": "https://registry.npmjs.org/@jiaminghi/charts/-/charts-0.2.18.tgz",
+      "integrity": "sha512-K+HXaOOeWG9OOY1VG6M4mBreeeIAPhb9X+khG651AbnwEwL6G2UtcAQ8GWCq6GzhczcLwwhIhuaHqRygwHC0sA==",
+      "requires": {
+        "@babel/runtime": "^7.5.5",
+        "@jiaminghi/c-render": "^0.4.3"
+      }
+    },
+    "@jiaminghi/color": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/@jiaminghi/color/-/color-0.1.1.tgz",
+      "integrity": "sha512-M09+Sb5HGqVim0zo+nG5gU1v+6gXT8ptr0BZR6dMGt83XmCJgnZtO8s7llTW4hLFFFM5co6geZvTekqLpSPAAQ==",
+      "requires": {
+        "@babel/runtime": "^7.5.5"
+      }
+    },
+    "@jiaminghi/data-view": {
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/@jiaminghi/data-view/-/data-view-2.10.0.tgz",
+      "integrity": "sha512-Cud2MTiMcqc5k2KWabR/svuVQmXHANqURo+yj40370/LdI/gyUJ6LG203hWXEnT1nMCeiv/SLVmxv3PXLScCeA==",
+      "requires": {
+        "@babel/runtime": "^7.5.5",
+        "@jiaminghi/charts": "*"
+      }
+    },
+    "@jiaminghi/transition": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/@jiaminghi/transition/-/transition-1.1.11.tgz",
+      "integrity": "sha512-owBggipoHMikDHHDW5Gc7RZYlVuvxHADiU4bxfjBVkHDAmmck+fCkm46n2JzC3j33hWvP9nSCAeh37t6stgWeg==",
+      "requires": {
+        "@babel/runtime": "^7.5.5"
+      }
+    },
     "@mrmlnc/readdir-enhanced": {
       "version": "2.2.1",
       "resolved": "https://registry.nlark.com/@mrmlnc/readdir-enhanced/download/@mrmlnc/readdir-enhanced-2.2.1.tgz",

package.json

@@ -1,95 +0,0 @@
-{
-  "name": "supervision",
-  "version": "3.7.0",
-  "description": "智能督察管理平台",
-  "author": "项目",
-  "license": "MIT",
-  "scripts": {
-    "dev": "vue-cli-service serve",
-    "build:prod": "vue-cli-service build",
-    "build:stage": "vue-cli-service build --mode staging",
-    "preview": "node build/index.js --preview",
-    "lint": "eslint --ext .js,.vue src"
-  },
-  "husky": {
-    "hooks": {
-      "pre-commit": "lint-staged"
-    }
-  },
-  "lint-staged": {
-    "src/**/*.{js,vue}": [
-      "eslint --fix",
-      "git add"
-    ]
-  },
-  "keywords": [
-    "vue",
-    "admin",
-    "dashboard",
-    "element-ui",
-    "boilerplate",
-    "admin-template",
-    "management-system"
-  ],
-  "repository": {
-    "type": "git",
-    "url": "https://gitee.com/y_project/supervision-Vue.git"
-  },
-  "dependencies": {
-    "@riophae/vue-treeselect": "^0.4.0",
-    "axios": "0.21.0",
-    "clipboard": "2.0.6",
-    "core-js": "3.8.1",
-    "echarts": "^4.9.0",
-    "element-ui": "2.15.6",
-    "file-saver": "^2.0.5",
-    "fuse.js": "6.4.3",
-    "highlight.js": "9.18.5",
-    "html-docx-js": "^0.3.1",
-    "jquery": "^3.6.0",
-    "js-beautify": "1.13.0",
-    "js-cookie": "2.2.1",
-    "jsencrypt": "3.0.0-rc.1",
-    "nprogress": "0.2.0",
-    "quill": "1.3.7",
-    "rich-text-tool-editor": "^1.0.8",
-    "screenfull": "5.0.2",
-    "sortablejs": "1.10.2",
-    "vue": "2.6.12",
-    "vue-count-to": "1.0.13",
-    "vue-cropper": "0.5.5",
-    "vue-meta": "^2.4.0",
-    "vue-quill-editor": "^3.0.6",
-    "vue-router": "3.4.9",
-    "vue-seamless-scroll": "^1.1.23",
-    "vuedraggable": "2.24.3",
-    "vuex": "3.6.0",
-    "wangeditor": "^4.7.12"
-  },
-  "devDependencies": {
-    "@vue/cli-plugin-babel": "4.4.6",
-    "@vue/cli-plugin-eslint": "4.4.6",
-    "@vue/cli-service": "4.4.6",
-    "babel-eslint": "10.1.0",
-    "babel-plugin-import": "^1.13.3",
-    "chalk": "4.1.0",
-    "connect": "3.6.6",
-    "eslint": "7.15.0",
-    "eslint-plugin-vue": "7.2.0",
-    "lint-staged": "10.5.3",
-    "runjs": "4.4.2",
-    "sass": "1.32.13",
-    "sass-loader": "10.1.1",
-    "script-ext-html-webpack-plugin": "2.1.5",
-    "svg-sprite-loader": "5.1.1",
-    "vue-template-compiler": "2.6.12"
-  },
-  "engines": {
-    "node": ">=8.9",
-    "npm": ">= 3.0.0"
-  },
-  "browserslist": [
-    "> 1%",
-    "last 2 versions"
-  ]
-}

src/api/militaryvehicleManagement/thebusConfig.js

@@ -50,4 +50,13 @@ export function exportThebusConfig(query) {
     method: 'get',
     params: query
   })
-}
+}
+
+// 获取所有用户
+// 查询军车管理设置详细
+export function getThebusUser(id) {
+  return request({
+    url: 'system/user/list',
+    method: 'get'
+  })
+}

src/layout/components/AppMain.vue

@@ -5,21 +5,81 @@
         <router-view :key="key" />
       </keep-alive>
     </transition>
+    <div class="tkbox" v-if="open">
+      <div class="tkbox-title">
+        <div class="tkbox-title-left">
+          <img src="../../assets/images/八一.png" alt />
+          <span>重要消息</span>
+        </div>
+        <div class="tkbox-title-right">
+          <img src="../../assets/images/关闭.png" alt @click="showfun" />
+        </div>
+      </div>
+      <div class="tkbox-main">
+        <p>
+          <img src="../../assets/images/警示.png" alt />
+          <span>您有一条打印文件需要处理，请尽快处理</span>
+        </p>
+      </div>
+      <div class="tkbox-footer">
+        <el-button type="primary" @click="quchulifun">去处理</el-button>
+      </div>
+    </div>
   </section>
 </template>
 
 <script>
+import { printTrigger, printTriggerClear } from "@/api/PrintsManage/manage";
 export default {
-  name: 'AppMain',
+  name: "AppMain",
+  data() {
+    return {
+      open: false,
+      timer: null
+    };
+  },
+  created() {
+    this.timer = null;
+    this.startTime();
+  },
   computed: {
     cachedViews() {
-      return this.$store.state.tagsView.cachedViews
+      return this.$store.state.tagsView.cachedViews;
     },
     key() {
-      return this.$route.path
+      return this.$route.path;
     }
+  },
+  methods: {
+    showfun() {
+      printTriggerClear().then(res => {
+        // console.log(res)
+      });
+      this.open = false;
+    },
+    quchulifun() {
+      // this.$router
+      //   .push({ path: "/index", query: { name: "/print" } })
+      //   .catch(() => {});
+      printTriggerClear().then(res => {
+        //  if(res.code==200){
+        //  }
+      });
+      window.open(`/print/manage`, "_self");
+    },
+    startTime() {
+      this.timer = setInterval(() => {
+        printTrigger().then(res => {
+          console.log(res);
+        });
+      }, 1000000); /* 每500毫秒执行一次，实现动态显示时间效果 */
+    }
+  },
+  destroyed() { 
+    clearInterval(this.timer); // 清除定时器
+    this.timer = null;
   }
-}
+};
 </script>
 
 <style lang="scss" scoped>
@@ -29,9 +89,81 @@ export default {
   width: 100%;
   position: relative;
   overflow: hidden;
+  position: relative;
+}
+
+.tkbox {
+  width: 500px;
+  height: 220px;
+  background-image: url("../../assets/images/框.png");
+  background-size: 100% 100%;
+  background-repeat: no-repeat;
+  position: absolute;
+  left: 30%;
+  top: 30%;
 }
 
-.fixed-header+.app-main {
+.tkbox-title {
+  width: 100%;
+  height: 90px;
+  display: flex;
+  flex-direction: row;
+}
+
+.tkbox-title-left {
+  flex: 1;
+  display: flex;
+  align-items: center;
+}
+
+.tkbox-title-left img {
+  margin-right: 10px;
+  width: 30px;
+  height: 30px;
+  margin-left: 35px;
+  display: inline-block;
+}
+
+.tkbox-title-left span {
+  color: #fff;
+}
+
+.tkbox-title-right {
+  flex: 1;
+  display: flex;
+  justify-content: right;
+  align-items: center;
+  margin-right: 35px;
+}
+
+.tkbox-main {
+  width: 100%;
+  height: 60px;
+}
+
+.tkbox-main p {
+  width: 90%;
+  height: auto;
+  margin: 0 auto;
+  color: #fff;
+  font-size: 14px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.tkbox-main p span {
+  margin-left: 10px;
+}
+
+.tkbox-footer {
+  width: 100%;
+  height: 30px;
+  margin-bottom: 30px;
+  text-align: center;
+}
+
+.fixed-header + .app-main {
   padding-top: 50px;
 }
 
@@ -41,7 +173,7 @@ export default {
     min-height: calc(100vh - 84px);
   }
 
-  .fixed-header+.app-main {
+  .fixed-header + .app-main {
     padding-top: 84px;
   }
 }
@@ -55,40 +187,40 @@ export default {
   }
 }
 // 设置背景颜色
-.app-main{
-  background: #022845 ;
+.app-main {
+  background: #022845;
 }
 // 头部背景颜色、字体颜色
-.navbar{
-  background: #114A80 !important;
+.navbar {
+  background: #114a80 !important;
   color: #fff !important;
   // box-shadow:5px 5px 10px black;
   border-bottom: 1px solid #15324e;
 }
-.el-scrollbar__view{
-  background-color: #114A80;
+.el-scrollbar__view {
+  background-color: #114a80;
 }
-.app-breadcrumb.el-breadcrumb .no-redirect{
+.app-breadcrumb.el-breadcrumb .no-redirect {
   color: #fff !important;
 }
 .el-breadcrumb__inner a {
   color: #fff !important;
 }
-.tags-view-container{
+.tags-view-container {
   background: #022845 !important;
   border: 0px !important;
 }
 
-.navbar .right-menu .avatar-container .avatar-wrapper .el-icon-caret-bottom{
+.navbar .right-menu .avatar-container .avatar-wrapper .el-icon-caret-bottom {
   color: #fff !important;
 }
-.navbar .right-menu .right-menu-item{
+.navbar .right-menu .right-menu-item {
   color: #fff !important;
 }
 
 // 设置主题内外边距
 .app-container {
-    margin: 10px 10px 10px 10px;
-    padding: 15px 15px 15px 15px;
+  margin: 10px 10px 10px 10px;
+  padding: 15px 15px 15px 15px;
 }
 </style>

src/main.js

@@ -76,6 +76,9 @@ Vue.filter('dataFormat', originVal => {
 
 })
 
+import dataV from '@jiaminghi/data-view'
+
+Vue.use(dataV)
 
 // 全局组件挂载
 Vue.component('DictTag', DictTag)

src/router/index.js

@@ -44,6 +44,11 @@ export const constantRoutes = [
     component: (resolve) => require(['@/views/login'], resolve),
     hidden: true
   },
+  {
+    path: '/taishi',
+    component: (resolve) => require(['@/views/taishi/index'], resolve),
+    hidden: true
+  },
   // 首页区域
   {
     path: '/pt',
@@ -87,6 +92,7 @@ export const constantRoutes = [
       }
     ]
   },
+  
   // 个人中心
   {
     path: '/user',

src/views/PrintsManage/manage/index.vue

@@ -16,11 +16,11 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="类型" prop="type">
+      <!-- <el-form-item label="类型" prop="type">
         <el-select v-model="queryParams.type" placeholder="请选择类型" clearable size="small">
           <el-option label="请选择字典生成" value />
         </el-select>
-      </el-form-item>
+      </el-form-item>-->
       <!-- <el-form-item label="大小" prop="size">
         <el-input
           v-model="queryParams.size"
@@ -39,7 +39,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>-->
-      <el-form-item label="单位名称" prop="unitName">
+      <!-- <el-form-item label="单位名称" prop="unitName">
         <el-input
           v-model="queryParams.unitName"
           placeholder="请输入单位名称"
@@ -56,7 +56,7 @@
           size="small"
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item>-->
       <!-- <el-form-item label="发送人ID" prop="sendId">
         <el-input
           v-model="queryParams.sendId"
@@ -133,8 +133,16 @@
         />
       </el-form-item>-->
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
       </el-form-item>
     </el-form>
 
@@ -147,7 +155,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['PrintsManage:manage:add']"
-        >新增</el-button>
+          >新增</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -158,7 +167,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['PrintsManage:manage:edit']"
-        >修改</el-button>
+          >修改</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -169,7 +179,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['PrintsManage:manage:remove']"
-        >删除</el-button>
+          >删除</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -180,9 +191,13 @@
           :loading="exportLoading"
           @click="handleExport"
           v-hasPermi="['PrintsManage:manage:export']"
-        >导出</el-button>
+          >导出</el-button
+        >
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
     </el-row>
 
     <el-table
@@ -199,13 +214,22 @@
       <el-table-column label="类型" align="center" prop="type" />
       <el-table-column label="大小" align="center" prop="size" />
       <!-- <el-table-column label="单位ID" align="center" prop="unitId" /> -->
-      <el-table-column label="单位名称" align="center" prop="unitName" />
-      <el-table-column label="级别" align="center" prop="levelM" />
+      <!-- <el-table-column label="单位名称" align="center" prop="unitName" /> -->
+      <el-table-column label="级别" align="center" prop="levelM">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.level" :value="scope.row.levelM" />
+        </template>
+      </el-table-column>
       <!-- <el-table-column label="发送人ID" align="center" prop="sendId" /> -->
       <el-table-column label="发送人" align="center" prop="sendName" />
-      <el-table-column label="创建时间" align="center" prop="creattime" width="180">
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="creattime"
+        width="180"
+      >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.creattime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.creattime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
       <!-- <el-table-column label="更新时间" align="center" prop="updatetime" width="180">
@@ -219,28 +243,41 @@
       <el-table-column label="接收人" align="center" prop="receiveName" />
       <el-table-column label="生成路径" align="center" prop="sFile" />
       <el-table-column label="打印回复信息" align="center" prop="printInfo" />-->
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
         <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-printer"
+            @click="handlePrint(scope.row)"
+            >打印</el-button
+          >
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['PrintsManage:manage:edit']"
-          >修改</el-button>
+            >修改</el-button
+          >
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['PrintsManage:manage:remove']"
-          >删除</el-button>
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
 
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
@@ -248,8 +285,19 @@
     />
 
     <!-- 添加或修改集中文印主对话框 -->
-    <el-dialog :title="title" :visible.sync="open" append-to-body>
-      <el-form ref="form" :model="form" :inline="true" :rules="rules" label-width="120px">
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="1030px"
+      append-to-body
+    >
+      <el-form
+        ref="form"
+        :model="form"
+        :inline="true"
+        :rules="rules"
+        label-width="120px"
+      >
         <div class="jiben">发送人信息</div>
         <el-form-item label="发送人" prop="sendName">
           <el-input v-model="form.sendName" placeholder="请输入发送人" />
@@ -258,14 +306,12 @@
         <el-form-item label="文件名称" prop="name">
           <el-input v-model="form.name" placeholder="请输入文件名称" />
         </el-form-item>
-        <!-- <el-form-item label="路径">
-          <fileUpload v-model="form.file" />
-        </el-form-item>-->
+
         <el-form-item label="文件类型" prop="type">
           <el-input v-model="form.type" placeholder="请输入文件类型" />
           <!-- <el-select v-model="form.type" placeholder="请选择类型">
             <el-option label="请选择字典生成" value />
-          </el-select> -->
+          </el-select>-->
         </el-form-item>
         <el-form-item label="文件大小" prop="size">
           <el-input v-model="form.size" placeholder="请输入文件大小" />
@@ -286,6 +332,48 @@
             ></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="上传文件">
+          <!-- <fileUpload v-model="form.file" /> -->
+          <el-upload
+            :action="uploadFileUrl"
+            :before-upload="handleBeforeUpload"
+            :file-list="fileList"
+            :limit="limit"
+            :on-error="handleUploadError"
+            :on-exceed="handleExceed"
+            :on-success="handleUploadSuccess"
+            :show-file-list="false"
+            :headers="headers"
+            class="upload-file-uploader"
+            ref="upload"
+            name="pfile"
+          >
+            <!-- 上传按钮 -->
+            <el-button size="mini" type="primary" class="select_file"
+              >选取文件</el-button
+            >
+            <!-- 上传提示 -->
+            <!-- <div class="el-upload__tip" slot="tip" v-if="showTip">
+              请上传
+              <template v-if="fileSize">
+                大小不超过
+                <b style="color: #13CE66 ">{{ fileSize }}MB</b>
+              </template>
+              <template v-if="fileType">
+                格式为
+                <b style="color: #13CE66">{{ fileType.join("/") }}</b>
+              </template>
+              的文件
+            </div>-->
+          </el-upload>
+          <!-- <input
+            multiple="multiple"
+            type="file"
+            id="sys_upload_file"
+            ref="sysUploadFile"
+            @change="uploadFileFn($event)"
+          />-->
+        </el-form-item>
         <!-- <el-form-item label="发送人ID" prop="sendId">
           <el-input v-model="form.sendId" placeholder="请输入发送人ID" />
         </el-form-item>-->
@@ -301,7 +389,11 @@
         </el-form-item>-->
         <div class="jiben">打印说明</div>
         <el-form-item label prop="explainInfo">
-          <el-input v-model="form.explainInfo" type="textarea" placeholder="请输入打印说明" />
+          <el-input
+            v-model="form.explainInfo"
+            type="textarea"
+            placeholder="请输入打印说明"
+          />
         </el-form-item>
         <!-- <el-form-item label="打印状态(1 打印中  2 已打印)">
           <el-radio-group v-model="form.printStatus">
@@ -326,6 +418,58 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+    <el-dialog
+      :title="title"
+      :visible.sync="dyopen"
+      append-to-body
+      style="width:800px;margin-left:600px;padding-top:100px;"
+    >
+      <el-form
+        ref="dyform"
+        :model="dyform"
+        :inline="true"
+        :rules="rules"
+        label-width="120px"
+      >
+        <!-- <div class="jiben">打印信息</div> -->
+        <el-form-item label="打印内容" prop="printName">
+          <el-input v-model="dyform.printName" placeholder="请输入打印内容" />
+        </el-form-item>
+        <el-form-item label="打印份数" prop="printNumber">
+          <el-input
+            v-model="dyform.printNumber"
+            type="Number"
+            placeholder="请输入打印份数"
+          />
+        </el-form-item>
+        <el-form-item label="是否需要归还" prop="isReturn">
+          <el-radio-group v-model="dyform.isReturn" size="mini">
+            <el-radio label="1">归还</el-radio>
+            <el-radio label="0">无需归还</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <!-- <div class="jiben">打印人信息</div> -->
+        <el-form-item label="打印人" prop="printfileName">
+          <el-select
+            v-model="dyform.printfileName"
+            filterable
+            clearable
+            placeholder="请选择打印人"
+          >
+            <el-option
+              v-for="item in rylist"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="dysubmitForm">确 定</el-button>
+        <el-button @click="dycancel">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -336,11 +480,42 @@ import {
   delManage,
   addManage,
   updateManage,
-  exportManage
+  exportManage,
+  printFile,
+  listPeople
 } from "@/api/PrintsManage/manage";
+import { getToken } from "@/utils/auth";
+import Cookies from "js-cookie";
 
 export default {
   name: "Manage",
+  dicts: ["level"],
+  props: {
+    // 值
+    value: [String, Object, Array],
+    // 数量限制
+    limit: {
+      type: Number,
+      default: 5
+    },
+    // 大小限制(MB)
+    fileSize: {
+      type: Number,
+      default: 5
+    },
+    // 文件类型, 例如['png', 'jpg', 'jpeg']
+    fileType: {
+      type: Array,
+      default: () => ["doc", "xls", "ppt", "txt", "pdf"]
+    },
+    // 是否显示提示
+    isShowTip: {
+      type: Boolean,
+      default: true
+    },
+    // 文件名称
+    names: ""
+  },
   data() {
     return {
       // 遮罩层
@@ -363,6 +538,7 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      dyopen: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -387,15 +563,25 @@ export default {
       },
       // 表单参数
       form: {},
+      dyform: {},
       // 表单校验
       rules: {},
       //级别
-      levelMs:[],
+      levelMs: [],
+      baseUrl: process.env.VUE_APP_BASE_API,
+      uploadFileUrl:
+        process.env.VUE_APP_BASE_API + "/PrintsManage/manage/printFile", // 上传的图片服务器地址
+      headers: {
+        Authorization: "Bearer " + getToken()
+      },
+      fileList: [],
+      faith: null,
+      rylist: []
     };
   },
   created() {
     this.getList();
-     //级别
+    //级别
     this.getDicts("level").then(response => {
       this.levelMs = response.data;
     });
@@ -415,6 +601,10 @@ export default {
       this.open = false;
       this.reset();
     },
+    dycancel(){
+      this.dyopen = false;
+      this.dyreset();
+    },
     // 表单重置
     reset() {
       this.form = {
@@ -439,6 +629,17 @@ export default {
       };
       this.resetForm("form");
     },
+    // 表单重置
+    dyreset() {
+      this.dyform = {
+        id: null,
+        printName: null,
+        printNumber: null,
+        isReturn: null,
+        printfileName: null
+      };
+      this.resetForm("dyform");
+    },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
@@ -460,6 +661,7 @@ export default {
       this.reset();
       this.open = true;
       this.title = "添加集中文印主";
+      this.form.sendName = Cookies.get("nickName");
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -519,13 +721,89 @@ export default {
           this.exportLoading = false;
         })
         .catch(() => {});
+    },
+    // 上传前校检格式和大小
+    handleBeforeUpload(file) {
+      // 校检文件类型
+      this.form.name = file.name;
+      if (file.size == 0) {
+        this.form.size = "0 B";
+      }
+      var k = 1024;
+      var sizes = ["B", "KB", "MB", "GB", "TB", "EB", "ZB", "YB"];
+      var i = Math.floor(Math.log(file.size) / Math.log(k));
+      this.form.size = file.size;
+      this.form.size =
+        (file.size / Math.pow(k, i)).toPrecision(3) + "" + sizes[i];
+
+      if (this.fileType) {
+        let fileExtension = "";
+        if (file.name.lastIndexOf(".") > -1) {
+          fileExtension = file.name.slice(file.name.lastIndexOf(".") + 1);
+          this.form.type = fileExtension;
+        }
+        const isTypeOk = this.fileType.some(type => {
+          if (file.type.indexOf(type) > -1) return true;
+          if (fileExtension && fileExtension.indexOf(type) > -1) return true;
+          return false;
+        });
+        if (!isTypeOk) {
+          this.$message.error(
+            `文件格式不正确, 请上传${this.fileType.join("/")}格式文件!`
+          );
+          return false;
+        }
+      }
+      // 校检文件大小
+      if (this.fileSize) {
+        const isLt = file.size / 1024 / 1024 < this.fileSize;
+        if (!isLt) {
+          this.$message.error(`上传文件大小不能超过 ${this.fileSize} MB!`);
+          return false;
+        }
+      }
+      return true;
+    },
+    // 文件个数超出
+    handleExceed() {
+      this.$message.error(`上传文件数量不能超过 ${this.limit} 个!`);
+    },
+    // 上传失败
+    handleUploadError(err) {
+      this.$message.error("上传失败, 请重试");
+    },
+    // 上传成功回调
+    handleUploadSuccess(res, file) {
+      this.$message.success("上传成功");
+      this.fileList.push({ name: file.name, url: res.fileName });
+      this.$emit("input", this.fileList);
+      this.form.file = res.url;
+    },
+    //打印
+    handlePrint() {
+      this.dyreset();
+      this.dyopen = true;
+      this.title = "打印";
+      this.getrylist();
+    },
+    //获取人员
+    getrylist() {
+      listPeople().then(res => {
+        if (res.code == 200) {
+          this.rylist = res.rows;
+        }
+      });
+    },
+    //打印提交
+    dysubmitForm(){
+       var open=window.open();
+       open.location.href="http://192.168.5.188:8080/profile/print/2022/03/19/31715ba3-47cb-43bd-b9b3-852e0909dbc7.doc";
     }
   }
 };
 </script>
 <style scoped>
 ::v-deep .el-dialog {
-  width: 1030px !important;
   background-color: #004d86;
 }
 
@@ -594,7 +872,7 @@ export default {
   color: #1c86e1;
 }
 .el-select-dropdown__item {
-  /* color: #fff; */
+  color: #fff;
 }
 .el-tree {
   background-color: #00365f;

src/views/bdglregular/regularcountinfo/index.vue

@@ -9,7 +9,7 @@
           :data="peopleList"
           :header-cell-style="{ background: '#0c2c50', color: 'white' }"
           style="width:98%;background:#0c2c50;margin-left:1%;"
-          height="300"
+          height="350"
         >
           <!-- <el-table-column type="selection" width="55" align="center" /> -->
           <el-table-column label="名次" align="center" type="index" />
@@ -36,7 +36,7 @@
           :data="peopleList2"
           :header-cell-style="{ background: '#0c2c50', color: 'white' }"
           style="width:98%;background:#0c2c50;margin-left:1%;"
-          height="300"
+          height="350"
         >
           <!-- <el-table-column type="selection" width="55" align="center" /> -->
           <el-table-column label="序号" align="center" type="index" />
@@ -300,19 +300,23 @@ export default {
 
 <style scoped>
 .wrap {
+  min-height: calc(100vh - 85px);
   width: 100%;
-  height: 100%;
+  position: relative;
+  overflow: hidden;
   background-color: #103360;
+  margin: 0;
+  padding:0;
 }
 .head {
   width: 100%;
-  height: 400px;
+  height: 43.5vh;
   display: flex;
   flex-direction: row;
 }
 .head-left {
   flex: 4;
-  height: 95%;
+  height: 98%;
   background-image: url("../../../assets/images/small_bg_1.png");
   background-repeat: no-repeat;
   background-size: 100% 100%;
@@ -322,7 +326,7 @@ export default {
 }
 .head-right {
   flex: 6;
-  height: 95%;
+  height: 98%;
   background-image: url("../../../assets/images/small_bg_1.png");
   background-repeat: no-repeat;
   background-size: 100% 100%;
@@ -337,15 +341,16 @@ export default {
   height: 30px;
   font-size: 18px;
   color: #fff;
-  background-image: url("../../../assets/images/dtitle.png");
+  background-image: url("../../../assets/images/组 21.png");
   background-repeat: no-repeat;
   margin-top: 9px;
   line-height: 30px;
   position: relative;
+  margin-left: 5px;
 }
 .head-left-title span {
   position: absolute;
-  left:80px;
+  left:33px;
 }
 
 ::v-deep .el-table__empty-block {
@@ -353,7 +358,7 @@ export default {
 }
 .foot {
   width: 100%;
-  height: 450px;
+  height: 45vh;
   display: flex;
   flex-direction: row;
 }

src/views/bdglregular/specialcountinfo/index.vue

@@ -9,7 +9,7 @@
           :data="peopleList"
           :header-cell-style="{ background: '#0c2c50', color: 'white' }"
           style="width:98%;background:#0c2c50;margin-left:1%;"
-          height="300"
+          height="350"
         >
           <!-- <el-table-column type="selection" width="55" align="center" /> -->
           <el-table-column label="名次" align="center" type="index" />
@@ -36,25 +36,39 @@
           :data="peopleList2"
           :header-cell-style="{ background: '#0c2c50', color: 'white' }"
           style="width:98%;background:#0c2c50;margin-left:1%;"
-          height="300"
         >
           <!-- <el-table-column type="selection" width="55" align="center" /> -->
           <el-table-column label="序号" align="center" type="index" />
-          <el-table-column label="受检单位" align="center" prop="inspectedUnit" />
-          <el-table-column label="检查单位" align="center" prop="unitCheck"></el-table-column>
-          <el-table-column label="状态" align="center" prop="currentState"></el-table-column>
+          <el-table-column
+            label="受检单位"
+            align="center"
+            prop="inspectedUnit"
+          />
+          <el-table-column
+            label="检查单位"
+            align="center"
+            prop="unitCheck"
+          ></el-table-column>
+          <el-table-column
+            label="状态"
+            align="center"
+            prop="currentState"
+          ></el-table-column>
           <el-table-column label="减分" align="center" prop="score">
             <template slot-scope="scope">
               <div style="color:#f00;">{{ scope.row.score }}</div>
             </template>
           </el-table-column>
           <el-table-column label="事由" align="center" prop="question" />
-          <el-table-column label="整改时间" align="center" prop="rectificationTime" width="180">
+          <el-table-column
+            label="整改时间"
+            align="center"
+            prop="rectificationTime"
+            width="180"
+          >
             <template slot-scope="scope">
               <span>
-                {{
-                parseTime(scope.row.rectificationTime, "{y}-{m}-{d}")
-                }}
+                {{ parseTime(scope.row.rectificationTime, "{y}-{m}-{d}") }}
               </span>
             </template>
           </el-table-column>
@@ -144,7 +158,7 @@ export default {
               trigger: "item",
               formatter: "{a} <br/>{b} : {c} ({d}%)"
             },
-            color: ['#fac858', '#5470c6', '#ee6666','#91cc75'],
+            color: ["#fac858", "#5470c6", "#ee6666", "#91cc75"],
             legend: {
               orient: "vertical",
               right: "0",
@@ -220,7 +234,7 @@ export default {
                 // left: "",
                 y: "bottom",
                 x: "center",
-                padding:0,
+                padding: 0,
                 textStyle: {
                   color: "#ffff",
                   // fontSize: 12,
@@ -228,7 +242,7 @@ export default {
                   fontWeight: "normal"
                 }
               },
-              color: ['#fac858', '#5470c6', '#ee6666','#91cc75'],
+              color: ["#fac858", "#5470c6", "#ee6666", "#91cc75"],
               tooltip: {
                 trigger: "item",
                 formatter: "{a} <br/>{b} : {c} ({d}%)"
@@ -271,7 +285,7 @@ export default {
                       name: "待验收"
                     },
                     {
-                      value: this.peopleList3[i].weitongguo,
+                      value: this.peopleList3[i].weitonguo,
                       name: "未通过"
                     },
                     {
@@ -300,19 +314,23 @@ export default {
 
 <style scoped>
 .wrap {
+  min-height: calc(100vh - 85px);
   width: 100%;
-  height: 100%;
+  position: relative;
+  overflow: hidden;
   background-color: #103360;
+  margin: 0;
+  padding: 0;
 }
 .head {
   width: 100%;
-  height: 400px;
+  height: 43.5vh;
   display: flex;
   flex-direction: row;
 }
 .head-left {
   flex: 4;
-  height: 95%;
+  height: 98%;
   background-image: url("../../../assets/images/small_bg_1.png");
   background-repeat: no-repeat;
   background-size: 100% 100%;
@@ -322,7 +340,7 @@ export default {
 }
 .head-right {
   flex: 6;
-  height: 95%;
+  height: 98%;
   background-image: url("../../../assets/images/small_bg_1.png");
   background-repeat: no-repeat;
   background-size: 100% 100%;
@@ -345,7 +363,7 @@ export default {
 }
 .head-left-title span {
   position: absolute;
-  left:80px;
+  left: 80px;
 }
 
 ::v-deep .el-table__empty-block {
@@ -353,9 +371,10 @@ export default {
 }
 .foot {
   width: 100%;
-  height: 450px;
+  height: 45vh;
   display: flex;
   flex-direction: row;
+  margin-top: 15px;
 }
 .foot-left {
   flex: 4;

src/views/login.vue

@@ -93,8 +93,8 @@ export default {
       codeUrl: "",
       cookiePassword: "",
       loginForm: {
-        username: "admin",
-        password: "admin123",
+        username: "",
+        password: "",
         rememberMe: false,
         code: "",
         uuid: "",

src/views/militaryvehicleManagement/driver/index.vue

@@ -441,6 +441,13 @@ export default {
     });
   },
   methods: {
+    // 重置人员联系
+    ChongZhi() {
+      this.form.peopleId = null;
+      this.form.contact = null;
+      this.form.enlistDate = null;
+      this.form.birthDate = null;
+    },
     // 字典翻译sex
     sexLian(row) {
       var sex = "";
@@ -487,6 +494,7 @@ export default {
     // 选择部门单位触发
     selectPeo(data) {
       this.form.unitName = data.label;
+      this.ChongZhi();
       this.getRen(data.id);
     },
     //  获取单位列表
@@ -553,6 +561,7 @@ export default {
     handleAdd() {
       this.getTreeList();
       this.reset();
+      this.renYuan = [];
       this.open = true;
       this.title = "添加军车司机设置";
     },

src/views/militaryvehicleManagement/thebus/index.vue

@@ -598,6 +598,10 @@ export default {
     });
   },
   methods: {
+    // 重置人员
+    ChongZhi() {
+      (this.form.peopleId = null), (this.form.contactnumber = null);
+    },
     // 翻译车辆型号
     vehicleModel(row, column) {
       var vehiclemodel = "";
@@ -636,6 +640,7 @@ export default {
     // 选择部门单位触发
     selectPeo(data) {
       this.form.unitName = data.label;
+      this.ChongZhi();
       this.getRen(data.id);
     },
     // 获取人员列表
@@ -713,6 +718,7 @@ export default {
     handleAdd() {
       this.reset();
       this.getTreeList();
+      this.renYuan = [];
       this.open = true;
       this.title = "添加军车管理";
     },

src/views/militaryvehicleManagement/thebusAccessLog/index.vue

@@ -235,7 +235,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancel">重置</el-button>
       </div>
     </el-dialog>
   </div>
@@ -331,6 +331,10 @@ export default {
     });
   },
   methods: {
+    // 重置人员
+    ChongZhi() {
+      this.form.driverId = null;
+    },
     // 字典翻译车辆类型
     carXingHao(row) {
       var carXingHao = "";
@@ -360,6 +364,7 @@ export default {
     // 选择部门单位触发
     selectPeo(data) {
       this.form.unitName = data.label;
+      this.ChongZhi();
       this.getRen(data.id);
     },
     // 车牌号触发
@@ -382,9 +387,9 @@ export default {
         this.loading = false;
       });
     },
-    // 取消按钮
+    // 重置按钮
     cancel() {
-      this.open = false;
+      // this.open = false;
       this.reset();
     },
     // 表单重置

src/views/militaryvehicleManagement/thebusApply/index.vue

@@ -369,7 +369,7 @@
       </el-col>
       <!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
     </el-row>
-
+    <!-- 列表选项 -->
     <el-table
       v-loading="loading"
       :data="thebusApplyList"
@@ -383,7 +383,11 @@
       <el-table-column label="人员名称" align="center" prop="peopleId" />
       <el-table-column label="联系方式" align="center" prop="contact" />
       <el-table-column label="外出事由" align="center" prop="cause" />
-      <el-table-column label="营级审批人" align="center" prop="unitPeopleId" />
+      <el-table-column
+        label="营级审批人"
+        align="center"
+        prop="unitPeopleName"
+      />
       <el-table-column
         label="营级审批状态"
         align="center"
@@ -413,93 +417,42 @@
         width="100"
       />
       <el-table-column label="修改时间" align="center" prop="updatetime" />
-      <!-- <el-table-column label="人员名称" align="center" prop="thebusId" />
-      <el-table-column label="授权开始时间" align="center" prop="authStime" />
-      <el-table-column label="授权结束时间" align="center" prop="authEtime" />
-      <el-table-column
-        label="审批模板"
-        align="center"
-        prop="thebusThemplateId"
-      />
-
-      <el-table-column
-        label="一级审批备注"
-        align="center"
-        prop="people1Remark"
-      />
-      <el-table-column
-        label="一级审批时间"
-        align="center"
-        prop="people1Authtime"
-      />
-
-      <el-table-column
-        label="二级审批备注"
-        align="center"
-        prop="people2Remark"
-      />
-      <el-table-column
-        label="二级审批时间"
-        align="center"
-        prop="people2Authtime"
-      />
-
-      <el-table-column
-        label="三级审批备注"
-        align="center"
-        prop="people3Remark"
-      />
-      <el-table-column
-        label="三级审批时间"
-        align="center"
-        prop="people3Authtime"
-      />
-      <el-table-column label="整体审批状态" align="center" prop="status" />
-      <el-table-column label="出车状态" align="center" prop="outstatus" />
-      <el-table-column label="操作人" align="center" prop="adminId" />
-      <el-table-column label="创建时间" align="center" prop="createtime" />
-
-      <el-table-column label="车辆司机" align="center" prop="driver" />
-      <el-table-column
-        label="车辆联系方式"
-        align="center"
-        prop="driverContact"
-      />
-      <el-table-column label="人数" align="center" prop="peopleCount" />
-
-      <el-table-column
-        label="营级审批备注"
-        align="center"
-        prop="unitPeopleRemark"
-      />
-
-      <el-table-column
-        label="初审审批备注"
-        align="center"
-        prop="chushenRemark"
-      /> -->
       <el-table-column
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
+        width="150"
       >
         <template slot-scope="scope">
           <el-button
-            size="mini"
+            size="btu"
             type="text"
-            icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['militaryvehicleManagement:thebusApply:edit']"
             >修改</el-button
           >
           <el-button
-            size="mini"
+            size="btc"
             type="text"
-            icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['militaryvehicleManagement:thebusApply:remove']"
             >删除</el-button
           >
+          <el-button
+            size="btc"
+            type="text"
+            @click="handleShenPi(scope.row)"
+            v-if="scope.row.isCaoZuo !== '1'"
+            v-hasPermi="['militaryvehicleManagement:thebusApply:edit']"
+            >审批</el-button
+          >
+          <el-button
+            size="btc"
+            type="text"
+            @click="handleTeShuShenPi(scope.row)"
+            v-hasPermi="['militaryvehicleManagement:thebusApply:edit']"
+            >特殊审批</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
@@ -522,13 +475,31 @@
         inline
       >
         <el-form-item label="单位" prop="unitId">
-          <el-input v-model="form.unitId" placeholder="请输入单位" />
+          <treeselect
+            v-model="form.unitId"
+            :options="treeList"
+            placeholder="选择单位"
+            @select="selectPeo"
+          />
         </el-form-item>
         <el-form-item label="人数" prop="peopleCount">
           <el-input v-model="form.peopleCount" placeholder="请输入人数" />
         </el-form-item>
         <el-form-item label="人员名称" prop="peopleId">
-          <el-input v-model="form.peopleId" placeholder="请输入人员名称" />
+          <el-select
+            v-model="form.peopleId"
+            placeholder="请选择人员名称"
+            filterable
+          >
+            <el-option
+              v-for="(item, i) in renYuan"
+              :key="i"
+              :label="item.name"
+              :value="item.id"
+              @click.native="cheRen(item.name)"
+            >
+            </el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="联系方式" prop="contact">
           <el-input v-model="form.contact" placeholder="请输入联系方式" />
@@ -537,154 +508,373 @@
           <el-input v-model="form.cause" placeholder="请输入外出事由" />
         </el-form-item>
         <el-form-item label="授权开始时间" prop="authStime">
-          <el-input v-model="form.authStime" placeholder="请输入授权开始时间" />
+          <el-date-picker
+            clearable
+            size="small"
+            v-model="form.authStime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="授权开始时间"
+          >
+          </el-date-picker>
         </el-form-item>
         <el-form-item label="授权结束时间" prop="authEtime">
-          <el-input v-model="form.authEtime" placeholder="请输入授权结束时间" />
+          <el-date-picker
+            clearable
+            size="small"
+            v-model="form.authEtime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="授权结束时间"
+          >
+          </el-date-picker>
         </el-form-item>
         <el-form-item label="营级审批人" prop="unitPeopleId">
-          <el-input
+          <!-- <el-input
             v-model="form.unitPeopleId"
             placeholder="请输入营级审批人"
-          />
+          /> -->
+          <el-select
+            v-model="form.unitPeopleId"
+            placeholder="请选择营级审批人"
+            filterable
+          >
+            <el-option
+              v-for="(item, i) in userRen"
+              :key="i"
+              :label="item.nickName"
+              :value="item.userId"
+              @click.native="yinJi(item.nickName)"
+            >
+            </el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="审批模板" prop="model">
-          <el-input v-model="form.model" placeholder="请输入审批模板" />
+        <el-form-item label="审批模板" prop="thebusThemplateId">
+          <el-select
+            v-model="form.thebusThemplateId"
+            placeholder="请选择审批模板"
+            filterable
+          >
+            <el-option
+              v-for="(item, i) in shenPi"
+              :key="i"
+              :label="item.shenpiname"
+              :value="item.id"
+              @click.native="shenPiThemplate(item)"
+            >
+            </el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="一级审批人" prop="people1Id">
-          <el-input v-model="form.people1Id" placeholder="请输入一级审批人" />
+          <el-input
+            v-model="form.peopleoneName"
+            placeholder="请输入一级审批人"
+          />
         </el-form-item>
         <el-form-item label="二级审批人" prop="people2Id">
-          <el-input v-model="form.people2Id" placeholder="请输入二级审批人" />
+          <el-input
+            v-model="form.peopletwoName"
+            placeholder="请输入二级审批人"
+          />
         </el-form-item>
         <el-form-item label="三级审批人" prop="people3Id">
-          <el-input v-model="form.people3Id" placeholder="请输入三级审批人" />
+          <el-input
+            v-model="form.peoplethreeName"
+            placeholder="请输入三级审批人"
+          />
         </el-form-item>
         <div class="jiben">出车路线</div>
-        <el-form-item prop="remarks">
+        <el-form-item prop="route">
           <el-input
-            v-model="form.remarks"
+            v-model="form.route"
             type="textarea"
             placeholder="请输入出车路线"
           />
         </el-form-item>
-        <!-- <el-form-item label="人员名称" prop="thebusId">
-          <el-input v-model="form.thebusId" placeholder="请输入人员名称" />
-        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
 
-        <el-form-item label="审批模板" prop="thebusThemplateId">
-          <el-input
-            v-model="form.thebusThemplateId"
-            placeholder="请输入审批模板"
+    <!-- 审批对话框 -->
+    <el-dialog
+      :title="title"
+      :visible.sync="opens"
+      width="500px"
+      append-to-body
+    >
+      <el-form
+        ref="forms"
+        :model="form"
+        :rules="formRules"
+        label-width="80px"
+        inline
+      >
+        <el-form-item label="单位" prop="unitId">
+          <treeselect
+            v-model="form.unitId"
+            :options="treeList"
+            placeholder="选择单位"
+            @select="selectPeo"
           />
         </el-form-item>
-
-        <el-form-item label="一级审批状态" prop="people1State">
-          <el-input
-            v-model="form.people1State"
-            placeholder="请输入一级审批状态"
-          />
+        <el-form-item label="人数" prop="peopleCount">
+          <el-input v-model="form.peopleCount" placeholder="请输入人数" />
         </el-form-item>
-        <el-form-item label="一级审批备注" prop="people1Remark">
-          <el-input
-            v-model="form.people1Remark"
-            placeholder="请输入一级审批备注"
-          />
+        <el-form-item label="人员名称" prop="peopleId">
+          <el-select
+            v-model="form.peopleId"
+            placeholder="请选择人员名称"
+            filterable
+          >
+            <el-option
+              v-for="(item, i) in renYuan"
+              :key="i"
+              :label="item.name"
+              :value="item.id"
+              @click.native="cheRen(item.name)"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="联系方式" prop="contact">
+          <el-input v-model="form.contact" placeholder="请输入联系方式" />
+        </el-form-item>
+        <el-form-item label="外出事由" prop="cause">
+          <el-input v-model="form.cause" placeholder="请输入外出事由" />
+        </el-form-item>
+        <el-form-item label="授权开始时间" prop="authStime">
+          <el-date-picker
+            clearable
+            size="small"
+            v-model="form.authStime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="授权开始时间"
+          >
+          </el-date-picker>
         </el-form-item>
-        <el-form-item label="一级审批时间" prop="people1Authtime">
+        <el-form-item label="授权结束时间" prop="authEtime">
+          <el-date-picker
+            clearable
+            size="small"
+            v-model="form.authEtime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="授权结束时间"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="营级审批人" prop="unitPeopleId">
+          <el-select
+            v-model="form.unitPeopleId"
+            placeholder="请选择营级审批人"
+            filterable
+          >
+            <el-option
+              v-for="(item, i) in userRen"
+              :key="i"
+              :label="item.nickName"
+              :value="item.userId"
+              @click.native="yinJi(item.nickName)"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="审批模板" prop="thebusThemplateId">
+          <el-select
+            v-model="form.thebusThemplateId"
+            placeholder="请选择审批模板"
+            filterable
+          >
+            <el-option
+              v-for="(item, i) in shenPi"
+              :key="i"
+              :label="item.shenpiname"
+              :value="item.id"
+              @click.native="shenPiThemplate(item)"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="一级审批人" prop="people1Id">
           <el-input
-            v-model="form.people1Authtime"
-            placeholder="请输入一级审批时间"
+            v-model="form.peopleoneName"
+            placeholder="请输入一级审批人"
           />
         </el-form-item>
-
-        <el-form-item label="二级审批状态" prop="people2State">
+        <el-form-item label="二级审批人" prop="people2Id">
           <el-input
-            v-model="form.people2State"
-            placeholder="请输入二级审批状态"
+            v-model="form.peopletwoName"
+            placeholder="请输入二级审批人"
           />
         </el-form-item>
-        <el-form-item label="二级审批备注" prop="people2Remark">
+        <el-form-item label="三级审批人" prop="people3Id">
           <el-input
-            v-model="form.people2Remark"
-            placeholder="请输入二级审批备注"
+            v-model="form.peoplethreeName"
+            placeholder="请输入三级审批人"
           />
         </el-form-item>
-        <el-form-item label="二级审批时间" prop="people2Authtime">
+        <div class="jiben">出车路线</div>
+        <el-form-item prop="route">
           <el-input
-            v-model="form.people2Authtime"
-            placeholder="请输入二级审批时间"
+            v-model="form.route"
+            type="textarea"
+            placeholder="请输入出车路线"
           />
         </el-form-item>
+        <div class="jiben">不通过原因</div>
+        <el-form-item prop="routes">
+          <el-input v-model="form.routes" type="textarea" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFormShenPi">通过</el-button>
+        <el-button @click="cancelShenPi">不通过</el-button>
+      </div>
+    </el-dialog>
 
-        <el-form-item label="三级审批状态" prop="people3State">
-          <el-input
-            v-model="form.people3State"
-            placeholder="请输入三级审批状态"
+    <!-- 特殊审批对话框 -->
+    <el-dialog
+      :title="title"
+      :visible.sync="opensTe"
+      width="500px"
+      append-to-body
+    >
+      <el-form
+        ref="formsTe"
+        :model="form"
+        :rules="formRulesTe"
+        label-width="80px"
+        inline
+      >
+        <el-form-item label="单位" prop="unitId">
+          <treeselect
+            v-model="form.unitId"
+            :options="treeList"
+            placeholder="选择单位"
+            @select="selectPeo"
           />
         </el-form-item>
-        <el-form-item label="三级审批备注" prop="people3Remark">
-          <el-input
-            v-model="form.people3Remark"
-            placeholder="请输入三级审批备注"
-          />
+        <el-form-item label="人数" prop="peopleCount">
+          <el-input v-model="form.peopleCount" placeholder="请输入人数" />
         </el-form-item>
-        <el-form-item label="三级审批时间" prop="people3Authtime">
-          <el-input
-            v-model="form.people3Authtime"
-            placeholder="请输入三级审批时间"
-          />
+        <el-form-item label="人员名称" prop="peopleId">
+          <el-select
+            v-model="form.peopleId"
+            placeholder="请选择人员名称"
+            filterable
+          >
+            <el-option
+              v-for="(item, i) in renYuan"
+              :key="i"
+              :label="item.name"
+              :value="item.id"
+              @click.native="cheRen(item.name)"
+            >
+            </el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="整体审批状态">
-          <el-radio-group v-model="form.status">
-            <el-radio label="1">请选择字典生成</el-radio>
-          </el-radio-group>
+        <el-form-item label="联系方式" prop="contact">
+          <el-input v-model="form.contact" placeholder="请输入联系方式" />
         </el-form-item>
-        <el-form-item label="出车状态">
-          <el-radio-group v-model="form.outstatus">
-            <el-radio label="1">请选择字典生成</el-radio>
-          </el-radio-group>
+        <el-form-item label="外出事由" prop="cause">
+          <el-input v-model="form.cause" placeholder="请输入外出事由" />
         </el-form-item>
-        <el-form-item label="操作人" prop="adminId">
-          <el-input v-model="form.adminId" placeholder="请输入操作人" />
+        <el-form-item label="授权开始时间" prop="authStime">
+          <el-date-picker
+            clearable
+            size="small"
+            v-model="form.authStime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="授权开始时间"
+          >
+          </el-date-picker>
         </el-form-item>
-        <el-form-item label="车辆司机" prop="driver">
-          <el-input v-model="form.driver" placeholder="请输入车辆司机" />
+        <el-form-item label="授权结束时间" prop="authEtime">
+          <el-date-picker
+            clearable
+            size="small"
+            v-model="form.authEtime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="授权结束时间"
+          >
+          </el-date-picker>
         </el-form-item>
-        <el-form-item label="车辆联系方式" prop="driverContact">
-          <el-input
-            v-model="form.driverContact"
-            placeholder="请输入车辆联系方式"
-          />
+        <el-form-item label="营级审批人" prop="unitPeopleId">
+          <el-select
+            v-model="form.unitPeopleId"
+            placeholder="请选择营级审批人"
+            filterable
+          >
+            <el-option
+              v-for="(item, i) in userRen"
+              :key="i"
+              :label="item.nickName"
+              :value="item.userId"
+              @click.native="yinJi(item.nickName)"
+            >
+            </el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="营级审批状态" prop="unitPeopleState">
+        <el-form-item label="审批模板" prop="thebusThemplateId">
+          <el-select
+            v-model="form.thebusThemplateId"
+            placeholder="请选择审批模板"
+            filterable
+          >
+            <el-option
+              v-for="(item, i) in shenPi"
+              :key="i"
+              :label="item.shenpiname"
+              :value="item.id"
+              @click.native="shenPiThemplate(item)"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="一级审批人" prop="people1Id">
           <el-input
-            v-model="form.unitPeopleState"
-            placeholder="请输入营级审批状态"
+            v-model="form.peopleoneName"
+            placeholder="请输入一级审批人"
           />
         </el-form-item>
-        <el-form-item label="营级审批备注" prop="unitPeopleRemark">
+        <el-form-item label="二级审批人" prop="people2Id">
           <el-input
-            v-model="form.unitPeopleRemark"
-            placeholder="请输入营级审批备注"
+            v-model="form.peopletwoName"
+            placeholder="请输入二级审批人"
           />
         </el-form-item>
-        <el-form-item label="初审审批状态" prop="chushenState">
+        <el-form-item label="三级审批人" prop="people3Id">
           <el-input
-            v-model="form.chushenState"
-            placeholder="请输入初审审批状态"
+            v-model="form.peoplethreeName"
+            placeholder="请输入三级审批人"
           />
         </el-form-item>
-        <el-form-item label="初审审批备注" prop="chushenRemark">
+        <div class="jiben">出车路线</div>
+        <el-form-item prop="route">
           <el-input
-            v-model="form.chushenRemark"
-            placeholder="请输入初审审批备注"
+            v-model="form.route"
+            type="textarea"
+            placeholder="请输入出车路线"
           />
-        </el-form-item> -->
+        </el-form-item>
+        <div class="jiben">特殊审批原因</div>
+        <el-form-item prop="teShuYuanYing">
+          <el-input v-model="form.teShuYuanYing" type="textarea" />
+        </el-form-item>
+        <div class="jiben">不通过原因</div>
+        <el-form-item prop="routes">
+          <el-input v-model="form.routes" type="textarea" />
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitFormTeShenPi">通过</el-button>
+        <el-button @click="cancelTeShenPi">不通过</el-button>
       </div>
     </el-dialog>
   </div>
@@ -699,9 +889,21 @@ import {
   updateThebusApply,
   exportThebusApply,
 } from "@/api/militaryvehicleManagement/thebusApply";
+// 导入树形结构
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import { getZhuChiRen, getDept } from "@/api/militaryvehicleManagement/thebus";
+
+import {
+  listThebusConfig,
+  getThebusUser,
+} from "@/api/militaryvehicleManagement/thebusConfig";
 
 export default {
   name: "ThebusApply",
+  components: {
+    Treeselect,
+  },
   data() {
     return {
       // 遮罩层
@@ -767,12 +969,126 @@ export default {
       form: {},
       // 表单校验
       rules: {},
+      // 树形列表
+      treeList: [],
+      // 人员列表
+      renYuan: [],
+      // 获取营级审批人
+      userRen: [],
+      // 审批模板
+      shenPi: [],
+      // 审批是否显示弹出层
+      opens: false,
+      // 审批表单校验
+      formRules: {
+        routes: [
+          { required: true, message: "请输入不通过原因", trigger: "blur" },
+        ],
+      },
+      // 特殊审批是否显示弹出层
+      opensTe: false,
+      // 特殊审批表单校验·
+      formRulesTe: {
+        routes: [
+          { required: true, message: "请输入不通过原因", trigger: "blur" },
+        ],
+        teShuYuanYing: [
+          { required: true, message: "请输特级审批原因", trigger: "blur" },
+        ],
+      },
     };
   },
   created() {
     this.getList();
   },
   methods: {
+    // 特殊审批通过
+    submitFormTeShenPi() {
+      this.$refs["formsTe"].validateField("teShuYuanYing", (valid) => {
+        if (!valid) {
+          console.log("通过");
+        }
+      });
+    },
+    // 特殊审批不通过
+    cancelTeShenPi() {
+      this.$refs["formsTe"].validate((valid) => {
+        if (valid) {
+          alert("通过");
+          this.opensTe = true;
+        }
+      });
+    },
+    // 特殊审批按钮
+    handleTeShuShenPi() {
+      this.reset();
+      this.opensTe = true;
+    },
+    // 审批通过
+    submitFormShenPi() {
+      alert("通过");
+      this.opens = false;
+    },
+    // 审批不通过
+    cancelShenPi() {
+      this.$refs["forms"].validate((valid) => {
+        if (valid) {
+          console.log("不通过");
+          this.opens = false;
+        }
+      });
+    },
+    // 审批按钮
+    handleShenPi() {
+      this.opens = true;
+    },
+    // 选择营级人员触发
+    yinJi(name) {
+      this.form.unitPeopleName = name;
+    },
+    // 选择审批模板触发
+    shenPiThemplate(data) {
+      console.log(data);
+      this.form.peopleoneName = data.oneshenpirenname;
+      this.form.peopletwoName = data.twoshenpirenname;
+      this.form.peoplethreeName = data.threeshenpirenname;
+      this.form.peopleoneId = data.onshenpirenid;
+      this.form.peopletwoId = data.twoshenpirenid;
+      this.form.peoplethreeId = data.threeshenpirenid;
+    },
+    // 获取审批模板列表
+    getShenPi() {
+      listThebusConfig().then((response) => {
+        this.shenPi = response.rows;
+      });
+    },
+    // 获取营级审批
+    getYingJi() {
+      getThebusUser().then((res) => {
+        this.userRen = res.rows;
+      });
+    },
+    // 选择人员触发
+    cheRen(name) {
+      this.form.driverName = name;
+    },
+    // 获取人员列表
+    getRen(id) {
+      getZhuChiRen(id).then((res) => {
+        this.renYuan = res.data;
+      });
+    },
+    //  获取单位列表
+    getTreeList() {
+      getDept().then((res) => {
+        this.treeList = res.data;
+      });
+    },
+    // 选择部门单位触发
+    selectPeo(data) {
+      this.form.unitName = data.label;
+      this.getRen(data.id);
+    },
     /** 查询用车申请列表 */
     getList() {
       this.loading = true;
@@ -847,6 +1163,9 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
+      this.getYingJi();
+      this.getShenPi();
+      this.getTreeList();
       this.open = true;
       this.title = "添加用车申请";
     },

src/views/militaryvehicleManagement/thebusConfig/index.vue

@@ -89,10 +89,22 @@
     >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" align="center" prop="id" />
-      <el-table-column label="审批模板名称" align="center" prop="peopleType" />
-      <el-table-column label="一级审批人" align="center" prop="authAutoOpen" />
-      <el-table-column label="二级审批人" align="center" prop="carAutoBack" />
-      <el-table-column label="三级审批人" align="center" prop="noauthOpen" />
+      <el-table-column label="审批模板名称" align="center" prop="shenpiname" />
+      <el-table-column
+        label="一级审批人"
+        align="center"
+        prop="oneshenpirenname"
+      />
+      <el-table-column
+        label="二级审批人"
+        align="center"
+        prop="twoshenpirenname"
+      />
+      <el-table-column
+        label="三级审批人"
+        align="center"
+        prop="threeshenpirenname"
+      />
       <el-table-column
         label="操作"
         align="center"
@@ -127,7 +139,7 @@
       @pagination="getList"
     />
 
-    <!-- 添加或修改军车管理设置对话框 -->
+    <!-- 添加军车管理设置对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form
         ref="form"
@@ -139,53 +151,69 @@
         <div class="box3">
           <el-form v-for="(item1, e) in checkShop" :key="e">
             <div>
-              <el-form-item label="" prop="">
+              <el-form-item label="" prop="" class="box4">
                 <el-input
-                  v-model="item1.peopleName"
-                  placeholder="检查人"
+                  v-model="item1.shenpiname"
+                  placeholder="审批模板名称"
                 ></el-input>
               </el-form-item>
-              <el-form-item label="" prop="">
-                <el-input
-                  v-model="item1.foremanName"
-                  placeholder="领班员"
-                ></el-input>
-              </el-form-item>
-              <el-form-item label="" prop="">
-                <el-input
-                  v-model="item1.sentryName"
-                  placeholder="哨兵姓名"
-                ></el-input>
+              <el-form-item label="" prop="onshenpirenid">
+                <el-select
+                  v-model="item1.onshenpirenid"
+                  placeholder="请选择一级审批人"
+                  filterable
+                >
+                  <el-option
+                    v-for="(item, i) in userRen"
+                    :key="i"
+                    :label="item.nickName"
+                    :value="item.userId"
+                  >
+                  </el-option>
+                </el-select>
               </el-form-item>
-              <el-form-item label="" prop="">
-                <el-date-picker
-                  v-model="item1.examineDate"
-                  type="date"
-                  :editable="false"
-                  size="mini"
-                  placeholder="选择日期"
-                  value-format="yyyy-MM-dd"
+              <el-form-item label="" prop="twoshenpirenid">
+                <el-select
+                  v-model="item1.twoshenpirenid"
+                  placeholder="请选择二级审批人"
+                  filterable
                 >
-                </el-date-picker>
+                  <el-option
+                    v-for="(item, i) in userRen"
+                    :key="i"
+                    :label="item.nickName"
+                    :value="item.userId"
+                  >
+                  </el-option>
+                </el-select>
               </el-form-item>
-              <el-form-item label="" prop="">
-                <el-input
-                  v-model="item1.dialogue"
-                  placeholder="检查情况"
-                ></el-input>
+              <el-form-item label="" prop="threeshenpirenid">
+                <el-select
+                  v-model="item1.threeshenpirenid"
+                  placeholder="请选择三级审批人"
+                  filterable
+                >
+                  <el-option
+                    v-for="(item, i) in userRen"
+                    :key="i"
+                    :label="item.nickName"
+                    :value="item.userId"
+                  >
+                  </el-option>
+                </el-select>
               </el-form-item>
               <el-form-item>
                 <el-button
                   type="primary"
                   icon="el-icon-plus"
-                  size="mini"
+                  size="btc"
                   @click="addForms"
                   v-if="e == checkShop.length - 1"
                 ></el-button>
                 <el-button
                   type="primary"
                   icon="el-icon-delete"
-                  size="mini"
+                  size="btd"
                   v-if="e > 0"
                   @click="delForms(e)"
                 ></el-button>
@@ -199,6 +227,79 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+    <!-- 修改军车管理设置 -->
+    <el-dialog
+      :title="title"
+      :visible.sync="opens"
+      width="500px"
+      append-to-body
+    >
+      <el-form
+        ref="form"
+        :model="form"
+        :rules="rules"
+        label-width="80px"
+        inline
+      >
+        <div>
+          <el-form-item label="" prop="" class="box4">
+            <el-input
+              v-model="form.shenpiname"
+              placeholder="审批模板名称"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="" prop="onshenpirenid">
+            <el-select
+              v-model="form.onshenpirenid"
+              placeholder="请选择一级审批人"
+              filterable
+            >
+              <el-option
+                v-for="(item, i) in userRen"
+                :key="i"
+                :label="item.nickName"
+                :value="item.userId"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="" prop="twoshenpirenid">
+            <el-select
+              v-model="form.twoshenpirenid"
+              placeholder="请选择二级审批人"
+              filterable
+            >
+              <el-option
+                v-for="(item, i) in userRen"
+                :key="i"
+                :label="item.nickName"
+                :value="item.userId"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="" prop="threeshenpirenid">
+            <el-select
+              v-model="form.threeshenpirenid"
+              placeholder="请选择三级审批人"
+              filterable
+            >
+              <el-option
+                v-for="(item, i) in userRen"
+                :key="i"
+                :label="item.nickName"
+                :value="item.userId"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </div>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -211,6 +312,7 @@ import {
   updateThebusConfig,
   exportThebusConfig,
 } from "@/api/militaryvehicleManagement/thebusConfig";
+import { getThebusUser } from "@/api/militaryvehicleManagement/thebusConfig";
 
 export default {
   name: "ThebusConfig",
@@ -256,19 +358,29 @@ export default {
       //添加对话框查铺表格为空
       checkShop: [
         {
-          peopleName: null,
-          foremanName: null,
-          sentryName: null,
-          examineDate: null,
-          dialogue: null,
+          shenpiname: null,
+          onshenpirenid: null,
+          twoshenpirenid: null,
+          threeshenpirenid: null,
         },
       ],
+      // 获取审批人
+      userRen: [],
+      // 修改弹出框
+      opens: false,
     };
   },
   created() {
     this.getList();
   },
   methods: {
+    // 获取所有用户审批人
+    getUserRen() {
+      getThebusUser().then((response) => {
+        this.userRen = response.rows;
+        console.log(this.userRen);
+      });
+    },
     // 删除对话框查铺
     delForms(i) {
       this.checkShop.splice(i, 1);
@@ -277,11 +389,10 @@ export default {
     // 增加对话框查铺
     addForms() {
       this.checkShop.push({
-        peopleName: null,
-        foremanName: null,
-        sentryName: null,
-        examineDate: null,
-        dialogue: null,
+        shenpiname: null,
+        onshenpirenid: null,
+        twoshenpirenid: null,
+        threeshenpirenid: null,
       });
     },
     /** 查询军车管理设置列表 */
@@ -311,7 +422,15 @@ export default {
         defaultUnitId: null,
         defaultPeopleId: null,
       };
-      this.resetForm("form");
+      (this.checkShop = [
+        {
+          shenpiname: null,
+          onshenpirenid: null,
+          twoshenpirenid: null,
+          threeshenpirenid: null,
+        },
+      ]),
+        this.resetForm("form");
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -332,16 +451,19 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
+      this.getUserRen();
       this.open = true;
       this.title = "添加军车管理设置";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
+      this.getUserRen();
       const id = row.id || this.ids;
       getThebusConfig(id).then((response) => {
         this.form = response.data;
-        this.open = true;
+        console.log(this.form, 1);
+        this.opens = true;
         this.title = "修改军车管理设置";
       });
     },
@@ -352,11 +474,11 @@ export default {
           if (this.form.id != null) {
             updateThebusConfig(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
-              this.open = false;
+              this.opens = false;
               this.getList();
             });
           } else {
-            addThebusConfig(this.form).then((response) => {
+            addThebusConfig(this.checkShop).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -518,7 +640,7 @@ export default {
   margin-right: 76px;
 }
 ::v-deep .el-dialog__body {
-  padding: 30px 60px;
+  padding: 30px 0px;
 }
 /* 小手样式 */
 ::v-deep .el-table__cell {
@@ -534,4 +656,40 @@ export default {
   color: #fff;
   background-color: #1890ff;
 }
+/* 查铺查哨-临时来对亲属 */
+.box3 {
+  width: 680px;
+  min-height: 70px;
+  border-radius: 5px;
+  /* background: #409eff; */
+  margin-bottom: 30px;
+  padding-top: 15px;
+  padding-left: 15px;
+}
+/* 表单长度 */
+::v-deep .box3 .el-form-item__content {
+  width: 116px;
+}
+::v-deep .box3 .el-input__inner {
+  width: 116px;
+  height: 37px;
+}
+/* 添加删除按钮 */
+::v-deep .box3 .el-button {
+  width: 32px;
+  height: 32px;
+  text-align: center;
+  margin-left: -6px;
+  margin-right: 3px;
+  margin-left: 8px;
+}
+::v-deep .box3 .el-button .el-icon-plus {
+  margin-left: -6px;
+}
+::v-deep .box3 .el-button .el-icon-delete {
+  margin-left: -6px;
+}
+.box3 > .box4 {
+  width: 100px;
+}
 </style>

src/views/pt.vue

@@ -4,7 +4,7 @@
     <div class="box">
       <!-- 头部区域 -->
       <div class="tou">
-        <span>12313465465456465</span>
+        <span style="color:#00ccff;font-size:1.2vw;">{{times}}</span>
       </div>
       <!-- 主体区域 -->
       <div class="centen">
@@ -19,40 +19,28 @@
               </div>
             </li>
             <li>
-              <div class="demo active" id="a1" data-url="/diary?ref=addtabs">
+              <div class="demo active" id="a1" v-on:click="wenyinfun" data-url="/diary?ref=addtabs">
                 <img src="../images/dy.png" alt />
                 <br />
                 <a href="#" class="a">集 中 文 印</a>
               </div>
             </li>
             <li>
-              <div
-                class="demo active"
-                v-on:click="gongzuofun"
-                data-url="/diary?ref=addtabs"
-              >
+              <div class="demo active" v-on:click="gongzuofun" data-url="/diary?ref=addtabs">
                 <img src="../images/gz.png" alt />
                 <br />
                 <a href="#" class="a">工 作 安 排</a>
               </div>
             </li>
             <li>
-              <div
-                class="demo active"
-                v-on:click="guizhangfun"
-                data-url="/diary?ref=addtabs"
-              >
+              <div class="demo active" v-on:click="guizhangfun" data-url="/diary?ref=addtabs">
                 <img src="../images/zd.png" alt />
                 <br />
                 <a href="#" class="a">规 章 制 度</a>
               </div>
             </li>
             <li>
-              <div
-                class="demo active"
-                v-on:click="taishifun"
-                data-url="/diary?ref=addtabs"
-              >
+              <div class="demo active" v-on:click="taishifun" data-url="/diary?ref=addtabs">
                 <img src="../images/fx.png" alt />
                 <br />
                 <a href="#" class="a">态 势 分 析</a>
@@ -62,33 +50,21 @@
           <hr />
           <ul class="ul">
             <li>
-              <div
-                class="demo active"
-                v-on:click="zhanbeifun"
-                data-url="/diary?ref=addtabs"
-              >
+              <div class="demo active" v-on:click="zhanbeifun" data-url="/diary?ref=addtabs">
                 <img src="../images/zb.png" alt />
                 <br />
                 <a href="#" class="a">战备值班</a>
               </div>
             </li>
             <li>
-              <div
-                class="demo active"
-                v-on:click="jianchafun"
-                data-url="/diary?ref=addtabs"
-              >
+              <div class="demo active" v-on:click="jianchafun" data-url="/diary?ref=addtabs">
                 <img src="../images/jc.png" alt />
                 <br />
                 <a href="#" class="a">检查督导</a>
               </div>
             </li>
             <li>
-              <div
-                class="demo active"
-                v-on:click="renyuanfun"
-                data-url="/diary?ref=addtabs"
-              >
+              <div class="demo active" v-on:click="renyuanfun" data-url="/diary?ref=addtabs">
                 <img src="../images/ry.png" alt />
                 <br />
                 <a href="#" class="a">人员进出</a>
@@ -126,33 +102,21 @@
               </div>
             </li>
             <li>
-              <div
-                class="demo active"
-                v-on:click="renlifun"
-                data-url="/diary?ref=addtabs"
-              >
+              <div class="demo active" v-on:click="renlifun" data-url="/diary?ref=addtabs">
                 <img src="../images/rl.png" alt />
                 <br />
                 <a href="#" class="a">人力资源</a>
               </div>
             </li>
             <li>
-              <div
-                class="demo active"
-                v-on:click="xitongfun"
-                data-url="/diary?ref=addtabs"
-              >
+              <div class="demo active" v-on:click="xitongfun" data-url="/diary?ref=addtabs">
                 <img src="../images/xt.png" alt />
                 <br />
                 <a href="#" class="a">系统管理</a>
               </div>
             </li>
             <li>
-              <div
-                class="demo active"
-                v-on:click="gongju"
-                data-url="/diary?ref=addtabs"
-              >
+              <div class="demo active" v-on:click="gongju" data-url="/diary?ref=addtabs">
                 <img src="../images/xt.png" alt />
                 <br />
                 <a href="#" class="a">系统工具</a>
@@ -162,45 +126,28 @@
           <hr />
           <ul class="ul">
             <li>
-              <div
-                class="demo active"
-                id="a3"
-                v-on:click="junchefun"
-                data-url="/diary?ref=addtabs"
-              >
+              <div class="demo active" id="a3" v-on:click="junchefun">
                 <img src="../images/cart.png" alt />
                 <br />
                 <a href="#" class="a">车辆管理</a>
               </div>
             </li>
             <li>
-              <div
-                class="demo active"
-                v-on:click="yingfangfun"
-                data-url="/diary?ref=addtabs"
-              >
+              <div class="demo active" v-on:click="yingfangfun" data-url="/diary?ref=addtabs">
                 <img src="../images/git.png" alt />
                 <br />
                 <a href="#" class="a">营房管理</a>
               </div>
             </li>
             <li>
-              <div
-                class="demo active"
-                v-on:click="yingjufun"
-                data-url="/diary?ref=addtabs"
-              >
+              <div class="demo active" v-on:click="yingjufun" data-url="/diary?ref=addtabs">
                 <img src="../images/gl.png" alt />
                 <br />
                 <a href="#" class="a">营具管理</a>
               </div>
             </li>
             <li>
-              <div
-                class="demo active"
-                v-on:click="yiliaofun"
-                data-url="/diary?ref=addtabs"
-              >
+              <div class="demo active" v-on:click="yiliaofun" data-url="/diary?ref=addtabs">
                 <img src="../images/yl.png" alt />
                 <br />
                 <a href="#" class="a">医疗卫生管理</a>
@@ -315,9 +262,35 @@
 <script>
 export default {
   data() {
-    return {};
+    return {
+      times: null,
+      timer: null
+    };
+  },
+  created() {
+    this.timer=null;
+    this.startTime();
   },
   methods: {
+    startTime() {
+      this.timer = setInterval(() => {
+        var today = new Date();
+        var y = today.getFullYear();
+        var M = today.getMonth() + 1;
+        var d = today.getDate();
+        var h = today.getHours();
+        var m = today.getMinutes();
+        var s = today.getSeconds();
+        var w = today.getDay();
+        if (m < 10) {
+          m = "0" + m;
+        }
+        if (s < 10) {
+          s = "0" + s;
+        }
+        this.times = y + "-" + M + "-" + d + " " + h + ":" + m + ":" + s;
+      }, 500); /* 每500毫秒执行一次，实现动态显示时间效果 */
+    },
     doThis() {
       this.$router
         .push({ path: "/index", query: { name: "/grassrootsregistration" } })
@@ -345,8 +318,8 @@ export default {
     },
     junchefun() {
       this.$router
-      .push({ path: "/index", query: { name: "/militaryvehicleManagement" } })
-      .catch(() => {});
+        .push({ path: "/index", query: { name: "/militaryvehicleManagement" } })
+        .catch(() => {});
     },
     gongzuofun() {
       this.$router
@@ -383,13 +356,20 @@ export default {
         .push({ path: "/index", query: { name: "/tool" } })
         .catch(() => {});
     },
-    taishifun() {
-      // this.$router
-      //   .push({ path: "/index", query: { name: "/taishi" } })
-      //   .catch(() => {});
-      window.open(`/taishi.html`);
+    wenyinfun() {
+      this.$router
+        .push({ path: "/index", query: { name: "/print" } })
+        .catch(() => {});
     },
+    taishifun() { 
+      this.$router.push({ path: "/taishi" }).catch(() => {});
+      // window.open(`/taishi`,'_self');
+    }
   },
+  destroyed() {
+    clearInterval(this.timer); // 清除定时器
+    this.timer = null;
+  }
 };
 </script>
 
@@ -422,8 +402,8 @@ li {
 }
 .tou span {
   position: absolute;
-  right: 143px;
-  top: 55px;
+  right: 100px;
+  top: 32px;
 }
 .in1 {
   padding: 0 84px;
@@ -431,7 +411,7 @@ li {
 .demo {
   color: #fff;
   width: 107px;
-  height: 123px;
+  height: 12vh;
   background: url("../images/tx.png") no-repeat;
   text-align: center;
   line-height: 64px;
@@ -442,8 +422,8 @@ li {
 }
 .ul {
   display: flex;
-  margin-bottom: 62px;
-  height: 15%;
+  margin-bottom: 7vh;
+  height: 13vh;
 }
 .ul li {
   margin: 0 48px;
@@ -465,7 +445,7 @@ hr {
 .num1 {
   color: #fff;
   width: 529px;
-  height: 244px;
+  height: 26.5vh;
   background: url("../images/rd.png") no-repeat;
   margin-bottom: 20px;
   padding: 22px 20px 0px 20px;

src/views/taishi/index.vue

@@ -125,7 +125,7 @@
             <div class="center4_l" style="margin-left:2%;">
               <div style="background-color: #1d79b5;width: 5px;height: 9px;"></div>军车管理
             </div>
-            <div class="center4_l">
+            <div class="center4_l" style="margin-left:7%;">
               <div style="background-color: #1d79b5;width: 5px;height: 9px;"></div>私家车管理
             </div>
             <div class="center4_b">
@@ -143,7 +143,7 @@
             <table class="center4_s">
               <tr>
                 <td rowspan="2">
-                  <img src="/taishi/img/cheliangz.png" alt />
+                  <img src="../../assets/images/cheliangz.png" alt />
                 </td>
                 <td style="color: #30fdff;font-family: 'IMPACT';font-size: 22px;">0</td>
               </tr>
@@ -155,7 +155,7 @@
             <table class="center4_s">
               <tr>
                 <td rowspan="2">
-                  <img src="/taishi/img/cheliangz.png" alt />
+                  <img src="../../assets/images/cheliangz.png" alt />
                 </td>
                 <td style="color: #30fdff;font-family: 'IMPACT';font-size: 22px;">0</td>
               </tr>
@@ -167,7 +167,7 @@
             <table class="center4_s">
               <tr>
                 <td rowspan="2">
-                  <img src="/taishi/img/cheliangz.png" alt />
+                  <img src="../../assets/images/cheliangz.png" alt />
                 </td>
                 <td style="color: #30fdff;font-family: 'IMPACT';font-size: 22px;">1</td>
               </tr>
@@ -179,7 +179,7 @@
             <table class="center4_y">
               <tr>
                 <td>
-                  <img src="/taishi/img/cheliangq.png" alt />
+                  <img src="../../assets/images/cheliangq.png" alt />
                 </td>
                 <td style="font-family: 'IMPACT';font-size: 22px;color: #b4372a;">1</td>
               </tr>
@@ -191,7 +191,7 @@
             <table class="center4_y center4_y2">
               <tr>
                 <td>
-                  <img src="/taishi/img/cheliangq.png" alt />
+                  <img src="../../assets/images/cheliangq.png" alt />
                 </td>
                 <td style="font-family: 'IMPACT';font-size: 22px;color: #b4372a;">1</td>
               </tr>
@@ -338,7 +338,7 @@
               <table class="center4_d-1" style="margin-top: 10px;">
                 <tr>
                   <td rowspan="2">
-                    <img src="/taishi/img/yinfangz.png" alt />
+                    <img src="../../assets/images/yinfangz.png" alt />
                   </td>
                   <td style="color: #30fdff;font-family: 'IMPACT';font-size: 28px;"></td>
                 </tr>
@@ -350,7 +350,7 @@
               <table class="center4_d-1" style="margin-top: 10px;">
                 <tr>
                   <td rowspan="2">
-                    <img src="/taishi/img/yinfangz.png" alt />
+                    <img src="../../assets/images/yinfangz.png" alt />
                   </td>
                   <td style="color: #30fdff;font-family: 'IMPACT';font-size: 28px;"></td>
                 </tr>
@@ -368,7 +368,7 @@
               <table class="center4_d-1" style="margin-top: 10px;">
                 <tr>
                   <td rowspan="2">
-                    <img src="/taishi/img/yinjus.png" alt />
+                    <img src="../../assets/images/yinjus.png" alt />
                   </td>
                   <td style="color: #e6923e;font-family: 'IMPACT';font-size: 28px;"></td>
                 </tr>
@@ -380,7 +380,7 @@
               <table class="center4_d-1" style="margin-top: 10px;">
                 <tr>
                   <td rowspan="2">
-                    <img src="/taishi/img/yinjus.png" alt />
+                    <img src="../../assets/images/yinjus.png" alt />
                   </td>
                   <td style="color: #e6923e;font-family: 'IMPACT';font-size: 28px;"></td>
                 </tr>
@@ -1615,7 +1615,7 @@ export default {
   background-repeat: no-repeat;
   display: flex;
   flex-wrap: wrap;
-  margin-top: 8px;
+  margin-top: 10px;
 }
 .left2-1 {
   width: 100%;
@@ -1770,7 +1770,7 @@ export default {
   background-repeat: no-repeat;
   display: flex;
   flex-wrap: wrap;
-  margin-top: 8px;
+  margin-top: 10px;
 }
 .left3-main {
   width: 100%;
@@ -1853,7 +1853,7 @@ export default {
   background-image: url("../../assets/images/c12.png");
   background-repeat: no-repeat;
   background-size: 100% 100%;
-  margin-top: 8px;
+  margin-top: 10px;
 }
 #center-a-main {
   width: 100%;
@@ -1866,7 +1866,7 @@ export default {
   background-image: url("../../assets/images/c12.png");
   background-repeat: no-repeat;
   background-size: 100% 100%;
-  margin-top: 8px;
+  margin-top: 10px;
   display: flex;
   flex-direction: row;
 }
@@ -1967,7 +1967,7 @@ export default {
   background-repeat: no-repeat;
   display: flex;
   flex-wrap: wrap;
-  margin-top: 8px;
+  margin-top: 10px;
   position: relative;
 }
 .right2-main {
@@ -1982,7 +1982,7 @@ export default {
   background-repeat: no-repeat;
   display: flex;
   flex-wrap: wrap;
-  margin-top: 8px;
+  margin-top: 10px;
   position: relative;
 }
 .right3-l {

src/views/taishi/taishi/index.vue

@@ -1,13 +0,0 @@
-<template>
-  
-</template>
-
-<script>
-export default {
-
-}
-</script>
-
-<style>
-
-</style>