From 53cc07834ed1b7eb65f1f539fa94269b11b61f14 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Sat, 28 Aug 2021 08:49:55 +0800
Subject: [PATCH] 武装押运
---
src/views/home/index.vue | 94 +++++++--------
src/views/home/column.js | 5
src/views/home/ourDatas.js | 28 ++++
src/components/cardPopup/cardPopup.vue | 188 +++++++++++++++++++-----------
src/views/home/htmls.js | 44 +++++++
5 files changed, 236 insertions(+), 123 deletions(-)
diff --git a/src/components/cardPopup/cardPopup.vue b/src/components/cardPopup/cardPopup.vue
index 867e21c..3747594 100644
--- a/src/components/cardPopup/cardPopup.vue
+++ b/src/components/cardPopup/cardPopup.vue
@@ -1,57 +1,80 @@
<template>
- <div v-if="see && useWhere != 'close'" class="securityPermit">
- <slot name="close"></slot>
- <div class="heards">{{ name }}</div>
- <basic-container>
- <div v-show="forms == 1" class="first-box-outer">
- <div class="f-b-o-in">
- <div class="handling-guideline">
- <h2 class="hand-title">{{ name }}办理指南</h2>
- <div
- class="hand-content"
- ref="handcontent"
- id="handcontent"
- v-html="htmls"
- >
- <!-- ### -->
- {{ htmls }}
+ <div class="once">
+ <div v-if="OnceChouse && useWhere != 'close'" class="OnceChouse">
+ <slot name="close"></slot>
+ <div class="heards"></div>
+ <basic-container>
+ <div v-for="(item, index) in cardData" :key="index">
+ <!-- <div class="chouseHide"> -->
+ <el-radio v-model="choseType" :label="item.type">{{
+ item.menuName
+ }}</el-radio>
+ <div class="choseTitle">{{ item.datas.msg }}</div>
+ <!-- </div> -->
+ </div>
+ <div class="hand-next">
+ <el-button type="primary" @click="tipchose">确认</el-button>
+ <!-- <el-button type="primary" @click="qx">取消</el-button> -->
+ </div>
+ </basic-container>
+ </div>
+ <div
+ v-if="see && useWhere != 'close' && !OnceChouse"
+ class="securityPermit"
+ >
+ <slot name="close"></slot>
+ <div class="heards">{{ name }}</div>
+ <basic-container>
+ <div v-show="forms == 1" class="first-box-outer">
+ <div class="f-b-o-in">
+ <div class="handling-guideline">
+ <h2 class="hand-title">{{ name }}办理指南</h2>
+ <div
+ class="hand-content"
+ ref="handcontent"
+ id="handcontent"
+ v-html="htmls"
+ >
+ <!-- ### -->
+ {{ htmls }}
+ </div>
</div>
</div>
+ <div class="hand-next">
+ <el-button type="primary" @click="tip0">下一步</el-button>
+ <el-button type="primary" @click="qx">取消</el-button>
+ </div>
</div>
- <div class="hand-next">
- <el-button type="primary" @click="tip0">下一步</el-button>
- <el-button type="primary" @click="qx">取消</el-button>
- </div>
- </div>
- <div v-show="forms == 2" class="first-box-outer">
- <div class="f-b-o-in" v-if="active">
- <el-collapse v-model="activeNames" @change="handleChange">
- <el-collapse-item title="公司基本信息" name="1">
- <avue-form
- ref="form1"
- v-model="obj0"
- :option="option"
- ></avue-form>
- </el-collapse-item>
- <el-collapse-item title="附件上传/查询" name="2">
- <attach :type="imgType" :opens="opens"></attach>
- </el-collapse-item>
- </el-collapse>
- </div>
+ <div v-show="forms == 2" class="first-box-outer">
+ <div class="f-b-o-in" v-if="active">
+ <el-collapse v-model="activeNames" @change="handleChange">
+ <el-collapse-item title="公司基本信息" name="1">
+ <avue-form
+ ref="form1"
+ v-model="obj0"
+ :option="option"
+ ></avue-form>
+ </el-collapse-item>
+ <el-collapse-item title="附件上传/查询" name="2">
+ <attach :type="imgType" :opens="opens"></attach>
+ </el-collapse-item>
+ </el-collapse>
+ </div>
- <div class="hand-next">
- <el-button type="primary" @click="tip1up1">上一页</el-button>
- <el-button type="primary" @click="tip1" :disabled="!opens"
- >暂存</el-button
- >
- <el-button type="primary" @click="up()" :disabled="!opens">{{
- //canDoIt ? "提交审批" : "已成功提交"
- opens ? "提交审批" : "提交审批"
- }}</el-button>
- <el-button type="info" @click="qx">取消</el-button>
+ <div class="hand-next">
+ <el-button type="primary" @click="tip1up1">上一页</el-button>
+ <el-button type="primary" @click="tip1" :disabled="!opens"
+ >暂存</el-button
+ >
+ <el-button type="primary" @click="up()" :disabled="!opens">{{
+ //canDoIt ? "提交审批" : "已成功提交"
+ opens ? "提交审批" : "提交审批"
+ }}</el-button>
+ <el-button type="info" @click="qx">取消</el-button>
+ </div>
</div>
- </div>
- </basic-container>
+ </basic-container>
+ </div>
</div>
</template>
@@ -70,7 +93,7 @@
components: {
attach: attach,
},
- props: ["data"],
+ props: ["data", "together"],
data() {
return {
htmls: "",
@@ -96,6 +119,10 @@
activeNames: ["1", "2"],
opens: true,
active: false,
+
+ OnceChouse: false, //选择武装押运或者保安服务许可
+ cardData: [],
+ choseType: "",
};
},
computed: {
@@ -103,8 +130,44 @@
},
watch: {
useWhere() {
+ var d = [];
+ // console.log(this.together, "fromWhere");
+ for (var i in this.together) {
+ if (this.useWhere == this.together[i].fromWhere) {
+ this.OnceChouse = true;
+
+ d.push(this.together[i]);
+ console.log("选择");
+ }
+ }
+ if (this.OnceChouse) {
+ this.choseType = this.useWhere;
+ for (var k in this.data) {
+ if (this.data[k].type == this.useWhere) {
+ d.unshift(this.data[k]);
+ }
+ }
+ this.cardData = d;
+ console.log(this.cardData);
+ } else {
+ this.openS();
+ }
+
+ if (this.useWhere == "close") {
+ this.tipover();
+ }
+ },
+ },
+ methods: {
+ tipchose() {
+ this.OnceChouse = false;
+ this.openS(this.choseType, this.cardData);
+ },
+ openS(chose, datas) {
+ var n = chose || this.useWhere;
+ this.data = datas || this.data;
for (var k in this.data) {
- if (this.useWhere == this.data[k].type) {
+ if (n == this.data[k].type) {
this.see = true;
this.type = this.data[k].type;
this.imgType = this.data[k].imgType;
@@ -112,30 +175,12 @@
this.apiName = this.data[k].datas.apiName;
this.name = this.data[k].menuName;
var d = this.data[k].datas.column;
- // this.option.column = d;
- this.onLoad(this.page, {}, this.useWhere, d);
- // //判断是否禁用按钮
- // for (var k in this.canDoIt) {
- // if (this.canDoIt[k].type == this.type) {
- // console.log(this.type + "-------" + this.canDoIt[k].opens);
- // this.opens = this.canDoIt[k].opens;
- // }
- // }
- // //是否禁用按钮
- // for (var k in d) {
- // d[k]["disabled"] = !this.opens;
- // }
-
- console.log("已选择type:" + this.useWhere + "--" + this.name);
+ this.onLoad(this.page, {}, n, d);
+ console.log("已选择type:" + n + "--" + this.name);
this.convert();
}
}
- if (this.useWhere == "close") {
- this.tipover();
- }
},
- },
- methods: {
onLoad(page, params = {}, val, d) {
params["cardid"] = this.userInfo.Id;
getList(page.currentPage, page.pageSize, params).then((res) => {
@@ -148,7 +193,7 @@
getListrev(page.currentPage, page.pageSize, params).then((resv) => {
this.data = this.data.concat(resv.data.data.records);
console.log("已有申请数量：", this.data.length);
- console.log(val);
+ console.log(val, "当前type");
this.changeBut(true, d);
if (this.data.length == 0) {
console.log("一条数据都没有");
@@ -277,6 +322,7 @@
var d = {};
this.data0 = d;
this.active = false;
+ this.OnceChouse = false;
},
},
};
diff --git a/src/views/home/column.js b/src/views/home/column.js
index 3c4fcd3..30d8726 100644
--- a/src/views/home/column.js
+++ b/src/views/home/column.js
@@ -323,3 +323,8 @@
export var crossRegioncolumn = [//跨区域经营备案
...columnXIAQU
]
+
+
+export var armedEscortcolumn = [//武装押运许可申请
+ ...columnU
+]
diff --git a/src/views/home/htmls.js b/src/views/home/htmls.js
index d232905..e5bd6c7 100644
--- a/src/views/home/htmls.js
+++ b/src/views/home/htmls.js
@@ -248,4 +248,48 @@
<p><label>受理部门：</label>市级公安机关</p>
+<p><label>审批机关：：</label>区级公安机关</p>`
+
+
+export var armedEscort = //设立分公司备案
+ `<p><label>审批依据：</label></p>
+<p>
+ 1、《保安服务管理条例》(中华人民共和国国务院令第564号)；<br />
+ 2、《公安机关实施保安服务管理条例办法》(中华人民共和国公安部令 第 112 号)；<br />
+ 3、《陕西省公安厅关于申请设立保安服务公司保安培训单位有关事项的通知》（陕公治〔2011〕225号）；<br />
+ 4、《公安部关于修改部分部门规章的决定》（中华人民共和国公安部令第136号）；<br />
+ 5、《陕西省公安厅关于向自贸试验区下放治安管理行政许可事项的通知》（陕公转发[2017]151号）；<br />
+ 6、《公安部关于印发〈保安守护押运管理规定〉的通知》（公通字[2017]13号）规定：各地原则上
+ 不再许可设立新的提供武装守护押运服务的保安企业，确需设立的，必须报经公安部同意后方可许可）；<br />
+</p>
+<p>
+ <label>申请条件：</label
+ >自然人、法人及公司主要管理人员均应具备5年以上军队、公安、安全、审判、检察、司法行政或者治安保卫、保安经营管理工作经验。
+</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、出资属国有独资或者国有资本占注册资本总额51%以上的有效证明文件（原件及复印件各1份）<br />
+ 9、符合国家或者行业标准的专用运输车辆以及通信、报警设备的材料（原件及复印件各1份<br />
+ 10、枪支安全管理制度和保管设施情况的材料（原件及复印件各1份）<br />
+</p>
+<p><label>法定周期：</label>区、市15个工作日</p>
+<p><label>承诺时限：</label>区、市15个工作日</p>
+
+<p><label>受理部门：</label>市级公安机关</p>
+
<p><label>审批机关：：</label>区级公安机关</p>`
\ No newline at end of file
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 0b47e17..59e060e 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -41,7 +41,7 @@
></i>
</span>
</Approval>
- <cardPopup class="crossRegion" :data="dataCard">
+ <cardPopup class="crossRegion" :data="dataCard" :together="together">
<span slot="close">
<i class="el-icon-close ApprovalClose" @click="openClose"> </i>
</span>
@@ -68,6 +68,7 @@
userName: "",
data: [],
dataCard: [],
+ together: [],
out: true,
d: [],
};
@@ -77,63 +78,26 @@
},
created() {
this.cc();
- this.dataCard = ourDatas;
+ // this.dataCard = ourDatas;
var cando = [];
+ var normal = [];
+ var both = [];
for (var k in ourDatas) {
+ if (ourDatas[k].fromWhere != undefined) {
+ both.push(ourDatas[k]);
+ continue;
+ }
+ normal.push(ourDatas[k]);
cando.push({
opens: true,
type: ourDatas[k].type,
});
}
+ this.dataCard = normal;
+ this.together = both;
this.$store.commit("setcanDoIt", cando);
},
methods: {
- // onLoad(page, params = {}, val) {
- // params["cardid"] = this.userInfo.Id;
- // getList(page.currentPage, page.pageSize, params).then((res) => {
- // const data = res.data.data;
- // this.data = data.records;
- // getListre(page.currentPage, page.pageSize, params).then((ress) => {
- // this.data = this.data.concat(ress.data.data.records);
- // getListrek(page.currentPage, page.pageSize, params).then((resk) => {
- // this.data = this.data.concat(resk.data.data.records);
- // getListrev(page.currentPage, page.pageSize, params).then((resv) => {
- // this.data = this.data.concat(resv.data.data.records);
- // console.log("已有申请数量：", this.data.length);
- // console.log(val);
- // if (this.data.length == 0) {
- // this.$store.commit("changecanDoIt", {
- // o: true,
- // ptype: val,
- // });
- // console.log("一条数据都没有");
- // this.$store.commit("changeuseWhere", val);
- // return;
- // }
- // this.data.forEach((item) => {
- // if (item.ptype == val) {
- // if (item.type == 0 || item.type == 2) {
- // this.$store.commit("changecanDoIt", {
- // o: false,
- // ptype: val,
- // });
- // console.log("有数据");
- // this.$store.commit("changeuseWhere", val);
- // } else {
- // this.$store.commit("changecanDoIt", {
- // o: true,
- // ptype: val,
- // });
- // console.log("无数据");
- // this.$store.commit("changeuseWhere", val);
- // }
- // }
- // });
- // });
- // });
- // });
- // });
- // },
cc: function () {
this.userName = this.userInfo.user_name;
},
@@ -262,6 +226,14 @@
width: 1243px;
// height: 766px;
}
+ .OnceChouse {
+ position: absolute;
+ top: calc(50% - 200px);
+ left: calc(50% - 300px);
+ width: 600px;
+ height: 400px;
+ // background-color: #fff;
+ }
.ApprovalClose {
position: absolute;
@@ -285,12 +257,12 @@
width: calc(100% - 10px);
height: 40px;
position: relative;
- top: 10px;
+ top: 13px;
color: #fff;
border-radius: 10px 10px 0 0;
text-align: center;
line-height: 40px;
- left: 0;
+ left: 1px;
background-color: #25aff3;
}
.first-box-outer {
@@ -337,4 +309,26 @@
height: 100%;
background-color: rgba($color: #7a7a7a, $alpha: 0.1);
}
+
+//单选大小
+.el-radio__inner {
+ width: 25px;
+ height: 25px;
+}
+.el-radio__inner::after {
+ width: 8px;
+ height: 8px;
+ // left: calc(50% - 4px);
+ // top: calc(50% - 4px);
+}
+.el-radio__label {
+ font-size: 16px;
+ font-weight: 700;
+ font: Helvetica Neue, Helvetica, PingFang SC, \5fae\8f6f\96c5\9ed1, Tahoma,
+ Arial, sans-serif;
+}
+.choseTitle {
+ padding: 15px 28px;
+ font-size: 14px;
+}
</style>
\ No newline at end of file
diff --git a/src/views/home/ourDatas.js b/src/views/home/ourDatas.js
index 8f3cdd8..f5093bc 100644
--- a/src/views/home/ourDatas.js
+++ b/src/views/home/ourDatas.js
@@ -4,7 +4,8 @@
crossRegioncolumn,//跨区域经营备案
branchOfficecolumn, //设立分公司备案
securityGuardcolumn,//自招保安单位备案
- cancellationOfFilingcolumn //自招保安单位备案撤销
+ cancellationOfFilingcolumn, //自招保安单位备案撤销
+ armedEscortcolumn, //武装押运许可申请
} from './column'
import {
@@ -13,7 +14,8 @@
securityPermit, //保安服务许可申请
branchOffice, //设立分公司备案
securityGuard,//自招保安单位备案
- cancellationOfFiling//自招保安单位备案撤销
+ cancellationOfFiling,//自招保安单位备案撤销
+ armedEscort,//武装押运许可申请
} from './htmls'
export var ourDatas = [
@@ -26,6 +28,10 @@
type: 0,
imgType: 0,
datas: {
+ msg: `材料说明：普通保安服
+ 务公司是指申请服务范围为：门卫、巡逻、守
+ 护、随身护卫、安全检查、安全技术防范、安全风险评估、区域
+ 秩序维护的公司。`,
htmls: securityPermit,
column: securityPermitcolumn,
apiName: ['permit/save', 'permit/storage', 'permit/selectIn']
@@ -98,5 +104,23 @@
column: crossRegioncolumn,
apiName: ['recordk/save', 'recordk/recorkstorage', 'recordk/selectIn']
}
+ },
+ {
+ menuName: "武装押运许可申请",
+ // centerUrl: "/img/logo.png",
+ // topUrl: "url(/img/login-sq10.png)",
+ // topUrlh: "url(/img/login-sq1010.png)",
+ fromWhere: 0,
+ type: 6,
+ imgType: 8,
+ datas: {
+ msg: `按照《公安部关于印发<保安守
+ 护押运管理规定>的通知》（公通字[2017]13号）规定
+ ：各地原则上不再许可设立新的
+ 提供武装守护押运服务的保安企业，确需设立的，必须报经公安部同意后方可许可`,
+ htmls: armedEscort,
+ column: armedEscortcolumn,
+ apiName: ['recordk/save', 'recordk/recorkstorage', 'recordk/selectIn']
+ }
}
]
\ No newline at end of file
--
Gitblit v1.9.3