From 2d6dd9c84ccf3ab8f0595301433fc238c3661291 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Sat, 10 Jul 2021 13:51:05 +0800
Subject: [PATCH] 派遣管理和保安单位管理 内联修改， 根据单位的存在改变状态
---
src/views/dispatchChild/data.js | 215 +--------
src/views/securityUnit/index.vue | 205 ++++++--
src/views/securityUnitChild/index.vue | 48 +
src/views/dispatch/data.js | 189 --------
src/views/dispatch/index.vue | 12
src/views/securityUnit/data.js | 498 ++++++++++++++--------
src/views/dispatchChild/index.vue | 104 +++-
src/views/securityUnitChild/data.js | 26
8 files changed, 647 insertions(+), 650 deletions(-)
diff --git a/src/views/dispatch/data.js b/src/views/dispatch/data.js
index ae922f9..08f3ee3 100644
--- a/src/views/dispatch/data.js
+++ b/src/views/dispatch/data.js
@@ -9,27 +9,6 @@
// ]
export var column = [//派遣服务公司登记
- // {
- // label: "id",
- // prop: "id",
- // hide: true,
- // editDisplay: false,
- // addDisplay: false
- // },
- // {
- // label: "保安单位",
- // prop: "tenantName",
- // hide: true,
- // editDisplay: false,
- // addDisplay: false
- // },
- // {
- // label: "保安id",
- // prop: "tenantId",
- // hide: true,
- // editDisplay: false,
- // addDisplay: false
- // },//上面不显示
{
label: "派遣单位名称",
prop: "name",
@@ -40,13 +19,12 @@
},
{
label: "保安公司",
- prop: "tenantId",
+ prop: "tenantName",
type: "tree",
- search: true,
- dicUrl: "/api/blade-system/tenant/select",
+ dicUrl: "/api/blade-system/dept/lazy-tree?parentId=0",
props: {
- label: "tenantName",
- value: "tenantId"
+ label: "title",
+ value: "id"
},
// hide: !website.tenantMode,
// addDisplay: website.tenantMode,
@@ -65,22 +43,6 @@
label: " 联系人",
prop: "linkman",
labelWidth: 110,
- // addDisplay: true,
- // editDisplay: true,
- // viewDisplay: true,
- // searchSpan: 5,
- // dicUrl: "/api/blade-system/dict-biz/dictionary?code=educationType",
- // props: {
- // label: "dictValue",
- // value: "dictKey"
- // },
- // search: true,
- // type: "select",
- // // rules: [{
- // // required: true,
- // // message: "请选择学历",
- // // trigger: "blur"
- // // }],
},
{
label: "联系电话",
@@ -176,147 +138,4 @@
},
-]
-
-export var data = [
- {
- "tenant_id": "xx保安公司", "name": "xx职务",
- "number": "10",
- "education": "大专以上",
- "experience": "2年",
- "max_salary": "8k",
- "units_scale": "200人+",
- "linkman": "XX",
- "phone": "xxxxxxxxxx",
- "address": "环城路地一大道30号口下",
- "start_time": "7月8日",
- "end_time": "7月31日",
- "status": "2"
- },
- {
- "tenant_id": "xx保安公司", "name": "xx职务",
- "number": "10",
- "education": "大专以上",
- "experience": "2年",
- "max_salary": "8k",
- "units_scale": "200人+",
- "linkman": "XX",
- "phone": "xxxxxxxxxx",
- "address": "环城路地一大道30号口下",
- "start_time": "7月8日",
- "end_time": "7月31日",
- "status": "2"
- },
- {
- "tenant_id": "xx保安公司", "name": "xx职务",
- "number": "10",
- "education": "大专以上",
- "experience": "2年",
- "max_salary": "8k",
- "units_scale": "200人+",
- "linkman": "XX",
- "phone": "xxxxxxxxxx",
- "address": "环城路地一大道30号口下",
- "start_time": "7月8日",
- "end_time": "7月31日",
- "status": "2"
- },
- {
- "tenant_id": "xx保安公司", "name": "xx职务",
- "number": "10",
- "education": "大专以上",
- "experience": "3年",
- "max_salary": "8k",
- "units_scale": "200人+",
- "linkman": "XX",
- "phone": "xxxxxxxxxx",
- "address": "环城路地一大道30号口下",
- "start_time": "7月8日",
- "end_time": "7月31日",
- "status": "2"
- },
- {
- "tenant_id": "xx保安公司", "name": "xx职务",
- "number": "10",
- "education": "大专以上",
- "experience": "5年",
- "max_salary": "8k",
- "units_scale": "200人+",
- "linkman": "XX",
- "phone": "xxxxxxxxxx",
- "address": "环城路地一大道30号口下",
- "start_time": "7月8日",
- "end_time": "7月31日",
- "status": "2"
- },
- {
- "tenant_id": "xx保安公司", "name": "xx职务",
- "number": "10",
- "education": "大专以上",
- "experience": "2年",
- "max_salary": "8k",
- "units_scale": "200人+",
- "linkman": "XX",
- "phone": "xxxxxxxxxx",
- "address": "环城路地一大道30号口下",
- "start_time": "7月8日",
- "end_time": "7月31日",
- "status": "2"
- },
- {
- "tenant_id": "xx保安公司", "name": "xx职务",
- "number": "10",
- "education": "大专以上",
- "experience": "2年",
- "max_salary": "8k",
- "units_scale": "200人+",
- "linkman": "XX",
- "phone": "xxxxxxxxxx",
- "address": "环城路地一大道30号口下",
- "start_time": "7月8日",
- "end_time": "7月31日",
- "status": "2"
- },
- {
- "tenant_id": "xx保安公司", "name": "xx职务",
- "number": "10",
- "education": "大专以上",
- "experience": "2年",
- "max_salary": "8k",
- "units_scale": "200人+",
- "linkman": "XX",
- "phone": "xxxxxxxxxx",
- "address": "环城路地一大道30号口下",
- "start_time": "7月8日",
- "end_time": "7月31日",
- "status": "2"
- },
- {
- "tenant_id": "xx保安公司", "name": "xx职务",
- "number": "10",
- "education": "大专以上",
- "experience": "2年",
- "max_salary": "8k",
- "units_scale": "200人+",
- "linkman": "XX",
- "phone": "xxxxxxxxxx",
- "address": "环城路地一大道30号口下",
- "start_time": "7月8日",
- "end_time": "7月31日",
- "status": "2"
- },
- {
- "tenant_id": "xx保安公司", "name": "xx职务",
- "number": "10",
- "education": "大专以上",
- "experience": "2年",
- "max_salary": "8k",
- "units_scale": "200人+",
- "linkman": "XX",
- "phone": "xxxxxxxxxx",
- "address": "环城路地一大道30号口下",
- "start_time": "7月8日",
- "end_time": "7月31日",
- "status": "2"
- }
]
diff --git a/src/views/dispatch/index.vue b/src/views/dispatch/index.vue
index 2ab82fb..2fd5dfc 100644
--- a/src/views/dispatch/index.vue
+++ b/src/views/dispatch/index.vue
@@ -74,6 +74,7 @@
update1,
remove1,
} from "@/api/dispatch/dispatch";
+import { getDeptTree, getDeptLazyTree } from "@/api/system/dept";
export default {
data() {
@@ -217,6 +218,10 @@
// var form = this.data[0];
// delete form.id;
// for (var k = 0; k < 13; k++) {
+ form["deptId"] = form.tenantName;
+ form["tenantName"] = form.$tenantName;
+ // delete form.tenantName;
+ // console.log(form);
adddata(form).then(
(res) => {
this.onLoad(this.page);
@@ -306,11 +311,13 @@
this.onLoad(this.page, this.query);
},
rowClick(row) {
- console.log(row);
+ // console.log(row);
+ window.localStorage.setItem("paqiandata", JSON.stringify(row));
this.$router.push({
path: "/dispatchChild",
// redirect: { name: "foo" },
- query: { row: row },
+ // query: { row: row },
+ query: { rowdispatch: "fromDispatch"},
// params: { row: row.identificationnumber },
});
},
@@ -325,6 +332,7 @@
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
+ window.localStorage.setItem("paqiandataS", JSON.stringify(this.data));
console.log(this.data);
this.loading = false;
});
diff --git a/src/views/dispatchChild/data.js b/src/views/dispatchChild/data.js
index 8d73b92..d173500 100644
--- a/src/views/dispatchChild/data.js
+++ b/src/views/dispatchChild/data.js
@@ -28,23 +28,7 @@
},
{
label: "保安公司",
- prop: "tenantId",
- type: "tree",
- search: true,
- dicUrl: "/api/blade-system/tenant/select",
- props: {
- label: "tenantName",
- value: "tenantId"
- },
- // hide: !website.tenantMode,
- // addDisplay: website.tenantMode,
- // editDisplay: website.tenantMode,
- // viewDisplay: website.tenantMode,
- rules: [{
- required: true,
- message: "请输入所属保安单位",
- trigger: "click"
- }],
+ prop: "tenantName",
span: 11,
labelWidth: 130,
disabled: true,
@@ -73,9 +57,9 @@
{
label: "创建时间",
prop: "createTime",
- type: "date",
- format: "yyyy-MM-dd hh:mm:ss",
- valueFormat: "timestamp",
+ // type: "date",
+ // format: "yyyy-MM-dd hh:mm:ss",
+ // valueFormat: "timestamp",
span: 11,
labelWidth: 130,
disabled: true,
@@ -85,16 +69,17 @@
]
export var column1 = [//派遣服务公司登记
+ // {
+ // label: "id",
+ // prop: "id",
+ // // search: true,
+ // // searchSpan: 4,
+ // // overHidden: true,
+ // // hide: true,
+ // // editDisplay: false,
+ // // addDisplay: false
+ // },
{
- label: "id",
- prop: "id",
- // search: true,
- // searchSpan: 4,
- // overHidden: true,
- hide: true,
- editDisplay: false,
- addDisplay: false
- }, {
label: "保安人名称",
prop: "name",
// search: true,
@@ -127,157 +112,31 @@
// search: true,
// searchSpan: 4,
// overHidden: true
- }, {
- label: "派遣单位",
- prop: "dispatcherCompany",
- // search: true,
- // searchSpan: 4,
- // overHidden: true
},
+ // {
+ // label: "派遣单位",
+ // // prop: "dispatcherCompany",
+ // prop: "tenantName",
+ // type: "tree",
+ // dicUrl: "/api/blade-system/dept/lazy-tree?parentId=0",
+ // props: {
+ // label: "title",
+ // value: "id"
+ // },
+ // // hide: !website.tenantMode,
+ // // addDisplay: website.tenantMode,
+ // // editDisplay: website.tenantMode,
+ // // viewDisplay: website.tenantMode,
+ // rules: [{
+ // required: true,
+ // message: "请输入派遣单位",
+ // trigger: "click"
+ // }],
+ // search: true,
+ // searchSpan: 4,
+ // overHidden: true
+ // },
]
-
-export var data = [
- {
- "tenant_id": "xx保安公司", "name": "xx职务",
- "number": "10",
- "education": "大专以上",
- "experience": "2年",
- "max_salary": "8k",
- "units_scale": "200人+",
- "linkman": "XX",
- "phone": "xxxxxxxxxx",
- "address": "环城路地一大道30号口下",
- "start_time": "7月8日",
- "end_time": "7月31日",
- "status": "2"
- },
- {
- "tenant_id": "xx保安公司", "name": "xx职务",
- "number": "10",
- "education": "大专以上",
- "experience": "2年",
- "max_salary": "8k",
- "units_scale": "200人+",
- "linkman": "XX",
- "phone": "xxxxxxxxxx",
- "address": "环城路地一大道30号口下",
- "start_time": "7月8日",
- "end_time": "7月31日",
- "status": "2"
- },
- {
- "tenant_id": "xx保安公司", "name": "xx职务",
- "number": "10",
- "education": "大专以上",
- "experience": "2年",
- "max_salary": "8k",
- "units_scale": "200人+",
- "linkman": "XX",
- "phone": "xxxxxxxxxx",
- "address": "环城路地一大道30号口下",
- "start_time": "7月8日",
- "end_time": "7月31日",
- "status": "2"
- },
- {
- "tenant_id": "xx保安公司", "name": "xx职务",
- "number": "10",
- "education": "大专以上",
- "experience": "3年",
- "max_salary": "8k",
- "units_scale": "200人+",
- "linkman": "XX",
- "phone": "xxxxxxxxxx",
- "address": "环城路地一大道30号口下",
- "start_time": "7月8日",
- "end_time": "7月31日",
- "status": "2"
- },
- {
- "tenant_id": "xx保安公司", "name": "xx职务",
- "number": "10",
- "education": "大专以上",
- "experience": "5年",
- "max_salary": "8k",
- "units_scale": "200人+",
- "linkman": "XX",
- "phone": "xxxxxxxxxx",
- "address": "环城路地一大道30号口下",
- "start_time": "7月8日",
- "end_time": "7月31日",
- "status": "2"
- },
- {
- "tenant_id": "xx保安公司", "name": "xx职务",
- "number": "10",
- "education": "大专以上",
- "experience": "2年",
- "max_salary": "8k",
- "units_scale": "200人+",
- "linkman": "XX",
- "phone": "xxxxxxxxxx",
- "address": "环城路地一大道30号口下",
- "start_time": "7月8日",
- "end_time": "7月31日",
- "status": "2"
- },
- {
- "tenant_id": "xx保安公司", "name": "xx职务",
- "number": "10",
- "education": "大专以上",
- "experience": "2年",
- "max_salary": "8k",
- "units_scale": "200人+",
- "linkman": "XX",
- "phone": "xxxxxxxxxx",
- "address": "环城路地一大道30号口下",
- "start_time": "7月8日",
- "end_time": "7月31日",
- "status": "2"
- },
- {
- "tenant_id": "xx保安公司", "name": "xx职务",
- "number": "10",
- "education": "大专以上",
- "experience": "2年",
- "max_salary": "8k",
- "units_scale": "200人+",
- "linkman": "XX",
- "phone": "xxxxxxxxxx",
- "address": "环城路地一大道30号口下",
- "start_time": "7月8日",
- "end_time": "7月31日",
- "status": "2"
- },
- {
- "tenant_id": "xx保安公司", "name": "xx职务",
- "number": "10",
- "education": "大专以上",
- "experience": "2年",
- "max_salary": "8k",
- "units_scale": "200人+",
- "linkman": "XX",
- "phone": "xxxxxxxxxx",
- "address": "环城路地一大道30号口下",
- "start_time": "7月8日",
- "end_time": "7月31日",
- "status": "2"
- },
- {
- "tenant_id": "xx保安公司", "name": "xx职务",
- "number": "10",
- "education": "大专以上",
- "experience": "2年",
- "max_salary": "8k",
- "units_scale": "200人+",
- "linkman": "XX",
- "phone": "xxxxxxxxxx",
- "address": "环城路地一大道30号口下",
- "start_time": "7月8日",
- "end_time": "7月31日",
- "status": "2"
- }
-]
diff --git a/src/views/dispatchChild/index.vue b/src/views/dispatchChild/index.vue
index 7287a0d..8c36729 100644
--- a/src/views/dispatchChild/index.vue
+++ b/src/views/dispatchChild/index.vue
@@ -102,10 +102,7 @@
],
},
- cardid: "", //获取派遣记录参数
- name: "", //获取派遣记录参数
- dispatcherCompany: "", //获取派遣记录参数
- id: "",
+ id: "", //记录归属id
//基本信息
//保安单位信息表单
obj0: {
@@ -329,20 +326,25 @@
// var form = this.data1[0];
// delete form.id;
// for (var k = 0; k < 13; k++) {
- adddata1(form).then(
- (res) => {
- this.onLoad1(this.page1);
- this.$message({
- type: "success",
- message: "操作成功!",
- });
- done();
- },
- (error) => {
- window.console.log(error);
- loading();
- }
- );
+ // form["deptId"] = form.tenantName;
+ // form["tenantName"] = form.$tenantName;
+ form["dispatcherUnitId"] = this.id;
+ console.log(form);
+
+ adddata1(form).then(
+ (res) => {
+ this.onLoad1(this.page1);
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ });
+ done();
+ },
+ (error) => {
+ window.console.log(error);
+ loading();
+ }
+ );
// }
},
searchChange1(params, done) {
@@ -356,7 +358,10 @@
this.onLoad1(this.page1);
},
rowUpdate1(row, index, done, loading) {
- console.log(row);
+ // row["deptId"] = row.tenantName;
+ // row["tenantName"] = row.$tenantName;
+ row["dispatcherUnitId"] = this.id;
+ console.log(row, "row");
update1(row).then(
() => {
this.onLoad1(this.page1);
@@ -428,7 +433,7 @@
// params["name"] = this.name;
// params["dispatcherCompany"] = this.dispatcherCompany;
params["dispatcherUnitId"] = this.id;
- console.log(params, "get");
+ // console.log(params, "get");
getdata1(
page.currentPage,
page.pageSize,
@@ -443,21 +448,64 @@
});
},
//派遣记录
+ saveLock(name, val) {
+ localStorage.setItem(name, val);
+ },
+ readLock(name) {
+ return localStorage.getItem(name);
+ },
},
mounted() {
+ // this.typeTABS = this.optionTABS.column[0];
+ // // console.log(typeof this.$route.query.row, 15315);
+ // if (typeof this.$route.query.row == "object") {
+ // var row = this.$route.query.row;
+ // for (var k in row) {
+ // this.obj0[k] = row[k];
+ // }
+ // this.obj0.title = row.name + "基本信息";
+ // // console.log(row);
+ // this.id = row.id;
+ // this.saveLock("paqiandata", JSON.stringify(row));
+ // } else {
+ // var row = JSON.parse(this.readLock("paqiandata"));
+ // // console.log(row);
+ // this.obj0.title = row.name + "基本信息";
+ // for (var k in row) {
+ // this.obj0[k] = row[k];
+ // }
+ // }
this.typeTABS = this.optionTABS.column[0];
-
- if (this.$route.query.row) {
- var row = this.$route.query.row;
+ var row = {};
+ if (this.readLock("paqiandata") != null) {
+ row = JSON.parse(this.readLock("paqiandata"));
+ this.obj0.title = row.name + " 基本信息";
for (var k in row) {
this.obj0[k] = row[k];
}
- this.obj0.title = row.name + "基本信息";
- console.log(row);
- this.cardid = row.cardid;
- this.name = row.name;
- this.dispatcherCompany = row.dispatcherCompany;
this.id = row.id;
+ if (this.readLock("paqiandataS") != null) {
+ var b = JSON.parse(this.readLock("paqiandataS"));
+ var i = 0;
+ for (var k in b) {
+ if (b[k].name == row.name) {
+ i = 1;
+ }
+ }
+ if (i == 1) {
+ // console.log("存在");
+ } else {
+ // console.log("已删除");
+
+ this.obj0 = {};
+ this.obj0.title = row.name + " 该派遣单位已删除";
+ window.localStorage.removeItem("paqiandata");
+ this.id = 1244241;
+ }
+ }
+ } else {
+ // console.log("no");
+ this.obj0.title = " 未选择派遣单位";
}
},
};
diff --git a/src/views/securityUnit/data.js b/src/views/securityUnit/data.js
index c96e190..a570cee 100644
--- a/src/views/securityUnit/data.js
+++ b/src/views/securityUnit/data.js
@@ -59,8 +59,20 @@
{
label: "企业类型",
prop: "stats",
- labelWidth: w,
- span: s
+ type: "tree",
+ dicUrl: "/api/blade-system/dict-biz/dictionary?code=stats",
+ props: {
+ label: "dictValue",
+ value: "dictKey"
+ },
+ width: 130,
+ rules: [
+ {
+ required: true,
+ message: "请选择企业类型",
+ trigger: "click",
+ },
+ ],
},
{
label: "法定代表人",
@@ -95,6 +107,9 @@
prop: "establishtime",
width: 130,
overHidden: true,
+ type: "date",
+ format: "yyyy-MM-dd",
+ valueFormat: "timestamp",
// addDisplay: true,
// editDisplay: true,
// viewDisplay: true,
@@ -157,30 +172,30 @@
// // rules: [{
// // required: false,
// // message: "请选择单位规模",
- // // trigger: "blur"
+ // // trigger: "blur"
// // }],
},
- {
- label: "企业类型",
- prop: "enterprises",
- width: 130,
- // addDisplay: true,
- // editDisplay: true,
- // viewDisplay: true,
- // searchSpan: 4,
- // dicUrl: "/api/blade-system/dict-biz/dictionary?code=unitsScaleType",
- // props: {
- // label: "dictValue",
- // value: "dictKey"
- // },
- // // search: true,
- // type: "select",
- // // rules: [{
- // // required: true,
- // // message: "请选择单位规模",
- // // trigger: "blur"
- // // }],
- },
+ // {
+ // label: "企业类型",
+ // prop: "stats",
+ // // type: "tree",
+ // // disabled: true,
+ // type: "tree",
+ // // type: "select",
+ // dicUrl: "/api/blade-system/dict-biz/dictionary?code=stats",
+ // props: {
+ // label: "dictValue",
+ // value: "dictKey"
+ // },
+ // width: 130,
+ // rules: [
+ // {
+ // required: true,
+ // message: "请选择所属部门",
+ // trigger: "click",
+ // },
+ // ],
+ // },
{
label: "注册地址",
prop: "address",
@@ -255,6 +270,262 @@
trigger: "blur"
}]
},
+ {
+ label: "辖区",
+ prop: "departmentid",
+ // type: "tree",
+ // disabled: true,
+ type: "tree",
+ dicUrl: "/api/blade-system/dept/lazy-tree?parentId=0",
+ props: {
+ label: "title",
+ value: "id"
+ },
+ labelWidth: w,
+ span: s,
+ rules: [
+ {
+ required: true,
+ message: "请选择所属部门",
+ trigger: "click",
+ },
+ ],
+ },
+ // {
+ // label: "机构",
+ // prop: "departmentids",
+ // // type: "tree",
+ // // disabled: true,
+ // type: "tree",
+ // dicUrl: "/api/blade-system/dept/lazy-tree?parentId=0",
+ // props: {
+ // label: "title",
+ // value: "id"
+ // },
+ // labelWidth: w,
+ // span: s,
+ // rules: [
+ // {
+ // required: true,
+ // message: "请选择所属部门",
+ // trigger: "click",
+ // },
+ // ],
+ // },
+ {
+ label: "企业类型",
+ prop: "stats",
+ type: "tree",
+ dicUrl: "/api/blade-system/dict-biz/dictionary?code=stats",
+ props: {
+ label: "dictValue",
+ value: "dictKey"
+ },
+ labelWidth: w,
+ span: s,
+ rules: [
+ {
+ required: true,
+ message: "请选择企业类型",
+ trigger: "click",
+ },
+ ],
+ },
+ {
+ label: "企业名称",
+ prop: "enterprisename",
+ labelWidth: w,
+ span: s,
+ rules: [{
+ required: true,
+ message: "请输入企业名称",
+ trigger: "blur"
+ }]
+ },
+ {
+ label: "法定代表人",
+ prop: "representative",
+ labelWidth: w,
+ span: s,
+ rules: [{
+ required: true,
+ message: "请输入法定代表人",
+ trigger: "blur"
+ }]
+ },
+ // {
+ // label: "企业类型",
+ // prop: "stats",
+ // labelWidth: w,
+ // span: s,
+ // rules: [{
+ // required: true,
+ // message: "请输入企业类型",
+ // trigger: "blur"
+ // }]
+ // },
+ {
+ label: "成立日期",
+ prop: "establishtime",
+ labelWidth: w,
+ span: s,
+ type: "date",
+ format: "yyyy-MM-dd",
+ valueFormat: "timestamp",
+ rules: [{
+ required: true,
+ message: "请输入成立日期",
+ trigger: "blur"
+ }]
+ },
+ {
+ label: "注册资本(万元人民币)",
+ prop: "registeredcapital",
+ labelWidth: w,
+ span: s,
+ rules: [{
+ required: true,
+ message: "请输入注册资本",
+ trigger: "blur"
+ }]
+ },
+ {
+ label: "实缴资本(万元人民币)",
+ prop: "capital",
+ labelWidth: w,
+ span: s,
+ rules: [{
+ required: true,
+ message: "请输入实缴资本",
+ trigger: "blur"
+ }]
+ },
+ {
+ label: "组织机构代码",
+ prop: "organizationcode",
+ labelWidth: w,
+ span: s,
+ rules: [{
+ required: true,
+ message: "请输入组织机构代码",
+ trigger: "blur"
+ }]
+ },
+ {
+ label: "工商注册号",
+ prop: "registrationnumber",
+ labelWidth: w,
+ span: s,
+ rules: [{
+ required: true,
+ message: "请输入工商注册号",
+ trigger: "blur"
+ }]
+ },
+ {
+ label: "纳税人识别号",
+ prop: "identificationnumber",
+ labelWidth: w,
+ span: s,
+ rules: [{
+ required: true,
+ message: "请输入纳税人识别号",
+ trigger: "blur"
+ }]
+ },
+ {
+ label: "企业类型",
+ prop: "enterprises",
+ labelWidth: w,
+ span: s,
+ rules: [{
+ required: true,
+ message: "请输入企业类型",
+ trigger: "blur"
+ }]
+ },
+ {
+ label: "注册地址",
+ prop: "address",
+ labelWidth: w,
+ span: s,
+ rules: [{
+ required: true,
+ message: "请输入注册地址",
+ trigger: "blur"
+ }]
+ },
+ {
+ label: "经营范围",
+ prop: "business",
+ labelWidth: w,
+ span: s,
+ rules: [{
+ required: true,
+ message: "请输入经营范围",
+ trigger: "blur"
+ }]
+ },
+ {
+ label: "所属地区",
+ prop: "region",
+ labelWidth: w,
+ span: s,
+ rules: [{
+ required: true,
+ message: "请输入所属地区",
+ trigger: "blur"
+ }]
+ },
+ {
+ label: "登记机关",
+ prop: "registration",
+ labelWidth: w,
+ span: s,
+ rules: [{
+ required: true,
+ message: "请输入登记机关",
+ trigger: "blur"
+ }]
+ // overHidden: true,
+ },
+
+ {
+ label: "所属行业",
+ prop: "industry",
+ labelWidth: w,
+ span: s,
+ rules: [{
+ required: true,
+ message: "请输入所属行业",
+ trigger: "blur"
+ }]
+ }
+]
+
+export var column1 = [
+ {
+ label: "",
+ labelWidth: 20,
+ type: 'title',
+ prop: "title1",
+ span: 24,
+ styles: {
+ fontSize: '24px'
+ }
+ },
+ {
+ label: "统一社会信用代码",
+ prop: "creditcode",
+ disabled: true,
+ labelWidth: w,
+ span: s,
+ rules: [{
+ required: true,
+ message: "请输入法定代表人",
+ trigger: "blur"
+ }]
+ },
// {
// label: "部门",
// prop: "departmentid",
@@ -275,137 +546,6 @@
// ],
// },
{
- label: "企业名称",
- prop: "enterprisename",
- labelWidth: w,
- span: s
- },
- {
- label: "法定代表人",
- prop: "representative",
- labelWidth: w,
- span: s
- },
- {
- label: "企业类型",
- prop: "stats",
- labelWidth: w,
- span: s
- },
- {
- label: "成立日期",
- prop: "establishtime",
- labelWidth: w,
- span: s
- },
- {
- label: "注册资本(万元人民币)",
- prop: "registeredcapital",
- labelWidth: w,
- span: s
- },
- {
- label: "实缴资本(万元人民币)",
- prop: "capital",
- labelWidth: w,
- span: s
- },
- {
- label: "组织机构代码",
- prop: "organizationcode",
- labelWidth: w,
- span: s
- },
- {
- label: "工商注册号",
- prop: "registrationnumber",
- labelWidth: w,
- span: s
- },
- {
- label: "纳税人识别号",
- prop: "identificationnumber",
- labelWidth: w,
- span: s
- },
- {
- label: "企业类型",
- prop: "enterprises",
- labelWidth: w,
- span: s
- },
- {
- label: "注册地址",
- prop: "address",
- labelWidth: w,
- span: s
- },
- {
- label: "经营范围",
- prop: "business",
- labelWidth: w,
- span: s
- },
- {
- label: "所属地区",
- prop: "region",
- labelWidth: w,
- span: s
- },
- {
- label: "登记机关",
- prop: "registration",
- labelWidth: w,
- span: s,
- // overHidden: true,
- },
-
- {
- label: "所属行业",
- prop: "industry",
- labelWidth: w,
- span: s
- }
-]
-
-export var column1 = [
- {
- label: "",
- labelWidth: 20,
- type: 'title',
- prop: "title1",
- span: 24,
- styles: {
- fontSize: '24px'
- }
- },
- {
- label: "统一社会信用代码",
- prop: "creditcode",
- disabled: true,
- labelWidth: w,
- span: s
- },
- {
- label: "部门",
- prop: "departmentid",
- // type: "tree",
- disabled: true,
- dicData: [],
- labelWidth: w,
- span: s,
- props: {
- label: "title",
- },
- rules: [
- {
- required: true,
- message: "请选择所属部门",
- trigger: "click",
- },
- ],
- },
- {
label: "股东",
prop: "shareholder",
labelWidth: w,
@@ -424,14 +564,14 @@
// },
{
label: "出资金额",
- prop: "capital",
+ prop: "capital2",
labelWidth: w,
span: s
}, {
label: "出资时间",
prop: "capitaltime",
type: "date",
- format: "yyyy-MM-dd hh:mm:ss",
+ format: "yyyy-MM-dd",
valueFormat: "timestamp",
labelWidth: w,
span: s
@@ -466,25 +606,25 @@
labelWidth: w,
span: s
},
- {
- label: "部门",
- prop: "departmentid",
- // type: "tree",
- disabled: true,
- dicData: [],
- labelWidth: w,
- span: s,
- props: {
- label: "title",
- },
- rules: [
- {
- required: true,
- message: "请选择所属部门",
- trigger: "click",
- },
- ],
- },
+ // {
+ // label: "部门",
+ // prop: "departmentid",
+ // // type: "tree",
+ // disabled: true,
+ // dicData: [],
+ // labelWidth: w,
+ // span: s,
+ // props: {
+ // label: "title",
+ // },
+ // rules: [
+ // {
+ // required: true,
+ // message: "请选择所属部门",
+ // trigger: "click",
+ // },
+ // ],
+ // },
{
label: "姓名",
prop: "name",
@@ -497,17 +637,17 @@
span: s
}, {
label: "身份证",
- prop: "cardid",
+ prop: "cardid2",
labelWidth: w,
span: s
}, {
label: "联系电话",
- prop: "cell",
+ prop: "cell2",
labelWidth: w,
span: s
}, {
label: "持股比例(%)",
- prop: "shareholdingRatio",
+ prop: "shareholdingratio2",
labelWidth: w,
span: s
}
diff --git a/src/views/securityUnit/index.vue b/src/views/securityUnit/index.vue
index e0f05c9..caa4d7d 100644
--- a/src/views/securityUnit/index.vue
+++ b/src/views/securityUnit/index.vue
@@ -39,7 +39,7 @@
</avue-crud>
<div class="lod" v-show="forms != -1">
<div class="lod-in">
- <el-col class="trees" v-if="forms == 0">
+ <!-- <el-col class="trees" v-if="forms == 0">
<div class="box">
<el-scrollbar>
<basic-container>
@@ -51,7 +51,7 @@
</basic-container>
</el-scrollbar>
</div>
- </el-col>
+ </el-col> -->
<avue-form
ref="form"
v-model="obj0"
@@ -64,7 +64,7 @@
</template>
</avue-form>
<avue-form
- ref="form"
+ ref="form1"
v-model="obj1"
:option="option1"
v-else-if="forms == 1"
@@ -76,7 +76,7 @@
</template>
</avue-form>
<avue-form
- ref="form"
+ ref="form2"
v-model="obj2"
:option="option2"
v-else-if="forms == 2"
@@ -118,35 +118,58 @@
treeData: [],
treeOption: {
- nodeKey: "id",
- lazy: true,
- treeLoad: function (node, resolve) {
- // const parentId = node.level === 0 ? 0 : node.data.id;
- getDeptLazyTree().then((res) => {
- resolve(
- res.data.data.map((item) => {
- console.log({
- ...item,
- leaf: !item.hasChildren,
- });
- return {
- ...item,
- leaf: !item.hasChildren,
- };
- })
- );
- });
- },
+ title: "我是标题",
+ filterText: "搜索关键字自定义",
+ defaultExpandAll: true,
addBtn: false,
menu: false,
size: "small",
+ formOption: {
+ labelWidth: 100,
+ column: [
+ {
+ label: "自定义项",
+ prop: "label",
+ },
+ ],
+ },
props: {
labelText: "标题",
label: "title",
- value: "value",
+ value: "id",
children: "children",
},
},
+ // treeOption: {
+ // nodeKey: "id",
+ // // lazy: true,
+ // // treeLoad: function (node, resolve) {
+ // // // const parentId = node.level === 0 ? 0 : node.data.id;
+ // // getDeptLazyTree().then((res) => {
+ // // resolve(
+ // // res.data.data.map((item) => {
+ // // console.log({
+ // // ...item,
+ // // leaf: !item.hasChildren,
+ // // });
+ // // return {
+ // // ...item,
+ // // leaf: !item.hasChildren,
+ // // };
+ // // })
+ // // );
+ // // });
+ // // },
+ // addBtn: false,
+ // menu: false,
+ // size: "small",
+ // props: {
+ // labelText: "标题",
+ // label: "title",
+ // value: "value",
+ // children: "children",
+ // },
+ // },
obj0: {
title0: "保安单位基本信息",
@@ -180,6 +203,9 @@
data0: {},
data1: {},
data2: {},
+ b0: {},
+ b1: {},
+ b2: {},
noshehuibianma: 0,
nobumen: 0,
@@ -257,8 +283,15 @@
// this.$message.success("页码" + val);
},
rowSave(form, done, loading) {
- console.log("save1");
+ // console.log("save1");
this.forms = 0;
+ var that = this;
+ //先获取部门接口
+ getDeptLazyTree().then((res) => {
+ var d = res.data.data;
+ that.treeData = d;
+ // console.log(d);
+ });
},
searchChange(params, done) {
this.query = params;
@@ -336,12 +369,13 @@
this.onLoad(this.page, this.query);
},
rowClick(row) {
- console.log(row);
- row.identificationnumber; //统一社会信用代码
+ // console.log(row);
+ // row.identificationnumber; //统一社会信用代 码
+ window.localStorage.setItem("danweidata", JSON.stringify(row));
this.$router.push({
path: "/securityUnitChild",
// redirect: { name: "foo" },
- query: { row: row },
+ query: { rowsecurity: "fromSecurity" },
// params: { row: row.identificationnumber },
});
},
@@ -352,61 +386,110 @@
page.pageSize,
Object.assign(params, this.query)
).then((res) => {
- // console.log(res);
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
+ window.localStorage.setItem("danweidataS", JSON.stringify(this.data));
console.log(this.data);
this.loading = false;
});
},
- nodeClick(data) {
- // this.treeDeptId = data.id;
- // this.page.currentPage = 1;
- // this.onLoad(this.page);
- // this.$message.success(JSON.stringify(data));
- this.obj0["departmentid"] = data.title;
- this.obj1["departmentid"] = data.title;
- this.obj2["departmentid"] = data.title;
- this.nobumen = 1;
- },
+ // nodeClick(data) {//分局 不在这添加
+ // // this.treeDeptId = data.id;
+ // // this.page.currentPage = 1;
+ // // this.onLoad(this.page);
+ // // this.$message.success(JSON.stringify(data));
+ // this.obj0["departmentid"] = data.title;
+ // this.obj1["departmentid"] = data.title;
+ // this.obj2["departmentid"] = data.title;
+ // this.obj0["useid"] = data.id;
+ // this.obj1["useid"] = data.id;
+ // this.obj2["useid"] = data.id;
+ // this.nobumen = 1;
+ // },
tip0() {
if (this.panduanmeiyouziduan()) {
return;
}
- var b = {};
+ var d = {};
for (var k in this.obj0) {
- if (k != "title") {
- b[k] = this.obj0[k];
+ for (var i in column0) {
+ if (k == column0[i].prop && k != "title0") {
+ d[k] = this.obj0[k];
+ }
}
}
- this.data0 = b;
+ // console.log(d);
+ for (var k in d) {
+ if (d[k] == "" || d[k] == undefined) {
+ console.log(k);
+ this.$message.warning("请检查表单是否填写完整！");
+ return;
+ }
+ }
+ this.data0 = d;
this.forms = 1;
},
tip1() {
if (this.panduanmeiyouziduan()) {
return;
}
- var b = {};
+ var d = {};
for (var k in this.obj1) {
- if (k != "title") {
- b[k] = this.obj1[k];
+ for (var i in column1) {
+ if (k == column1[i].prop && k != "title1") {
+ d[k] = this.obj1[k];
+ }
}
}
- this.data1 = b;
+ d["capital"] = d["capital2"];
+ delete d["capital2"];
+ // console.log(d);
+ for (var k in d) {
+ if (d[k] == "" || d[k] == undefined) {
+ console.log(k);
+ this.$message.warning("请检查表单是否填写完整！");
+ return;
+ }
+ }
+ this.data1 = d;
this.forms = 2;
},
tip2() {
if (this.panduanmeiyouziduan()) {
return;
}
- var b = {};
+ var d = {};
for (var k in this.obj2) {
- if (k != "title") {
- b[k] = this.obj2[k];
+ for (var i in column2) {
+ if (k == column2[i].prop && k != "title2") {
+ d[k] = this.obj2[k];
+ }
}
}
- this.data2 = b;
+ d["cardid"] = d["cardid2"];
+ delete d["cardid2"];
+ d["cell"] = d["cell2"];
+ delete d["cell2"];
+ d["shareholdingratio"] = d["shareholdingratio2"];
+ delete d["shareholdingratio2"];
+ // console.log(d);
+ for (var k in d) {
+ if (d[k] == "" || d[k] == undefined) {
+ console.log(k);
+ this.$message.warning("请检查表单是否填写完整！");
+ return;
+ }
+ }
+ this.data2 = d;
+
+ // this.data0.departmentid = this.data0.useid;
+ // this.data1.departmentid = this.data1.useid;
+ // this.data2.departmentid = this.data2.useid;
+ // delete this.data0.useid;
+ // delete this.data1.useid;
+ // delete this.data2.useid;
+
adddata(this.data0).then((res) => {
console.log(res, 0);
});
@@ -449,20 +532,26 @@
return true;
}
if (this.nobumen == 0) {
- this.$message.warning("请选则部门");
return false;
+ this.$message.warning("请选则部门");
}
return false;
},
},
watch: {
haveID() {
- if (this.haveID > 9000) {
- //统一社会信用代码判断
- this.noshehuibianma = 1;
- } else {
- this.noshehuibianma = 0;
+ // console.log(this.haveID);
+ if (this.haveID != undefined) {
+ if (this.haveID.length > 5) {
+ //统一社会信用代码判断
+ this.noshehuibianma = 1;
+ } else {
+ this.noshehuibianma = 0;
+ }
}
+ },
+ havedata() {
+ console.log(this.havedata, "qqqqq");
},
},
mounted() {},
@@ -503,7 +592,7 @@
width: 15%;
top: 100px;
left: 0;
- display: none;
+ // display: none;
}
.lod-in {
width: 70%;
diff --git a/src/views/securityUnitChild/data.js b/src/views/securityUnitChild/data.js
index 3b90fc1..e93de06 100644
--- a/src/views/securityUnitChild/data.js
+++ b/src/views/securityUnitChild/data.js
@@ -84,7 +84,13 @@
},
{
label: "企业类型",
- prop: "enterprises",
+ prop: "stats",
+ type: "tree",
+ dicUrl: "/api/blade-system/dict-biz/dictionary?code=stats",
+ props: {
+ label: "dictValue",
+ value: "dictKey"
+ },
span: 11,
labelWidth: 130,
disabled: true,
@@ -138,17 +144,19 @@
prop: "id",
hide: true,
addDisplay: false,
- editDisplay:false
+ editDisplay: false
}, {
label: "股东",
prop: "shareholder",
}, {
label: "持股比例(%)",
prop: "shareholdingratio",
- }, {
- label: "最终受益股份",
- prop: "beneficial",
- }, {
+ },
+ // {
+ // label: "最终受益股份",
+ // prop: "beneficial",
+ // },
+ {
label: "出资金额(万元)",
prop: "capital",
}, {
@@ -167,7 +175,7 @@
label: "统一社会信用代码",
prop: "creditcode",
addDisplay: false,
- editDisplay:false
+ editDisplay: false
},
]
@@ -176,13 +184,13 @@
label: "统一社会信用代码",
prop: "creditcode",
addDisplay: false,
- editDisplay:false
+ editDisplay: false
}, {
label: "id",
prop: "id",
hide: true,
addDisplay: false,
- editDisplay:false
+ editDisplay: false
}, {
label: "姓名",
prop: "name",
diff --git a/src/views/securityUnitChild/index.vue b/src/views/securityUnitChild/index.vue
index da5dd05..9fa5108 100644
--- a/src/views/securityUnitChild/index.vue
+++ b/src/views/securityUnitChild/index.vue
@@ -141,17 +141,17 @@
optionTABS: {
column: [
{
- icon: "el-icon-info",
+ // icon: "el-icon-info",
label: "保安单位基本信息",
prop: "tab1",
},
{
- icon: "el-icon-info",
+ // icon: "el-icon-info",
label: "保安单位出资人员",
prop: "tab2",
},
{
- icon: "el-icon-info",
+ // icon: "el-icon-info",
label: "主要管理人员信息",
prop: "tab3",
},
@@ -671,29 +671,55 @@
const data = res.data.data;
this.page2.total = data.total;
this.data2 = data.records;
- console.log(this.data2);
+ // console.log(this.data2);
this.loading2 = false;
});
},
//派遣记录
+ saveLock(name, val) {
+ window.localStorage.setItem(name, val);
+ },
+ readLock(name) {
+ return window.localStorage.getItem(name);
+ },
},
mounted() {
- // this.Ourdata = data;
- // this.onLoad1(this.page1); //第二个表格不会自动执行
- // this.onLoad2(this.page2); //第三个表格不会自动执行
this.typeTABS = this.optionTABS.column[0];
- if (this.$route.query.row) {
- var row = this.$route.query.row;
+ var row = {};
+ if (this.readLock("danweidata") != null) {
+ row = JSON.parse(this.readLock("danweidata"));
+ this.obj0.title = row.enterprisename + "基本信息";
for (var k in row) {
this.obj0[k] = row[k];
}
- this.obj0.title = row.enterprisename + "基本信息";
this.creditcode = row.creditcode;
+ if (this.readLock("danweidataS") != null) {
+ var b = JSON.parse(this.readLock("danweidataS"));
+ var i = 0;
+ for (var k in b) {
+ if (b[k].enterprisename == row.enterprisename) {
+ i = 1;
+ }
+ }
+ if (i == 1) {
+ // console.log("存在");
+ } else {
+ // console.log("已删除");
+
+ this.obj0 = {};
+ this.obj0.title = row.enterprisename + "该公司已删除";
+ window.localStorage.removeItem("danweidata");
+ this.creditcode = '';
+ }
+ }
+ } else {
+ // console.log("no");
+ this.obj0.title = "未选择查询单位";
}
},
watch: {
chuzitime() {
- console.log(this.chuzitime, "chuzitime");
+ // console.log(this.chuzitime, "chuzitime");
},
},
};
--
Gitblit v1.9.3