|
|
@@ -7,14 +7,14 @@
|
|
|
v-show="showSearch"
|
|
|
label-width="68px"
|
|
|
>
|
|
|
- <!-- <el-input
|
|
|
+ <!-- <el-input
|
|
|
v-model="queryParams.privateCarId"
|
|
|
placeholder="请输入车牌号"
|
|
|
clearable
|
|
|
size="small"
|
|
|
@input="handleQuery"
|
|
|
- /> -->
|
|
|
- <el-form-item label="" prop="vehiclenumber">
|
|
|
+ />-->
|
|
|
+ <el-form-item label prop="vehiclenumber">
|
|
|
<el-input
|
|
|
v-model="queryParams.vehiclenumber"
|
|
|
placeholder="请输入车牌号"
|
|
|
@@ -23,7 +23,7 @@
|
|
|
@input="handleQuery"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="" prop="jinrushiajin">
|
|
|
+ <el-form-item label prop="jinrushiajin">
|
|
|
<el-date-picker
|
|
|
clearable
|
|
|
size="small"
|
|
|
@@ -32,10 +32,9 @@
|
|
|
placeholder="选择开始时间"
|
|
|
value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
@change="handleQuery"
|
|
|
- >
|
|
|
- </el-date-picker>
|
|
|
+ ></el-date-picker>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="" prop="likaishitian">
|
|
|
+ <el-form-item label prop="likaishitian">
|
|
|
<el-date-picker
|
|
|
clearable
|
|
|
size="small"
|
|
|
@@ -44,8 +43,7 @@
|
|
|
placeholder="选择结束时间"
|
|
|
value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
@change="handleQuery"
|
|
|
- >
|
|
|
- </el-date-picker>
|
|
|
+ ></el-date-picker>
|
|
|
</el-form-item>
|
|
|
<el-form-item>
|
|
|
<!-- <el-button
|
|
|
@@ -54,7 +52,7 @@
|
|
|
size="mini"
|
|
|
@click="handleQuery"
|
|
|
>搜索</el-button
|
|
|
- > -->
|
|
|
+ >-->
|
|
|
<el-button size="btr" @click="resetQuery">重置</el-button>
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
@@ -94,7 +92,7 @@
|
|
|
v-hasPermi="['militaryvehicleManagement:privateAccessLog:remove']"
|
|
|
>删除</el-button
|
|
|
>
|
|
|
- </el-col> -->
|
|
|
+ </el-col>-->
|
|
|
<!-- <el-col :span="1.5">
|
|
|
<el-button
|
|
|
class="box"
|
|
|
@@ -107,7 +105,7 @@
|
|
|
v-hasPermi="['militaryvehicleManagement:privateAccessLog:export']"
|
|
|
>导出</el-button
|
|
|
>
|
|
|
- </el-col> -->
|
|
|
+ </el-col>-->
|
|
|
<!-- </el-row> -->
|
|
|
|
|
|
<el-table
|
|
|
@@ -117,22 +115,20 @@
|
|
|
:header-cell-style="{ background: '#003C69', color: 'white' }"
|
|
|
>
|
|
|
<el-table-column type="selection" width="55" align="center" />
|
|
|
- <el-table-column label="序号" align="center" prop="">
|
|
|
+ <el-table-column label="序号" align="center" prop>
|
|
|
<template scope="scope">
|
|
|
- <span>{{
|
|
|
+ <span>
|
|
|
+ {{
|
|
|
(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
|
|
|
- }}</span>
|
|
|
+ }}
|
|
|
+ </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="jinrushiajin" />
|
|
|
<el-table-column label="离开时间" align="center" prop="likaishitian" />
|
|
|
- <el-table-column
|
|
|
- label="备注"
|
|
|
- align="center"
|
|
|
- prop="remark"
|
|
|
- show-overflow-tooltip
|
|
|
- />
|
|
|
+ <el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip />
|
|
|
<!-- <el-table-column
|
|
|
label="操作"
|
|
|
align="center"
|
|
|
@@ -154,7 +150,7 @@
|
|
|
>删除</el-button
|
|
|
>
|
|
|
</template>
|
|
|
- </el-table-column> -->
|
|
|
+ </el-table-column>-->
|
|
|
</el-table>
|
|
|
|
|
|
<pagination
|
|
|
@@ -173,13 +169,7 @@
|
|
|
append-to-body
|
|
|
:close-on-click-modal="false"
|
|
|
>
|
|
|
- <el-form
|
|
|
- ref="form"
|
|
|
- :model="form"
|
|
|
- :rules="rules"
|
|
|
- label-width="80px"
|
|
|
- inline
|
|
|
- >
|
|
|
+ <el-form ref="form" :model="form" :rules="rules" label-width="80px" inline>
|
|
|
<el-form-item label="车牌号" prop="privateCarId">
|
|
|
<el-select v-model="form.privateCarId" placeholder="请输入车牌号">
|
|
|
<el-option
|
|
|
@@ -189,26 +179,21 @@
|
|
|
:value="item.id"
|
|
|
@click.native="chePaiHao(item.vehiclenumber)"
|
|
|
class="input_xiala"
|
|
|
- >
|
|
|
- </el-option>
|
|
|
+ ></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="车辆型号" prop="vehiclemodel">
|
|
|
<el-input v-model="form.vehiclemodel" placeholder="请输入车辆型号" />
|
|
|
</el-form-item>
|
|
|
<el-form-item label="车辆类别" prop="vehiclecategory">
|
|
|
- <el-select
|
|
|
- v-model="form.vehiclecategory"
|
|
|
- placeholder="请输入车辆类别"
|
|
|
- >
|
|
|
+ <el-select v-model="form.vehiclecategory" placeholder="请输入车辆类别">
|
|
|
<el-option
|
|
|
v-for="(item, i) in privateCar"
|
|
|
:key="i"
|
|
|
:label="item.dictLabel"
|
|
|
:value="item.dictValue"
|
|
|
class="input_xiala"
|
|
|
- >
|
|
|
- </el-option>
|
|
|
+ ></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="车辆颜色" prop="vehiclecolor">
|
|
|
@@ -223,8 +208,7 @@
|
|
|
:value="item.id"
|
|
|
@click.native="suoYouRen(item.name)"
|
|
|
class="input_xiala"
|
|
|
- >
|
|
|
- </el-option>
|
|
|
+ ></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="联系方式" prop="contactnumber">
|
|
|
@@ -238,8 +222,7 @@
|
|
|
type="date"
|
|
|
value-format="yyyy-MM-dd"
|
|
|
placeholder="请输入进入时间"
|
|
|
- >
|
|
|
- </el-date-picker>
|
|
|
+ ></el-date-picker>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="离开时间" prop="likaishitian">
|
|
|
<el-date-picker
|
|
|
@@ -249,8 +232,7 @@
|
|
|
type="date"
|
|
|
value-format="yyyy-MM-dd"
|
|
|
placeholder="请输入离开时间"
|
|
|
- >
|
|
|
- </el-date-picker>
|
|
|
+ ></el-date-picker>
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
@@ -268,13 +250,13 @@ import {
|
|
|
delPrivateAccessLog,
|
|
|
addPrivateAccessLog,
|
|
|
updatePrivateAccessLog,
|
|
|
- exportPrivateAccessLog,
|
|
|
+ exportPrivateAccessLog
|
|
|
} from "@/api/militaryvehicleManagement/privateAccessLog";
|
|
|
// 查询字典
|
|
|
import { getDicts } from "@/api/system/dict/data";
|
|
|
import {
|
|
|
getRenYuanCar,
|
|
|
- listPrivateCar,
|
|
|
+ listPrivateCar
|
|
|
} from "@/api/militaryvehicleManagement/privateCar";
|
|
|
import { getAll } from "@/api/grassrootsregistration/bdglmeeting";
|
|
|
|
|
|
@@ -317,15 +299,15 @@ export default {
|
|
|
time2: null,
|
|
|
adminId: null,
|
|
|
createtime: null,
|
|
|
- updatetime: null,
|
|
|
+ updatetime: null
|
|
|
},
|
|
|
// 表单参数
|
|
|
form: {},
|
|
|
// 表单校验
|
|
|
rules: {
|
|
|
privateCarId: [
|
|
|
- { required: true, message: "车牌号不能为空", trigger: "blur" },
|
|
|
- ],
|
|
|
+ { required: true, message: "车牌号不能为空", trigger: "blur" }
|
|
|
+ ]
|
|
|
},
|
|
|
// 车辆类别
|
|
|
privateCar: [],
|
|
|
@@ -334,12 +316,12 @@ export default {
|
|
|
// 车牌号列表
|
|
|
carList: [],
|
|
|
// 外面的人员
|
|
|
- renYuans: [],
|
|
|
+ renYuans: []
|
|
|
};
|
|
|
},
|
|
|
created() {
|
|
|
this.getList();
|
|
|
- getDicts("privateCar").then((response) => {
|
|
|
+ getDicts("privateCar").then(response => {
|
|
|
this.privateCar = response.data;
|
|
|
});
|
|
|
this.getSuo();
|
|
|
@@ -347,14 +329,14 @@ export default {
|
|
|
methods: {
|
|
|
// 获取搜索所有人
|
|
|
getSuo() {
|
|
|
- getAll().then((res) => {
|
|
|
+ getAll().then(res => {
|
|
|
this.renYuans = res.rows;
|
|
|
});
|
|
|
},
|
|
|
// 车辆类别翻译
|
|
|
carLei(row, column) {
|
|
|
var carLei = "";
|
|
|
- this.privateCar.map((item) => {
|
|
|
+ this.privateCar.map(item => {
|
|
|
if (item.dictValue == row.vehiclecategory) {
|
|
|
carLei = item.dictLabel;
|
|
|
}
|
|
|
@@ -371,20 +353,20 @@ export default {
|
|
|
},
|
|
|
// 获取车牌号列表
|
|
|
getCarPai() {
|
|
|
- listPrivateCar().then((response) => {
|
|
|
+ listPrivateCar().then(response => {
|
|
|
this.carList = response.rows;
|
|
|
});
|
|
|
},
|
|
|
// 人员列表
|
|
|
getRen() {
|
|
|
- getRenYuanCar().then((response) => {
|
|
|
+ getRenYuanCar().then(response => {
|
|
|
this.renYuan = response.rows;
|
|
|
});
|
|
|
},
|
|
|
/** 查询私家车进出查询列表 */
|
|
|
getList() {
|
|
|
this.loading = true;
|
|
|
- listPrivateAccessLog(this.queryParams).then((response) => {
|
|
|
+ listPrivateAccessLog(this.queryParams).then(response => {
|
|
|
this.privateAccessLogList = response.rows;
|
|
|
this.total = response.total;
|
|
|
this.loading = false;
|
|
|
@@ -410,7 +392,7 @@ export default {
|
|
|
time2: null,
|
|
|
adminId: null,
|
|
|
createtime: null,
|
|
|
- updatetime: null,
|
|
|
+ updatetime: null
|
|
|
};
|
|
|
this.resetForm("form");
|
|
|
},
|
|
|
@@ -427,7 +409,7 @@ export default {
|
|
|
},
|
|
|
// 多选框选中数据
|
|
|
handleSelectionChange(selection) {
|
|
|
- this.ids = selection.map((item) => item.id);
|
|
|
+ this.ids = selection.map(item => item.id);
|
|
|
this.single = selection.length !== 1;
|
|
|
this.multiple = !selection.length;
|
|
|
},
|
|
|
@@ -445,7 +427,7 @@ export default {
|
|
|
this.getCarPai();
|
|
|
this.getRen();
|
|
|
const id = row.id || this.ids;
|
|
|
- getPrivateAccessLog(id).then((response) => {
|
|
|
+ getPrivateAccessLog(id).then(response => {
|
|
|
this.form = response.data;
|
|
|
this.open = true;
|
|
|
this.title = "修改私家车进出查询";
|
|
|
@@ -453,16 +435,16 @@ export default {
|
|
|
},
|
|
|
/** 提交按钮 */
|
|
|
submitForm() {
|
|
|
- this.$refs["form"].validate((valid) => {
|
|
|
+ this.$refs["form"].validate(valid => {
|
|
|
if (valid) {
|
|
|
if (this.form.id != null) {
|
|
|
- updatePrivateAccessLog(this.form).then((response) => {
|
|
|
+ updatePrivateAccessLog(this.form).then(response => {
|
|
|
this.$modal.msgSuccess("修改成功");
|
|
|
this.open = false;
|
|
|
this.getList();
|
|
|
});
|
|
|
} else {
|
|
|
- addPrivateAccessLog(this.form).then((response) => {
|
|
|
+ addPrivateAccessLog(this.form).then(response => {
|
|
|
this.$modal.msgSuccess("新增成功");
|
|
|
this.open = false;
|
|
|
this.getList();
|
|
|
@@ -476,7 +458,7 @@ export default {
|
|
|
const ids = row.id || this.ids;
|
|
|
this.$modal
|
|
|
.confirm("是否确认删除私家车进出查询的数据项？")
|
|
|
- .then(function () {
|
|
|
+ .then(function() {
|
|
|
return delPrivateAccessLog(ids);
|
|
|
})
|
|
|
.then(() => {
|
|
|
@@ -494,13 +476,13 @@ export default {
|
|
|
this.exportLoading = true;
|
|
|
return exportPrivateAccessLog(queryParams);
|
|
|
})
|
|
|
- .then((response) => {
|
|
|
+ .then(response => {
|
|
|
this.$download.name(response.msg);
|
|
|
this.exportLoading = false;
|
|
|
})
|
|
|
.catch(() => {});
|
|
|
- },
|
|
|
- },
|
|
|
+ }
|
|
|
+ }
|
|
|
};
|
|
|
</script>
|
|
|
<style scoped>
|
|
|
@@ -657,7 +639,4 @@ export default {
|
|
|
.box {
|
|
|
background-color: #ffba00 !important;
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
</style>
|
zxr