From 4a800a8fc83c6bd1f86a8e847b079a51a7532c09 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期三, 20 七月 2022 15:05:58 +0800
Subject: [PATCH] 修复国标配置的bug
---
src/pages/library/components/carList.vue | 32 ++++++++++++++++++++++++--------
1 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/src/pages/library/components/carList.vue b/src/pages/library/components/carList.vue
index a30dfb2..7be0a09 100644
--- a/src/pages/library/components/carList.vue
+++ b/src/pages/library/components/carList.vue
@@ -579,7 +579,7 @@
class="inputWidth"
>
<el-option
- v-for="item in VideoPhotoData.dictionary.CARTYPE"
+ v-for="item in dictionary.nVehicleType"
:key="item.value"
:label="item.name"
:value="item.value"
@@ -593,7 +593,7 @@
class="inputWidth"
>
<el-option
- v-for="item in VideoPhotoData.dictionary.BRAND"
+ v-for="item in dictionary.nVehicleBrand"
:key="item.value"
:label="item.name"
:value="item.value"
@@ -607,7 +607,7 @@
class="inputWidth"
>
<el-option
- v-for="item in VideoPhotoData.dictionary.nColor"
+ v-for="item in dictionary.nVehicleColor"
:key="item.value"
:label="item.name"
:value="item.value"
@@ -708,6 +708,7 @@
updateDbTableStatus,
deleteDbPersonById,
deleteDBtablesById,
+ dicByType,
} from "@/api/baseLibrary";
import axios from "axios";
import fTemplate from "@/components/fTemplate";
@@ -758,10 +759,12 @@
} else {
var result = false;
if (value.length === 7) {
- var express = /^[浜触娌笣鍐�璞簯杈介粦婀樼殩椴佹柊鑻忔禉璧ｉ剛妗傜敇鏅嬭挋闄曞悏闂借吹绮ら潚钘忓窛瀹佺惣浣块A-Z]{1}[A-Z]{1}[A-Z0-9]{4}[A-Z0-9鎸傚璀︽腐婢砞{1}$/;
+ var express =
+ /^[浜触娌笣鍐�璞簯杈介粦婀樼殩椴佹柊鑻忔禉璧ｉ剛妗傜敇鏅嬭挋闄曞悏闂借吹绮ら潚钘忓窛瀹佺惣浣块A-Z]{1}[A-Z]{1}[A-Z0-9]{4}[A-Z0-9鎸傚璀︽腐婢砞{1}$/;
result = express.test(value);
} else if (value.length === 8) {
- var express2 = /^[浜触娌笣鍐�璞簯杈介粦婀樼殩椴佹柊鑻忔禉璧ｉ剛妗傜敇鏅嬭挋闄曞悏闂借吹绮ら潚钘忓窛瀹佺惣浣块A-Z]{1}[A-Z]{1}[A-Z0-9]{5}[A-Z0-9鎸傚璀︽腐婢砞{1}$/;
+ var express2 =
+ /^[浜触娌笣鍐�璞簯杈介粦婀樼殩椴佹柊鑻忔禉璧ｉ剛妗傜敇鏅嬭挋闄曞悏闂借吹绮ら潚钘忓窛瀹佺惣浣块A-Z]{1}[A-Z]{1}[A-Z0-9]{5}[A-Z0-9鎸傚璀︽腐婢砞{1}$/;
result = express2.test(value);
}
if (result) {
@@ -842,6 +845,7 @@
noFaceList: [],
},
delBtnLoading: false,
+ dictionary: {},
};
},
watch: {
@@ -851,6 +855,9 @@
"BaseManageData.selectWhites": function (value) {
this.blackAngWhite();
},
+ },
+ created() {
+ this.dicByType();
},
mounted() {
this.getCarList();
@@ -879,10 +886,12 @@
checkCarNo(value) {
var result = false;
if (value.length === 7) {
- var express = /^[浜触娌笣鍐�璞簯杈介粦婀樼殩椴佹柊鑻忔禉璧ｉ剛妗傜敇鏅嬭挋闄曞悏闂借吹绮ら潚钘忓窛瀹佺惣浣块A-Z]{1}[A-Z]{1}[A-Z0-9]{4}[A-Z0-9鎸傚璀︽腐婢砞{1}$/;
+ var express =
+ /^[浜触娌笣鍐�璞簯杈介粦婀樼殩椴佹柊鑻忔禉璧ｉ剛妗傜敇鏅嬭挋闄曞悏闂借吹绮ら潚钘忓窛瀹佺惣浣块A-Z]{1}[A-Z]{1}[A-Z0-9]{4}[A-Z0-9鎸傚璀︽腐婢砞{1}$/;
result = express.test(value);
} else if (value.length === 8) {
- var express2 = /^[浜触娌笣鍐�璞簯杈介粦婀樼殩椴佹柊鑻忔禉璧ｉ剛妗傜敇鏅嬭挋闄曞悏闂借吹绮ら潚钘忓窛瀹佺惣浣块A-Z]{1}[A-Z]{1}[A-Z0-9]{5}[A-Z0-9鎸傚璀︽腐婢砞{1}$/;
+ var express2 =
+ /^[浜触娌笣鍐�璞簯杈介粦婀樼殩椴佹柊鑻忔禉璧ｉ剛妗傜敇鏅嬭挋闄曞悏闂借吹绮ら潚钘忓窛瀹佺惣浣块A-Z]{1}[A-Z]{1}[A-Z0-9]{5}[A-Z0-9鎸傚璀︽腐婢砞{1}$/;
result = express2.test(value);
}
return result;
@@ -899,6 +908,12 @@
this.delBtnLoading = false;
this.askDeleteShow = false;
+ },
+ async dicByType() {
+ const res = await dicByType();
+ if (res && res.success) {
+ this.dictionary = res.data;
+ }
},
deleteBase() {
deleteDBtablesById({ id: this.baseObject.id })
@@ -1291,7 +1306,8 @@
},
async platesBatch() {
var temp = this.plates.split(/[\n,]/g);
- var reg = /[浜触娌笣鍐�璞簯杈介粦婀樼殩椴佹柊鑻忔禉璧ｉ剛妗傜敇鏅嬭挋闄曞悏闂借吹绮ら潚钘忓窛瀹佺惣浣块]{1}[A-Z]{1}[A-Z0-9]{5,6}/;
+ var reg =
+ /[浜触娌笣鍐�璞簯杈介粦婀樼殩椴佹柊鑻忔禉璧ｉ剛妗傜敇鏅嬭挋闄曞悏闂借吹绮ら潚钘忓窛瀹佺惣浣块]{1}[A-Z]{1}[A-Z0-9]{5,6}/;
for (let i = 0; i < temp.length; i++) {
if (temp[i] == "") {
temp.splice(i, 1);
--
Gitblit v1.8.0