From 5a3ace296c010b5c11501dedf252e1c144cda9e2 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Mon, 06 Dec 2021 13:55:01 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhba_enterprises_ys
---
src/views/securityAnalysis/child/dispatch.vue | 65 +++++++++++++++++++++++++-------
1 files changed, 51 insertions(+), 14 deletions(-)
diff --git a/src/views/securityAnalysis/child/dispatch.vue b/src/views/securityAnalysis/child/dispatch.vue
index 5f37d1a..c53e493 100644
--- a/src/views/securityAnalysis/child/dispatch.vue
+++ b/src/views/securityAnalysis/child/dispatch.vue
@@ -20,7 +20,7 @@
props: ["card"],
data() {
var jurisdiction =
- this.card.jurisdiction == "1123598813738675201"
+ this.card.jurisdiction == "1372091709474910209"
? "1372091709474910209"
: this.card.jurisdiction;
return {
@@ -75,15 +75,13 @@
// span: 12,
labelWidth: 118,
},
-
{
label: "保安公司",
- prop: "deptId",
+ prop: "deptName",
type: "tree",
overHidden: true,
dicUrl:
- "/api/blade-system/dept/security_lazy-tree?jurisdiction=" +
- jurisdiction,
+ "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
props: {
label: "title",
value: "id",
@@ -110,6 +108,41 @@
// hide: true,
// span: 11,
},
+ //备用 不删 ↑针对没有depid的公司名字转换
+ // {
+ // label: "保安公司",
+ // prop: "deptId",
+ // type: "tree",
+ // overHidden: true,
+ // dicUrl:
+ // "/api/blade-system/dept/security_lazy-tree?jurisdiction=" +
+ // jurisdiction,
+ // 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: 230,
+ // searchLabelWidth: 80,
+ // search: true,
+ // searchSpan: 4,
+ // // editDisplay: false,
+ // // addDisplay: false,
+ // // hide: true,
+ // // span: 11,
+ // },
{
label: "保安服务类型",
prop: "serveType",
@@ -143,11 +176,11 @@
},
],
},
- // {
- // label: " 派遣人数",
- // prop: "num",
- // labelWidth: 118,
- // },
+ {
+ label: "人员数量",
+ prop: "num",
+ labelWidth: 118,
+ },
{
label: "合同开始时间",
prop: "startTime",
@@ -271,10 +304,10 @@
} else {
this.option1.column[2].search = false;
}
- if (this.card.jurisdiction == 1123598813738675201) {
+ if (this.card.jurisdiction == 1372091709474910209) {
this.card.jurisdiction = "";
}
- console.log(this.query1);
+ // console.log(this.query1);
const releaseTimeRange = this.query1.releaseTimeRange;
if (releaseTimeRange) {
params = {
@@ -307,6 +340,10 @@
this.getPractitionersPageInfo(this.page1, this.query1);
},
searchChange(params, done) {
+ if (params.deptName) {
+ params.deptId = params.deptName;
+ }
+ delete params.deptName;
this.query1 = params;
this.page1.currentPage = 1;
this.refreshChange();
@@ -316,11 +353,11 @@
this.query1 = {};
this.page1.currentPage = 1;
this.refreshChange();
- console.log(212);
+ // console.log(212);
},
},
};
</script>
<style scoped>
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3