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

shj

2022-08-09 c64c8f43ec1a3d88feb1f915fd488040b6358e7d

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

@@ -3,9 +3,10 @@
    <el-dialog
        :title="titles"
        v-model="isShowDialog"
        width="769px"
        width="40%"
        draggable
        :fullscreen="full"
        @close="resetForm(ruleFormRef)"
    >
      <el-button @click="toggleFullscreen" size="small" class="pot" :icon="FullScreen"></el-button>
      <el-form
@@ -17,15 +18,14 @@
          label-width="90px">
        <el-row :gutter="35">
          <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
            <el-form-item label="选择人员" prop="userUid">
            <el-form-item label="选择人员" prop="name">
              <el-input
                  v-model="ruleForm.userUid"
                  v-model="ruleForm.userName"
                  placeholder="请选择"
                  class="input-with-select"
                  disabled
              >
                <template #append>
                  <el-button :icon="Search" @click="openUser" disabled/>
                  <el-button :icon="Search" @click="openUser"/>
                </template>
              </el-input>
            </el-form-item>
@@ -41,10 +41,10 @@
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
            <el-form-item label="人员性别" prop="sex">
              <el-radio-group v-model="ruleForm.sex">
                <el-radio label="男" />
                <el-radio label="女" />
            <el-form-item label="人员性别" prop="gender">
              <el-radio-group v-model="ruleForm.gender">
                <el-radio :label="false">男</el-radio>
                <el-radio :label="true">女</el-radio>
              </el-radio-group>
            </el-form-item>
          </el-col>
@@ -68,7 +68,7 @@
            </span>
      </template>
    </el-dialog>
    <DailogSearchUser ref="userRef" @SearchUser="onUser"/>
    <DailogSearchUserManger ref="userRef" @SearchUser="onUser"/>
  </div>
</template>

@@ -88,21 +88,22 @@
  Search,
  FullScreen,
} from '@element-plus/icons-vue'
import DailogSearchUser from "/@/components/DailogSearchUser/index.vue"
import {contingencyApi} from "/@/api/contingency";
import DailogSearchUserManger from "/@/components/DailogSearchUserManger/index.vue"
import {contingencyApi} from "/@/api/contingencyManagement/contingency";

