From e3ab7d6f6c122f56d099cac700448d6f85987dd1 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Fri, 10 Sep 2021 10:56:35 +0800
Subject: [PATCH] 整体更改
---
src/views/home/index.vue | 3
src/components/attach/attach copy.vue | 438 ++++++++++++++
src/views/home/enclosure.js | 82 ++
src/views/home/column.js | 183 +++---
src/components/Approval/Approval.vue | 2
src/views/home/ourDatas.js | 83 ++
src/components/attach/attach copy 2.vue | 334 +++++++++++
src/components/attach/attach.vue | 325 +++++-----
src/styles/element-ui.scss | 4
src/api/resource/attach.js | 37 +
src/components/cardPopup/cardPopup.vue | 52 +
src/views/home/htmls.js | 213 +++---
12 files changed, 1,372 insertions(+), 384 deletions(-)
diff --git a/src/api/resource/attach.js b/src/api/resource/attach.js
index 90f9db2..3cf9a06 100644
--- a/src/api/resource/attach.js
+++ b/src/api/resource/attach.js
@@ -1,6 +1,43 @@
import request from '@/router/axios';
import { urls } from "@/api/urls";
+
+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 addUseInfor = (params) => {
+ return request({
+ url: '/api/licetuser/liceUp',
+ method: 'post',
+ data: {
+ ...params
+ }
+ })
+}
+
+
export const getList = (current, size, params, deptid) => {
return request({
url: '/api/blade-resource/attach/page',
diff --git a/src/components/Approval/Approval.vue b/src/components/Approval/Approval.vue
index d5c89ed..137e77f 100644
--- a/src/components/Approval/Approval.vue
+++ b/src/components/Approval/Approval.vue
@@ -181,7 +181,6 @@
Object.assign(params, this.query)
).then((res) => {
const data = res.data.data;
- this.page.total = data.total;
this.data = data.records;
this.loading = false;
getListre(
@@ -202,6 +201,7 @@
Object.assign(params, this.query)
).then((resv) => {
this.data = this.data.concat(resv.data.data.records);
+ this.page.total = this.data.length;
});
});
});
diff --git a/src/components/attach/attach copy 2.vue b/src/components/attach/attach copy 2.vue
new file mode 100644
index 0000000..e8e5691
--- /dev/null
+++ b/src/components/attach/attach copy 2.vue
@@ -0,0 +1,334 @@
+<template>
+ <basic-container class="hasButTwo">
+ <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="type" slot-scope="{ row }">
+ <el-tag :class="row.type == 1 ? '' : ''">{{ row.$type }}</el-tag>
+ </template>
+ <template slot-scope="{ type, size, row }" slot="menu">
+ <el-button
+ icon="el-icon-upload2"
+ :size="size"
+ :type="type"
+ v-show="row.type == 1"
+ >上传</el-button
+ >
+ <el-button
+ icon="el-icon-close"
+ :size="size"
+ :type="type"
+ v-show="row.type == 2"
+ >删除</el-button
+ >
+ <el-button
+ icon="el-icon-download"
+ :size="size"
+ :type="type"
+ v-show="row.type == 2"
+ >下载</el-button
+ >
+ <el-button icon="el-icon-document-checked" :size="size" :type="type"
+ >下载模板</el-button
+ >
+ </template>
+ </avue-crud>
+ </basic-container>
+</template>
+
+<script>
+import { getList, getDetail, remove } from "@/api/resource/attach";
+import { mapGetters } from "vuex";
+
+export default {
+ props: ["type", "opens", "enclosure"],
+ data() {
+ var type = this.type;
+ var deptid = this.$route.query.deptId;
+ var cardid = this.$store.getters.userInfo.Id;
+ return {
+ form: {},
+ query: {},
+ putParam: "",
+ loading: false,
+ page: {
+ pageSize: 10,
+ currentPage: 1,
+ total: 0,
+ },
+ attachBox: false,
+ selectionList: [],
+ option: {
+ height: "auto",
+ calcHeight: 30,
+ tip: false,
+ align: "center",
+ searchShow: false,
+ // menu: false,
+ // height: 323,
+ columnBtn: false,
+ searchMenuSpan: 6,
+ border: false,
+ index: true,
+ stripe: true,
+ viewBtn: true,
+ selection: true,
+ dialogClickModal: false,
+ column: [
+ {
+ label: "附件名称",
+ prop: "originalName",
+ overHidden: true,
+ },
+ {
+ label: "附件状态",
+ prop: "type",
+ slot: true,
+ overHidden: true,
+ dicData: [
+ {
+ label: "未上传",
+ value: 1,
+ },
+ {
+ label: "已上传",
+ value: 2,
+ },
+ ],
+ },
+ ],
+ },
+ 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=&type=0"
+ // // "/api/blade-resource/oss/endpoint/put-file-attach?type=" +
+ // // type +
+ // // "&deptid=" +
+ // // deptid,
+ // },
+ {
+ label: "拖拽上传",
+ prop: "imgUrl5",
+ type: "upload",
+ span: 12,
+ drag: true,
+ propsHttp: {
+ res: "data",
+ },
+ tip: "只能上传jpg/png文件，且不超过500kb",
+ action:
+ "/api/blade-resource/oss/endpoint/put-file-attach?deptid=&type=" +
+ type +
+ "&cardid=" +
+ cardid,
+ },
+ ],
+ },
+ imgSee: false,
+ imgUrl: "",
+ };
+ },
+ computed: {
+ ...mapGetters(["permission", "canDoIt"]),
+ permissionList() {
+ return {
+ addBtn: false,
+ editBtn: false,
+ viewBtn: false,
+ delBtn: this.vaildData(this.permission.attach_delete, false),
+ };
+ },
+ ids() {
+ let ids = [];
+ this.selectionList.forEach((ele) => {
+ ids.push(ele.id);
+ });
+ return ids.join(",");
+ },
+ },
+ mounted() {
+ console.log(this.enclosure, "enclosure");
+ var flag = false,
+ i = 0,
+ ind = null;
+ this.$store.state.tags.tagList.forEach((item, index) => {
+ if (item.label == "附件上传") {
+ if (flag == false) {
+ ind = index;
+ flag = true;
+ }
+ i++;
+ }
+ });
+ if (i > 1) {
+ this.$store.state.tags.tagList.splice(ind, 1);
+ }
+ },
+ methods: {
+ handleUpload() {
+ this.attachBox = true;
+ },
+ uploadAfter(res, done, loading, column) {
+ // window.console.log(column);
+ this.attachBox = false;
+ this.refreshChange();
+ done();
+ },
+ handleDownload(row) {
+ window.open(`${row.link}`);
+ },
+ rowDel(row) {
+ this.$confirm("确定将选择数据删除?", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ })
+ .then(() => {
+ return remove(row.id);
+ })
+ .then(() => {
+ this.onLoad(this.page);
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ });
+ });
+ },
+ handleDelete() {
+ if (this.selectionList.length === 0) {
+ this.$message.warning("请选择至少一条数据");
+ return;
+ }
+ this.$confirm("确定将选择数据删除?", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ })
+ .then(() => {
+ return remove(this.ids);
+ })
+ .then(() => {
+ this.onLoad(this.page);
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ });
+ this.$refs.crud.toggleSelection();
+ });
+ },
+ 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 = {}) {
+ // params.type = this.type;
+ // params.deptid = "";
+ // params.cardid = this.$store.getters.userInfo.Id;
+ // this.loading = true;
+ // getList(
+ // 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;
+ // this.loading = false;
+ // this.selectionClear();
+ // });
+ this.data = this.enclosure;
+ },
+
+ seeImages(row) {
+ this.imgUrl = "";
+ this.imgUrl = "url(" + row.link + ") center center / contain no-repeat";
+ console.log(this.imgUrl);
+ // this.imgUrl = row.link;
+
+ this.imgSee = true;
+ },
+
+ fileFormat(row) {
+ var index = row.link.lastIndexOf(".");
+ var ext = row.link.substr(index + 1);
+
+ return (
+ [
+ "png",
+ "jpg",
+ "jpeg",
+ "bmp",
+ "gif",
+ "webp",
+ "psd",
+ "svg",
+ "tiff",
+ ].indexOf(ext.toLowerCase()) == -1
+ );
+ },
+ },
+};
+</script>
+
+<style lang="scss" scoped>
+</style>
diff --git a/src/components/attach/attach copy.vue b/src/components/attach/attach copy.vue
new file mode 100644
index 0000000..6d544bb
--- /dev/null
+++ b/src/components/attach/attach copy.vue
@@ -0,0 +1,438 @@
+<template>
+ <basic-container class="hasButTwo">
+ <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"
+ v-if="opens"
+ @click="handleUpload"
+ >上 传
+ </el-button>
+ <el-button
+ type="danger"
+ size="small"
+ icon="el-icon-delete"
+ plain
+ v-if="opens"
+ @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="imgs" :style="{ background: imgUrl }"></div>
+ </el-dialog>
+ </basic-container>
+</template>
+
+<script>
+import { getList, getDetail, remove } from "@/api/resource/attach";
+import { mapGetters } from "vuex";
+
+export default {
+ props: ["type", "opens"],
+ data() {
+ var type = this.type;
+ var deptid = this.$route.query.deptId;
+ var cardid = this.$store.getters.userInfo.Id;
+ return {
+ form: {},
+ query: {},
+ putParam: "",
+ loading: false,
+ page: {
+ pageSize: 10,
+ currentPage: 1,
+ total: 0,
+ },
+ attachBox: false,
+ selectionList: [],
+ option: {
+ height: "auto",
+ calcHeight: 30,
+ tip: false,
+ align: "center",
+ searchShow: true,
+ // menu: false,
+ height: 323,
+ searchMenuSpan: 6,
+ border: false,
+ index: true,
+ stripe: true,
+ viewBtn: true,
+ selection: true,
+ dialogClickModal: false,
+ column: [
+ // {
+ // label: "附件地址",
+ // prop: "link",
+ // hide: true,
+ // rules: [
+ // {
+ // required: true,
+ // message: "请输入附件地址",
+ // trigger: "blur",
+ // },
+ // ],
+ // },
+ // {
+ // label: "附件域名",
+ // prop: "domain",
+ // hide: true,
+ // // search: true,
+ // rules: [
+ // {
+ // required: true,
+ // message: "请输入附件域名",
+ // trigger: "blur",
+ // },
+ // ],
+ // },
+ // {
+ // label: "附件名称",
+ // prop: "name",
+ // hide: true,
+ // search: true,
+ // rules: [
+ // {
+ // required: true,
+ // message: "请输入附件名称",
+ // trigger: "blur",
+ // },
+ // ],
+ // },
+ {
+ label: "附件名称",
+ prop: "originalName",
+ search: true,
+ overHidden: 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: "createTime",
+ // // slot: true,
+ // // search: true,
+ // rules: [
+ // {
+ // required: true,
+ // message: "请输入附件大小",
+ // trigger: "blur",
+ // },
+ // ],
+ // },
+ // {
+ // label: "预览",
+ // prop: "link",
+ // slot: true,
+ // dataType: "string",
+ // type: "img",
+ // },
+ ],
+ },
+ 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=&type=0"
+ // // "/api/blade-resource/oss/endpoint/put-file-attach?type=" +
+ // // type +
+ // // "&deptid=" +
+ // // deptid,
+ // },
+ {
+ label: "拖拽上传",
+ prop: "imgUrl5",
+ type: "upload",
+ span: 12,
+ drag: true,
+ propsHttp: {
+ res: "data",
+ },
+ tip: "只能上传jpg/png文件，且不超过500kb",
+ action:
+ "/api/blade-resource/oss/endpoint/put-file-attach?deptid=&type=" +
+ type +
+ "&cardid=" +
+ cardid,
+ },
+ ],
+ },
+ imgSee: false,
+ imgUrl: "",
+ };
+ },
+ computed: {
+ ...mapGetters(["permission", "canDoIt"]),
+ permissionList() {
+ return {
+ addBtn: false,
+ editBtn: false,
+ viewBtn: false,
+ delBtn: this.vaildData(this.permission.attach_delete, false),
+ };
+ },
+ ids() {
+ let ids = [];
+ this.selectionList.forEach((ele) => {
+ ids.push(ele.id);
+ });
+ return ids.join(",");
+ },
+ },
+ mounted() {
+ var flag = false,
+ i = 0,
+ ind = null;
+ this.$store.state.tags.tagList.forEach((item, index) => {
+ if (item.label == "附件上传") {
+ if (flag == false) {
+ ind = index;
+ flag = true;
+ }
+ i++;
+ }
+ });
+ if (i > 1) {
+ this.$store.state.tags.tagList.splice(ind, 1);
+ }
+ },
+ methods: {
+ handleUpload() {
+ this.attachBox = true;
+ },
+ uploadAfter(res, done, loading, column) {
+ // window.console.log(column);
+ this.attachBox = false;
+ this.refreshChange();
+ done();
+ },
+ handleDownload(row) {
+ window.open(`${row.link}`);
+ },
+ rowDel(row) {
+ this.$confirm("确定将选择数据删除?", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ })
+ .then(() => {
+ return remove(row.id);
+ })
+ .then(() => {
+ this.onLoad(this.page);
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ });
+ });
+ },
+ handleDelete() {
+ if (this.selectionList.length === 0) {
+ this.$message.warning("请选择至少一条数据");
+ return;
+ }
+ this.$confirm("确定将选择数据删除?", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ })
+ .then(() => {
+ return remove(this.ids);
+ })
+ .then(() => {
+ this.onLoad(this.page);
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ });
+ this.$refs.crud.toggleSelection();
+ });
+ },
+ 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 = {}) {
+ params.type = this.type;
+ params.deptid = "";
+ params.cardid = this.$store.getters.userInfo.Id;
+ this.loading = true;
+ getList(
+ 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;
+ this.loading = false;
+ this.selectionClear();
+ });
+ },
+
+ seeImages(row) {
+ this.imgUrl = "";
+ this.imgUrl = "url(" + row.link + ") center center / contain no-repeat";
+ console.log(this.imgUrl);
+ // this.imgUrl = row.link;
+
+ this.imgSee = true;
+ },
+
+ fileFormat(row) {
+ var index = row.link.lastIndexOf(".");
+ var ext = row.link.substr(index + 1);
+
+ return (
+ [
+ "png",
+ "jpg",
+ "jpeg",
+ "bmp",
+ "gif",
+ "webp",
+ "psd",
+ "svg",
+ "tiff",
+ ].indexOf(ext.toLowerCase()) == -1
+ );
+ },
+ },
+};
+</script>
+
+<style lang="scss" scoped>
+</style>
diff --git a/src/components/attach/attach.vue b/src/components/attach/attach.vue
index 6d544bb..360051b 100644
--- a/src/components/attach/attach.vue
+++ b/src/components/attach/attach.vue
@@ -18,47 +18,38 @@
@refresh-change="refreshChange"
@on-load="onLoad"
>
- <template slot="menuLeft">
+ <template slot="type" slot-scope="{ row }">
+ <el-tag :class="row.type != 2 ? 'red' : ''">{{
+ row.type != 2 ? "未上传" : "已上传"
+ }}</el-tag>
+ </template>
+ <template slot="downtemplate" slot-scope="{ row }">
+ <el-tag
+ @click="downTemplates(row.template)"
+ class="hand"
+ :class="row.template == '' ? 'red' : ''"
+ >{{ row.template == "" ? "无模板" : "下载模板" }}</el-tag
+ >
+ </template>
+ <template slot-scope="{ type, size, row }" slot="menu">
<el-button
- type="primary"
- size="small"
- plain
icon="el-icon-upload2"
- v-if="opens"
- @click="handleUpload"
- >上 传
- </el-button>
+ :size="size"
+ :type="type"
+ @click="upData(row)"
+ >上传</el-button
+ >
<el-button
- type="danger"
- size="small"
- icon="el-icon-delete"
- plain
- v-if="opens"
- @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>
+ :size="size"
+ :type="type"
+ :disabled="row.type != 2"
+ @click="dowmData(row)"
+ >下载</el-button
+ >
</template>
</avue-crud>
+
<el-dialog
title="附件管理"
append-to-body
@@ -73,24 +64,15 @@
>
</avue-form>
</el-dialog>
-
- <el-dialog
- title="预览"
- append-to-body
- :visible.sync="imgSee"
- class="see-img-box"
- >
- <div class="imgs" :style="{ background: imgUrl }"></div>
- </el-dialog>
</basic-container>
</template>
<script>
-import { getList, getDetail, remove } from "@/api/resource/attach";
+import { getUseInfor, getTemplate, addUseInfor } from "@/api/resource/attach";
import { mapGetters } from "vuex";
export default {
- props: ["type", "opens"],
+ props: ["type", "opens", "enclosure", "ptype"],
data() {
var type = this.type;
var deptid = this.$route.query.deptId;
@@ -108,115 +90,42 @@
attachBox: false,
selectionList: [],
option: {
- height: "auto",
+ height: 600,
+
calcHeight: 30,
tip: false,
align: "center",
- searchShow: true,
- // menu: false,
- height: 323,
+ searchShow: false,
+ columnBtn: false,
+ menuWidth: 180,
searchMenuSpan: 6,
border: false,
index: true,
+ delBtn: false,
stripe: true,
viewBtn: true,
selection: true,
dialogClickModal: false,
column: [
- // {
- // label: "附件地址",
- // prop: "link",
- // hide: true,
- // rules: [
- // {
- // required: true,
- // message: "请输入附件地址",
- // trigger: "blur",
- // },
- // ],
- // },
- // {
- // label: "附件域名",
- // prop: "domain",
- // hide: true,
- // // search: true,
- // rules: [
- // {
- // required: true,
- // message: "请输入附件域名",
- // trigger: "blur",
- // },
- // ],
- // },
- // {
- // label: "附件名称",
- // prop: "name",
- // hide: true,
- // search: true,
- // rules: [
- // {
- // required: true,
- // message: "请输入附件名称",
- // trigger: "blur",
- // },
- // ],
- // },
{
label: "附件名称",
- prop: "originalName",
- search: true,
+ prop: "originalname",
overHidden: true,
- rules: [
- {
- required: true,
- message: "请输入附件原名",
- trigger: "blur",
- },
- ],
},
{
- label: "附件拓展名",
- prop: "extension",
- rules: [
- {
- required: true,
- message: "请输入附件拓展名",
- trigger: "blur",
- },
- ],
- },
- {
- label: "附件大小",
- prop: "attachSize",
+ label: "附件状态",
+ prop: "type",
+ width: 110,
slot: true,
- rules: [
- {
- required: true,
- message: "请输入附件大小",
- trigger: "blur",
- },
- ],
+ overHidden: true,
},
- // {
- // label: "上传时间",
- // prop: "createTime",
- // // slot: true,
- // // search: true,
- // rules: [
- // {
- // required: true,
- // message: "请输入附件大小",
- // trigger: "blur",
- // },
- // ],
- // },
- // {
- // label: "预览",
- // prop: "link",
- // slot: true,
- // dataType: "string",
- // type: "img",
- // },
+ {
+ label: "示范模板",
+ prop: "downtemplate",
+ width: 110,
+ // overHidden: true,
+ slot: true,
+ },
],
},
data: [],
@@ -225,23 +134,6 @@
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=&type=0"
- // // "/api/blade-resource/oss/endpoint/put-file-attach?type=" +
- // // type +
- // // "&deptid=" +
- // // deptid,
- // },
{
label: "拖拽上传",
prop: "imgUrl5",
@@ -253,6 +145,7 @@
},
tip: "只能上传jpg/png文件，且不超过500kb",
action:
+ // "/api/blade-resource/oss/endpoint/put-file-attach",
"/api/blade-resource/oss/endpoint/put-file-attach?deptid=&type=" +
type +
"&cardid=" +
@@ -262,6 +155,11 @@
},
imgSee: false,
imgUrl: "",
+
+ saveIds: [],
+ saveLinks: [],
+ onceIds: "",
+ onceLinks: "",
};
},
computed: {
@@ -283,6 +181,7 @@
},
},
mounted() {
+ // console.log(this.enclosure, "enclosure");
var flag = false,
i = 0,
ind = null;
@@ -300,13 +199,63 @@
}
},
methods: {
+ upData(val) {
+ console.log(val);
+ this.onceIds = +val.id - 1 + "";
+ this.attachBox = true;
+ },
+ dowmData(val) {
+ console.log(val.down);
+ window.open(val.down);
+ //
+ },
+ downTemplates(val) {
+ // console.log(val);
+ if (val == "") {
+ return;
+ }
+ window.open(val);
+ // window.open(`/api/examScore/export-template`);
+ },
handleUpload() {
this.attachBox = true;
},
uploadAfter(res, done, loading, column) {
- // window.console.log(column);
- this.attachBox = false;
+ window.console.log(res.link);
+ this.onceLinks = res.link;
+ var haveit = null;
+ for (let k in this.saveIds) {
+ if (this.saveIds[k] == this.onceIds) {
+ // this.saveLinks[k] = this.onceLinks;
+ haveit = k;
+ break;
+ }
+ }
+ if (haveit != null) {
+ this.saveLinks[haveit] = this.onceLinks;
+ } else {
+ this.saveIds.push(this.onceIds);
+ this.saveLinks.push(this.onceLinks);
+ }
+ console.log(this.saveIds);
+ console.log(this.saveLinks);
+
+ // console.log(this.$store.getters.userInfo.Id);
+ var params = {
+ userid: this.$store.getters.userInfo.Id,
+ ptype: this.ptype,
+ templateid: this.saveIds.join(","),
+ links: this.saveLinks.join(","),
+ };
+ addUseInfor(params).then((res) => {
+ // console.log(res);
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ });
+ });
this.refreshChange();
+ this.attachBox = false;
done();
},
handleDownload(row) {
@@ -386,20 +335,40 @@
this.onLoad(this.page, this.query);
},
onLoad(page, params = {}) {
- params.type = this.type;
- params.deptid = "";
- params.cardid = this.$store.getters.userInfo.Id;
- this.loading = true;
- getList(
- 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;
- this.loading = false;
- this.selectionClear();
+ var that = this;
+ var data = [];
+ console.log(this.$store.getters.userInfo.Id);
+ // this.data = this.enclosure;
+ params["ptype"] = this.ptype;
+ getTemplate(params, 1, 50).then((res) => {
+ data = res.data.data.records;
+ console.log(data, "::template");
+ params["userid"] = this.$store.getters.userInfo.Id;
+ getUseInfor(params).then((res) => {
+ var userInfo = res.data.data.records;
+ console.log(userInfo, "::userInfo");
+ if (userInfo.length == 0) {
+ for (var k in data) {
+ data[k]["type"] = 1;
+ }
+ that.data = data;
+ this.saveIds = [];
+ this.saveLinks = [];
+ } else {
+ this.saveIds = userInfo[0].templateid.split(",");
+ this.saveLinks = userInfo[0].links.split(",");
+ for (let k in data) {
+ for (let i in this.saveIds) {
+ if (+data[k].id - 1 == this.saveIds[i]) {
+ data[k]["type"] = 2;
+ data[k]["down"] = this.saveLinks[i];
+ }
+ }
+ // data[k]["type"] = 1;
+ }
+ that.data = data;
+ }
+ });
});
},
@@ -435,4 +404,20 @@
</script>
<style lang="scss" scoped>
+.red {
+ border: 1px solid rgba($color: #ff5656, $alpha: 0.3) !important;
+ background-color: rgba($color: #ff5151, $alpha: 0.1) !important;
+ color: rgba($color: #ff5151, $alpha: 1) !important;
+}
+.hand:hover {
+ cursor: pointer;
+}
+// .longbut {
+// // background-color: red !important;
+// width: 125px;
+// }
+// .shortbut {
+// // background-color: green !important;
+// width: 80px;
+// }
</style>
diff --git a/src/components/cardPopup/cardPopup.vue b/src/components/cardPopup/cardPopup.vue
index 7bb1ee7..e614345 100644
--- a/src/components/cardPopup/cardPopup.vue
+++ b/src/components/cardPopup/cardPopup.vue
@@ -56,7 +56,12 @@
></avue-form>
</el-collapse-item>
<el-collapse-item title="附件上传/查询" name="2">
- <attach :type="imgType" :opens="opens"></attach>
+ <attach
+ :type="imgType"
+ :ptype="type"
+ :opens="opens"
+ :enclosure="enclosure"
+ ></attach>
</el-collapse-item>
</el-collapse>
</div>
@@ -123,6 +128,11 @@
OnceChouse: false, //选择武装押运或者保安服务许可
cardData: [],
choseType: "",
+ overtime: {
+ overtimef: "",
+ overtimec: "",
+ },
+ enclosure: [], //附件上传 基础数据
};
},
computed: {
@@ -170,6 +180,8 @@
if (n == this.data[k].type) {
this.see = true;
this.type = this.data[k].type;
+ this.enclosure = this.data[k].enclosure;
+ this.overtime = this.data[k].overtime;
this.imgType = this.data[k].imgType;
this.htmls = this.data[k].datas.htmls;
this.apiName = this.data[k].datas.apiName;
@@ -283,13 +295,6 @@
this.data0.ptype = this.type;
this.data0.cardid = this.$store.getters.userInfo.Id;
- // if (!this.tipover(1, this.data0)) {
- // console.log("不通过");
- // return;
- // }
- // console.log(this.tipover(1, this.data0));
- // return;
-
//验证数据
var commin = true;
var a = this.data0;
@@ -299,20 +304,27 @@
if (!yanzhengphons.test(a[k])) {
// console.log(a[k], k);
commin = false;
+ console.log(1);
break;
}
- } else if (k == "creditcode" || k == "registeredcapital") {
+ // } else if (k == "creditcode" || k == "registeredcapital") {
+ } else if (k == "registeredcapital") {
//数字验证
if (!yanzhengnumbers.test(a[k])) {
// console.log(a[k], k);
commin = false;
+ console.log(2);
break;
}
+ } else if (k == "address" || k == "business") {
+ //跳过验证
+ continue;
} else {
//空值验证
if (a[k] == "" && k != "ptype") {
// console.log(a[k], k);
commin = false;
+ console.log(3);
break;
}
}
@@ -322,9 +334,12 @@
message: "请检查输入数据是否正确！",
type: "warning",
});
+
return;
}
-
+ a["overtime"] = this.getNowTime(this.overtime.overtimec);
+ console.log(a);
+ // return;
add(this.apiName[0], this.data0).then(() => {
this.qx();
this.$message({
@@ -334,7 +349,22 @@
this.$store.commit("changecanDoIt", false);
});
},
-
+ getNowTime(form) {
+ var DaysToAdd = form;
+ var now = new Date();
+ var newdate = new Date();
+ var newtimems = newdate.getTime() + DaysToAdd * 24 * 60 * 60 * 1000;
+ newdate.setTime(newtimems);
+ //只得到年月日的
+ var time =
+ newdate.getFullYear() +
+ "-" +
+ (newdate.getMonth() + 1) +
+ "-" +
+ newdate.getDate();
+ //得到具体时间
+ return time;
+ },
tipover(a, b) {
if (a == 1) {
console.log(b);
diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
index a98a587..97ef0b7 100644
--- a/src/styles/element-ui.scss
+++ b/src/styles/element-ui.scss
@@ -101,3 +101,7 @@
}
}
}
+
+.el-upload__tip {
+ width: 423px !important;
+}
diff --git a/src/views/home/column.js b/src/views/home/column.js
index a0054cf..345d600 100644
--- a/src/views/home/column.js
+++ b/src/views/home/column.js
@@ -33,22 +33,22 @@
},
],
},
- {
- label: "统一社会信用代码",
- prop: "creditcode",
- labelWidth: 160,
- span: 12,
- rules: [
- {
- required: true,
- message: "请输入社会信用代码",
- trigger: "blur",
- },
- {
- validator: numbers, trigger: ['change', 'blur']
- },
- ],
- },
+ // {
+ // label: "统一社会信用代码",
+ // prop: "creditcode",
+ // labelWidth: 160,
+ // span: 12,
+ // // rules: [
+ // // {
+ // // required: true,
+ // // message: "请输入社会信用代码",
+ // // trigger: "blur",
+ // // },
+ // // // {
+ // // // validator: numbers, trigger: ['change', 'blur']
+ // // // },
+ // // ],
+ // },
// {
// label: "企业类型",
@@ -161,90 +161,89 @@
},
],
},
- {
- label: "注册时间",
- prop: "establishtime",
- labelWidth: 160,
- span: 12,
- type: "date",
- format: "yyyy-MM-dd",
- valueFormat: "yyyy-MM-dd",
- rules: [
- {
- required: true,
- message: "请输入注册时间",
- trigger: "blur",
- },
- ],
- },
- {
- label: "注册资本(万元人民币)",
- prop: "registeredcapital",
- labelWidth: 160,
- span: 12,
- rules: [
- {
- required: true,
- message: "请输入注册资本",
- trigger: "blur",
- },
- {
- validator: numbers, trigger: ['change', 'blur']
- }
- ],
- },
- {
- label: "组织机构代码",
- prop: "organizationcode",
- labelWidth: 160,
- span: 12,
- rules: [
- {
- required: true,
- message: "请输入组织机构代码",
- trigger: "blur",
- },
- ],
- },
- {
- label: "工商注册号",
- prop: "registrationnumber",
-
- labelWidth: 160,
- span: 12,
- rules: [
- {
- required: true,
- message: "请输入工商注册号",
- trigger: "blur",
- },
- ],
- },
+ // {
+ // label: "注册时间",
+ // prop: "establishtime",
+ // labelWidth: 160,
+ // span: 12,
+ // type: "date",
+ // format: "yyyy-MM-dd",
+ // valueFormat: "yyyy-MM-dd",
+ // rules: [
+ // {
+ // required: true,
+ // message: "请输入注册时间",
+ // trigger: "blur",
+ // },
+ // ],
+ // },
+ // {
+ // label: "注册资本(万元人民币)",
+ // prop: "registeredcapital",
+ // labelWidth: 160,
+ // span: 12,
+ // rules: [
+ // {
+ // required: true,
+ // message: "请输入注册资本",
+ // trigger: "blur",
+ // },
+ // {
+ // validator: numbers, trigger: ['change', 'blur']
+ // }
+ // ],
+ // },
+ // {
+ // label: "组织机构代码",
+ // prop: "organizationcode",
+ // labelWidth: 160,
+ // span: 12,
+ // rules: [
+ // {
+ // required: true,
+ // message: "请输入组织机构代码",
+ // trigger: "blur",
+ // },
+ // ],
+ // },
+ // {
+ // label: "工商注册号",
+ // prop: "registrationnumber",
+ // labelWidth: 160,
+ // span: 12,
+ // rules: [
+ // {
+ // required: true,
+ // message: "请输入工商注册号",
+ // trigger: "blur",
+ // },
+ // ],
+ // },
{
label: "注册地址",
prop: "address",
labelWidth: 160,
span: 12,
- rules: [
- {
- required: true,
- message: "请输入注册地址",
- trigger: "blur",
- },
- ],
+ // rules: [
+ // {
+ // required: true,
+ // message: "请输入注册地址",
+ // trigger: "blur",
+ // },
+ // ],
},
{
- label: "经营范围",
+ label: "服务范围",
prop: "business",
labelWidth: 160,
span: 12,
- rules: [
- {
- required: true,
- message: "请输入经营范围",
- trigger: "blur",
- },
- ],
+ // rules: [
+ // {
+ // required: true,
+ // message: "请输入经营范围",
+ // trigger: "blur",
+ // },
+ // ],
},
{
label: "所属辖区",
@@ -358,3 +357,7 @@
export var armedEscortcolumn = [//武装押运许可申请
...columnU
]
+
+export var changeOfLegalPersoncolumn = [//保安服务公司法人变更
+ ...column
+]
\ No newline at end of file
diff --git a/src/views/home/enclosure.js b/src/views/home/enclosure.js
new file mode 100644
index 0000000..5b9210a
--- /dev/null
+++ b/src/views/home/enclosure.js
@@ -0,0 +1,82 @@
+
+export var securityPermitenclosure = [//保安服务许可申请
+ {
+ originalName: '保安服务公司申请设立审批表',
+ type: 1,// 1：未上传，2已上传
+ template: 'http://223.82.109.183:2081/zhba/upload/20210903/a164b17742408de1a17d7b674179f173.doc',
+ }, {
+ originalName: '设立申请书',
+ type: 1,
+ template: 'http://223.82.109.183:2081/zhba/upload/20210903/593c4f35909b462e540c4f995ddbb158.docx',
+ }, {
+ originalName: '工商行政管理部门核发的企业名称预先核准通知书',
+ type: 1,
+ template: '',
+ }, {
+ originalName: '法定代表人和主要管理人员基本情况表',
+ type: 1,
+ template: 'http://223.82.109.183:2081/zhba/upload/20210903/1735efad611d020ae17005f07694ac1a.docx',
+ }, {
+ originalName: '法定代表人和主要管理人员身份证',
+ type: 1,
+ template: 'http://223.82.109.183:2081/zhba/upload/20210903/a154626919745232a502db651f45636f.png',
+ }, {
+ originalName: '法定代表人和主要管理人员二级保安员（保安师）资格证书',
+ type: 1,
+ template: 'http://223.82.109.183:2081/zhba/upload/20210903/002a97dbe2489e663e85f521880118d5.jpg',
+ }, {
+ originalName: '法定代表人和主要管理人员工作经历承诺书',
+ type: 1,
+ template: 'http://223.82.109.183:2081/zhba/upload/20210903/545dcc1c2436fdb2b800592c54a6ce10.docx',
+ }, {
+ originalName: '专业技术人员名单及资格证书',
+ type: 1,
+ template: 'http://223.82.109.183:2081/zhba/upload/20210903/0dbccea933a413cb2a040e5ede1c624f.docx',
+ }, {
+ originalName: '住所的所有权或者使用权的有效证明文件',
+ type: 1,
+ template: 'http://223.82.109.183:2081/zhba/upload/20210903/0f400b2d545bcfc23c2c8b1cf4ada10a.docx',
+ }, {
+ originalName: '提供保安服务所需的有关设备、交通工具等材料',
+ type: 1,
+ template: 'http://223.82.109.183:2081/zhba/upload/20210903/9629ca21d4b0baecd3b2eba5fcb6f031.docx',
+ }, {
+ originalName: '组织机构和保安服务管理制度、岗位责任制度、保安员管理制度材料',
+ type: 1,
+ template: 'http://223.82.109.183:2081/zhba/upload/20210903/e738bf6056c5f0b3304ff531e9e4c936.docx',
+ }
+]
+
+
+export var securityTrainingenclosure = [//保安培训许可申请
+
+]
+
+
+export var branchOfficeenclosure = [//设立分公司备案
+
+]
+
+
+export var securityGuardenclosure = [//自招保安单位备案
+
+]
+
+
+export var cancellationOfFilingenclosure = [//自招保安单位备案撤销
+
+]
+
+
+export var crossRegionenclosure = [//跨区域经营备案
+
+]
+
+
+export var armedEscortenclosure = [//武装押运许可申请
+
+]
+
+export var changeOfLegalPersonenclosure = [//保安服务公司法人变更
+
+]
\ No newline at end of file
diff --git a/src/views/home/htmls.js b/src/views/home/htmls.js
index e5bd6c7..5651bbb 100644
--- a/src/views/home/htmls.js
+++ b/src/views/home/htmls.js
@@ -1,4 +1,4 @@
-export var crossRegion = // 跨区域经营备案
+export var crossRegion = // 跨区域经营备案 2021.9.2已对材料都正确liu
`<p><label>审批依据：</label></p>
<p>1、《保安服务管理条例》(国务院令第564号)；<br /></p>
<p>
@@ -26,22 +26,14 @@
10、保安公司安全管理制度<br />
</p>
-<p>
- <label>申请材料形式标准：</label>
-</p>
-<p>
- 1、申请人提交的申请材料齐全且符合法定形式<br />
- 2、申请表用黑色签字笔或钢笔书写，并保证表格内容真实无误<br />
-</p>
-
-<p><label>法定周期：</label>区、市30个工作日</p>
-<p><label>承诺时限：</label>区、市14个工作日</p>
+<p><label>法定周期：</label>30个工作日</p>
+<p><label>承诺时限：</label>14个工作日</p>
<p><label>受理部门：</label>市级公安机关</p>
-<p><label>审批机关：：</label>区级公安机关</p>`
+<p><label>责任处（科）室：</label>南昌市公安局治安支队六大队</p>`
-export var securityTraining = //保安培训公司备案
+export var securityTraining = //保安培训公司备案 2021.9.2已对材料都正确liu
`<p><label>审批依据：</label></p>
<p>
1、《保安培训机构管理办法》(公安部令第85号)；<br />
@@ -68,7 +60,6 @@
1、《保安培训单位申请设立审批表》。<br />
2、设立申请书，应当载明申请人基本情况、拟设立培训单位名称、培训目标、培训规模、培训内容、培训条件和内部管理制度等。<br />
3、保安培训单位法人资格材料<br />
-
4、申请人、法定代表人和校长（院长）等主要管理人员身份证<br />
5、师资人员的学历证书（其中保安专业师资人员应当具有大学本科以上学历），教师花名册（含工作单位、住址、职称、专兼职、拟任课程），与教师签订的聘用合同<br />
6、申请人、法定代表人和校长（院长）等主要管理人员基本情况登记表<br />
@@ -79,68 +70,53 @@
9、委托代理人申办的，须附具委托书和代理人身份证复印件<br />
</p>
-<p><label>法定周期：</label>区、市30个工作日</p>
-<p><label>承诺时限：</label>区、市20个工作日</p>
+<p><label>法定周期：</label>30个工作日</p>
+<p><label>承诺时限：</label>20个工作日</p>
-<p><label>受理部门：</label>市级公安机关</p>
+<p><label>责任处（科）室：</label>南昌市公安局治安支队六大队</p>`
-<p><label>审批机关：：</label>区级公安机关</p>`
-
-export var securityPermit = //保安服务公司许可申请
+export var securityPermit = //保安服务公司许可申请 2021.9.2已对材料都正确liu
`<p><label>审批依据：</label></p>
<p>
- 1、《保安服务管理条例》(中华人民共和国国务院令第564号)；<br />
+ 1、《保安服务管理条例》(国务院令第564号)<br />
- 2、《公安机关实施保安服务管理条例办法》(中华人民共和国公安部令
- 第 112 号)；<br />
+ 2、《公安机关是是保安服务管理条例办法》(公安部第112号令)<br />
- 3、关于印发《宁夏回族自治区保安服务公司许可备案实施细则（试行）》和《宁夏回族自治区保安培训机构管理办法实施细则（试行）》的通知（宁公通〔2017〕61号）；<br />
</p>
<p>
<label>申请条件：</label
>自然人、法人和其他组织。自然人需要有完全民事行为能力，年满18周岁且不具有精神疾病。
</p>
+<p>
+ <label>受理条件：</label>
+ 【予以批准的条件】 1、拟任的保安服务公司法定代表人和主要管理人员应当具备任职所需的专
+ 业知识和5年以上军队、公安、安全、审判、检察、司法行政或者治安、保卫经营管理工作经验，无
+ 被刑事处罚、劳动教养、收容教育、强制隔离戒毒或者被开除公职、开除军籍等不良记录。 2、有与
+ 所提供的保安服务相适应的专业技术人员，其中法律、行政法规有资格要求的专业技术人员，应当取
+ 得相应的资格。 3、有住所和提供保安服务所需的设施、装备。 4、有健全的组织机构和保安服务
+ 管理制度、岗位责任制度、保安员管理制度<br />
+ 【不予以批准的条件】 申请人不符合以上条件，或者不能提供足以证明符合条件的相关证明材料。<br />
+</p>
<p><label>申请材料：</label></p>
<p>
- 1、《申请设立保安服务公司行政许可审批表》。<br />
- 2、设立保安服务公司申请书<br />
- 3、设立保安服务公司可行性分析报告<br />
-
- 4、保安服务从业单位法定代表人（主要负责人）登记表<br />
- 5、保安服务公司章程<br />
- 6、注册资本认缴金额证明。<br />
- 7、拟任的法定代表人、主要管理人员应提供下列材料：<br />
- ①有效身份证件；②保安师资格证书原件及复印件；③个人简历及5年以上军队、公安、安全、审判、检察、司法行政或者治保安卫、保安经营管理工作经验证明。<br />
- 8、专业技术人员名单，法律、行政法规有资格要求的资格证明。<br />
- 9、拟设保安服务公司住所的所有权或使用权有效证明文件和提供保安服务所需的有关设备、交通工具等材料并附彩色照片。<br />
- 10、组织机构和保安服务管理制度、岗位责任制度、保安员管理制度材料。<br />
- 11、工商行政管理部门核发的企业名称预先核准通知书。<br />
+ 1、保安服务公司申请设立审批表<br />
+ 2、设立申请书<br />
+ 3、工商行政管理部门核发的企业名称预先核准通知书<br />
+ 4、法定代表人和主要管理人员基本情况表<br />
+ 5、法定代表人和主要管理人员身份证<br />
+ 6、法定代表人和主要管理人员二级保安员（保安师）资格证书<br />
+ 7、法定代表人和主要管理人员工作经历承诺书：<br />
+ 8、专业技术人员名单及资格证书<br />
+ 9、住所的所有权或者使用权的有效证明文件<br />
+ 10、提供保安服务所需的有关设备、交通工具等材料<br />
+ 11、组织机构和保安服务管理制度、岗位责任制度、保安员管理制度材料<br />
</p>
+<p><label>法定周期：</label>30个工作日</p>
+<p><label>承诺时限：</label>20个工作日</p>
-<p>
- <label
- >申请设立中外合资、中外合作或者外资独资保安服务公司除以上1-11项内容外还需另外提供以下材料：</label
- >
-</p>
+<p><label>责任处（科）室：</label>南昌市公安局治安支队六大队</p>`
-<p>
- 1、中外合资、中外合作合同原件及复印件。<br />
-
- 2、外方的资信证明和注册登记文件原件及复印件。<br />
-
- 3、境外法定代表人、主要管理人员所属国家或者地区无被刑事处罚记录证明（原居住地警察机构出具并经公证机关公证）。<br />
-
- 4、境外法定代表人、主要管理人员5年以上保安经营管理工作经验证明。<br />
-</p>
-
-<p><label>法定周期：</label>区、市20个工作日</p>
-<p><label>承诺时限：</label>区、市20个工作日</p>
-
-<p><label>受理部门：</label>市级公安机关</p>
-
-<p><label>审批机关：：</label>区级公安机关</p>`
-
-export var securityGuard = //自招保安单位备案
+export var securityGuard = //自招保安单位备案 2021.9.2已对材料都正确liu
`<p><label>审批依据：</label></p>
<p>
1、《保安服务管理条例》(国务院令第564号)；<br />
@@ -169,50 +145,12 @@
7、保安服务管理制度、岗位责任制度、保安员管理制度材料<br />
8、自行招用保安员的在岗培训法律、保安专业知识和技能情况<br />
</p>
-<p><label>法定周期：</label>区、市30个工作日</p>
-<p><label>承诺时限：</label>区、市14个工作日</p>
+<p><label>法定周期：</label>30个工作日</p>
+<p><label>承诺时限：</label>14个工作日</p>
-<p><label>受理部门：</label>市级公安机关</p>
+<p><label>责任处（科）室：</label>南昌市公安局治安支队六大队</p>`
-<p><label>审批机关：：</label>区级公安机关</p>`
-
-export var cancellationOfFiling = //自招保安单位备案撤销
- `<p><label>审批依据：</label></p>
-<p>
- 1、《保安服务管理条例》(国务院令第564号)；<br />
- 2、《公安机关实施保安服务管理条例办法》(公安部第112号令)；<br />
-</p>
-<p>
- <label>申请条件：</label
- >自然人、法人和其他组织。自然人需要有完全民事行为能力，年满18周岁且不具有精神疾病。
-</p>
-<p>
- <label>受理条件：</label>
- 【予以批准的条件】 1、应当具有法人资格；
- 2、有符合本条例规定条件的保安员；
- 3、有健全的保安服务管理制度、岗位责任制度和保安员管理制度。<br />
- 【不予批准的条件】
- 申请人不符合以上条件，或者不能提供足以证明符合条件的相关证明材料<br />
-</p>
-<p><label>申请材料：</label></p>
-<p>
- 1、自行招用保安员单位登记备案表<br />
- 2、企业法人营业执照<br />
- 3、法定代表人身份证<br />
- 4、保安服务分管负责人身份证<br />
- 5、自行招用保安员身份证<br />
- 6、自行招用保安员的保安员证<br />
- 7、保安服务管理制度、岗位责任制度、保安员管理制度材料<br />
- 8、自行招用保安员的在岗培训法律、保安专业知识和技能情况<br />
-</p>
-<p><label>法定周期：</label>区、市30个工作日</p>
-<p><label>承诺时限：</label>区、市14个工作日</p>
-
-<p><label>受理部门：</label>市级公安机关</p>
-
-<p><label>审批机关：：</label>区级公安机关</p>`
-
-export var branchOffice = //设立分公司备案
+export var branchOffice = //设立分公司备案 2021.9.2已对材料都正确liu
`<p><label>审批依据：</label></p>
<p>
1、《保安服务管理条例》(国务院令第564号)；<br />
@@ -243,6 +181,41 @@
10、公司章程中设立分公司事项相关规定或股东会、董事会设立分公司决议<br />
11、保安服务管理制度、岗位责任制度、保安员管理制度材料<br />
</p>
+<p><label>法定周期：</label>30个工作日</p>
+<p><label>承诺时限：</label>14个工作日</p>
+
+<p><label>责任处（科）室：</label>南昌市公安局治安支队六大队</p>`
+
+
+export var cancellationOfFiling = //自招保安单位备案撤销 // 暂时不做处理
+ `<p><label>审批依据：</label></p>
+<p>
+ 1、《保安服务管理条例》(国务院令第564号)；<br />
+ 2、《公安机关实施保安服务管理条例办法》(公安部第112号令)；<br />
+</p>
+<p>
+ <label>申请条件：</label
+ >自然人、法人和其他组织。自然人需要有完全民事行为能力，年满18周岁且不具有精神疾病。
+</p>
+<p>
+ <label>受理条件：</label>
+ 【予以批准的条件】 1、应当具有法人资格；
+ 2、有符合本条例规定条件的保安员；
+ 3、有健全的保安服务管理制度、岗位责任制度和保安员管理制度。<br />
+ 【不予批准的条件】
+ 申请人不符合以上条件，或者不能提供足以证明符合条件的相关证明材料<br />
+</p>
+<p><label>申请材料：</label></p>
+<p>
+ 1、自行招用保安员单位登记备案表<br />
+ 2、企业法人营业执照<br />
+ 3、法定代表人身份证<br />
+ 4、保安服务分管负责人身份证<br />
+ 5、自行招用保安员身份证<br />
+ 6、自行招用保安员的保安员证<br />
+ 7、保安服务管理制度、岗位责任制度、保安员管理制度材料<br />
+ 8、自行招用保安员的在岗培训法律、保安专业知识和技能情况<br />
+</p>
<p><label>法定周期：</label>区、市30个工作日</p>
<p><label>承诺时限：</label>区、市14个工作日</p>
@@ -251,7 +224,7 @@
<p><label>审批机关：：</label>区级公安机关</p>`
-export var armedEscort = //设立分公司备案
+export var armedEscort = //武装押运许可申请 // 暂时不做处理
`<p><label>审批依据：</label></p>
<p>
1、《保安服务管理条例》(中华人民共和国国务院令第564号)；<br />
@@ -292,4 +265,36 @@
<p><label>受理部门：</label>市级公安机关</p>
-<p><label>审批机关：：</label>区级公安机关</p>`
\ No newline at end of file
+<p><label>审批机关：：</label>区级公安机关</p>`
+
+export var changeOfLegalPerson = //保安服务公司法人变更 2021.9.2已对材料都正确liu
+ `<p><label>审批依据：</label></p>
+<p>
+ 1、《保安服务管理条例》(国务院令第564号)<br />
+ 2、《公安机关实施保安服务管理条例办法》(公安部第112号令)<br />
+</p>
+<p>
+ <label>申请条件：</label
+ >自然人、法人及公司主要管理人员均应具备5年以上军队、公安、安全、审判、检察、司法行政或者治安保卫、保安经营管理工作经验。
+</p>
+<p>
+ <label>受理条件：</label>
+ 【予以批准的条件】 1、拟任保安服务公司法定代表人应当具备5年以上军队、公安、安
+ 全、审判、检察、司法行政或者治安、保安经营管理工作经验。 2、拟任保安服务公司法定代表
+ 人具有二级保安员（保安师）资格证书。3、 无被刑事处罚、劳动
+ 教养、收容教育、强制隔离戒毒或者被开除公职、开除军籍等不良记录。<br />
+ 【不予以批准的条件】 申请人不符合以上条件，或者不能提供足以证明符合条件的相关证明材料。<br />
+</p>
+<p><label>申请材料：</label></p>
+<p>
+ 1、保安服务公司申请设立审批表<br />
+ 2、公司申请书<br />
+ 3、法定代表人基本情况表<br />
+ 4、法定代表人身份证<br />
+ 5、法定代表人二级保安员（保安师）资格证书<br />
+ 6、法定代表人工作经历承诺书<br />
+</p>
+<p><label>法定周期：</label>30个工作日</p>
+<p><label>承诺时限：</label>10个工作日</p>
+<p><label>责任处（科）室：</label>南昌市公安局治安支队六大队</p>`
+
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index d0af6ec..dfd5052 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -203,7 +203,8 @@
}
}
.b_main {
- width: 1105px;
+ // width: 1105px;// 3个一行
+ width: 1475px; //4个一行
height: calc(100% - 220px);
// border: 1px solid red;
margin: 0 auto;
diff --git a/src/views/home/ourDatas.js b/src/views/home/ourDatas.js
index f5093bc..dec1e88 100644
--- a/src/views/home/ourDatas.js
+++ b/src/views/home/ourDatas.js
@@ -6,6 +6,7 @@
securityGuardcolumn,//自招保安单位备案
cancellationOfFilingcolumn, //自招保安单位备案撤销
armedEscortcolumn, //武装押运许可申请
+ changeOfLegalPersoncolumn, //保安服务公司法人变更
} from './column'
import {
@@ -16,7 +17,22 @@
securityGuard,//自招保安单位备案
cancellationOfFiling,//自招保安单位备案撤销
armedEscort,//武装押运许可申请
+ changeOfLegalPerson, //保安服务公司法人变更
} from './htmls'
+
+
+import {
+ crossRegionenclosure,// 跨区域经营备案
+ securityTrainingenclosure, //保安培训许可申请
+ securityPermitenclosure, //保安服务许可申请
+ branchOfficeenclosure, //设立分公司备案
+ securityGuardenclosure,//自招保安单位备案
+ cancellationOfFilingenclosure,//自招保安单位备案撤销
+ armedEscortenclosure,//武装押运许可申请
+ changeOfLegalPersonenclosure, //保安服务公司法人变更
+} from './enclosure'
+
+
export var ourDatas = [
{
@@ -35,7 +51,12 @@
htmls: securityPermit,
column: securityPermitcolumn,
apiName: ['permit/save', 'permit/storage', 'permit/selectIn']
- }
+ },
+ overtime: {
+ overtimef: 30,
+ overtimec: 20,
+ },
+ enclosure: securityPermitenclosure,
},
{
menuName: "保安培训许可申请",
@@ -48,7 +69,12 @@
htmls: securityTraining,
column: securityTrainingcolumn,
apiName: ['permit/save', 'permit/storage', 'permit/selectIn']
- }
+ },
+ overtime: {
+ overtimef: 30,
+ overtimec: 20,
+ },
+ enclosure: securityTrainingenclosure,
},
{
@@ -62,7 +88,12 @@
htmls: branchOffice,
column: branchOfficecolumn,
apiName: ['record/save', 'record/rocordsave', 'record/selectIn']
- }
+ },
+ overtime: {
+ overtimef: 30,
+ overtimec: 14,
+ },
+ enclosure: branchOfficeenclosure,
},
{
@@ -76,7 +107,12 @@
htmls: securityGuard,
column: securityGuardcolumn,
apiName: ['record/save', 'record/rocordsave', 'record/selectIn']
- }
+ },
+ overtime: {
+ overtimef: 30,
+ overtimec: 14,
+ },
+ enclosure: securityGuardenclosure,
},
{
@@ -90,7 +126,12 @@
htmls: cancellationOfFiling,
column: cancellationOfFilingcolumn,
apiName: ['revoke/save', 'revoke/revokesave', 'revoke/selectIn']
- }
+ },
+ overtime: {
+ overtimef: 30,
+ overtimec: 14,
+ },
+ enclosure: cancellationOfFilingenclosure,
},
{
menuName: "跨区域经营备案",
@@ -103,7 +144,12 @@
htmls: crossRegion,
column: crossRegioncolumn,
apiName: ['recordk/save', 'recordk/recorkstorage', 'recordk/selectIn']
- }
+ },
+ overtime: {
+ overtimef: 30,
+ overtimec: 14,
+ },
+ enclosure: crossRegionenclosure,
},
{
menuName: "武装押运许可申请",
@@ -121,6 +167,29 @@
htmls: armedEscort,
column: armedEscortcolumn,
apiName: ['recordk/save', 'recordk/recorkstorage', 'recordk/selectIn']
- }
+ },
+ overtime: {
+ overtimef: 15,
+ overtimec: 15,
+ },
+ enclosure: armedEscortenclosure,
+ },
+ {//保安服务公司法人变更
+ menuName: "保安服务公司法人变更",
+ centerUrl: "/img/logo.png",
+ topUrl: "url(/img/login-sq10.png)",
+ topUrlh: "url(/img/login-sq1010.png)",
+ type: 7,
+ imgType: 9,
+ datas: {
+ htmls: changeOfLegalPerson,
+ column: changeOfLegalPersoncolumn,
+ apiName: ['recordk/save', 'recordk/recorkstorage', 'recordk/selectIn']
+ },
+ overtime: {
+ overtimef: 30,
+ overtimec: 10,
+ },
+ enclosure: changeOfLegalPersonenclosure,
}
]
\ No newline at end of file
--
Gitblit v1.9.3