Merge branch 'master' of https://sinanoaq.cn:8888/r/gtqtOut

shj

2022-08-09 c64c8f43ec1a3d88feb1f915fd488040b6358e7d

 src/views/contingencyManagement/contingency/component/openAdd.vue

@@ -13,9 +13,9 @@
                    <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                        <el-form-item label="队伍级别" prop="teamLevel">
                            <el-select v-model="ruleForm.teamLevel" class="w100" placeholder="请选择">
                                <el-option label="公司" value="公司"></el-option>
                                <el-option label="分厂-车间" value="分厂-车间"></el-option>
                                <el-option label="工序-班组等" value="工序-班组等"></el-option>
                                <el-option label="公司" value="1"></el-option>
                                <el-option label="分厂-车间" value="2"></el-option>
                                <el-option label="工序-班组等" value="3"></el-option>
                            </el-select>
                        </el-form-item>
                    </el-col>
@@ -30,7 +30,7 @@
                    </el-col>
                    <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                        <el-form-item label="负责人部门" prop="principalDepartmentId">
                            <el-tree-select v-model="ruleForm.principalDepartmentId" :data="data" class="w100"
                            <el-tree-select v-model="ruleForm.principalDepartmentId" :data="newTreeList" class="w100"
                                            :props="propse" clearable placeholder="请选择"/>
                        </el-form-item>
                    </el-col>
@@ -140,7 +140,7 @@
    } from '@element-plus/icons-vue'
    import AddEmergencyPersonnel from "/@/views/contingencyManagement/contingency/component/addEmergencyPersonnel.vue";
    import DailogSearchUserManger from "/@/components/DailogSearchUserManger/index.vue"
    import {contingencyApi} from "/@/api/contingency";
    import {contingencyApi} from "/@/api/contingencyManagement/contingency";
    import {goalManagementApi} from "/@/api/goalManagement";
    // import {releaseDrillPlanApi} from "/@/api/releaseDrillPlan";

@@ -201,29 +201,53 @@
            // 上传附件
            const fileList = ref<UploadUserFile[]>([])

            //部门树
            const department = () => {
                goalManagementApi()
            //定义树形下拉框
            const principalDepartmentId = ref()
            const data = ref()



            //el-tree-select回显
            const propse = {
                label: 'depName',
                children: 'children',
            };
            const newTreeList = [];
            //得到部门树
            const department = async () => {
                await goalManagementApi()
                    .getTreedepartment()
                    .then((res) => {
                        if (res.data.code == 200) {
                            data.value = res.data.data;
                            getTreeList(res.data.data, newTreeList);
                        } else {
                            ElMessage.error(res.data.msg);
                        }
                    });
            };
            //定义树形下拉框
            const principalDepartmentId = ref()
            const propse = {
                label: 'depName',
                children: 'children',
                value: 'depId',
            // 递归树状数据且修改字段名
            const getTreeList = (treeList, newTreeList) => {
                treeList.map((c) => {
                    let tempData = {
                        depName: c.depName,
                        value: c.depId,
                        children: [],
                    };
                    if (c.children && c.children.length > 0) {
                        tempData.children = [];
                        getTreeList(c.children, tempData.children);
                    }
                    newTreeList.push(tempData);
                });
            };
            const data = ref()
            onMounted(() => {
                department();
            });




            // 打开用户选择弹窗
            const userRef = ref();
            const openUser = () => {
@@ -482,7 +506,8 @@
                onRowDel,
                department,
                peopleInsertBtn,
                teamId
                teamId,
                newTreeList
            };
        },
    });