[问题修复](pet_门口门禁):

- 门口门禁bug修复
pet_门口门禁
huangyuxuan 2025-02-06 15:04:18 +08:00
parent b79472f20c
commit 0b7595c308
5 changed files with 21 additions and 16 deletions

View File

@ -1,8 +1,8 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form label-width="90px"> <el-form label-width="130px">
<el-row> <el-row>
<el-col :span="4"> <el-col :span="5">
<el-form-item label="相关方单位名称"> <el-form-item label="相关方单位名称">
<el-input v-model="searchForm.CORP_NAME" placeholder="相关方单位名称"/> <el-input v-model="searchForm.CORP_NAME" placeholder="相关方单位名称"/>
</el-form-item> </el-form-item>

View File

@ -671,7 +671,7 @@ export default {
).then((data) => { ).then((data) => {
if (data.result === 'success') { if (data.result === 'success') {
this.detailForm.LICENCE_NO = data.pd.LICENCE_NO // this.detailForm.LICENCE_NO = data.pd.LICENCE_NO //
this.detailForm.VEHICLE_DEPARTMENT_ID = data.pd.DEPARTMENT_NAME // this.detailForm.VEHICLE_DEPARTMENT_ID = data.pd.VEHICLE_DEPARTMENT_NAME //
this.detailForm.LICENCE_TYPE = this.translateLicenceType(data.pd.LICENCE_TYPE) // this.detailForm.LICENCE_TYPE = this.translateLicenceType(data.pd.LICENCE_TYPE) //
this.detailForm.VEHICLE_TYPE = this.translateVehicleType(data.pd.VEHICLE_TYPE) // this.detailForm.VEHICLE_TYPE = this.translateVehicleType(data.pd.VEHICLE_TYPE) //
this.detailForm.VEHICLE_BELONG_TYPE = data.pd.VEHICLE_BELONG_TYPE === undefined ? '' : this.translateVehicleBelongType(data.pd.VEHICLE_BELONG_TYPE) this.detailForm.VEHICLE_BELONG_TYPE = data.pd.VEHICLE_BELONG_TYPE === undefined ? '' : this.translateVehicleBelongType(data.pd.VEHICLE_BELONG_TYPE)

View File

@ -97,8 +97,8 @@
{{ translateVehicleType(row.VEHICLE_TYPE) }} {{ translateVehicleType(row.VEHICLE_TYPE) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="XGF_DEPT_NAME" label="车辆所属部门" align="center" /> <el-table-column prop="DEPT_NAME" label="车辆所属部门" align="center" />
<el-table-column prop="USER_NAME" label="车辆责任人" align="center"/> <el-table-column prop="U_NAME" label="车辆责任人" align="center"/>
<el-table-column label="操作" align="center" width="480"> <el-table-column label="操作" align="center" width="480">
<template slot-scope="{row}"> <template slot-scope="{row}">
<el-button type="warning" size="mini" @click="vehicleInOutRecordBtn(row.LICENCE_NO)"></el-button> <el-button type="warning" size="mini" @click="vehicleInOutRecordBtn(row.LICENCE_NO)"></el-button>
@ -459,7 +459,7 @@ export default {
console.log('22222222222222222222222222222') console.log('22222222222222222222222222222')
this.listLoading = true this.listLoading = true
requestFN( requestFN(
'vehiclemessage/getPageList?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page, 'mkmjManagement/zgCarInfoList?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
{ {
...this.searchForm, ...this.searchForm,
'CORPINFO_ID': this.CORPINFO_ID, 'CORPINFO_ID': this.CORPINFO_ID,
@ -467,7 +467,7 @@ export default {
} }
).then((data) => { ).then((data) => {
this.listLoading = false this.listLoading = false
this.varList = data.varList this.varList = data.carInfoList
this.total = data.page.totalResult this.total = data.page.totalResult
// this.hasButton() // this.hasButton()
this.pd = data.pd this.pd = data.pd
@ -644,11 +644,11 @@ export default {
).then((data) => { ).then((data) => {
if (data.result === 'success') { if (data.result === 'success') {
this.detailForm.LICENCE_NO = data.pd.LICENCE_NO // this.detailForm.LICENCE_NO = data.pd.LICENCE_NO //
this.detailForm.VEHICLE_DEPARTMENT_ID = data.pd.DEPARTMENT_NAME // this.detailForm.VEHICLE_DEPARTMENT_ID = data.pd.DEPT_NAME //
this.detailForm.LICENCE_TYPE = this.translateLicenceType(data.pd.LICENCE_TYPE) // this.detailForm.LICENCE_TYPE = this.translateLicenceType(data.pd.LICENCE_TYPE) //
this.detailForm.VEHICLE_TYPE = this.translateVehicleType(data.pd.VEHICLE_TYPE) // this.detailForm.VEHICLE_TYPE = this.translateVehicleType(data.pd.VEHICLE_TYPE) //
this.detailForm.VEHICLE_BELONG_TYPE = data.pd.VEHICLE_BELONG_TYPE === undefined ? '' : this.translateVehicleBelongType(data.pd.VEHICLE_BELONG_TYPE) this.detailForm.VEHICLE_BELONG_TYPE = data.pd.VEHICLE_BELONG_TYPE === undefined ? '' : this.translateVehicleBelongType(data.pd.VEHICLE_BELONG_TYPE)
this.detailForm.USER_ID = data.pd.USER_NAME // this.detailForm.USER_ID = data.pd.U_NAME //
} else { } else {
this.$message({ this.$message({
message: '数据回显失败', message: '数据回显失败',

View File

@ -70,7 +70,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="VEHICLE_DEPARTMENT_NAME" label="车辆所属部门" align="center"/> <el-table-column prop="VEHICLE_DEPARTMENT_NAME" label="车辆所属部门" align="center"/>
<el-table-column prop="USER_NAME" label="车辆责任人" align="center"/> <el-table-column prop="USER_NAME" label="车辆责任人" align="center"/>
<el-table-column prop="ISEXIST" label="是否存在" align="center" /> <!-- <el-table-column prop="ISEXIST" label="是否存在" align="center" />-->
<el-table-column label="操作" align="center" width="480"> <el-table-column label="操作" align="center" width="480">
<template slot-scope="{row}"> <template slot-scope="{row}">
<el-button icon="el-icon-view" size="mini" @click="showDetail(row.BLACK_LIST_ID)"></el-button> <el-button icon="el-icon-view" size="mini" @click="showDetail(row.BLACK_LIST_ID)"></el-button>

View File

@ -77,7 +77,7 @@
<el-table-column prop="VEHICLE_DEPARTMENT_NAME" label="车辆所属部门" align="center" /> <el-table-column prop="VEHICLE_DEPARTMENT_NAME" label="车辆所属部门" align="center" />
<el-table-column prop="USER_NAME" label="车辆责任人" align="center" width="120" /> <el-table-column prop="USER_NAME" label="车辆责任人" align="center" width="120" />
<el-table-column prop="VIOLATION_COUNT" label="违规次数" align="center" /> <el-table-column prop="VIOLATION_COUNT" label="违规次数" align="center" />
<el-table-column prop="ISEXIST" label="是否存在" align="center" /> <!-- <el-table-column prop="ISEXIST" label="是否存在" align="center" />-->
<el-table-column label="操作" align="center" width="480"> <el-table-column label="操作" align="center" width="480">
<template slot-scope="{row}"> <template slot-scope="{row}">
@ -228,7 +228,13 @@ export default {
{ pattern: /^([京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z]{1}[A-Z]{1}[A-Z0-9]{4}[A-Z0-9挂学警港澳]{1})$/, message: '请填写正确的车牌号', trigger: 'blur' } { pattern: /^([京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z]{1}[A-Z]{1}[A-Z0-9]{4}[A-Z0-9挂学警港澳]{1})$/, message: '请填写正确的车牌号', trigger: 'blur' }
], ],
VIOLATION_TYPE: [{ required: true, message: '请选择违规类型', trigger: 'blur' }], VIOLATION_TYPE: [{ required: true, message: '请选择违规类型', trigger: 'blur' }],
FFILE: [{ required: true, message: '违规图片不能为空', trigger: 'blur' }], FFILE: [{ required: true, validator: (rule, value, callback) => {
if (value.length === 0) {
callback(new Error('违规图片不能为空'));
} else {
callback();
}
}, trigger: 'blur' }],
LOCATION: [{ required: true, message: '违规区域不能为空', trigger: 'blur' }], LOCATION: [{ required: true, message: '违规区域不能为空', trigger: 'blur' }],
VIOLATIONTIME: [{ required: true, message: '违规时间不能为空', trigger: 'blur' }], VIOLATIONTIME: [{ required: true, message: '违规时间不能为空', trigger: 'blur' }],
LICENCE_TYPE: [{ required: true, message: '请选择车牌类型', trigger: 'blur' }], LICENCE_TYPE: [{ required: true, message: '请选择车牌类型', trigger: 'blur' }],
@ -376,6 +382,7 @@ export default {
// //
handleRemove(file, fileList) { handleRemove(file, fileList) {
this.violationUpload = fileList.length >= 4 this.violationUpload = fileList.length >= 4
this.addForm.FFILE = fileList
}, },
handleChangeIMG(file, fileList) { handleChangeIMG(file, fileList) {
const types = ['image/jpeg', 'image/jpg', 'image/png'] const types = ['image/jpeg', 'image/jpg', 'image/png']
@ -385,6 +392,7 @@ export default {
fileList.pop() fileList.pop()
} }
this.violationUpload = fileList.length >= 4 this.violationUpload = fileList.length >= 4
this.addForm.FFILE = fileList
}, },
// //
handlePictureCardPreview(file) { handlePictureCardPreview(file) {
@ -404,14 +412,11 @@ export default {
}, },
// //
addDialogConfirmBtn(formName) { addDialogConfirmBtn(formName) {
this.addForm.FFILE = this.violation_files
this.$refs[formName].validate((valid) => { this.$refs[formName].validate((valid) => {
if (!valid) { if (!valid) {
return false return false
} }
this.$refs.addForm.validate(valid => { this.addRequest(); //
this.addRequest(valid) //
})
}) })
}, },
addRequest(valid) { addRequest(valid) {