From 9cf6960c4fe099f0e0f2388d3fca775e176d830a Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Thu, 26 Aug 2021 10:20:53 +0800
Subject: [PATCH] 跨区域
---
src/views/home/index.vue | 23 ++++++-----
src/views/home/column.js | 12 +++++-
src/components/Approval/Approval.vue | 38 ++++++++++++-------
3 files changed, 47 insertions(+), 26 deletions(-)
diff --git a/src/components/Approval/Approval.vue b/src/components/Approval/Approval.vue
index 159a348..12e78fd 100644
--- a/src/components/Approval/Approval.vue
+++ b/src/components/Approval/Approval.vue
@@ -187,20 +187,30 @@
Object.assign(params, this.query)
).then((ress) => {
this.data = this.data.concat(ress.data.data.records);
- });
- getListrek(
- page.currentPage,
- page.pageSize,
- Object.assign(params, this.query)
- ).then((resk) => {
- this.data = this.data.concat(resk.data.data.records);
- });
- getListrev(
- page.currentPage,
- page.pageSize,
- Object.assign(params, this.query)
- ).then((resv) => {
- this.data = this.data.concat(resv.data.data.records);
+ getListrek(
+ page.currentPage,
+ page.pageSize,
+ Object.assign(params, this.query)
+ ).then((resk) => {
+ this.data = this.data.concat(resk.data.data.records);
+ getListrev(
+ page.currentPage,
+ page.pageSize,
+ Object.assign(params, this.query)
+ ).then((resv) => {
+ this.data = this.data.concat(resv.data.data.records);
+ // console.log(this.data);
+ if (this.data.length == 0) {
+ this.$store.commit("changecanDoIt", true);
+ } else {
+ if (this.data[0].type == 0 || this.data[0].type == 2) {
+ this.$store.commit("changecanDoIt", false);
+ } else {
+ this.$store.commit("changecanDoIt", true);
+ }
+ }
+ });
+ });
});
});
},
diff --git a/src/views/home/column.js b/src/views/home/column.js
index 832c702..a2eddda 100644
--- a/src/views/home/column.js
+++ b/src/views/home/column.js
@@ -271,6 +271,14 @@
columnU.push(column[k]);
}
+var columnXIAQU = [];
+for (var k in column) {
+ if (column[k].prop == 'jurisdiction') {
+ continue;
+ }
+ columnXIAQU.push(column[k]);
+}
+
export var securityPermitcolumn = [//保安服务许可申请
...columnU
]
@@ -292,7 +300,7 @@
export var cancellationOfFilingcolumn = [//自招保安单位备案撤销
- ...column, {
+ ...columnU, {
label: "撤销原因",
prop: "reason",
labelWidth: 160,
@@ -310,5 +318,5 @@
export var crossRegioncolumn = [//跨区域经营备案
- ...column
+ ...columnXIAQU
]
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 3d57c30..053f03f 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -78,6 +78,11 @@
dataCard: [],
out: true,
d: [],
+ page: {
+ pageSize: 10,
+ currentPage: 1,
+ total: 0,
+ },
};
},
computed: {
@@ -85,12 +90,7 @@
},
created() {
this.cc();
- var page = {
- pageSize: 10,
- currentPage: 1,
- total: 0,
- };
- this.onLoad(page);
+ this.onLoad(this.page);
this.dataCard = ourDatas;
},
methods: {
@@ -106,15 +106,15 @@
getListrev(page.currentPage, page.pageSize, params).then((resv) => {
this.data = this.data.concat(resv.data.data.records);
console.log("已有申请数量", this.data.length);
- if (this.data.length >= 1) {
- // this.$store.commit("changehandle", false);
+ if (this.data.length == 0) {
+ this.$store.commit("changecanDoIt", true);
} else {
- // this.$store.commit("changehandle", true);
+ this.$store.commit("changecanDoIt", false);
}
this.showCard = true;
this.data.forEach((item) => {
for (const key in this.dataCard) {
- if (this.dataCard[key].type == item.ptype) {
+ if (this.dataCard[key].ptype == item.ptype) {
console.log("已申请名称", this.dataCard[key].menuName);
console.log("申请状态", this.dataCard[key].type);
if (
@@ -122,6 +122,8 @@
this.dataCard[key].type == 2
) {
this.$store.commit("changecanDoIt", false);
+ } else {
+ this.$store.commit("changecanDoIt", true);
}
}
}
@@ -161,6 +163,7 @@
this.$store.commit("doitApprovalShow", true);
return;
}
+ this.onLoad(this.page);
this.$store.commit("changeuseWhere", val);
},
},
--
Gitblit v1.9.3