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

shj

2022-08-16 ec9b4e03a5ae6a1472abea6a082e126fdedac30a

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

 src/views/accidentManagementSystem/accidentExpress/component/openAdd.vue

@@ -55,7 +55,7 @@
                                <el-radio :label="false">否</el-radio>
                            </el-radio-group>
                            <el-button v-if="ruleForm.casualties" type="primary" style="margin-left: 20px"
                                       :icon="Edit" @click="openDai" round plain />
                                       :icon="Edit" @click="openDai(ruleFormRef)" round plain />
                        </el-form-item>
                    </el-col>
                    <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
@@ -120,7 +120,7 @@
import { reactive, ref, defineComponent, defineEmits, onMounted } from 'vue';

import type { UploadUserFile, FormInstance, FormRules } from 'element-plus';
import { ElMessage } from 'element-plus';
import { ElMessage,ElMessageBox, } from 'element-plus';
import { Search, FullScreen, Edit } from '@element-plus/icons-vue';
import NumberOfCasualties from '/@/views/accidentManagementSystem/accidentExpress/component/numberOfCasualties.vue';
import UserSelections from '/@/components/userSelections/index.vue';
@@ -317,27 +317,37 @@
                await formEl.validate((valid, fields) => {
                    if (valid) {
                        isShowDialog.value = false;
                        ruleForm.value.id = null;
                        accidentManagementSystemApi()
                            .accidentAdd(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();
                        if(ruleForm.value.id==null||ruleForm.value.id==''){
                            ruleForm.value.id = null;
                            accidentManagementSystemApi()
                                .accidentAdd(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 {
                            ElMessage({
                                showClose: true,
                                message: '添加成功',
                                type: 'success',
                            });
                            emit('myAdd', true);
                        }

                    } else {
                        console.log('error submit!', fields);
                    }
@@ -403,13 +413,51 @@
            console.log('tag', ruleForm);
        };
        const ShowUser = ref();
        const openDai = () => {
        const openDai = async (formEl: FormInstance | undefined) => {
            if(ruleForm.value.id==null||ruleForm.value.id==''){
                ElMessage({
                    showClose: true,
                    message: '请先添加事故快报',
                    type: 'info',
                });
                if(!ruleForm.value.fileList){
                    ruleForm.value.fileList = []
                }
                if (!formEl) return;
                await formEl.validate((valid, fields) => {
                    if (valid) {
                        // isShowDialog.value = false;
                        ElMessageBox.confirm('确认添加此事故快报？', '提示', {
                            confirmButtonText: '确定',
                            cancelButtonText: '取消',
                            type: 'warning',
                        })
                        .then(() => {
                            accidentManagementSystemApi()
                                    .accidentAdd(ruleForm.value)
                                    .then((res) => {
                                        if (res.data.code == 200) {
                                            ElMessage({
                                                showClose: true,
                                                message: res.data.msg,
                                                type: 'success',
                                            });
                                            ruleForm.value.id = res.data.data.id
                                            ShowUser.value.openDialog(ruleForm.value.id, disabled.value);
                                        } else {
                                            ElMessage({
                                                showClose: true,
                                                message: res.data.msg,
                                                type: 'error',
                                            });
                                        }
                                    });
                        })
                        .catch(() => {});
                    } else {
                        console.log('error submit!', fields);
                    }
                });
                // ElMessage({
                //     showClose: true,
                //     message: '请先添加事故快报',
                //     type: 'info',
                // });
            }else {
                ShowUser.value.openDialog(ruleForm.value.id, disabled.value);
            }

 src/views/accidentManagementSystem/accidentExpress/index.vue

@@ -11,7 +11,7 @@
                    <el-button size="default" type="primary" @click="onOpenAdd">
                        <el-icon> <Plus /> </el-icon>新建
                    </el-button>
                    <el-button size="default" type="warning" plain :disabled="warning">
                    <el-button size="default" type="warning" plain :disabled="warning" @click="onEdit('修改', deletAll[0])">
                        <el-icon> <Edit /> </el-icon>修改
                    </el-button>
                    <el-button size="default" type="danger" @click="onDeleteAll" plain :disabled="danger">
@@ -171,6 +171,7 @@
                arr.push(valId[i].id);
            }
            deletAll.value = arr;
            console.log(deletAll.value)
            if (val.length == 1) {
                warning.value = false;
                danger.value = false;

 src/views/accidentManagementSystem/accidentReport/index.vue

@@ -15,7 +15,7 @@
                  <Plus />
                </el-icon>新建
              </el-button>
              <el-button size="default" type="warning" plain :disabled="warning">
              <el-button size="default" type="warning" plain :disabled="warning" @click="onEdit('修改', deletAll[0])">
                <el-icon>
                  <Edit />
                </el-icon>修改
@@ -195,7 +195,7 @@
            arr.push(valId[i].id);
        }
        deletAll.value = arr;
      // console.log(deletAll.value);
      console.log(deletAll.value);
      if (val.length == 1) {
        warning.value = false;
        danger.value = false;
@@ -332,7 +332,8 @@
      onMyAdd,
      onDeleteAll,
      onEdit,
      editableTabs
      editableTabs,
      deletAll
    };
  },
});

 src/views/accidentManagementSystem/workInjuryDeclaration/index.vue

@@ -22,7 +22,7 @@
                        </el-icon>
                        新建
                    </el-button>
                    <el-button size="default" type="warning" plain :disabled="warning">
                    <el-button size="default" type="warning" plain :disabled="warning" @click="onEdit('修改', deletAll[0])">
                        <el-icon>
                            <Edit />
                        </el-icon>
@@ -328,6 +328,7 @@
            total,
            onMyAdd,
            onSelectItem,
            deletAll
        };
    },
});

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

