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

shj

2022-08-09 c64c8f43ec1a3d88feb1f915fd488040b6358e7d

 src/views/contingencyManagement/panManagement/index.vue

@@ -60,8 +60,21 @@
         <el-table :data="tableData" style="width: 100%" ref="multipleTableRef" @selection-change="handleSelectionChange">
            <el-table-column type="selection" width="55" />
            <el-table-column prop="name" label="预案名称" show-overflow-tooltip sortable></el-table-column>
            <el-table-column prop="type" label="预案类型" show-overflow-tooltip sortable></el-table-column>
            <el-table-column prop="level" label="预案级别" show-overflow-tooltip sortable></el-table-column>
            <el-table-column prop="type" label="预案类型" show-overflow-tooltip sortable>
          <template #default="scope">
            <span v-if="scope.row.type == 1">综合应急预案</span>
            <span v-if="scope.row.type == 2">现场处置方案</span>
            <span v-if="scope.row.type == 3">专项应急预案</span>
            <span v-if="scope.row.type == 4">其他预案</span>
          </template>
        </el-table-column>
            <el-table-column prop="level" label="预案级别" show-overflow-tooltip sortable>
          <template #default="scope">
            <span v-if="scope.row.level == 1">综合应急预案</span>
            <span v-if="scope.row.level == 2">现场处置方案</span>
            <span v-if="scope.row.level == 3">专项应急预案</span>
          </template>
        </el-table-column>
            <el-table-column prop="releaseDate" label="发布实施日期" show-overflow-tooltip sortable></el-table-column>
            <el-table-column label="操作" width="260" align="center" fixed="right">
               <template #default="scope">
@@ -94,7 +107,7 @@
                     text
                     type="primary"
                     v-if="scope.row.approveStatus === 2 && scope.row.checkApprove === true"
                     @click="onApproval('修改',scope.row.approveId)"
                     @click="onApproval('修改',scope.row.approveId,scope.row.id)"
                  >
                     审批
                  </el-button>
@@ -103,7 +116,7 @@
                     text
                     type="primary"
                     v-if="scope.row.approveStatus === 2 && scope.row.checkApprove === false"
                     @click="onApproval('详情',scope.row.id)"
                     @click="onApproval('详情',scope.row.approveId,scope.row.id)"
                  >
              查看审批
                  </el-button>
@@ -179,8 +192,8 @@
import InitiateApproval from '/@/views/contingencyManagement/panManagement/component/initiateApproval.vue';
import Approval from '/@/views/contingencyManagement/panManagement/component/approval.vue';
// import UpData from '/@/views/contingencyManagement/panManagement/component/upData.vue';
import { emergencyPlanApi } from '/@/api/emergencyPlan';
import { emergencyPlanLogApi } from '/@/api/emergencyPlanLog';
import { emergencyPlanApi } from '/@/api/contingencyManagement/emergencyPlan';
import { emergencyPlanLogApi } from '/@/api/contingencyManagement/emergencyPlanLog';

export default defineComponent({
   name: 'systemUser',
@@ -426,10 +439,12 @@
      // 分页改变
      const onHandleSizeChange = (val: number) => {
         listQuery.pageSize = val;
         onSubmit();
      };
      // 分页未改变
      const onHandleCurrentChange = (val: number) => {
         listQuery.pageIndex = val;
         onSubmit();
      };

      // const router=useRouter()
@@ -458,17 +473,17 @@
      };
      // 审批
      const approvalRef = ref();
      const onApproval = (val: string,row: object) => {
      const onApproval = (val: string,row: object,id) => {
      if(val=='详情'){
        approvalRef.value.openDialog('查看审批', row, true);
      } else {
        approvalRef.value.openDialog('修改审批', row, false);
        approvalRef.value.openDialog('审批', row, false,id);
      }
      };
    // 审批流程
    const processRef = ref();
    const onApprovalProcess = () => {
      processRef.value.openDialog();
    const onApprovalProcess = (row:object,id) => {
      processRef.value.openDialog(row,id);
    };

      //全屏