From 1db657f93de8e2902d7a2456b9c7806972a0b928 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 11 Sep 2021 17:43:50 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises_ys
---
src/views/securityUnit/securityTraining.vue | 344 +++++++++++++++++++++++++++++++--------------------------
1 files changed, 187 insertions(+), 157 deletions(-)
diff --git a/src/views/securityUnit/securityTraining.vue b/src/views/securityUnit/securityTraining.vue
index 12384fb..b5b4df6 100644
--- a/src/views/securityUnit/securityTraining.vue
+++ b/src/views/securityUnit/securityTraining.vue
@@ -41,6 +41,13 @@
icon="el-icon-circle-check"
>附件上传
</el-button>
+ <el-button
+ :size="size"
+ :type="type"
+ @click="Uploads(row)"
+ icon="el-icon-circle-check"
+ >单位装备清单
+ </el-button>
</template>
<template slot="menuLeft">
<el-button
@@ -49,7 +56,7 @@
size="small"
plain
@click.stop="rowSave"
- >新增</el-button
+ >信息登记</el-button
>
<el-button
type="danger"
@@ -69,58 +76,43 @@
</el-button>
</template>
</avue-crud>
- <div class="lod" v-show="forms != -1">
- <div class="lod-in">
- <!-- <el-col class="trees" v-if="forms == 0">
- <div class="box">
- <el-scrollbar>
- <basic-container>
- <avue-tree
- :option="treeOption"
- :data="treeData"
- @node-click="nodeClick"
- />
- </basic-container>
- </el-scrollbar>
- </div>
- </el-col> -->
- <avue-form
- ref="form"
- v-model="obj0"
- :option="option0"
- v-if="forms == 0"
- >
- <template slot="menuForm">
- <el-button type="primary" @click="tip0">下一页</el-button>
- <el-button type="info" @click="tipover">取消</el-button>
- </template>
- </avue-form>
- <avue-form
- ref="form1"
- v-model="obj1"
- :option="option1"
- v-else-if="forms == 1"
- >
- <template slot="menuForm">
- <el-button type="primary" @click="tip1up1">上一页</el-button>
- <el-button type="primary" @click="tip1">下一页</el-button>
- <el-button type="info" @click="tipover">取消</el-button>
- </template>
- </avue-form>
- <avue-form
- ref="form2"
- v-model="obj2"
- :option="option2"
- v-else-if="forms == 2"
- >
- <template slot="menuForm">
- <el-button type="primary" @click="tip2up2">上一页</el-button>
- <el-button type="primary" @click="tip2">提交</el-button>
- <el-button type="info" @click="tipover">取消</el-button>
- </template>
- </avue-form>
- </div>
- </div>
+
+ <el-dialog
+ title="信息登记"
+ append-to-body
+ :visible.sync="forms"
+ :close-on-click-modal="false"
+ @close="tipover"
+ class="information-box"
+ width="60%"
+ >
+ <el-tabs v-model="activeName" @tab-click="handleClick">
+ <el-tab-pane label="保安单位基本信息" name="first">
+ <avue-form ref="form" v-model="obj0" :option="option0">
+ <template slot="menuForm" align="center">
+ <el-button type="primary" @click="submitAdd">提交</el-button>
+ <el-button type="info" @click="tipover">取消</el-button>
+ </template>
+ </avue-form>
+ </el-tab-pane>
+ <el-tab-pane label="保安单位出资人员" name="second">
+ <avue-form ref="form1" v-model="obj1" :option="option1">
+ <template slot="menuForm">
+ <el-button type="primary" @click="submitAdd">提交</el-button>
+ <el-button type="info" @click="tipover">取消</el-button>
+ </template>
+ </avue-form>
+ </el-tab-pane>
+ <el-tab-pane label="主要管理人员信息" name="third">
+ <avue-form ref="form2" v-model="obj2" :option="option2">
+ <template slot="menuForm">
+ <el-button type="primary" @click="submitAdd">提交</el-button>
+ <el-button type="info" @click="tipover">取消</el-button>
+ </template>
+ </avue-form>
+ </el-tab-pane>
+ </el-tabs>
+ </el-dialog>
</div>
<el-dialog
title="保安单位导入"
@@ -252,7 +244,39 @@
// },
obj0: {
- title0: "保安单位基本信息",
+ creditcode: "",
+ jurisdiction: "",
+ stats: "",
+ enterprisename: "",
+ representative: "",
+ establishtime: "",
+ registeredcapital: "",
+ capital: "",
+ organizationcode: "",
+ registrationnumber: "",
+ identificationnumber: "",
+ enterprises: "",
+ address: "",
+ business: "",
+ region: "",
+ registration: "",
+ industry: "",
+ },
+ obj1: {
+ creditcode: "",
+ shareholder: "",
+ shareholdingratio: "",
+ capital2: "",
+ capitaltime: "",
+ cardid: "",
+ cell: "",
+ },
+ obj2: {
+ creditcode: "",
+ name: "",
+ post: "",
+ cardid2: "",
+ cell2: "",
},
option0: {
emptyBtn: false,
@@ -260,18 +284,14 @@
gutter: 30,
column: column0,
},
- obj1: {
- title1: "保安单位出资人员",
- },
+
option1: {
emptyBtn: false,
submitBtn: false,
gutter: 30,
column: column1,
},
- obj2: {
- title2: "主要管理人员信息",
- },
+
option2: {
emptyBtn: false,
submitBtn: false,
@@ -279,7 +299,7 @@
column: column2,
},
- forms: -1,
+ forms: false,
data0: {},
data1: {},
data2: {},
@@ -301,11 +321,13 @@
searchMenuSpan: 6,
height: 583,
- menuWidth: 275,
+ menuWidth: 369,
align: "center",
selection: true,
column: column,
},
+
+ activeName: "first",
};
},
computed: {
@@ -336,6 +358,16 @@
},
},
methods: {
+ Uploads(row) {
+ // console.log(val.departmentid);
+ this.$router.push({
+ path: `/resource/attachCopyzb`,
+ query: {
+ deptId: row.departmentid,
+ enterprisename: row.enterprisename,
+ },
+ });
+ },
rowClickSelf(val) {
// console.log(val.departmentid);
this.$router.push({
@@ -389,7 +421,8 @@
},
rowSave(form, done, loading) {
// console.log("save1");
- this.forms = 0;
+ this.forms = true;
+ this.activeName = "first";
var that = this;
//先获取部门接口
getDeptLazyTree().then((res) => {
@@ -528,84 +561,80 @@
// this.obj2["useid"] = data.id;
// this.nobumen = 1;
// },
- tip0() {
+ submitAdd() {
if (this.panduanmeiyouziduan()) {
return;
}
- var d = {};
+
+ var oneObj = {};
+
for (var k in this.obj0) {
for (var i in column0) {
if (k == column0[i].prop && k != "title0") {
- d[k] = this.obj0[k];
+ oneObj[k] = this.obj0[k];
+ }
+
+ if (column0[i].prop == "creditcode") {
+ column1[1].value = column0[i].value;
}
}
}
- console.log(d);
- for (var k in d) {
- if (d[k] == "" || d[k] == undefined) {
- console.log(k);
- this.$message.warning("请检查表单是否填写完整！");
+
+ for (var key in oneObj) {
+ if (oneObj[key] == "" || oneObj[key] == undefined) {
+ console.log(key);
+ this.$message.warning("请检查表单是否填写完整！1");
return;
}
}
- console.log(d, 0);
- this.data0 = d;
- this.forms = 1;
- },
- tip1() {
- if (this.panduanmeiyouziduan()) {
- return;
- }
- var d = {};
- for (var k in this.obj1) {
- for (var i in column1) {
- if (k == column1[i].prop && k != "title1") {
- d[k] = this.obj1[k];
+
+ this.data0 = oneObj;
+
+ var twoObj = {};
+ for (var twok in this.obj1) {
+ for (var twoi in column1) {
+ if (twok == column1[twoi].prop && twok != "title1") {
+ twoObj[twok] = this.obj1[twok];
}
}
}
- d["capital"] = d["capital2"];
- delete d["capital2"];
+
+ twoObj["capital"] = twoObj["capital2"];
+ delete twoObj["capital2"];
// console.log(d);
- for (var k in d) {
- if (d[k] == "" || d[k] == undefined) {
- console.log(k);
- this.$message.warning("请检查表单是否填写完整！");
+ for (var twokey in twoObj) {
+ if (twoObj[twokey] == "" || twoObj[twokey] == undefined) {
+ console.log(twokey);
+ this.$message.warning("请检查表单是否填写完整！2");
return;
}
}
- console.log(d, 1);
- this.data1 = d;
- this.forms = 2;
- },
- tip2() {
- if (this.panduanmeiyouziduan()) {
- return;
- }
- var d = {};
- for (var k in this.obj2) {
- for (var i in column2) {
- if (k == column2[i].prop && k != "title2") {
- d[k] = this.obj2[k];
+
+ this.data1 = twoObj;
+
+ var threeObj = {};
+ for (var threek in this.obj2) {
+ for (var threei in column2) {
+ if (threek == column2[threei].prop && threek != "title2") {
+ threeObj[threek] = this.obj2[threek];
}
}
}
- console.log(d);
- d["cardid"] = d["cardid2"];
- delete d["cardid2"];
- d["cell"] = d["cell2"];
- delete d["cell2"];
+
+ threeObj["cardid"] = threeObj["cardid2"];
+ delete threeObj["cardid2"];
+ threeObj["cell"] = threeObj["cell2"];
+ delete threeObj["cell2"];
// d["shareholdingratio"] = d["shareholdingratio2"];
// delete d["shareholdingratio2"];
- for (var k in d) {
- if (d[k] == "" || d[k] == undefined) {
- console.log(k);
- this.$message.warning("请检查表单是否填写完整！");
+ for (var threekey in threeObj) {
+ if (threeObj[threekey] == "" || threeObj[threekey] == undefined) {
+ console.log(threekey);
+ this.$message.warning("请检查表单是否填写完整！3");
return;
}
}
- console.log(d, 2);
- this.data2 = d;
+ this.data2 = threeObj;
// this.data0.departmentid = this.data0.useid;
// this.data1.departmentid = this.data1.useid;
@@ -629,22 +658,44 @@
}, 500);
this.tipover();
},
- tip1up1() {
- this.forms = 0;
- },
- tip2up2() {
- this.forms = 1;
- },
+
tipover() {
- this.forms = -1;
+ this.forms = false;
this.obj0 = {
- title0: "保安单位基本信息",
+ creditcode: "",
+ jurisdiction: "",
+ stats: "",
+ enterprisename: "",
+ representative: "",
+ establishtime: "",
+ registeredcapital: "",
+ capital: "",
+ organizationcode: "",
+ registrationnumber: "",
+ identificationnumber: "",
+ enterprises: "",
+ address: "",
+ business: "",
+ region: "",
+ registration: "",
+ industry: "",
};
+
this.obj1 = {
- title1: "保安单位出资人员",
+ creditcode: "",
+ shareholder: "",
+ shareholdingratio: "",
+ capital2: "",
+ capitaltime: "",
+ cardid: "",
+ cell: "",
};
this.obj2 = {
- title2: "主要管理人员信息",
+ creditcode: "",
+ name: "",
+ post: "",
+ cardid2: "",
+ cell2: "",
};
this.data0 = {};
this.data1 = {};
@@ -680,7 +731,18 @@
console.log(this.havedata, "qqqqq");
},
},
- mounted() {},
+ mounted() {
+ var that = this;
+
+ this.option0.column.forEach((item) => {
+ if (item.prop == "creditcode") {
+ item.change = function (e) {
+ that.obj1.creditcode = e.value;
+ that.obj2.creditcode = e.value;
+ };
+ }
+ });
+ },
};
</script>
@@ -700,38 +762,6 @@
// padding: 0 !important;
// }
-.lod {
- position: absolute;
- top: 0;
- left: 0;
- width: 100%;
- height: 100%;
- background-color: rgba($color: #000000, $alpha: 0.5);
- padding: 100px 0 0 0;
- z-index: 500 !important;
- display: flex;
- // align-items: center;
- justify-content: center;
- .trees {
- z-index: 501 !important;
- position: absolute;
- width: 15%;
- top: 100px;
- left: 0;
- // display: none;
- }
- .lod-in {
- width: 70%;
- height: auto;
- background-color: transparent;
-
- // padding: 10px 0 0 0;
- }
-
- .el-collapse-item {
- padding-top: 15px !important;
- }
-}
.el-collapse {
border-top: 1px solid transparent !important;
}
--
Gitblit v1.9.3