@@ -62,7 +62,7 @@
                <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" :disabled="disabled">新增
                            <el-button type="primary" size="default" @click="onAddEmergencyPersonnel(ruleFormRef)" :disabled="disabled">新增
                            </el-button>
                            <el-table
                                    :data="tableData"
@@ -161,7 +161,6 @@
            });
            const titles = ref();
            const disabled = ref();
            const peopleInsertBtn = ref(false)
            const teamId = ref()
            // 打开弹窗
            const openDialog = (title: string, id: number, type: boolean) => {
@@ -169,12 +168,6 @@
                titles.value = title;
                disabled.value = type;
                teamId.value = id
                //如果是新增  无法添加人员
                if(title == '新建应急队伍管理'){
                    peopleInsertBtn.value = true
                }else{
                    peopleInsertBtn.value = false
                }
                if (title == '查看应急队伍管理' || title == '修改应急队伍管理') {
                    contingencyApi()
                        .seeEmergencyTeam(id)
@@ -334,26 +327,35 @@
                    await formEl.validate((valid, fields) => {
                        if (valid) {
                            isShowDialog.value = false;
                            contingencyApi()
                                .addEmergencyTeam(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();
                            if(teamId.value==null||teamId.value==''){
                                contingencyApi()
                                    .addEmergencyTeam(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 {
                                ElMessage({
                                    showClose: true,
                                    message: '添加成功',
                                    type: 'success',
                                });
                                emit('myAdd', true);
                            }
                        } else {
                            console.log('error submit!', fields);
                        }
@@ -413,17 +415,52 @@
            const tableData = ref([]);
            //添加队伍负责人弹窗
            const addRef = ref();
            const onAddEmergencyPersonnel = () => {
                //未添加队伍 无法修改人员
                if(peopleInsertBtn.value == true){
                    ElMessage({
                        showClose: true,
                        message: '请先添加应急队伍',
                        type: 'warning',
                    });
                }else {
                    addRef.value.openDialog('新建应急队伍人员','',teamId.value);
            const onAddEmergencyPersonnel = async (formEl: FormInstance | undefined) => {
                if(!ruleForm.value.fileList){
                    ruleForm.value.fileList = []
                }
                if (!formEl) return;
                await formEl.validate((valid, fields) => {
                    if (valid) {
                        // isShowDialog.value = false;
                        if(teamId.value == ''||teamId.value==null){
                            ElMessageBox.confirm('确认添加此应急队伍？', '提示', {
                                confirmButtonText: '确定',
                                cancelButtonText: '取消',
                                type: 'warning',
                            })
                                .then(() => {
                                    contingencyApi()
                                        .addEmergencyTeam(ruleForm.value)
                                        .then((res) => {
                                            if (res.data.code == 200) {
                                                ElMessage({
                                                    showClose: true,
                                                    message: res.data.msg,
                                                    type: 'success',
                                                });
                                                teamId.value = res.data.data.id
                                                addRef.value.openDialog('新建应急队伍人员','',teamId.value);
                                            } else {
                                                ElMessage({
                                                    showClose: true,
                                                    message: res.data.msg,
                                                    type: 'error',
                                                });
                                            }
                                        });
                                })
                                .catch(() => {});

                        }else {
                            addRef.value.openDialog('新建应急队伍人员','',teamId.value);
                        }


                    } else {
                        console.log('error submit!', fields);
                    }
                });
            };
            // 请求列表数据
            const listApi = async () => {
@@ -508,7 +545,6 @@
                onEdit,
                onRowDel,
                department,
                peopleInsertBtn,
                teamId,
                newTreeList,
                successUploader,

 src/views/contingencyManagement/contingency/index.vue

@@ -30,11 +30,11 @@
              <Plus />
            </el-icon>新建
          </el-button>
<!--          <el-button size="default" type="warning" plain :disabled="warning">-->
<!--            <el-icon>-->
<!--              <Edit />-->
<!--            </el-icon>修改-->
<!--          </el-button>-->
          <el-button size="default" type="warning" plain :disabled="warning" @click="onEdit('修改', deleteAll[0])">
            <el-icon>
              <Edit />
            </el-icon>修改
          </el-button>
          <el-button size="default" type="danger" plain :disabled="danger" @click="onDeleteAll">
            <el-icon>
              <Delete />
@@ -142,6 +142,7 @@
  // Upload,
  // Download,
  // Refresh,
  Edit,
  View,
  EditPen,
} from '@element-plus/icons-vue'
@@ -155,6 +156,7 @@
  components: {
    OpenAdd,
    View,
    Edit,
    EditPen,
    Plus,
    Delete,
@@ -203,7 +205,7 @@
      listQuery.searchParams.teamLevel = '';
      onSubmit();
    };
    // const warning = ref(true);
    const warning = ref(true);
    const danger = ref(true);
    const deleteAll = ref();
    const handleSelectionChange = (val: any) => {
@@ -214,13 +216,13 @@
      }
      deleteAll.value = arr;
      if (val.length == 1) {
        // warning.value = false;
        warning.value = false;
        danger.value = false;
      } else if (val.length == 0) {
        // warning.value = true;
        warning.value = true;
        danger.value = true;
      } else {
        // warning.value = true;
        warning.value = true;
        danger.value = false;
      }
    };
@@ -346,7 +348,7 @@
      onHandleSizeChange,
      onHandleCurrentChange,
      deleteAll,
      // warning,
      warning,
      danger,
    };
  },

 src/views/contingencyManagement/emergencyPlanStartRecord/index.vue

@@ -28,7 +28,7 @@
      </div>
      <div class="button_Line">
        <div class="button_Left">
          <el-button size="default" type="warning" plain :disabled="warning">
          <el-button size="default" type="warning" plain :disabled="warning" @click="onEdit('修改',deleteAll[0])">
            <el-icon>
              <Edit />
            </el-icon>修改

 src/views/contingencyManagement/emergencyResources/emergencyMaterialsInspection/index.vue

@@ -19,7 +19,7 @@
                    <el-button size="default" type="primary" @click="onOpenAdd">
                        <el-icon> <Plus /> </el-icon>新建
                    </el-button>
                    <el-button size="default" type="warning" plain :disabled="warning">
                    <el-button size="default" type="warning" plain :disabled="warning"  @click="onEdit('修改', deletAll[0])">
                        <el-icon> <Edit /> </el-icon>修改
                    </el-button>
                    <el-button size="default" type="danger" plain @click="onDeleteAll" :disabled="danger">
@@ -315,6 +315,7 @@
            danger,
            total,
            onUser,
            deletAll
        };
    },
});

 src/views/contingencyManagement/emergencyResources/emergencySupplies/index.vue

@@ -11,7 +11,7 @@
                    <el-button size="default" type="primary" @click="onOpenAdd">
                        <el-icon> <Plus /> </el-icon>新建
                    </el-button>
                    <el-button size="default" type="warning" plain :disabled="warning">
                    <el-button size="default" type="warning" plain :disabled="warning" @click="onEdit('修改', deletAll[0])">
                        <el-icon> <Edit /> </el-icon>修改
                    </el-button>
                    <el-button size="default" type="danger" plain @click="onDeleteAll" :disabled="danger">
@@ -341,6 +341,7 @@
            onMaintainAdd,
            onInspectAdd,
            onMyAdds,
            deletAll
        };
    },
});

 src/views/contingencyManagement/emergencyResources/maintenanceOfEmergencyMaterials/index.vue

