From daa772264aedb3a6f500fcc2dc7329259d39c831 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Wed, 14 Jul 2021 11:17:08 +0800
Subject: [PATCH] 派遣菜单和装备菜单调整，公司单位管理调整
---
src/views/dispatch/dispatchChildoperable.vue | 76 +++++++++++++++++++++++++-------------
1 files changed, 50 insertions(+), 26 deletions(-)
diff --git a/src/views/dispatch/dispatchChildoperable.vue b/src/views/dispatch/dispatchChildoperable.vue
index d059f3c..7ea0151 100644
--- a/src/views/dispatch/dispatchChildoperable.vue
+++ b/src/views/dispatch/dispatchChildoperable.vue
@@ -169,10 +169,55 @@
// // 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: "id",
+ labelWidth: 120,
+ searchLabelWidth: 120,
+ dicUrl: "/api/page-tree",
+ props: {
+ label: "name",
+ value: "id",
+ },
+ searchSpan: 4,
+ search: true,
+ overHidden: true,
+ type: "select",
+ rules: [
+ {
+ required: true,
+ message: "请输入保安公司",
+ trigger: "blur",
+ },
+ ],
+ },
+ {
label: "保安人名称",
prop: "name",
search: true,
- searchSpan: 5,
+ searchSpan: 4,
labelWidth: 120,
searchLabelWidth: 120,
// overHidden: true
@@ -206,37 +251,16 @@
// // searchSpan: 4,
// // overHidden: true
// },
- {
- label: "保安公司",
- prop: "deptId",
- labelWidth: 120,
- searchLabelWidth: 120,
- 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: "dispatchertime",
type: "date",
format: "yyyy-MM-dd hh:mm:ss",
- valueFormat: "timestamp",
+ valueFormat: "yyyy-MM-dd hh:mm:ss",
labelWidth: 120,
+ searchSpan: 4,
search: true,
- searchSpan: 5,
rules: [
{
required: true,
@@ -251,7 +275,7 @@
prop: "endTime",
type: "date",
format: "yyyy-MM-dd hh:mm:ss",
- valueFormat: "timestamp",
+ valueFormat: "yyyy-MM-dd hh:mm:ss",
labelWidth: 120,
rules: [
{
--
Gitblit v1.9.3