From 251a931a9e001be7c80d63de784ab14d04777200 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期五, 18 四月 2025 09:36:15 +0800
Subject: [PATCH] 1、我的待办页面 设备点检 分类审批弹窗功能逻辑开发并复用至我的已办、流程管理和点检工单页面 2、我的待办页面 设备周保流程 分类审批弹窗功能逻辑调整并复用至周保工单页面 3、周保工单页面以及详情列表功能bug修改 4、点检工单页面及新增弹窗功能bug修改 5、工作流我的待办页面 设备点检 分类详情弹窗样式调整为设备周保流程一致 6、工作流我的待办页面 设备周保流程 分类详情弹窗保养明细列表功能逻辑调整
---
src/views/flowable/workflow/weekMaintenance/WeekMaintenanceApprovalModal.vue | 775 ++++++++++++++++++++++++++++++++---------------------------
1 files changed, 418 insertions(+), 357 deletions(-)
diff --git a/src/views/flowable/workflow/weekMaintenance/WeekMaintenanceApprovalModal.vue b/src/views/flowable/workflow/weekMaintenance/WeekMaintenanceApprovalModal.vue
index 5303ee7..e853f82 100644
--- a/src/views/flowable/workflow/weekMaintenance/WeekMaintenanceApprovalModal.vue
+++ b/src/views/flowable/workflow/weekMaintenance/WeekMaintenanceApprovalModal.vue
@@ -8,16 +8,17 @@
switchFullscreen
@ok="handleOk"
@cancel="handleCancel"
+ centered
cancelText="鍏抽棴">
- <a-spin :spinning="confirmLoading">
+ <a-spin :spinning="spinning">
<a-form-model ref="form" :model="model" :rules="validatorRules">
<a-divider orientation="center" style="font-size: large;font-style: italic;color: #66aeed;"> 淇濆吇鍩虹淇℃伅
</a-divider>
<a-row :gutter="24">
<a-col :span="8">
<a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="orderNum" label="宸ュ崟鍙�">
- <a-input placeholder="宸ュ崟鍙风郴缁熻嚜鍔ㄧ敓鎴�" v-model="model.orderNum" disabled />
+ <a-input placeholder="宸ュ崟鍙风郴缁熻嚜鍔ㄧ敓鎴�" v-model="model.orderNum" disabled/>
</a-form-model-item>
</a-col>
<a-col :span="8">
@@ -30,7 +31,7 @@
</a-col>
<a-col :span="8">
<a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="standardName" label="鏍囧噯鍚嶇О">
- <a-input placeholder="閫夋嫨璁惧鍚庤嚜鍔ㄥ甫鍑�" v-model="model.standardName" disabled />
+ <a-input placeholder="閫夋嫨璁惧鍚庤嚜鍔ㄥ甫鍑�" v-model="model.standardName" disabled/>
</a-form-model-item>
</a-col>
</a-row>
@@ -39,24 +40,24 @@
<a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="maintenanceDate" label="淇濆吇鏃ユ湡">
<a-date-picker placeholder="璇烽�夋嫨璁″垝淇濆吇鏃ユ湡" v-model="model.maintenanceDate" format="YYYY-MM-DD"
disabled
- style="width: 100%" />
+ style="width: 100%"/>
</a-form-model-item>
</a-col>
<a-col :span="8">
<a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="operator" label="淇濆吇浜�">
<j-search-select-tag v-model="model.operator" placeholder="璇烽�夋嫨淇濆吇浜�" disabled
- :dictOptions="maintenanceOperatorOptions" />
+ :dictOptions="maintenanceOperatorOptions"/>
</a-form-model-item>
</a-col>
<a-col :span="8">
<a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="maintenancePeriod" label="淇濆吇鍛ㄦ湡">
- <a-input placeholder="閫夋嫨璁惧鍚庤嚜鍔ㄥ甫鍑�" v-model="model.maintenancePeriod" disabled />
+ <a-input placeholder="閫夋嫨璁惧鍚庤嚜鍔ㄥ甫鍑�" v-model="model.maintenancePeriod" disabled/>
</a-form-model-item>
</a-col>
</a-row>
<a-row :gutter="24">
<a-form-model-item :labelCol="labelColLong" :wrapperCol="wrapperColLong" prop="remark" label="澶囨敞">
- <a-textarea placeholder="璇疯緭鍏ュ娉�" v-model="model.remark" disabled />
+ <a-textarea placeholder="璇疯緭鍏ュ娉�" v-model="model.remark" disabled/>
</a-form-model-item>
</a-row>
<a-row :gutter="24">
@@ -65,13 +66,13 @@
:isMultiple="true"
file-type="image"
:disabled="confirmDisable"
- v-model="model.imageFilesResult" />
+ v-model="model.imageFilesResult"/>
</a-form-model-item>
</a-row>
<a-divider orientation="center" style="font-size: large;font-style: italic;color: #66aeed;"> 淇濆吇椤逛俊鎭�
</a-divider>
<a-row :gutter="24">
- <a-tabs>
+ <a-tabs v-model="activeTabKey">
<a-tab-pane key="1" tab="淇濆吇椤规槑缁�">
<j-vxe-table
ref="editableDetailTable"
@@ -92,39 +93,44 @@
placeholder="璇烽�夋嫨淇濆吇缁撴灉"
:disabled="disableSubmit || confirmDisable"
@change="handleInspectionResultSelectChange($event,props.row)"
- style="width: 100%" />
+ style="width: 100%"/>
</template>
<template v-slot:exceptionDescription="props">
<a-textarea style="height: 32px" v-model="props.row.exceptionDescription"
- :disabled="disableSubmit || confirmDisable || !props.row.maintenanceResult || props.row.maintenanceResult === '1'" />
+ :disabled="disableSubmit || confirmDisable || !props.row.maintenanceResult || props.row.maintenanceResult === '1'"/>
</template>
<template v-slot:reportFlag="props">
<j-dict-select-tag v-model="props.row.reportFlag"
:disabled="disableSubmit || confirmDisable || !props.row.maintenanceResult || props.row.maintenanceResult === '1'"
dictCode="yn"
- style="width: 100%" />
+ style="width: 100%"/>
</template>
</j-vxe-table>
</a-tab-pane>
- <a-tab-pane v-if="!disableSubmit" key='2' tab='娴佺▼鑺傜偣'>
- <a-card :bordered="false">
- <a-timeline>
- <a-timeline-item v-for="(item,index) in taskData" :key="index">
- <div>
- <h3 style="font-weight: bold;">{{item.taskName}}</h3>
- <div>澶勭悊浜猴細{{item.assignee_dictText}}</div>
- <div v-if="index !==0">澶勭悊鏃堕暱锛歿{item.duration}}</div>
- <div v-if="item.name !== '鎻愪氦鐢宠'">澶勭悊绫诲瀷锛歿{item.sequenceFlowName}}</div>
- <div v-if="item.description">澶勭悊鎰忚锛歿{item.description}}</div>
- </div>
- </a-timeline-item>
- </a-timeline>
- </a-card>
- </a-tab-pane>
- <a-button v-if="!disableSubmit || selectedRowKeys.length > 0" slot="tabBarExtraContent" type="primary"
- @click="handleSelectAllInspectionResult">淇濆吇姝ｅ父
+ <template v-if="selectShenpiData.procInstId">
+ <a-tab-pane key='2' tab='娴佺▼鑺傜偣'>
+ <a-card :bordered="false">
+ <a-timeline>
+ <a-timeline-item v-for="(item,index) in taskData" :key="index">
+ <div>
+ <h3 style="font-weight: bold;">{{item.taskName}}</h3>
+ <div>澶勭悊浜猴細{{item.assignee_dictText}}</div>
+ <div v-if="index !==0">澶勭悊鏃堕暱锛歿{item.duration}}</div>
+ <div v-if="item.name !== '鎻愪氦鐢宠'">澶勭悊绫诲瀷锛歿{item.sequenceFlowName}}</div>
+ <div v-if="item.description">澶勭悊鎰忚锛歿{item.description}}</div>
+ </div>
+ </a-timeline-item>
+ </a-timeline>
+ </a-card>
+ </a-tab-pane>
+ <a-tab-pane key='3' tab='娴佺▼鍥�'>
+ <img :src="imageSrc" alt="Fetched Image"/>-->
+ </a-tab-pane>
+ </template>
+ <a-button v-if="!disableSubmit &&!confirmDisable&& selectedRowKeys.length > 0" slot="tabBarExtraContent"
+ type="primary" @click="handleSelectAllInspectionResult">淇濆吇姝ｅ父
</a-button>
</a-tabs>
</a-row>
@@ -134,12 +140,14 @@
<a-row :gutter="24">
<a-col :span="12">
<a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="confirmDealType" label="纭绫诲瀷">
- <j-dict-select-tag type='radio' v-model='model.confirmDealType' dictCode='approved_rejected' placeholder="璇烽�夋嫨澶勭悊绫诲瀷" :disabled="disableSubmit || initialAcceptanceDisable" />
+ <j-dict-select-tag type='radio' v-model='model.confirmDealType' dictCode='approved_rejected'
+ placeholder="璇烽�夋嫨澶勭悊绫诲瀷" :disabled="disableSubmit || initialAcceptanceDisable"/>
</a-form-model-item>
</a-col>
<a-col :span="12">
<a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="confirmComment" label="纭鎰忚">
- <a-textarea placeholder="璇疯緭鍏ユ剰瑙�" v-model="model.confirmComment" :disabled="disableSubmit || initialAcceptanceDisable" />
+ <a-textarea placeholder="璇疯緭鍏ユ剰瑙�" v-model="model.confirmComment"
+ :disabled="disableSubmit || initialAcceptanceDisable"/>
</a-form-model-item>
</a-col>
</a-row>
@@ -149,16 +157,19 @@
</a-divider>
<a-row :gutter="24">
<a-col :span="12">
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="initialAcceptanceComment" label="鍒濋獙鏀舵剰瑙�">
- <a-textarea placeholder="璇疯緭鍏ユ剰瑙�" v-model="model.initialAcceptanceComment" :disabled="disableSubmit || finalAcceptanceDisable" />
+ <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="initialAcceptanceComment"
+ label="鍒濋獙鏀舵剰瑙�">
+ <a-textarea placeholder="璇疯緭鍏ユ剰瑙�" v-model="model.initialAcceptanceComment"
+ :disabled="disableSubmit || finalAcceptanceDisable"/>
</a-form-model-item>
</a-col>
<a-col :span="12">
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="initialAcceptanceFilesResult" label="鍒濋獙鏀堕檮浠�">
+ <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="initialAcceptanceFilesResult"
+ label="鍒濋獙鏀堕檮浠�">
<lx-upload :returnUrl="false"
:isMultiple="true"
:disabled="disableSubmit || finalAcceptanceDisable"
- v-model="model.initialAcceptanceFilesResult" />
+ v-model="model.initialAcceptanceFilesResult"/>
</a-form-model-item>
</a-col>
</a-row>
@@ -168,16 +179,19 @@
</a-divider>
<a-row :gutter="24">
<a-col :span="12">
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="finalAcceptanceComment" label="缁堥獙鏀舵剰瑙�">
- <a-textarea placeholder="璇疯緭鍏ユ剰瑙�" v-model="model.finalAcceptanceComment" :disabled="disableSubmit || completionDisable" />
+ <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="finalAcceptanceComment"
+ label="缁堥獙鏀舵剰瑙�">
+ <a-textarea placeholder="璇疯緭鍏ユ剰瑙�" v-model="model.finalAcceptanceComment"
+ :disabled="disableSubmit || completionDisable"/>
</a-form-model-item>
</a-col>
<a-col :span="12">
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="finalAcceptanceFilesResult" label="缁堥獙鏀堕檮浠�">
+ <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="finalAcceptanceFilesResult"
+ label="缁堥獙鏀堕檮浠�">
<lx-upload :returnUrl="false"
:isMultiple="true"
:disabled="disableSubmit || completionDisable"
- v-model="model.finalAcceptanceFilesResult" />
+ v-model="model.finalAcceptanceFilesResult"/>
</a-form-model-item>
</a-col>
</a-row>
@@ -188,339 +202,386 @@
</template>
<script>
-import { getAction, httpAction } from '@/api/manage'
-import { JVxeTableModelMixin } from '@/mixins/JVxeTableModelMixin.js'
-import { JVXETypes } from '@comp/jeecg/JVxeTable'
-import MaintenanceEquipmentSelect from '@views/eam/equipment/modules/MaintenanceEquipmentSelect'
+ import { downFile, getAction, httpAction } from '@/api/manage'
+ import { JVxeTableModelMixin } from '@/mixins/JVxeTableModelMixin.js'
+ import { JVXETypes } from '@comp/jeecg/JVxeTable'
+ import MaintenanceEquipmentSelect from '@views/eam/equipment/modules/MaintenanceEquipmentSelect'
-export default {
- name: 'WeekMaintenanceApprovalModal',
- mixins: [JVxeTableModelMixin],
- components: {
- MaintenanceEquipmentSelect
- },
- data() {
- return {
- title: '鎿嶄綔',
- visible: false,
- //鐘舵�佹帶鍒�
- //淇濆吇涓� 涓嶅彲缂栬緫
- // confirmDisable: false,
- // initialAcceptanceDisable: false,
- // finalAcceptanceDisable: false,
- editable: false,
- model: {},
- maintenanceCategory: 'WEEK_MAINTENANCE',
- maintenanceOperatorOptions: [],
- labelCol: {
- xs: { span: 24 },
- sm: { span: 6 }
- },
- wrapperCol: {
- xs: { span: 24 },
- sm: { span: 16 }
- },
- labelColLong: {
- xs: { span: 24 },
- sm: { span: 2 }
- },
- wrapperColLong: {
- xs: { span: 24 },
- sm: { span: 21 }
- },
- confirmLoading: false,
- validatorRules: {
- confirmDealType: [
- { required: true, message: '璇烽�夋嫨閫氳繃鎴栭┏鍥�!' }
- ],
- confirmComment: [
- { required: true, message: '璇疯緭鍏ョ‘璁ゆ剰瑙�!' }
- ],
- initialAcceptanceComment: [
- { required: true, message: '璇疯緭鍏ュ垵楠屾敹鎰忚!' }
- ],
- finalAcceptanceComment: [
- { required: true, message: '璇疯緭鍏ョ粓楠屾敹鎰忚!' }
- ],
- },
- url: {
- queryById: '/eam/weekMaintenanceOrder/queryById',
- detail: '/eam/weekMaintenanceOrderDetail/queryList',
- approval: '/eam/weekMaintenanceOrder/approval',
- userSelect: '/eam/user_select/list',
- queryHisTaskList: '/assign/flow/queryHisTaskList',
- },
- disableSubmit: false,
- taskData: [],
- isDisplayBmp: false,
- showBmpButtonLoading: false,
- selectedRowKeys: [],
- detail: {
- loading: false,
- dataSource: [],
- columns: [
- {
- title: 'ID',
- key: 'id',
- type: JVXETypes.hidden
- },
- {
- title: 'orderId',
- key: 'orderId',
- type: JVXETypes.hidden
- },
- {
- title: '搴忓彿',
- key: 'itemCode',
- type: JVXETypes.normal,
- width: '5%',
- align: 'center'
- },
- {
- title: '淇濆吇椤�',
- key: 'itemName',
- type: JVXETypes.normal,
- width: '10%',
- align: 'center'
- },
- {
- title: '瀛愪繚鍏婚」',
- key: 'subItemName',
- type: JVXETypes.normal,
- width: '10%',
- align: 'center'
- },
- {
- title: '淇濆吇瑕佹眰',
- key: 'itemDemand',
- type: JVXETypes.normal,
- width: '20%',
- align: 'center'
- },
- {
- title: '淇濆吇缁撴灉',
- key: 'maintenanceResult',
- type: JVXETypes.slot,
- width: '10%',
- align: 'center',
- slotName: 'maintenanceResult',
- validateRules: [
- { required: true, message: '淇濆吇缁撴灉涓嶈兘涓虹┖锛�' }
- ]
- },
- {
- title: '寮傚父鎻忚堪',
- key: 'exceptionDescription',
- type: JVXETypes.slot,
- width: '20%',
- align: 'center',
- slotName: 'exceptionDescription',
- },
- {
- title: '鏄惁鎶ヤ慨',
- key: 'reportFlag',
- type: JVXETypes.slot,
- width: '10%',
- align: 'center',
- slotName: 'reportFlag',
+ export default {
+ name: 'WeekMaintenanceApprovalModal',
+ mixins: [JVxeTableModelMixin],
+ components: {
+ MaintenanceEquipmentSelect
+ },
+ props: {
+ selectShenpiData: {
+ type: Object
+ }
+ },
+ data() {
+ return {
+ title: '鎿嶄綔',
+ visible: false,
+ //鐘舵�佹帶鍒�
+ //淇濆吇涓� 涓嶅彲缂栬緫
+ // confirmDisable: false,
+ // initialAcceptanceDisable: false,
+ // finalAcceptanceDisable: false,
+ editable: false,
+ model: {},
+ maintenanceCategory: 'WEEK_MAINTENANCE',
+ maintenanceOperatorOptions: [],
+ labelCol: {
+ xs: { span: 24 },
+ sm: { span: 6 }
+ },
+ wrapperCol: {
+ xs: { span: 24 },
+ sm: { span: 16 }
+ },
+ labelColLong: {
+ xs: { span: 24 },
+ sm: { span: 2 }
+ },
+ wrapperColLong: {
+ xs: { span: 24 },
+ sm: { span: 21 }
+ },
+ confirmLoading: false,
+ spinning: false,
+ imageSrc: null,
+ activeTabKey: '1',
+ validatorRules: {
+ confirmDealType: [
+ { required: true, message: '璇烽�夋嫨閫氳繃鎴栭┏鍥�!' }
+ ],
+ confirmComment: [
+ { required: true, message: '璇疯緭鍏ョ‘璁ゆ剰瑙�!' }
+ ],
+ initialAcceptanceComment: [
+ { required: true, message: '璇疯緭鍏ュ垵楠屾敹鎰忚!' }
+ ],
+ finalAcceptanceComment: [
+ { required: true, message: '璇疯緭鍏ョ粓楠屾敹鎰忚!' }
+ ]
+ },
+ url: {
+ queryById: '/eam/weekMaintenanceOrder/queryById',
+ detail: '/eam/weekMaintenanceOrderDetail/queryList',
+ approval: '/eam/weekMaintenanceOrder/approval',
+ userSelect: '/eam/user_select/list',
+ queryHisTaskList: '/assign/flow/queryHisTaskList',
+ diagramView: '/assign/flow/diagramView'
+ },
+ disableSubmit: false,
+ taskData: [],
+ isDisplayBmp: false,
+ showBmpButtonLoading: false,
+ selectedRowKeys: [],
+ detail: {
+ loading: false,
+ dataSource: [],
+ columns: [
+ {
+ title: 'ID',
+ key: 'id',
+ type: JVXETypes.hidden
+ },
+ {
+ title: 'orderId',
+ key: 'orderId',
+ type: JVXETypes.hidden
+ },
+ {
+ title: '搴忓彿',
+ key: 'itemCode',
+ type: JVXETypes.normal,
+ width: '5%',
+ align: 'center'
+ },
+ {
+ title: '淇濆吇椤�',
+ key: 'itemName',
+ type: JVXETypes.normal,
+ width: '10%',
+ align: 'center'
+ },
+ {
+ title: '瀛愪繚鍏婚」',
+ key: 'subItemName',
+ type: JVXETypes.normal,
+ width: '10%',
+ align: 'center'
+ },
+ {
+ title: '淇濆吇瑕佹眰',
+ key: 'itemDemand',
+ type: JVXETypes.normal,
+ width: '20%',
+ align: 'center'
+ },
+ {
+ title: '淇濆吇缁撴灉',
+ key: 'maintenanceResult',
+ type: JVXETypes.slot,
+ width: '10%',
+ align: 'center',
+ slotName: 'maintenanceResult',
+ validateRules: [
+ { required: true, message: '淇濆吇缁撴灉涓嶈兘涓虹┖锛�' }
+ ]
+ },
+ {
+ title: '寮傚父鎻忚堪',
+ key: 'exceptionDescription',
+ type: JVXETypes.slot,
+ width: '20%',
+ align: 'center',
+ slotName: 'exceptionDescription',
+ validateRules: [
+ { handler: this.customValidator }
+ ]
+ },
+ {
+ title: '鏄惁鎶ヤ慨',
+ key: 'reportFlag',
+ type: JVXETypes.slot,
+ width: '10%',
+ align: 'center',
+ slotName: 'reportFlag',
+ validateRules: [
+ { handler: this.customValidator }
+ ]
+ }
+ ],
+ toolbarConfig: {
+ // prefix 鍓嶇紑锛泂uffix 鍚庣紑
+ slot: ['prefix', 'suffix'],
+ // add 鏂板鎸夐挳锛況emove 鍒犻櫎鎸夐挳锛沜learSelection 娓呯┖閫夋嫨鎸夐挳
+ btn: ['clearSelection']
}
- ],
- toolbarConfig: {
- // prefix 鍓嶇紑锛泂uffix 鍚庣紑
- slot: ['prefix', 'suffix'],
- // add 鏂板鎸夐挳锛況emove 鍒犻櫎鎸夐挳锛沜learSelection 娓呯┖閫夋嫨鎸夐挳
- btn: ['clearSelection']
}
}
- }
- },
- created() {
- },
- computed: {
- confirmDisable: function(){
- return ['WAIT_CONFIRM', 'WAIT_INITIAL_ACCEPTANCE', 'WAIT_FINAL_ACCEPTANCE', 'COMPLETE'].includes(this.model.maintenanceStatus);
},
- initialAcceptanceDisable: function() {
- return ['WAIT_INITIAL_ACCEPTANCE', 'WAIT_FINAL_ACCEPTANCE', 'COMPLETE'].includes(this.model.maintenanceStatus);
+ created() {
},
- finalAcceptanceDisable: function() {
- return ['WAIT_FINAL_ACCEPTANCE', 'COMPLETE'].includes(this.model.maintenanceStatus);
+ computed: {
+ confirmDisable: function() {
+ return ['WAIT_CONFIRM', 'WAIT_INITIAL_ACCEPTANCE', 'WAIT_FINAL_ACCEPTANCE', 'COMPLETE'].includes(this.model.maintenanceStatus)
+ },
+ initialAcceptanceDisable: function() {
+ return ['WAIT_INITIAL_ACCEPTANCE', 'WAIT_FINAL_ACCEPTANCE', 'COMPLETE'].includes(this.model.maintenanceStatus)
+ },
+ finalAcceptanceDisable: function() {
+ return ['WAIT_FINAL_ACCEPTANCE', 'COMPLETE'].includes(this.model.maintenanceStatus)
+ },
+ completionDisable: function() {
+ return ['COMPLETE', 'ABOLISH'].includes(this.model.maintenanceStatus)
+ }
},
- completionDisable: function() {
- return ['COMPLETE', 'ABOLISH'].includes(this.model.maintenanceStatus);
- }
- },
- methods: {
- async handleDetail(item) {
- this.loading = true
- this.visible = true
- this.detail.dataSource = []
- let taskDataList = await getAction(this.url.queryHisTaskList, { procInstId: item.procInstId });
- this.taskData = [...taskDataList.result];
- let res = await getAction(this.url.queryById, {id: item.dataId})
- this.model = Object.assign({}, res.result)
- if(this.model.imageFiles) {
- let obj = JSON.parse(this.model.imageFiles);
- this.model.imageFilesResult = [...obj];
- }
- if(this.model.initialAcceptanceFiles) {
- let obj = JSON.parse(this.model.initialAcceptanceFiles);
- this.model.initialAcceptanceFilesResult = [...obj];
- }
- if(this.model.finalAcceptanceFiles) {
- let obj = JSON.parse(this.model.finalAcceptanceFiles);
- this.model.finalAcceptanceFilesResult = [...obj];
- }
- this.model.dataId = item.dataId
- this.model.taskId = item.id
- this.model.userId = item.assignee
- this.model.instanceId = item.procInstId
- this.model.values = item.variables
- await this.loadDetail(item.dataId)
- this.loading = false
- },
- recordDetail(record) {
- this.loading = true
- this.visible = true
- this.detail.dataSource = []
- this.model = Object.assign({}, record)
- if(this.model.imageFiles) {
- let obj = JSON.parse(this.model.imageFiles);
- this.model.imageFilesResult = [...obj];
- }
- if(this.model.initialAcceptanceFiles) {
- let obj = JSON.parse(this.model.initialAcceptanceFiles);
- this.model.initialAcceptanceFilesResult = [...obj];
- }
- if(this.model.finalAcceptanceFiles) {
- let obj = JSON.parse(this.model.finalAcceptanceFiles);
- this.model.finalAcceptanceFilesResult = [...obj];
- }
- this.loadDetail(record.id)
- this.loading = false
- },
- close() {
- this.$emit('close')
- this.visible = false
- this.$refs.form.clearValidate()
- },
- async handleOk() {
- const that = this
- let errMap = await that.$refs.editableDetailTable.validateTable()
- if (errMap) {
- this.$message.warning('鏁版嵁鏍￠獙澶辫触锛�')
- return
- }
- // 瑙﹀彂琛ㄥ崟楠岃瘉
- this.$refs.form.validate(valid => {
- if (valid) {
- let tableData = that.$refs.editableDetailTable.getTableData();
+ methods: {
+ async handleDetail(item) {
+ this.initParams()
+ this.model = {}
+ if (item.procInstId) {
+ const { processDefinitionId, processInstanceId, processDefinitionKey, procInstId } = item
- let checkMsg = null;
- tableData.some(row => {
- if(!row.maintenanceResult) {
- checkMsg = '淇濆吇缁撴灉涓嶈兘涓虹┖锛�';
- return true;
- }
- if(row.maintenanceResult === '2' && (!row.exceptionDescription || !row.reportFlag)) {
- checkMsg = '淇濆吇缁撴灉涓哄紓甯革紝闇�瑕佸～鍐欏紓甯稿師鍥犲強鏄惁鎶ヤ慨锛�';
- return true;
- }
- })
- if(checkMsg) {
- that.$message.warning(checkMsg);
- return;
- }
+ let taskDataList = await getAction(this.url.queryHisTaskList, { procInstId })
+ this.taskData = [...taskDataList.result]
- that.model.tableDetailList = [...tableData]
-
- that.confirmLoading = true
- let httpurl = this.url.approval
- let method = 'put'
-
- httpAction(httpurl, this.model, method).then((res) => {
- if (res.success) {
- that.$message.success(res.message)
- that.$emit('searchReset')
- that.close()
- } else {
- that.$message.warning(res.message)
- }
- }).finally(() => {
- that.confirmLoading = false
- })
- } else {
- return false
+ downFile(this.url.diagramView, {
+ processDefinitionId,
+ processInstanceId,
+ TaskDefinitionKey: processDefinitionKey
+ }, 'get')
+ .then((res => {
+ const urlObject = window.URL.createObjectURL(new Blob([res]))
+ this.imageSrc = urlObject
+ }))
+ .catch(err => {
+ this.$notification.error({
+ message: '娑堟伅',
+ description: res.message
+ })
+ })
}
- })
- },
- handleCancel() {
- this.close()
- },
- autocompleteForm(selectObj) {
- this.$set(this.model, 'standardName', selectObj.standardName)
- this.$set(this.model, 'maintenancePeriod', selectObj.maintenancePeriod)
- this.$set(this.model, 'standardId', selectObj.id)
- this.$set(this.model, 'equipmentId', selectObj.equipmentId)
- // console.log('model', this.model)
- if (!this.model.id) {
- this.loadStandardDetail(selectObj.id)
- }
- this.loadMaintenanceOperatorList(this.model.equipmentId)
- },
- //鏍囧噯閫夋嫨鍙樺寲
- loadDetail(orderId) {
- if (orderId) {
- getAction(this.url.detail, { orderId: orderId }).then(res => {
- if (res.success) {
- this.detail.dataSource = [...res.result]
+ let res = await getAction(this.url.queryById, { id: item.dataId })
+ this.model = Object.assign({}, res.result)
+ if (this.model.imageFiles) {
+ let obj = JSON.parse(this.model.imageFiles)
+ this.model.imageFilesResult = [...obj]
+ }
+ if (this.model.initialAcceptanceFiles) {
+ let obj = JSON.parse(this.model.initialAcceptanceFiles)
+ this.model.initialAcceptanceFilesResult = [...obj]
+ }
+ if (this.model.finalAcceptanceFiles) {
+ let obj = JSON.parse(this.model.finalAcceptanceFiles)
+ this.model.finalAcceptanceFilesResult = [...obj]
+ }
+ this.model.dataId = item.dataId
+ this.model.taskId = item.id
+ this.model.userId = item.assignee
+ this.model.instanceId = item.procInstId
+ this.model.values = item.variables
+ await this.loadDetail(item.dataId)
+ },
+
+ recordDetail(record) {
+ this.initParams()
+ this.model = Object.assign({}, record)
+ if (this.model.imageFiles) {
+ let obj = JSON.parse(this.model.imageFiles)
+ this.model.imageFilesResult = [...obj]
+ }
+ if (this.model.initialAcceptanceFiles) {
+ let obj = JSON.parse(this.model.initialAcceptanceFiles)
+ this.model.initialAcceptanceFilesResult = [...obj]
+ }
+ if (this.model.finalAcceptanceFiles) {
+ let obj = JSON.parse(this.model.finalAcceptanceFiles)
+ this.model.finalAcceptanceFilesResult = [...obj]
+ }
+ this.loadDetail(record.id)
+ },
+
+ initParams() {
+ this.detail.dataSource = []
+ this.visible = true
+ this.activeTabKey = '1'
+ this.spinning = true
+ },
+
+ async handleOk() {
+ const that = this
+ let errMap = await that.$refs.editableDetailTable.validateTable()
+ if (errMap) {
+ this.$message.warning('鏁版嵁鏍￠獙澶辫触锛�')
+ return
+ }
+ // 瑙﹀彂琛ㄥ崟楠岃瘉
+ this.$refs.form.validate(valid => {
+ if (valid) {
+ let tableData = that.$refs.editableDetailTable.getTableData()
+
+ that.model.tableDetailList = [...tableData]
+
+ that.confirmLoading = spinnning = true
+ let httpurl = this.url.approval
+ let method = 'put'
+
+ httpAction(httpurl, this.model, method).then((res) => {
+ if (res.success) {
+ that.$message.success(res.message)
+ that.$emit('searchReset')
+ that.close()
+ } else {
+ that.$message.warning(res.message)
+ }
+ }).finally(() => {
+ that.confirmLoading = spinning = false
+ })
+ } else {
+ return false
}
})
- }
- },
- loadMaintenanceOperatorList(equipmentId) {
- this.maintenanceOperatorOptions = []
- let params = { positionCode: 'PCR0001' }
- if (equipmentId) {
- params.equipmentId = equipmentId
- }
- getAction(this.url.userSelect, params).then(res => {
- if (res.success) {
- this.maintenanceOperatorOptions = res.result.map(item => ({
- key: item.id,
- value: item.username,
- text: item.realname
- }))
+ },
+
+ autocompleteForm(selectObj) {
+ this.$set(this.model, 'standardName', selectObj.standardName)
+ this.$set(this.model, 'maintenancePeriod', selectObj.maintenancePeriod)
+ this.$set(this.model, 'standardId', selectObj.id)
+ this.$set(this.model, 'equipmentId', selectObj.equipmentId)
+ // console.log('model', this.model)
+ if (!this.model.id) {
+ this.loadStandardDetail(selectObj.id)
}
- })
- },
- handleInspectionResultSelectChange(value, record) {
- if (record.exceptionDescription) delete record.exceptionDescription
- if (record.reportFlag) delete record.reportFlag
- },
- // 鎵归噺閫夋嫨鎵�鏈夌偣妫�缁撴灉
- handleSelectAllInspectionResult() {
- this.selectedRowKeys.forEach(key => {
- const dataItem = this.detail.dataSource.find(item => item.id === key)
- if (dataItem && dataItem.maintenanceResult !== '1') {
- console.log('dataItem', dataItem)
- delete dataItem.exceptionDescription
- delete dataItem.reportFlag
- dataItem.maintenanceResult = '1'
+ this.loadMaintenanceOperatorList(this.model.equipmentId)
+ },
+
+ //鏍囧噯閫夋嫨鍙樺寲
+ loadDetail(orderId) {
+ if (orderId) {
+ getAction(this.url.detail, { orderId: orderId })
+ .then(res => {
+ if (res.success) {
+ this.detail.dataSource = [...res.result]
+ }
+ })
+ .finally(() => {
+ this.spinning = false
+ })
}
- })
- this.$refs.editableDetailTable.clearCheckboxRow()
- this.selectedRowKeys = []
- },
- /**
- * 琛ㄦ牸澶氶�夋鍙戠敓鏀瑰彉鏃惰Е鍙�
- * @param {selectedRowIds} 琛ㄦ牸涓凡閫夋嫨鐨処D鍒楄〃
- */
- handleTableSelectRowChange({ selectedRowIds }) {
- this.selectedRowKeys = selectedRowIds
- },
+ },
+
+ loadMaintenanceOperatorList(equipmentId) {
+ this.maintenanceOperatorOptions = []
+ let params = { positionCode: 'PCR0001' }
+ if (equipmentId) {
+ params.equipmentId = equipmentId
+ }
+ getAction(this.url.userSelect, params).then(res => {
+ if (res.success) {
+ this.maintenanceOperatorOptions = res.result.map(item => ({
+ key: item.id,
+ value: item.username,
+ text: item.realname
+ }))
+ }
+ })
+ },
+
+ handleInspectionResultSelectChange(value, record) {
+ if (record.exceptionDescription) delete record.exceptionDescription
+ if (record.reportFlag) delete record.reportFlag
+ },
+
+ // 鎵归噺閫夋嫨鎵�鏈夌偣妫�缁撴灉
+ handleSelectAllInspectionResult() {
+ this.selectedRowKeys.forEach(key => {
+ const dataItem = this.detail.dataSource.find(item => item.id === key)
+ if (dataItem && dataItem.maintenanceResult !== '1') {
+ console.log('dataItem', dataItem)
+ delete dataItem.exceptionDescription
+ delete dataItem.reportFlag
+ dataItem.maintenanceResult = '1'
+ }
+ })
+ this.$refs.editableDetailTable.clearCheckboxRow()
+ this.selectedRowKeys = []
+ },
+
+ /**
+ * 琛ㄦ牸澶氶�夋鍙戠敓鏀瑰彉鏃惰Е鍙�
+ * @param {selectedRowIds} 琛ㄦ牸涓凡閫夋嫨鐨処D鍒楄〃
+ */
+ handleTableSelectRowChange({ selectedRowIds }) {
+ this.selectedRowKeys = selectedRowIds
+ },
+
+ customValidator({ cellValue, row }, callback) {
+ if (row.maintenanceResult === '2') {
+ if (!cellValue) {
+ callback(false, '${title}涓嶈兘涓虹┖锛�') // false = 鏈�氳繃锛屽彲浠ヨ窡鑷畾涔夋彁绀�
+ } else {
+ callback(true) // true = 閫氳繃楠岃瘉
+ }
+ } else {
+ callback(true)
+ }
+ },
+
+ handleCancel() {
+ this.close()
+ },
+
+ close() {
+ this.$emit('close')
+ this.visible = false
+ this.$refs.form.clearValidate()
+ }
+ }
}
-}
</script>
<style lang="less" scoped>
--
Gitblit v1.9.3