@@ -19,7 +19,7 @@
                    <el-button size="default" type="primary" @click="onOpenAdd('新建')">
                        <el-icon> <Plus /> </el-icon>新建
                    </el-button>
                    <el-button size="default" type="warning" plain :disabled="warning">
                    <el-button size="default" type="warning" plain :disabled="warning" @click="onEdit('修改', deletAll[0])">
                        <el-icon> <Edit /> </el-icon>修改
                    </el-button>
                    <el-button size="default" type="danger" plain @click="onDeleteAll" :disabled="danger">
@@ -319,6 +319,7 @@
            onDeleteAll,
            onEdit,
            onUser,
            deletAll
        };
    },
});

 src/views/contingencyManagement/panManagement/index.vue

@@ -25,7 +25,7 @@
                    <el-button size="default" type="primary" @click="onOpenAdd">
                        <el-icon> <Plus /> </el-icon>新建
                    </el-button>
                    <el-button size="default" type="warning" plain :disabled="warning">
                    <el-button size="default" type="warning" plain :disabled="warning" @click="onEdit('修改', deleteAll[0])">
                        <el-icon> <Edit /> </el-icon>修改
                    </el-button>
                    <el-button size="default" type="danger" plain :disabled="danger" @click="onDeleteAll">

 src/views/facilityManagement/InstrumentationInformation/index.vue

