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/dispatch/dispatch.vue | 232 ++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 179 insertions(+), 53 deletions(-)
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;
--
Gitblit v1.9.3