From 8bdc4ce33eda5a8c72eb7b1fee8c7347e77c856f Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Fri, 24 Sep 2021 16:30:54 +0800
Subject: [PATCH] 公司管理进入用户权限
---
src/api/system/user.js | 11
src/views/licenseApproval/cancellationOfFiling.vue | 304 -----
src/views/licenseApproval/securityTraining.vue | 473 ++------
src/api/licenseApproval/recordk.js | 2
src/views/licenseApproval/column.js | 286 +++++
src/views/licenseApproval/securityGuard.vue | 492 ++------
src/views/licenseApproval/securityPermit.vue | 474 ++------
src/api/licenseApproval/revoke.js | 2
src/views/system/user.vue | 46
src/views/licenseApproval/crossRegion.vue | 475 ++------
src/views/licenseApproval/branchOffice.vue | 477 ++------
11 files changed, 993 insertions(+), 2,049 deletions(-)
diff --git a/src/api/licenseApproval/recordk.js b/src/api/licenseApproval/recordk.js
index e7fe5c0..7e96ed3 100644
--- a/src/api/licenseApproval/recordk.js
+++ b/src/api/licenseApproval/recordk.js
@@ -42,7 +42,7 @@
export const update = (row) => {
return request({
- url: '/api/recordk/submit',
+ url: '/api/recordk/update',
method: 'post',
data: row
})
diff --git a/src/api/licenseApproval/revoke.js b/src/api/licenseApproval/revoke.js
index a268a64..f86e90e 100644
--- a/src/api/licenseApproval/revoke.js
+++ b/src/api/licenseApproval/revoke.js
@@ -42,7 +42,7 @@
export const update = (row) => {
return request({
- url: '/api/revoke/submit',
+ url: '/api/revoke/update',
method: 'post',
data: row
})
diff --git a/src/api/system/user.js b/src/api/system/user.js
index 0c21d46..4762d5e 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -1,5 +1,16 @@
import request from '@/router/axios';
+export const getJurisdiction = (params) => {
+ return request({
+ url: '/api/jurisdiction/selJur',
+ method: 'get',
+ params: {
+ ...params
+ }
+ })
+}
+
+
export const getList = (current, size, params, deptId) => {
return request({
url: '/api/blade-user/page',
diff --git a/src/views/licenseApproval/branchOffice.vue b/src/views/licenseApproval/branchOffice.vue
index 4e06ea6..5d195dc 100644
--- a/src/views/licenseApproval/branchOffice.vue
+++ b/src/views/licenseApproval/branchOffice.vue
@@ -2,7 +2,7 @@
* @Author: liu
* @Date: 2021-08-26 17:00:55
* @Last Modified by: liu
- * @Last Modified time: 2021-09-11 16:36:08
+ * @Last Modified time: 2021-09-23 16:43:42
*/
@@ -54,7 +54,7 @@
icon="el-icon-edit"
:size="size"
:type="type"
- v-if="row.type == '2'"
+ v-if="row.stateOur == '0'"
@click.stop="rowDel(row)"
>备案审批
</el-button>
@@ -62,23 +62,51 @@
icon="el-icon-edit"
:size="size"
:type="type"
+ v-if="row.stateOur != '0'"
+ @click.stop="rowSee(row)"
+ >审批查询
+ </el-button>
+ <el-button
+ icon="el-icon-edit"
+ :size="size"
+ :type="type"
@click.stop="viewLicense(row)"
- v-if="row.type == '0'"
+ v-if="
+ row.papprove == '1' && row.xapprove == '1' && row.sapprove == '1'
+ "
>打印备案证
</el-button>
</template>
<template class="tdtype" slot-scope="{ row }" slot="type">
<el-tag class="dtype">
{{
- row.type == "0" ? "通过" : row.type == "1" ? "不通过" : "待审批"
+ row.stateOur == "1"
+ ? "通过"
+ : row.stateOur == "2"
+ ? "不通过"
+ : "待审核"
}}
- <i class="gz" v-if="row.type == '0'"></i>
- <i class="yj" v-if="row.type == '1'"></i>
- <i class="zc" v-if="row.type == '2'"></i>
+ <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>
</el-tag>
</template>
</avue-crud>
</basic-container>
+
+ <el-dialog
+ title=""
+ :visible.sync="dialogVisibleccsee"
+ width="30%"
+ :modal-append-to-body="false"
+ >
+ <div class="flots">
+ <div class="f_title">
+ 审批 {{ stateOur == "1" ? "通过" : stateOur == "2" ? "不通过" : "" }}
+ </div>
+ <div><span>审批意见：</span> {{ stateText }}</div>
+ </div>
+ </el-dialog>
<div
v-if="dialogVisible"
@@ -167,6 +195,7 @@
remove,
} from "@/api/licenseApproval/record";
import { mapGetters } from "vuex";
+import { column } from "./column";
export default {
data() {
@@ -210,331 +239,14 @@
viewBtn: true,
selection: true,
dialogClickModal: false,
- column: [
- {
- label: "企业名称",
- search: true,
- prop: "enterprisename",
- searchLabelWidth: 80,
- searchSpan: 4,
- overHidden: true,
- width: 250,
- rules: [
- {
- required: true,
- message: "请输入企业名称",
- trigger: "blur",
- },
- ],
- },
- {
- label: "社会信用代码",
- prop: "creditcode",
- hide: true,
- rules: [
- {
- required: true,
- message: "请输入统一社会信用代码",
- trigger: "blur",
- },
- ],
- },
- {
- label: "法定代表人",
- prop: "representative",
- searchLabelWidth: 90,
- search: true,
- width: 82,
- rules: [
- {
- required: true,
- message: "请输入法定代表人",
- trigger: "blur",
- },
- ],
- },
- {
- label: "法定代表人电话",
- width: 106,
- prop: "representativecell",
- rules: [
- {
- required: true,
- message: "请输入法定代表人电话",
- trigger: "blur",
- },
- ],
- },
- {
- label: "联系人",
- prop: "contacts",
- width: 58,
- rules: [
- {
- required: true,
- message: "请输入联系人",
- trigger: "blur",
- },
- ],
- },
- {
- label: "联系人电话",
- width: 96,
- prop: "contactscell",
- rules: [
- {
- required: true,
- message: "请输入联系人电话",
- trigger: "blur",
- },
- ],
- },
- {
- label: "单位许可证编号",
- prop: "perid",
- // labelWidth: 160,
- // span: 12,
- hide: true,
- rules: [
- {
- required: true,
- message: "单位许可证编号",
- trigger: "blur",
- },
- ],
- },
- {
- label: "许可证发证机关",
- prop: "offices",
- // labelWidth: 160,
- // span: 12,
- hide: true,
- rules: [
- {
- required: true,
- message: "许可证发证机关",
- trigger: "blur",
- },
- ],
- },
- {
- label: "发证时间",
- prop: "officetime",
- // labelWidth: 160,
- // span: 12,
- hide: true,
- type: "date",
- format: "yyyy-MM-dd",
- valueFormat: "yyyy-MM-dd",
- },
- {
- label: "注册时间",
- hide: true,
- prop: "establishtime",
- type: "date",
- format: "yyyy-MM-dd",
- valueFormat: "yyyy-MM-dd",
- rules: [
- {
- required: true,
- message: "请输入注册时间",
- trigger: "blur",
- },
- ],
- },
- {
- label: "注册资本",
- prop: "registeredcapital",
- rules: [
- {
- required: true,
- message: "请输入注册资本",
- trigger: "blur",
- },
- ],
- },
- {
- label: "组织机构代码",
- prop: "organizationcode",
- hide: true,
- rules: [
- {
- required: true,
- message: "请输入组织机构代码",
- trigger: "blur",
- },
- ],
- },
- {
- label: "工商注册号",
- hide: true,
- prop: "registrationnumber",
- rules: [
- {
- required: true,
- message: "请输入工商注册号",
- trigger: "blur",
- },
- ],
- },
- // {
- // label: "纳税人识别号",
- // prop: "identificationnumber",
- // hide: true,
- // rules: [
- // {
- // required: true,
- // message: "请输入纳税人识别号",
- // trigger: "blur",
- // },
- // ],
- // },
- // {
- // label: "企业类型",
- // hide: true,
- // prop: "enterprises",
- // rules: [
- // {
- // required: true,
- // message: "请输入企业类型",
- // trigger: "blur",
- // },
- // ],
- // },
- {
- label: "注册地址",
- prop: "address",
- overHidden: true,
- rules: [
- {
- required: true,
- message: "请输入注册地址",
- trigger: "blur",
- },
- ],
- },
- // {
- // label: "所属辖区",
- // hide: true,
- // prop: "region",
- // rules: [
- // {
- // required: true,
- // message: "请输入所属辖区",
- // trigger: "blur",
- // },
- // ],
- // },
- {
- label: "登记机关",
- prop: "registration",
- overHidden: true,
- rules: [
- {
- required: true,
- message: "请输入登记机关",
- trigger: "blur",
- },
- ],
- },
- {
- label: "所属行业",
- hide: true,
- prop: "industry",
- rules: [
- {
- required: true,
- message: "请输入所属行业",
- trigger: "blur",
- },
- ],
- },
- // {
- // label: "所属机构",
- // prop: "deptid",
- // addDisplay: false,
- // type: "select",
- // hide: true,
- // dicUrl: "/api/blade-system/dept/selectIn",
- // props: {
- // label: "deptname",
- // value: "deptid",
- // },
- // },
- {
- label: "所属辖区",
- prop: "jurisdiction",
- type: "tree",
- dicUrl: "/api/jurisdiction/lazy-trees",
- props: {
- label: "title",
- value: "id",
- },
- // labelWidth: 160,
- // span: 12,
- },
- {
- label: "许可类型",
- // search: true,
- hide: true,
- prop: "ptype",
- type: "select",
- searchSpan: 4,
- dicData: [
- {
- label: "设立分公司备案",
- value: "2",
- },
- ],
- },
- {
- label: "提交时间",
- prop: "permitime",
- overHidden: true,
- addDisplay: false,
- width: 132,
- type: "date",
- format: "yyyy-MM-dd HH:mm:ss",
- valueFormat: "yyyy-MM-dd HH:mm:ss",
- },
- {
- label: "审核状态",
- prop: "type",
- addDisplay: false,
- type: "select",
- dicData: [
- {
- label: "通过",
- value: "0",
- },
- {
- label: "不通过",
- value: "1",
- },
- {
- label: "待审核",
- value: "2",
- },
- ],
- },
- {
- label: "经营范围",
- prop: "business",
- component: "AvueUeditor",
- hide: true,
- minRows: 6,
- span: 24,
- rules: [
- {
- required: true,
- message: "请输入经营范围",
- trigger: "blur",
- },
- ],
- },
- ],
+ column: column,
},
data: [],
+
+ user_name: "",
+ stateOur: "",
+ stateText: "",
+ dialogVisibleccsee: false,
};
},
computed: {
@@ -610,27 +322,56 @@
this.dialogVisiblecc = true;
this.xukezData = row;
},
+
+ rowSee(row) {
+ this.dialogVisibleccsee = true;
+ this.stateOur = row.stateOur;
+ if (this.user_name == "派") {
+ // 派出所审批
+ this.stateText = row.popinion;
+ } else if (this.user_name == "县") {
+ // 分局审批
+ this.stateText = row.xopinion;
+ } else if (this.user_name == "市") {
+ // 市局审批
+ this.stateText = row.sopinion;
+ }
+ },
+
closecc() {
- this.xukezData.type = "0";
- this.dialogVisiblecc = false;
- this.xukezData["approve"] = this.textareaShenpi;
- console.log(this.xukezData);
- update(this.xukezData);
- this.textareaShenpi = "";
- this.$message({
- type: "success",
- message: "审核通过!",
- });
+ this.upsData("1", "0"); //通过
},
subcc() {
- this.xukezData.type = "1";
+ this.upsData("2", "1"); //不通过
+ },
+ upsData(state, type) {
this.dialogVisiblecc = false;
- this.xukezData["approve"] = this.textareaShenpi;
- update(this.xukezData);
- this.textareaShenpi = "";
- this.$message({
- type: "success",
- message: "审核不通过!",
+ if (this.user_name == "派") {
+ // 派出所审批
+ this.xukezData.papprove = state;
+ this.xukezData.popinion = this.textareaShenpi;
+ this.xukezData.type = type == "0" ? "2" : "1"; // 为了保持审核系统识别
+ } else if (this.user_name == "县") {
+ // 分局审批
+ this.xukezData.xapprove = state;
+ this.xukezData.xopinion = this.textareaShenpi;
+ this.xukezData.type = type == "0" ? "2" : "1"; // 为了保持审核系统识别
+ } else if (this.user_name == "市") {
+ // 市局审批
+ this.xukezData.sapprove = state;
+ this.xukezData.sopinion = this.textareaShenpi;
+ this.xukezData.type = type == "0" ? "0" : "1"; // 为了保持审核系统识别
+ }
+ console.log(this.xukezData);
+ // return;
+ update(this.xukezData).then((res) => {
+ console.log(res);
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ });
+ this.refreshChange();
+ this.textareaShenpi = "";
});
},
@@ -710,9 +451,47 @@
refreshChange() {
this.onLoad(this.page, this.query);
},
+ getFenji(name) {
+ var d = {};
+ if (name == "派出所管理员") {
+ d = {
+ // papprove: 1,
+ };
+ this.user_name = "派";
+ } else if (name == "县局管理员") {
+ d = {
+ papprove: "1",
+ };
+ this.user_name = "县";
+ } else if (name == "市局管理员") {
+ d = {
+ xapprove: "1",
+ };
+ this.user_name = "市";
+ }
+ return d;
+ },
+ changeState(data) {
+ var b = data;
+ if (this.user_name == "派") {
+ // 派出所审批
+ b["stateOur"] = b.papprove == "0" ? "0" : b.papprove == "1" ? "1" : "2";
+ } else if (this.user_name == "县") {
+ // 分局审批
+ b["stateOur"] = b.xapprove == "0" ? "0" : b.xapprove == "1" ? "1" : "2";
+ } else if (this.user_name == "市") {
+ // 市局审批
+ b["stateOur"] = b.sapprove == "0" ? "0" : b.sapprove == "1" ? "1" : "2";
+ }
+ return b;
+ },
onLoad(page, params = {}) {
this.loading = true;
params["ptype"] = 2;
+ params = {
+ ...params,
+ ...this.getFenji(this.userInfo.role_name),
+ };
getList(
page.currentPage,
page.pageSize,
@@ -721,6 +500,10 @@
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
+ for (var k in this.data) {
+ console.log(this.changeState(this.data[k]));
+ this.data[k] = this.changeState(this.data[k]);
+ }
this.loading = false;
this.selectionClear();
});
diff --git a/src/views/licenseApproval/cancellationOfFiling.vue b/src/views/licenseApproval/cancellationOfFiling.vue
index 97f1402..2a2200c 100644
--- a/src/views/licenseApproval/cancellationOfFiling.vue
+++ b/src/views/licenseApproval/cancellationOfFiling.vue
@@ -2,7 +2,7 @@
* @Author: liu
* @Date: 2021-08-26 17:00:04
* @Last Modified by: liu
- * @Last Modified time: 2021-09-11 16:37:11
+ * @Last Modified time: 2021-09-22 11:33:28
*/
@@ -106,6 +106,7 @@
remove,
} from "@/api/licenseApproval/revoke";
import { mapGetters } from "vuex";
+import { column } from "./column";
export default {
data() {
@@ -149,306 +150,7 @@
viewBtn: true,
selection: true,
dialogClickModal: false,
- column: [
- {
- label: "企业名称",
- search: true,
- prop: "enterprisename",
- searchLabelWidth: 80,
- searchSpan: 4,
- overHidden: true,
- width: 250,
- rules: [
- {
- required: true,
- message: "请输入企业名称",
- trigger: "blur",
- },
- ],
- },
- {
- label: "社会信用代码",
- prop: "creditcode",
- hide: true,
- rules: [
- {
- required: true,
- message: "请输入统一社会信用代码",
- trigger: "blur",
- },
- ],
- },
- {
- label: "法定代表人",
- prop: "representative",
- searchLabelWidth: 90,
- search: true,
- width: 82,
- rules: [
- {
- required: true,
- message: "请输入法定代表人",
- trigger: "blur",
- },
- ],
- },
- {
- label: "法定代表人电话",
- width: 106,
- prop: "representativecell",
- rules: [
- {
- required: true,
- message: "请输入法定代表人电话",
- trigger: "blur",
- },
- ],
- },
- {
- label: "联系人",
- prop: "contacts",
- width: 58,
- rules: [
- {
- required: true,
- message: "请输入联系人",
- trigger: "blur",
- },
- ],
- },
- {
- label: "联系人电话",
- width: 96,
- prop: "contactscell",
- rules: [
- {
- required: true,
- message: "请输入联系人电话",
- trigger: "blur",
- },
- ],
- },
- {
- label: "注册时间",
- hide: true,
- prop: "establishtime",
- type: "date",
- format: "yyyy-MM-dd",
- valueFormat: "yyyy-MM-dd",
- rules: [
- {
- required: true,
- message: "请输入注册时间",
- trigger: "blur",
- },
- ],
- },
- {
- label: "注册资本",
- prop: "registeredcapital",
- rules: [
- {
- required: true,
- message: "请输入注册资本",
- trigger: "blur",
- },
- ],
- },
- {
- label: "组织机构代码",
- prop: "organizationcode",
- hide: true,
- rules: [
- {
- required: true,
- message: "请输入组织机构代码",
- trigger: "blur",
- },
- ],
- },
- {
- label: "工商注册号",
- hide: true,
- prop: "registrationnumber",
- rules: [
- {
- required: true,
- message: "请输入工商注册号",
- trigger: "blur",
- },
- ],
- },
- // {
- // label: "纳税人识别号",
- // prop: "identificationnumber",
- // hide: true,
- // rules: [
- // {
- // required: true,
- // message: "请输入纳税人识别号",
- // trigger: "blur",
- // },
- // ],
- // },
- // {
- // label: "企业类型",
- // hide: true,
- // prop: "enterprises",
- // rules: [
- // {
- // required: true,
- // message: "请输入企业类型",
- // trigger: "blur",
- // },
- // ],
- // },
- {
- label: "注册地址",
- prop: "address",
- overHidden: true,
- rules: [
- {
- required: true,
- message: "请输入注册地址",
- trigger: "blur",
- },
- ],
- },
- // {
- // label: "所属辖区",
- // hide: true,
- // prop: "region",
- // rules: [
- // {
- // required: true,
- // message: "请输入所属辖区",
- // trigger: "blur",
- // },
- // ],
- // },
- {
- label: "登记机关",
- prop: "registration",
- overHidden: true,
- rules: [
- {
- required: true,
- message: "请输入登记机关",
- trigger: "blur",
- },
- ],
- },
- {
- label: "所属行业",
- hide: true,
- prop: "industry",
- rules: [
- {
- required: true,
- message: "请输入所属行业",
- trigger: "blur",
- },
- ],
- },
- // {
- // label: "所属机构",
- // prop: "deptid",
- // addDisplay: false,
- // type: "select",
- // hide: true,
- // dicUrl: "/api/blade-system/dept/selectIn",
- // props: {
- // label: "deptname",
- // value: "deptid",
- // },
- // },
- {
- label: "所属辖区",
- prop: "jurisdiction",
- type: "tree",
- dicUrl: "/api/jurisdiction/lazy-trees",
- props: {
- label: "title",
- value: "id",
- },
- // labelWidth: 160,
- // span: 12,
- },
- {
- label: "许可类型",
- // search: true,
- hide: true,
- prop: "ptype",
- type: "select",
- searchSpan: 4,
- dicData: [
- {
- label: "保安服务许可",
- value: "0",
- },
- ],
- },
- {
- label: "提交时间",
- prop: "permitime",
- overHidden: true,
- addDisplay: false,
- width: 132,
- type: "date",
- format: "yyyy-MM-dd HH:mm:ss",
- valueFormat: "yyyy-MM-dd HH:mm:ss",
- },
- {
- label: "审核状态",
- prop: "type",
- addDisplay: false,
- type: "select",
- dicData: [
- {
- label: "通过",
- value: "0",
- },
- {
- label: "不通过",
- value: "1",
- },
- {
- label: "待审核",
- value: "2",
- },
- ],
- },
- {
- label: "经营范围",
- prop: "business",
- component: "AvueUeditor",
- hide: true,
- minRows: 6,
- span: 24,
- rules: [
- {
- required: true,
- message: "请输入经营范围",
- trigger: "blur",
- },
- ],
- },
- {
- label: "撤销原因",
- prop: "reason",
- // labelWidth: 160,
- // span: 24,
- hide: true,
- type: "textarea",
- rules: [
- {
- required: true,
- message: "请输入撤销原因",
- trigger: "blur",
- },
- ],
- },
- ],
+ column: column,
},
data: [],
};
diff --git a/src/views/licenseApproval/column.js b/src/views/licenseApproval/column.js
new file mode 100644
index 0000000..c5215dc
--- /dev/null
+++ b/src/views/licenseApproval/column.js
@@ -0,0 +1,286 @@
+export var column = [
+ {
+ label: "企业名称",
+ search: true,
+ prop: "enterprisename",
+ searchLabelWidth: 80,
+ searchSpan: 4,
+ overHidden: true,
+ width: 250,
+ rules: [
+ {
+ required: true,
+ message: "请输入企业名称",
+ trigger: "blur",
+ },
+ ],
+ },
+ // {
+ // label: "社会信用代码",
+ // prop: "creditcode",
+ // hide: true,
+ // rules: [
+ // {
+ // required: true,
+ // message: "请输入统一社会信用代码",
+ // trigger: "blur",
+ // },
+ // ],
+ // },
+ {
+ label: "法定代表人",
+ prop: "representative",
+ search: true,
+ searchLabelWidth: 90,
+ width: 82,
+ rules: [
+ {
+ required: true,
+ message: "请输入法定代表人",
+ trigger: "blur",
+ },
+ ],
+ },
+ {
+ label: "法定代表人电话",
+ width: 106,
+ prop: "representativecell",
+ rules: [
+ {
+ required: true,
+ message: "请输入法定代表人电话",
+ trigger: "blur",
+ },
+ ],
+ },
+ {
+ label: "联系人",
+ prop: "contacts",
+ width: 58,
+ rules: [
+ {
+ required: true,
+ message: "请输入联系人",
+ trigger: "blur",
+ },
+ ],
+ },
+ {
+ label: "联系人电话",
+ width: 96,
+ prop: "contactscell",
+ rules: [
+ {
+ required: true,
+ message: "请输入联系人电话",
+ trigger: "blur",
+ },
+ ],
+ },
+ // {
+ // label: "注册时间",
+ // hide: true,
+ // prop: "establishtime",
+ // type: "date",
+ // format: "yyyy-MM-dd",
+ // valueFormat: "yyyy-MM-dd",
+ // rules: [
+ // {
+ // required: true,
+ // message: "请输入注册时间",
+ // trigger: "blur",
+ // },
+ // ],
+ // },
+ // {
+ // label: "注册资本",
+ // prop: "registeredcapital",
+ // hide: true,
+ // rules: [
+ // {
+ // required: true,
+ // message: "请输入注册资本",
+ // trigger: "blur",
+ // },
+ // ],
+ // },
+ // {
+ // label: "组织机构代码",
+ // prop: "organizationcode",
+ // hide: true,
+ // rules: [
+ // {
+ // required: true,
+ // message: "请输入组织机构代码",
+ // trigger: "blur",
+ // },
+ // ],
+ // },
+ // {
+ // label: "工商注册号",
+ // hide: true,
+ // prop: "registrationnumber",
+ // rules: [
+ // {
+ // required: true,
+ // message: "请输入工商注册号",
+ // trigger: "blur",
+ // },
+ // ],
+ // },
+ // {
+ // label: "纳税人识别号",
+ // prop: "identificationnumber",
+ // hide: true,
+ // rules: [
+ // {
+ // required: true,
+ // message: "请输入纳税人识别号",
+ // trigger: "blur",
+ // },
+ // ],
+ // },
+ // {
+ // label: "企业类型",
+ // hide: true,
+ // prop: "enterprises",
+ // rules: [
+ // {
+ // required: true,
+ // message: "请输入企业类型",
+ // trigger: "blur",
+ // },
+ // ],
+ // },
+ {
+ label: "注册地址",
+ prop: "address",
+ overHidden: true,
+ rules: [
+ {
+ required: true,
+ message: "请输入注册地址",
+ trigger: "blur",
+ },
+ ],
+ },
+ // {
+ // label: "所属地区",
+ // hide: true,
+ // prop: "region",
+ // rules: [
+ // {
+ // required: true,
+ // message: "请输入所属地区",
+ // trigger: "blur",
+ // },
+ // ],
+ // },
+ {
+ label: "登记机关",
+ prop: "registration",
+ overHidden: true,
+ rules: [
+ {
+ required: true,
+ message: "请输入登记机关",
+ trigger: "blur",
+ },
+ ],
+ },
+ {
+ label: "所属行业",
+ hide: true,
+ prop: "industry",
+ rules: [
+ {
+ required: true,
+ message: "请输入所属行业",
+ trigger: "blur",
+ },
+ ],
+ },
+ // {
+ // label: "所属机构",
+ // prop: "deptid",
+ // addDisplay: false,
+ // type: "select",
+ // hide: true,
+ // dicUrl: "/api/blade-system/dept/selectIn",
+ // props: {
+ // label: "deptname",
+ // value: "deptid",
+ // },
+ // },
+ {
+ label: "所属辖区",
+ prop: "jurisdiction",
+ type: "tree",
+ dicUrl: "/api/jurisdiction/lazy-trees",
+ props: {
+ label: "title",
+ value: "id",
+ },
+ // labelWidth: 160,
+ // span: 12,
+ },
+ {
+ label: "许可类型",
+ // search: true,
+ hide: true,
+ prop: "ptype",
+ type: "select",
+ searchSpan: 4,
+ dicData: [
+ {
+ label: "保安服务许可",
+ value: "0",
+ },
+ ],
+ },
+ {
+ label: "提交时间",
+ prop: "permitime",
+ overHidden: true,
+ addDisplay: false,
+ width: 132,
+ type: "date",
+ format: "yyyy-MM-dd HH:mm:ss",
+ valueFormat: "yyyy-MM-dd HH:mm:ss",
+ },
+ {
+ label: "审核状态",
+ prop: "type",
+ addDisplay: false,
+ type: "select",
+ dicData: [
+ {
+ label: "通过",
+ value: "0",
+ },
+ {
+ label: "不通过",
+ value: "1",
+ },
+ {
+ label: "待审核",
+ value: "2",
+ },
+ ],
+ },
+ {
+ label: "经营范围",
+ prop: "business",
+ component: "AvueUeditor",
+ hide: true,
+ minRows: 6,
+ span: 24,
+ rules: [
+ {
+ required: true,
+ message: "请输入经营范围",
+ trigger: "blur",
+ },
+ ],
+ },
+];
\ No newline at end of file
diff --git a/src/views/licenseApproval/crossRegion.vue b/src/views/licenseApproval/crossRegion.vue
index 25953fc..3c71fa2 100644
--- a/src/views/licenseApproval/crossRegion.vue
+++ b/src/views/licenseApproval/crossRegion.vue
@@ -2,7 +2,7 @@
* @Author:liu
* @Date: 2021-08-26 16:59:35
* @Last Modified by: liu
- * @Last Modified time: 2021-09-11 16:37:07
+ * @Last Modified time: 2021-09-23 16:48:07
*/
@@ -55,30 +55,59 @@
:size="size"
:type="type"
@click.stop="rowDel(row)"
- v-if="row.type == '2'"
+ v-if="row.stateOur == '0'"
>备案审批
</el-button>
<el-button
icon="el-icon-edit"
:size="size"
:type="type"
+ v-if="row.stateOur != '0'"
+ @click.stop="rowSee(row)"
+ >审批查询
+ </el-button>
+ <el-button
+ icon="el-icon-edit"
+ :size="size"
+ :type="type"
@click.stop="viewLicense(row)"
- v-if="row.type == '0'"
+ v-if="
+ row.papprove == '1' && row.xapprove == '1' && row.sapprove == '1'
+ "
>打印备案证
</el-button>
</template>
<template class="tdtype" slot-scope="{ row }" slot="type">
<el-tag class="dtype">
{{
- row.type == "0" ? "通过" : row.type == "1" ? "不通过" : "待审核"
+ row.stateOur == "1"
+ ? "通过"
+ : row.stateOur == "2"
+ ? "不通过"
+ : "待审核"
}}
- <i class="gz" v-if="row.type == '0'"></i>
- <i class="yj" v-if="row.type == '1'"></i>
- <i class="zc" v-if="row.type == '2'"></i>
+ <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>
</el-tag>
</template>
</avue-crud>
</basic-container>
+
+ <el-dialog
+ title=""
+ :visible.sync="dialogVisibleccsee"
+ width="30%"
+ :modal-append-to-body="false"
+ >
+ <div class="flots">
+ <div class="f_title">
+ 审批 {{ stateOur == "1" ? "通过" : stateOur == "2" ? "不通过" : "" }}
+ </div>
+ <div><span>审批意见：</span> {{ stateText }}</div>
+ </div>
+ </el-dialog>
+
<div
v-if="dialogVisible"
class="dialogVisibles"
@@ -165,6 +194,7 @@
remove,
} from "@/api/licenseApproval/recordk";
import { mapGetters } from "vuex";
+import { column } from "./column";
export default {
data() {
@@ -208,331 +238,14 @@
viewBtn: true,
selection: true,
dialogClickModal: false,
- column: [
- {
- label: "企业名称",
- search: true,
- prop: "enterprisename",
- searchLabelWidth: 80,
- searchSpan: 4,
- overHidden: true,
- width: 250,
- rules: [
- {
- required: true,
- message: "请输入企业名称",
- trigger: "blur",
- },
- ],
- },
- {
- label: "社会信用代码",
- prop: "creditcode",
- hide: true,
- rules: [
- {
- required: true,
- message: "请输入统一社会信用代码",
- trigger: "blur",
- },
- ],
- },
- {
- label: "法定代表人",
- prop: "representative",
- search: true,
- searchLabelWidth: 90,
- width: 82,
- rules: [
- {
- required: true,
- message: "请输入法定代表人",
- trigger: "blur",
- },
- ],
- },
- {
- label: "法定代表人电话",
- width: 106,
- prop: "representativecell",
- rules: [
- {
- required: true,
- message: "请输入法定代表人电话",
- trigger: "blur",
- },
- ],
- },
- {
- label: "联系人",
- prop: "contacts",
- width: 58,
- rules: [
- {
- required: true,
- message: "请输入联系人",
- trigger: "blur",
- },
- ],
- },
- {
- label: "联系人电话",
- width: 96,
- prop: "contactscell",
- rules: [
- {
- required: true,
- message: "请输入联系人电话",
- trigger: "blur",
- },
- ],
- },
- {
- label: "单位许可证编号",
- prop: "perid",
- // labelWidth: 160,
- // span: 12,
- hide: true,
- rules: [
- {
- required: true,
- message: "单位许可证编号",
- trigger: "blur",
- },
- ],
- },
- {
- label: "许可证发证机关",
- prop: "offices",
- // labelWidth: 160,
- // span: 12,
- hide: true,
- rules: [
- {
- required: true,
- message: "许可证发证机关",
- trigger: "blur",
- },
- ],
- },
- {
- label: "发证时间",
- prop: "officetime",
- // labelWidth: 160,
- // span: 12,
- hide: true,
- type: "date",
- format: "yyyy-MM-dd",
- valueFormat: "yyyy-MM-dd",
- },
- {
- label: "注册时间",
- hide: true,
- prop: "establishtime",
- type: "date",
- format: "yyyy-MM-dd",
- valueFormat: "yyyy-MM-dd",
- rules: [
- {
- required: true,
- message: "请输入注册时间",
- trigger: "blur",
- },
- ],
- },
- {
- label: "注册资本",
- prop: "registeredcapital",
- rules: [
- {
- required: true,
- message: "请输入注册资本",
- trigger: "blur",
- },
- ],
- },
- {
- label: "组织机构代码",
- prop: "organizationcode",
- hide: true,
- rules: [
- {
- required: true,
- message: "请输入组织机构代码",
- trigger: "blur",
- },
- ],
- },
- {
- label: "工商注册号",
- hide: true,
- prop: "registrationnumber",
- rules: [
- {
- required: true,
- message: "请输入工商注册号",
- trigger: "blur",
- },
- ],
- },
- // {
- // label: "纳税人识别号",
- // prop: "identificationnumber",
- // hide: true,
- // rules: [
- // {
- // required: true,
- // message: "请输入纳税人识别号",
- // trigger: "blur",
- // },
- // ],
- // },
- // {
- // label: "企业类型",
- // hide: true,
- // prop: "enterprises",
- // rules: [
- // {
- // required: true,
- // message: "请输入企业类型",
- // trigger: "blur",
- // },
- // ],
- // },
- {
- label: "注册地址",
- prop: "address",
- overHidden: true,
- rules: [
- {
- required: true,
- message: "请输入注册地址",
- trigger: "blur",
- },
- ],
- },
- // {
- // label: "所属辖区",
- // hide: true,
- // prop: "region",
- // rules: [
- // {
- // required: true,
- // message: "请输入所属辖区",
- // trigger: "blur",
- // },
- // ],
- // },
- {
- label: "登记机关",
- prop: "registration",
- overHidden: true,
- rules: [
- {
- required: true,
- message: "请输入登记机关",
- trigger: "blur",
- },
- ],
- },
- {
- label: "所属行业",
- hide: true,
- prop: "industry",
- rules: [
- {
- required: true,
- message: "请输入所属行业",
- trigger: "blur",
- },
- ],
- },
- // {
- // label: "所属机构",
- // prop: "deptid",
- // addDisplay: false,
- // type: "select",
- // hide: true,
- // dicUrl: "/api/blade-system/dept/selectIn",
- // props: {
- // label: "deptname",
- // value: "deptid",
- // },
- // },
- // {
- // label: "所属辖区",
- // prop: "jurisdiction",
- // type: "tree",
- // dicUrl: "/api/jurisdiction/lazy-trees",
- // props: {
- // label: "title",
- // value: "id",
- // },
- // // labelWidth: 160,
- // // span: 12,
- // },
- {
- label: "许可类型",
- // search: true,
- hide: true,
- prop: "ptype",
- type: "select",
- searchSpan: 4,
- dicData: [
- {
- label: "设立分公司备案",
- value: "2",
- },
- ],
- },
- {
- label: "提交时间",
- prop: "permitime",
- overHidden: true,
- addDisplay: false,
- width: 132,
- type: "date",
- format: "yyyy-MM-dd HH:mm:ss",
- valueFormat: "yyyy-MM-dd HH:mm:ss",
- },
- {
- label: "审核状态",
- prop: "type",
- addDisplay: false,
- type: "select",
- dicData: [
- {
- label: "通过",
- value: "0",
- },
- {
- label: "不通过",
- value: "1",
- },
- {
- label: "待审核",
- value: "2",
- },
- ],
- },
- {
- label: "经营范围",
- prop: "business",
- component: "AvueUeditor",
- hide: true,
- minRows: 6,
- span: 24,
- rules: [
- {
- required: true,
- message: "请输入经营范围",
- trigger: "blur",
- },
- ],
- },
- ],
+ column: column,
},
data: [],
+
+ user_name: "",
+ stateOur: "",
+ stateText: "",
+ dialogVisibleccsee: false,
};
},
computed: {
@@ -566,7 +279,7 @@
path: "/attachOnce/index",
// redirect: { name: "foo" },
// query: { row: row },
- query: { deptid: row.cardid, type: "7" },
+ query: { deptid: row.cardid, type: "5" },
// params: { row: row.identificationnumber },
});
},
@@ -607,20 +320,57 @@
this.dialogVisiblecc = true;
this.xukezData = row;
},
+
+ rowSee(row) {
+ this.dialogVisibleccsee = true;
+ this.stateOur = row.stateOur;
+ if (this.user_name == "派") {
+ // 派出所审批
+ this.stateText = row.popinion;
+ } else if (this.user_name == "县") {
+ // 分局审批
+ this.stateText = row.xopinion;
+ } else if (this.user_name == "市") {
+ // 市局审批
+ this.stateText = row.sopinion;
+ }
+ },
+
closecc() {
- this.xukezData.type = "0";
- this.dialogVisiblecc = false;
- this.xukezData["approve"] = this.textareaShenpi;
- console.log(this.xukezData);
- update(this.xukezData);
- this.textareaShenpi = "";
+ this.upsData("1", "0"); //通过
},
subcc() {
- this.xukezData.type = "1";
+ this.upsData("2", "1"); //不通过
+ },
+ upsData(state, type) {
this.dialogVisiblecc = false;
- this.xukezData["approve"] = this.textareaShenpi;
- update(this.xukezData);
- this.textareaShenpi = "";
+ if (this.user_name == "派") {
+ // 派出所审批
+ this.xukezData.papprove = state;
+ this.xukezData.popinion = this.textareaShenpi;
+ this.xukezData.type = type == "0" ? "2" : "1"; // 为了保持审核系统识别
+ } else if (this.user_name == "县") {
+ // 分局审批
+ this.xukezData.xapprove = state;
+ this.xukezData.xopinion = this.textareaShenpi;
+ this.xukezData.type = type == "0" ? "2" : "1"; // 为了保持审核系统识别
+ } else if (this.user_name == "市") {
+ // 市局审批
+ this.xukezData.sapprove = state;
+ this.xukezData.sopinion = this.textareaShenpi;
+ this.xukezData.type = type == "0" ? "0" : "1"; // 为了保持审核系统识别
+ }
+ console.log(this.xukezData);
+ // return;
+ update(this.xukezData).then((res) => {
+ console.log(res);
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ });
+ this.refreshChange();
+ this.textareaShenpi = "";
+ });
},
viewLicense(row) {
@@ -698,9 +448,48 @@
refreshChange() {
this.onLoad(this.page, this.query);
},
+ getFenji(name) {
+ // console.log(name, "name");
+ var d = {};
+ if (name == "派出所管理员") {
+ d = {
+ // papprove: 1,
+ };
+ this.user_name = "派";
+ } else if (name == "县局管理员") {
+ d = {
+ papprove: "1",
+ };
+ this.user_name = "县";
+ } else if (name == "市局管理员") {
+ d = {
+ xapprove: "1",
+ };
+ this.user_name = "市";
+ }
+ return d;
+ },
+ changeState(data) {
+ var b = data;
+ if (this.user_name == "派") {
+ // 派出所审批
+ b["stateOur"] = b.papprove == "0" ? "0" : b.papprove == "1" ? "1" : "2";
+ } else if (this.user_name == "县") {
+ // 分局审批
+ b["stateOur"] = b.xapprove == "0" ? "0" : b.xapprove == "1" ? "1" : "2";
+ } else if (this.user_name == "市") {
+ // 市局审批
+ b["stateOur"] = b.sapprove == "0" ? "0" : b.sapprove == "1" ? "1" : "2";
+ }
+ return b;
+ },
onLoad(page, params = {}) {
this.loading = true;
params["ptype"] = 5;
+ params = {
+ ...params,
+ ...this.getFenji(this.userInfo.role_name),
+ };
getList(
page.currentPage,
page.pageSize,
@@ -709,6 +498,10 @@
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
+ for (var k in this.data) {
+ console.log(this.changeState(this.data[k]));
+ this.data[k] = this.changeState(this.data[k]);
+ }
this.loading = false;
this.selectionClear();
});
diff --git a/src/views/licenseApproval/securityGuard.vue b/src/views/licenseApproval/securityGuard.vue
index eac0235..3766bff 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-11 16:36:19
+ * @Last Modified time: 2021-09-23 16:14:20
*/
@@ -54,7 +54,7 @@
icon="el-icon-edit"
:size="size"
:type="type"
- v-if="row.type == '2'"
+ v-if="row.stateOur == '0'"
@click.stop="rowDel(row)"
>备案审批
</el-button>
@@ -62,15 +62,34 @@
icon="el-icon-edit"
:size="size"
:type="type"
+ v-if="
+ row.stateOur != '0' &&
+ !(
+ row.papprove == '1' &&
+ row.xapprove == '1' &&
+ row.sapprove == '1'
+ )
+ "
+ @click.stop="rowSee(row)"
+ >审批查询
+ </el-button>
+ <el-button
+ icon="el-icon-brush"
+ :size="size"
+ :type="type"
@click.stop="viewLicense(row)"
- v-if="row.type == '0'"
+ v-if="
+ row.papprove == '1' && row.xapprove == '1' && row.sapprove == '1'
+ "
>打印备案证
</el-button>
<el-button
- icon="el-icon-edit"
+ icon="el-icon-brush"
:size="size"
:type="type"
- v-show="row.type == 0"
+ v-if="
+ row.papprove == '1' && row.xapprove == '1' && row.sapprove == '1'
+ "
@click.stop="viewLicensehuizhi(row)"
>回执打印
</el-button>
@@ -78,11 +97,15 @@
<template class="tdtype" slot-scope="{ row }" slot="type">
<el-tag class="dtype">
{{
- row.type == "0" ? "通过" : row.type == "1" ? "不通过" : "待审核"
+ row.stateOur == "1"
+ ? "通过"
+ : row.stateOur == "2"
+ ? "不通过"
+ : "待审核"
}}
- <i class="gz" v-if="row.type == '0'"></i>
- <i class="yj" v-if="row.type == '1'"></i>
- <i class="zc" v-if="row.type == '2'"></i>
+ <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>
</el-tag>
</template>
</avue-crud>
@@ -204,6 +227,19 @@
</div>
</div>
</el-dialog>
+ <el-dialog
+ title=""
+ :visible.sync="dialogVisibleccsee"
+ width="30%"
+ :modal-append-to-body="false"
+ >
+ <div class="flots">
+ <div class="f_title">
+ 审批 {{ stateOur == "1" ? "通过" : stateOur == "2" ? "不通过" : "" }}
+ </div>
+ <div><span>审批意见：</span> {{ stateText }}</div>
+ </div>
+ </el-dialog>
</div>
</template>
@@ -216,7 +252,7 @@
remove,
} from "@/api/licenseApproval/record";
import { mapGetters } from "vuex";
-
+import { column } from "./column";
export default {
data() {
return {
@@ -261,331 +297,14 @@
viewBtn: true,
selection: true,
dialogClickModal: false,
- column: [
- {
- label: "企业名称",
- search: true,
- prop: "enterprisename",
- searchLabelWidth: 80,
- searchSpan: 4,
- overHidden: true,
- width: 250,
- rules: [
- {
- required: true,
- message: "请输入企业名称",
- trigger: "blur",
- },
- ],
- },
- {
- label: "社会信用代码",
- prop: "creditcode",
- hide: true,
- rules: [
- {
- required: true,
- message: "请输入统一社会信用代码",
- trigger: "blur",
- },
- ],
- },
- {
- label: "法定代表人",
- prop: "representative",
- search: true,
- width: 82,
- searchLabelWidth: 90,
- rules: [
- {
- required: true,
- message: "请输入法定代表人",
- trigger: "blur",
- },
- ],
- },
- {
- label: "法定代表人电话",
- width: 106,
- prop: "representativecell",
- rules: [
- {
- required: true,
- message: "请输入法定代表人电话",
- trigger: "blur",
- },
- ],
- },
- {
- label: "联系人",
- prop: "contacts",
- width: 58,
- rules: [
- {
- required: true,
- message: "请输入联系人",
- trigger: "blur",
- },
- ],
- },
- {
- label: "联系人电话",
- width: 96,
- prop: "contactscell",
- rules: [
- {
- required: true,
- message: "请输入联系人电话",
- trigger: "blur",
- },
- ],
- },
- {
- label: "单位许可证编号",
- prop: "perid",
- // labelWidth: 160,
- // span: 12,
- hide: true,
- rules: [
- {
- required: true,
- message: "单位许可证编号",
- trigger: "blur",
- },
- ],
- },
- {
- label: "许可证发证机关",
- prop: "offices",
- // labelWidth: 160,
- // span: 12,
- hide: true,
- rules: [
- {
- required: true,
- message: "许可证发证机关",
- trigger: "blur",
- },
- ],
- },
- {
- label: "发证时间",
- prop: "officetime",
- // labelWidth: 160,
- // span: 12,
- hide: true,
- type: "date",
- format: "yyyy-MM-dd",
- valueFormat: "yyyy-MM-dd",
- },
- {
- label: "注册时间",
- hide: true,
- prop: "establishtime",
- type: "date",
- format: "yyyy-MM-dd",
- valueFormat: "yyyy-MM-dd",
- rules: [
- {
- required: true,
- message: "请输入注册时间",
- trigger: "blur",
- },
- ],
- },
- {
- label: "注册资本",
- prop: "registeredcapital",
- rules: [
- {
- required: true,
- message: "请输入注册资本",
- trigger: "blur",
- },
- ],
- },
- {
- label: "组织机构代码",
- prop: "organizationcode",
- hide: true,
- rules: [
- {
- required: true,
- message: "请输入组织机构代码",
- trigger: "blur",
- },
- ],
- },
- {
- label: "工商注册号",
- hide: true,
- prop: "registrationnumber",
- rules: [
- {
- required: true,
- message: "请输入工商注册号",
- trigger: "blur",
- },
- ],
- },
- // {
- // label: "纳税人识别号",
- // prop: "identificationnumber",
- // hide: true,
- // rules: [
- // {
- // required: true,
- // message: "请输入纳税人识别号",
- // trigger: "blur",
- // },
- // ],
- // },
- // {
- // label: "企业类型",
- // hide: true,
- // prop: "enterprises",
- // rules: [
- // {
- // required: true,
- // message: "请输入企业类型",
- // trigger: "blur",
- // },
- // ],
- // },
- {
- label: "注册地址",
- prop: "address",
- overHidden: true,
- rules: [
- {
- required: true,
- message: "请输入注册地址",
- trigger: "blur",
- },
- ],
- },
- // {
- // label: "所属辖区",
- // hide: true,
- // prop: "region",
- // rules: [
- // {
- // required: true,
- // message: "请输入所属辖区",
- // trigger: "blur",
- // },
- // ],
- // },
- {
- label: "登记机关",
- prop: "registration",
- overHidden: true,
- rules: [
- {
- required: true,
- message: "请输入登记机关",
- trigger: "blur",
- },
- ],
- },
- {
- label: "所属行业",
- hide: true,
- prop: "industry",
- rules: [
- {
- required: true,
- message: "请输入所属行业",
- trigger: "blur",
- },
- ],
- },
- // {
- // label: "所属机构",
- // prop: "deptid",
- // addDisplay: false,
- // type: "select",
- // hide: true,
- // dicUrl: "/api/blade-system/dept/selectIn",
- // props: {
- // label: "deptname",
- // value: "deptid",
- // },
- // },
- {
- label: "所属辖区",
- prop: "jurisdiction",
- type: "tree",
- dicUrl: "/api/jurisdiction/lazy-trees",
- props: {
- label: "title",
- value: "id",
- },
- // labelWidth: 160,
- // span: 12,
- },
- {
- label: "许可类型",
- // search: true,
- hide: true,
- prop: "ptype",
- type: "select",
- searchSpan: 4,
- dicData: [
- {
- label: "自招保安单位备案",
- value: "3",
- },
- ],
- },
- {
- label: "提交时间",
- prop: "permitime",
- overHidden: true,
- addDisplay: false,
- width: 132,
- type: "date",
- format: "yyyy-MM-dd HH:mm:ss",
- valueFormat: "yyyy-MM-dd HH:mm:ss",
- },
- {
- label: "审核状态",
- prop: "type",
- addDisplay: false,
- type: "select",
- dicData: [
- {
- label: "通过",
- value: "0",
- },
- {
- label: "不通过",
- value: "1",
- },
- {
- label: "待审核",
- value: "2",
- },
- ],
- },
- {
- label: "经营范围",
- prop: "business",
- component: "AvueUeditor",
- hide: true,
- minRows: 6,
- span: 24,
- rules: [
- {
- required: true,
- message: "请输入经营范围",
- trigger: "blur",
- },
- ],
- },
- ],
+ column: column,
},
data: [],
+
+ user_name: "",
+ stateOur: "",
+ stateText: "",
+ dialogVisibleccsee: false,
};
},
computed: {
@@ -663,22 +382,57 @@
this.dialogVisiblecc = true;
this.xukezData = row;
},
- closecc() {
- this.xukezData.type = "0";
- this.dialogVisiblecc = false;
- this.xukezData["approve"] = this.textareaShenpi;
- console.log(this.xukezData);
- update(this.xukezData);
- this.textareaShenpi = "";
- },
- subcc() {
- this.xukezData.type = "1";
- this.dialogVisiblecc = false;
- this.xukezData["approve"] = this.textareaShenpi;
- update(this.xukezData);
- this.textareaShenpi = "";
+ rowSee(row) {
+ this.dialogVisibleccsee = true;
+ this.stateOur = row.stateOur;
+ if (this.user_name == "派") {
+ // 派出所审批
+ this.stateText = row.popinion;
+ } else if (this.user_name == "县") {
+ // 分局审批
+ this.stateText = row.xopinion;
+ } else if (this.user_name == "市") {
+ // 市局审批
+ this.stateText = row.sopinion;
+ }
},
+ closecc() {
+ this.upsData("1", "0"); //通过
+ },
+ subcc() {
+ this.upsData("2", "1"); //不通过
+ },
+ upsData(state, type) {
+ this.dialogVisiblecc = false;
+ if (this.user_name == "派") {
+ // 派出所审批
+ this.xukezData.papprove = state;
+ this.xukezData.popinion = this.textareaShenpi;
+ this.xukezData.type = type == "0" ? "2" : "1"; // 为了保持审核系统识别
+ } else if (this.user_name == "县") {
+ // 分局审批
+ this.xukezData.xapprove = state;
+ this.xukezData.xopinion = this.textareaShenpi;
+ this.xukezData.type = type == "0" ? "2" : "1"; // 为了保持审核系统识别
+ } else if (this.user_name == "市") {
+ // 市局审批
+ this.xukezData.sapprove = state;
+ this.xukezData.sopinion = this.textareaShenpi;
+ this.xukezData.type = type == "0" ? "0" : "1"; // 为了保持审核系统识别
+ }
+ console.log(this.xukezData);
+ // return;
+ update(this.xukezData).then((res) => {
+ console.log(res);
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ });
+ this.refreshChange();
+ this.textareaShenpi = "";
+ });
+ },
viewLicensehuizhi() {
this.dialogVisiblehuizhi = true;
},
@@ -761,9 +515,49 @@
refreshChange() {
this.onLoad(this.page, this.query);
},
+ getFenji(name) {
+ var d = {};
+ if (name == "派出所管理员") {
+ d = {
+ // papprove: 1,
+ };
+ this.user_name = "派";
+ } else if (name == "县局管理员") {
+ d = {
+ papprove: "1",
+ };
+ this.user_name = "县";
+ } else if (name == "市局管理员") {
+ d = {
+ xapprove: "1",
+ };
+ this.user_name = "市";
+ }
+ return d;
+ },
+ changeState(data) {
+ var b = data;
+ if (this.user_name == "派") {
+ // 派出所审批
+ b["stateOur"] = b.papprove == "0" ? "0" : b.papprove == "1" ? "1" : "2";
+ } else if (this.user_name == "县") {
+ // 分局审批
+ b["stateOur"] = b.xapprove == "0" ? "0" : b.xapprove == "1" ? "1" : "2";
+ } else if (this.user_name == "市") {
+ // 市局审批
+ b["stateOur"] = b.sapprove == "0" ? "0" : b.sapprove == "1" ? "1" : "2";
+ }
+ return b;
+ },
onLoad(page, params = {}) {
this.loading = true;
params["ptype"] = 3;
+ params = {
+ ...params,
+ ...this.getFenji(this.userInfo.role_name),
+ };
+ console.log(params, "params");
+ // return;
getList(
page.currentPage,
page.pageSize,
@@ -772,6 +566,10 @@
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
+ for (var k in this.data) {
+ console.log(this.changeState(this.data[k]));
+ this.data[k] = this.changeState(this.data[k]);
+ }
this.loading = false;
this.selectionClear();
});
diff --git a/src/views/licenseApproval/securityPermit.vue b/src/views/licenseApproval/securityPermit.vue
index 04f1154..2e16383 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-08-27 19:20:28
+ * @Last Modified time: 2021-09-23 15:57:13
*/
<template>
@@ -55,82 +55,58 @@
:size="size"
:type="type"
@click.stop="rowDel(row)"
- v-if="row.type == '2'"
+ v-if="row.stateOur == '0'"
>许可审批
</el-button>
<el-button
icon="el-icon-edit"
:size="size"
:type="type"
+ v-if="row.stateOur != '0'"
+ @click.stop="rowSee(row)"
+ >审批查询
+ </el-button>
+ <el-button
+ icon="el-icon-brush"
+ :size="size"
+ :type="type"
@click.stop="viewLicense(row)"
- v-if="row.type == '0'"
+ v-if="
+ row.papprove == '1' && row.xapprove == '1' && row.sapprove == '1'
+ "
>打印许可证
</el-button>
</template>
<template class="tdtype" slot-scope="{ row }" slot="type">
<el-tag class="dtype">
{{
- row.type == "0" ? "通过" : row.type == "1" ? "不通过" : "待审核"
+ row.stateOur == "1"
+ ? "通过"
+ : row.stateOur == "2"
+ ? "不通过"
+ : "待审核"
}}
- <i class="gz" v-if="row.type == '0'"></i>
- <i class="yj" v-if="row.type == '1'"></i>
- <i class="zc" v-if="row.type == '2'"></i>
+ <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>
</el-tag>
</template>
</avue-crud>
</basic-container>
-
- <!-- <el-dialog
- :visible.sync="dialogVisible"
- :before-close="handleClose"
+ <el-dialog
+ title=""
+ :visible.sync="dialogVisibleccsee"
+ width="30%"
:modal-append-to-body="false"
- width="1005px"
- top="10vh"
- class="printstyle"
>
- <div id="licence_box">
- <div class="licence" id="licence" v-if="dialogVisible">
- <div class="licence-head">保安服务许可证</div>
- <div class="head-tid">
- 洪公保服务
- <span class="fontStyle">{{
- licenceData.row.organizationcode
- }}</span>
- 号
- </div>
- <div class="licence-main">
- <div
- class="l-m-once"
- v-for="(item, index, key) in licenceData.chiden"
- :key="key"
- >
- <span class="l-m-o-title"> {{ index }}: </span>
- <span class="l-m-r-once">{{ item }}</span>
- </div>
- </div>
- <div class="licence-bottom">发证机关（南昌市公安局）</div>
- <div class="l-bottom">
- 发证日期
- <span class="l-b-t">{{
- licenceData.row.permitime.slice(0, 4)
- }}</span
- >年
- <span class="l-b-t">{{
- licenceData.row.permitime.slice(5, 7)
- }}</span>
- 月
- <span class="l-b-t">{{
- licenceData.row.permitime.slice(8, 10)
- }}</span>
- 日
- </div>
+ <div class="flots">
+ <div class="f_title">
+ 审批 {{ stateOur == "1" ? "通过" : stateOur == "2" ? "不通过" : "" }}
</div>
+ <div><span>审批意见：</span> {{ stateText }}</div>
</div>
+ </el-dialog>
- <span slot="footer" class="dialog-footer">
- <el-button type="primary" @click="Print">打 印</el-button>
- </span>
- </el-dialog> -->
<div
v-if="dialogVisible"
class="dialogVisibles"
@@ -218,6 +194,7 @@
remove,
} from "@/api/licenseApproval/permit";
import { mapGetters } from "vuex";
+import { column } from "./column";
export default {
data() {
@@ -261,293 +238,14 @@
viewBtn: true,
selection: true,
dialogClickModal: false,
- column: [
- {
- label: "企业名称",
- search: true,
- prop: "enterprisename",
- searchLabelWidth: 80,
- searchSpan: 4,
- overHidden: true,
- width: 250,
- rules: [
- {
- required: true,
- message: "请输入企业名称",
- trigger: "blur",
- },
- ],
- },
- {
- label: "社会信用代码",
- prop: "creditcode",
- hide: true,
- rules: [
- {
- required: true,
- message: "请输入统一社会信用代码",
- trigger: "blur",
- },
- ],
- },
- {
- label: "法定代表人",
- prop: "representative",
- search: true,
- searchLabelWidth: 90,
- width: 82,
- rules: [
- {
- required: true,
- message: "请输入法定代表人",
- trigger: "blur",
- },
- ],
- },
- {
- label: "法定代表人电话",
- width: 106,
- prop: "representativecell",
- rules: [
- {
- required: true,
- message: "请输入法定代表人电话",
- trigger: "blur",
- },
- ],
- },
- {
- label: "联系人",
- prop: "contacts",
- width: 58,
- rules: [
- {
- required: true,
- message: "请输入联系人",
- trigger: "blur",
- },
- ],
- },
- {
- label: "联系人电话",
- width: 96,
- prop: "contactscell",
- rules: [
- {
- required: true,
- message: "请输入联系人电话",
- trigger: "blur",
- },
- ],
- },
- {
- label: "注册时间",
- hide: true,
- prop: "establishtime",
- type: "date",
- format: "yyyy-MM-dd",
- valueFormat: "yyyy-MM-dd",
- rules: [
- {
- required: true,
- message: "请输入注册时间",
- trigger: "blur",
- },
- ],
- },
- {
- label: "注册资本",
- prop: "registeredcapital",
- rules: [
- {
- required: true,
- message: "请输入注册资本",
- trigger: "blur",
- },
- ],
- },
- {
- label: "组织机构代码",
- prop: "organizationcode",
- hide: true,
- rules: [
- {
- required: true,
- message: "请输入组织机构代码",
- trigger: "blur",
- },
- ],
- },
- {
- label: "工商注册号",
- hide: true,
- prop: "registrationnumber",
- rules: [
- {
- required: true,
- message: "请输入工商注册号",
- trigger: "blur",
- },
- ],
- },
- // {
- // label: "纳税人识别号",
- // prop: "identificationnumber",
- // hide: true,
- // rules: [
- // {
- // required: true,
- // message: "请输入纳税人识别号",
- // trigger: "blur",
- // },
- // ],
- // },
- // {
- // label: "企业类型",
- // hide: true,
- // prop: "enterprises",
- // rules: [
- // {
- // required: true,
- // message: "请输入企业类型",
- // trigger: "blur",
- // },
- // ],
- // },
- {
- label: "注册地址",
- prop: "address",
- overHidden: true,
- rules: [
- {
- required: true,
- message: "请输入注册地址",
- trigger: "blur",
- },
- ],
- },
- // {
- // label: "所属辖区",
- // hide: true,
- // prop: "region",
- // rules: [
- // {
- // required: true,
- // message: "请输入所属辖区",
- // trigger: "blur",
- // },
- // ],
- // },
- {
- label: "登记机关",
- prop: "registration",
- overHidden: true,
- rules: [
- {
- required: true,
- message: "请输入登记机关",
- trigger: "blur",
- },
- ],
- },
- {
- label: "所属行业",
- hide: true,
- prop: "industry",
- rules: [
- {
- required: true,
- message: "请输入所属行业",
- trigger: "blur",
- },
- ],
- },
- // {
- // label: "所属机构",
- // prop: "deptid",
- // addDisplay: false,
- // type: "select",
- // hide: true,
- // dicUrl: "/api/blade-system/dept/selectIn",
- // props: {
- // label: "deptname",
- // value: "deptid",
- // },
- // },
- {
- label: "所属辖区",
- prop: "jurisdiction",
- type: "tree",
- dicUrl: "/api/jurisdiction/lazy-trees",
- props: {
- label: "title",
- value: "id",
- },
- // labelWidth: 160,
- // span: 12,
- },
- {
- label: "许可类型",
- // search: true,
- hide: true,
- prop: "ptype",
- type: "select",
- searchSpan: 4,
- dicData: [
- {
- label: "保安服务许可",
- value: "0",
- },
- ],
- },
- {
- label: "提交时间",
- prop: "permitime",
- overHidden: true,
- addDisplay: false,
- width: 132,
- type: "date",
- format: "yyyy-MM-dd HH:mm:ss",
- valueFormat: "yyyy-MM-dd HH:mm:ss",
- },
- {
- label: "审核状态",
- prop: "type",
- addDisplay: false,
- type: "select",
- dicData: [
- {
- label: "通过",
- value: "0",
- },
- {
- label: "不通过",
- value: "1",
- },
- {
- label: "待审核",
- value: "2",
- },
- ],
- },
- {
- label: "经营范围",
- prop: "business",
- component: "AvueUeditor",
- hide: true,
- minRows: 6,
- span: 24,
- rules: [
- {
- required: true,
- message: "请输入经营范围",
- trigger: "blur",
- },
- ],
- },
- ],
+ column: column,
},
data: [],
+
+ user_name: "",
+ stateOur: "",
+ stateText: "",
+ dialogVisibleccsee: false,
};
},
computed: {
@@ -623,20 +321,56 @@
this.dialogVisiblecc = true;
this.xukezData = row;
},
+ rowSee(row) {
+ this.dialogVisibleccsee = true;
+ this.stateOur = row.stateOur;
+ if (this.user_name == "派") {
+ // 派出所审批
+ this.stateText = row.popinion;
+ } else if (this.user_name == "县") {
+ // 分局审批
+ this.stateText = row.xopinion;
+ } else if (this.user_name == "市") {
+ // 市局审批
+ this.stateText = row.sopinion;
+ }
+ },
+
closecc() {
- this.xukezData.type = "0";
- this.dialogVisiblecc = false;
- this.xukezData["approve"] = this.textareaShenpi;
- console.log(this.xukezData);
- update(this.xukezData);
- this.textareaShenpi = "";
+ this.upsData("1", "0"); //通过
},
subcc() {
- this.xukezData.type = "1";
+ this.upsData("2", "1"); //不通过
+ },
+ upsData(state, type) {
this.dialogVisiblecc = false;
- this.xukezData["approve"] = this.textareaShenpi;
- update(this.xukezData);
- this.textareaShenpi = "";
+ if (this.user_name == "派") {
+ // 派出所审批
+ this.xukezData.papprove = state;
+ this.xukezData.popinion = this.textareaShenpi;
+ this.xukezData.type = type == "0" ? "2" : "1"; // 为了保持审核系统识别
+ } else if (this.user_name == "县") {
+ // 分局审批
+ this.xukezData.xapprove = state;
+ this.xukezData.xopinion = this.textareaShenpi;
+ this.xukezData.type = type == "0" ? "2" : "1"; // 为了保持审核系统识别
+ } else if (this.user_name == "市") {
+ // 市局审批
+ this.xukezData.sapprove = state;
+ this.xukezData.sopinion = this.textareaShenpi;
+ this.xukezData.type = type == "0" ? "0" : "1"; // 为了保持审核系统识别
+ }
+ console.log(this.xukezData);
+ // return;
+ update(this.xukezData).then((res) => {
+ console.log(res);
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ });
+ this.refreshChange();
+ this.textareaShenpi = "";
+ });
},
viewLicense(row) {
@@ -712,9 +446,47 @@
refreshChange() {
this.onLoad(this.page, this.query);
},
+ getFenji(name) {
+ var d = {};
+ if (name == "派出所管理员") {
+ d = {
+ // papprove: 1,
+ };
+ this.user_name = "派";
+ } else if (name == "县局管理员") {
+ d = {
+ papprove: "1",
+ };
+ this.user_name = "县";
+ } else if (name == "市局管理员") {
+ d = {
+ xapprove: "1",
+ };
+ this.user_name = "市";
+ }
+ return d;
+ },
+ changeState(data) {
+ var b = data;
+ if (this.user_name == "派") {
+ // 派出所审批
+ b["stateOur"] = b.papprove == "0" ? "0" : b.papprove == "1" ? "1" : "2";
+ } else if (this.user_name == "县") {
+ // 分局审批
+ b["stateOur"] = b.xapprove == "0" ? "0" : b.xapprove == "1" ? "1" : "2";
+ } else if (this.user_name == "市") {
+ // 市局审批
+ b["stateOur"] = b.sapprove == "0" ? "0" : b.sapprove == "1" ? "1" : "2";
+ }
+ return b;
+ },
onLoad(page, params = {}) {
this.loading = true;
params["ptype"] = 0;
+ params = {
+ ...params,
+ ...this.getFenji(this.userInfo.role_name),
+ };
getList(
page.currentPage,
page.pageSize,
@@ -723,6 +495,10 @@
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
+ for (var k in this.data) {
+ console.log(this.changeState(this.data[k]));
+ this.data[k] = this.changeState(this.data[k]);
+ }
this.loading = false;
this.selectionClear();
});
diff --git a/src/views/licenseApproval/securityTraining.vue b/src/views/licenseApproval/securityTraining.vue
index e2de008..028bf12 100644
--- a/src/views/licenseApproval/securityTraining.vue
+++ b/src/views/licenseApproval/securityTraining.vue
@@ -2,7 +2,7 @@
* @Author: liu
* @Date: 2021-08-26 16:55:25
* @Last Modified by: liu
- * @Last Modified time: 2021-09-11 16:35:54
+ * @Last Modified time: 2021-09-23 16:02:19
*/
@@ -55,82 +55,59 @@
:size="size"
:type="type"
@click.stop="rowDel(row)"
- v-if="row.type == '2'"
+ v-if="row.stateOur == '0'"
>许可审批
</el-button>
<el-button
icon="el-icon-edit"
:size="size"
:type="type"
+ v-if="row.stateOur != '0'"
+ @click.stop="rowSee(row)"
+ >审批查询
+ </el-button>
+ <el-button
+ icon="el-icon-edit"
+ :size="size"
+ :type="type"
@click.stop="viewLicense(row)"
- v-if="row.type == '0'"
+ v-if="
+ row.papprove == '1' && row.xapprove == '1' && row.sapprove == '1'
+ "
>打印许可证
</el-button>
</template>
<template class="tdtype" slot-scope="{ row }" slot="type">
<el-tag class="dtype">
{{
- row.type == "0" ? "通过" : row.type == "1" ? "不通过" : "待审核"
+ row.stateOur == "1"
+ ? "通过"
+ : row.stateOur == "2"
+ ? "不通过"
+ : "待审核"
}}
- <i class="gz" v-if="row.type == '0'"></i>
- <i class="yj" v-if="row.type == '1'"></i>
- <i class="zc" v-if="row.type == '2'"></i>
+ <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>
</el-tag>
</template>
</avue-crud>
</basic-container>
- <!-- <el-dialog
- :visible.sync="dialogVisible"
- :before-close="handleClose"
+ <el-dialog
+ title=""
+ :visible.sync="dialogVisibleccsee"
+ width="30%"
:modal-append-to-body="false"
- width="1005px"
- top="10vh"
- class="printstyle"
>
- <div id="licence_box">
- <div class="licence" id="licence" v-if="dialogVisible">
- <div class="licence-head">保安服务许可证</div>
- <div class="head-tid">
- 洪公保服务
- <span class="fontStyle">{{
- licenceData.row.organizationcode
- }}</span>
- 号
- </div>
- <div class="licence-main">
- <div
- class="l-m-once"
- v-for="(item, index, key) in licenceData.chiden"
- :key="key"
- >
- <span class="l-m-o-title"> {{ index }}: </span>
- <span class="l-m-r-once">{{ item }}</span>
- </div>
- </div>
- <div class="licence-bottom">发证机关（南昌市公安局）</div>
- <div class="l-bottom">
- 发证日期
- <span class="l-b-t">{{
- licenceData.row.permitime.slice(0, 4)
- }}</span
- >年
- <span class="l-b-t">{{
- licenceData.row.permitime.slice(5, 7)
- }}</span>
- 月
- <span class="l-b-t">{{
- licenceData.row.permitime.slice(8, 10)
- }}</span>
- 日
- </div>
+ <div class="flots">
+ <div class="f_title">
+ 审批 {{ stateOur == "1" ? "通过" : stateOur == "2" ? "不通过" : "" }}
</div>
+ <div><span>审批意见：</span> {{ stateText }}</div>
</div>
+ </el-dialog>
- <span slot="footer" class="dialog-footer">
- <el-button type="primary" @click="Print">打 印</el-button>
- </span>
- </el-dialog> -->
<div
v-if="dialogVisible"
class="dialogVisibles"
@@ -218,6 +195,7 @@
remove,
} from "@/api/licenseApproval/permit";
import { mapGetters } from "vuex";
+import { column } from "./column";
export default {
data() {
@@ -261,293 +239,14 @@
viewBtn: true,
selection: true,
dialogClickModal: false,
- column: [
- {
- label: "企业名称",
- search: true,
- prop: "enterprisename",
- searchLabelWidth: 80,
- searchSpan: 4,
- overHidden: true,
- width: 250,
- rules: [
- {
- required: true,
- message: "请输入企业名称",
- trigger: "blur",
- },
- ],
- },
- {
- label: "社会信用代码",
- prop: "creditcode",
- hide: true,
- rules: [
- {
- required: true,
- message: "请输入统一社会信用代码",
- trigger: "blur",
- },
- ],
- },
- {
- label: "法定代表人",
- prop: "representative",
- search: true,
- width: 82,
- searchLabelWidth: 90,
- rules: [
- {
- required: true,
- message: "请输入法定代表人",
- trigger: "blur",
- },
- ],
- },
- {
- label: "法定代表人电话",
- width: 106,
- prop: "representativecell",
- rules: [
- {
- required: true,
- message: "请输入法定代表人电话",
- trigger: "blur",
- },
- ],
- },
- {
- label: "联系人",
- prop: "contacts",
- width: 58,
- rules: [
- {
- required: true,
- message: "请输入联系人",
- trigger: "blur",
- },
- ],
- },
- {
- label: "联系人电话",
- width: 96,
- prop: "contactscell",
- rules: [
- {
- required: true,
- message: "请输入联系人电话",
- trigger: "blur",
- },
- ],
- },
- {
- label: "注册时间",
- hide: true,
- prop: "establishtime",
- type: "date",
- format: "yyyy-MM-dd",
- valueFormat: "yyyy-MM-dd",
- rules: [
- {
- required: true,
- message: "请输入注册时间",
- trigger: "blur",
- },
- ],
- },
- {
- label: "注册资本",
- prop: "registeredcapital",
- rules: [
- {
- required: true,
- message: "请输入注册资本",
- trigger: "blur",
- },
- ],
- },
- {
- label: "组织机构代码",
- prop: "organizationcode",
- hide: true,
- rules: [
- {
- required: true,
- message: "请输入组织机构代码",
- trigger: "blur",
- },
- ],
- },
- {
- label: "工商注册号",
- hide: true,
- prop: "registrationnumber",
- rules: [
- {
- required: true,
- message: "请输入工商注册号",
- trigger: "blur",
- },
- ],
- },
- // {
- // label: "纳税人识别号",
- // prop: "identificationnumber",
- // hide: true,
- // rules: [
- // {
- // required: true,
- // message: "请输入纳税人识别号",
- // trigger: "blur",
- // },
- // ],
- // },
- // {
- // label: "企业类型",
- // hide: true,
- // prop: "enterprises",
- // rules: [
- // {
- // required: true,
- // message: "请输入企业类型",
- // trigger: "blur",
- // },
- // ],
- // },
- {
- label: "注册地址",
- prop: "address",
- overHidden: true,
- rules: [
- {
- required: true,
- message: "请输入注册地址",
- trigger: "blur",
- },
- ],
- },
- // {
- // label: "所属辖区",
- // hide: true,
- // prop: "region",
- // rules: [
- // {
- // required: true,
- // message: "请输入所属辖区",
- // trigger: "blur",
- // },
- // ],
- // },
- {
- label: "登记机关",
- prop: "registration",
- overHidden: true,
- rules: [
- {
- required: true,
- message: "请输入登记机关",
- trigger: "blur",
- },
- ],
- },
- {
- label: "所属行业",
- hide: true,
- prop: "industry",
- rules: [
- {
- required: true,
- message: "请输入所属行业",
- trigger: "blur",
- },
- ],
- },
- // {
- // label: "所属机构",
- // prop: "deptid",
- // addDisplay: false,
- // type: "select",
- // hide: true,
- // dicUrl: "/api/blade-system/dept/selectIn",
- // props: {
- // label: "deptname",
- // value: "deptid",
- // },
- // },
- {
- label: "所属辖区",
- prop: "jurisdiction",
- type: "tree",
- dicUrl: "/api/jurisdiction/lazy-trees",
- props: {
- label: "title",
- value: "id",
- },
- // labelWidth: 160,
- // span: 12,
- },
- {
- label: "许可类型",
- // search: true,
- hide: true,
- prop: "ptype",
- type: "select",
- searchSpan: 4,
- dicData: [
- {
- label: "保安培训许可",
- value: "1",
- },
- ],
- },
- {
- label: "提交时间",
- prop: "permitime",
- overHidden: true,
- addDisplay: false,
- width: 132,
- type: "date",
- format: "yyyy-MM-dd HH:mm:ss",
- valueFormat: "yyyy-MM-dd HH:mm:ss",
- },
- {
- label: "审核状态",
- prop: "type",
- addDisplay: false,
- type: "select",
- dicData: [
- {
- label: "通过",
- value: "0",
- },
- {
- label: "不通过",
- value: "1",
- },
- {
- label: "待审核",
- value: "2",
- },
- ],
- },
- {
- label: "经营范围",
- prop: "business",
- component: "AvueUeditor",
- hide: true,
- minRows: 6,
- span: 24,
- rules: [
- {
- required: true,
- message: "请输入经营范围",
- trigger: "blur",
- },
- ],
- },
- ],
+ column: column,
},
data: [],
+
+ user_name: "",
+ stateOur: "",
+ stateText: "",
+ dialogVisibleccsee: false,
};
},
computed: {
@@ -622,20 +321,56 @@
this.dialogVisiblecc = true;
this.xukezData = row;
},
+ rowSee(row) {
+ this.dialogVisibleccsee = true;
+ this.stateOur = row.stateOur;
+ if (this.user_name == "派") {
+ // 派出所审批
+ this.stateText = row.popinion;
+ } else if (this.user_name == "县") {
+ // 分局审批
+ this.stateText = row.xopinion;
+ } else if (this.user_name == "市") {
+ // 市局审批
+ this.stateText = row.sopinion;
+ }
+ },
+
closecc() {
- this.xukezData.type = "0";
- this.dialogVisiblecc = false;
- this.xukezData["approve"] = this.textareaShenpi;
- console.log(this.xukezData);
- update(this.xukezData);
- this.textareaShenpi = "";
+ this.upsData("1", "0"); //通过
},
subcc() {
- this.xukezData.type = "1";
+ this.upsData("2", "1"); //不通过
+ },
+ upsData(state, type) {
this.dialogVisiblecc = false;
- this.xukezData["approve"] = this.textareaShenpi;
- update(this.xukezData);
- this.textareaShenpi = "";
+ if (this.user_name == "派") {
+ // 派出所审批
+ this.xukezData.papprove = state;
+ this.xukezData.popinion = this.textareaShenpi;
+ this.xukezData.type = type == "0" ? "2" : "1"; // 为了保持审核系统识别
+ } else if (this.user_name == "县") {
+ // 分局审批
+ this.xukezData.xapprove = state;
+ this.xukezData.xopinion = this.textareaShenpi;
+ this.xukezData.type = type == "0" ? "2" : "1"; // 为了保持审核系统识别
+ } else if (this.user_name == "市") {
+ // 市局审批
+ this.xukezData.sapprove = state;
+ this.xukezData.sopinion = this.textareaShenpi;
+ this.xukezData.type = type == "0" ? "0" : "1"; // 为了保持审核系统识别
+ }
+ console.log(this.xukezData);
+ // return;
+ update(this.xukezData).then((res) => {
+ console.log(res);
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ });
+ this.refreshChange();
+ this.textareaShenpi = "";
+ });
},
viewLicense(row) {
@@ -711,9 +446,47 @@
refreshChange() {
this.onLoad(this.page, this.query);
},
+ getFenji(name) {
+ var d = {};
+ if (name == "派出所管理员") {
+ d = {
+ // papprove: 1,
+ };
+ this.user_name = "派";
+ } else if (name == "县局管理员") {
+ d = {
+ papprove: "1",
+ };
+ this.user_name = "县";
+ } else if (name == "市局管理员") {
+ d = {
+ xapprove: "1",
+ };
+ this.user_name = "市";
+ }
+ return d;
+ },
+ changeState(data) {
+ var b = data;
+ if (this.user_name == "派") {
+ // 派出所审批
+ b["stateOur"] = b.papprove == "0" ? "0" : b.papprove == "1" ? "1" : "2";
+ } else if (this.user_name == "县") {
+ // 分局审批
+ b["stateOur"] = b.xapprove == "0" ? "0" : b.xapprove == "1" ? "1" : "2";
+ } else if (this.user_name == "市") {
+ // 市局审批
+ b["stateOur"] = b.sapprove == "0" ? "0" : b.sapprove == "1" ? "1" : "2";
+ }
+ return b;
+ },
onLoad(page, params = {}) {
this.loading = true;
params["ptype"] = 1;
+ params = {
+ ...params,
+ ...this.getFenji(this.userInfo.role_name),
+ };
getList(
page.currentPage,
page.pageSize,
@@ -722,6 +495,10 @@
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
+ for (var k in this.data) {
+ console.log(this.changeState(this.data[k]));
+ this.data[k] = this.changeState(this.data[k]);
+ }
this.loading = false;
this.selectionClear();
});
diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index be69d63..37f37bf 100644
--- a/src/views/system/user.vue
+++ b/src/views/system/user.vue
@@ -193,6 +193,7 @@
add,
grant,
resetPassword,
+ getJurisdiction,
} from "@/api/system/user";
import { getDeptTree, getDeptLazyTree } from "@/api/system/dept";
import { getRoleTree } from "@/api/system/role";
@@ -305,18 +306,21 @@
label: "所属组织机构",
prop: "deptName",
slot: true,
+ overHidden: true,
display: false,
},
{
label: "用户姓名",
prop: "realName",
search: true,
+ width: 90,
display: false,
},
{
label: "所属角色",
prop: "roleName",
slot: true,
+ width: 130,
display: false,
},
// {
@@ -806,21 +810,35 @@
row.deptId = row.deptId;
row.roleId = row.roleId.join(",");
row.postId = row.postId.join(",");
- add(row).then(
- () => {
- this.initFlag = false;
- this.onLoad(this.page);
- this.$message({
- type: "success",
- message: "操作成功!",
- });
- done();
- },
- (error) => {
- window.console.log(error);
- loading();
+ console.log(row, "row");
+ var params = {
+ deptname: row.$deptId,
+ };
+ getJurisdiction(params).then((res) => {
+ // console.log(res.data.data);
+ // return;
+ if (res.msg != "暂无承载数据") {
+ row.jurisdiction = res.data.data;
+ } else {
+ row.jurisdiction = "";
}
- );
+ add(row).then(
+ () => {
+ this.initFlag = false;
+ this.onLoad(this.page);
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ });
+ done();
+ },
+ (error) => {
+ window.console.log(error);
+ loading();
+ }
+ );
+ });
+ // return;
},
rowUpdate(row, index, done, loading) {
row.deptId = row.deptId;
--
Gitblit v1.9.3