diff --git a/src/views/firstLevelDoor/freightVehiclesPort/fleetFilingApplication/components/list.vue b/src/views/firstLevelDoor/freightVehiclesPort/fleetFilingApplication/components/list.vue
index b349c1e..60a8128 100644
--- a/src/views/firstLevelDoor/freightVehiclesPort/fleetFilingApplication/components/list.vue
+++ b/src/views/firstLevelDoor/freightVehiclesPort/fleetFilingApplication/components/list.vue
@@ -36,6 +36,11 @@
align="center"/>
+
+
+ {{ getAuditType(row.IS_AUDIT) }}
+
+
编辑
@@ -52,10 +57,10 @@
-
-
-
-
+
+
+
+
+
- 返回
+ 返回
@@ -385,6 +394,16 @@ export default{
this.listLoading = false
})
},
+ 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
+ }
+ },
goCheckLicenceNoAdd() {
if (this.addForm.LICENCE_NO) {
const regex = /^([京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z]{1}[A-Z]{1}[A-Z0-9]{4}[A-Z0-9挂学警港澳]{1})$/
@@ -495,8 +514,8 @@ export default{
})
},
goEdit(row){
- this.addForm.VEHICLE_ID = row.VEHICLE_ID
this.editDialogVisible = true
+ this.addForm = { ...row };
},
editDialogCancelBtn(){
this.editDialogVisible = false
@@ -521,9 +540,3 @@ export default{
}
-
diff --git a/src/views/firstLevelDoor/freightVehiclesPort/oprtApplication/components/carList.vue b/src/views/firstLevelDoor/freightVehiclesPort/oprtApplication/components/carList.vue
index b02d5ca..221668a 100644
--- a/src/views/firstLevelDoor/freightVehiclesPort/oprtApplication/components/carList.vue
+++ b/src/views/firstLevelDoor/freightVehiclesPort/oprtApplication/components/carList.vue
@@ -4,8 +4,8 @@
-
-
+
+
@@ -38,18 +38,30 @@
-
-
+
+
+ {{ translateLicenceType(row.LICENCE_TYPE) }}
+
+
+
+
+ {{ translateVehicleType(row.VEHICLE_TYPE) }}
+
+
- 待公安审批
- 待企业审批
- 企业审批通过
+ 待申请
+ 待公安审批
+ 待企业审批
+ 企业审批通过
+ 审批驳回
申请
+ 查看原因
+ 重新申请
@@ -120,6 +132,26 @@
+
+
+
+
+
+
+
+
+
+
@@ -137,6 +169,8 @@ export default{
page: 1,
limit: 10
},
+ remarkDialogVisible: false, // 控制驳回原因弹窗的显示
+ remarkText: '',
areaList: [], // 省市县列表
listLoading: true,
varList: [],
@@ -207,9 +241,9 @@ export default{
},
methods: {
getButton(row){
- if (row.IS_DANGEROUS_CAR === '0' && row.IS_AUDIT === '1'){
+ if (row.IS_DANGEROUS_CAR === '0' && row.IS_AUDIT === '1' && row.QY_AUDITOR == null){
return true
- }else if (row.IS_DANGEROUS_CAR === '1' && row.IS_AUDIT === '0'){
+ }else if (row.IS_DANGEROUS_CAR === '1' && row.IS_AUDIT === '0' && row.GA_AUDITOR == null){
return true
}else {
return false
@@ -220,18 +254,26 @@ export default{
this.$refs.multipleTable.clearSelection()
this.getList()
},
+ remark(row) {
+ this.remarkText = row.QY_REMARK || row.GA_REMARK; // 假设驳回原因存储在 row.REJECT_REASON 中
+ this.remarkDialogVisible = true; // 显示弹窗
+ },
+ handleRemarkClose() {
+ this.remarkDialogVisible = false; // 关闭弹窗
+ },
+ 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
+ }
+ },
// 重置
reset() {
- this.form = {
- USER_NAME: '',
- PHONE: '',
- ID_CARD: '',
- CORPINFO_NAME: '',
- DEPARTMENT_NAME: '',
- VISIT_START_TIME: '',
- VISIT_END_TIME: '',
- DOOR_NAME: ''
- }
+ this.form.LICENCE_NO = ''
this.getList()
},
// 获取列表
diff --git a/src/views/firstLevelDoor/longCarPort/CarInfo/components/list.vue b/src/views/firstLevelDoor/longCarPort/CarInfo/components/list.vue
index 596870e..ca39520 100644
--- a/src/views/firstLevelDoor/longCarPort/CarInfo/components/list.vue
+++ b/src/views/firstLevelDoor/longCarPort/CarInfo/components/list.vue
@@ -19,7 +19,7 @@
-
+
-
+
+
+
+
+
+
@@ -79,9 +90,16 @@
-
+
+
+
- 车辆进出记录
+ {{ getAuditType(row.IS_AUDIT) }}
+
+
+
+
+ 车辆进出记录
@@ -119,17 +137,15 @@
style="width: 300px"/>
-
-
-
-
+ placeholder="请选择车辆所属部门"
+ style="width: 300px"
+ @change="handleCorpChange"/>
+
+
+
+
+
+
+
+