Compare commits
3 Commits
2970dca3e0
...
prod-26-05
| Author | SHA1 | Date | |
|---|---|---|---|
| 564a8b7199 | |||
| c55f6b4045 | |||
| 0b4127a0e2 |
@@ -202,14 +202,15 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
async mounted() {
|
async mounted() {
|
||||||
|
const urlParams = new URLSearchParams(window.location.search);
|
||||||
const lastRoute = localStorage.getItem('lastRoute');
|
const lastRoute = localStorage.getItem('lastRoute');
|
||||||
if (lastRoute) {
|
this.id = this.$route.query.id || urlParams.get('id');
|
||||||
|
if (lastRoute && !this.id) {
|
||||||
const { name, query } = JSON.parse(lastRoute);
|
const { name, query } = JSON.parse(lastRoute);
|
||||||
this.$router.replace({ name, query });
|
this.$router.replace({ name, query });
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
const urlParams = new URLSearchParams(window.location.search);
|
|
||||||
this.id = this.$route.query.id || urlParams.get('id');
|
|
||||||
await this.getAreaTree();
|
await this.getAreaTree();
|
||||||
if(this.id) {
|
if(this.id) {
|
||||||
await this.getInfoHandler();
|
await this.getInfoHandler();
|
||||||
|
|||||||
@@ -287,10 +287,10 @@
|
|||||||
if(!res.data.ocrInvoiceRes.data.sellerName.startsWith("国家税务总局") &&
|
if(!res.data.ocrInvoiceRes.data.sellerName.startsWith("国家税务总局") &&
|
||||||
conList.every(a => {
|
conList.every(a => {
|
||||||
let items = a.itemName.split("*")
|
let items = a.itemName.split("*")
|
||||||
return (!items[1].includes("现代服务") && !items[1].includes("运输服务")) || (!items[2].includes("拖车") && !items[2].includes("救援") && !items[2].includes("施救") && !items[2].includes("清障") && !items[2].includes("道路救援"))
|
return (!items[1].includes("生产生活服务") && !items[1].includes("交通运输服务")) || (!items[2].includes("拖车") && !items[2].includes("救援") && !items[2].includes("施救") && !items[2].includes("清障") && !items[2].includes("道路救援"))
|
||||||
})
|
})
|
||||||
){
|
){
|
||||||
errorStr = errorStr + "分类必须包含:现代服务/运输服务,服务名称必须包含:拖车/救援/施救/清障/道路救援 ;例如《*现代服务*拖车费》";
|
errorStr = errorStr + "分类必须包含:生产生活服务/交通运输服务,服务名称必须包含:拖车/救援/施救/清障/道路救援 ;例如《*现代服务*拖车费》";
|
||||||
}
|
}
|
||||||
|
|
||||||
if( !flag ) {
|
if( !flag ) {
|
||||||
|
|||||||
Reference in New Issue
Block a user