From 31d62d0ac0bf6fdcb200ffeaa7b4e15aaf2d4946 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期五, 25 七月 2025 16:40:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/eam/technical/EamTechnicalStatusEvaluationOrderList.vue | 244 ++++++++++++++++++++++++++++++++++--------------
1 files changed, 170 insertions(+), 74 deletions(-)
diff --git a/src/views/eam/technical/EamTechnicalStatusEvaluationOrderList.vue b/src/views/eam/technical/EamTechnicalStatusEvaluationOrderList.vue
index 26efcce..92eb74e 100644
--- a/src/views/eam/technical/EamTechnicalStatusEvaluationOrderList.vue
+++ b/src/views/eam/technical/EamTechnicalStatusEvaluationOrderList.vue
@@ -1,73 +1,137 @@
<template>
<a-card :bordered="false">
- <!-- 鏌ヨ鍖哄煙 -->
- <div class="table-page-search-wrapper">
- <a-form layout="inline" @keyup.enter.native="searchQuery">
- <a-row :gutter="24">
- <a-col :xl="5" :lg="6" :md="8" :sm="12">
- <a-form-item label="缁熶竴缂栫爜">
- <technical-status-equipment-select placeholder="璇疯緭鍏ョ粺涓�缂栫爜鎴栧悕绉版悳绱�" v-model="queryParam.equipmentId"/>
- </a-form-item>
- </a-col>
- <a-col :xl="5" :lg="6" :md="8" :sm="12">
- <a-form-item label="宸ュ崟鍙�">
- <a-input placeholder="璇疯緭鍏ュ伐鍗曞彿" v-model="queryParam.orderNum"/>
- </a-form-item>
- </a-col>
- <a-col :xl="5" :lg="6" :md="8" :sm="12">
- <a-form-item label="璁″垝閴村畾鏃ユ湡">
- <a-date-picker v-model="queryParam.evaluationDate" style="width: 100%"/>
- </a-form-item>
- </a-col>
- <a-col :xl="4" :lg="6" :md="8" :sm="12">
+ <template v-if="isDisplayOperation">
+ <!-- 鏌ヨ鍖哄煙 -->
+ <div class="table-page-search-wrapper">
+ <a-form layout="inline" @keyup.enter.native="searchQuery">
+ <a-row :gutter="24">
+ <a-col :xl="5" :lg="6" :md="8" :sm="12">
+ <a-form-item label="缁熶竴缂栫爜">
+ <lx-search-equipment-select placeholder="璇疯緭鍏ョ粺涓�缂栫爜鎴栧悕绉版悳绱�" v-model="queryParam.equipmentId"/>
+ </a-form-item>
+ </a-col>
+ <a-col :xl="5" :lg="6" :md="8" :sm="12">
+ <a-form-item label="宸ュ崟鍙�">
+ <a-input placeholder="璇疯緭鍏ュ伐鍗曞彿" v-model="queryParam.orderNum"/>
+ </a-form-item>
+ </a-col>
+ <a-col :xl="5" :lg="6" :md="8" :sm="12">
+ <a-form-item label="璁″垝閴村畾鏃ユ湡">
+ <a-date-picker v-model="queryParam.evaluationDate" style="width: 100%"/>
+ </a-form-item>
+ </a-col>
+ <a-col :xl="5" :lg="6" :md="8" :sm="12">
+ <a-form-item label="閴村畾鐘舵��">
+ <j-dict-select-tag placeholder="璇烽�夋嫨閴村畾鐘舵��" dict-code="technical_status_evaluation_order_status"
+ v-model="queryParam.evaluationStatus"/>
+ </a-form-item>
+ </a-col>
+ <a-col :xl="4" :lg="6" :md="8" :sm="12">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
<a-button type="info" @click="searchReset" icon="reload" style="margin-left: 8px">閲嶇疆</a-button>
</span>
- </a-col>
- </a-row>
- </a-form>
- </div>
+ </a-col>
+ </a-row>
+ </a-form>
+ </div>
- <!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
- <div class="table-operator">
- <a-button @click="handleAdd" type="primary" icon="plus">鏂板</a-button>
- </div>
+ <!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
+ <div class="table-operator">
+ <a-button @click="handleAdd" type="primary" icon="plus">鏂板</a-button>
+ </div>
+ </template>
<!-- table鍖哄煙-begin -->
<a-table bordered rowKey="id" :columns="columns" :dataSource="dataSource" :pagination="ipagination"
:scroll="{ x: 'max-content' }" :loading="loading" @change="handleTableChange">
+ <!--瀹夊叏瑁呯疆妫�鏌ョ粨鏋�-->
+ <template slot="safetyEquipmentCheckResult" slot-scope="text">
+ <a-switch checked-children="鏄�" un-checked-children="鍚�" :checked="Boolean(+text)" disabled/>
+ </template>
- <span slot="action" slot-scope="text, record">
- <a-popconfirm v-if="record.evaluationStatus=='WAIT_EVALUATION'" title="纭畾棰嗗彇鍚楋紵"
- @confirm="handleReceive(record.id)">
+ <!--绮惧害鍙傛暟妫�鏌ョ粨鏋�-->
+ <template slot="precisionCheckResult" slot-scope="text">
+ <a-switch checked-children="鏄�" un-checked-children="鍚�" :checked="Boolean(+text)" disabled/>
+ </template>
+
+ <!--鍔熻兘鐘舵�佹鏌ョ粨鏋�-->
+ <template slot="functionalCheckResult" slot-scope="text">
+ <a-switch v-if="text!=='NONE'" checked-children="鏄�" un-checked-children="鍚�" :checked="text==='YES'" disabled/>
+ <span v-else>鏃�</span>
+ </template>
+
+ <!--鍏朵粬妫�鏌ョ粨鏋�-->
+ <template slot="otherCheckResult" slot-scope="text">
+ <a-switch v-if="text!=='NONE'" checked-children="鏄�" un-checked-children="鍚�" :checked="text==='YES'" disabled/>
+ <span v-else>鏃�</span>
+ </template>
+
+ <!--璇曚欢妫�鏌ョ粨鏋�-->
+ <template slot="sampleCheckResult" slot-scope="text">
+ <a-switch checked-children="鏄�" un-checked-children="鍚�" :checked="Boolean(+text)" disabled/>
+ </template>
+
+ <span slot="action" slot-scope="text, record">
+ <template v-if="record.evaluationStatus === 'WAIT_EVALUATION'">
+ <a-popconfirm title="纭畾棰嗗彇鍚楋紵" @confirm="handleReceive(record.id)">
<a>棰嗗彇</a>
</a-popconfirm>
+
+ <a-divider type="vertical"/>
+ </template>
+
+ <template v-if="record.evaluationStatus === 'WAIT_EVALUATION'||record.evaluationStatus==='LOCKED'">
+ <a @click="handleOrderChange(record)">鍙樻洿</a>
+
+ <a-divider type="vertical"/>
+ </template>
+
+ <a @click="handleDetail(record)" v-if="record.evaluationStatus!=='CHANGING'">璇︽儏</a>
</span>
</a-table>
<!-- table鍖哄煙-end -->
- <!-- 琛ㄥ崟鍖哄煙 -->
+ <!--宸ュ崟寮圭獥-->
<eamTechnicalStatusEvaluationOrder-modal ref="modalForm" @ok="modalFormOk"/>
+
+ <technical-status-evaluation-approval-modal ref="technicalStatusEvaluationApprovalModal"
+ :selectShenpiData="selectedRowData"/>
+
+ <!--宸ュ崟鍙樻洿寮圭獥-->
+ <eamTechnicalStatusEvaluationOrderChange-modal ref="orderChangeModal" @ok="modalFormOk"/>
</a-card>
</template>
<script>
import EamTechnicalStatusEvaluationOrderModal from './modules/EamTechnicalStatusEvaluationOrderModal'
+ import EamTechnicalStatusEvaluationOrderChangeModal from './modules/EamTechnicalStatusEvaluationOrderChangeModal'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
- import TechnicalStatusEquipmentSelect from '../equipment/modules/TechnicalStatusEquipmentSelect'
import { getAction } from '@/api/manage'
+ import LxSearchEquipmentSelect from '../equipment/modules/LxSearchEquipmentSelect'
+ import TechnicalStatusEvaluationApprovalModal
+ from '../../flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationApprovalModal'
export default {
name: 'EamTechnicalStatusEvaluationOrderList',
mixins: [JeecgListMixin],
components: {
- TechnicalStatusEquipmentSelect,
- EamTechnicalStatusEvaluationOrderModal
+ TechnicalStatusEvaluationApprovalModal,
+ LxSearchEquipmentSelect,
+ EamTechnicalStatusEvaluationOrderModal,
+ EamTechnicalStatusEvaluationOrderChangeModal
+ },
+ props: {
+ isDisplayOperation: {
+ type: Boolean,
+ default: true
+ }
},
data() {
return {
description: '鎶�鏈姸鎬侀壌瀹氬伐鍗曠鐞嗛〉闈�',
+ disableMixinCreated: true,
+ selectedRowData: {},
// 琛ㄥご
columns: [
{
@@ -100,16 +164,20 @@
fixed: 'left'
},
{
+ title: '閴村畾鐘舵��',
+ align: 'center',
+ dataIndex: 'evaluationStatus_dictText',
+ fixed: 'left'
+ },
+ {
title: '宸ュ崟鍙�',
align: 'center',
- dataIndex: 'orderNum',
- fixed: 'left'
+ dataIndex: 'orderNum'
},
{
title: '璁″垝閴村畾鏃ユ湡',
align: 'center',
- dataIndex: 'evaluationDate',
- fixed: 'left'
+ dataIndex: 'evaluationDate'
},
{
title: '閿佸畾宸ュ崟鏃ユ湡',
@@ -132,14 +200,9 @@
dataIndex: 'actualEndTime'
},
{
- title: '閴村畾浜�',
+ title: '棰嗗彇浜�',
align: 'center',
- dataIndex: 'evaluator'
- },
- {
- title: '閴村畾鐘舵��',
- align: 'center',
- dataIndex: 'evaluationStatus_dictText'
+ dataIndex: 'evaluator_dictText'
},
{
title: '鍒涘缓鏂瑰紡',
@@ -149,42 +212,47 @@
{
title: '瀹夊叏瑁呯疆妫�鏌ョ粨鏋�',
align: 'center',
- dataIndex: 'safetyEquipmentCheckResult'
+ dataIndex: 'safetyEquipmentCheckResult',
+ scopedSlots: { customRender: 'safetyEquipmentCheckResult' }
},
{
title: '绮惧害鍙傛暟妫�鏌ョ粨鏋�',
align: 'center',
- dataIndex: 'precisionCheckResult'
+ dataIndex: 'precisionCheckResult',
+ scopedSlots: { customRender: 'precisionCheckResult' }
},
{
title: '鍔熻兘鐘舵�佹鏌ョ粨鏋�',
align: 'center',
- dataIndex: 'functionalCheckResult'
+ dataIndex: 'functionalCheckResult',
+ scopedSlots: { customRender: 'functionalCheckResult' }
},
{
title: '鍏朵粬妫�鏌ョ粨鏋�',
align: 'center',
- dataIndex: 'otherCheckResult'
+ dataIndex: 'otherCheckResult',
+ scopedSlots: { customRender: 'otherCheckResult' }
},
{
title: '缁翠慨瀹や富浠荤瀛�',
align: 'center',
- dataIndex: 'repairManagerSignature'
+ dataIndex: 'repairManagerSignature_dictText'
},
{
title: '缁翠慨瀹や富浠荤瀛楁椂闂�',
align: 'center',
- dataIndex: 'repairManagerSignatureTime1'
+ dataIndex: 'repairManagerSignatureTime'
},
{
title: '璇曚欢妫�鏌ョ粨鏋�',
align: 'center',
- dataIndex: 'sampleCheckResult'
+ dataIndex: 'sampleCheckResult',
+ scopedSlots: { customRender: 'sampleCheckResult' }
},
{
title: '宸ヨ壓鍛樼瀛�',
align: 'center',
- dataIndex: 'processTechnicianSignature'
+ dataIndex: 'processTechnicianSignature_dictText'
},
{
title: '宸ヨ壓鍛樼瀛楁椂闂�',
@@ -194,7 +262,7 @@
{
title: '閴村畾缁撴灉',
align: 'center',
- dataIndex: 'evaluationResult'
+ dataIndex: 'evaluationResult_dictText'
},
{
title: '闄�/绂佺敤鍘熷洜',
@@ -204,7 +272,7 @@
{
title: '璁惧妫�鏌ヤ汉绛惧瓧',
align: 'center',
- dataIndex: 'inspectorSignature'
+ dataIndex: 'inspectorSignature_dictText'
},
{
title: '璁惧妫�鏌ヤ汉绛惧瓧鏃堕棿',
@@ -230,46 +298,74 @@
title: '闄勫綍D HF缂栫爜',
align: 'center',
dataIndex: 'hfCodeD'
- },
- {
- title: '鎿嶄綔',
- dataIndex: 'action',
- align: 'center',
- scopedSlots: { customRender: 'action' },
- fixed: 'right'
}
],
url: {
list: '/eam/eamTechnicalStatusEvaluationOrder/list',
- receive: '/eam/eamTechnicalStatusEvaluationOrder/collect',
- delete: '/eam/eamTechnicalStatusEvaluationOrder/delete',
- deleteBatch: '/eam/eamTechnicalStatusEvaluationOrder/deleteBatch',
- exportXlsUrl: 'eam/eamTechnicalStatusEvaluationOrder/exportXls',
- importExcelUrl: 'eam/eamTechnicalStatusEvaluationOrder/importExcel'
+ receive: '/eam/eamTechnicalStatusEvaluationOrder/collect'
}
}
},
- computed: {
- importExcelUrl: function() {
- return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
+ created() {
+ if (!this.isDisplayOperation) {
+ return
}
+ const operationColumn = {
+ title: '鎿嶄綔',
+ dataIndex: 'action',
+ align: 'center',
+ scopedSlots: { customRender: 'action' },
+ fixed: 'right',
+ width: 200
+ }
+ this.columns = [...this.columns, operationColumn]
+ this.loadData(1)
},
methods: {
+ /**
+ * 鐐瑰嚮棰嗗彇鏃惰Е鍙�
+ * @param id
+ */
handleReceive(id) {
- getAction(this.url.receive, { id })
+ let that = this
+ this.loading = true
+ getAction(that.url.receive, { id })
.then(res => {
if (res.success) {
- this.$notification.success({
+ that.$notification.success({
message: '娑堟伅',
description: res.message
})
+ that.loadData()
} else {
- this.$notification.warning({
+ that.$notification.warning({
message: '娑堟伅',
description: res.message
})
+ that.loading = false
}
})
+ },
+
+ /**
+ * 鐐瑰嚮鍙樻洿鏃惰Е鍙�
+ * @param record
+ */
+ handleOrderChange(record) {
+ this.$refs.orderChangeModal.title = '鍙樻洿'
+ this.$refs.orderChangeModal.add(record)
+ },
+
+ /**
+ * 鐐瑰嚮璇︽儏鏃惰Е鍙�
+ * @param record
+ */
+ handleDetail(record) {
+ this.selectedRowData = Object.assign({}, record)
+ this.$refs.technicalStatusEvaluationApprovalModal.title = '璇︽儏'
+ this.$refs.technicalStatusEvaluationApprovalModal.visible = true
+ this.$refs.technicalStatusEvaluationApprovalModal.disableSubmit = true
+ this.$refs.technicalStatusEvaluationApprovalModal.handleDetail(record)
}
}
}
--
Gitblit v1.9.3