From 3f5c1ae2cfbe8d29eb11e0ac88abceaa7d6906f2 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 25 Nov 2021 15:47:28 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_regulatory_ys
---
src/views/securityCompany/computents/serviceS.vue | 157 +++++++++++++++++++++++++++++++
src/views/commandQuery/taskDistribution.vue | 34 ++++++
src/views/securityCompany/computents/service.vue | 1
src/views/securityCompany/computents/enclosure.vue | 1
src/views/securityGuardManagement/register.vue | 26 ++++
src/api/securityCompany/securityCompany.js | 13 ++
src/views/securityCompany/column.js | 13 +-
src/views/securityCompany/computents/equipment.vue | 3
src/views/securityCompany/computents/punish.vue | 3
src/views/securityCompany/companyDetails.vue | 15 ++-
src/views/securityCompany/computents/staff.vue | 5
11 files changed, 251 insertions(+), 20 deletions(-)
diff --git a/src/api/securityCompany/securityCompany.js b/src/api/securityCompany/securityCompany.js
index cfd68be..65165aa 100644
--- a/src/api/securityCompany/securityCompany.js
+++ b/src/api/securityCompany/securityCompany.js
@@ -51,6 +51,19 @@
})
}
+export const getListedispatcherUnit = (current, size, params, deptId) => {
+ return request({
+ url: '/api/dispatcherUnit/page',
+ method: 'get',
+ params: {
+ ...params,
+ current,
+ size,
+ deptId
+ }
+ })
+}
+
export const getListeenclosure = (current, size, params, deptid) => {
return request({
url: '/api/blade-resource/attach/list',
diff --git a/src/views/commandQuery/taskDistribution.vue b/src/views/commandQuery/taskDistribution.vue
index 37beb26..454a66c 100644
--- a/src/views/commandQuery/taskDistribution.vue
+++ b/src/views/commandQuery/taskDistribution.vue
@@ -2,7 +2,7 @@
* @Author: Morpheus
* @Date: 2021-07-07 17:30:05
* @Last Modified by: Morpheus
- * @Last Modified time: 2021-11-25 14:54:40
+ * @Last Modified time: 2021-11-25 15:47:19
* menu-name 监管信息
*/
<template>
@@ -43,7 +43,8 @@
:visible.sync="seeLocationFlag"
:modal-append-to-body="false"
width="width">
- <Map v-if="seeLocationFlag" ref="locationForm" />
+ <Map v-if="seeLocationFlag"
+ ref="locationForm" />
</el-dialog>
<el-dialog class="see-track"
@@ -67,7 +68,8 @@
</el-button>
</div>
- <Map v-if="seeTrackFlag" ref="tarckForm" />
+ <Map v-if="seeTrackFlag"
+ ref="tarckForm" />
</el-dialog>
</basic-container>
</template>
@@ -167,7 +169,26 @@
// editDisplay: false,
// addDisplay: false
},
-
+ {
+ label: "指令时间",
+ prop: "releaseTimeRange",
+ type: "datetime",
+ format: "yyyy-MM-dd hh:mm:ss",
+ valueFormat: "yyyy-MM-dd hh:mm:ss",
+ searchRange: true,
+ hide: true,
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: false,
+ search: true,
+ rules: [
+ {
+ required: true,
+ message: "请输入指令时间",
+ trigger: "blur",
+ },
+ ],
+ },
{
label: "接收指令人",
prop: "receiveName",
@@ -315,6 +336,11 @@
onLoad (page, params = {}) {
// this.loading = false;
this.loading = true;
+ if (this.query.releaseTimeRange) {
+ this.query["startTime"] = this.query.releaseTimeRange[0];
+ this.query["endTime"] = this.query.releaseTimeRange[1];
+ delete this.query.releaseTimeRange;
+ }
getLisperetaskDistribution(
page.currentPage,
page.pageSize,
diff --git a/src/views/securityCompany/column.js b/src/views/securityCompany/column.js
index 62725e0..3616fc1 100644
--- a/src/views/securityCompany/column.js
+++ b/src/views/securityCompany/column.js
@@ -1,11 +1,13 @@
export var companyColimn = [
{
- label: "统一社会信用代码",
+ label: "社会信用代码证号",
prop: "creditcode",
width: 140,
hide: true,
-
+ search: true,
labelWidth: 160,
+ searchSpan: 4,
+ searchLabelWidth: 130
// hide: true,
// editDisplay: false,
// addDisplay: false
@@ -56,9 +58,9 @@
labelWidth: 160,
prop: "representativecell",
width: 120,
- // search: true,
+ search: true,
searchSpan: 4,
- searchLabelWidth: 100
+ searchLabelWidth: 120
},
{
@@ -117,13 +119,14 @@
prop: "contactscell",
labelWidth: 160,
width: 95,
+ // search: true,
},
{
label: "注册地址",
prop: "address",
labelWidth: 160,
- // search: true,
+ search: true, searchSpan: 4,
hide: true,
},
{
diff --git a/src/views/securityCompany/companyDetails.vue b/src/views/securityCompany/companyDetails.vue
index 44cb21c..407e993 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-09-15 11:06:36
+ * @Last Modified time: 2021-11-25 10:09:07
* menu-name 保安公司详细资料
*/
<template>
@@ -191,7 +191,7 @@
<el-row>
<el-col span="12">
- <el-form-item label="组织机构代码">
+ <el-form-item label="社会信用代码证号">
<el-input
disabled="true"
v-model="form.organizationcode"
@@ -293,12 +293,15 @@
<punish :form="form"></punish>
</el-tab-pane>
<el-tab-pane label="服务对象" name="eighth">
+ <serviceS :form="form"></serviceS>
+ </el-tab-pane>
+ <el-tab-pane label="派遣信息" name="ninth">
<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="ninth">
+ <el-tab-pane label="营业执照" name="tenth">
<div class="businessLicenses">
<el-container>
<el-main>
@@ -315,7 +318,7 @@
</el-container>
</div>
</el-tab-pane>
- <el-tab-pane label="许可证" name="tenth">
+ <el-tab-pane label="许可证" name="eleven">
<div class="businessLicenses">
<el-container>
<el-main>
@@ -348,7 +351,8 @@
import equipment from "./computents/equipment.vue"; //装备管理
import staff from "./computents/staff.vue"; //保安员信息
import punish from "./computents/punish.vue"; //处罚信息
-import service from "./computents/service.vue"; //服务对象
+import serviceS from "./computents/serviceS.vue"; //服务对象
+import service from "./computents/service.vue"; //派遣
// import enclosure from "./computents/enclosure.vue"; //其他附件
import { getList } from "@/api/securityCompany/security"; //保安公司
@@ -359,6 +363,7 @@
staff: staff,
punish: punish,
service: service,
+ serviceS,
// enclosure: enclosure,
},
data() {
diff --git a/src/views/securityCompany/computents/enclosure.vue b/src/views/securityCompany/computents/enclosure.vue
index 60e5300..2608ec8 100644
--- a/src/views/securityCompany/computents/enclosure.vue
+++ b/src/views/securityCompany/computents/enclosure.vue
@@ -17,6 +17,7 @@
@current-change="currentChange"
@size-change="sizeChange"
@refresh-change="refreshChange"
+ @on-load="onLoad"
>
<!-- @on-load="onLoad" -->
<template slot="menuLeft">
diff --git a/src/views/securityCompany/computents/equipment.vue b/src/views/securityCompany/computents/equipment.vue
index 210a019..ae6d6bc 100644
--- a/src/views/securityCompany/computents/equipment.vue
+++ b/src/views/securityCompany/computents/equipment.vue
@@ -12,6 +12,7 @@
@search-reset="equipmentSearchReset"
@current-change="equipmentCurrentChange"
@size-change="equipmentSizeChange"
+ @on-load="equipmentOnLoad"
>
</avue-crud>
<!-- @on-load="equipmentOnLoad" -->
@@ -234,7 +235,7 @@
},
mounted() {
console.log(this.form, "equipmentData");
- this.equipmentOnLoad(this.equipmentPage);
+ // this.equipmentOnLoad(this.equipmentPage);
},
methods: {
equipmentOnLoad(page, params = {}) {
diff --git a/src/views/securityCompany/computents/punish.vue b/src/views/securityCompany/computents/punish.vue
index 970c864..6e99add 100644
--- a/src/views/securityCompany/computents/punish.vue
+++ b/src/views/securityCompany/computents/punish.vue
@@ -13,6 +13,7 @@
@current-change="punishCurrentChange"
@size-change="punishSizeChange"
@refresh-change="punishRefreshcCange"
+ @on-load="punishOnLoad"
>
</avue-crud>
<!-- @on-load="punishOnLoad" -->
@@ -65,7 +66,7 @@
},
mounted() {
// console.log(this.form, "pu");
- this.punishOnLoad(this.punishPage);
+ // this.punishOnLoad(this.punishPage);
},
methods: {
punishOnLoad(page, params = {}) {
diff --git a/src/views/securityCompany/computents/service.vue b/src/views/securityCompany/computents/service.vue
index 678fd34..12ede9e 100644
--- a/src/views/securityCompany/computents/service.vue
+++ b/src/views/securityCompany/computents/service.vue
@@ -12,6 +12,7 @@
@search-reset="serviceSearchReset"
@current-change="serviceCurrentChange"
@size-change="serviceSizeChange"
+ @on-load="serviceOnLoad"
>
</avue-crud>
<!-- @on-load="serviceOnLoad" -->
diff --git a/src/views/securityCompany/computents/serviceS.vue b/src/views/securityCompany/computents/serviceS.vue
new file mode 100644
index 0000000..6fe1de5
--- /dev/null
+++ b/src/views/securityCompany/computents/serviceS.vue
@@ -0,0 +1,157 @@
+<template>
+ <avue-crud
+ class="company-box"
+ :option="serviceOption"
+ :search.sync="serviceSearch"
+ :table-loading="serviceLoading"
+ :data="serviceData"
+ ref="serviceCrud"
+ :page.sync="servicePage"
+ @selection-change="serviceSelectionChange"
+ @search-change="serviceSearchChange"
+ @search-reset="serviceSearchReset"
+ @current-change="serviceCurrentChange"
+ @size-change="serviceSizeChange"
+ @on-load="serviceOnLoad"
+ >
+ </avue-crud>
+ <!-- @on-load="serviceOnLoad" -->
+</template>
+
+<script>
+import { getListedispatcherUnit } from "@/api/securityCompany/securityCompany";
+export default {
+ props: ["form"],
+ data() {
+ return {
+ serviceOption: {
+ // 操作栏多余按钮去除
+ delBtn: false,
+ editBtn: false,
+ searchShowBtn: false,
+ addBtn: false,
+ selection: true,
+ menu: false,
+ border: true,
+ align: "center",
+ height: "auto",
+ calcHeight: 270,
+ tip: false,
+ searchShow: false,
+ searchMenuSpan: 4,
+ index: false,
+ viewBtn: true,
+ //dialogType: 'drawer',
+ dialogClickModal: false,
+ // 操作栏宽度
+ menuWidth: 156,
+
+ column: [
+ {
+ label: "派遣单位",
+ prop: "name",
+ search: true,
+ searchSpan: 4,
+ display: false,
+ },
+ {
+ label: "联系人",
+ prop: "linkman",
+ display: false,
+ width: 120,
+ search: true,
+ searchSpan: 4,
+ },
+
+ {
+ label: "联系电话",
+ prop: "phone",
+ display: false,
+ width: 200,
+ },
+ {
+ label: "创建时间",
+ prop: "createTime",
+ type: "date",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ mock: {
+ type: "datetime",
+ format: "yyyy-MM-dd",
+ },
+ display: false,
+ width: 180,
+ },
+ {
+ label: "派遣地址",
+ prop: "address",
+ display: false,
+ width: 280,
+ },
+ ],
+ },
+ serviceSearch: {},
+ serviceLoading: true,
+ serviceData: [],
+ servicePage: {
+ pageSize: 10,
+ currentPage: 1,
+ total: 0,
+ },
+ serviceQuery: {},
+ serviceSelectionList: [],
+ };
+ },
+ mounted() {
+ console.log(this.form, "serviceData");
+ // this.serviceOnLoad(this.servicePage);
+ },
+ methods: {
+ serviceOnLoad(page, params = {}) {
+ this.serviceLoading = true;
+ getListedispatcherUnit(
+ page.currentPage,
+ page.pageSize,
+ Object.assign(params, this.serviceQuery),
+ this.form.departmentid
+ ).then((res) => {
+ const data = res.data.data;
+
+ this.servicePage.total = data.total;
+ this.serviceData = data.records;
+ console.log(this.serviceData, "this.serviceData");
+ this.serviceLoading = false;
+ this.$refs.serviceCrud.refreshTable();
+ this.$refs.serviceCrud.doLayout();
+ this.serviceSelectionClear();
+ });
+ },
+ serviceSelectionClear() {
+ this.serviceSelectionList = [];
+ this.$refs.serviceCrud.toggleSelection();
+ },
+ serviceSelectionChange(list) {
+ this.serviceSelectionList = list;
+ },
+ serviceSearchChange(params, done) {
+ this.serviceQuery = params;
+ this.servicePage.currentPage = 1;
+ this.serviceOnLoad(this.servicePage, params);
+ done();
+ },
+ serviceSearchReset() {
+ this.serviceQuery = {};
+ this.serviceOnLoad(this.servicePage);
+ },
+ serviceCurrentChange(currentPage) {
+ this.servicePage.currentPage = currentPage;
+ },
+ serviceSizeChange(pageSize) {
+ this.servicePage.pageSize = pageSize;
+ },
+ },
+};
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/src/views/securityCompany/computents/staff.vue b/src/views/securityCompany/computents/staff.vue
index 46f423d..251cc07 100644
--- a/src/views/securityCompany/computents/staff.vue
+++ b/src/views/securityCompany/computents/staff.vue
@@ -12,6 +12,7 @@
@search-reset="staffSearchReset"
@current-change="staffCurrentChange"
@size-change="staffSizeChange"
+ @on-load="staffOnLoad"
>
<!-- @on-load="staffOnLoad" -->
</avue-crud>
@@ -254,8 +255,8 @@
};
},
mounted() {
- console.log(this.form, "staff");
- this.staffOnLoad(this.staffPage);
+ // console.log(this.form, "staff");
+ // this.staffOnLoad(this.staffPage);
},
methods: {
staffOnLoad(page, params = {}) {
diff --git a/src/views/securityGuardManagement/register.vue b/src/views/securityGuardManagement/register.vue
index b8f65ab..c0018c9 100644
--- a/src/views/securityGuardManagement/register.vue
+++ b/src/views/securityGuardManagement/register.vue
@@ -2,7 +2,7 @@
* @Author: Morpheus
* @Date: 2021-07-05 16:31:54
* @Last Modified by: liu
- * @Last Modified time: 2021-09-23 17:29:29
+ * @Last Modified time: 2021-11-25 09:42:36
* menu-name 保安员注册查询
*/
<template>
@@ -587,7 +587,18 @@
display: false,
},
-
+ {
+ label: "照片",
+ prop: "avatar",
+ dataType: "string",
+ type: "img",
+ },
+ {
+ label: "指纹",
+ prop: "fingerprint",
+ dataType: "string",
+ type: "img",
+ },
{
label: "籍贯",
prop: "nativeplace",
@@ -619,6 +630,11 @@
display: false,
},
{
+ label: "身高",
+ prop: "height",
+ width: 55,
+ },
+ {
label: "学历",
prop: "education",
display: false,
@@ -646,6 +662,12 @@
display: false,
},
{
+ label: "地址",
+ prop: "nativeplace",
+ minWidth: 95,
+ overHidden: true,
+ },
+ {
label: "健康状态",
prop: "healstats",
hide: true,
--
Gitblit v1.9.3