From eafc031e3e6e48778d22b5455358273714944012 Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: Mon, 05 Sep 2022 09:53:16 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/gtqt
---
src/views/specialWorkSystem/workTicket/workApply/components/space.vue | 35 ++++++++++++++++++++++-------------
1 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/src/views/specialWorkSystem/workTicket/workApply/components/space.vue b/src/views/specialWorkSystem/workTicket/workApply/components/space.vue
index afe6404..6036dd3 100644
--- a/src/views/specialWorkSystem/workTicket/workApply/components/space.vue
+++ b/src/views/specialWorkSystem/workTicket/workApply/components/space.vue
@@ -16,8 +16,6 @@
</el-select>
</el-form-item>
</el-col>
- </el-row>
- <el-row>
<el-col :span="12">
<el-form-item label="作业时间" prop="workTimeLine">
<el-date-picker
@@ -54,17 +52,19 @@
</el-form-item>
</el-col>
</el-row>
+ <el-divider border-style="dashed" />
<el-row>
<el-col :span="12">
<el-form-item label="受限空间所属单位" prop="workDetail.csDepId">
- <el-select v-model="form.workDetail.csDepId">
- <el-option
- v-for="item in csDepList"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- />
- </el-select>
+<!-- <el-select v-model="form.workDetail.csDepId">-->
+<!-- <el-option-->
+<!-- v-for="item in csDepList"-->
+<!-- :key="item.value"-->
+<!-- :label="item.label"-->
+<!-- :value="item.value"-->
+<!-- />-->
+<!-- </el-select>-->
+ <el-cascader v-model="form.workDetail.csDepId" :options="departList" :props="casProps" :show-all-levels="false" @change="handleChange" />
</el-form-item>
</el-col>
<el-col :span="12">
@@ -121,12 +121,13 @@
interface stateType {
form: Object,
csDepList: Array<any>,
- otherWorkList: Array<any>
+ otherWorkList: Array<any>,
+ casProps: {}
}
export default defineComponent({
name: 'spaceForm',
components: {},
- props:['workerList'],
+ props:['workerList','departList'],
setup() {
const userInfo = useUserInfo()
const { userInfos } = storeToRefs(userInfo);
@@ -173,6 +174,14 @@
value: 6
}
],
+ casProps: {
+ emitPath: false,
+ value: 'depId',
+ label: 'depName',
+ multiple: false,
+ expandTrigger: 'hover',
+ checkStrictly: true
+ },
otherWorkList: [
{
label: '动火作业',
@@ -302,7 +311,7 @@
.el-select{
width: 100%;
}
- .el-cascader{
+ :deep(.el-cascader){
width: 100% !important;
}
}
--
Gitblit v1.9.2