From 3db6d5c4d17ab9942a5c89a167c1f06ca485f355 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期三, 16 七月 2025 21:21:14 +0800
Subject: [PATCH] 二保工单审批调整
---
src/views/flowable/workflow/thirdMaintenance/ThirdMaintenanceApprovalModal.vue | 499 +++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 352 insertions(+), 147 deletions(-)
diff --git a/src/views/flowable/workflow/thirdMaintenance/ThirdMaintenanceApprovalModal.vue b/src/views/flowable/workflow/thirdMaintenance/ThirdMaintenanceApprovalModal.vue
index 1747b37..8d86f59 100644
--- a/src/views/flowable/workflow/thirdMaintenance/ThirdMaintenanceApprovalModal.vue
+++ b/src/views/flowable/workflow/thirdMaintenance/ThirdMaintenanceApprovalModal.vue
@@ -1,126 +1,184 @@
<template>
- <j-modal :title="title" :visible="visible" :confirmLoading="confirmLoading"
- :okButtonProps="{ class:{'jee-hidden': disableSubmit} }" fullscreen @ok="handleOk" @cancel="handleCancel"
- centered cancelText="鍏抽棴">
+ <j-modal
+ :title="title"
+ :width="1200"
+ :visible="visible"
+ :confirmLoading="confirmLoading"
+ :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+ switchFullscreen
+ @ok="handleOk"
+ @cancel="handleCancel"
+ centered
+ cancelText="鍏抽棴">
<a-spin :spinning="spinning">
- <a-form-model ref="form" :model="model" :rules="validatorRules" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <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-tabs>
- <a-tab-pane tab="鍩虹淇℃伅">
- <a-row>
- <a-col :span="12">
- <a-form-model-item label="宸ュ崟鍙�">
- <a-input v-model="model.orderNum" readOnly/>
- </a-form-model-item>
- </a-col>
- <a-col :span="12">
- <a-form-model-item label="缁熶竴缂栫爜">
- <maintenance-equipment-select v-model="model.equipmentId" maintenanceCategory="SECOND_MAINTENANCE"
- @autocompleteForm="autocompleteForm" disabled/>
- </a-form-model-item>
- </a-col>
- </a-row>
-
- <a-row>
- <a-col :span="12">
- <a-form-model-item label="瑙勮寖鍚嶇О">
- <a-input v-model="model.standardName" readOnly/>
- </a-form-model-item>
- </a-col>
- <a-col :span="12">
- <a-form-model-item label="淇濆吇鏃ユ湡">
- <a-input v-model="model.maintenanceDate" readOnly/>
- </a-form-model-item>
- </a-col>
- </a-row>
-
- <a-row>
- <a-col :span="12">
- <a-form-model-item label="淇濆吇浜�">
- <a-input v-model="model.operator" readOnly/>
- </a-form-model-item>
- </a-col>
- <a-col :span="12">
- <a-form-model-item label="淇濆吇鍛ㄦ湡">
- <a-input v-model="model.maintenancePeriod" readOnly/>
- </a-form-model-item>
- </a-col>
- </a-row>
-
- <a-row>
- <a-col :span="24">
- <a-form-model-item :labelCol="labelColLong" :wrapperCol="wrapperColLong" label="澶囨敞">
- <a-textarea v-model="model.remark" readOnly/>
- </a-form-model-item>
- </a-col>
- </a-row>
- </a-tab-pane>
- </a-tabs>
+ <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="orderNum" label="宸ュ崟鍙�">
+ <a-input placeholder="宸ュ崟鍙风郴缁熻嚜鍔ㄧ敓鎴�" v-model="model.orderNum" disabled/>
+ </a-form-model-item>
</a-col>
-
- <a-col :span="10">
- <a-tabs v-model="activeTabKey">
- <a-tab-pane key="1" tab="淇濆吇椤规槑缁�" v-if="!isPrecisionCheck">
- <j-vxe-table ref="editableDetailTable" :rowNumber="false" :rowSelection="true" :bordered="true"
- :alwaysEdit="true" :toolbar="false" keep-source :height="300" :loading="detail.loading"
- :dataSource="detail.dataSource" :columns="detail.columns"
- @selectRowChange="handleTableSelectRowChange">
- <template v-slot:maintenanceResult="props">
- <j-dict-select-tag v-model="props.row.maintenanceResult" dictCode="eam_inspection_result"
- placeholder="璇烽�夋嫨淇濆吇缁撴灉"
- :disabled="disableSubmit || confirmDisable"
- @change="handleInspectionResultSelectChange($event,props.row)"
- 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'"/>
- </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%"/>
- </template>
- </j-vxe-table>
- </a-tab-pane>
- <template v-if="selectShenpiData.procInstId">
- <a-tab-pane key='2' tab='娴佺▼鍥�'>
- <img :src="imageSrc" alt="Fetched Image"/>
- </a-tab-pane>
- </template>
- <a-button :disabled="disableSubmit ||confirmDisable||selectedRowKeys.length > 0" slot="tabBarExtraContent"
- type="primary" @click="handleSelectAllInspectionResult">鎵归噺淇濆吇姝ｅ父
- </a-button>
- </a-tabs>
+ <a-col :span="8">
+ <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentId" label="璁惧缂栫爜">
+ <maintenance-equipment-select placeholder="璇疯緭鍏ヨ澶囩紪鍙锋垨鍚嶇О鎼滅储" v-model="model.equipmentId"
+ :maintenanceCategory="maintenanceCategory"
+ @autocompleteForm="autocompleteForm"
+ disabled></maintenance-equipment-select>
+ </a-form-model-item>
</a-col>
-
- <a-col :span="6">
- <a-tabs v-if="confirmDisable">
- <a-tab-pane tab="纭">
- <a-form-model-item :labelCol="labelColLong" :wrapperCol="wrapperColLong" prop="confirmComment"
- label="纭鎰忚">
- <a-textarea placeholder="璇疯緭鍏ユ剰瑙�" v-model="model.confirmComment"
- :disabled="disableSubmit || leaderConfirmDisable"/>
- </a-form-model-item>
- </a-tab-pane>
- </a-tabs>
-
- <a-tabs v-if="leaderConfirmDisable">
- <a-tab-pane tab="棰嗗纭">
- <a-form-model-item :labelCol="labelColLong" :wrapperCol="wrapperColLong" prop="leaderConfirmComment"
- label="棰嗗鎰忚">
- <a-textarea placeholder="璇疯緭鍏ユ剰瑙�" v-model="model.leaderConfirmComment"
- :disabled="disableSubmit || completionDisable"/>
- </a-form-model-item>
- </a-tab-pane>
- </a-tabs>
+ <a-col :span="8">
+ <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="standardName" label="鏍囧噯鍚嶇О">
+ <a-input placeholder="閫夋嫨璁惧鍚庤嚜鍔ㄥ甫鍑�" v-model="model.standardName" disabled/>
+ </a-form-model-item>
</a-col>
</a-row>
+ <a-row :gutter="24">
+ <a-col :span="8">
+ <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%"/>
+ </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"/>
+ </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-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-form-model-item>
+ </a-row>
+ <a-row :gutter="24">
+ <a-form-model-item :labelCol="labelColLong" :wrapperCol="wrapperColLong" label="淇濆吇鍥剧墖">
+ <lx-upload :returnUrl="false"
+ :isMultiple="true"
+ file-type="image"
+ :disabled="confirmDisable"
+ :number="3"
+ 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 v-model="activeTabKey">
+ <a-tab-pane key="1" tab="淇濆吇椤规槑缁�" v-if="!isPrecisionCheck">
+ <j-vxe-table
+ ref="editableDetailTable"
+ :rowNumber="false"
+ :rowSelection="true"
+ :bordered="true"
+ :alwaysEdit="true"
+ :toolbar="false"
+ keep-source
+ :height="300"
+ :loading="detail.loading"
+ :dataSource="detail.dataSource"
+ :columns="detail.columns"
+ @selectRowChange="handleTableSelectRowChange"
+ >
+ <template v-slot:maintenanceResult="props">
+ <j-dict-select-tag v-model="props.row.maintenanceResult" dictCode="eam_inspection_result"
+ placeholder="璇烽�夋嫨淇濆吇缁撴灉"
+ :disabled="disableSubmit || confirmDisable"
+ @change="handleInspectionResultSelectChange($event,props.row)"
+ 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'"/>
+ </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%"/>
+ </template>
+ </j-vxe-table>
+ </a-tab-pane>
+<!-- <a-tab-pane key='4' tab='绮惧害妫�楠�' v-if="!isMaintenance">-->
+<!-- <j-vxe-table-->
+<!-- ref="editablePrecisionDetailTable"-->
+<!-- :rowNumber="true"-->
+<!-- :rowSelection="true"-->
+<!-- :bordered="true"-->
+<!-- :alwaysEdit="true"-->
+<!-- :toolbar="false"-->
+<!-- :toolbarConfig="precisionDetail.toolbarConfig"-->
+<!-- keep-source-->
+<!-- :height="300"-->
+<!-- :dataSource="precisionDetail.dataSource"-->
+<!-- :columns="precisionDetail.columns"-->
+<!-- style="margin-top: 8px;" >-->
+<!-- <template v-slot:actualValue="props">-->
+<!-- <a-input-number v-model="props.row.actualValue" :disabled="disableSubmit || confirmDisable" style="width: 100%" />-->
+<!-- </template>-->
+<!-- </j-vxe-table>-->
+<!-- </a-tab-pane>-->
+ <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>
+ <div v-if="confirmDisable">
+ <a-divider orientation="center" style="font-size: large;font-style: italic;color: #66aeed;"> 鏈哄姩鍔炵‘璁や俊鎭�
+ </a-divider>
+ <a-row :gutter="24">
+ <a-col :span="24">
+ <a-form-model-item :labelCol="labelColLong" :wrapperCol="wrapperColLong" prop="confirmComment" label="纭鎰忚">
+ <a-textarea placeholder="璇疯緭鍏ユ剰瑙�" v-model="model.confirmComment"
+ :disabled="disableSubmit || leaderConfirmDisable"/>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ </div>
+ <div v-if="leaderConfirmDisable">
+ <a-divider orientation="center" style="font-size: large;font-style: italic;color: #66aeed;"> 棰嗗纭淇℃伅
+ </a-divider>
+ <a-row :gutter="24">
+ <a-col :span="24">
+ <a-form-model-item :labelCol="labelColLong" :wrapperCol="wrapperColLong" prop="leaderConfirmComment"
+ label="棰嗗鎰忚">
+ <a-textarea placeholder="璇疯緭鍏ユ剰瑙�" v-model="model.leaderConfirmComment"
+ :disabled="disableSubmit || completionDisable"/>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ </div>
</a-form-model>
</a-spin>
</j-modal>
@@ -147,7 +205,15 @@
return {
title: '鎿嶄綔',
visible: false,
+ //鐘舵�佹帶鍒�
+ //淇濆吇涓� 涓嶅彲缂栬緫
+ // confirmDisable: false,
+ // initialAcceptanceDisable: false,
+ // finalAcceptanceDisable: false,
+ editable: false,
model: {},
+ maintenanceCategory: 'SECOND_MAINTENANCE',
+ maintenanceOperatorOptions: [],
labelCol: {
xs: { span: 24 },
sm: { span: 6 }
@@ -158,11 +224,11 @@
},
labelColLong: {
xs: { span: 24 },
- sm: { span: 3 }
+ sm: { span: 2 }
},
wrapperColLong: {
xs: { span: 24 },
- sm: { span: 20 }
+ sm: { span: 21 }
},
confirmLoading: false,
spinning: false,
@@ -174,18 +240,24 @@
],
leaderConfirmComment: [
{ required: true, message: '璇疯緭鍏ュ垵楠屾敹鎰忚!' }
- ]
+ ],
},
url: {
queryById: '/eam/thirdMaintenanceOrder/queryById',
detail: '/eam/thirdMaintenanceOrderDetail/queryList',
approval: '/eam/thirdMaintenanceOrder/approval',
+ userSelect: '/eam/user_select/list',
queryHisTaskList: '/assign/flow/queryHisTaskList',
- diagramView: '/assign/flow/diagramView'
+ diagramView: '/assign/flow/diagramView',
+ // precisionCheckDetail: '/eam/precisionCheckDetail/queryList',
},
disableSubmit: false,
+ taskData: [],
+ isDisplayBmp: false,
+ showBmpButtonLoading: false,
selectedRowKeys: [],
detail: {
+ loading: false,
dataSource: [],
columns: [
{
@@ -202,31 +274,28 @@
title: '搴忓彿',
key: 'itemCode',
type: JVXETypes.normal,
- width: 60,
+ width: '5%',
align: 'center'
},
{
- title: '淇濆吇閮ㄤ綅',
- key: 'itemPart',
- type: JVXETypes.normal,
- align: 'center'
- },
- {
- title: '淇濆吇鍐呭',
+ title: '淇濆吇椤�',
key: 'itemName',
type: JVXETypes.normal,
+ width: '10%',
align: 'center'
},
{
- title: '楠屾敹鏍囧噯',
+ title: '淇濆吇瑕佹眰',
key: 'itemDemand',
type: JVXETypes.normal,
+ width: '20%',
align: 'center'
},
{
title: '淇濆吇缁撴灉',
key: 'maintenanceResult',
type: JVXETypes.slot,
+ width: '10%',
align: 'center',
slotName: 'maintenanceResult',
validateRules: [
@@ -237,6 +306,7 @@
title: '寮傚父鎻忚堪',
key: 'exceptionDescription',
type: JVXETypes.slot,
+ width: '20%',
align: 'center',
slotName: 'exceptionDescription',
validateRules: [
@@ -247,15 +317,88 @@
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']
+ }
+ },
+ // precisionDetail: {
+ // loading: false,
+ // dataSource: [],
+ // columns: [
+ // {
+ // title: 'ID',
+ // key: 'id',
+ // type: JVXETypes.hidden
+ // },
+ // {
+ // title: 'orderId',
+ // key: 'orderId',
+ // type: JVXETypes.hidden
+ // },
+ // {
+ // title: 'equipmentId',
+ // key: 'equipmentId',
+ // type: JVXETypes.hidden
+ // },
+ // {
+ // title: 'parameterId',
+ // key: 'parameterId',
+ // type: JVXETypes.hidden
+ // },
+ // {
+ // title: '妫�娴嬮」鐩�',
+ // key: 'parameterId_dictText',
+ // type: JVXETypes.normal,
+ // width: '25%',
+ // align: 'center'
+ // },
+ // {
+ // title: '鍙傛暟缂栫爜',
+ // key: 'parameterCode_dictText',
+ // type: JVXETypes.normal,
+ // width: '20%',
+ // align: 'center',
+ // },
+ // {
+ // title: '鍏佸樊鍊�',
+ // key: 'parameterValue',
+ // type: JVXETypes.normal,
+ // width: '15%',
+ // align: 'center',
+ // },
+ // {
+ // title: '瀹炴祴鍊�',
+ // key: 'actualValue',
+ // type: JVXETypes.slot,
+ // width: '15%',
+ // align: 'center',
+ // slotName: 'actualValue',
+ // validateRules: [
+ // { required: true, message: '璇疯緭鍏ュ疄娴嬪�硷紒' }
+ // ]
+ // }
+ // ],
+ // toolbarConfig: {
+ // // prefix 鍓嶇紑锛泂uffix 鍚庣紑
+ // slot: ['prefix', 'suffix'],
+ // // add 鏂板鎸夐挳锛況emove 鍒犻櫎鎸夐挳锛沜learSelection 娓呯┖閫夋嫨鎸夐挳
+ // btn: ['add', 'remove', 'clearSelection']
+ // }
+ // }
}
+ },
+ created() {
},
computed: {
confirmDisable: function() {
@@ -268,18 +411,25 @@
return ['COMPLETE', 'ABOLISH'].includes(this.model.maintenanceStatus)
},
isMaintenance: function() {
- return this.selectShenpiData && this.selectShenpiData.taskDefKey === 'maintenance_execution'
+ return this.selectShenpiData && this.selectShenpiData.taskDefKey === 'maintenance_execution';
},
isPrecisionCheck: function() {
- return this.selectShenpiData && this.selectShenpiData.taskDefKey === 'precision_check'
- }
+ return this.selectShenpiData && this.selectShenpiData.taskDefKey === 'precision_check';
+ },
},
methods: {
async handleDetail(item) {
this.initParams()
+ //閲嶆柊璁＄畻defaultKey
+ if(item && item.taskDefKey === 'precision_check') {
+ this.activeTabKey = '4';
+ }
this.model = {}
if (item.procInstId) {
- const { processDefinitionId, processInstanceId, processDefinitionKey } = item
+ const { processDefinitionId, processInstanceId, processDefinitionKey, procInstId } = item
+
+ let taskDataList = await getAction(this.url.queryHisTaskList, { procInstId })
+ this.taskData = [...taskDataList.result]
downFile(this.url.diagramView, {
processDefinitionId,
@@ -299,40 +449,66 @@
}
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]
+ }
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)
+ // await this.loadPrecisionDetail(item.dataId);
},
recordDetail(record) {
+ console.log('record', record)
this.initParams()
this.model = Object.assign({}, record)
+ if (this.model.imageFiles) {
+ let obj = JSON.parse(this.model.imageFiles)
+ this.model.imageFilesResult = [...obj]
+ }
this.loadDetail(record.id)
+ this.loadPrecisionDetail(record.id);
},
initParams() {
this.detail.dataSource = []
this.visible = true
- this.activeTabKey = '1'
+ this.activeTabKey = '1';
+ if(this.selectShenpiData && this.selectShenpiData.taskDefKey === 'precision_check') {
+ this.activeTabKey = '4';
+ }
this.spinning = true
},
-
async handleOk() {
const that = this
- let errMap = await that.$refs.editableDetailTable.validateTable()
- if (errMap) {
- this.$message.warning('鏁版嵁鏍￠獙澶辫触锛�')
- return
+ if(that.$refs.editableDetailTable) {
+ let errMap = await that.$refs.editableDetailTable.validateTable()
+ if (errMap) {
+ this.$message.warning('鏁版嵁鏍￠獙澶辫触锛�')
+ return
+ }
}
-
// 瑙﹀彂琛ㄥ崟楠岃瘉
this.$refs.form.validate(valid => {
if (valid) {
that.confirmLoading = that.spinning = true
- that.model.tableDetailList = that.$refs.editableDetailTable.getTableData()
+ let tableData = [];
+ let precisionTableData = [];
+ if(that.$refs.editableDetailTable) {
+ tableData = that.$refs.editableDetailTable.getTableData()
+ }
+ if(that.$refs.editablePrecisionDetailTable) {
+ precisionTableData = that.$refs.editablePrecisionDetailTable.getTableData()
+ }
+ that.model.tableDetailList = [...tableData]
+ that.model.precisionDetailList = [...precisionTableData]
+ let httpurl = this.url.approval
+ let method = 'put'
- httpAction(this.url.approval, this.model, 'put').then((res) => {
+ httpAction(httpurl, this.model, method).then((res) => {
if (res.success) {
that.$message.success(res.message)
that.$emit('searchReset')
@@ -348,20 +524,21 @@
}
})
},
-
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 })
+ getAction(this.url.detail, { orderId: orderId })
.then(res => {
if (res.success) {
this.detail.dataSource = [...res.result]
@@ -372,11 +549,35 @@
})
}
},
+ // loadPrecisionDetail(orderId) {
+ // if (orderId) {
+ // getAction(this.url.precisionCheckDetail, { orderId: orderId }).then(res => {
+ // if (res.success) {
+ // this.precisionDetail.dataSource = [...res.result]
+ // }
+ // })
+ // }
+ // },
+ 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 => {
@@ -423,4 +624,8 @@
}
}
}
-</script>
\ No newline at end of file
+</script>
+
+<style lang="less" scoped>
+
+</style>
\ No newline at end of file
--
Gitblit v1.9.3