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

shj

2022-08-03 96103611f97b412453ecf0948792987956e4f29f

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

@@ -1,7 +1,7 @@
<template>
   <div class="system-edit-user-container">
      <el-dialog :title="titles" v-model="isShowDialog" width="769px" draggable :fullscreen="full">
         <el-button @click="toggleFullscreen" size="small" class="pot" :icon="FullScreen"></el-button>
         <el-button @click="toggleFullscreen" size="small" class="pot" :icon="FullScreen" ></el-button>
         <el-form ref="ruleFormRef" :model="ruleForm" size="default" :rules="rules" label-width="120px" :disabled="disabled">
            <el-row :gutter="35">
               <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
@@ -20,16 +20,16 @@
               </el-col>
               <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                  <el-form-item label="队伍负责人" prop="principalUid">
                     <el-input v-model="ruleForm.principalUid" placeholder="请选择" class="input-with-select">
                     <el-input v-model="ruleForm.principalUid" placeholder="请选择" class="input-with-select" disabled>
                        <template #append>
                           <el-button :icon="Search" @click="openUser" />
                           <el-button :icon="Search" @click="openUser" disabled/>
                        </template>
                     </el-input>
                  </el-form-item>
               </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" placeholder="请选择" />
                     <el-tree-select v-model="ruleForm.principalDepartmentId" :data="data" class="w100" :props="propse" clearable  placeholder="请选择" />
                  </el-form-item>
               </el-col>
               <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
@@ -67,13 +67,14 @@
         <el-row :gutter="35">
            <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
               <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
                  <el-tab-pane label="应急队伍人员" name="first">
                     <el-button type="primary" size="default" @click="onAddEmergencyPersonnel">新增</el-button>
                  <el-tab-pane label="应急队伍人员" name="first" :disabled="disabled">
                     <el-button type="primary" size="default" @click="onAddEmergencyPersonnel" :disabled="disabled">新增</el-button>
                     <el-table
                        :data="tableData"
                        style="width: 100%; margin-top: 15px"
                        ref="multipleTableRef"
                        :header-cell-style="{ background: '#f6f7fa', color: '#909399' }"
                :disabled="disabled"
                     >
                        <el-table-column prop="jobNumber" label="人员工号" show-overflow-tooltip></el-table-column>
                        <el-table-column prop="name" label="人员名称" show-overflow-tooltip></el-table-column>
@@ -99,7 +100,7 @@
         </template>
      </el-dialog>
      <AddEmergencyPersonnel ref="addRef"  @myAdd="onMyAdd"/>
      <DailogSearchUser ref="userRef" @SearchUser="onUser" />
      <DailogSearchUser ref="userRef" @SearchUsers="onUser" />
   </div>
</template>

@@ -108,6 +109,7 @@
  reactive,
  ref,
  defineComponent,
  onMounted,
  // toRefs,
} from 'vue';
import {
@@ -129,6 +131,7 @@
import AddEmergencyPersonnel from "/@/views/contingencyManagement/contingency/component/addEmergencyPersonnel.vue";
import DailogSearchUser from "/@/components/DailogSearchUser/index.vue"
import {contingencyApi} from "/@/api/contingency";
import {goalManagementApi} from "/@/api/goalManagement";
// import {releaseDrillPlanApi} from "/@/api/releaseDrillPlan";


@@ -186,61 +189,88 @@
    // 上传附件
    const fileList = ref<UploadUserFile[]>([])

    //部门树
    const department = () => {
      goalManagementApi()
          .getTreedepartment()
          .then((res) => {
            if (res.data.code == 200) {
              data.value = res.data.data;
            } else {
              ElMessage.error(res.data.msg);
            }
          });
    };
    //定义树形下拉框
    const principalDepartmentId = ref()
    const data = [
      {
        value: '1',
        label: '广汇能源综合物流发展有限责任公司',
        children: [
          {
            value: '11',
            label: '经营班子',
            children: [],
          },
        ],
      },
      {
        value: '2',
        label: '生产运行部',
        children: [
          {
            value: '21',
            label: '灌装一班',
            children: []
          },
          {
            value: '22',
            label: '工艺四班',
            children: [],
          },
        ],
      },
      {
        value: '3',
        label: '设备部',
        children: [
          {
            value: '31',
            label: '仪表班',
            children: [],
          },
          {
            value: '32',
            label: '机修班',
            children: [],
          },
        ],
      },
    ]
    const propse = {
      label: 'depName',
      children: 'children',
      value: 'depId',
    };
    const data=ref()
    onMounted(() => {
      department();
    });
    // const data = [
    //   {
    //     value: '1',
    //     label: '广汇能源综合物流发展有限责任公司',
    //     children: [
    //       {
    //         value: '11',
    //         label: '经营班子',
    //         children: [],
    //       },
    //     ],
    //   },
    //   {
    //     value: '2',
    //     label: '生产运行部',
    //     children: [
    //       {
    //         value: '21',
    //         label: '灌装一班',
    //         children: []
    //       },
    //       {
    //         value: '22',
    //         label: '工艺四班',
    //         children: [],
    //       },
    //     ],
    //   },
    //   {
    //     value: '3',
    //     label: '设备部',
    //     children: [
    //       {
    //         value: '31',
    //         label: '仪表班',
    //         children: [],
    //       },
    //       {
    //         value: '32',
    //         label: '机修班',
    //         children: [],
    //       },
    //     ],
    //   },
    // ]
    // 打开用户选择弹窗
    const userRef = ref();
    const openUser = () => {
      userRef.value.openDailog();
    };
    const nameC = ref();
    const onUser = (e:any) => {
      ruleForm.value.principalUid=e.id
      ruleForm.value.principalUid = e.uid
      nameC.value=e.realName
    };
    // const onUser = (e:any) => {
    //
    //   ruleForm.value.principalUid=e.id
    // };
    //定义tabs切换
    const activeName = ref('first')
    const handleClick = (tab: TabsPaneContext, event: Event) => {
@@ -436,8 +466,8 @@
    const tableData = ref([]);
    //添加队伍负责人弹窗
    const addRef = ref();
    const onAddEmergencyPersonnel = () => {
      addRef.value.openDialog('新建应急队伍人员',false);
    const onAddEmergencyPersonnel = (title:string,data: any) => {
      addRef.value.openDialog('新建应急队伍人员',data);
    };
    // 新增后刷新
    const onMyAdd = (e: boolean) => {
@@ -500,6 +530,7 @@
      userRef,
      titles,
      disabled,
      propse,
      emit,
      onSubmit,
      openUser,
@@ -508,11 +539,12 @@
      FullScreen,
      full,
      onUser,
      // listQuery,
      nameC,
      onMyAdd,
      // listApi,
      onEdit,
      onRowDel,
      department,
    };
  },
});