From c2832e40f4b70ec7303a4e6fc673e93a61626d95 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 24 Sep 2021 09:23:54 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhba_regulatory
---
src/views/licenseApproval/cancellationOfFiling.vue | 307 -----
src/views/qualificationExamination/paymentInquiry.vue | 802 ++++++-------
src/views/licenseApproval/securityTraining.vue | 292 ----
src/views/resource/attachOnce.vue | 387 +++---
src/views/licenseApproval/column.js | 286 ++++
src/views/licenseApproval/securityGuard.vue | 499 ++-----
src/views/licenseApproval/securityPermit.vue | 290 ----
src/views/licenseApproval/crossRegion.vue | 330 -----
src/api/resource/attachOnce.js | 28
src/views/licenseApproval/branchOffice.vue | 330 -----
src/views/qualificationExamination/scoreInquiry.vue | 37
11 files changed, 1,063 insertions(+), 2,525 deletions(-)
diff --git a/src/api/resource/attachOnce.js b/src/api/resource/attachOnce.js
index 45cfeed..f826c1a 100644
--- a/src/api/resource/attachOnce.js
+++ b/src/api/resource/attachOnce.js
@@ -1,5 +1,33 @@
import request from '@/router/axios';
+
+
+export const getTemplate = (params, current, size) => {
+ return request({
+ url: '/api/licet/list',
+ method: 'get',
+ params: {
+ ...params,
+ current,
+ size,
+ }
+ })
+}
+
+export const getUseInfor = (params, current, size) => {
+ return request({
+ url: '/api/licetuser/list',
+ method: 'get',
+ params: {
+ ...params,
+ current,
+ size,
+ }
+ })
+}
+
+
+
export const getList = (current, size, params, cardid, type) => {
return request({
url: '/api/blade-resource/attach/list',
diff --git a/src/views/licenseApproval/branchOffice.vue b/src/views/licenseApproval/branchOffice.vue
index 59bc993..efc663e 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-06 09:20:45
+ * @Last Modified time: 2021-09-22 11:27:06
*/
@@ -167,7 +167,7 @@
remove,
} from "@/api/licenseApproval/record";
import { mapGetters } from "vuex";
-
+import { column } from "./column";
export default {
data() {
return {
@@ -210,329 +210,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: "单位许可证编号",
- 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: [],
};
@@ -569,7 +247,7 @@
path: "/attachOnce/index",
// redirect: { name: "foo" },
// query: { row: row },
- query: { deptid: row.cardid, type: "0" },
+ query: { deptid: row.cardid, type: "2" },
// params: { row: row.identificationnumber },
});
},
diff --git a/src/views/licenseApproval/cancellationOfFiling.vue b/src/views/licenseApproval/cancellationOfFiling.vue
index 4b3d450..8ef9dec 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-08-28 10:28:44
+ * @Last Modified time: 2021-09-22 11:25:46
*/
@@ -106,7 +106,7 @@
remove,
} from "@/api/licenseApproval/revoke";
import { mapGetters } from "vuex";
-
+import { column } from "./column";
export default {
data() {
return {
@@ -149,306 +149,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: [],
};
@@ -484,7 +185,7 @@
path: "/attachOnce/index",
// redirect: { name: "foo" },
// query: { row: row },
- query: { deptid: row.cardid, type: "0" },
+ query: { deptid: row.cardid, type: "6" },
// params: { row: row.identificationnumber },
});
},
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 162a6fb..078b46c 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-06 09:21:39
+ * @Last Modified time: 2021-09-23 16:44:17
*/
@@ -165,7 +165,7 @@
remove,
} from "@/api/licenseApproval/recordk";
import { mapGetters } from "vuex";
-
+import { column } from "./column";
export default {
data() {
return {
@@ -208,329 +208,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",
- 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: [],
};
@@ -566,7 +244,7 @@
path: "/attachOnce/index",
// redirect: { name: "foo" },
// query: { row: row },
- query: { deptid: row.cardid, type: "0" },
+ query: { deptid: row.cardid, type: "5" },
// params: { row: row.identificationnumber },
});
},
diff --git a/src/views/licenseApproval/securityGuard.vue b/src/views/licenseApproval/securityGuard.vue
index 3750234..ddd8bd3 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-07 17:44:35
+ * @Last Modified time: 2021-09-23 08:37:38
*/
@@ -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>
@@ -148,7 +171,7 @@
<div
id="licence_box"
:class="classStyle == 'print' ? 'printstyle' : ''"
- ref="licencehuizhi"
+ ref="licencelicencehuizhi"
>
<div
class="licencehuizhi exam-box"
@@ -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 {
@@ -252,7 +288,7 @@
searchShow: true,
searchMenuSpan: 8,
border: true,
- menuWidth: 378,
+ menuWidth: 300,
labelWidth: 130,
headerAlign: "center",
align: "center",
@@ -261,332 +297,14 @@
viewBtn: true,
selection: true,
dialogClickModal: false,
- column: [
- {
- label: "企业名称",
- search: true,
- prop: "enterprisename",
- searchLabelWidth: 80,
- searchSpan: 4,
- overHidden: true,
- width: 200,
- 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",
- width: 80,
- 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,7 +341,7 @@
path: "/attachOnce/index",
// redirect: { name: "foo" },
// query: { row: row },
- query: { deptid: row.cardid, type: "0" },
+ query: { deptid: row.cardid, type: "3" },
// params: { row: row.identificationnumber },
});
},
@@ -664,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 = ""; // 为了保持审核系统识别
+ } else if (this.user_name == "分") {
+ // 分局审批
+ this.xukezData.xapprove = state;
+ this.xukezData.xopinion = this.textareaShenpi;
+ this.xukezData.type = ""; // 为了保持审核系统识别
+ } else if (this.user_name == "市") {
+ // 市局审批
+ this.xukezData.sapprove = state;
+ this.xukezData.sopinion = this.textareaShenpi;
+ this.xukezData.type = type; // 为了保持审核系统识别
+ }
+ 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;
},
@@ -762,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,
@@ -773,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 2d395da..120f236 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-28 10:29:07
+ * @Last Modified time: 2021-09-22 11:26:34
*/
<template>
@@ -218,7 +218,7 @@
remove,
} from "@/api/licenseApproval/permit";
import { mapGetters } from "vuex";
-
+import { column } from "./column";
export default {
data() {
return {
@@ -261,291 +261,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",
- 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: [],
};
diff --git a/src/views/licenseApproval/securityTraining.vue b/src/views/licenseApproval/securityTraining.vue
index dc89582..54cf1bd 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:37
+ * @Last Modified time: 2021-09-22 11:26:08
*/
@@ -218,7 +218,7 @@
remove,
} from "@/api/licenseApproval/permit";
import { mapGetters } from "vuex";
-
+import { column } from "./column";
export default {
data() {
return {
@@ -261,291 +261,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",
- 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: [],
};
@@ -581,7 +297,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 },
});
},
diff --git a/src/views/qualificationExamination/paymentInquiry.vue b/src/views/qualificationExamination/paymentInquiry.vue
index 14747de..6f19fe3 100644
--- a/src/views/qualificationExamination/paymentInquiry.vue
+++ b/src/views/qualificationExamination/paymentInquiry.vue
@@ -1,63 +1,75 @@
/*
* @Author: Morpheus
* @Date: 2021-07-07 17:30:05
- * @Last Modified by: Morpheus
- * @Last Modified time: 2021-08-12 19:32:05
+ * @Last Modified by: liu
+ * @Last Modified time: 2021-09-23 08:32:06
* menu-name 缴费查询
*/
<template>
- <basic-container>
- <avue-crud :option="option"
- :table-loading="loading"
- :data="data"
- :page.sync="page"
- :permission="permissionList"
- v-model="form"
- ref="crud"
- @row-update="rowUpdates"
- @row-save="rowSave"
- @row-del="rowDel"
- @search-change="searchChange"
- @search-reset="searchReset"
- @selection-change="selectionChange"
- @current-change="currentChange"
- @size-change="sizeChange"
- @refresh-change="refreshChange"
- @on-load="onLoad">
+ <basic-container>
+ <avue-crud
+ :option="option"
+ :table-loading="loading"
+ :data="data"
+ :page.sync="page"
+ :permission="permissionList"
+ v-model="form"
+ ref="crud"
+ @row-update="rowUpdates"
+ @row-save="rowSave"
+ @row-del="rowDel"
+ @search-change="searchChange"
+ @search-reset="searchReset"
+ @selection-change="selectionChange"
+ @current-change="currentChange"
+ @size-change="sizeChange"
+ @refresh-change="refreshChange"
+ @on-load="onLoad"
+ >
+ <template slot-scope="{ type, size, row }" slot="menu">
+ <el-button
+ icon="el-icon-edit"
+ :size="size"
+ :type="type"
+ :disabled="row.paymentStatus == '3'"
+ @click.stop="openDialog(row)"
+ >缴费确认
+ </el-button>
+ </template>
- <template slot-scope="{ type, size, row }"
- slot="menu">
+ <template slot-scope="{ row }" slot="sex">
+ {{ row.sex == 1 ? "男" : row.sex == 2 ? "女" : "" }}
+ </template>
- <el-button icon="el-icon-edit"
- :size="size"
- :type="type"
- @click.stop="payTheFees(row)">缴费确认
- </el-button>
-
- </template>
-
-
- <template slot-scope="{ row }"
- slot="sex">
- {{row.sex==1?'男':row.sex==2?'女':''}}
- </template>
-
- <template class="tdtype"
- slot-scope="{ row }"
- slot="paymentStatus">
- <el-tag class="dtype">
- {{ row.paymentStatus == "1" ? "已缴费" : row.paymentStatus == "2" ? "未缴费" : "部分缴费" }}
- <i class="gz"
- v-if="row.paymentStatus == '1'"></i>
- <i class="yj"
- v-if="row.paymentStatus == '2'"></i>
- <i class="zc"
- v-if="row.paymentStatus == '3'"></i>
- </el-tag>
- </template>
-
- </avue-crud>
- </basic-container>
+ <template class="tdtype" slot-scope="{ row }" slot="paymentStatus">
+ <el-tag class="dtype">
+ {{
+ row.paymentStatus == "1"
+ ? "已缴费"
+ : row.paymentStatus == "2"
+ ? "未缴费"
+ : "待确定"
+ }}
+ <i class="gz" v-if="row.paymentStatus == '1'"></i>
+ <i class="yj" v-if="row.paymentStatus == '2'"></i>
+ <i class="zc" v-if="row.paymentStatus == '3'"></i>
+ </el-tag>
+ </template>
+ </avue-crud>
+ <el-dialog
+ title="提示"
+ :visible.sync="dialogVisible"
+ width="30%"
+ :before-close="handleClose"
+ :modal-append-to-body="false"
+ >
+ <span>是否确认缴费</span>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="DoIt('1')"> 已缴费 </el-button>
+ <el-button @click="DoIt('2')">未缴费</el-button>
+ </span>
+ </el-dialog>
+ </basic-container>
</template>
<script>
@@ -71,410 +83,338 @@
import { mapGetters } from "vuex";
import { datasing } from "./dataqualificationExamination";
// import { getList } from "@/api/qualificationExamination/qualificationExamination";
-import { getLispereexamPayment, update } from "@/api/qualificationExamination/scoreInquiry";
+import {
+ getLispereexamPayment,
+ update,
+} from "@/api/qualificationExamination/scoreInquiry";
export default {
- data () {
- var dic1 = [
- {
- label: "公司缴费",
+ data() {
+ var dic1 = [
+ {
+ label: "公司缴费",
+ value: 1,
+ },
+ {
+ label: "个人缴费",
+ value: 2,
+ },
+ ];
+ var dic2 = [
+ {
+ label: "已缴费",
+ value: 1,
+ },
+ {
+ label: "未缴费",
+ value: 2,
+ },
+ {
+ label: "部分缴费",
+ value: 3,
+ },
+ ];
+ return {
+ form: {},
+ query: {},
+ loading: true,
+ page: {
+ pageSize: 10,
+ currentPage: 1,
+ total: 0,
+ },
+ selectionList: [],
+ option: {
+ // 操作栏多余按钮去除
+ delBtn: false,
+ editBtn: false,
+ addBtn: false,
+ selection: true,
+ menu: true,
+
+ searchShowBtn: false,
+
+ align: "center",
+ height: "auto",
+ calcHeight: 30,
+ tip: false,
+ searchShow: true,
+ searchMenuSpan: 6,
+ index: true,
+ viewBtn: true,
+ dialogClickModal: false,
+
+ column: [
+ // {
+ // label: "缴费类型",
+ // prop: "type",
+ // dicData:[
+ // {
+ // label:"公司缴费",
+ // value: 1
+ // },
+ // {
+ // label:"个人缴费",
+ // value: 2
+ // }
+ // ],
+ // searchSpan: 4,
+ // search: true,
+ // type: "select",
+ // },
+ {
+ label: "缴费人",
+ prop: "realName",
+ search: true,
+ searchSpan: 4,
+ },
+ {
+ label: "身份证号",
+ prop: "idCardNo",
+ search: true,
+ searchSpan: 4,
+ },
+ {
+ label: "性别",
+ prop: "sex",
+ slot: true,
+ dicData: [
+ {
+ label: "男",
value: 1,
- },
- {
- label: "个人缴费",
+ },
+ {
+ label: "女",
value: 2,
- },
- ];
- var dic2 = [
- {
+ },
+ ],
+ },
+ {
+ label: "联系方式",
+ prop: "phone",
+ },
+ {
+ label: "所在单位",
+ prop: "deptName",
+ search: true,
+ searchSpan: 6,
+ },
+ {
+ label: "缴费状态",
+ prop: "paymentStatus",
+ searchSpan: 4,
+ search: true,
+ dicData: [
+ {
label: "已缴费",
value: 1,
- },
- {
+ },
+ {
label: "未缴费",
value: 2,
- },
- {
+ },
+ {
label: "部分缴费",
value: 3,
- },
- ];
- return {
- form: {},
- query: {},
- loading: true,
- page: {
- pageSize: 10,
- currentPage: 1,
- total: 0,
- },
- selectionList: [],
- option: {
- // 操作栏多余按钮去除
- delBtn: false,
- editBtn: false,
- addBtn: false,
- selection: true,
- menu: true,
-
- searchShowBtn: false,
-
- align: "center",
- height: "auto",
- calcHeight: 30,
- tip: false,
- searchShow: true,
- searchMenuSpan: 6,
- index: true,
- viewBtn: true,
- dialogClickModal: false,
-
- column: [
- // {
- // label: "缴费类型",
- // prop: "type",
- // dicData:[
- // {
- // label:"公司缴费",
- // value: 1
- // },
- // {
- // label:"个人缴费",
- // value: 2
- // }
- // ],
- // searchSpan: 4,
- // search: true,
- // type: "select",
- // },
- {
- label: "缴费人",
- prop: "realName",
- search:true,
- searchSpan:4,
- },
- {
- label: "身份证号",
- prop: "idCardNo",
- search:true,
- searchSpan:4,
- },
- {
- label: "性别",
- prop: "sex",
- slot:true,
- dicData: [
- {
- label:"男",
- value:1
- },
- {
- label:"女",
- value:2
- }
- ],
- },
- {
- label: "联系方式",
- prop: "phone",
- },
- {
- label: "所在单位",
- prop: "deptName",
- search:true,
- searchSpan:6,
- },
- {
- label: "缴费状态",
- prop: "paymentStatus",
- searchSpan: 4,
- search: true,
- dicData: [
- {
- label:"已缴费",
- value:1
- },
- {
- label:"未缴费",
- value:2
- },
- {
- label:"部分缴费",
- value:3
- },
- ],
- type: "select",
- },
- {
- label: "缴费凭证",
- prop: "certificateUrl",
- overHidden: true,
- type: "upload",
- listType: "picture-img",
- },
- {
- label: "缴费时间",
- prop: "paymentTime",
- type: "date",
- format: "yyyy-MM-dd",
- valueFormat: "yyyy-MM-dd",
- labelWidth: 120,
- searchSpan: 4,
- // search: true,
- overHidden: true,
- rules: [
- {
- required: true,
- message: "请输入时间",
- trigger: "click",
- },
- ],
- },
- ],
- },
- data: [
- // {
- // deptid: "江西众泰保安公司",
- // punishtype: 2,
- // punishreason: "非法施工",
- // punishresult: "没收全部非法所得财产，并罚款3W元",
- // punishtime: "2021-01-01",
- // punisnum: 110110110120,
- // },
+ },
],
- };
+ type: "select",
+ },
+ {
+ label: "缴费凭证",
+ prop: "certificateUrl",
+ overHidden: true,
+ type: "upload",
+ listType: "picture-img",
+ },
+ {
+ label: "缴费时间",
+ prop: "paymentTime",
+ type: "date",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ labelWidth: 120,
+ searchSpan: 4,
+ // search: true,
+ overHidden: true,
+ rules: [
+ {
+ required: true,
+ message: "请输入时间",
+ trigger: "click",
+ },
+ ],
+ },
+ ],
+ },
+ data: [],
+ onceData: {},
+ dialogVisible: false,
+ };
+ },
+ computed: {
+ ...mapGetters(["permission"]),
+ permissionList() {
+ return {
+ addBtn: this.vaildData(this.permission.post_add, false),
+ viewBtn: this.vaildData(this.permission.post_view, false),
+ delBtn: this.vaildData(this.permission.post_delete, false),
+ editBtn: this.vaildData(this.permission.post_edit, false),
+ };
},
- computed: {
- ...mapGetters(["permission"]),
- permissionList () {
- return {
- addBtn: this.vaildData(this.permission.post_add, false),
- viewBtn: this.vaildData(this.permission.post_view, false),
- delBtn: this.vaildData(this.permission.post_delete, false),
- editBtn: this.vaildData(this.permission.post_edit, false),
- };
- },
- ids () {
- let ids = [];
- this.selectionList.forEach((ele) => {
- ids.push(ele.id);
- });
- return ids.join(",");
- },
+ ids() {
+ let ids = [];
+ this.selectionList.forEach((ele) => {
+ ids.push(ele.id);
+ });
+ return ids.join(",");
},
- methods: {
- rowSave (row, done, loading) {
- adddata(row).then(
- () => {
- this.onLoad(this.page);
- this.$message({
- type: "success",
- message: "操作成功!",
- });
- done();
- },
- (error) => {
- window.console.log(error);
- loading();
- }
- );
+ },
+ methods: {
+ rowSave(row, done, loading) {
+ adddata(row).then(
+ () => {
+ this.onLoad(this.page);
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ });
+ done();
},
- rowUpdates (row, index, done, loading) {
- // console.log(42342);
- update(row).then(
- () => {
- this.onLoad(this.page);
- this.$message({
- type: "success",
- message: "操作成功!",
- });
- done();
- },
- (error) => {
- window.console.log(error);
- loading();
- }
- );
- },
- rowDel (row) {
- this.$confirm("确定将选择数据删除?", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning",
- })
- .then(() => {
- return remove(row.id);
- })
- .then(() => {
- this.onLoad(this.page);
- this.$message({
- type: "success",
- message: "操作成功!",
- });
- });
- },
-
- payTheFees (row) {
- console.log(row)
- this.$confirm("请确认是否缴费？", {
- confirmButtonText: "已缴费",
- cancelButtonText: "未缴费",
- type: "warning",
- })
- .then(() => {
- row.paymentStatus = "1";
- return update(row).then(() => {
- this.onLoad(this.page);
- this.$message({
- type: "success",
- message: "操作成功!",
- });
- });
- })
- .catch(() => {
- row.paymentStatus = "2";
- return update(row).then(() => {
- this.onLoad(this.page);
- this.$message({
- type: "success",
- message: "操作成功!",
- });
- });
- });
- },
-
- // beforeOpen(done, type) {
- // if (["edit", "view"].includes(type)) {
- // getDetail(this.form.id).then((res) => {
- // this.form = res.data.data;
- // });
- // }
- // done();
- // },
-
- searchReset () {
- this.query = {};
- this.onLoad(this.page);
- },
-
- searchChange (params, done) {
- this.query = params;
- this.page.currentPage = 1;
- this.onLoad(this.page, params);
- done();
- },
- selectionChange (list) {
- this.selectionList = list;
- },
- selectionClear () {
- this.selectionList = [];
- this.$refs.crud.toggleSelection();
- },
- currentChange (currentPage) {
- this.page.currentPage = currentPage;
- },
- sizeChange (pageSize) {
- this.page.pageSize = pageSize;
- },
- refreshChange () {
- this.onLoad(this.page, this.query);
- },
- onLoad (page, params = {}) {
- // this.loading = false;
- this.loading = true;
- getLispereexamPayment(
- page.currentPage,
- page.pageSize,
- Object.assign(params, this.query)
- ).then((res) => {
- const data = res.data.data;
- this.page.total = data.total;
- this.data = data.records;
- console.log(this.data, "getLispereexamPayment");
- this.loading = false;
- // this.selectionClear();
- });
- },
- // onLoad(page, params = {}) {
- // // this.loading = false;
- // this.loading = true;
- // // getListJSON().then((res) => {
- // // axios
- // // .get(
- // // "../../api/qualificationExamination/signQualificationExamination.json"
- // // )
- // // .then((res) => {
- // // page.currentPage,
- // // page.pageSize,
- // // Object.assign(params, this.query)
- // if (datasing) {
- // var res = datasing;
- // console.log(res, "signQualificationExamination");
- // const data = res.data;
- // // this.page.total = data.total;
- // var d = data.records;
- // for (var k in d) {
- // d[k].examination_mx = "正常";
- // d[k].examination_type = "正常";
- // d[k]["carid"] = "370111198807051124";
- // d[k]["certificate"] = "拥有";
- // d[k]["reviewTime"] = "2021-02-21";
- // d[k]["results"] = "通过";
- // d[k]["onjob"] = "是";
- // }
- // this.data = d;
- // this.loading = false;
- // }
- // // this.selectionClear();
- // // });
- // },
-
- // 行单击
- // handleRowClick(row) {
- // // delete (row["name"]);
- // var obj = row;
- // obj["name"] = "保安公司详细资料";
- // this.$router.push({
- // path: `/securityCompany/index`,
- // query: obj,
- // });
- // },
+ (error) => {
+ window.console.log(error);
+ loading();
+ }
+ );
},
+ rowUpdates(row, index, done, loading) {
+ // console.log(42342);
+ update(row).then(
+ () => {
+ this.onLoad(this.page);
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ });
+ done();
+ },
+ (error) => {
+ window.console.log(error);
+ loading();
+ }
+ );
+ },
+ rowDel(row) {
+ this.$confirm("确定将选择数据删除?", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ })
+ .then(() => {
+ return remove(row.id);
+ })
+ .then(() => {
+ this.onLoad(this.page);
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ });
+ });
+ },
+ openDialog(row) {
+ this.dialogVisible = true;
+ this.onceData = row;
+ },
+ DoIt(n) {
+ this.onceData.paymentStatus = n;
+ update(this.onceData).then(() => {
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ });
+ this.onLoad(this.page);
+ this.dialogVisible = false;
+ });
+ },
+ searchReset() {
+ this.query = {};
+ this.onLoad(this.page);
+ },
+
+ searchChange(params, done) {
+ this.query = params;
+ this.page.currentPage = 1;
+ this.onLoad(this.page, params);
+ done();
+ },
+ selectionChange(list) {
+ this.selectionList = list;
+ },
+ selectionClear() {
+ this.selectionList = [];
+ this.$refs.crud.toggleSelection();
+ },
+ currentChange(currentPage) {
+ this.page.currentPage = currentPage;
+ },
+ sizeChange(pageSize) {
+ this.page.pageSize = pageSize;
+ },
+ refreshChange() {
+ this.onLoad(this.page, this.query);
+ },
+ onLoad(page, params = {}) {
+ // this.loading = false;
+ this.loading = true;
+ getLispereexamPayment(
+ page.currentPage,
+ page.pageSize,
+ Object.assign(params, this.query)
+ ).then((res) => {
+ const data = res.data.data;
+ this.page.total = data.total;
+ this.data = data.records;
+ console.log(this.data, "getLispereexamPayment");
+ this.loading = false;
+ // this.selectionClear();
+ });
+ },
+ },
};
</script>
<style scoped>
.dtype {
- width: 80px;
+ width: 80px;
}
.zc {
- position: absolute;
- top: 50%;
- margin-top: -5px;
- margin-left: 6px;
- width: 10px;
- height: 10px;
- border-radius: 30%;
- background: #29c093;
+ position: absolute;
+ top: 50%;
+ margin-top: -5px;
+ margin-left: 6px;
+ width: 10px;
+ height: 10px;
+ border-radius: 30%;
+ background: #29c093;
}
.yj {
- position: absolute;
- top: 50%;
- margin-top: -5px;
- margin-left: 6px;
- width: 10px;
- height: 10px;
- border-radius: 30%;
- background: #f34a4a;
+ position: absolute;
+ top: 50%;
+ margin-top: -5px;
+ margin-left: 6px;
+ width: 10px;
+ height: 10px;
+ border-radius: 30%;
+ background: #f34a4a;
}
.gz {
- position: absolute;
- top: 50%;
- margin-top: -5px;
- margin-left: 6px;
- width: 10px;
- height: 10px;
- border-radius: 30%;
- background: #f48f57;
+ position: absolute;
+ top: 50%;
+ margin-top: -5px;
+ margin-left: 6px;
+ width: 10px;
+ height: 10px;
+ border-radius: 30%;
+ background: #f48f57;
}
</style>
diff --git a/src/views/qualificationExamination/scoreInquiry.vue b/src/views/qualificationExamination/scoreInquiry.vue
index c233482..8e60522 100644
--- a/src/views/qualificationExamination/scoreInquiry.vue
+++ b/src/views/qualificationExamination/scoreInquiry.vue
@@ -1,8 +1,8 @@
/*
* @Author: Morpheus
* @Date: 2021-07-07 17:30:05
- * @Last Modified by: Morpheus
- * @Last Modified time: 2021-07-10 16:06:14
+ * @Last Modified by: liu
+ * @Last Modified time: 2021-09-22 17:02:18
* menu-name 监管信息
*/
<template>
@@ -83,8 +83,8 @@
{
label: "考试名称",
prop: "examName",
- search:true,
- searchSpan:6,
+ search: true,
+ searchSpan: 6,
// slot: true,
// display: false,
},
@@ -96,7 +96,7 @@
format: "yyyy-MM-dd",
valueFormat: "yyyy-MM-dd",
labelWidth: 120,
-
+
overHidden: true,
rules: [
{
@@ -163,21 +163,21 @@
prop: "qualified",
searchSpan: 4,
search: true,
- type:"select",
- dicData:[
+ type: "select",
+ dicData: [
{
- label:"合格",
- value: 0
+ label: "合格",
+ value: 0,
},
{
- label:"不合格",
- value: 1
+ label: "不合格",
+ value: 1,
},
{
- label:"实操成绩暂未录入",
- value: 3
+ label: "实操成绩暂未录入",
+ value: 3,
},
- ]
+ ],
// slot: true,
// display: false,
},
@@ -309,6 +309,13 @@
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
+ for (var k in this.data) {
+ for (var m in this.data[k]) {
+ if (this.data[k][m] == -1) {
+ this.data[k][m] = "";
+ }
+ }
+ }
this.loading = false;
// for (var k in d) {
// if (d[k].qualified == 0) {
@@ -321,7 +328,7 @@
// }
// this.data = d;
// console.log(this.data);
-
+
// this.selectionClear();
});
},
diff --git a/src/views/resource/attachOnce.vue b/src/views/resource/attachOnce.vue
index 8e41e86..52d20e6 100644
--- a/src/views/resource/attachOnce.vue
+++ b/src/views/resource/attachOnce.vue
@@ -1,86 +1,100 @@
<template>
<basic-container>
- <avue-crud
- :option="option"
- :table-loading="loading"
- :data="data"
- :page.sync="page"
- :permission="permissionList"
- :before-open="beforeOpen"
- v-model="form"
- ref="crud"
- @row-del="rowDel"
- @search-change="searchChange"
- @search-reset="searchReset"
- @selection-change="selectionChange"
- @current-change="currentChange"
- @size-change="sizeChange"
- @refresh-change="refreshChange"
- @on-load="onLoad"
- >
- <template slot="menuLeft">
- <!-- <el-button type="primary"-->
- <!-- size="small"-->
- <!-- plain-->
- <!-- icon="el-icon-upload2"-->
- <!-- @click="handleUpload">上 传-->
- <!-- </el-button>-->
- <!-- <el-button type="danger"-->
- <!-- size="small"-->
- <!-- icon="el-icon-delete"-->
- <!-- plain-->
- <!-- @click="handleDelete">删 除-->
- <!-- </el-button>-->
- </template>
- <template slot-scope="scope" slot="menu">
- <el-button
- type="text"
- icon="el-icon-download"
- size="small"
- @click="handleDownload(scope.row)"
- >下载
- </el-button>
- <el-button
- type="text"
- icon="el-icon-picture-outline-round"
- size="small"
- v-show="!fileFormat(scope.row)"
- @click="seeImages(scope.row)"
- >预览
- </el-button>
- </template>
- <template slot-scope="{ row }" slot="attachSize">
- <el-tag>{{ `${row.attachSize} KB` }}</el-tag>
- </template>
- </avue-crud>
- <el-dialog
- title="附件管理"
- append-to-body
- :visible.sync="attachBox"
- width="555px"
- >
- <avue-form
- ref="form"
- :option="attachOption"
- v-model="attachForm"
- :upload-after="uploadAfter"
+ <div>
+ <slot name="buts"></slot>
+ <avue-crud
+ :option="option"
+ :table-loading="loading"
+ :data="seeData"
+ :page.sync="page"
+ :permission="permissionList"
+ :before-open="beforeOpen"
+ v-model="form"
+ ref="crud"
+ @row-del="rowDel"
+ @search-change="searchChange"
+ @search-reset="searchReset"
+ @selection-change="selectionChange"
+ @current-change="currentChange"
+ @size-change="sizeChange"
+ @refresh-change="refreshChange"
+ @on-load="onLoad"
>
- </avue-form>
- </el-dialog>
+ <template slot-scope="{ row }" slot="links">
+ <el-tag>
+ {{ getType(row.link) }}
+ </el-tag>
+ </template>
+ <template slot="menuLeft">
+ <!-- <el-button type="primary"-->
+ <!-- size="small"-->
+ <!-- plain-->
+ <!-- icon="el-icon-upload2"-->
+ <!-- @click="handleUpload">上 传-->
+ <!-- </el-button>-->
+ <!-- <el-button type="danger"-->
+ <!-- size="small"-->
+ <!-- icon="el-icon-delete"-->
+ <!-- plain-->
+ <!-- @click="handleDelete">删 除-->
+ <!-- </el-button>-->
+ </template>
+ <template slot-scope="scope" slot="menu">
+ <el-button
+ type="text"
+ icon="el-icon-download"
+ size="small"
+ @click="handleDownload(scope.row)"
+ >下载
+ </el-button>
+ <el-button
+ type="text"
+ icon="el-icon-picture-outline-round"
+ size="small"
+ v-show="!fileFormat(scope.row)"
+ @click="seeImages(scope.row)"
+ >预览
+ </el-button>
+ </template>
+ <!-- <template slot-scope="{ row }" slot="attachSize">
+ <el-tag>{{ `${row.attachSize} KB` }}</el-tag>
+ </template> -->
+ </avue-crud>
+ <el-dialog
+ title="附件管理"
+ append-to-body
+ :visible.sync="attachBox"
+ width="555px"
+ >
+ <avue-form
+ ref="form"
+ :option="attachOption"
+ v-model="attachForm"
+ :upload-after="uploadAfter"
+ >
+ </avue-form>
+ </el-dialog>
- <el-dialog
- title="预览"
- append-to-body
- :visible.sync="imgSee"
- class="see-img-box"
- >
- <div class="img" :style="{ background: imgUrl }"></div>
- </el-dialog>
+ <el-dialog
+ title="预览"
+ append-to-body
+ :visible.sync="imgSee"
+ class="see-img-box"
+ >
+ <div class="img" :style="{ background: imgUrl }"></div>
+ </el-dialog>
+ </div>
</basic-container>
</template>
<script>
-import { getList, getDetail, remove } from "@/api/resource/attachOnce";
+import {
+ getUseInfor,
+ getTemplate,
+ getList,
+ getDetail,
+ remove,
+} from "@/api/resource/attachOnce";
import { mapGetters } from "vuex";
import ElImageViewer from "element-ui/packages/image/src/image-viewer";
@@ -99,7 +113,7 @@
attachBox: false,
selectionList: [],
option: {
- height: "auto",
+ height: 620,
calcHeight: 30,
tip: false,
searchShow: true,
@@ -108,10 +122,23 @@
headerAlign: "center",
border: true,
index: true,
+ align: "center",
+ delBtn: false,
viewBtn: true,
selection: true,
dialogClickModal: false,
column: [
+ {
+ label: "附件名称",
+ prop: "id",
+ rules: [
+ {
+ required: true,
+ message: "请输入附件地址",
+ trigger: "blur",
+ },
+ ],
+ },
{
label: "附件地址",
prop: "link",
@@ -124,124 +151,24 @@
],
},
{
- label: "附件域名",
- prop: "domain",
- search: true,
+ label: "附件格式",
+ prop: "links",
+ width: 120,
rules: [
{
required: true,
- message: "请输入附件域名",
+ message: "请输入附件地址",
trigger: "blur",
- },
- ],
- },
- {
- label: "附件名称",
- prop: "name",
- search: true,
- rules: [
- {
- required: true,
- message: "请输入附件名称",
- trigger: "blur",
- },
- ],
- },
- {
- label: "附件原名",
- prop: "originalName",
- search: true,
- rules: [
- {
- required: true,
- message: "请输入附件原名",
- trigger: "blur",
- },
- ],
- },
- {
- label: "附件拓展名",
- prop: "extension",
- rules: [
- {
- required: true,
- message: "请输入附件拓展名",
- trigger: "blur",
- },
- ],
- },
- {
- label: "附件大小",
- prop: "attachSize",
- slot: true,
- rules: [
- {
- required: true,
- message: "请输入附件大小",
- trigger: "blur",
- },
- ],
- },
- {
- label: "所属机构",
- prop: "deptid",
- type: "select",
- dicUrl: "/api/blade-system/dept/selectIn",
- props: {
- label: "deptname",
- value: "deptid",
- },
- },
- {
- label: "类型",
- prop: "type",
- addDisplay: false,
- width: 80,
- type: "select",
- dicData: [
- {
- label: "许可审批",
- value: "0",
- },
- {
- label: "备案",
- value: "1",
- },
- {
- label: "撤销",
- value: "2",
- },
- {
- label: "跨区备案",
- value: "3",
},
],
},
],
},
data: [],
- attachForm: {},
- attachOption: {
- submitBtn: false,
- emptyBtn: false,
- column: [
- {
- label: "附件上传",
- prop: "attachFile",
- type: "upload",
- drag: true,
- loadText: "模板上传中，请稍等",
- span: 24,
- propsHttp: {
- res: "data",
- },
- action: "/api/blade-resource/oss/endpoint/put-file-attach?deptid=",
- },
- ],
- },
-
imgSee: false,
imgUrl: "",
+ ourData: [],
+ seeData: [],
};
},
created() {
@@ -260,9 +187,9 @@
if (i > 1) {
this.$store.state.tags.tagList.splice(ind, 1);
}
- var deptid = this.$route.query.deptid;
- var type = this.$route.query.type;
- this.attachOption.column[0].action += deptid + "&type=" + type;
+ // var deptid = this.$route.query.deptid;
+ // var type = this.$route.query.type;
+ // this.attachOption.column[0].action += deptid + "&type=" + type;
},
computed: {
...mapGetters(["permission"]),
@@ -370,19 +297,77 @@
},
onLoad(page, params = {}) {
this.loading = true;
- getList(
- page.currentPage,
- page.pageSize,
- Object.assign(params, this.query),
- this.$route.query.deptid,
- this.$route.query.type
- ).then((res) => {
- const data = res.data.data;
- this.page.total = data.total;
- this.data = data.records;
- this.loading = false;
- this.selectionClear();
+ this.data = [];
+ params["ptype"] = this.$route.query.type;
+ getTemplate(params, 1, 50).then((res) => {
+ //获取模板
+ const mobel = res.data.data.records;
+ console.log(mobel);
+ params["userid"] = this.$route.query.deptid;
+ getUseInfor(params).then((res) => {
+ //处理对应数据
+ const data = res.data.data.records[0];
+ console.log(data);
+ if (data == [] || data == undefined) {
+ this.data = [];
+ this.loading = false;
+ return;
+ }
+ var links = data.links.split(",");
+ var id = data.templateid.split(",");
+ for (let k in links) {
+ this.data.push({
+ link: links[k],
+ id: +id[k] + 1,
+ });
+ }
+ console.log(this.data);
+ for (let n in this.data) {
+ //处理模板
+ for (let m in mobel) {
+ if (this.data[n].id == mobel[m].id) {
+ this.data[n].id = mobel[m].originalname;
+ }
+ }
+ }
+ this.ourData = [
+ ...this.data,
+ // ...this.data,
+ // ...this.data,
+ // ...this.data,
+ // ...this.data,
+ // ...this.data,
+ // ...this.data,
+ // ...this.data,
+ // ...this.data,
+ // ...this.data,
+ // ...this.data,
+ // ...this.data,
+ ];
+ this.page.total = this.ourData.length;
+ function doit(data, page) {
+ return data.slice(
+ (+page.currentPage - 1) * +page.pageSize,
+ +page.currentPage * +page.pageSize
+ );
+ }
+ this.seeData = doit(this.ourData, page);
+ this.loading = false;
+ });
});
+ // getList(
+ // page.currentPage,
+ // page.pageSize,
+ // Object.assign(params, this.query),
+ // this.$route.query.deptid,
+ // this.$route.query.type
+ // ).then((res) => {
+ // const data = res.data.data;
+ // this.page.total = data.total;
+ // this.data = data.records;
+ // this.loading = false;
+ // this.selectionClear();
+ // });
},
seeImages(row) {
@@ -391,7 +376,13 @@
this.imgSee = true;
},
-
+ getType(file) {
+ var filename = file;
+ var index1 = filename.lastIndexOf(".");
+ var index2 = filename.length;
+ var type = filename.substring(index1, index2);
+ return type;
+ },
fileFormat(row) {
var index = row.link.lastIndexOf(".");
var ext = row.link.substr(index + 1);
--
Gitblit v1.9.3