From 101581ee75385f7cfce3adb6cd3cb3e202aa2064 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 15 Jul 2021 22:31:36 +0800
Subject: [PATCH] 合并修改
---
src/views/dispatch/dispatchChildoperable.vue | 142 +++++++++++++++++++++++++++++++++--------------
1 files changed, 100 insertions(+), 42 deletions(-)
diff --git a/src/views/dispatch/dispatchChildoperable.vue b/src/views/dispatch/dispatchChildoperable.vue
index d059f3c..1637016 100644
--- a/src/views/dispatch/dispatchChildoperable.vue
+++ b/src/views/dispatch/dispatchChildoperable.vue
@@ -77,6 +77,7 @@
update1,
remove1,
} from "@/api/dispatch/dispatch";
+import { getDept } from "@/api/system/dept";
export default {
data() {
@@ -133,6 +134,8 @@
// selection: true,
// column: column,
// },
+ deptCategory: "",
+ deptId: "",
loading1: true, //派遣记录
selectionList1: [],
@@ -150,7 +153,7 @@
// menu: false,
searchSize: "mini",
searchMenuSpan: 8,
- height: 563,
+ height: 623,
cellBtn: false,
// addBtn: false,
// menuWidth: 160,
@@ -169,48 +172,11 @@
// // addDisplay: false
// },
{
- label: "保安人名称",
- prop: "name",
- search: true,
- searchSpan: 5,
- labelWidth: 120,
- searchLabelWidth: 120,
- // overHidden: true
- rules: [
- {
- required: true,
- message: "请输入保安人名称",
- trigger: "click",
- },
- ],
- },
- {
- label: "身份证",
- prop: "cardid",
- labelWidth: 120,
- rules: [
- {
- required: true,
- message: "请输入身份证",
- trigger: "click",
- },
- ],
- // search: true,
- // searchSpan: 4,
- // overHidden: true
- },
- // {
- // label: "派遣人",
- // prop: "dispatcher",
- // // search: true,
- // // searchSpan: 4,
- // // overHidden: true
- // },
- {
label: "保安公司",
prop: "deptId",
labelWidth: 120,
searchLabelWidth: 120,
+ searchSpan: 4,
dicUrl:
"/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
props: {
@@ -229,14 +195,84 @@
],
},
{
+ 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: "name",
+ search: true,
+ searchSpan: 4,
+ labelWidth: 120,
+ searchLabelWidth: 120,
+ // overHidden: true
+ rules: [
+ {
+ required: true,
+ message: "请输入保安人名称",
+ trigger: "click",
+ },
+ ],
+ },
+ {
+ label: "身份证",
+ prop: "cardid",
+ labelWidth: 120,
+ overHidden: true,
+ rules: [
+ {
+ required: true,
+ message: "请输入身份证",
+ trigger: "click",
+ },
+ ],
+ // 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",
+ valueFormat: "yyyy-MM-dd hh:mm:ss",
labelWidth: 120,
+ searchSpan: 4,
search: true,
- searchSpan: 5,
+ overHidden: true,
rules: [
{
required: true,
@@ -251,8 +287,9 @@
prop: "endTime",
type: "date",
format: "yyyy-MM-dd hh:mm:ss",
- valueFormat: "timestamp",
+ valueFormat: "yyyy-MM-dd hh:mm:ss",
labelWidth: 120,
+ overHidden: true,
rules: [
{
required: true,
@@ -644,6 +681,27 @@
// this.obj0.name = " 未选择派遣单位";
// }
},
+ // onLoad(page, params = {}) {
+ // this.deptId = JSON.parse(
+ // window.localStorage.getItem("saber-userInfo")
+ // ).content.dept_id;
+
+ // //获取当前用户部门信息，判断是否为公安，如果是公安，则只能查看公告信息
+ // var that = this;
+ // getDept(this.deptId).then((res) => {
+ // var deptCategory = res.data.data.deptCategory;
+ // deptCategory == 1
+ // ? (that.deptCategory = true)
+ // : (that.deptCategory = false);
+
+ // if (that.deptCategory) {
+ // params["deptId"] = this.deptId;
+ // }
+ // let values = {
+ // ...params,
+ // };
+ // })
+ // }
};
</script>
--
Gitblit v1.9.3