From 87b0fa598f0a01a07884deb83c14741f8021e1ff Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Tue, 27 Jul 2021 18:11:42 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhba_enterprises
---
src/views/dispatch/dispatchChildoperable.vue | 149 ++++++++++++++++++++++++++++++++++++-------------
1 files changed, 109 insertions(+), 40 deletions(-)
diff --git a/src/views/dispatch/dispatchChildoperable.vue b/src/views/dispatch/dispatchChildoperable.vue
index 1637016..fd346fc 100644
--- a/src/views/dispatch/dispatchChildoperable.vue
+++ b/src/views/dispatch/dispatchChildoperable.vue
@@ -81,6 +81,7 @@
export default {
data() {
+ let baseUrl = "https://cli.avuejs.com/api/area";
return {
// typeTABS: {}, //标签页
// optionTABS: {
@@ -158,7 +159,7 @@
// addBtn: false,
// menuWidth: 160,
align: "center",
- // selection: true,
+ selection: true,
column: [
// 派遣服务公司登记
// {
@@ -171,50 +172,73 @@
// // 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",
+ // 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: "dispatcherCompany",
addDisplay: false,
editDisplay: false,
},
+ // {
+ // label: "派遣单位",
+ // prop: "dispatcherUnitId",
+ // labelWidth: 120,
+ // searchLabelWidth: 120,
+ // 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",
+ // },
+ // ],
+ // },
{
- label: "派遣单位",
- prop: "dispatcherUnitId",
+ label: "保安公司",
+ prop: "deptId",
labelWidth: 120,
searchLabelWidth: 120,
- dicUrl: "/api/dispatcherUnit/page-tree",
- props: {
- label: "name",
- value: "id",
- },
- hide: true,
- searchSpan: 4,
search: true,
overHidden: true,
type: "tree",
+ cascaderItem: ["name"],
+ // cascaderItem: ["city", "area"],
+ props: {
+ label: "title",
+ value: "id",
+ },
+ dicUrl: `/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697`,
rules: [
{
required: true,
@@ -224,21 +248,66 @@
],
},
{
- label: "保安人名称",
+ width: 120,
+ label: "保安员",
prop: "name",
- search: true,
- searchSpan: 4,
labelWidth: 120,
- searchLabelWidth: 120,
- // overHidden: true
+ type: "tree",
+ cell: true,
+ props: {
+ label: "realName",
+ value: "id",
+ },
+ dicUrl: `/api/blade-user/page-security-unit?deptId={{deptId}}`,
rules: [
{
required: true,
- message: "请输入保安人名称",
- trigger: "click",
+ message: "请选择保安",
+ trigger: "blur",
},
],
},
+ // {
+ // width: 120,
+ // label: "保安人名称",
+ // prop: "area",
+ // cell: true,
+ // props: {
+ // label: "name",
+ // value: "code",
+ // },
+ // type: "select",
+ // dicUrl: `${baseUrl}/getArea/{{key}}`,
+ // rules: [
+ // {
+ // required: true,
+ // message: "请选择地区",
+ // trigger: "blur",
+ // },
+ // ],
+ // },
+ // {
+ // label: "保安人名称",
+ // prop: "name",
+ // search: true,
+ // searchSpan: 4,
+ // labelWidth: 120,
+ // searchLabelWidth: 120,
+ // // overHidden: true
+ // type: "tree",
+ // dicUrl: "/api/blade-user/page-security",
+ // props: {
+ // label: "realName",
+ // value: "postId",
+ // },
+ // rules: [
+ // {
+ // required: true,
+ // message: "请输入保安人名称",
+ // trigger: "click",
+ // },
+ // ],
+ // },
{
label: "身份证",
prop: "cardid",
--
Gitblit v1.9.3