guoyuepeng
/
qa-prevention-xgf-vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

- bug修复
pet_门口门禁
huangyuxuan 2025-01-20 17:09:37 +08:00
parent 4287fd4860
commit 681f3cf93c
3 changed files with 298 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

158
src/views/firstLevelDoor/freightVehiclesPort/freightVehicleMaintenance/components/carList.vue
View File

@ -9,7 +9,8 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <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="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> <el-button v-waves class="filter-item" type="success" icon="el-icon-refresh" @click="reset">重置</el-button>
</el-col> </el-col>
</el-row> </el-row>
@ -34,7 +35,7 @@
type="selection" type="selection"
width="55" width="55"
align="center"/> align="center"/>
<el-table-column type="index" label="序号" width="50" align="center" /> <el-table-column type="index" label="序号" width="50" align="center"/>
<el-table-column prop="LICENCE_NO" label="车牌号"/> <el-table-column prop="LICENCE_NO" label="车牌号"/>
<el-table-column prop="CONTACT" label="联系人姓名"/> <el-table-column prop="CONTACT" label="联系人姓名"/>
<el-table-column prop="PHONE" label="联系人电话"/> <el-table-column prop="PHONE" label="联系人电话"/>
@ -59,15 +60,17 @@
<el-button type="primary" icon="el-icon-plus" size="mini" @click="openAddDialogAddBtn()">新增</el-button> <el-button type="primary" icon="el-icon-plus" size="mini" @click="openAddDialogAddBtn()">新增</el-button>
<div/> <div/>
<div/> <div/>
<pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" /> <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList"/>
</div> </div>
<el-dialog :visible.sync="addDialogVisible" title="添加车辆信息" width="600px"> <el-dialog :visible.sync="addDialogVisible" title="添加车辆信息" width="600px">
<el-form v-if="addDialogVisible" ref="addForm" :model="addForm" label-width="170px" style="padding:0 20px; width: 500px;"> <el-form v-if="addDialogVisible" ref="addForm" :model="addForm" label-width="170px"
<el-form-item :rules="[{required: true ,message: '车牌号不能为空'}]" label="车牌号" prop="LICENCE_NO"> style="padding:0 20px; width: 500px;">
<el-input v-model="addForm.LICENCE_NO" type="text" maxlength="300" placeholder="这里输入车牌号..." @blur="goCheckLicenceNoAdd()"/> <el-form-item :rules="[{required: true ,message: '车牌号不能为空',trigger: 'blur'}]" label="车牌号" prop="LICENCE_NO">
<el-input v-model="addForm.LICENCE_NO" type="text" maxlength="300" placeholder="这里输入车牌号..."
@blur="goCheckLicenceNoAdd()"/>
</el-form-item> </el-form-item>
<!-- 白牌、蓝牌、黄牌、绿牌、黑牌 下拉框--> <!-- 白牌、蓝牌、黄牌、绿牌、黑牌 下拉框-->
<el-form-item :rules="[{required: true}]" label="车牌类型" prop="LICENCE_TYPE"> <el-form-item :rules="[{required: true,message: '车牌类型不能为空',trigger: 'blur'}]" label="车牌类型" prop="LICENCE_TYPE">
<SelectTree <SelectTree
ref="selectTree_add2" ref="selectTree_add2"
:clearable="false" :clearable="false"
@ -78,7 +81,7 @@
style="width: 300px"/> style="width: 300px"/>
</el-form-item> </el-form-item>
<!-- 货车、轿车、大巴客车 下拉框--> <!-- 货车、轿车、大巴客车 下拉框-->
<el-form-item :rules="[{required: true}]" label="车辆类型" prop="VEHICLE_TYPE"> <el-form-item :rules="[{required: true,message: '车辆类型不能为空',trigger: 'blur'}]" label="车辆类型" prop="VEHICLE_TYPE">
<SelectTree <SelectTree
ref="selectTree_add3" ref="selectTree_add3"
:clearable="false" :clearable="false"
@ -89,7 +92,7 @@
style="width: 300px"/> style="width: 300px"/>
</el-form-item> </el-form-item>
<!--是否为危化车辆--> <!--是否为危化车辆-->
<el-form-item :rules="[{required: true}]" label="是否为危化车辆" prop="IS_DANGEROUS_CAR"> <el-form-item :rules="[{required: true,message: '是否为危化车辆不能为空',trigger: 'blur'}]" label="是否为危化车辆" prop="IS_DANGEROUS_CAR">
<SelectTree <SelectTree
ref="selectTree_add4" ref="selectTree_add4"
:clearable="false" :clearable="false"
@ -99,17 +102,17 @@
placeholder="请选择是否危化车辆" placeholder="请选择是否危化车辆"
style="width: 300px"/> style="width: 300px"/>
</el-form-item> </el-form-item>
<el-form-item label="负责人" :rules="[{ required: true, message: '请填写负责人姓名', trigger: 'blur' }]"> <el-form-item label="负责人" prop="CONTACT" :rules="[{ required: true, message: '请填写负责人姓名', trigger: 'blur' }]">
<el-input v-model="addForm.CONTACT" type="text" maxlength="300" placeholder="这里输入负责人名称..."/> <el-input v-model="addForm.CONTACT" type="text" maxlength="300" placeholder="这里输入负责人名称..."/>
</el-form-item> </el-form-item>
<el-form-item label="负责人手机号" :rules="[{ required: true, message: '请填写负责人手机号', trigger: 'blur' }]"> <el-form-item label="负责人手机号" prop="PHONE" :rules="[{ required: true, message: '请填写负责人手机号', trigger: 'blur' },{ pattern: /^1[3-9]\d{9}$/, message: '手机号格式不正确', trigger: 'blur' }]">
<el-input v-model="addForm.PHONE" type="text" maxlength="300" placeholder="这里输入负责人手机号..."/> <el-input v-model="addForm.PHONE" type="text" maxlength="11" placeholder="这里输入负责人手机号..."/>
</el-form-item> </el-form-item>
<el-form-item label="排放标准" :rules="[{ required: true, message: '请填写排放标准', trigger: 'blur' }]"> <el-form-item label="排放标准" prop="EMISSION_STANDARDS" :rules="[{ required: true, message: '请填写排放标准', trigger: 'blur' }]">
<el-input v-model="addForm.EMISSION_STANDARDS" type="text" maxlength="300" placeholder="这里输入排放标准..."/> <el-input v-model="addForm.EMISSION_STANDARDS" type="text" maxlength="300" placeholder="这里输入排放标准..."/>
</el-form-item> </el-form-item>
<!-- 驾驶证上传 --> <!-- 驾驶证 -->
<el-form-item label="驾驶证" :rules="[{ required: true, message: '请上传驾驶证', trigger: 'blur' }]"> <el-form-item label="驾驶证" prop="DRIVING_LICENSE" :rules="[{ required: true, message: '请上传驾驶证', trigger: 'blur' }]">
<el-upload <el-upload
action="http://127.0.0.1:8199/mkmj/management/fileUpload" action="http://127.0.0.1:8199/mkmj/management/fileUpload"
:on-success="handleDrivingLicenseSuccess" :on-success="handleDrivingLicenseSuccess"
@ -119,7 +122,8 @@
</el-upload> </el-upload>
</el-form-item> </el-form-item>
<el-form-item label="绿本" :rules="[{ required: true, message: '请上传绿本', trigger: 'blur' }]"> <!-- 绿本 -->
<el-form-item label="绿本" prop="GREEN_BOOK" :rules="[{ required: true, message: '请上传绿本', trigger: 'blur' }]">
<el-upload <el-upload
action="http://127.0.0.1:8199/mkmj/management/fileUpload" action="http://127.0.0.1:8199/mkmj/management/fileUpload"
:on-success="handleGreenBookSuccess" :on-success="handleGreenBookSuccess"
@ -129,7 +133,8 @@
</el-upload> </el-upload>
</el-form-item> </el-form-item>
<el-form-item label="环保随车清单" :rules="[{ required: true, message: '请上传环保随车清单', trigger: 'blur' }]"> <!-- 环保随车清单 -->
<el-form-item label="环保随车清单" prop="ECO_FRIENDLY_CHECKLIST" :rules="[{ required: true, message: '请上传环保随车清单', trigger: 'blur' }]">
<el-upload <el-upload
action="http://127.0.0.1:8199/mkmj/management/fileUpload" action="http://127.0.0.1:8199/mkmj/management/fileUpload"
:on-success="handleEcoFriendlyChecklistSuccess" :on-success="handleEcoFriendlyChecklistSuccess"
@ -139,7 +144,8 @@
</el-upload> </el-upload>
</el-form-item> </el-form-item>
<el-form-item label="出厂合格证" :rules="[{ required: true, message: '请上传出厂合格证', trigger: 'blur' }]"> <!-- 出厂合格证 -->
<el-form-item label="出厂合格证" prop="FACTORY_CERTIFICATE" :rules="[{ required: true, message: '请上传出厂合格证', trigger: 'blur' }]">
<el-upload <el-upload
action="http://127.0.0.1:8199/mkmj/management/fileUpload" action="http://127.0.0.1:8199/mkmj/management/fileUpload"
:on-success="handleFactoryCertificateSuccess" :on-success="handleFactoryCertificateSuccess"
@ -149,7 +155,8 @@
</el-upload> </el-upload>
</el-form-item> </el-form-item>
<el-form-item label="环保信息截图" :rules="[{ required: true, message: '请上传环保信息截图', trigger: 'blur' }]"> <!-- 环保信息截图 -->
<el-form-item label="环保信息截图" prop="ENVIRONMENTAL_SCREENSHOTS" :rules="[{ required: true, message: '请上传环保信息截图', trigger: 'blur' }]">
<el-upload <el-upload
action="http://127.0.0.1:8199/mkmj/management/fileUpload" action="http://127.0.0.1:8199/mkmj/management/fileUpload"
:on-success="handleEnvironmentalScreenshotsSuccess" :on-success="handleEnvironmentalScreenshotsSuccess"
@ -166,14 +173,16 @@
</el-dialog> </el-dialog>
<!--编辑--> <!--编辑-->
<el-dialog :visible.sync="editDialogVisible" title="编辑车辆信息" width="600px"> <el-dialog :visible.sync="editDialogVisible" title="编辑车辆信息" width="600px">
<el-form v-if="editDialogVisible" ref="editForm" :model="addForm" label-width="170px" style="padding:0 20px; width: 500px;"> <el-form v-if="editDialogVisible" ref="editForm" :model="addForm" label-width="170px"
<el-form-item label="车牌号" prop="LICENCE_NO"> style="padding:0 20px; width: 500px;">
<el-input v-model="addForm.LICENCE_NO" type="text" maxlength="300" placeholder="这里输入车牌号..."/> <el-form-item :rules="[{required: true ,message: '车牌号不能为空',trigger: 'blur'}]" label="车牌号" prop="LICENCE_NO">
<el-input v-model="addForm.LICENCE_NO" type="text" maxlength="300" placeholder="这里输入车牌号..."
@blur="goCheckLicenceNoAdd()"/>
</el-form-item> </el-form-item>
<!-- 白牌、蓝牌、黄牌、绿牌、黑牌 下拉框--> <!-- 白牌、蓝牌、黄牌、绿牌、黑牌 下拉框-->
<el-form-item label="车牌类型" prop="LICENCE_TYPE"> <el-form-item :rules="[{required: true,message: '车牌类型不能为空',trigger: 'blur'}]" label="车牌类型" prop="LICENCE_TYPE">
<SelectTree <SelectTree
ref="selectTree_edit2" ref="selectTree_add2"
:clearable="false" :clearable="false"
:options="licenceTypeList" :options="licenceTypeList"
:props="vehicleDefaultProps" :props="vehicleDefaultProps"
@ -182,9 +191,9 @@
style="width: 300px"/> style="width: 300px"/>
</el-form-item> </el-form-item>
<!-- 货车、轿车、大巴客车 下拉框--> <!-- 货车、轿车、大巴客车 下拉框-->
<el-form-item label="车辆类型" prop="VEHICLE_TYPE"> <el-form-item :rules="[{required: true,message: '车辆类型不能为空',trigger: 'blur'}]" label="车辆类型" prop="VEHICLE_TYPE">
<SelectTree <SelectTree
ref="selectTree_edit3" ref="selectTree_add3"
:clearable="false" :clearable="false"
:options="vehicleTypeList" :options="vehicleTypeList"
:props="vehicleDefaultProps" :props="vehicleDefaultProps"
@ -193,9 +202,9 @@
style="width: 300px"/> style="width: 300px"/>
</el-form-item> </el-form-item>
<!--是否为危化车辆--> <!--是否为危化车辆-->
<el-form-item label="是否为危化车辆" prop="IS_DANGEROUS_CAR"> <el-form-item :rules="[{required: true,message: '是否为危化车辆不能为空',trigger: 'blur'}]" label="是否为危化车辆" prop="IS_DANGEROUS_CAR">
<SelectTree <SelectTree
ref="selectTree_edit4" ref="selectTree_add4"
:clearable="false" :clearable="false"
:options="DANGEROUS_CAR_LIST" :options="DANGEROUS_CAR_LIST"
:props="vehicleDefaultProps" :props="vehicleDefaultProps"
@ -203,17 +212,17 @@
placeholder="请选择是否危化车辆" placeholder="请选择是否危化车辆"
style="width: 300px"/> style="width: 300px"/>
</el-form-item> </el-form-item>
<el-form-item label="负责人"> <el-form-item label="负责人" prop="CONTACT" :rules="[{ required: true, message: '请填写负责人姓名', trigger: 'blur' }]">
<el-input v-model="addForm.CONTACT" type="text" maxlength="300" placeholder="这里输入负责人名称..."/> <el-input v-model="addForm.CONTACT" type="text" maxlength="300" placeholder="这里输入负责人名称..."/>
</el-form-item> </el-form-item>
<el-form-item label="负责人手机号"> <el-form-item label="负责人手机号" prop="PHONE" :rules="[{ required: true, message: '请填写负责人手机号', trigger: 'blur' },{ pattern: /^1[3-9]\d{9}$/, message: '手机号格式不正确', trigger: 'blur' }]">
<el-input v-model="addForm.PHONE" type="text" maxlength="300" placeholder="这里输入负责人手机号..."/> <el-input v-model="addForm.PHONE" type="text" maxlength="11" placeholder="这里输入负责人手机号..."/>
</el-form-item> </el-form-item>
<el-form-item label="排放标准"> <el-form-item label="排放标准" prop="EMISSION_STANDARDS" :rules="[{ required: true, message: '请填写排放标准', trigger: 'blur' }]">
<el-input v-model="addForm.EMISSION_STANDARDS" type="text" maxlength="300" placeholder="这里输入排放标准..."/> <el-input v-model="addForm.EMISSION_STANDARDS" type="text" maxlength="300" placeholder="这里输入排放标准..."/>
</el-form-item> </el-form-item>
<!-- 驾驶证上传 --> <!-- 驾驶证 -->
<el-form-item label="驾驶证"> <el-form-item label="驾驶证" prop="DRIVING_LICENSE" :rules="[{ required: true, message: '请上传驾驶证', trigger: 'blur' }]">
<el-upload <el-upload
action="http://127.0.0.1:8199/mkmj/management/fileUpload" action="http://127.0.0.1:8199/mkmj/management/fileUpload"
:on-success="handleDrivingLicenseSuccess" :on-success="handleDrivingLicenseSuccess"
@ -223,7 +232,8 @@
</el-upload> </el-upload>
</el-form-item> </el-form-item>
<el-form-item label="绿本"> <!-- 绿本 -->
<el-form-item label="绿本" prop="GREEN_BOOK" :rules="[{ required: true, message: '请上传绿本', trigger: 'blur' }]">
<el-upload <el-upload
action="http://127.0.0.1:8199/mkmj/management/fileUpload" action="http://127.0.0.1:8199/mkmj/management/fileUpload"
:on-success="handleGreenBookSuccess" :on-success="handleGreenBookSuccess"
@ -233,7 +243,8 @@
</el-upload> </el-upload>
</el-form-item> </el-form-item>
<el-form-item label="环保随车清单"> <!-- 环保随车清单 -->
<el-form-item label="环保随车清单" prop="ECO_FRIENDLY_CHECKLIST" :rules="[{ required: true, message: '请上传环保随车清单', trigger: 'blur' }]">
<el-upload <el-upload
action="http://127.0.0.1:8199/mkmj/management/fileUpload" action="http://127.0.0.1:8199/mkmj/management/fileUpload"
:on-success="handleEcoFriendlyChecklistSuccess" :on-success="handleEcoFriendlyChecklistSuccess"
@ -243,7 +254,8 @@
</el-upload> </el-upload>
</el-form-item> </el-form-item>
<el-form-item label="出厂合格证"> <!-- 出厂合格证 -->
<el-form-item label="出厂合格证" prop="FACTORY_CERTIFICATE" :rules="[{ required: true, message: '请上传出厂合格证', trigger: 'blur' }]">
<el-upload <el-upload
action="http://127.0.0.1:8199/mkmj/management/fileUpload" action="http://127.0.0.1:8199/mkmj/management/fileUpload"
:on-success="handleFactoryCertificateSuccess" :on-success="handleFactoryCertificateSuccess"
@ -253,7 +265,8 @@
</el-upload> </el-upload>
</el-form-item> </el-form-item>
<el-form-item label="环保信息截图"> <!-- 环保信息截图 -->
<el-form-item label="环保信息截图" prop="ENVIRONMENTAL_SCREENSHOTS" :rules="[{ required: true, message: '请上传环保信息截图', trigger: 'blur' }]">
<el-upload <el-upload
action="http://127.0.0.1:8199/mkmj/management/fileUpload" action="http://127.0.0.1:8199/mkmj/management/fileUpload"
:on-success="handleEnvironmentalScreenshotsSuccess" :on-success="handleEnvironmentalScreenshotsSuccess"
@ -277,10 +290,11 @@
<script> <script>
import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包 import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包
import { requestFN } from '@/utils/request' import {requestFN} from '@/utils/request'
import SelectTree from '@/components/SelectTree' import SelectTree from '@/components/SelectTree'
export default{
components: { Pagination, SelectTree}, export default {
components: {Pagination, SelectTree},
data() { data() {
return { return {
listQuery: { listQuery: {
@ -330,22 +344,22 @@ export default{
}, },
// 车牌类型列表 // 车牌类型列表
licenceTypeList: [ licenceTypeList: [
{ ID: '0', NAME: '白牌' }, {ID: '0', NAME: '白牌'},
{ ID: '1', NAME: '蓝牌' }, {ID: '1', NAME: '蓝牌'},
{ ID: '2', NAME: '黄牌' }, {ID: '2', NAME: '黄牌'},
{ ID: '3', NAME: '绿牌' }, {ID: '3', NAME: '绿牌'},
{ ID: '4', NAME: '黑牌' } {ID: '4', NAME: '黑牌'}
], ],
// 车辆类型列表 // 车辆类型列表
vehicleTypeList: [ vehicleTypeList: [
// { ID: '', NAME: '请选择' }, // { ID: '', NAME: '请选择' },
{ ID: '0', NAME: '货车' }, {ID: '0', NAME: '货车'},
{ ID: '1', NAME: '轿车' }, {ID: '1', NAME: '轿车'},
{ ID: '2', NAME: '大巴客车' } {ID: '2', NAME: '大巴客车'}
], ],
DANGEROUS_CAR_LIST: [ DANGEROUS_CAR_LIST: [
{ ID: '0', NAME: '否' }, {ID: '0', NAME: '否'},
{ ID: '1', NAME: '是' }, {ID: '1', NAME: '是'},
], ],
// 车辆下拉树默认属性 // 车辆下拉树默认属性
vehicleDefaultProps: { vehicleDefaultProps: {
@ -439,7 +453,7 @@ export default{
this.ISCHECK = false this.ISCHECK = false
}, },
reSetAddDialog() { reSetAddDialog() {
this.addForm.VEHICLE_ID = '', this.addForm.VEHICLE_ID = '',
this.addForm.LICENCE_NO = '', this.addForm.LICENCE_NO = '',
this.addForm.LICENCE_TYPE = '', this.addForm.LICENCE_TYPE = '',
this.addForm.VEHICLE_TYPE = '', this.addForm.VEHICLE_TYPE = '',
@ -480,18 +494,24 @@ export default{
this.addDialogVisible = false; this.addDialogVisible = false;
}, },
addDialogConfirmBtn() { addDialogConfirmBtn() {
requestFN( this.$refs.addForm.validate(valid => {
'/mkmj/management/carInfoMaintenance' , if (valid) {
this.addForm requestFN(
).then((data) => { '/mkmj/management/carInfoMaintenance',
this.addDialogVisible = false this.addForm
this.reSetAddDialog() ).then((data) => {
this.getList() this.addDialogVisible = false
}).catch((e) => { this.reSetAddDialog()
this.addDialogVisible = false this.getList()
}).catch((e) => {
this.addDialogVisible = false
})
} else {
return false
}
}) })
}, },
goDelete(row){ goDelete(row) {
this.$confirm('确定要删除吗?', { this.$confirm('确定要删除吗?', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
@ -500,7 +520,7 @@ export default{
requestFN( requestFN(
'/mkmj/management/deleteCarInfo', '/mkmj/management/deleteCarInfo',
{ {
VEHICLE_ID : row.VEHICLE_ID VEHICLE_ID: row.VEHICLE_ID
} }
).then((data) => { ).then((data) => {
this.listLoading = false this.listLoading = false
@ -511,16 +531,16 @@ export default{
}).catch(() => { }).catch(() => {
}) })
}, },
goEdit(row){ goEdit(row) {
this.editDialogVisible = true this.editDialogVisible = true
this.addForm = { ...row }; this.addForm = {...row};
}, },
editDialogCancelBtn(){ editDialogCancelBtn() {
this.editDialogVisible = false this.editDialogVisible = false
}, },
editDialogConfirmBtn(){ editDialogConfirmBtn() {
requestFN( requestFN(
'/mkmj/management/carInfoMaintenance' , '/mkmj/management/carInfoMaintenance',
this.addForm this.addForm
).then((data) => { ).then((data) => {
this.editDialogVisible = false this.editDialogVisible = false
@ -530,7 +550,7 @@ export default{
this.editDialogVisible = false this.editDialogVisible = false
}) })
}, },
goBack(){ goBack() {
this.$parent.activeName = 'List' this.$parent.activeName = 'List'
} }
} }

234
src/views/firstLevelDoor/longCarPort/CarInfo/components/list.vue
View File

@ -99,7 +99,9 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" width="400"> <el-table-column label="操作" align="center" width="400">
<template slot-scope="{row}"> <template slot-scope="{row}">
<el-button type="warning" size="mini" @click="vehicleInOutRecordBtn(row.LICENCE_NO)">车辆进出记录</el-button> <el-button v-if="row.IS_AUDIT === '3'" type="success" icon="el-icon-edit" size="mini" @click="remark(row)">查看原因</el-button>
<el-button v-if="row.IS_AUDIT === '3'" type="primary" icon="el-icon-edit" size="mini" @click="apply(row)">重新申请</el-button>
<el-button v-if="row.IS_AUDIT !== '3'" type="warning" size="mini" @click="vehicleInOutRecordBtn(row.LICENCE_NO)">车辆进出记录</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -110,12 +112,11 @@
<pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getPageList" /> <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getPageList" />
</div> </div>
<el-dialog :visible.sync="addDialogVisible" title="添加车辆信息" width="600px"> <el-dialog :visible.sync="addDialogVisible" title="添加车辆信息" width="600px">
<el-form v-if="addDialogVisible" ref="addForm" :model="addForm" label-width="170px" style="padding:0 20px; width: 500px;"> <el-form v-if="addDialogVisible" ref="addForm" :model="addForm" :rules="rules" label-width="170px" style="padding:0 20px; width: 500px;">
<el-form-item :rules="[{required: true}]" label="车牌号" prop="LICENCE_NO"> <el-form-item label="车牌号" prop="LICENCE_NO">
<el-input v-model="addForm.LICENCE_NO" type="text" maxlength="300" placeholder="这里输入车牌号..." @blur="goCheckLicenceNoAdd()"/> <el-input v-model="addForm.LICENCE_NO" type="text" maxlength="300" placeholder="这里输入车牌号..." @blur="goCheckLicenceNoAdd()"/>
</el-form-item> </el-form-item>
<!-- 白牌、蓝牌、黄牌、绿牌、黑牌 下拉框--> <el-form-item label="车牌类型" prop="LICENCE_TYPE">
<el-form-item :rules="[{required: true}]" label="车牌类型" prop="LICENCE_TYPE">
<SelectTree <SelectTree
ref="selectTree_add2" ref="selectTree_add2"
:clearable="false" :clearable="false"
@ -125,8 +126,7 @@
placeholder="请选择车牌类型" placeholder="请选择车牌类型"
style="width: 300px"/> style="width: 300px"/>
</el-form-item> </el-form-item>
<!-- 货车、轿车、大巴客车 下拉框--> <el-form-item label="车辆类型" prop="VEHICLE_TYPE">
<el-form-item :rules="[{required: true}]" label="车辆类型" prop="VEHICLE_TYPE">
<SelectTree <SelectTree
ref="selectTree_add3" ref="selectTree_add3"
:clearable="false" :clearable="false"
@ -136,7 +136,7 @@
placeholder="请选择车辆类型" placeholder="请选择车辆类型"
style="width: 300px"/> style="width: 300px"/>
</el-form-item> </el-form-item>
<el-form-item label="车辆所属部门"> <el-form-item label="车辆所属部门" prop="DEPARTMENT_ID">
<SelectTree <SelectTree
ref="selectTree_add1" ref="selectTree_add1"
:clearable="false" :clearable="false"
@ -147,7 +147,7 @@
style="width: 300px" style="width: 300px"
@change="handleCorpChange"/> @change="handleCorpChange"/>
</el-form-item> </el-form-item>
<el-form-item label="负责人"> <el-form-item label="负责人" prop="USER_ID">
<el-select <el-select
v-model="addForm.USER_ID" v-model="addForm.USER_ID"
placeholder="请选择负责人"> placeholder="请选择负责人">
@ -159,14 +159,14 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="访问起始时间"> <el-form-item label="访问起始时间" prop="VISIT_START_TIME">
<el-date-picker <el-date-picker
v-model="addForm.VISIT_START_TIME" v-model="addForm.VISIT_START_TIME"
type="datetime" type="datetime"
placeholder="选择日期时间"> placeholder="选择日期时间">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="访问结束时间"> <el-form-item label="访问结束时间" prop="VISIT_END_TIME">
<el-date-picker <el-date-picker
v-model="addForm.VISIT_END_TIME" v-model="addForm.VISIT_END_TIME"
type="datetime" type="datetime"
@ -179,6 +179,95 @@
<el-button type="primary" @click="addDialogConfirmBtn">确 定</el-button> <el-button type="primary" @click="addDialogConfirmBtn">确 定</el-button>
</div> </div>
</el-dialog> </el-dialog>
<el-dialog
title="驳回原因"
:visible.sync="remarkDialogVisible"
width="30%"
:before-close="handleRemarkClose">
<el-form>
<el-form-item label="驳回原因">
<el-input
v-model="remarkText"
type="textarea"
:rows="4"
readonly>
</el-input>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="remarkDialogVisible = false">关闭</el-button>
</span>
</el-dialog>
<el-dialog :visible.sync="reapplyDialogVisible" title="重新申请" width="600px">
<el-form v-if="reapplyDialogVisible" ref="reapplyForm" :model="reapplyForm" :rules="rules" label-width="170px" style="padding:0 20px; width: 500px;">
<el-form-item label="车牌号" prop="LICENCE_NO">
<el-input v-model="reapplyForm.LICENCE_NO" type="text" maxlength="300" placeholder="这里输入车牌号..." readonly/>
</el-form-item>
<el-form-item label="车牌类型" prop="LICENCE_TYPE">
<SelectTree
ref="selectTree_reapply2"
:clearable="false"
:options="licenceTypeList"
:props="vehicleDefaultProps"
v-model="reapplyForm.LICENCE_TYPE"
placeholder="请选择车牌类型"
style="width: 300px"/>
</el-form-item>
<el-form-item label="车辆类型" prop="VEHICLE_TYPE">
<SelectTree
ref="selectTree_reapply3"
:clearable="false"
:options="vehicleTypeList"
:props="vehicleDefaultProps"
v-model="reapplyForm.VEHICLE_TYPE"
placeholder="请选择车辆类型"
style="width: 300px"/>
</el-form-item>
<el-form-item label="车辆所属部门" prop="DEPT_NAME">
<SelectTree
ref="selectTree_reapply1"
:clearable="false"
:options="departmentTreeData"
:props="defaultProps"
v-model="reapplyForm.DEPARTMENT_ID"
placeholder="请选择车辆所属部门"
style="width: 300px"
@change="handleCorpChange"/>
</el-form-item>
<el-form-item label="负责人" prop="U_NAME">
<el-select
v-model="reapplyForm.USER_ID"
placeholder="请选择负责人">
<el-option
v-for="user in personList"
:key="user.USER_ID"
:label="user.NAME"
:value="user.USER_ID">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="访问起始时间" prop="VISIT_START_TIME">
<el-date-picker
v-model="reapplyForm.VISIT_START_TIME"
type="datetime"
placeholder="选择日期时间">
</el-date-picker>
</el-form-item>
<el-form-item label="访问结束时间" prop="VISIT_END_TIME">
<el-date-picker
v-model="reapplyForm.VISIT_END_TIME"
type="datetime"
placeholder="选择日期时间">
</el-date-picker>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="reapplyDialogCancelBtn">取 消</el-button>
<el-button type="primary" @click="reapplyDialogConfirmBtn">确 定</el-button>
</div>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
@ -186,11 +275,37 @@ import Pagination from '@/components/Pagination' // 通过 el-pagination二次
import { requestFN } from '@/utils/request' import { requestFN } from '@/utils/request'
import waves from '@/directive/waves' // waves directive import waves from '@/directive/waves' // waves directive
import SelectTree from '@/components/SelectTree' import SelectTree from '@/components/SelectTree'
import {log} from "nightwatch/lib/util/logger";
export default { export default {
components: { Pagination, SelectTree }, components: { Pagination, SelectTree },
directives: { waves }, directives: { waves },
data() { data() {
return { return {
rules: {
LICENCE_NO: [
{ required: true, message: '车牌号不能为空', trigger: 'blur' }
],
LICENCE_TYPE: [
{ required: true, message: '车牌类型不能为空', trigger: 'change' }
],
VEHICLE_TYPE: [
{ required: true, message: '车辆类型不能为空', trigger: 'change' }
],
DEPARTMENT_ID: [
{ required: true, message: '车辆所属部门不能为空', trigger: 'change' }
],
USER_ID: [
{ required: true, message: '负责人不能为空', trigger: 'change' }
],
VISIT_START_TIME: [
{ required: true, message: '访问起始时间不能为空', trigger: 'change' }
],
VISIT_END_TIME: [
{ required: true, message: '访问结束时间不能为空', trigger: 'change' }
]
},
remarkDialogVisible: false,
remarkText: '',
ISCHECK: false, ISCHECK: false,
userInfo: JSON.parse(sessionStorage.getItem('user')), userInfo: JSON.parse(sessionStorage.getItem('user')),
listLoading: true, listLoading: true,
@ -305,6 +420,18 @@ export default {
LICENCE_TYPE: null, // 车牌类型 LICENCE_TYPE: null, // 车牌类型
VEHICLE_TYPE: null // 车辆类型 VEHICLE_TYPE: null // 车辆类型
}, },
reapplyDialogVisible: false, // 控制重新申请对话框的显示
reapplyForm: { // 重新申请表单数据
LICENCE_NO: '',
LICENCE_TYPE: '',
VEHICLE_TYPE: '',
DEPARTMENT_ID: '',
USER_ID: '',
VISIT_START_TIME: '',
VISIT_END_TIME: '',
DEPT_NAME: '',
U_NAME: ''
},
addDialogVisible: false, // 添加弹窗的展示与不展示 addDialogVisible: false, // 添加弹窗的展示与不展示
editDialogVisible: false, // 编辑弹窗的展示与不展示 editDialogVisible: false, // 编辑弹窗的展示与不展示
detailDialogVisible: false, // 详情弹窗的展示与不展示 detailDialogVisible: false, // 详情弹窗的展示与不展示
@ -328,6 +455,13 @@ export default {
return '审核驳回' return '审核驳回'
} }
}, },
remark(row) {
this.remarkText = row.QY_REMARK || row.GA_REMARK; // 假设驳回原因存储在 row.REJECT_REASON 中
this.remarkDialogVisible = true; // 显示弹窗
},
handleRemarkClose() {
this.remarkDialogVisible = false; // 关闭弹窗
},
getRowKey(row) { getRowKey(row) {
return row.VEHICLE_ID return row.VEHICLE_ID
}, },
@ -491,24 +625,66 @@ export default {
this.addDialogVisible = false this.addDialogVisible = false
this.reSetAddDialog() this.reSetAddDialog()
}, },
addDialogConfirmBtn(){
requestFN( apply(row) {
'/mkmj/management/saveLongTimeCarInfo', this.reapplyForm = { ...row }; // 将当前行的数据复制到 reapplyForm
{ this.reapplyForm.DEPT_NAME = row.DEPT_NAME
CORPINFO_ID: JSON.parse(sessionStorage.getItem('user')).CORPINFO_ID, this.reapplyForm.U_NAME = row.U_NAME
DEPARTMENT_ID: this.addForm.DEPARTMENT_ID, this.reapplyDialogVisible = true; // 打开对话框
USER_ID: this.addForm.USER_ID, console.log(this.reapplyForm)
LICENCE_NO: this.addForm.LICENCE_NO, },
LICENCE_TYPE: this.addForm.LICENCE_TYPE, reapplyDialogCancelBtn() {
VEHICLE_TYPE: this.addForm.VEHICLE_TYPE, this.reapplyDialogVisible = false; // 关闭对话框
VISIT_START_TIME: this.addForm.VISIT_START_TIME, },
VISIT_END_TIME: this.addForm.VISIT_END_TIME, reapplyDialogConfirmBtn() {
CAR_FROM: '2' // 在这里处理重新申请的逻辑
this.$refs.reapplyForm.validate(valid => {
if (valid) {
requestFN(
'/mkmj/management/saveLongTimeCarInfo',
{
CORPINFO_ID: JSON.parse(sessionStorage.getItem('user')).CORPINFO_ID,
VEHICLE_DEPARTMENT_ID: this.reapplyForm.DEPARTMENT_ID,
USER_ID: this.reapplyForm.USER_ID,
LICENCE_NO: this.reapplyForm.LICENCE_NO,
LICENCE_TYPE: this.reapplyForm.LICENCE_TYPE,
VEHICLE_TYPE: this.reapplyForm.VEHICLE_TYPE,
VISIT_START_TIME: this.reapplyForm.VISIT_START_TIME,
VISIT_END_TIME: this.reapplyForm.VISIT_END_TIME,
CAR_FROM: '2'
}
).then((data) => {
this.reapplyDialogVisible = false; // 关闭对话框
this.getPageList()
}).catch((e) => {
})
}
});
},
addDialogConfirmBtn(){
this.$refs.addForm.validate(valid => {
if (valid){
requestFN(
'/mkmj/management/saveLongTimeCarInfo',
{
CORPINFO_ID: JSON.parse(sessionStorage.getItem('user')).CORPINFO_ID,
DEPARTMENT_ID: this.addForm.DEPARTMENT_ID,
USER_ID: this.addForm.USER_ID,
LICENCE_NO: this.addForm.LICENCE_NO,
LICENCE_TYPE: this.addForm.LICENCE_TYPE,
VEHICLE_TYPE: this.addForm.VEHICLE_TYPE,
VISIT_START_TIME: this.addForm.VISIT_START_TIME,
VISIT_END_TIME: this.addForm.VISIT_END_TIME,
CAR_FROM: '2'
}
).then((data) => {
this.addDialogVisible = false
this.getPageList()
}).catch((e) => {
})
}else {
return false
} }
).then((data) => {
this.addDialogVisible = false
this.getPageList()
}).catch((e) => {
}) })
} }
} }

5
src/views/firstLevelDoor/personPortInfo/PersonInfo/index.vue
View File

@ -1,5 +1,8 @@
<template> <template>
<component :is="activeName" /> <div>
<List v-show="activeName==='List'" ref="list" />
<recordsList v-if="activeName==='recordsList'"/>
</div>
</template> </template>
<script> <script>