[新增功能](hyx_门口门禁):

- bug修复
pet_门口门禁
huangyuxuan 2025-01-20 08:39:19 +08:00
parent 726fd68af5
commit 02aad9bd31
5 changed files with 244 additions and 48 deletions

View File

@ -79,9 +79,11 @@
</el-table-column>
<el-table-column prop="DEPT_NAME" label="车辆所属部门" align="center" />
<el-table-column prop="U_NAME" label="车辆责任人" align="center"/>
<el-table-column label="操作" align="center" width="480">
<el-table-column prop="VISIT_START_TIME" label="访问起始时间" align="center"/>
<el-table-column prop="VISIT_END_TIME" label="访问结束时间" align="center"/>
<el-table-column label="操作" align="center" width="200">
<template slot-scope="{row}">
<el-button icon="el-icon-view" size="mini" @click="showDetail(row.VEHICLE_ID)"></el-button>
<!-- <el-button icon="el-icon-view" size="mini" @click="showDetail(row.VEHICLE_ID)"></el-button>-->
<el-button type="success" icon="Check" size="mini" @click="approve(row)"></el-button>
</template>
</el-table-column>
@ -105,10 +107,10 @@
<el-input v-model="detailForm.VEHICLE_BELONG_TYPE" :disabled="true" :autosize="{ minRows: 1}" type="text" maxlength="300"/>
</el-form-item>
<el-form-item label="车辆所属部门">
<el-input v-model="detailForm.VEHICLE_DEPARTMENT_ID" :disabled="true" :autosize="{ minRows: 1}" type="text" maxlength="300"/>
<el-input v-model="detailForm.DEPT_NAME" :disabled="true" :autosize="{ minRows: 1}" type="text" maxlength="300"/>
</el-form-item>
<el-form-item label="车辆责任人">
<el-input v-model="detailForm.USER_ID" :disabled="true" :autosize="{ minRows: 1}" type="text" maxlength="300"/>
<el-input v-model="detailForm.U_NAME" :disabled="true" :autosize="{ minRows: 1}" type="text" maxlength="300"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@ -234,7 +236,9 @@ export default {
USER_ID: '', //
EMPLOYEE_VEHICLE_USER_ID: '', //
LICENCE_TYPE: null, //
VEHICLE_TYPE: null //
VEHICLE_TYPE: null, //
DEPT_NAME: '',
U_NAME: ''
},
addDialogVisible: false, //
editDialogVisible: false, //
@ -349,6 +353,8 @@ export default {
this.detailForm.LICENCE_NO = data.pd.LICENCE_NO //
this.detailForm.VEHICLE_DEPARTMENT_ID = data.pd.DEPARTMENT_NAME //
this.detailForm.USER_ID = data.pd.USER_NAME //
this.detailForm.U_NAME = data.pd.U_NAME
this.detailForm.DEPT_NAME = data.pd.DEPT_NAME
this.detailForm.LICENCE_TYPE = this.translateLicenceType(data.pd.LICENCE_TYPE) //
this.detailForm.VEHICLE_TYPE = this.translateVehicleType(data.pd.VEHICLE_TYPE) //
this.detailForm.VEHICLE_BELONG_TYPE = data.pd.VEHICLE_BELONG_TYPE === undefined ? '' : this.vehicleBelongType(data.pd.VEHICLE_BELONG_TYPE)

View File

@ -81,7 +81,7 @@
<el-table-column prop="USER_NAME" label="车辆责任人" align="center"/>
<el-table-column label="操作" align="center" width="480">
<template slot-scope="{row}">
<el-button type="warning" icon="el-icon-more" size="mini" @click="vehicleInOutRecordBtn(row.LICENCE_NO)"></el-button>
<el-button type="warning" size="mini" @click="vehicleInOutRecordBtn(row.LICENCE_NO)"></el-button>
<el-button icon="el-icon-view" size="mini" @click="showDetail(row.VEHICLE_ID)"></el-button>
<el-button type="primary" icon="el-icon-edit" size="mini" @click="openEditDialogEditBtn(row.VEHICLE_ID)"></el-button>
<el-button type="danger" icon="el-icon-delete" size="mini" @click="deleteSingleDataDeleteBtn(row.VEHICLE_ID, row.USER_ID, row.EMPLOYEE_VEHICLE_USER_ID)">删除</el-button>
@ -228,10 +228,10 @@
<el-input v-model="detailForm.VEHICLE_BELONG_TYPE" :disabled="true" :autosize="{ minRows: 1}" type="text" maxlength="300"/>
</el-form-item>
<el-form-item label="车辆所属部门">
<el-input v-model="detailForm.VEHICLE_DEPARTMENT_ID" :disabled="true" :autosize="{ minRows: 1}" type="text" maxlength="300"/>
<el-input v-model="detailForm.DEPT_NAME" :disabled="true" :autosize="{ minRows: 1}" type="text" maxlength="300"/>
</el-form-item>
<el-form-item label="车辆责任人">
<el-input v-model="detailForm.USER_ID" :disabled="true" :autosize="{ minRows: 1}" type="text" maxlength="300"/>
<el-input v-model="detailForm.U_NAME" :disabled="true" :autosize="{ minRows: 1}" type="text" maxlength="300"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@ -355,7 +355,9 @@ export default {
USER_ID: '', //
EMPLOYEE_VEHICLE_USER_ID: '', //
LICENCE_TYPE: null, //
VEHICLE_TYPE: null //
VEHICLE_TYPE: null, //
DEPT_NAME: '',
U_NAME: ''
},
addDialogVisible: false, //
editDialogVisible: false, //
@ -599,39 +601,24 @@ export default {
},
// ()
showDetail(VEHICLE_ID) {
// this.$parent.activeName = 'Info'
// this.$parent.INSPECTION_ID = row.INSPECTION_ID
this.detailForm = {
LICENCE_NO: '', //
VEHICLE_DEPARTMENT_ID: '', //
VEHICLE_BELONG_TYPE: '', //
USER_ID: '', //
USER_NAME: '', //
EMPLOYEE_VEHICLE_USER_ID: '', //
LICENCE_TYPE: null, //
VEHICLE_TYPE: null //
}
this.detailDialogVisible = true
//
requestFN(
'vehiclemessage/detailVehicleMessage',
{
VEHICLE_ID: VEHICLE_ID
}
).then((data) => {
if (data.result === 'success') {
console.log('=============================')
this.detailForm.LICENCE_NO = data.pd.LICENCE_NO //
this.detailForm.VEHICLE_DEPARTMENT_ID = data.pd.DEPARTMENT_NAME //
this.detailForm.USER_ID = data.pd.USER_NAME //
this.detailForm.USER_ID = data.pd.USER_NAME
this.detailForm.U_NAME = data.pd.U_NAME
this.detailForm.DEPT_NAME = data.pd.DEPT_NAME
this.detailForm.LICENCE_TYPE = this.translateLicenceType(data.pd.LICENCE_TYPE) //
this.detailForm.VEHICLE_TYPE = this.translateVehicleType(data.pd.VEHICLE_TYPE) //
this.detailForm.VEHICLE_BELONG_TYPE = data.pd.VEHICLE_BELONG_TYPE === undefined ? '' : this.vehicleBelongType(data.pd.VEHICLE_BELONG_TYPE)
} else {
this.$message({
message: '数据回显失败',
type: 'error'
})
}
console.log('-------------')
console.log(this.detailForm)
}).catch((e) => {
})
},

View File

@ -17,13 +17,6 @@
<el-input v-model="form.DEPARTMENT_NAME" placeholder="搜索" class="filter-item" style="width: 200px;"/>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="用户类型">
<el-select v-model="form.USER_TYPE" placeholder="请选择" style="width: 100%;">
<el-option v-for="item in typeList" :key="item.ID" :label="item.NAME" :value="item.ID" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getQuery"></el-button>
<el-button v-waves class="filter-item" type="success" icon="el-icon-refresh" @click="reset"></el-button>

View File

@ -37,8 +37,16 @@
align="center"/>
<el-table-column type="index" label="序号" width="50" align="center"/>
<el-table-column prop="LICENCE_NO" label="车牌号"/>
<el-table-column prop="LICENCE_TYPE" label="车牌类型"/>
<el-table-column prop="VEHICLE_TYPE" label="车辆类型"/>
<el-table-column label="车牌类型" align="center">
<template slot-scope="{row}">
{{ translateLicenceType(row.LICENCE_TYPE) }}
</template>
</el-table-column>
<el-table-column label="车辆类型" align="center">
<template slot-scope="{row}">
{{ translateVehicleType(row.VEHICLE_TYPE) }}
</template>
</el-table-column>
<el-table-column prop="CONTACT" label="联系人"/>
<el-table-column prop="PHONE" label="联系人电话"/>
<el-table-column label="审核状态" align="center" width="120">
@ -48,6 +56,7 @@
</el-table-column>
<el-table-column label="操作" align="left" width="110">
<template slot-scope="{row}">
<el-button type="primary" icon="el-icon-view" size="mini" @click="detail(row)"></el-button>
<el-button v-if="row.IS_AUDIT === '1'" type="success" icon="el-icon-view" size="mini" @click="approve(row)"></el-button>
</template>
</el-table-column>
@ -58,6 +67,41 @@
<pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList"/>
</div>
<send-util ref="sendUtil" append-to-body @refresh="getList"/>
<el-dialog :title="detailTitle" :visible.sync="dialogVisible" width="50%">
<el-form :model="detailForm" label-width="120px">
<el-form-item label="排放标准">
<el-input v-model="detailForm.EMISSION_STANDARDS" readonly />
</el-form-item>
<el-form-item label="驾驶证图片">
<el-image :src="config.fileUrl + detailForm.DRIVING_LICENSE" style="width: 100px; height: 100px" />
</el-form-item>
<el-form-item label="绿本图片">
<el-image :src="config.fileUrl + detailForm.GREEN_BOOK" style="width: 100px; height: 100px" />
</el-form-item>
<el-form-item label="环保随车清单图片">
<el-image :src="config.fileUrl + detailForm.ECO_FRIENDLY_CHECKLIST" style="width: 100px; height: 100px" />
</el-form-item>
<el-form-item label="出厂合格证图片">
<el-image :src="config.fileUrl + detailForm.FACTORY_CERTIFICATE" style="width: 100px; height: 100px" />
</el-form-item>
<el-form-item label="环保信息截图图片">
<el-image :src="config.fileUrl + detailForm.ENVIRONMENTAL_SCREENSHOTS" style="width: 100px; height: 100px" />
</el-form-item>
<el-form-item label="访问起始时间">
<el-input v-model="detailForm.VISIT_START_TIME" readonly />
</el-form-item>
<el-form-item label="访问结束时间">
<el-input v-model="detailForm.VISIT_END_TIME" readonly />
</el-form-item>
<el-form-item label="访问口门名称">
<el-input v-model="detailForm.DOOR_NAME" readonly />
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">关闭</el-button>
</span>
</el-dialog>
</div>
</template>
@ -73,6 +117,36 @@ export default {
page: 1,
limit: 10
},
config: config,
dialogVisible: false,
detailTitle: '详情',
detailForm: {
EMISSION_STANDARDS: '',
DRIVING_LICENSE: '',
GREEN_BOOK: '',
ECO_FRIENDLY_CHECKLIST: '',
CERTIFICATE_IMAGE: '',
FACTORY_CERTIFICATE: '',
ENVIRONMENTAL_SCREENSHOTS: '',
VISIT_START_TIME: '',
VISIT_END_TIME: '',
DOOR_NAME: ''
},
licenceTypeList: [
// { ID: '', NAME: '' },
{ ID: '0', NAME: '白牌' },
{ ID: '1', NAME: '蓝牌' },
{ ID: '2', NAME: '黄牌' },
{ ID: '3', NAME: '绿牌' },
{ ID: '4', NAME: '黑牌' }
],
//
vehicleTypeList: [
// { ID: '', NAME: '' },
{ ID: '0', NAME: '货车' },
{ ID: '1', NAME: '轿车' },
{ ID: '2', NAME: '大巴客车' }
],
areaList: [], //
placeList: [],
listLoading: true,
@ -115,6 +189,16 @@ export default {
return '审核驳回'
}
},
translateLicenceType(id) {
for (var i = 0; i < this.licenceTypeList.length; i++) {
if (this.licenceTypeList[i].ID == id) return this.licenceTypeList[i].NAME
}
},
translateVehicleType(id) {
for (var i = 0; i < this.vehicleTypeList.length; i++) {
if (this.vehicleTypeList[i].ID == id) return this.vehicleTypeList[i].NAME
}
},
//
getQuery() {
this.$refs.multipleTable.clearSelection()
@ -149,6 +233,27 @@ export default {
}).catch((e) => {
this.listLoading = false
})
},
detail(row) {
this.dialogVisible = true
requestFN(
'/vehiclemessage/getCarInfo',
{
VEHICLE_ID: row.VEHICLE_ID
}
).then((data) => {
this.detailForm.EMISSION_STANDARDS = data.pageData.EMISSION_STANDARDS
this.detailForm.DRIVING_LICENSE = data.pageData.DRIVING_LICENSE
this.detailForm.GREEN_BOOK = data.pageData.GREEN_BOOK
this.detailForm.ECO_FRIENDLY_CHECKLIST = data.pageData.ECO_FRIENDLY_CHECKLIST
this.detailForm.FACTORY_CERTIFICATE = data.pageData.FACTORY_CERTIFICATE
this.detailForm.ENVIRONMENTAL_SCREENSHOTS = data.pageData.ENVIRONMENTAL_SCREENSHOTS
this.detailForm.VISIT_START_TIME = data.pageData.VISIT_START_TIME
this.detailForm.VISIT_END_TIME = data.pageData.VISIT_END_TIME
this.detailForm.DOOR_NAME = data.pageData.DOOR_NAME
}).catch((e) => {
this.listLoading = false
})
}
}

