From 055aaa6acf8f109ccab63205dce7eff00ccb6120 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Sun, 22 Aug 2021 09:25:20 +0800
Subject: [PATCH] 派遣服务管理 添加字段 派遣记录操作按钮 保安员页面 保安公司可点击跳转 跨区改分公司，
---
src/views/dispatchChild/data.js | 105 ++++
vue.config.js | 4
src/views/securityGuard/securityGuard.vue | 38 +
src/views/securityUnit/armedEscort.vue | 10
src/views/dispatchChild/index.vue | 151 --------
src/styles/element-ui.scss | 25
src/views/dispatch/dispatch.vue | 232 +++++++++--
src/views/dispatch/dispatchChildoperable.vue | 41 +
/dev/null | 190 ----------
src/api/securityUnit/securityUnit.js | 14
src/views/approvalOflicenseFiling/recordk.vue | 10
src/views/approvalOflicenseFiling/revoke.vue | 10
src/views/securityUnitChild/index.vue | 223 +++--------
src/views/approvalOflicenseFiling/permit.vue | 10
src/views/approvalOflicenseFiling/record.vue | 10
15 files changed, 486 insertions(+), 587 deletions(-)
diff --git a/src/api/securityUnit/securityUnit.js b/src/api/securityUnit/securityUnit.js
index c857ba4..9791802 100644
--- a/src/api/securityUnit/securityUnit.js
+++ b/src/api/securityUnit/securityUnit.js
@@ -13,6 +13,20 @@
})
}
+export const getOncedata = (params) => {
+ return request({
+ url: '/api/information/detail',
+ // url: 'http://192.168.0.104:80/information/page',
+ method: 'get',
+ params: {
+ ...params,
+ // current,
+ // size,
+ }
+ })
+}
+
+
export const adddata = (row) => {
return request({
url: '/api/information/save',
diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
index 48afb80..1fd72b0 100644
--- a/src/styles/element-ui.scss
+++ b/src/styles/element-ui.scss
@@ -20,7 +20,7 @@
}
.el-menu--display,
-.el-menu--display+.el-submenu__icon-arrow {
+.el-menu--display + .el-submenu__icon-arrow {
display: none;
}
@@ -49,17 +49,17 @@
.el-dropdown-menu__item--divided:before,
.el-menu,
-.el-menu--horizontal>.el-menu-item:not(.is-disabled):focus,
-.el-menu--horizontal>.el-menu-item:not(.is-disabled):hover,
-.el-menu--horizontal>.el-submenu .el-submenu__title:hover {
+.el-menu--horizontal > .el-menu-item:not(.is-disabled):focus,
+.el-menu--horizontal > .el-menu-item:not(.is-disabled):hover,
+.el-menu--horizontal > .el-submenu .el-submenu__title:hover {
background-color: transparent;
}
.el-dropdown-menu__item--divided:before,
.el-menu,
-.el-menu--horizontal>.el-menu-item:not(.is-disabled):focus,
-.el-menu--horizontal>.el-menu-item:not(.is-disabled):hover,
-.el-menu--horizontal>.el-submenu .el-submenu__title:hover {
+.el-menu--horizontal > .el-menu-item:not(.is-disabled):focus,
+.el-menu--horizontal > .el-menu-item:not(.is-disabled):hover,
+.el-menu--horizontal > .el-submenu .el-submenu__title:hover {
background-color: transparent !important;
}
@@ -239,7 +239,7 @@
}
//top 导航 按钮
-.el-menu--horizontal>.el-menu-item.is-active,
+.el-menu--horizontal > .el-menu-item.is-active,
.avue-top,
.el-dropdown {
color: #fff !important;
@@ -252,4 +252,11 @@
position: absolute;
top: 40px;
left: 0;
-}
\ No newline at end of file
+}
+
+.securityGuard .avue-form__menu {
+ position: relative;
+ width: 100%;
+ display: flex;
+ flex-direction: row-reverse;
+}
diff --git a/src/views/approvalOflicenseFiling/permit.vue b/src/views/approvalOflicenseFiling/permit.vue
new file mode 100644
index 0000000..e64dd16
--- /dev/null
+++ b/src/views/approvalOflicenseFiling/permit.vue
@@ -0,0 +1,10 @@
+<template>
+ <div>保安公司许可申请 ----正在搭建</div>
+</template>
+
+<script>
+export default {};
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/src/views/approvalOflicenseFiling/record.vue b/src/views/approvalOflicenseFiling/record.vue
new file mode 100644
index 0000000..50a4bd3
--- /dev/null
+++ b/src/views/approvalOflicenseFiling/record.vue
@@ -0,0 +1,10 @@
+<template>
+ <div>保安单位备案申请 ----正在搭建</div>
+</template>
+
+<script>
+export default {};
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/src/views/approvalOflicenseFiling/recordk.vue b/src/views/approvalOflicenseFiling/recordk.vue
new file mode 100644
index 0000000..bea5b8d
--- /dev/null
+++ b/src/views/approvalOflicenseFiling/recordk.vue
@@ -0,0 +1,10 @@
+<template>
+ <div>跨区域经营备案申请 ----正在搭建</div>
+</template>
+
+<script>
+export default {};
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/src/views/approvalOflicenseFiling/revoke.vue b/src/views/approvalOflicenseFiling/revoke.vue
new file mode 100644
index 0000000..3b8d404
--- /dev/null
+++ b/src/views/approvalOflicenseFiling/revoke.vue
@@ -0,0 +1,10 @@
+<template>
+ <div>自招保安单位撤销备案申请 ----正在搭建</div>
+</template>
+
+<script>
+export default {};
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/src/views/dispatch/data.js b/src/views/dispatch/data.js
deleted file mode 100644
index 65b27db..0000000
--- a/src/views/dispatch/data.js
+++ /dev/null
@@ -1,190 +0,0 @@
-// var DIC = [
-// {
-// label: '招聘中',
-// value: 1,
-// }, {
-// label: '停止招聘',
-// value: 2,
-// }
-// ]
-
-export var column = [//派遣服务公司登记
- {
- label: "派遣单位名称",
- prop: "name",
- search: true,
- searchLabelWidth: 110,
- searchSpan: 4,
- // span: 12,
- labelWidth: 110,
- },
- {
- label: "保安公司",
- prop: "deptId",
- type: "tree",
- dicUrl: "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
- props: {
- label: "title",
- value: "id"
- },
- // hide: true,
- // hide: !website.tenantMode,
- // addDisplay: website.tenantMode,
- // editDisplay: website.tenantMode,
- // viewDisplay: website.tenantMode,
- rules: [{
- required: true,
- message: "请选择保安公司",
- trigger: "click"
- }],
- labelWidth: 110,
- width: 200,
- searchLabelWidth: 110,
- search: true,
- searchSpan: 4,
- // editDisplay: false,
- // addDisplay: false,
- // hide: true,
- // span: 11,
- },
-
- {
- label: " 联系人",
- prop: "linkman",
- labelWidth: 110,
- },
- {
- label: "联系电话",
- prop: "phone",
- labelWidth: 110,
- // addDisplay: true,
- // editDisplay: true,
- // viewDisplay: true,
- // searchSpan: 4,
- // dicUrl: "/api/blade-system/dict-biz/dictionary?code=experienceType",
- // props: {
- // label: "dictValue",
- // value: "dictKey"
- // },
- // search: true,
- // type: "select",
- // // rules: [{
- // // required: true,
- // // message: "请选择工作经验",
- // // trigger: "blur"
- // // }],
- },
- // {
- // label: "行政区",
- // prop: "addresss",
- // labelWidth: 110,
- // search: true,
- // // width: 110,
- // // overHidden: true
- // },
- // {
- // label: "所属辖区",
- // prop: "jurisdiction",
- // // multiple: true,
- // labelWidth: 110,
- // type: "tree",
- // dicUrl: "/api/jurisdiction/lazy-tree?parentId=0",
- // props: {
- // label: "title",
- // value: "id",
- // },
- // checkStrictly: true,
- // slot: true,
- // rules: [
- // {
- // required: true,
- // message: "请选择所属行政区",
- // trigger: "click",
- // },
- // ],
- // },
- // {
- // label: "详细地址",
- // prop: "address",
- // labelWidth: 110,
- // // search: true,
- // // width: 110,
- // // overHidden: true
- // },
- {
- label: "合同生效时间",
- prop: "startTime",
- labelWidth: 110,
- type: "date",
- format: "yyyy-MM-dd",
- valueFormat: "yyyy-MM-dd",
- // search: true,
- // searchSpan: 4,
- // overHidden: true
- },
- {
- label: "合同到期时间",
- prop: "endTime",
- labelWidth: 110,
- type: "date",
- format: "yyyy-MM-dd",
- valueFormat: "yyyy-MM-dd",
- // search: true,
- // searchSpan: 4,
- // overHidden: true
- }
-]
-
-export var column1 = [//派遣服务公司登记
- {
- label: "id",
- prop: "id",
- // search: true,
- // searchSpan: 4,
- // overHidden: true,
- hide: true,
- editDisplay: false,
- addDisplay: false
- }, {
- label: "保安人名称",
- prop: "name",
- // search: true,
- // searchSpan: 4,
- // overHidden: true
- }, {
- label: "身份证",
- prop: "cardid",
- // search: true,
- // searchSpan: 4,
- // overHidden: true
- }, {
- label: "派遣人",
- prop: "dispatcher",
- // search: true,
- // searchSpan: 4,
- // overHidden: true
- }, {
- label: "派遣时间",
- prop: "dispatchertime",
- type: "date",
- format: "yyyy-MM-dd hh:mm:ss",
- valueFormat: "timestamp",
- // search: true,
- // searchSpan: 4,
- // overHidden: true
- }, {
- label: "派遣地址",
- prop: "dispatcheraddress",
- // search: true,
- // searchSpan: 4,
- // overHidden: true
- }, {
- label: "派遣单位",
- prop: "dispatcherUnitId",
- // search: true,
- // searchSpan: 4,
- // overHidden: true
- },
-
-
-]
diff --git a/src/views/dispatch/dispatch.vue b/src/views/dispatch/dispatch.vue
index b59f93c..8db0d5d 100644
--- a/src/views/dispatch/dispatch.vue
+++ b/src/views/dispatch/dispatch.vue
@@ -65,7 +65,6 @@
</template>
<script>
-import { data, column, column1 } from "./data";
import {
getdata,
adddata,
@@ -122,58 +121,144 @@
menuWidth: 160,
align: "center",
selection: true,
- column: column,
- // group: [
- // {
- // label: "基础信息",
- // prop: "baseInfo",
- // icon: "el-icon-user-solid",
- // column: [
- // {
- // label: "所属保安单位",
- // prop: "tenantId",
- // type: "tree",
- // 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",
- // },
- // ],
- // span: 24,
- // },
- // ],
- // },
- // ],
+ column: [
+ //派遣服务公司登记
+ {
+ label: "派遣单位名称",
+ prop: "name",
+ search: true,
+ searchLabelWidth: 110,
+ searchSpan: 4,
+ // span: 12,
+ labelWidth: 118,
+ },
+ {
+ label: "保安公司",
+ prop: "deptId",
+ type: "tree",
+ dicUrl:
+ "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
+ props: {
+ label: "title",
+ value: "id",
+ },
+ // hide: true,
+ // hide: !website.tenantMode,
+ // addDisplay: website.tenantMode,
+ // editDisplay: website.tenantMode,
+ // viewDisplay: website.tenantMode,
+ rules: [
+ {
+ required: true,
+ message: "请选择保安公司",
+ trigger: "click",
+ },
+ ],
+ labelWidth: 118,
+ width: 200,
+ searchLabelWidth: 80,
+ search: true,
+ searchSpan: 4,
+ // editDisplay: false,
+ // addDisplay: false,
+ // hide: true,
+ // span: 11,
+ },
+ {
+ label: "保安服务类型",
+ prop: "serveType",
+ // search: true,
+ searchLabelWidth: 110,
+ searchSpan: 4,
+ // span: 12,
+ labelWidth: 118,
+ },
+ {
+ label: "合同生效时间",
+ prop: "releaseTimeRange",
+ type: "datetime",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ searchValue: [this.getStartTime(), this.getEndTime()],
+ searchRange: true,
+ searchSpan: 5,
+ searchLabelWidth: 110,
+ hide: true,
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: false,
+ search: true,
+ rules: [
+ {
+ required: true,
+ message: "请输入时间",
+ trigger: "blur",
+ },
+ ],
+ },
+ {
+ label: "所属辖区",
+ prop: "jurisdiction",
+ // multiple: true,
+ searchLabelWidth: 80,
+ search: true,
+ searchSpan: 4,
+ labelWidth: 118,
+ type: "tree",
+ dicUrl: "/api/jurisdiction/lazy-tree?parentId=0",
+ props: {
+ label: "title",
+ value: "id",
+ },
+ checkStrictly: true,
+ slot: true,
+ rules: [
+ {
+ required: true,
+ message: "请选择所属行政区",
+ trigger: "click",
+ },
+ ],
+ },
+ {
+ label: " 派遣人数",
+ prop: "num",
+ labelWidth: 118,
+ },
+ {
+ label: "合同开始时间",
+ prop: "startTime",
+ labelWidth: 118,
+ type: "date",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ // search: true,
+ // searchSpan: 4,
+ // overHidden: true
+ },
+ {
+ label: "合同结束时间",
+ prop: "endTime",
+ labelWidth: 118,
+ type: "date",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ // search: true,
+ // searchSpan: 4,
+ // overHidden: true
+ },
+ {
+ label: " 负责人",
+ prop: "linkman",
+ labelWidth: 118,
+ },
+ {
+ label: "负责人联系方式",
+ prop: "phone",
+ labelWidth: 118,
+ },
+ ],
},
- // loading1: true, //派遣记录
- // selectionList1: [],
- // page1: {
- // pageSize: 10,
- // currentPage: 1,
- // total: 0,
- // },
- // query1: {},
- // data1: [],
- // option1: {
- // card: true,
- // searchSize: "mini",
- // searchMenuSpan: 6,
- // height: 547,
- // menuWidth: 160,
- // align: "center",
- // selection: true,
- // column: column1,
- // },
};
},
computed: {
@@ -326,13 +411,54 @@
// params: { row: row.identificationnumber },
});
},
+ getStartTime() {
+ if (
+ this.$route.query.startTime != undefined &&
+ this.$route.query.startTime != null &&
+ this.$route.query.startTime != ""
+ ) {
+ return this.$route.query.startTime;
+ }
+ return "";
+ },
+ getEndTime() {
+ if (
+ this.$route.query.endTime != undefined &&
+ this.$route.query.endTime != null &&
+ this.$route.query.endTime != ""
+ ) {
+ return this.$route.query.endTime;
+ }
+ return "";
+ },
onLoad(page, params = {}) {
var that = this;
this.loading = true;
+
+ var values;
+ const { releaseTimeRange } = this.query;
+ if (releaseTimeRange) {
+ values = {
+ ...params,
+ beginTime: releaseTimeRange[0],
+ overTime: releaseTimeRange[1],
+ ...this.query,
+ };
+ // values.releaseTimeRange = null;
+ } else {
+ values = {
+ ...params,
+ ...this.query,
+ };
+ }
+
+ console.log(values);
+
getdata(
page.currentPage,
page.pageSize,
- Object.assign(params, this.query)
+ // Object.assign(params, this.query)
+ values
).then((res) => {
// console.log(res);
const data = res.data.data;
diff --git a/src/views/dispatch/dispatchChildoperable.vue b/src/views/dispatch/dispatchChildoperable.vue
index 8935884..d3d497f 100644
--- a/src/views/dispatch/dispatchChildoperable.vue
+++ b/src/views/dispatch/dispatchChildoperable.vue
@@ -49,6 +49,8 @@
searchMenuSpan: 8,
height: 623,
cellBtn: false,
+ delBtnText: "结束派遣",
+ editBtnText: "变更派遣",
// addBtn: false,
// menuWidth: 160,
align: "center",
@@ -60,10 +62,35 @@
prop: "dispatcherCompany",
// addDisplay: false,
// editDisplay: false,
- search: true,
- labelWidth: 120,
- searchSpan: 4,
+ // search: true,
+ // labelWidth: 120,
+ // searchSpan: 4,
width: 180,
+ addDisplay: false,
+ editDisplay: false,
+ },
+ {
+ label: "派遣单位",
+ prop: "dispatcherUnitId",
+ labelWidth: 120,
+ searchLabelWidth: 80,
+ dicUrl: "/api/dispatcherUnit/page-tree",
+ props: {
+ label: "name",
+ value: "id",
+ },
+ hide: true,
+ searchSpan: 4,
+ search: true,
+ overHidden: true,
+ type: "tree",
+ rules: [
+ {
+ required: true,
+ message: "请输入派遣单位",
+ trigger: "blur",
+ },
+ ],
},
// {
{
@@ -140,8 +167,8 @@
label: "派遣时间",
prop: "dispatchertime",
type: "date",
- format: "yyyy-MM-dd hh:mm:ss",
- valueFormat: "yyyy-MM-dd hh:mm:ss",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
labelWidth: 120,
searchSpan: 5,
// search: true,
@@ -159,8 +186,8 @@
label: "结束时间",
prop: "endTime",
type: "date",
- format: "yyyy-MM-dd hh:mm:ss",
- valueFormat: "yyyy-MM-dd hh:mm:ss",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
labelWidth: 120,
overHidden: true,
rules: [
diff --git a/src/views/dispatchChild/data.js b/src/views/dispatchChild/data.js
index a90d819..853acde 100644
--- a/src/views/dispatchChild/data.js
+++ b/src/views/dispatchChild/data.js
@@ -52,6 +52,30 @@
// disabled: true,
// },
{
+ label: "保安员",
+ prop: "name",
+ type: "tree",
+ // width: 70,
+ labelWidth: 120,
+ searchSpan: 3,
+ multiple: true,
+ search: true,
+ // cell: true,
+ // hide: true,
+ props: {
+ label: "realName",
+ value: "id",
+ },
+ dicUrl: `/api/blade-user/page-security-units?deptId={{key}}`,
+ rules: [
+ {
+ required: true,
+ message: "请选择保安",
+ trigger: "blur",
+ },
+ ],
+ },
+ {
label: "联系人",
prop: "linkman",
span: 11,
@@ -97,21 +121,43 @@
// // editDisplay: false,
// // addDisplay: false
// },
+ // {
+ // label: "保安公司",
+ // prop: "deptId",
+ // labelWidth: 120,
+ // searchLabelWidth: 120,
+ // searchSpan: 4,
+ // dicUrl:
+ // "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
+ // props: {
+ // label: "title",
+ // value: "id",
+ // },
+ // search: true,
+ // overHidden: true,
+ // type: "select",
+ // rules: [
+ // {
+ // required: true,
+ // message: "请输入保安公司",
+ // trigger: "blur",
+ // },
+ // ],
+ // },
{
label: "保安公司",
prop: "deptId",
+ search: true,
labelWidth: 120,
- searchLabelWidth: 120,
+ type: "select",
searchSpan: 4,
- dicUrl:
- "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
+ cascaderItem: ["name"],
props: {
label: "title",
value: "id",
},
- search: true,
- overHidden: true,
- type: "select",
+ width: 180,
+ dicUrl: `/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697`,
rules: [
{
required: true,
@@ -144,19 +190,46 @@
rules: [
{
required: true,
- message: "请输入保安公司",
+ message: "请输入派遣单位",
trigger: "blur",
},
],
},
+
{
- label: "保安人名称",
+ label: "保安员",
prop: "name",
- search: true,
- searchSpan: 4,
- searchLabelWidth: 120
+ addDisplay: false,
+ editDisplay: false,
+ // .
// overHidden: true
- }, {
+ },
+
+ // {
+ // label: "保安员",
+ // prop: "name",
+ // type: "select",
+ // width: 70,
+ // labelWidth: 120,
+ // searchSpan: 3,
+ // search: true,
+ // hide: true,
+ // // cell: true,
+ // // hide: true,
+ // props: {
+ // label: "realName",
+ // value: "id",
+ // },
+ // dicUrl: `/api/blade-user/page-security-units?deptId={{key}}`,
+ // rules: [
+ // {
+ // required: true,
+ // message: "请选择保安",
+ // trigger: "blur",
+ // },
+ // ],
+ // },
+ {
label: "身份证",
prop: "cardid",
// search: true,
@@ -174,8 +247,8 @@
label: "派遣时间",
prop: "dispatchertime",
type: "date",
- format: "yyyy-MM-dd hh:mm:ss",
- valueFormat: "timestamp",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
search: true,
searchSpan: 4,
// overHidden: true
@@ -183,8 +256,8 @@
label: "结束时间",
prop: "endTime",
type: "date",
- format: "yyyy-MM-dd hh:mm:ss",
- valueFormat: "timestamp",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
// search: true,
// searchSpan: 5,
// overHidden: true
diff --git a/src/views/dispatchChild/index.vue b/src/views/dispatchChild/index.vue
index c88631c..f72c2a7 100644
--- a/src/views/dispatchChild/index.vue
+++ b/src/views/dispatchChild/index.vue
@@ -114,26 +114,6 @@
gutter: 30,
column: column,
},
- // loading: true, //派遣服务公司登记
- // selectionList: [],
- // page: {
- // pageSize: 10,
- // currentPage: 1,
- // total: 0,
- // },
- // query: {},
- // data: [],
- // option: {
- // card: true,
- // searchSize: "mini",
- // searchMenuSpan: 6,
- // height: 547,
- // menuWidth: 160,
- // align: "center",
- // selection: true,
- // column: column,
- // },
-
loading1: true, //派遣记录
selectionList1: [],
page1: {
@@ -153,7 +133,7 @@
height: 563,
// menuWidth: 160,
align: "center",
- // selection: true,
+ selection: true,
column: column1,
cellBtn: false,
addBtn: false,
@@ -184,134 +164,11 @@
// this.onLoad(this.page);
} else if (column.prop == "tab2") {
// this.loading = false;
- console.log(document.getElementsByClassName("el-card__body")[0]);
+ // console.log(document.getElementsByClassName("el-card__body")[0]);
this.onLoad1(this.page1); //第二个表格不会自动执行
}
// this.$message.success(JSON.stringify(column));
},
- //派遣服务公司登记
- // sizeChange(val) {
- // this.page1.currentPage = 1;
- // this.page1.pageSize = val;
- // // this.getData();
- // this.onLoad(this.page, this.query);
- // // this.$message.success("行数" + val);
- // },
- // currentChange(val) {
- // this.page1.currentPage = val;
- // // this.getData();
- // this.onLoad(this.page, this.query);
- // // this.$message.success("页码" + val);
- // },
- // rowSave(form, done, loading) {
- // var that = this;
- // var form = this.data[0];
- // delete form.id;
- // for (var k = 0; k < 13; k++) {
- // adddata(form).then(
- // (res) => {
- // this.onLoad(this.page);
- // this.$message({
- // type: "success",
- // message: "操作成功!",
- // });
- // done();
- // },
- // (error) => {
- // window.console.log(error);
- // loading();
- // }
- // );
- // }
- // },
- // searchChange(params, done) {
- // this.query = params;
- // this.page.currentPage = 1;
- // this.onLoad(this.page, params);
- // done();
- // },
- // searchReset() {
- // this.query = {};
- // this.onLoad(this.page);
- // },
- // rowUpdate(row, index, done, loading) {
- // console.log(row);
- // update(row).then(
- // () => {
- // this.onLoad(this.page);
- // this.$message({
- // type: "success",
- // message: "操作成功!",
- // });
- // done();
- // },
- // (error) => {
- // window.console.log(error);
- // loading();
- // }
- // );
- // },
- // rowDel(row) {
- // this.$confirm("确定将选择数据删除?", {
- // confirmButtonText: "确定",
- // cancelButtonText: "取消",
- // type: "warning",
- // })
- // .then(() => {
- // return remove(row.id);
- // })
- // .then(() => {
- // this.onLoad(this.page);
- // this.$message({
- // type: "success",
- // message: "操作成功!",
- // });
- // });
- // },
- // selectionChange(list) {
- // this.selectionList = list;
- // },
- // 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.crudrec.toggleSelection();
- // });
- // },
- // refreshChange() {
- // this.onLoad(this.page, this.query);
- // },
- // onLoad(page, params = {}) {
- // this.loading = true;
- // getdata(
- // page.currentPage,
- // 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;
- // console.log(this.data);
- // this.loading = false;
- // });
- // },
- //派遣服务公司登记
//派遣记录
sizeChange1(val) {
@@ -449,6 +306,10 @@
const data = res.data.data;
this.page1.total = data.total;
this.data1 = data.records;
+ // for (var k in this.data1) {
+ // this.data1[k].securityName = this.data1[k].securityName.split(",");
+ // this.data1[k].securityName = this.data1[k].securityName.join(" | ");
+ // }
console.log(this.data1, 1);
this.loading1 = false;
});
diff --git a/src/views/securityGuard/securityGuard.vue b/src/views/securityGuard/securityGuard.vue
index 1a13380..8b60307 100644
--- a/src/views/securityGuard/securityGuard.vue
+++ b/src/views/securityGuard/securityGuard.vue
@@ -26,7 +26,6 @@
@row-del="rowDel"
@row-update="rowUpdate"
@row-save="rowSave"
- @row-click="rowClick"
:before-open="beforeOpen"
:page.sync="page"
@search-change="searchChange"
@@ -109,14 +108,13 @@
</template>
<template slot-scope="{ type, size, row }" slot="menu">
- <!-- <el-button
- style="display:none"
- icon="el-icon-edit"
- :size="size"
- :type="type"
- @click.stop="addOrUpdateHandle(row.id)"
- >修改
- </el-button> -->
+ <el-button
+ icon="el-icon-s-custom"
+ :size="size"
+ :type="type"
+ @click.stop="rowClick(row)"
+ >查看
+ </el-button>
<el-button
icon="el-icon-edit"
:size="size"
@@ -131,7 +129,11 @@
<el-tag v-if="row.sex == 1">男</el-tag>
<el-tag v-if="row.sex == 2">女</el-tag>
</template>
-
+ <template slot-scope="{ row }" slot="deptId">
+ <el-tag class="rowClickSelf" @click="rowClickSelf(row.deptId)">{{
+ row.$deptId
+ }}</el-tag>
+ </template>
<template slot-scope="{ row }" slot="tenantName">
<el-tag>{{ row.tenantName }}</el-tag>
</template>
@@ -387,6 +389,7 @@
align: "center",
index: true,
delBtnText: "注销",
+ menuWidth: 276,
selection: true,
viewBtn: true,
defaultExpandAll: true,
@@ -959,9 +962,17 @@
//行点击事件
rowClick(row) {
+ // console.log(row, 111);
this.$router.push({
path: "/securityGuardDetail",
query: { row: JSON.stringify(row) },
+ });
+ },
+ rowClickSelf(row) {
+ console.log(row, "baoan");
+ this.$router.push({
+ path: "/securityUnitChild",
+ query: { fromSecunityGuardId: row },
});
},
nodeClick(data) {
@@ -1426,7 +1437,7 @@
};
</script>
-<style>
+<style lang="scss" scoped>
.box {
height: 800px;
}
@@ -1438,4 +1449,9 @@
.box .el-scrollbar__wrap {
overflow: scroll;
}
+.rowClickSelf {
+ &:hover {
+ cursor: pointer;
+ }
+}
</style>
\ No newline at end of file
diff --git a/src/views/securityUnit/armedEscort.vue b/src/views/securityUnit/armedEscort.vue
new file mode 100644
index 0000000..a7c2988
--- /dev/null
+++ b/src/views/securityUnit/armedEscort.vue
@@ -0,0 +1,10 @@
+<template>
+ <div>武装压运公司</div>
+</template>
+
+<script>
+export default {};
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/src/views/securityUnitChild/index.vue b/src/views/securityUnitChild/index.vue
index 0b52f1d..c23e6c5 100644
--- a/src/views/securityUnitChild/index.vue
+++ b/src/views/securityUnitChild/index.vue
@@ -156,6 +156,7 @@
<script>
import { column, column1, column2 } from "./data";
import {
+ getOncedata,
// getdata,
// adddata,
// update,
@@ -423,130 +424,6 @@
this.onLoad2(this.page2); //第二个表格不会自动执行
}
},
- // //保安单位基本信息 改成表单
- // sizeChange(val) {
- // this.page1.currentPage = 1;
- // this.page1.pageSize = val;
- // // this.getData();
- // this.onLoad(this.page, this.query);
- // // this.$message.success("行数" + val);
- // },
- // currentChange(val) {
- // this.page1.currentPage = val;
- // // this.getData();
- // this.onLoad(this.page, this.query);
- // // this.$message.success("页码" + val);
- // },
- // rowSave(form, done, loading) {
- // // var that = this;
- // // var form = this.data[0];
- // // delete form.id;
- // // for (var k = 0; k < 13; k++) {
- // adddata(form).then(
- // () => {
- // this.onLoad(this.page);
- // this.$message({
- // type: "success",
- // message: "操作成功!",
- // });
- // done();
- // },
- // (error) => {
- // window.console.log(error);
- // loading();
- // }
- // );
- // // }
- // },
- // searchChange(params, done) {
- // this.query = params;
- // this.page.currentPage = 1;
- // this.onLoad(this.page, params);
- // done();
- // },
- // searchReset() {
- // this.query = {};
- // this.onLoad(this.page);
- // },
- // rowUpdate(row, index, done, loading) {
- // delete row.tenantid;
- // console.log(row, 0);
- // update(row).then(
- // () => {
- // this.onLoad(this.page);
- // this.$message({
- // type: "success",
- // message: "操作成功!",
- // });
- // done();
- // },
- // (error) => {
- // window.console.log(error);
- // loading();
- // }
- // );
- // },
- // rowDel(row) {
- // this.$confirm("确定将选择数据删除?", {
- // confirmButtonText: "确定",
- // cancelButtonText: "取消",
- // type: "warning",
- // })
- // .then(() => {
- // return remove(row.id);
- // })
- // .then(() => {
- // this.onLoad(this.page);
- // this.$message({
- // type: "success",
- // message: "操作成功!",
- // });
- // });
- // },
- // selectionChange(list) {
- // this.selectionList = list;
- // },
- // 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.crudrec.toggleSelection();
- // });
- // },
- // refreshChange() {
- // this.onLoad(this.page, this.query);
- // },
- // onLoad(page, params = {}) {
- // this.loading = true;
- // getdata(
- // page.currentPage,
- // 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;
- // console.log(this.data);
- // this.loading = false;
- // });
- // },
- //保安单位基本信息
//派遣记录
sizeChange1(val) {
@@ -832,43 +709,81 @@
},
},
mounted() {
- this.typeTABS = this.optionTABS.column[0];
- 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.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;
+ var that = this;
+ var doit = (a) => {
+ that.typeTABS = that.optionTABS.column[0];
+ var row = {};
+ if (that.readLock("danweidata") != null) {
+ row = JSON.parse(that.readLock("danweidata"));
+ // that.obj0.title = row.enterprisename;
+ // console.log(row, "row");
+ for (var k in row) {
+ that.obj0[k] = row[k];
+ }
+ that.creditcode = row.creditcode;
+ if (that.readLock("danweidataS") != null && a == 1) {
+ var b = JSON.parse(that.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("已删除");
+
+ that.obj0 = {};
+ that.obj0.enterprisename = row.enterprisename + "该公司已删除";
+ window.localStorage.removeItem("danweidata");
+ that.creditcode = "";
}
}
- if (i == 1) {
- // console.log("存在");
- } else {
- // console.log("已删除");
-
- this.obj0 = {};
- this.obj0.enterprisename = row.enterprisename + "该公司已删除";
- window.localStorage.removeItem("danweidata");
- this.creditcode = "";
- }
+ } else {
+ // console.log("no");
+ that.obj0.enterprisename = "未选择查询单位";
}
+ };
+ 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);
+ }
+
+ var fromSecunityGuardId = this.$route.query.fromSecunityGuardId;
+ // var fromSecunityGuardId = this.$route.query;
+ if (fromSecunityGuardId != undefined) {
+ var value = {
+ departmentid: fromSecunityGuardId,
+ };
+ getOncedata(value).then((res) => {
+ // console.log(res.data.data, "get");
+ window.localStorage.setItem(
+ "danweidata",
+ JSON.stringify(res.data.data)
+ );
+ doit();
+ });
+ // return;
} else {
- // console.log("no");
- this.obj0.enterprisename = "未选择查询单位";
+ doit(1);
}
},
watch: {
- chuzitime() {
- // console.log(this.chuzitime, "chuzitime");
- },
+ // chuzitime() {
+ // console.log(this.chuzitime, "chuzitime");
+ // },
},
};
</script>
diff --git a/vue.config.js b/vue.config.js
index 3bc21b9..d505996 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -27,8 +27,8 @@
proxy: {
'/api': {
// 本地服务接口地址
- target: 'http://localhost:81',
- // target: 'http://192.168.0.114:81',//钟日健W
+ // target: 'http://localhost:81',
+ target: 'http://192.168.0.114:81',//钟日健W
// target: 'http://localhost:81',//原W
// target: 'http://192.168.0.108:81',//原W
// target: 'http://192.168.0.109:81',//唐N
--
Gitblit v1.9.3