外包修改

马宇豪

2023-02-23 7fd5c2d17a4df2c6818ab76d6dffe851afa18c9c

外包修改

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

@@ -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="newTreeList" class="w100"
                            <el-tree-select v-model="ruleForm.principalDepartmentId" check-strictly :data="newTreeList" class="w100"
                                            :props="propse" clearable placeholder="请选择"/>
                        </el-form-item>
                    </el-col>

 src/views/contingencyManagement/contingency/index.vue

@@ -182,7 +182,7 @@
    const onSubmit = async () => {
      let res = await contingencyApi().getTeamManagementList(listQuery)
      if(res.data.code === '200'){
        tableData.value = res.data.data;
        tableData.value = JSON.parse(JSON.stringify(res.data.data));
        for(var a = 0;a<tableData.value.length;a++){
          if(tableData.value[a].fileList!=null&&tableData.value[a].fileList!=''&&tableData.value[a].fileList.length!=0){
            tableData.value[a].fileList = tableData.value[a].fileList[0].fileName

 src/views/contingencyManagement/emergencyDrill/implementationOfEmergencyDrill/component/openAdd.vue

@@ -36,13 +36,13 @@
        <el-row :gutter="35">
          <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
            <el-form-item label="演练地点" prop="drillAddress">
              <el-input :disabled="true" v-model="drillRuleForm.drillAddress" placeholder="请填写演练地点"></el-input>
              <el-input :disabled="disabled" v-model="drillRuleForm.drillAddress" placeholder="请填写演练地点"></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="主办部门"  placeholder="请选择" prop="departmentId">
              <el-tree-select
                      :disabled="true"
                      :disabled="disabled"
                      v-model="drillRuleForm.departmentId"
                      :data="deptData"
                      check-strictly
@@ -54,7 +54,7 @@
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
            <el-form-item label="演练方式" prop="drillWay">
              <el-select :disabled="true" v-model="drillRuleForm.drillWay" class="w100" placeholder="请选择">
              <el-select :disabled="disabled" v-model="drillRuleForm.drillWay" class="w100" placeholder="请选择">
                <el-option label="综合" value="0"></el-option>
                <el-option label="桌面" value="1"></el-option>
                <el-option label="专项" value="2"></el-option>
@@ -64,20 +64,20 @@
          <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
            <el-form-item label="应急预案" prop="planName" >
              <el-input
                      :disabled="true"
                      :disabled="disabled"
                      v-model="drillRuleForm.planName"
                      placeholder="请选择"
                      class="input-with-select"
              >
                <template #append>
                  <el-button :disabled="true" :icon="Search" @click="daiInpt"/>
                  <el-button :disabled="disabled" :icon="Search" @click="daiInpt"/>
                </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="drillLevel">
              <el-select :disabled="true" v-model="drillRuleForm.drillLevel" class="w100" placeholder="请选择">
              <el-select :disabled="disabled" v-model="drillRuleForm.drillLevel" class="w100" placeholder="请选择">
                <el-option label="公司级" value="1"></el-option>
                <el-option label="分厂级" value="2"></el-option>
                <el-option label="车间级" value="3"></el-option>
@@ -86,31 +86,31 @@
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
            <el-form-item label="计划定制日期" prop="makingPlanDate">
              <el-date-picker :disabled="true" v-model="drillRuleForm.makingPlanDate"
              <el-date-picker :disabled="disabled" v-model="drillRuleForm.makingPlanDate"
                              value-format="YYYY-MM-DD HH:mm:ss" type="datetime" placeholder="选择日期时间" style="width: 100%" />
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
            <el-form-item label="计划演练日期" prop="drillPlanDate">
              <el-date-picker :disabled="true" v-model="drillRuleForm.drillPlanDate"
              <el-date-picker :disabled="disabled" v-model="drillRuleForm.drillPlanDate"
                              value-format="YYYY-MM-DD HH:mm:ss" type="datetime" placeholder="选择日期时间" style="width: 100%" />
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
            <el-form-item label="修改时间" prop="gmtModitify">
              <el-date-picker :disabled="true" v-model="drillRuleForm.gmtModitify"
              <el-date-picker :disabled="disabled" v-model="drillRuleForm.gmtModitify"
                              value-format="YYYY-MM-DD HH:mm:ss" type="datetime" placeholder="选择日期时间" style="width: 100%" />
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
            <el-form-item label="计划定制人" prop="makingUserName">
              <el-input :disabled="true" v-model="drillRuleForm.makingUserName" placeholder="请填写计划定制人"></el-input>
              <el-input :disabled="disabled" v-model="drillRuleForm.makingUserName" placeholder="请填写计划定制人"></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="makingDepartmentId">
              <el-tree-select
                      :disabled="true"
                      :disabled="disabled"
                      v-model="drillRuleForm.makingDepartmentId"
                      check-strictly
                      :data="deptData"
@@ -123,13 +123,13 @@
          <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
            <el-form-item label="演练人员" prop="userListString" >
              <el-input
                      :disabled="true"
                      :disabled="disabled"
                      v-model="drillRuleForm.userListString"
                      placeholder="请选择"
                      class="input-with-select"
              >
                <template #append>
                  <el-button :disabled="true" :icon="Search" @click="openUser(0)"/>
                  <el-button :disabled="disabled" :icon="Search" @click="openUser(0)"/>
                </template>
              </el-input>
            </el-form-item>
@@ -137,7 +137,7 @@
          <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
            <el-form-item label="演练目的" prop="purpose">
              <el-input
                      :disabled="true"
                      :disabled="disabled"
                      v-model="drillRuleForm.purpose"
                      placeholder="请填写演练目的"
                      class="input-with-select textarea"
@@ -149,31 +149,31 @@
          <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
            <el-form-item label="演练负责人" prop="chargeUserListString" >
              <el-input
                      :disabled="true"
                      :disabled="disabled"
                      v-model="drillRuleForm.chargeUserListString"
                      placeholder="请选择"
                      class="input-with-select"
              >
                <template #append>
                  <el-button :disabled="true" :icon="Search" @click="openUser(1)"/>
                  <el-button :disabled="disabled" :icon="Search" @click="openUser(1)"/>
                </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="insuranceMeasures">
              <el-input :disabled="true" v-model="drillRuleForm.insuranceMeasures" placeholder="请填写保险措施"></el-input>
              <el-input :disabled="disabled" v-model="drillRuleForm.insuranceMeasures" placeholder="请填写保险措施"></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="drillExpense">
              <el-input :disabled="true" v-model="drillRuleForm.drillExpense" placeholder="请填写演练经费"></el-input>
              <el-input :disabled="disabled" v-model="drillRuleForm.drillExpense" placeholder="请填写演练经费"></el-input>
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
            <el-form-item label="备注信息" prop="remark">
              <el-input
                      :disabled="true"
                      :disabled="disabled"
                      v-model="drillRuleForm.remark"
                      placeholder="请填写备注信息"
                      class="input-with-select textarea"

 src/views/contingencyManagement/emergencyDrill/releaseOfDrillPlan/component/regionsDialog.vue

@@ -102,7 +102,7 @@
    const onSubmit = async () => {
      let res = await emergencyPlanApi().getEmergencyPlanList(listQuery);
      if (res.data.code === '200') {
        tableData.value = res.data.data;
        tableData.value = JSON.parse(JSON.stringify(res.data.data));
        pageIndex.value = res.data.pageIndex;
        pageSize.value = res.data.pageSize;
        total.value = res.data.total;

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

@@ -38,9 +38,9 @@
                    <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                        <el-form-item label="预案类型" prop="type">
                            <el-select v-model="ruleForm.type" class="w100" placeholder="请选择">
                                <el-option label="综合应急预案" value="1"></el-option>
                                <el-option label="现场处置方案" value="2"></el-option>
                                <el-option label="专项应急预案" value="3"></el-option>
                                <el-option label="综合应急预案" :value="1"></el-option>
                                <el-option label="现场处置方案" :value="2"></el-option>
                                <el-option label="专项应急预案" :value="3"></el-option>
                                <el-option label="其他预案" value="4"></el-option>
                            </el-select>
                        </el-form-item>
@@ -56,9 +56,9 @@
                    <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                        <el-form-item label="预案级别" prop="level">
                            <el-select v-model="ruleForm.level" class="w100" placeholder="请选择">
                                <el-option label="公司级" value="1"></el-option>
                                <el-option label="分厂级" value="2"></el-option>
                                <el-option label="车间级" value="3"></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>
@@ -199,7 +199,6 @@
                            }
                            if(res.data.data.deptList){
                                for(var a = 0;a<res.data.data.deptList.length;a++){

                                    responsibleDepartment.value.push(res.data.data.deptList[a].departmentId)
                                }
                            }
@@ -321,11 +320,13 @@
                if (!formEl) return;
                await formEl.validate((valid, fields) => {
                    if (valid) {
                        isShowDialog.value = false;
                        delete ruleForm.value.teamName
                        emergencyPlanApi()
                            .editEmergencyTeam(ruleForm.value)
            ruleForm.value.teamList = JSON.parse(JSON.stringify(ruleForm.value.teamList))
            ruleForm.value.fileList = JSON.parse(JSON.stringify(ruleForm.value.fileList))
            ruleForm.value.deptList = JSON.parse(JSON.stringify(ruleForm.value.deptList))
                        emergencyPlanApi().editEmergencyTeam(ruleForm.value)
                            .then((res) => {
                console.log(res,'res')
                                if (res.data.code == 200) {
                                    ElMessage({
                                        showClose: true,
@@ -342,7 +343,8 @@
                                    emit('myAdd', true);
                                }
                                formEl.resetFields();
                            });
                            })
            isShowDialog.value = false;
                    } else {
                        console.log('error submit!', fields);
                    }

 src/views/system/department/index.vue

@@ -3,12 +3,12 @@
        <el-card shadow="hover">
            <div class="system-dept-search mb15">
                <!--                <el-input size="default" placeholder="请输入部门名称" style="max-width: 180px"> </el-input>-->
                <el-button size="default" type="primary" class="ml10">
                    <el-icon>
                        <ele-Search />
                    </el-icon>
                    查询
                </el-button>
<!--                <el-button size="default" type="primary" class="ml10">-->
<!--                    <el-icon>-->
<!--                        <ele-Search />-->
<!--                    </el-icon>-->
<!--                    查询-->
<!--                </el-button>-->
                <el-button size="default" type="success" class="ml10" @click="onOpenDeptDialog('新增', '')">
                    <el-icon>
                        <ele-FolderAdd />

 src/views/system/role/index.vue

@@ -3,12 +3,12 @@
        <el-card shadow="hover">
            <div class="system-user-search mb15">
                <!--                <el-input size="default" placeholder="请输入角色名称" style="max-width: 180px"> </el-input>-->
                <el-button size="default" type="primary" class="ml10" @click="handleSearch">
                    <el-icon>
                        <ele-Search />
                    </el-icon>
                    查询
                </el-button>
<!--                <el-button size="default" type="primary" class="ml10" @click="handleSearch">-->
<!--                    <el-icon>-->
<!--                        <ele-Search />-->
<!--                    </el-icon>-->
<!--                    查询-->
<!--                </el-button>-->
                <el-button size="default" type="success" class="ml10" @click="onOpenDialogRef('新增', '')">
                    <el-icon>
                        <ele-FolderAdd />