From fd4b065fc5a3f73dbe6ceb8f2ed66612b10a3c00 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 11 十二月 2024 17:15:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/components/operation/HiddenDangerParam.vue | 36 ++++++++++++++++++++++++++++++++----
1 files changed, 32 insertions(+), 4 deletions(-)
diff --git a/admin/src/components/operation/HiddenDangerParam.vue b/admin/src/components/operation/HiddenDangerParam.vue
index 18cc589..babe186 100644
--- a/admin/src/components/operation/HiddenDangerParam.vue
+++ b/admin/src/components/operation/HiddenDangerParam.vue
@@ -4,6 +4,7 @@
width="600px"
:visible.sync="isShowModal"
:confirm-working="isWorking"
+ @close="close"
@confirm="confirm"
>
<el-form :model="param" ref="paramRef" :rules="rules">
@@ -21,6 +22,11 @@
type="datetime"
default-time="08:00:00"
/>
+ </el-form-item>
+ <el-form-item label="璐ｄ换閮ㄩ棬" prop="companyId">
+ <el-select @change="getAddrList" clearable filterable v-model="param.companyId">
+ <el-option v-for="op in department" :key="op.id" :label="op.name" :value="op.id"></el-option>
+ </el-select>
</el-form-item>
<el-form-item label="闅愭偅鍖哄煙" prop="areaId">
<el-select v-model="param.areaId" @change="changeArea" placeholder="璇烽�夋嫨">
@@ -106,6 +112,7 @@
import { allList, memberList } from '@/api/business/hiddenDangerParam'
import { create } from '@/api/business/hiddenDanger'
import { Loading } from 'element-ui'
+import { companyGetListPost } from '@/api/business/company'
export default {
extends: BaseOpera,
components: {
@@ -126,11 +133,13 @@
uploadData: {
folder: 'HIDDEN_DANGER_FILE'
},
+ department: [],
rules: {
// starttime: [{ required: true, message: '璇烽�夋嫨鏃ユ湡', trigger: 'change' }],
areaId: [{ required: true, message: '璇烽�夋嫨', trigger: 'change' }],
cateId: [{ required: true, message: '璇烽�夋嫨', trigger: 'change' }],
checkUserId: [{ required: true, message: '璇烽�夋嫨', trigger: 'change' }],
+ companyId: [{ required: true, message: '璇烽�夋嫨', trigger: 'change' }],
faceImgUrl: [{ required: true, message: '璇蜂笂浼�', trigger: 'change' }],
content: [{ required: true, message: '璇疯緭鍏�', trigger: 'blur' }]
@@ -142,15 +151,30 @@
this.initData()
},
methods: {
+
initData () {
allList({ type: 1 }).then(res => { // 绫诲瀷
this.typeList = res || []
})
- allList({ type: 0 }).then(res => { // 浣嶇疆
+ // memberList({}).then(res => {
+ // this.memberList = res || []
+ // })
+ this.getfindCompanyTreePage()
+ },
+ getfindCompanyTreePage() {
+ companyGetListPost({queryHiddenDanger: 1})
+ .then(res => {
+ if (res && res.length > 0) {
+ this.department = res
+ }
+ })
+ },
+ getAddrList() {
+ const { companyId } = this.param
+ this.$set(this.param, 'areaId', '')
+ this.$set(this.param, 'checkUserId', '')
+ allList({ type: 0,companyId }).then(res => { // 浣嶇疆
this.addrList = res || []
- })
- memberList({}).then(res => {
- this.memberList = res || []
})
},
changeArea (e) {
@@ -218,6 +242,10 @@
handleDelImg (i) {
this.fileList.splice(i, 1)
},
+ close(){
+ this.isShowModal = false
+ this.$emit('close')
+ },
// 鍚屾淇℃伅
confirm () {
this.$refs.paramRef.validate((valid) => {
--
Gitblit v1.9.3