export default defineComponent({
  name: 'addTeamLeader',
  components: {
    // Search,
    DailogSearchUser
    DailogSearchUserManger
  },
  setup(props, { emit }) {
    const isShowDialog = ref(false)
    const ruleFormRef = ref<FormInstance>()
    const ruleForm = ref ({
      teamId: '',
      userUid: 1,
      userUid: '',
      userName:'',
      gender: '',
      jobNumber: '', // 人员工号
      name: '', // 人员名称
@@ -148,105 +149,39 @@
    })
    const titles = ref();
    const disabled = ref();
    // const submitForm = async (title: string, formEl: FormInstance | undefined) => {
    //   if (title == '新建应急队伍人员') {
    //     if (!formEl) return;
    //     await formEl.validate((valid, fields) => {
    //       if (valid) {
    //         isShowDialog.value = false;
    //         contingencyApi()
    //             .addEmergencyTeamPersonnel(ruleForm.value)
    //             .then((res) => {
    //               if (res.data.code == 200) {
    //                 ElMessage({
    //                   showClose: true,
    //                   message: res.data.msg,
    //                   type: 'success',
    //                 });
    //                 emit('myAdd', true);
    //               } else {
    //                 ElMessage({
    //                   showClose: true,
    //                   message: res.data.msg,
    //                   type: 'error',
    //                 });
    //                 emit('myAdd', true);
    //               }
    //               formEl.resetFields();
    //             });
    //       } else {
    //         console.log('error submit!', fields);
    //       }
    //     });
    //   }
    //   else if (title == '修改应急队伍人员') {
    //     if (!formEl) return;
    //     await formEl.validate((valid, fields) => {
    //       if (valid) {
    //         isShowDialog.value = false;
    //         contingencyApi()
    //             .editEmergencyTeam(ruleForm.value)
    //             .then((res) => {
    //               if (res.data.code == 200) {
    //                 ElMessage({
    //                   showClose: true,
    //                   message: '修改成功',
    //                   type: 'success',
    //                 });
    //                 emit('myAdd', true);
    //               } else {
    //                 ElMessage({
    //                   showClose: true,
    //                   message: res.data.msg,
    //                   type: 'error',
    //                 });
    //                 emit('myAdd', true);
    //               }
    //               formEl.resetFields();
    //             });
    //       } else {
    //         console.log('error submit!', fields);
    //       }
    //     });
    //     formEl.resetFields();
    //     ruleForm.value = {
    //       teamId: '',
    //       userUid: 1,
    //       gender: '',
    //       jobNumber: '', // 人员工号
    //       name: '', // 人员名称
    //       phone: '', // 手机号码
    //       position: '', // 职位
    //     };
    //   }
    // }
    //继续添加
    const addForm = (formEl: FormInstance | undefined) => {
      emit('myAdd', ruleForm.value);
      formEl.resetFields();
    }
    const submitForm = async (title: string, formEl: FormInstance | undefined) => {
      if (title == '新建应急队伍人员') {
        if (!formEl) return;
        await formEl.validate((valid, fields) => {
          if (valid) {
            isShowDialog.value = false;
            emit('onAdd', ruleForm.value);
            // contingencyApi()
            //     .addEmergencyTeamPersonnel(ruleForm.value)
            //     .then((res) => {
            //       if (res.data.code == 200) {
            //         ElMessage({
            //           showClose: true,
            //           message: res.data.msg,
            //           type: 'success',
            //         });
            //         emit('myAdd', true);
            //       } else {
            //         ElMessage({
            //           showClose: true,
            //           message: res.data.msg,
            //           type: 'error',
            //         });
            //         emit('myAdd', true);
            //       }
            //       formEl.resetFields();
            //     });
            // console.log('-------',ruleForm.value)
            // emit('myAdd', ruleForm.value);
            contingencyApi()
                .addEmergencyTeamPersonnel(ruleForm.value)
                .then((res) => {
                  if (res.data.code == 200) {
                    ElMessage({
                      showClose: true,
                      message: res.data.msg,
                      type: 'success',
                    });
                    emit('myAdd', true);
                  } else {
                    ElMessage({
                      showClose: true,
                      message: res.data.msg,
                      type: 'error',
                    });
                    emit('myAdd', true);
                  }
                  formEl.resetFields();
                });
          } else {
            console.log('error submit!', fields);
          }
@@ -258,7 +193,7 @@
          if (valid) {
            isShowDialog.value = false;
            contingencyApi()
                .editEmergencyTeam(ruleForm.value)
                .editEmergencyTeamPersonnel(ruleForm.value)
                .then((res) => {
                  if (res.data.code == 200) {
                    ElMessage({
@@ -284,7 +219,8 @@
        formEl.resetFields();
        ruleForm.value = {
          teamId: '',
          userUid: 1,
          userUid: '',
          userName:'',
          gender: '',
          jobNumber: '', // 人员工号
          name: '', // 人员名称
@@ -298,11 +234,14 @@
      if (!formEl) return;
      formEl.resetFields();
    };

    // 打开弹窗
    const openDialog = (title: string, id: number, type: boolean) => {
    const openDialog = (title: string, id: number,teamId:number, type: boolean) => {
      isShowDialog.value = true;
      titles.value = title;
      disabled.value = type;
      ruleForm.value.teamId = teamId

      if (title == '查看应急队伍人员' || title == '修改应急队伍人员') {
        contingencyApi()
            .seeEmergencyTeamPersonnel(id)
@@ -319,7 +258,13 @@
      userRef.value.openDailog();
    };
    const onUser = (e:any) => {
      ruleForm.value.userUid=e.id
      ruleForm.value.userUid=e[0].uid
      ruleForm.value.userName=e[0].realName
      ruleForm.value.gender=e[0].sex
      ruleForm.value.name=e[0].username
      ruleForm.value.jobNumber=e[0].jobNumber
      ruleForm.value.phone=e[0].phone
      ruleForm.value.position=e[0].position
    };
    //全屏
    const full = ref(false);
@@ -350,7 +295,7 @@
      openUser,
      userRef,
      onUser,
      // addForm,
      addForm,
      submitForm,
    };
  },