@@ -27,7 +27,8 @@
                <div class="btns">
                    <div>
                        <el-button size="default" type="primary" :icon="Plus" @click="openD('新建')">新建</el-button>
                        <!-- <el-button size="default" :disabled="warning" type="warning" plain :icon="EditPen">修改</el-button> -->
                         <el-button size="default" :disabled="warning" type="warning" plain :icon="EditPen"
                                    @click="openD('修改', deletAll[0])">修改</el-button>
                        <el-button size="default" :disabled="danger" type="danger" :icon="Delete" @click="onDeleteAll" plain>删除</el-button>
                    </div>
                    <div>

 src/views/facilityManagement/ProductionEquipment/index.vue

@@ -28,7 +28,8 @@
                <div class="btns">
                    <div>
                        <el-button size="default" type="primary" :icon="Plus" @click="openD('新建')">新建</el-button>
                        <!-- <el-button size="default" :disabled="warning" type="warning" plain :icon="EditPen">修改</el-button> -->
                         <el-button size="default" :disabled="warning" type="warning" plain :icon="EditPen"
                                    @click="openD('修改', deletAll[0])">修改</el-button>
                        <el-button size="default" :disabled="danger" type="danger" :icon="Delete" @click="onDeleteAll" plain>删除</el-button>
                    </div>
                    <div>

 src/views/facilityManagement/keyEquipment/index.vue

@@ -28,7 +28,8 @@
                <div class="btns">
                    <div>
                        <el-button size="default" type="primary" :icon="Plus" @click="openD('新建')">新建</el-button>
                        <!--                        <el-button size="default" :disabled="warning" type="warning" plain :icon="EditPen">修改</el-button>-->
                        <el-button size="default" :disabled="warning" type="warning" plain :icon="EditPen"
                                   @click="openD('修改', deletAll[0])">修改</el-button>
                        <el-button size="default" :disabled="danger" type="danger" :icon="Delete" @click="onDeleteAll"
                                   plain>删除
                        </el-button>
@@ -420,6 +421,7 @@
                onDeleteAll,
                handleNodeClick,
                timeDate,
                deletAll
            };
        },
    });

 src/views/facilityManagement/safetyEquipment/index.vue

@@ -27,7 +27,8 @@
                <div class="btns">
                    <div>
                        <el-button size="default" type="primary" :icon="Plus" @click="openD('新建')">新建</el-button>
                        <!-- <el-button size="default" :disabled="warning" type="warning" plain :icon="EditPen">修改</el-button> -->
                         <el-button size="default" :disabled="warning" type="warning" plain :icon="EditPen"
                                    @click="openD('修改', deletAll[0])">修改</el-button>
                        <el-button size="default" :disabled="danger" type="danger" :icon="Delete" @click="onDeleteAll" plain>删除</el-button>
                    </div>
                    <div>

 src/views/goalManagement/IncentiveRecording/index.vue

