From 8e2a42e4a2da78f9cda9fa3e7732a0ef72f0c906 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 12 Nov 2021 09:29:02 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises
---
src/views/licenseApproval/securityTraining.vue | 330 ++++++------------------------------------------------
1 files changed, 38 insertions(+), 292 deletions(-)
diff --git a/src/views/licenseApproval/securityTraining.vue b/src/views/licenseApproval/securityTraining.vue
index a2e3827..19a6be2 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-06 09:27:21
+ * @Last Modified time: 2021-11-05 14:52:22
*/
@@ -48,14 +48,14 @@
:type="type"
class="zhengJian-icon"
@click.stop="handleCredentials(row)"
- >附件查阅
+ >附件
</el-button>
<el-button
icon="el-icon-edit"
:size="size"
:type="type"
@click.stop="rowDel(row)"
- v-if="row.type == '2'"
+ v-if="row.type == '2' && userData == '0'"
>许可审批
</el-button>
<el-button
@@ -72,9 +72,12 @@
{{
row.type == "0" ? "通过" : row.type == "1" ? "不通过" : "待审核"
}}
- <i class="gz" v-if="row.type == '0'"></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 == '2'"></i>
+ <!-- 红色 -->
+ <i class="zc" v-if="row.type == '0'"></i>
+ <!-- 绿色 -->
</el-tag>
</template>
</avue-crud>
@@ -218,7 +221,7 @@
remove,
} from "@/api/licenseApproval/permit";
import { mapGetters } from "vuex";
-
+import { column } from "./column";
export default {
data() {
return {
@@ -261,293 +264,10 @@
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: [],
+ userData: "",
};
},
computed: {
@@ -572,6 +292,29 @@
// console.log(this.userInfo.dept_id);
// },
methods: {
+ changeuserData() {
+ // console.log(this.userInfo, "userDatauserDatauserData");
+ if (this.userInfo.Id == "1123598821738675201") {
+ this.userData = "0";
+ return;
+ }
+ var gonganj = "";
+ if (this.userInfo.role_name == "公安管理员") {
+ let test = /派出所$/g;
+ if (test.test(this.userInfo.list.name)) {
+ gonganj = "2";
+ }
+ test = /分局|公安局$/g;
+ if (test.test(this.userInfo.list.name)) {
+ gonganj = "1";
+ }
+ test = /市公安局$/g;
+ if (test.test(this.userInfo.list.name)) {
+ gonganj = "0";
+ }
+ }
+ this.userData = gonganj;
+ },
Print() {
this.$Print(this.$refs.licence);
},
@@ -581,7 +324,7 @@
path: "/attachOnce/index",
// redirect: { name: "foo" },
// query: { row: row },
- query: { deptid: row.cardid, type: "0" },
+ query: { deptid: row.cardid, type: "1" },
// params: { row: row.identificationnumber },
});
},
@@ -712,8 +455,11 @@
this.onLoad(this.page, this.query);
},
onLoad(page, params = {}) {
+ this.changeuserData();
this.loading = true;
params["ptype"] = 1;
+ params["jurisdiction"] = this.userInfo.jurisdiction;
+ params["usetype"] = this.userData;
getList(
page.currentPage,
page.pageSize,
--
Gitblit v1.9.3