|
|
@@ -1,137 +1,137 @@
|
|
|
<template >
|
|
|
<div class="app-container">
|
|
|
<!-- 顶部工具栏 -->
|
|
|
- <el-row :gutter="10">
|
|
|
- <div class="top-right-btn">
|
|
|
- <el-row>
|
|
|
- <el-tooltip effect="dark" :content="$t('tagsView.refresh')" placement="top">
|
|
|
- <el-button size="mini" circle icon="el-icon-refresh" @click="getList()" />
|
|
|
- </el-tooltip>
|
|
|
- </el-row>
|
|
|
- </div>
|
|
|
- </el-row>
|
|
|
+ <!--<el-row :gutter="10">-->
|
|
|
+ <!--<div class="top-right-btn">-->
|
|
|
+ <!--<el-row>-->
|
|
|
+ <!--<el-tooltip effect="dark" :content="tagsView.refresh" placement="top">-->
|
|
|
+ <!--<el-button size="mini" circle icon="el-icon-refresh" @click="getList()" />-->
|
|
|
+ <!--</el-tooltip>-->
|
|
|
+ <!--</el-row>-->
|
|
|
+ <!--</div>-->
|
|
|
+ <!--</el-row>-->
|
|
|
<el-table v-loading="loading" :data="approvedangerList" @selection-change="handleSelectionChange" :height="clientHeight" border>
|
|
|
<el-table-column type="selection" width="55" align="center" />
|
|
|
- <el-table-column :label="$t('流程')+' '+ $t('ID')" align="center" prop="processId" :show-overflow-tooltip="true"/>
|
|
|
- <el-table-column :label="$t('流程')+' ' + $t('名称')" align="center" prop="processName" :show-overflow-tooltip="true"/>
|
|
|
- <el-table-column :label="$t('流程')+' ' + $t('创建时间')" align="center" prop="processCreateTime" :show-overflow-tooltip="true"/>
|
|
|
- <el-table-column :label="$t('待办任务')+' ' + $t('名称')" align="center" prop="taskName" :show-overflow-tooltip="true"/>
|
|
|
- <el-table-column :label="$t('待办任务')+' ' + $t('创建时间')" align="center" prop="taskCreateTime" :show-overflow-tooltip="true"/>
|
|
|
- <el-table-column :label="$t('申请编号')" align="center" prop="apNo" :show-overflow-tooltip="true">
|
|
|
+ <el-table-column label="流程ID" align="center" prop="processId" :show-overflow-tooltip="true"/>
|
|
|
+ <el-table-column label="流程名称" align="center" prop="processName" :show-overflow-tooltip="true"/>
|
|
|
+ <el-table-column label="流程创建时间" align="center" prop="processCreateTime" :show-overflow-tooltip="true"/>
|
|
|
+ <el-table-column label="待办任务名称" align="center" prop="taskName" :show-overflow-tooltip="true"/>
|
|
|
+ <el-table-column label="待办任务创建时间" align="center" prop="taskCreateTime" :show-overflow-tooltip="true"/>
|
|
|
+ <el-table-column label="申请编号" align="center" prop="apNo" :show-overflow-tooltip="true">
|
|
|
<!-- <template slot-scope="scope">-->
|
|
|
<!-- <span v-if="scope.row.processName === ($t('事件') + $t('审批流程')) ">{{scope.row.tApproveAccident.approveNo}}</span>-->
|
|
|
<!-- <span v-if="scope.row.processName === ($t('重大隐患') + $t('审批流程') )|| scope.row.processName === ($t('普通隐患') + $t('审批流程') )">{{scope.row.tApprove.approveNo}}</span>-->
|
|
|
<!-- </template>-->
|
|
|
</el-table-column>
|
|
|
- <el-table-column :label="$t('操作')" align="center" width="120" class-name="small-padding fixed-width">
|
|
|
+ <el-table-column label="操作" align="center" width="120" class-name="small-padding fixed-width">
|
|
|
<template slot-scope="scope">
|
|
|
<el-button
|
|
|
size="mini"
|
|
|
type="text"
|
|
|
icon="el-icon-edit"
|
|
|
@click="addOrUpdateHandle(scope.row)"
|
|
|
- >{{ $t('处理') }}</el-button>
|
|
|
+ >处理</el-button>
|
|
|
<el-button
|
|
|
size="mini"
|
|
|
type="text"
|
|
|
@click="processImg(scope.row.processId)"
|
|
|
- >{{ $t('流程图') }}</el-button>
|
|
|
+ >流程图</el-button>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
|
|
|
- <pagination
|
|
|
- v-show="total>0"
|
|
|
- :total="total"
|
|
|
- :page.sync="queryParams.pageNum"
|
|
|
- :limit.sync="queryParams.pageSize"
|
|
|
- @pagination="getList"
|
|
|
- />
|
|
|
+ <!--<pagination-->
|
|
|
+ <!--v-show="total>0"-->
|
|
|
+ <!--:total="total"-->
|
|
|
+ <!--:page.sync="queryParams.pageNum"-->
|
|
|
+ <!--:limit.sync="queryParams.pageSize"-->
|
|
|
+ <!--@pagination="getList"-->
|
|
|
+ <!--/>-->
|
|
|
|
|
|
- <!-- 弹窗, 新增 / 修改 -->
|
|
|
- <div v-if="addOrUpdateVisible">
|
|
|
- <el-dialog :close-on-click-modal="false" v-dialogDrag :visible.sync="addOrUpdateVisible" :destroy-on-close="true">
|
|
|
- <add-or-update v-if="this.infoprocessName === ($t('重大隐患')+' '+ $t('审批流程') )|| this.infoprocessName === ($t('普通隐患')+' ' + $t('审批流程') )" :info="approveInfo"></add-or-update>
|
|
|
- <accident v-if="this.infoprocessName === ($t('事件')+ $t('审批流程'))" :info="approveInfo" @recordInfo="approveChange($event)"></accident>
|
|
|
- <el-form>
|
|
|
- <el-form-item :label="$t('上传措施前照片')" prop="before" v-if="this.infoTaskName === '执行人'">
|
|
|
- <el-upload
|
|
|
- ref="uploadbefore"
|
|
|
- :limit="1"
|
|
|
- :headers="uploadbefore.headers"
|
|
|
- :action="uploadbefore.url"
|
|
|
- :disabled="uploadbefore.isUploading"
|
|
|
- :on-progress="handleFileUploadProgressBefore"
|
|
|
- :on-success="handleFileSuccessBefore"
|
|
|
- :auto-upload="true"
|
|
|
- drag
|
|
|
- >
|
|
|
- <i class="el-icon-upload"></i>
|
|
|
- <div class="el-upload__text">
|
|
|
- {{ $t('将文件拖到此处，或') }}
|
|
|
- <em>{{ $t('点击上传') }}</em>
|
|
|
- </div>
|
|
|
- </el-upload>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item :label="$t('上传措施后照片')" prop="after" v-if="this.infoTaskName === $t('执行人')">
|
|
|
- <el-upload
|
|
|
- ref="uploadafter"
|
|
|
- :limit="1"
|
|
|
- :headers="uploadafter.headers"
|
|
|
- :action="uploadafter.url"
|
|
|
- :disabled="uploadafter.isUploading"
|
|
|
- :on-progress="handleFileUploadProgressAfter"
|
|
|
- :on-success="handleFileSuccessAfter"
|
|
|
- drag
|
|
|
- >
|
|
|
- <i class="el-icon-upload"></i>
|
|
|
- <div class="el-upload__text">
|
|
|
- {{ $t('将文件拖到此处，或') }}
|
|
|
- <em>{{ $t('点击上传') }}</em>
|
|
|
- </div>
|
|
|
- </el-upload>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item :label="$t('审批意见')" prop="comment">
|
|
|
- <el-input v-model="comment" :placeholder="$t('请输入') + $t('审批意见')" maxlength="100" show-word-limit></el-input>
|
|
|
- </el-form-item>
|
|
|
- </el-form>
|
|
|
- <span v-if="this.infoprocessName === ($t('重大隐患')+' ' + $t('审批流程') ) || this.infoprocessName === ($t('普通隐患')+' ' + $t('审批流程') )" slot="footer">
|
|
|
- <span v-if="this.infoTaskName === $t('执行人')" class="dialog-footer">
|
|
|
- <el-button type="primary" @click="dataFormSubmit(1)">{{ $t('已完成') }}</el-button>
|
|
|
- <el-button type="danger" @click="dataFormSubmit(0)">{{ $t('无法执行') }}</el-button>
|
|
|
- </span>
|
|
|
- <span v-if="this.infoTaskName === $t('验证人')" class="dialog-footer">
|
|
|
- <el-button type="primary" @click="dataFormSubmit(1)">{{ $t('通过') }}</el-button>
|
|
|
- <el-button type="danger" @click="dataFormSubmit(0)">{{ $t('无效') }}</el-button>
|
|
|
- <el-button type="warning" @click="dataFormSubmit(2)">{{ $t('未达标') }}</el-button>
|
|
|
- </span>
|
|
|
- <span v-if="this.infoTaskName === $t('记录人')" class="dialog-footer">
|
|
|
- <el-button type="primary" @click="dataFormSubmit(1)">{{ $t('重新提交') }}</el-button>
|
|
|
- </span>
|
|
|
- <span v-if="this.infoTaskName === $t('确认')" class="dialog-footer">
|
|
|
- <el-button type="primary" @click="dataFormSubmit(1)">{{ $t('确认') }}</el-button>
|
|
|
- <el-button type="danger" @click="dataFormSubmit(0)">{{ $t('确认')+' ' + $t('不通过') }}</el-button>
|
|
|
- </span>
|
|
|
- </span>
|
|
|
- <span v-if="this.infoprocessName === ($t('事件') + $t('审批流程'))" slot="footer">
|
|
|
- <span v-if="this.infoTaskName === $t('记录人')" class="dialog-footer">
|
|
|
- <el-button type="primary" @click="dataFormSubmit(1)">{{ $t('提交') }}</el-button>
|
|
|
- </span>
|
|
|
- </span>
|
|
|
- </el-dialog>
|
|
|
- </div>
|
|
|
+ <!--<!– 弹窗, 新增 / 修改 –>-->
|
|
|
+ <!--<div v-if="addOrUpdateVisible">-->
|
|
|
+ <!--<el-dialog :close-on-click-modal="false" v-dialogDrag :visible.sync="addOrUpdateVisible" :destroy-on-close="true">-->
|
|
|
+ <!--<add-or-update v-if="this.infoprocessName === ($t('重大隐患')+' '+ $t('审批流程') )|| this.infoprocessName === ($t('普通隐患')+' ' + $t('审批流程') )" :info="approveInfo"></add-or-update>-->
|
|
|
+ <!--<accident v-if="this.infoprocessName === ($t('事件')+ $t('审批流程'))" :info="approveInfo" @recordInfo="approveChange($event)"></accident>-->
|
|
|
+ <!--<el-form>-->
|
|
|
+ <!--<el-form-item :label="$t('上传措施前照片')" prop="before" v-if="this.infoTaskName === '执行人'">-->
|
|
|
+ <!--<el-upload-->
|
|
|
+ <!--ref="uploadbefore"-->
|
|
|
+ <!--:limit="1"-->
|
|
|
+ <!--:headers="uploadbefore.headers"-->
|
|
|
+ <!--:action="uploadbefore.url"-->
|
|
|
+ <!--:disabled="uploadbefore.isUploading"-->
|
|
|
+ <!--:on-progress="handleFileUploadProgressBefore"-->
|
|
|
+ <!--:on-success="handleFileSuccessBefore"-->
|
|
|
+ <!--:auto-upload="true"-->
|
|
|
+ <!--drag-->
|
|
|
+ <!-->-->
|
|
|
+ <!--<i class="el-icon-upload"></i>-->
|
|
|
+ <!--<div class="el-upload__text">-->
|
|
|
+ <!--{{ $t('将文件拖到此处，或') }}-->
|
|
|
+ <!--<em>{{ $t('点击上传') }}</em>-->
|
|
|
+ <!--</div>-->
|
|
|
+ <!--</el-upload>-->
|
|
|
+ <!--</el-form-item>-->
|
|
|
+ <!--<el-form-item :label="$t('上传措施后照片')" prop="after" v-if="this.infoTaskName === $t('执行人')">-->
|
|
|
+ <!--<el-upload-->
|
|
|
+ <!--ref="uploadafter"-->
|
|
|
+ <!--:limit="1"-->
|
|
|
+ <!--:headers="uploadafter.headers"-->
|
|
|
+ <!--:action="uploadafter.url"-->
|
|
|
+ <!--:disabled="uploadafter.isUploading"-->
|
|
|
+ <!--:on-progress="handleFileUploadProgressAfter"-->
|
|
|
+ <!--:on-success="handleFileSuccessAfter"-->
|
|
|
+ <!--drag-->
|
|
|
+ <!-->-->
|
|
|
+ <!--<i class="el-icon-upload"></i>-->
|
|
|
+ <!--<div class="el-upload__text">-->
|
|
|
+ <!--{{ $t('将文件拖到此处，或') }}-->
|
|
|
+ <!--<em>{{ $t('点击上传') }}</em>-->
|
|
|
+ <!--</div>-->
|
|
|
+ <!--</el-upload>-->
|
|
|
+ <!--</el-form-item>-->
|
|
|
+ <!--<el-form-item :label="$t('审批意见')" prop="comment">-->
|
|
|
+ <!--<el-input v-model="comment" :placeholder="$t('请输入') + $t('审批意见')" maxlength="100" show-word-limit></el-input>-->
|
|
|
+ <!--</el-form-item>-->
|
|
|
+ <!--</el-form>-->
|
|
|
+ <!--<span v-if="this.infoprocessName === ($t('重大隐患')+' ' + $t('审批流程') ) || this.infoprocessName === ($t('普通隐患')+' ' + $t('审批流程') )" slot="footer">-->
|
|
|
+ <!--<span v-if="this.infoTaskName === $t('执行人')" class="dialog-footer">-->
|
|
|
+ <!--<el-button type="primary" @click="dataFormSubmit(1)">{{ $t('已完成') }}</el-button>-->
|
|
|
+ <!--<el-button type="danger" @click="dataFormSubmit(0)">{{ $t('无法执行') }}</el-button>-->
|
|
|
+ <!--</span>-->
|
|
|
+ <!--<span v-if="this.infoTaskName === $t('验证人')" class="dialog-footer">-->
|
|
|
+ <!--<el-button type="primary" @click="dataFormSubmit(1)">{{ $t('通过') }}</el-button>-->
|
|
|
+ <!--<el-button type="danger" @click="dataFormSubmit(0)">{{ $t('无效') }}</el-button>-->
|
|
|
+ <!--<el-button type="warning" @click="dataFormSubmit(2)">{{ $t('未达标') }}</el-button>-->
|
|
|
+ <!--</span>-->
|
|
|
+ <!--<span v-if="this.infoTaskName === $t('记录人')" class="dialog-footer">-->
|
|
|
+ <!--<el-button type="primary" @click="dataFormSubmit(1)">{{ $t('重新提交') }}</el-button>-->
|
|
|
+ <!--</span>-->
|
|
|
+ <!--<span v-if="this.infoTaskName === $t('确认')" class="dialog-footer">-->
|
|
|
+ <!--<el-button type="primary" @click="dataFormSubmit(1)">{{ $t('确认') }}</el-button>-->
|
|
|
+ <!--<el-button type="danger" @click="dataFormSubmit(0)">{{ $t('确认')+' ' + $t('不通过') }}</el-button>-->
|
|
|
+ <!--</span>-->
|
|
|
+ <!--</span>-->
|
|
|
+ <!--<span v-if="this.infoprocessName === ($t('事件') + $t('审批流程'))" slot="footer">-->
|
|
|
+ <!--<span v-if="this.infoTaskName === $t('记录人')" class="dialog-footer">-->
|
|
|
+ <!--<el-button type="primary" @click="dataFormSubmit(1)">{{ $t('提交') }}</el-button>-->
|
|
|
+ <!--</span>-->
|
|
|
+ <!--</span>-->
|
|
|
+ <!--</el-dialog>-->
|
|
|
+ <!--</div>-->
|
|
|
|
|
|
- <add-or-update v-if="specDealVisible" ref="specDeal" @refreshDataList="getList"></add-or-update>
|
|
|
- <spec-modify v-if="specModifyDealVisible" ref="specModifyDeal" @refreshDataList="getList"></spec-modify>
|
|
|
- <spec-training-plan v-if="specTrainingPlanDealVisible" ref="specTrainingPlanDeal" @refreshDataList="getList"></spec-training-plan>
|
|
|
- <process-img v-if="processImgVisible" ref="processImg" @refreshDataList="getList"></process-img>
|
|
|
- <intact-resolve v-if="intactResolveVisible" ref="intactResolveDeal" @refreshDataList="getList"></intact-resolve>
|
|
|
- <kekao-resolve v-if="kekaoResolveVisible" ref="kekaoResolveDeal" @refreshDataList="getList"></kekao-resolve>
|
|
|
- <spec-maintenance v-if="specMaintenanceVisible" ref="specMaintenance" @refreshDataList="getList"></spec-maintenance>
|
|
|
- <invoice-detail v-if="invoiceDetailVisible" ref="invoiceDetail" @refreshDataList="getList"></invoice-detail>
|
|
|
- <offlinevalve-detail v-if="offlinevalveDetailVisible" ref="offlinevalveDetail" @refreshDataList="getList"></offlinevalve-detail>
|
|
|
- <safetychange-detail v-if="safetychangeDetailVisible" ref="safetychangeDetail" @refreshDataList="getList"></safetychange-detail>
|
|
|
- <sai-apply-detail v-if="saiApplyVisible" ref="saiApplyDetail" @refreshDataList="getList"></sai-apply-detail>
|
|
|
+ <!--<add-or-update v-if="specDealVisible" ref="specDeal" @refreshDataList="getList"></add-or-update>-->
|
|
|
+ <!--<spec-modify v-if="specModifyDealVisible" ref="specModifyDeal" @refreshDataList="getList"></spec-modify>-->
|
|
|
+ <!--<spec-training-plan v-if="specTrainingPlanDealVisible" ref="specTrainingPlanDeal" @refreshDataList="getList"></spec-training-plan>-->
|
|
|
+ <!--<process-img v-if="processImgVisible" ref="processImg" @refreshDataList="getList"></process-img>-->
|
|
|
+ <!--<intact-resolve v-if="intactResolveVisible" ref="intactResolveDeal" @refreshDataList="getList"></intact-resolve>-->
|
|
|
+ <!--<kekao-resolve v-if="kekaoResolveVisible" ref="kekaoResolveDeal" @refreshDataList="getList"></kekao-resolve>-->
|
|
|
+ <!--<spec-maintenance v-if="specMaintenanceVisible" ref="specMaintenance" @refreshDataList="getList"></spec-maintenance>-->
|
|
|
+ <!--<invoice-detail v-if="invoiceDetailVisible" ref="invoiceDetail" @refreshDataList="getList"></invoice-detail>-->
|
|
|
+ <!--<offlinevalve-detail v-if="offlinevalveDetailVisible" ref="offlinevalveDetail" @refreshDataList="getList"></offlinevalve-detail>-->
|
|
|
+ <!--<safetychange-detail v-if="safetychangeDetailVisible" ref="safetychangeDetail" @refreshDataList="getList"></safetychange-detail>-->
|
|
|
+ <!--<sai-apply-detail v-if="saiApplyVisible" ref="saiApplyDetail" @refreshDataList="getList"></sai-apply-detail>-->
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
|
@@ -156,21 +156,21 @@
|
|
|
|
|
|
export default {
|
|
|
name: "Pending",
|
|
|
- components: {
|
|
|
- SaiApplyDetail,
|
|
|
- SafetychangeDetail,
|
|
|
- OfflinevalveDetail,
|
|
|
- Treeselect,
|
|
|
- AddOrUpdate,
|
|
|
- SpecModify,
|
|
|
- Accident,
|
|
|
- SpecTrainingPlan,
|
|
|
- ProcessImg,
|
|
|
- IntactResolve,
|
|
|
- SpecMaintenance,
|
|
|
- KekaoResolve,
|
|
|
- InvoiceDetail
|
|
|
- },
|
|
|
+ // components: {
|
|
|
+ // SaiApplyDetail,
|
|
|
+ // SafetychangeDetail,
|
|
|
+ // OfflinevalveDetail,
|
|
|
+ // Treeselect,
|
|
|
+ // AddOrUpdate,
|
|
|
+ // SpecModify,
|
|
|
+ // Accident,
|
|
|
+ // SpecTrainingPlan,
|
|
|
+ // ProcessImg,
|
|
|
+ // IntactResolve,
|
|
|
+ // SpecMaintenance,
|
|
|
+ // KekaoResolve,
|
|
|
+ // InvoiceDetail
|
|
|
+ // },
|
|
|
data() {
|
|
|
return {
|
|
|
// 遮罩层
|
|
|
@@ -295,11 +295,11 @@
|
|
|
/** 查询隐患申请列表 */
|
|
|
getList() {
|
|
|
this.loading = true;
|
|
|
- getPendinglist(this.queryParams).then(response => {
|
|
|
- this.approvedangerList = response.rows;
|
|
|
- this.total = response.total;
|
|
|
+ // getPendinglist(this.queryParams).then(response => {
|
|
|
+ // this.approvedangerList = response.rows;
|
|
|
+ // this.total = response.total;
|
|
|
this.loading = false;
|
|
|
- });
|
|
|
+ // });
|
|
|
},
|
|
|
/** 查询部门下拉树结构 */
|
|
|
getTreeselect() {
|
