From 6c0ceb8f4245ce2de4dccc506da50f09ed4df748 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Thu, 02 Dec 2021 17:07:50 +0800
Subject: [PATCH] +
---
src/views/licenseApproval/securityTraining.vue | 25 ++++++-
src/views/licenseApproval/securityGuard.vue | 23 ++++++-
src/views/licenseApproval/securityPermit.vue | 27 +++++++--
src/views/licenseApproval/crossRegion.vue | 25 ++++++-
src/views/licenseApproval/branchOffice.vue | 23 ++++++-
5 files changed, 99 insertions(+), 24 deletions(-)
diff --git a/src/views/licenseApproval/branchOffice.vue b/src/views/licenseApproval/branchOffice.vue
index 61aef4b..8222507 100644
--- a/src/views/licenseApproval/branchOffice.vue
+++ b/src/views/licenseApproval/branchOffice.vue
@@ -475,13 +475,28 @@
var b = data;
if (this.user_name == "派") {
// 派出所审批
- b["stateOur"] = b.papprove == "0" ? "0" : b.papprove == "1" ? "1" : "2";
+ b["stateOur"] =
+ b.papprove == "0" || b.papprove == ""
+ ? "0"
+ : b.papprove == "1"
+ ? "1"
+ : "2";
} else if (this.user_name == "县") {
// 分局审批
- b["stateOur"] = b.xapprove == "0" ? "0" : b.xapprove == "1" ? "1" : "2";
+ b["stateOur"] =
+ b.xapprove == "0" || b.xapprove == ""
+ ? "0"
+ : b.xapprove == "1"
+ ? "1"
+ : "2";
} else if (this.user_name == "市") {
// 市局审批
- b["stateOur"] = b.sapprove == "0" ? "0" : b.sapprove == "1" ? "1" : "2";
+ b["stateOur"] =
+ b.sapprove == "0" || b.sapprove == ""
+ ? "0"
+ : b.sapprove == "1"
+ ? "1"
+ : "2";
}
return b;
},
@@ -516,7 +531,7 @@
this.page.total = data.total;
this.data = data.records;
for (var k in this.data) {
- console.log(this.changeState(this.data[k]));
+ //console.log(this.changeState(this.data[k]));
this.data[k] = this.changeState(this.data[k]);
}
this.loading = false;
diff --git a/src/views/licenseApproval/crossRegion.vue b/src/views/licenseApproval/crossRegion.vue
index 2c094cd..8c6774f 100644
--- a/src/views/licenseApproval/crossRegion.vue
+++ b/src/views/licenseApproval/crossRegion.vue
@@ -473,20 +473,35 @@
var b = data;
if (this.user_name == "派") {
// 派出所审批
- b["stateOur"] = b.papprove == "0" ? "0" : b.papprove == "1" ? "1" : "2";
+ b["stateOur"] =
+ b.papprove == "0" || b.papprove == ""
+ ? "0"
+ : b.papprove == "1"
+ ? "1"
+ : "2";
} else if (this.user_name == "县") {
// 分局审批
- b["stateOur"] = b.xapprove == "0" ? "0" : b.xapprove == "1" ? "1" : "2";
+ b["stateOur"] =
+ b.xapprove == "0" || b.xapprove == ""
+ ? "0"
+ : b.xapprove == "1"
+ ? "1"
+ : "2";
} else if (this.user_name == "市") {
// 市局审批
- b["stateOur"] = b.sapprove == "0" ? "0" : b.sapprove == "1" ? "1" : "2";
+ b["stateOur"] =
+ b.sapprove == "0" || b.sapprove == ""
+ ? "0"
+ : b.sapprove == "1"
+ ? "1"
+ : "2";
}
return b;
},
onLoad(page, params = {}) {
this.loading = true;
params["ptype"] = 5;
- var gonganj = "";
+ var gonganj = "";
if (this.userInfo.role_name == "公安管理员") {
let test = /派出所$/g;
if (test.test(this.userInfo.list.name)) {
@@ -514,7 +529,7 @@
this.page.total = data.total;
this.data = data.records;
for (var k in this.data) {
- console.log(this.changeState(this.data[k]));
+ //console.log(this.changeState(this.data[k]));
this.data[k] = this.changeState(this.data[k]);
}
this.loading = false;
diff --git a/src/views/licenseApproval/securityGuard.vue b/src/views/licenseApproval/securityGuard.vue
index f75ce7c..fa9ef35 100644
--- a/src/views/licenseApproval/securityGuard.vue
+++ b/src/views/licenseApproval/securityGuard.vue
@@ -535,13 +535,28 @@
var b = data;
if (this.user_name == "派") {
// 派出所审批
- b["stateOur"] = b.papprove == "0" ? "0" : b.papprove == "1" ? "1" : "2";
+ b["stateOur"] =
+ b.papprove == "0" || b.papprove == ""
+ ? "0"
+ : b.papprove == "1"
+ ? "1"
+ : "2";
} else if (this.user_name == "县") {
// 分局审批
- b["stateOur"] = b.xapprove == "0" ? "0" : b.xapprove == "1" ? "1" : "2";
+ b["stateOur"] =
+ b.xapprove == "0" || b.xapprove == ""
+ ? "0"
+ : b.xapprove == "1"
+ ? "1"
+ : "2";
} else if (this.user_name == "市") {
// 市局审批
- b["stateOur"] = b.sapprove == "0" ? "0" : b.sapprove == "1" ? "1" : "2";
+ b["stateOur"] =
+ b.sapprove == "0" || b.sapprove == ""
+ ? "0"
+ : b.sapprove == "1"
+ ? "1"
+ : "2";
}
return b;
},
@@ -578,7 +593,7 @@
this.page.total = data.total;
this.data = data.records;
for (var k in this.data) {
- console.log(this.changeState(this.data[k]));
+ //console.log(this.changeState(this.data[k]));
this.data[k] = this.changeState(this.data[k]);
}
console.log(this.data);
diff --git a/src/views/licenseApproval/securityPermit.vue b/src/views/licenseApproval/securityPermit.vue
index 4727f12..2f668da 100644
--- a/src/views/licenseApproval/securityPermit.vue
+++ b/src/views/licenseApproval/securityPermit.vue
@@ -3,7 +3,7 @@
* @Author: liu
* @Date: 2021-08-26 16:22:20
* @Last Modified by: liu
- * @Last Modified time: 2021-09-23 15:57:13
+ * @Last Modified time: 2021-12-02 17:01:15
*/
<template>
@@ -470,20 +470,35 @@
var b = data;
if (this.user_name == "派") {
// 派出所审批
- b["stateOur"] = b.papprove == "0" ? "0" : b.papprove == "1" ? "1" : "2";
+ b["stateOur"] =
+ b.papprove == "0" || b.papprove == ""
+ ? "0"
+ : b.papprove == "1"
+ ? "1"
+ : "2";
} else if (this.user_name == "县") {
// 分局审批
- b["stateOur"] = b.xapprove == "0" ? "0" : b.xapprove == "1" ? "1" : "2";
+ b["stateOur"] =
+ b.xapprove == "0" || b.xapprove == ""
+ ? "0"
+ : b.xapprove == "1"
+ ? "1"
+ : "2";
} else if (this.user_name == "市") {
// 市局审批
- b["stateOur"] = b.sapprove == "0" ? "0" : b.sapprove == "1" ? "1" : "2";
+ b["stateOur"] =
+ b.sapprove == "0" || b.sapprove == ""
+ ? "0"
+ : b.sapprove == "1"
+ ? "1"
+ : "2";
}
return b;
},
onLoad(page, params = {}) {
this.loading = true;
params["ptype"] = 0;
- var gonganj = "";
+ var gonganj = "";
if (this.userInfo.role_name == "公安管理员") {
let test = /派出所$/g;
if (test.test(this.userInfo.list.name)) {
@@ -511,7 +526,7 @@
this.page.total = data.total;
this.data = data.records;
for (var k in this.data) {
- console.log(this.changeState(this.data[k]));
+ //console.log(this.changeState(this.data[k]));
this.data[k] = this.changeState(this.data[k]);
}
this.loading = false;
diff --git a/src/views/licenseApproval/securityTraining.vue b/src/views/licenseApproval/securityTraining.vue
index 48cc9bb..9584cfe 100644
--- a/src/views/licenseApproval/securityTraining.vue
+++ b/src/views/licenseApproval/securityTraining.vue
@@ -470,20 +470,35 @@
var b = data;
if (this.user_name == "派") {
// 派出所审批
- b["stateOur"] = b.papprove == "0" ? "0" : b.papprove == "1" ? "1" : "2";
+ b["stateOur"] =
+ b.papprove == "0" || b.papprove == ""
+ ? "0"
+ : b.papprove == "1"
+ ? "1"
+ : "2";
} else if (this.user_name == "县") {
// 分局审批
- b["stateOur"] = b.xapprove == "0" ? "0" : b.xapprove == "1" ? "1" : "2";
+ b["stateOur"] =
+ b.xapprove == "0" || b.xapprove == ""
+ ? "0"
+ : b.xapprove == "1"
+ ? "1"
+ : "2";
} else if (this.user_name == "市") {
// 市局审批
- b["stateOur"] = b.sapprove == "0" ? "0" : b.sapprove == "1" ? "1" : "2";
+ b["stateOur"] =
+ b.sapprove == "0" || b.sapprove == ""
+ ? "0"
+ : b.sapprove == "1"
+ ? "1"
+ : "2";
}
return b;
},
onLoad(page, params = {}) {
this.loading = true;
params["ptype"] = 1;
- var gonganj = "";
+ var gonganj = "";
if (this.userInfo.role_name == "公安管理员") {
let test = /派出所$/g;
if (test.test(this.userInfo.list.name)) {
@@ -511,7 +526,7 @@
this.page.total = data.total;
this.data = data.records;
for (var k in this.data) {
- console.log(this.changeState(this.data[k]));
+ //console.log(this.changeState(this.data[k]));
this.data[k] = this.changeState(this.data[k]);
}
this.loading = false;
--
Gitblit v1.9.3