From cee2a40ab2136460fe6d840bcfc3d835feb8e02a Mon Sep 17 00:00:00 2001
From: Admin <978517621@qq.com>
Date: 星期五, 26 八月 2022 14:50:00 +0800
Subject: [PATCH] Default Changelist
---
src/views/specialWorkSystem/workTicket/workApply/index.vue | 6 +-
src/views/specialWorkSystem/workTicket/myJobApply/components/heightLog.vue | 2
src/views/specialWorkSystem/workTicket/myApproval/index.vue | 6 ++
src/views/specialWorkSystem/workTicket/workApply/components/broken.vue | 31 +++++++---
src/views/specialWorkSystem/workTicket/myJobApply/components/brokenLog.vue | 2
src/views/specialWorkSystem/workTicket/myApproval/components/groundLog.vue | 2
src/views/specialWorkSystem/workTicket/myApproval/components/spaceLog.vue | 2
src/views/specialWorkSystem/workTicket/workApply/components/space.vue | 30 ++++++---
src/views/specialWorkSystem/workTicket/myJobApply/index.vue | 6 ++
src/views/specialWorkSystem/workTicket/myJobApply/components/groundLog.vue | 2
src/views/specialWorkSystem/workTicket/workApply/components/height.vue | 30 ++++++---
src/views/specialWorkSystem/workTicket/myJobApply/components/spaceLog.vue | 2
src/views/specialWorkSystem/workTicket/workApply/components/ground.vue | 32 +++++++---
13 files changed, 103 insertions(+), 50 deletions(-)
diff --git a/src/views/specialWorkSystem/workTicket/myApproval/components/groundLog.vue b/src/views/specialWorkSystem/workTicket/myApproval/components/groundLog.vue
index a552bc3..0110338 100644
--- a/src/views/specialWorkSystem/workTicket/myApproval/components/groundLog.vue
+++ b/src/views/specialWorkSystem/workTicket/myApproval/components/groundLog.vue
@@ -25,7 +25,7 @@
<el-form-item label="作业地址">
<el-input v-model="details.workLocation" readonly type="textarea" />
</el-form-item>
- <el-form-item label="作业单位ID">
+ <el-form-item label="作业单位">
<el-input v-model="details.workDetail.operationDepId" readonly type="textarea" />
</el-form-item>
<el-form-item label="范围">
diff --git a/src/views/specialWorkSystem/workTicket/myApproval/components/spaceLog.vue b/src/views/specialWorkSystem/workTicket/myApproval/components/spaceLog.vue
index 1359a65..d9feabc 100644
--- a/src/views/specialWorkSystem/workTicket/myApproval/components/spaceLog.vue
+++ b/src/views/specialWorkSystem/workTicket/myApproval/components/spaceLog.vue
@@ -25,7 +25,7 @@
<el-form-item label="作业地址">
<el-input v-model="details.workLocation" readonly type="textarea" />
</el-form-item>
- <el-form-item label="受限空间所属单位ID">
+ <el-form-item label="受限空间所属单位">
<el-input v-model="details.workDetail.csDepId" readonly type="textarea" />
</el-form-item>
<el-form-item label="受限空间名称">
diff --git a/src/views/specialWorkSystem/workTicket/myApproval/index.vue b/src/views/specialWorkSystem/workTicket/myApproval/index.vue
index ffd01b4..3c207b0 100644
--- a/src/views/specialWorkSystem/workTicket/myApproval/index.vue
+++ b/src/views/specialWorkSystem/workTicket/myApproval/index.vue
@@ -468,6 +468,12 @@
return state.departmentRecursionList.find((i: { depId: number }) => i.depId === Number(item))?.depName;
});
}
+ if(state.details.workDetail.csDepId){
+ state.details.workDetail.csDepId = state.departmentRecursionList.find((i: { depId: number }) => i.depId === Number(state.details.workDetail.csDepId))?.depName;
+ }
+ if(state.details.workDetail.operationDepId){
+ state.details.workDetail.operationDepId = state.departmentRecursionList.find((i: { depId: number }) => i.depId === Number(state.details.workDetail.operationDepId))?.depName;
+ }
if(state.details.workDetail.gbPath){
state.details.workDetail.gbPath = state.details.workDetail.gbPath.split(',')
}
diff --git a/src/views/specialWorkSystem/workTicket/myJobApply/components/brokenLog.vue b/src/views/specialWorkSystem/workTicket/myJobApply/components/brokenLog.vue
index 62b76f4..986ab4b 100644
--- a/src/views/specialWorkSystem/workTicket/myJobApply/components/brokenLog.vue
+++ b/src/views/specialWorkSystem/workTicket/myJobApply/components/brokenLog.vue
@@ -25,7 +25,7 @@
<el-form-item label="作业地址">
<el-input v-model="details.workLocation" readonly type="textarea" />
</el-form-item>
- <el-form-item label="作业单位ID">
+ <el-form-item label="作业单位">
<el-input v-model="details.workDetail.operationDepId" readonly type="textarea" />
</el-form-item>
<el-form-item label="断路原因">
diff --git a/src/views/specialWorkSystem/workTicket/myJobApply/components/groundLog.vue b/src/views/specialWorkSystem/workTicket/myJobApply/components/groundLog.vue
index bce9a7f..d865b1e 100644
--- a/src/views/specialWorkSystem/workTicket/myJobApply/components/groundLog.vue
+++ b/src/views/specialWorkSystem/workTicket/myJobApply/components/groundLog.vue
@@ -25,7 +25,7 @@
<el-form-item label="作业地址">
<el-input v-model="details.workLocation" readonly type="textarea" />
</el-form-item>
- <el-form-item label="作业单位ID">
+ <el-form-item label="作业单位">
<el-input v-model="details.workDetail.operationDepId" readonly type="textarea" />
</el-form-item>
<el-form-item label="范围">
diff --git a/src/views/specialWorkSystem/workTicket/myJobApply/components/heightLog.vue b/src/views/specialWorkSystem/workTicket/myJobApply/components/heightLog.vue
index 04d38f9..179d224 100644
--- a/src/views/specialWorkSystem/workTicket/myJobApply/components/heightLog.vue
+++ b/src/views/specialWorkSystem/workTicket/myJobApply/components/heightLog.vue
@@ -25,7 +25,7 @@
<el-form-item label="作业地址">
<el-input v-model="details.workLocation" readonly type="textarea" />
</el-form-item>
- <el-form-item label="作业单位ID">
+ <el-form-item label="作业单位">
<el-input v-model="details.workDetail.operationDepId" readonly type="textarea" />
</el-form-item>
<el-form-item label="作业高度">
diff --git a/src/views/specialWorkSystem/workTicket/myJobApply/components/spaceLog.vue b/src/views/specialWorkSystem/workTicket/myJobApply/components/spaceLog.vue
index c2f512b..4b65d15 100644
--- a/src/views/specialWorkSystem/workTicket/myJobApply/components/spaceLog.vue
+++ b/src/views/specialWorkSystem/workTicket/myJobApply/components/spaceLog.vue
@@ -25,7 +25,7 @@
<el-form-item label="作业地址">
<el-input v-model="details.workLocation" readonly type="textarea" />
</el-form-item>
- <el-form-item label="受限空间所属单位ID">
+ <el-form-item label="受限空间所属单位">
<el-input v-model="details.workDetail.csDepId" readonly type="textarea" />
</el-form-item>
<el-form-item label="受限空间名称">
diff --git a/src/views/specialWorkSystem/workTicket/myJobApply/index.vue b/src/views/specialWorkSystem/workTicket/myJobApply/index.vue
index 831bea1..6c2a074 100644
--- a/src/views/specialWorkSystem/workTicket/myJobApply/index.vue
+++ b/src/views/specialWorkSystem/workTicket/myJobApply/index.vue
@@ -469,6 +469,12 @@
return state.departmentRecursionList.find((i: { depId: number }) => i.depId === Number(item))?.depName;
});
}
+ if(state.details.workDetail.csDepId){
+ state.details.workDetail.csDepId = state.departmentRecursionList.find((i: { depId: number }) => i.depId === Number(state.details.workDetail.csDepId))?.depName;
+ }
+ if(state.details.workDetail.operationDepId){
+ state.details.workDetail.operationDepId = state.departmentRecursionList.find((i: { depId: number }) => i.depId === Number(state.details.workDetail.operationDepId))?.depName;
+ }
if(state.details.workDetail.gbPath){
state.details.workDetail.gbPath = state.details.workDetail.gbPath.split(',')
}
diff --git a/src/views/specialWorkSystem/workTicket/workApply/components/broken.vue b/src/views/specialWorkSystem/workTicket/workApply/components/broken.vue
index 08eda8b..dad3610 100644
--- a/src/views/specialWorkSystem/workTicket/workApply/components/broken.vue
+++ b/src/views/specialWorkSystem/workTicket/workApply/components/broken.vue
@@ -59,14 +59,15 @@
<el-row>
<el-col :span="12">
<el-form-item label="作业单位" prop="workDetail.operationDepId">
- <el-select v-model="form.workDetail.operationDepId">
- <el-option
- v-for="item in csDepList"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- />
- </el-select>
+<!-- <el-select v-model="form.workDetail.operationDepId">-->
+<!-- <el-option-->
+<!-- v-for="item in csDepList"-->
+<!-- :key="item.value"-->
+<!-- :label="item.label"-->
+<!-- :value="item.value"-->
+<!-- />-->
+<!-- </el-select>-->
+ <el-cascader v-model="form.workDetail.operationDepId" :options="departList" :props="casProps2" :show-all-levels="false" @change="handleChange2" />
</el-form-item>
</el-col>
<el-col :span="12">
@@ -141,7 +142,8 @@
dialogVisible: Boolean,
dialogImageUrl: string | null,
imgLimit: number,
- casProps: {}
+ casProps: {},
+ casProps2: {}
}
interface file {
url: string;
@@ -207,6 +209,14 @@
value: 'depId',
label: 'depName',
multiple: true
+ },
+ casProps2: {
+ emitPath: false,
+ value: 'depId',
+ label: 'depName',
+ multiple: false,
+ expandTrigger: 'hover',
+ checkStrictly: true
}
});
const ruleFormRef = ref<FormInstance>()
@@ -219,7 +229,8 @@
"workDetail.operationDepId": [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
"workDetail.bcReason": [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
"workDetail.bcExplain": [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
- "workDetail.bcPath": [{ required: true, message: '该内容不能为空', trigger: 'blur' }]
+ "workDetail.bcPath": [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
+ "workDetail.involvedDepIds": [{ required: true, message: '该内容不能为空', trigger: 'blur' }]
});
const submitForm = async (formEl: FormInstance | undefined) => {
if (!formEl) return
diff --git a/src/views/specialWorkSystem/workTicket/workApply/components/ground.vue b/src/views/specialWorkSystem/workTicket/workApply/components/ground.vue
index a65e6f5..9e14e96 100644
--- a/src/views/specialWorkSystem/workTicket/workApply/components/ground.vue
+++ b/src/views/specialWorkSystem/workTicket/workApply/components/ground.vue
@@ -57,14 +57,15 @@
<el-row>
<el-col :span="12">
<el-form-item label="作业单位" prop="workDetail.operationDepId">
- <el-select v-model="form.workDetail.operationDepId">
- <el-option
- v-for="item in csDepList"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- />
- </el-select>
+<!-- <el-select v-model="form.workDetail.operationDepId">-->
+<!-- <el-option-->
+<!-- v-for="item in csDepList"-->
+<!-- :key="item.value"-->
+<!-- :label="item.label"-->
+<!-- :value="item.value"-->
+<!-- />-->
+<!-- </el-select>-->
+ <el-cascader v-model="form.workDetail.operationDepId" :options="departList" :props="casProps" :show-all-levels="false" @change="handleChange" />
</el-form-item>
</el-col>
<el-col :span="12">
@@ -142,7 +143,8 @@
uploadUrl: string,
dialogVisible: Boolean,
dialogImageUrl: string | null,
- imgLimit: number
+ imgLimit: number,
+ casProps: {}
}
interface file {
url: string;
@@ -150,7 +152,7 @@
export default {
name: 'groundForm',
components: {},
- props:['workerList'],
+ props:['workerList','departList'],
setup(props: any, context: any) {
const userInfo = useUserInfo()
const { userInfos } = storeToRefs(userInfo);
@@ -236,7 +238,15 @@
label: '盲板抽堵作业',
value: 8
}
- ]
+ ],
+ casProps: {
+ emitPath: false,
+ value: 'depId',
+ label: 'depName',
+ multiple: false,
+ expandTrigger: 'hover',
+ checkStrictly: true
+ }
});
const ruleFormRef = ref<FormInstance>()
const applyRules = reactive<FormRules>({
diff --git a/src/views/specialWorkSystem/workTicket/workApply/components/height.vue b/src/views/specialWorkSystem/workTicket/workApply/components/height.vue
index d0dc61f..ecd1aeb 100644
--- a/src/views/specialWorkSystem/workTicket/workApply/components/height.vue
+++ b/src/views/specialWorkSystem/workTicket/workApply/components/height.vue
@@ -69,14 +69,15 @@
<el-row>
<el-col :span="12">
<el-form-item label="作业单位" prop="workDetail.operationDepId">
- <el-select v-model="form.workDetail.operationDepId">
- <el-option
- v-for="item in heDepList"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- />
- </el-select>
+<!-- <el-select v-model="form.workDetail.operationDepId">-->
+<!-- <el-option-->
+<!-- v-for="item in heDepList"-->
+<!-- :key="item.value"-->
+<!-- :label="item.label"-->
+<!-- :value="item.value"-->
+<!-- />-->
+<!-- </el-select>-->
+ <el-cascader v-model="form.workDetail.operationDepId" :options="departList" :props="casProps" :show-all-levels="false" @change="handleChange" />
</el-form-item>
</el-col>
<el-col :span="12">
@@ -131,12 +132,13 @@
workTypeList: Array<any>,
workLevelList: Array<any>,
heDepList: Array<any>,
- otherWorkList: Array<any>
+ otherWorkList: Array<any>,
+ casProps:{}
}
export default defineComponent({
name: 'heightForm',
components: {},
- props:['workerList'],
+ props:['workerList','departList'],
setup() {
const userInfo = useUserInfo()
const { userInfos } = storeToRefs(userInfo);
@@ -182,6 +184,14 @@
value: 6
}
],
+ casProps: {
+ emitPath: false,
+ value: 'depId',
+ label: 'depName',
+ multiple: false,
+ expandTrigger: 'hover',
+ checkStrictly: true
+ },
workTypeList: [
{
label: "类型一",
diff --git a/src/views/specialWorkSystem/workTicket/workApply/components/space.vue b/src/views/specialWorkSystem/workTicket/workApply/components/space.vue
index afe6404..0f7515c 100644
--- a/src/views/specialWorkSystem/workTicket/workApply/components/space.vue
+++ b/src/views/specialWorkSystem/workTicket/workApply/components/space.vue
@@ -57,14 +57,15 @@
<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 +122,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 +175,14 @@
value: 6
}
],
+ casProps: {
+ emitPath: false,
+ value: 'depId',
+ label: 'depName',
+ multiple: false,
+ expandTrigger: 'hover',
+ checkStrictly: true
+ },
otherWorkList: [
{
label: '动火作业',
diff --git a/src/views/specialWorkSystem/workTicket/workApply/index.vue b/src/views/specialWorkSystem/workTicket/workApply/index.vue
index ea33534..f6e2393 100644
--- a/src/views/specialWorkSystem/workTicket/workApply/index.vue
+++ b/src/views/specialWorkSystem/workTicket/workApply/index.vue
@@ -5,19 +5,19 @@
<fire-form :workerList = allWorkers></fire-form>
</el-tab-pane>
<el-tab-pane label="受限空间作业">
- <space-form :workerList = allWorkers></space-form>
+ <space-form :workerList = allWorkers :departList = departmentList></space-form>
</el-tab-pane>
<el-tab-pane label="吊装作业">
<hoist-form :workerList = allWorkers></hoist-form>
</el-tab-pane>
<el-tab-pane label="动土作业">
- <ground-form :workerList = allWorkers></ground-form>
+ <ground-form :workerList = allWorkers :departList = departmentList></ground-form>
</el-tab-pane>
<el-tab-pane label="断路作业">
<broken-form :workerList = allWorkers :departList = departmentList></broken-form>
</el-tab-pane>
<el-tab-pane label="高处作业">
- <height-form :workerList = allWorkers></height-form>
+ <height-form :workerList = allWorkers :departList = departmentList></height-form>
</el-tab-pane>
<el-tab-pane label="临时用电作业">
<power-form :workerList = allWorkers></power-form>
--
Gitblit v1.9.2