@@ -28,7 +28,8 @@
            <div class="btns">
                <div>
                    <el-button size="default" type="primary" :icon="Plus" @click="openD('新建')">新建</el-button>
                    <!-- <el-button size="default" :disabled="warning" type="warning" plain :icon="EditPen">修改</el-button> -->
                     <el-button size="default" :disabled="warning" type="warning" plain :icon="EditPen"
                                @click="openD('修改', editRow)">修改</el-button>
                    <el-button size="default" :disabled="danger" type="danger" :icon="Delete" plain @click="onDeleteAll">删除 </el-button>
                </div>
                <div>
@@ -179,7 +180,9 @@
        const warning = ref(true);
        const danger = ref(true);
        const deletAll = ref();
        const editRow = ref()
        const handleSelectionChange = (val: any) => {
            editRow.value = val[0]
            let valId = JSON.parse(JSON.stringify(val));
            let arr = [];
            for (let i = 0; i < valId.length; i++) {
@@ -266,6 +269,7 @@
            View,
            EditPen,
            Search,
            editRow
        };
    },
});

 src/views/goalManagement/Incentivestandard/index.vue

@@ -27,7 +27,8 @@
            <div class="btns">
                <div>
                    <el-button size="default" type="primary" :icon="Plus" @click="openD('新建')" >新建</el-button>
                    <!-- <el-button size="default" type="warning" :disabled="warning" plain :icon="EditPen" @click="openD">修改 </el-button> -->
                     <el-button size="default" type="warning" :disabled="warning" plain :icon="EditPen"
                                @click="openD('修改', deletAll[0])">修改 </el-button>
                    <el-button size="default" type="danger" :disabled="danger" :icon="Delete" plain @click="handleSelectionChange">删除</el-button>
                </div>
                <div>

 src/views/goalManagement/TargetBook/index.vue

@@ -26,7 +26,8 @@
            <div class="btns">
                <div>
                    <el-button size="default" type="primary" :icon="Plus" @click="openD('新建')">新建</el-button>
                    <el-button size="default" :disabled="warning" type="warning" plain :icon="EditPen">修改</el-button>
                    <el-button size="default" :disabled="warning" type="warning" plain :icon="EditPen"
                               @click="openD('修改', deletAll[0])">修改</el-button>
                    <el-button size="default" :disabled="danger" type="danger" :icon="Delete" plain @click="onDeleteAll">删除</el-button>
                </div>
                <div>

 src/views/goalManagement/performanceAppraisal/index.vue

@@ -21,7 +21,8 @@
                    <div class="btns">
                        <div>
                            <el-button size="default" type="primary" :icon="Plus" @click="openD('新建')">新建</el-button>
                            <!-- <el-button size="default" :disabled="warning" type="warning" plain :icon="EditPen">修改</el-button> -->
                             <el-button size="default" :disabled="warning" type="warning" plain :icon="EditPen"
                                        @click="openD('修改', deletAll[0])">修改</el-button>
                            <el-button size="default" :disabled="danger" type="danger" plain :icon="Delete" @click="onDeleteAll">删除</el-button>
                        </div>
                    </div>

 src/views/goalManagement/targetDecompositionMonth/index.vue

@@ -24,7 +24,8 @@
            <div class="btns">
                <div>
                    <!--<el-button size="default" type="primary" :icon="Plus" @click="openD('新建')">新建</el-button>-->
                    <!-- <el-button size="default" type="warning" :disabled="warning" :icon="EditPen" plain>修改</el-button> -->
                     <el-button size="default" type="warning" :disabled="warning" :icon="EditPen" plain
                                @click="openD('修改', deletAll[0])">修改</el-button>
                    <el-button size="default" type="danger" :disabled="danger" :icon="Delete" plain @click="onDeleteAll">删除</el-button>
                </div>
            </div>

 src/views/goalManagement/targetDecompositionYear/index.vue

@@ -24,7 +24,8 @@
            <div class="btns">
                <div>
                    <!--<el-button size="default" type="primary" :icon="Plus" @click="openD('新建')">新建</el-button>-->
                    <!-- <el-button size="default" type="warning" :disabled="warning" :icon="EditPen" plain>修改</el-button> -->
                     <el-button size="default" type="warning" :disabled="warning" :icon="EditPen" plain
                                @click="openD('修改', deletAll[0])">修改</el-button>
                    <el-button size="default" type="danger" :disabled="danger" :icon="Delete" plain @click="onDeleteAll">删除</el-button>
                </div>
            </div>