From a82407f7849298ff91c820f8802ab05dc26fca94 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Mon, 06 Sep 2021 16:51:01 +0800
Subject: [PATCH] 备案许可修改 公司信息拆分工商信息分页
---
src/views/licenseApproval/securityTraining.vue | 4
src/views/licenseApproval/securityGuard.vue | 23 +++--
src/views/licenseApproval/crossRegion.vue | 23 +++--
src/views/securityCompany/companyDetails.vue | 128 ++++++++++++++++++++++++++-----
src/views/licenseApproval/branchOffice.vue | 21 +++--
5 files changed, 147 insertions(+), 52 deletions(-)
diff --git a/src/views/licenseApproval/branchOffice.vue b/src/views/licenseApproval/branchOffice.vue
index 4169ac7..dfe930e 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-08-28 10:28:39
+ * @Last Modified time: 2021-09-06 09:20:45
*/
@@ -91,9 +91,9 @@
ref="licence"
>
<div class="licence" id="licence" v-if="dialogVisible">
- <div class="licence-head">备案证</div>
+ <div class="licence-head">备案回执</div>
<div class="head-tid">
- 洪公保服务
+ 编号
<span class="fontStyle">{{
licenceData.row.organizationcode
}}</span>
@@ -109,9 +109,9 @@
<span class="l-m-r-once">{{ item }}</span>
</div>
</div>
- <div class="licence-bottom">发证机关（南昌市公安局）</div>
+ <div class="licence-bottom">（公安机关印章）</div>
<div class="l-bottom">
- 发证日期
+ <!-- 发证日期 -->
<span class="l-b-t">{{
licenceData.row.permitime.slice(0, 4)
}}</span
@@ -636,14 +636,17 @@
viewLicense(row) {
//查看许可证
+ console.log(row, 34);
this.licenceData.row = row;
this.licenceData.chiden = {};
this.licenceData.chiden["名称"] = row.enterprisename;
- this.licenceData.chiden["住所"] = row.address;
+ this.licenceData.chiden["地址"] = row.address;
+ this.licenceData.chiden["服务区域"] = row.industry;
this.licenceData.chiden["法定代表人"] = row.representative;
- this.licenceData.chiden["服务范围"] = row.industry;
- this.licenceData.chiden["注册资本"] = row.registeredcapital;
- this.licenceData.chiden["批准文号"] = row.registrationnumber;
+ this.licenceData.chiden["备案时间"] = row.officetime;
+ this.licenceData.chiden["备案内容"] = "设立分公司备案";
+ // this.licenceData.chiden["注册资本"] = row.registeredcapital;
+ // this.licenceData.chiden["批准文号"] = row.registrationnumber;
console.log(this.licenceData);
this.dialogVisible = true;
diff --git a/src/views/licenseApproval/crossRegion.vue b/src/views/licenseApproval/crossRegion.vue
index 29b43ca..e52f5b3 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-08-28 10:28:50
+ * @Last Modified time: 2021-09-06 09:21:39
*/
@@ -90,13 +90,13 @@
ref="licence"
>
<div class="licence" id="licence" v-if="dialogVisible">
- <div class="licence-head">备案证</div>
+ <div class="licence-head">备案回执</div>
<div class="head-tid">
- 洪公保服务
+ 编号
<span class="fontStyle">{{
licenceData.row.organizationcode
}}</span>
- 号
+ <!-- 号 -->
</div>
<div class="licence-main">
<div
@@ -108,9 +108,9 @@
<span class="l-m-r-once">{{ item }}</span>
</div>
</div>
- <div class="licence-bottom">发证机关（南昌市公安局）</div>
+ <div class="licence-bottom">（公安机关印章）</div>
<div class="l-bottom">
- 发证日期
+ <!-- 发证日期 -->
<span class="l-b-t">{{
licenceData.row.permitime.slice(0, 4)
}}</span
@@ -625,14 +625,17 @@
viewLicense(row) {
//查看许可证
+ console.log(row, 34);
this.licenceData.row = row;
this.licenceData.chiden = {};
this.licenceData.chiden["名称"] = row.enterprisename;
- this.licenceData.chiden["住所"] = row.address;
+ this.licenceData.chiden["地址"] = row.address;
+ this.licenceData.chiden["服务区域"] = row.industry;
this.licenceData.chiden["法定代表人"] = row.representative;
- this.licenceData.chiden["服务范围"] = row.industry;
- this.licenceData.chiden["注册资本"] = row.registeredcapital;
- this.licenceData.chiden["批准文号"] = row.registrationnumber;
+ this.licenceData.chiden["备案时间"] = row.officetime;
+ this.licenceData.chiden["备案内容"] = "跨区域经营备案";
+ // this.licenceData.chiden["注册资本"] = row.registeredcapital;
+ // this.licenceData.chiden["批准文号"] = row.registrationnumber;
console.log(this.licenceData);
this.dialogVisible = true;
diff --git a/src/views/licenseApproval/securityGuard.vue b/src/views/licenseApproval/securityGuard.vue
index e66fbe1..4fae898 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-08-28 10:42:08
+ * @Last Modified time: 2021-09-06 09:24:44
*/
@@ -98,13 +98,13 @@
ref="licence"
>
<div class="licence" id="licence" v-if="dialogVisible">
- <div class="licence-head">备案证</div>
+ <div class="licence-head">备案回执</div>
<div class="head-tid">
- 洪公保服务
+ 编号
<span class="fontStyle">{{
licenceData.row.organizationcode
}}</span>
- 号
+ <!-- 号 -->
</div>
<div class="licence-main">
<div
@@ -116,9 +116,9 @@
<span class="l-m-r-once">{{ item }}</span>
</div>
</div>
- <div class="licence-bottom">发证机关（南昌市公安局）</div>
+ <div class="licence-bottom">（公安机关印章）</div>
<div class="l-bottom">
- 发证日期
+ <!-- 发证日期 -->
<span class="l-b-t">{{
licenceData.row.permitime.slice(0, 4)
}}</span
@@ -688,14 +688,17 @@
},
viewLicense(row) {
//查看许可证
+ console.log(row, 34);
this.licenceData.row = row;
this.licenceData.chiden = {};
this.licenceData.chiden["名称"] = row.enterprisename;
- this.licenceData.chiden["住所"] = row.address;
+ this.licenceData.chiden["地址"] = row.address;
+ this.licenceData.chiden["服务区域"] = row.industry;
this.licenceData.chiden["法定代表人"] = row.representative;
- this.licenceData.chiden["服务范围"] = row.industry;
- this.licenceData.chiden["注册资本"] = row.registeredcapital;
- this.licenceData.chiden["批准文号"] = row.registrationnumber;
+ this.licenceData.chiden["备案时间"] = row.officetime;
+ this.licenceData.chiden["备案内容"] = "自招保安单位备案";
+ // this.licenceData.chiden["注册资本"] = row.registeredcapital;
+ // this.licenceData.chiden["批准文号"] = row.registrationnumber;
console.log(this.licenceData);
this.dialogVisible = true;
diff --git a/src/views/licenseApproval/securityTraining.vue b/src/views/licenseApproval/securityTraining.vue
index 822dea1..d0efda7 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-08-28 10:29:12
+ * @Last Modified time: 2021-09-06 09:27:37
*/
@@ -142,7 +142,7 @@
ref="licence"
>
<div class="licence" id="licence" v-if="dialogVisible">
- <div class="licence-head">保安服务许可证</div>
+ <div class="licence-head">保安培训许可证</div>
<div class="head-tid">
洪公保服务
<span class="fontStyle">{{
diff --git a/src/views/securityCompany/companyDetails.vue b/src/views/securityCompany/companyDetails.vue
index 25352b1..7183416 100644
--- a/src/views/securityCompany/companyDetails.vue
+++ b/src/views/securityCompany/companyDetails.vue
@@ -2,7 +2,7 @@
* @Author: Morpheus
* @Date: 2021-07-05 16:31:54
* @Last Modified by: liu
- * @Last Modified time: 2021-08-31 14:52:13
+ * @Last Modified time: 2021-09-06 10:21:32
* menu-name 保安公司详细资料
*/
<template>
@@ -39,7 +39,7 @@
</el-col>
</el-row>
- <el-row>
+ <!-- <el-row>
<el-col span="12">
<el-col span="12">
<el-form-item label="注册时间">
@@ -60,9 +60,9 @@
></el-input>
</el-form-item>
</el-col>
- </el-row>
+ </el-row> -->
- <el-row>
+ <!-- <el-row>
<el-col span="12">
<el-form-item label="实缴资金">
<el-input
@@ -81,10 +81,10 @@
></el-input>
</el-form-item>
</el-col>
- </el-row>
+ </el-row> -->
<el-row>
- <el-col span="12">
+ <!-- <el-col span="12">
<el-form-item label="工商注册号">
<el-input
disabled="true"
@@ -92,12 +92,12 @@
autocomplete="off"
></el-input>
</el-form-item>
- </el-col>
- <el-col span="12">
- <el-form-item label="公司类型">
+ </el-col> -->
+ <el-col span="24">
+ <el-form-item label="注册地址">
<el-input
disabled="true"
- v-model="form.enterprises"
+ v-model="form.address"
autocomplete="off"
></el-input>
</el-form-item>
@@ -136,10 +136,10 @@
</el-form-item>
</el-col>
<el-col span="12">
- <el-form-item label="注册地址">
+ <el-form-item label="公司类型">
<el-input
disabled="true"
- v-model="form.address"
+ v-model="form.enterprises"
autocomplete="off"
></el-input>
</el-form-item>
@@ -161,7 +161,93 @@
</el-row>
</el-form>
</el-tab-pane>
- <el-tab-pane label="投资人信息" name="second">
+ <el-tab-pane label="工商信息" name="second">
+ <el-form
+ :model="form"
+ label-position="right"
+ size="mini"
+ label-width="100px"
+ >
+ <!-- <el-row>
+ <el-col span="12">
+ <el-form-item label="公司名称">
+ <el-input
+ disabled="true"
+ v-model="form.enterprisename"
+ autocomplete="off"
+ ></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col span="12">
+ <el-form-item label="法定代表人">
+ <el-input
+ disabled="true"
+ v-model="form.representative"
+ autocomplete="off"
+ ></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row> -->
+
+ <el-row>
+ <el-col span="12">
+ <el-form-item label="组织机构代码">
+ <el-input
+ disabled="true"
+ v-model="form.organizationcode"
+ autocomplete="off"
+ ></el-input>
+ </el-form-item>
+ </el-col>
+
+ <el-col span="12">
+ <el-form-item label="注册资金">
+ <el-input
+ disabled="true"
+ v-model="form.registeredcapital"
+ autocomplete="off"
+ ></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+
+ <el-row>
+ <el-col span="12">
+ <el-form-item label="实缴资金">
+ <el-input
+ disabled="true"
+ v-model="form.capital"
+ autocomplete="off"
+ ></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col span="12">
+ <el-col span="12">
+ <el-form-item label="注册时间">
+ <el-input
+ disabled="true"
+ v-model="form.establishtime"
+ autocomplete="off"
+ ></el-input>
+ </el-form-item>
+ </el-col>
+ </el-col>
+ </el-row>
+
+ <el-row>
+ <el-col span="12">
+ <el-form-item label="工商注册号">
+ <el-input
+ disabled="true"
+ v-model="form.registrationnumber"
+ autocomplete="off"
+ ></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-form>
+ </el-tab-pane>
+ <el-tab-pane label="投资人信息" name="third">
<avue-crud
class="company-box"
:option="investorOption"
@@ -179,7 +265,7 @@
>
</avue-crud>
</el-tab-pane>
- <el-tab-pane label="管理人信息" name="third">
+ <el-tab-pane label="管理人信息" name="fourth">
<avue-crud
class="company-box"
:option="manageOption"
@@ -197,22 +283,22 @@
>
</avue-crud>
</el-tab-pane>
- <el-tab-pane label="装备信息" name="fourth">
+ <el-tab-pane label="装备信息" name="fifth">
<equipment :form="form"></equipment>
</el-tab-pane>
- <el-tab-pane label="保安员信息" name="fifth">
+ <el-tab-pane label="保安员信息" name="sixth">
<staff :form="form"></staff>
</el-tab-pane>
- <el-tab-pane label="处罚信息" name="sixth">
+ <el-tab-pane label="处罚信息" name="seventh">
<punish :form="form"></punish>
</el-tab-pane>
- <el-tab-pane label="服务对象" name="seventh">
+ <el-tab-pane label="服务对象" name="eighth">
<service :form="form"></service>
</el-tab-pane>
<!-- <el-tab-pane label="其他附件" name="eighth">
<enclosure :form="form"></enclosure>
</el-tab-pane> -->
- <el-tab-pane label="营业执照" name="eighth">
+ <el-tab-pane label="营业执照" name="ninth">
<div class="businessLicenses">
<el-container>
<el-main>
@@ -229,7 +315,7 @@
</el-container>
</div>
</el-tab-pane>
- <el-tab-pane label="许可证" name="ninth">
+ <el-tab-pane label="许可证" name="tenth">
<div class="businessLicenses">
<el-container>
<el-main>
@@ -433,7 +519,7 @@
that = this;
this.$store.state.tags.tagList.forEach((item, index) => {
- if (item.label == "保安公司详细信息") {
+ if (item.label == "保安公司详细资料") {
if (flag == false) {
ind = index;
flag = true;
--
Gitblit v1.9.3