From 5a3ace296c010b5c11501dedf252e1c144cda9e2 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Mon, 06 Dec 2021 13:55:01 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhba_enterprises_ys
---
src/views/licenseApproval/securityGuard.vue | 55 +++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 41 insertions(+), 14 deletions(-)
diff --git a/src/views/licenseApproval/securityGuard.vue b/src/views/licenseApproval/securityGuard.vue
index 3766bff..fa9ef35 100644
--- a/src/views/licenseApproval/securityGuard.vue
+++ b/src/views/licenseApproval/securityGuard.vue
@@ -2,7 +2,7 @@
* @Author: liu
* @Date: 2021-08-26 16:57:58
* @Last Modified by: liu
- * @Last Modified time: 2021-09-23 16:14:20
+ * @Last Modified time: 2021-11-24 11:03:19
*/
@@ -97,15 +97,11 @@
<template class="tdtype" slot-scope="{ row }" slot="type">
<el-tag class="dtype">
{{
- row.stateOur == "1"
- ? "通过"
- : row.stateOur == "2"
- ? "不通过"
- : "待审核"
+ row.type == "0" ? "通过" : row.type == "1" ? "不通过" : "待审核"
}}
- <i class="gz" v-if="row.stateOur == '0'"></i>
- <i class="yj" v-if="row.stateOur == '2'"></i>
- <i class="zc" v-if="row.stateOur == '1'"></i>
+ <i class="gz" v-if="row.type == '2'"></i>
+ <i class="yj" v-if="row.type == '1'"></i>
+ <i class="zc" v-if="row.type == '0'"></i>
</el-tag>
</template>
</avue-crud>
@@ -539,22 +535,52 @@
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"] = 3;
+ var gonganj = "";
+ if (this.userInfo.role_name == "公安管理员") {
+ let test = /派出所$/g;
+ if (test.test(this.userInfo.list.name)) {
+ gonganj = "派出所管理员";
+ }
+ test = /分局|公安局$/g;
+ if (test.test(this.userInfo.list.name)) {
+ gonganj = "县局管理员";
+ }
+ test = /市公安局$/g;
+ if (test.test(this.userInfo.list.name)) {
+ gonganj = "市局管理员";
+ }
+ }
params = {
...params,
- ...this.getFenji(this.userInfo.role_name),
+ ...this.getFenji(gonganj),
};
console.log(params, "params");
// return;
@@ -567,9 +593,10 @@
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);
this.loading = false;
this.selectionClear();
});
--
Gitblit v1.9.3