浏览代码

完成了军车管理模糊匹配

sunyanqiang 3 年之前
父节点
当前提交
b7f5cfc43f

+ 13 - 23
src/views/militaryvehicleManagement/driver/index.vue

@@ -7,27 +7,11 @@
       v-show="showSearch"
       label-width="68px"
     >
-      <!-- <el-form-item prop="unitId">
-        <el-input
-          v-model="queryParams.unitId"
-          placeholder="请输入单位"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
       <el-form-item prop="confidential">
-        <!-- <el-input
-          v-model="queryParams.peopleName"
-          placeholder="请输入姓名"
-          clearable
-          size="small"
-          @input="handleQuery"
-        /> -->
         <el-select
-          v-model="queryParams.compereId"
+          v-model="queryParams.peopleId"
           placeholder="请选择姓名"
-          @change="Renyuans"
+          @change="handleQuery"
           filterable
           class="input_xiala"
         >
@@ -490,10 +474,6 @@ export default {
         this.renYuans = res.rows;
       });
     },
-    // 搜索人员触发
-    Renyuans() {
-      this.getList();
-    },
     // 重置人员联系
     ChongZhi() {
       this.form.peopleId = null;
@@ -601,7 +581,7 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.queryParams.peopleName = null;
+      this.queryParams.peopleId = null;
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -820,4 +800,14 @@ export default {
   color: #fff;
   background-color: #1890ff;
 }
+/* 调整输入框提示文字颜色 */
+::v-deep .vue-treeselect__placeholder {
+  color: #bdbdbd4f !important;
+}
+::v-deep input::-webkit-input-placeholder {
+  color: #bdbdbd4f !important;
+}
+::v-deep input:-moz-placeholder {
+  color: #bdbdbd4f !important;
+}
 </style>

+ 39 - 2
src/views/militaryvehicleManagement/privateAccessLog/index.vue

@@ -8,13 +8,29 @@
       label-width="68px"
     >
       <el-form-item prop="privateCarId">
-        <el-input
+        <!-- <el-input
           v-model="queryParams.privateCarId"
           placeholder="请输入车牌号"
           clearable
           size="small"
           @input="handleQuery"
-        />
+        /> -->
+        <el-select
+          v-model="queryParams.peopleId"
+          placeholder="请选择用车人姓名"
+          @change="handleQuery"
+          filterable
+          class="input_xiala"
+        >
+          <el-option
+            v-for="item in renYuans"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+            class="input_xiala"
+          >
+          </el-option>
+        </el-select>
       </el-form-item>
       <!-- <el-form-item label="车牌号" prop="vehiclenumber">
         <el-input
@@ -338,6 +354,7 @@ import {
   getRenYuanCar,
   listPrivateCar,
 } from "@/api/militaryvehicleManagement/privateCar";
+import { getAll } from "@/api/grassrootsregistration/bdglmeeting";
 
 export default {
   name: "PrivateAccessLog",
@@ -394,6 +411,8 @@ export default {
       renYuan: [],
       // 车牌号列表
       carList: [],
+      // 外面的人员
+      renYuans: [],
     };
   },
   created() {
@@ -401,8 +420,15 @@ export default {
     getDicts("privateCar").then((response) => {
       this.privateCar = response.data;
     });
+    this.getSuo();
   },
   methods: {
+    // 获取搜索所有人
+    getSuo() {
+      getAll().then((res) => {
+        this.renYuans = res.rows;
+      });
+    },
     // 车辆类别翻译
     carLei(row, column) {
       var carLei = "";
@@ -474,6 +500,7 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams.peopleId = null;
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -692,4 +719,14 @@ export default {
   color: #fff;
   background-color: #1890ff;
 }
+/* 调整输入框提示文字颜色 */
+::v-deep .vue-treeselect__placeholder {
+  color: #bdbdbd4f !important;
+}
+::v-deep input::-webkit-input-placeholder {
+  color: #bdbdbd4f !important;
+}
+::v-deep input:-moz-placeholder {
+  color: #bdbdbd4f !important;
+}
 </style>

+ 48 - 13
src/views/militaryvehicleManagement/privateCar/index.vue

@@ -8,22 +8,38 @@
       label-width="68px"
     >
       <el-form-item prop="vehiclenumber">
-        <el-input
+        <!-- <el-input
           v-model="queryParams.vehiclenumber"
           placeholder="请输入车牌号"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
-        />
+        /> -->
+        <el-select
+          v-model="queryParams.peopleId"
+          placeholder="请选择车辆所有人"
+          @change="handleQuery"
+          filterable
+          class="input_xiala"
+        >
+          <el-option
+            v-for="item in renYuans"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+            class="input_xiala"
+          >
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item>
-        <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
         >
@@ -87,7 +103,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="id">
+        <template scope="scope">
+          <span>{{
+            (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
+          }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="车辆所有人" align="center" prop="peopleName" />
       <el-table-column label="车牌号" align="center" prop="vehiclenumber" />
       <el-table-column label="车辆型号" align="center" prop="vehiclemodel" />
@@ -275,6 +297,7 @@ import {
 } from "@/api/militaryvehicleManagement/privateCar";
 // 查询字典
 import { getDicts } from "@/api/system/dict/data";
+import { getAll } from "@/api/grassrootsregistration/bdglmeeting";
 export default {
   name: "PrivateCar",
   data() {
@@ -326,14 +349,6 @@ export default {
         adminId: [
           { required: true, message: "创建人不能为空", trigger: "blur" },
         ],
-        // certificatenumber: [
-        //   { required: true, message: "请输入正确的身份号码", trigger: "blur" },
-        //   {
-        //     pattern:
-        //       /^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/,
-        //     message: "请输入正确的身份号码",
-        //   },
-        // ],
       },
       // 车辆类别
       privateCar: [],
@@ -341,6 +356,8 @@ export default {
       renYuan: [],
       // 证件类别
       documentType: [],
+      // 外面的人员
+      renYuans: [],
     };
   },
   created() {
@@ -351,8 +368,15 @@ export default {
     getDicts("documentType").then((response) => {
       this.documentType = response.data;
     });
+    this.getSuo();
   },
   methods: {
+    // 获取搜索所有人
+    getSuo() {
+      getAll().then((res) => {
+        this.renYuans = res.rows;
+      });
+    },
     // 证件类型翻译
     zhenJian(row, column) {
       var zhenJian = "";
@@ -426,6 +450,7 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams.peopleId = null;
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -643,4 +668,14 @@ export default {
   color: #fff;
   background-color: #1890ff;
 }
+/* 调整输入框提示文字颜色 */
+::v-deep .vue-treeselect__placeholder {
+  color: #bdbdbd4f !important;
+}
+::v-deep input::-webkit-input-placeholder {
+  color: #bdbdbd4f !important;
+}
+::v-deep input:-moz-placeholder {
+  color: #bdbdbd4f !important;
+}
 </style>

+ 10 - 0
src/views/militaryvehicleManagement/thebus/index.vue

@@ -938,4 +938,14 @@ export default {
   color: #fff;
   background-color: #1890ff;
 }
+/* 调整输入框提示文字颜色 */
+::v-deep .vue-treeselect__placeholder {
+  color: #bdbdbd4f !important;
+}
+::v-deep input::-webkit-input-placeholder {
+  color: #bdbdbd4f !important;
+}
+::v-deep input:-moz-placeholder {
+  color: #bdbdbd4f !important;
+}
 </style>

+ 10 - 0
src/views/militaryvehicleManagement/thebusAccessLog/index.vue

@@ -641,4 +641,14 @@ export default {
   color: #fff;
   background-color: #1890ff;
 }
+/* 调整输入框提示文字颜色 */
+::v-deep .vue-treeselect__placeholder {
+  color: #bdbdbd4f !important;
+}
+::v-deep input::-webkit-input-placeholder {
+  color: #bdbdbd4f !important;
+}
+::v-deep input:-moz-placeholder {
+  color: #bdbdbd4f !important;
+}
 </style>

+ 37 - 16
src/views/militaryvehicleManagement/thebusApply/index.vue

@@ -8,20 +8,22 @@
       label-width="68px"
     >
       <el-form-item prop="unitId">
-        <!-- <el-input
-          v-model="queryParams.unitId"
-          placeholder="请输入单位"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        /> -->
-        <el-input
-          v-model="queryParams.peopleName"
-          placeholder="请输入人员名称"
-          clearable
-          size="small"
-          @input="handleQuery"
-        />
+        <el-select
+          v-model="queryParams.peopleId"
+          placeholder="请选择用车人姓名"
+          @change="handleQuery"
+          filterable
+          class="input_xiala"
+        >
+          <el-option
+            v-for="item in renYuans"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+            class="input_xiala"
+          >
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item>
         <!-- <el-button
@@ -804,11 +806,11 @@ import {
 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";
+import { getAll } from "@/api/grassrootsregistration/bdglmeeting";
 
 export default {
   name: "ThebusApply",
@@ -910,13 +912,22 @@ export default {
       // 用车审批状态
       carApprova: [],
       teJi: true,
+      // 外面的人员
+      renYuans: [],
     };
   },
   created() {
     this.getList();
+    this.getSuo();
   },
   mounted() {},
   methods: {
+    // 获取搜索所有人
+    getSuo() {
+      getAll().then((res) => {
+        this.renYuans = res.rows;
+      });
+    },
     // 特殊审批通过
     submitFormTeShenPi() {
       this.$refs["formsTe"].validateField("teShuYuanYing", (valid) => {
@@ -1266,7 +1277,7 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.queryParams.peopleName = null;
+      this.queryParams.peopleId = null;
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -1493,5 +1504,15 @@ export default {
   color: #fff;
   background-color: #1890ff;
 }
+/* 调整输入框提示文字颜色 */
+::v-deep .vue-treeselect__placeholder {
+  color: #bdbdbd4f !important;
+}
+::v-deep input::-webkit-input-placeholder {
+  color: #bdbdbd4f !important;
+}
+::v-deep input:-moz-placeholder {
+  color: #bdbdbd4f !important;
+}
 </style>
 

+ 28 - 5
src/views/militaryvehicleManagement/thebusConfig/index.vue

@@ -8,23 +8,29 @@
       label-width="68px"
     >
       <el-form-item prop="peopleType">
-        <el-select
+        <el-input
+          v-model="queryParams.shenpiname"
+          placeholder="请输入审批模板名称"
+          size="small"
+          @input="handleQuery"
+        />
+        <!-- <el-select
           v-model="queryParams.peopleType"
           placeholder="请选择审批模板名称"
           clearable
           size="small"
         >
           <el-option label="请选择字典生成" value="" />
-        </el-select>
+        </el-select> -->
       </el-form-item>
       <el-form-item>
-        <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
         >
@@ -88,7 +94,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="id">
+        <template scope="scope">
+          <span>{{
+            (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
+          }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="审批模板名称" align="center" prop="shenpiname" />
       <el-table-column
         label="一级审批人"
@@ -442,6 +454,7 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams.shenpiname = null;
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -695,4 +708,14 @@ export default {
 .box3 > .box4 {
   width: 100px;
 }
+/* 调整输入框提示文字颜色 */
+::v-deep .vue-treeselect__placeholder {
+  color: #bdbdbd4f !important;
+}
+::v-deep input::-webkit-input-placeholder {
+  color: #bdbdbd4f !important;
+}
+::v-deep input:-moz-placeholder {
+  color: #bdbdbd4f !important;
+}
 </style>