View File

@ -5,7 +5,7 @@
<el-row>
<el-col :span="5">
<el-form-item label="车牌号:">
<el-input v-model="form.LICENCE_NO" placeholder="搜索" class="filter-item" style="width: 200px;"/>
<el-input v-model="form.LICENCE_NO" placeholder="搜索" style="width: 200px;"/>
</el-form-item>
</el-col>
<el-col :span="4">
@ -36,8 +36,16 @@
align="center"/>
<el-table-column type="index" label="序号" width="50" align="center" />
<el-table-column prop="LICENCE_NO" label="车牌号"/>
<el-table-column prop="LICENCE_TYPE" label="车牌类型"/>
<el-table-column prop="VEHICLE_TYPE" label="车辆类型"/>
<el-table-column label="车牌类型" align="center">
<template slot-scope="{row}">
{{ translateLicenceType(row.LICENCE_TYPE) }}
</template>
</el-table-column>
<el-table-column label="车辆类型" align="center">
<template slot-scope="{row}">
{{ translateVehicleType(row.VEHICLE_TYPE) }}
</template>
</el-table-column>
<el-table-column prop="CONTACT" label="联系人"/>
<el-table-column prop="PHONE" label="联系人电话"/>
<el-table-column label="审核状态" align="center" width="120">
@ -45,8 +53,9 @@
{{ getType(row.IS_AUDIT) }}
</template>
</el-table-column>
<el-table-column label="操作" align="left" width="110">
<el-table-column label="操作" align="left" width="200">
<template slot-scope="{row}">
<el-button type="primary" icon="el-icon-view" size="mini" @click="detail(row)"></el-button>
<el-button v-if="row.IS_AUDIT === '1'" type="success" icon="el-icon-view" size="mini" @click="approve(row)"></el-button>
</template>
</el-table-column>
@ -56,6 +65,41 @@
<pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />
</div>
<send-util ref="sendUtil" append-to-body @refresh="getList"/>
<el-dialog :title="detailTitle" :visible.sync="dialogVisible" width="50%">
<el-form :model="detailForm" label-width="120px">
<el-form-item label="排放标准">
<el-input v-model="detailForm.EMISSION_STANDARDS" readonly />
</el-form-item>
<el-form-item label="驾驶证图片">
<el-image :src="config.fileUrl + detailForm.DRIVING_LICENSE" style="width: 100px; height: 100px" />
</el-form-item>
<el-form-item label="绿本图片">
<el-image :src="config.fileUrl + detailForm.GREEN_BOOK" style="width: 100px; height: 100px" />
</el-form-item>
<el-form-item label="环保随车清单图片">
<el-image :src="config.fileUrl + detailForm.ECO_FRIENDLY_CHECKLIST" style="width: 100px; height: 100px" />
</el-form-item>
<el-form-item label="出厂合格证图片">
<el-image :src="config.fileUrl + detailForm.FACTORY_CERTIFICATE" style="width: 100px; height: 100px" />
</el-form-item>
<el-form-item label="环保信息截图图片">
<el-image :src="config.fileUrl + detailForm.ENVIRONMENTAL_SCREENSHOTS" style="width: 100px; height: 100px" />
</el-form-item>
<el-form-item label="访问起始时间">
<el-input v-model="detailForm.VISIT_START_TIME" readonly />
</el-form-item>
<el-form-item label="访问结束时间">
<el-input v-model="detailForm.VISIT_END_TIME" readonly />
</el-form-item>
<el-form-item label="访问口门名称">
<el-input v-model="detailForm.DOOR_NAME" readonly />
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">关闭</el-button>
</span>
</el-dialog>
</div>
</template>
@ -71,6 +115,36 @@ export default{
page: 1,
limit: 10
},
config: config,
dialogVisible: false,
detailTitle: '详情',
detailForm: {
EMISSION_STANDARDS: '',
DRIVING_LICENSE: '',
GREEN_BOOK: '',
ECO_FRIENDLY_CHECKLIST: '',
CERTIFICATE_IMAGE: '',
FACTORY_CERTIFICATE: '',
ENVIRONMENTAL_SCREENSHOTS: '',
VISIT_START_TIME: '',
VISIT_END_TIME: '',
DOOR_NAME: ''
},
licenceTypeList: [
// { ID: '', NAME: '' },
{ ID: '0', NAME: '白牌' },
{ ID: '1', NAME: '蓝牌' },
{ ID: '2', NAME: '黄牌' },
{ ID: '3', NAME: '绿牌' },
{ ID: '4', NAME: '黑牌' }
],
//
vehicleTypeList: [
// { ID: '', NAME: '' },
{ ID: '0', NAME: '货车' },
{ ID: '1', NAME: '轿车' },
{ ID: '2', NAME: '大巴客车' }
],
areaList: [], //
placeList: [],
listLoading: true,
@ -110,6 +184,16 @@ export default{
return '审核驳回'
}
},
translateLicenceType(id) {
for (var i = 0; i < this.licenceTypeList.length; i++) {
if (this.licenceTypeList[i].ID == id) return this.licenceTypeList[i].NAME
}
},
translateVehicleType(id) {
for (var i = 0; i < this.vehicleTypeList.length; i++) {
if (this.vehicleTypeList[i].ID == id) return this.vehicleTypeList[i].NAME
}
},
//
getQuery() {
this.$refs.multipleTable.clearSelection()
@ -144,6 +228,27 @@ export default{
}).catch((e) => {
this.listLoading = false
})
},
detail(row) {
this.dialogVisible = true
requestFN(
'/vehiclemessage/getCarInfo',
{
VEHICLE_ID: row.VEHICLE_ID
}
).then((data) => {
this.detailForm.EMISSION_STANDARDS = data.pageData.EMISSION_STANDARDS
this.detailForm.DRIVING_LICENSE = data.pageData.DRIVING_LICENSE
this.detailForm.GREEN_BOOK = data.pageData.GREEN_BOOK
this.detailForm.ECO_FRIENDLY_CHECKLIST = data.pageData.ECO_FRIENDLY_CHECKLIST
this.detailForm.FACTORY_CERTIFICATE = data.pageData.FACTORY_CERTIFICATE
this.detailForm.ENVIRONMENTAL_SCREENSHOTS = data.pageData.ENVIRONMENTAL_SCREENSHOTS
this.detailForm.VISIT_START_TIME = data.pageData.VISIT_START_TIME
this.detailForm.VISIT_END_TIME = data.pageData.VISIT_END_TIME
this.detailForm.DOOR_NAME = data.pageData.DOOR_NAME
}).catch((e) => {
this.listLoading = false
})
}
}