From 886748a39efb188d8008d41f2718eb78f3006ddd Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期五, 18 七月 2025 17:08:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/eam/technical/EamTechnicalStatusEvaluationOrderList.vue | 440 ++++++++++++++++++++++++++++---------------------------
1 files changed, 224 insertions(+), 216 deletions(-)
diff --git a/src/views/eam/technical/EamTechnicalStatusEvaluationOrderList.vue b/src/views/eam/technical/EamTechnicalStatusEvaluationOrderList.vue
index eb3b30f..8a25359 100644
--- a/src/views/eam/technical/EamTechnicalStatusEvaluationOrderList.vue
+++ b/src/views/eam/technical/EamTechnicalStatusEvaluationOrderList.vue
@@ -1,49 +1,36 @@
<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="6" :lg="7" :md="8" :sm="24">
- <a-form-item label="鍒犻櫎鏍囪">
- <a-input placeholder="璇疯緭鍏ュ垹闄ゆ爣璁�" v-model="queryParam.delFlag"></a-input>
+ <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="6" :lg="7" :md="8" :sm="24">
+ <a-col :xl="5" :lg="6" :md="8" :sm="12">
<a-form-item label="宸ュ崟鍙�">
- <a-input placeholder="璇疯緭鍏ュ伐鍗曞彿" v-model="queryParam.orderNum"></a-input>
+ <a-input placeholder="璇疯緭鍏ュ伐鍗曞彿" v-model="queryParam.orderNum"/>
</a-form-item>
</a-col>
- <template v-if="toggleSearchStatus">
- <a-col :xl="6" :lg="7" :md="8" :sm="24">
- <a-form-item label="璁惧ID">
- <a-input placeholder="璇疯緭鍏ヨ澶嘔D" v-model="queryParam.equipmentId"></a-input>
+ <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="6" :lg="7" :md="8" :sm="24">
- <a-form-item label="瑙勮寖ID">
- <a-input placeholder="璇疯緭鍏ヨ鑼僆D" v-model="queryParam.standardId"></a-input>
+ <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="6" :lg="7" :md="8" :sm="24">
- <a-form-item label="璁″垝閴村畾鏃ユ湡;鎻愬墠70澶╃敓鎴愬伐鍗�">
- <a-input placeholder="璇疯緭鍏ヨ鍒掗壌瀹氭棩鏈�;鎻愬墠70澶╃敓鎴愬伐鍗�" v-model="queryParam.evaluationDate"></a-input>
- </a-form-item>
- </a-col>
- </template>
- <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <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>
- <a @click="handleToggleSearch" style="margin-left: 8px">
- {{ toggleSearchStatus ? '鏀惰捣' : '灞曞紑' }}
- <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
- </a>
</span>
</a-col>
-
</a-row>
</a-form>
</div>
@@ -51,265 +38,286 @@
<!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
<div class="table-operator">
<a-button @click="handleAdd" type="primary" icon="plus">鏂板</a-button>
- <a-button type="primary" icon="download" @click="handleExportXls('鎶�鏈姸鎬侀壌瀹氬伐鍗�')">瀵煎嚭</a-button>
- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
- <a-button type="primary" icon="import">瀵煎叆</a-button>
- </a-upload>
- <a-dropdown v-if="selectedRowKeys.length > 0">
- <a-menu slot="overlay">
- <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>鍒犻櫎</a-menu-item>
- </a-menu>
- <a-button style="margin-left: 8px"> 鎵归噺鎿嶄綔 <a-icon type="down" /></a-button>
- </a-dropdown>
</div>
<!-- table鍖哄煙-begin -->
- <div>
- <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
- <i class="anticon anticon-info-circle ant-alert-icon"></i> 宸查�夋嫨 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>椤�
- <a style="margin-left: 24px" @click="onClearSelected">娓呯┖</a>
- </div>
-
- <a-table
- ref="table"
- size="middle"
- bordered
- rowKey="id"
- :columns="columns"
- :dataSource="dataSource"
- :pagination="ipagination"
- :loading="loading"
- class="j-table-force-nowrap"
- :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
- @change="handleTableChange">
+ <a-table bordered rowKey="id" :columns="columns" :dataSource="dataSource" :pagination="ipagination"
+ :scroll="{ x: 'max-content' }" :loading="loading" @change="handleTableChange">
<span slot="action" slot-scope="text, record">
- <a @click="handleEdit(record)">缂栬緫</a>
+ <template v-if="record.evaluationStatus === 'WAIT_EVALUATION'">
+ <a-popconfirm title="纭畾棰嗗彇鍚楋紵" @confirm="handleReceive(record.id)">
+ <a>棰嗗彇</a>
+ </a-popconfirm>
- <a-divider type="vertical" />
- <a-dropdown>
- <a class="ant-dropdown-link">鏇村 <a-icon type="down" /></a>
- <a-menu slot="overlay">
- <a-menu-item>
- <a-popconfirm title="纭畾鍒犻櫎鍚�?" @confirm="() => handleDelete(record.id)">
- <a>鍒犻櫎</a>
- </a-popconfirm>
- </a-menu-item>
- </a-menu>
- </a-dropdown>
+ <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)">璇︽儏</a>
</span>
-
- </a-table>
- </div>
+ </a-table>
<!-- table鍖哄煙-end -->
- <!-- 琛ㄥ崟鍖哄煙 -->
- <eamTechnicalStatusEvaluationOrder-modal ref="modalForm" @ok="modalFormOk"></eamTechnicalStatusEvaluationOrder-modal>
+ <!--宸ュ崟寮圭獥-->
+ <eamTechnicalStatusEvaluationOrder-modal ref="modalForm" @ok="modalFormOk"/>
+
+ <technical-status-evaluation-approval-modal ref="technicalStatusEvaluationApprovalModal"
+ :selectShenpiData="selectedOrderData"/>
+
+ <!--宸ュ崟鍙樻洿寮圭獥-->
+ <eamTechnicalStatusEvaluationOrderChange-modal ref="orderChangeModal" @ok="modalFormOk"/>
</a-card>
</template>
<script>
- import '@/assets/less/TableExpand.less'
import EamTechnicalStatusEvaluationOrderModal from './modules/EamTechnicalStatusEvaluationOrderModal'
+ import EamTechnicalStatusEvaluationOrderChangeModal from './modules/EamTechnicalStatusEvaluationOrderChangeModal'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+ import { getAction } from '@/api/manage'
+ import LxSearchEquipmentSelect from '../equipment/modules/LxSearchEquipmentSelect'
+ import TechnicalStatusEvaluationApprovalModal
+ from '../../flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationApprovalModal'
export default {
- name: "EamTechnicalStatusEvaluationOrderList",
- mixins:[JeecgListMixin],
+ name: 'EamTechnicalStatusEvaluationOrderList',
+ mixins: [JeecgListMixin],
components: {
- EamTechnicalStatusEvaluationOrderModal
+ TechnicalStatusEvaluationApprovalModal,
+ LxSearchEquipmentSelect,
+ EamTechnicalStatusEvaluationOrderModal,
+ EamTechnicalStatusEvaluationOrderChangeModal
},
- data () {
+ data() {
return {
description: '鎶�鏈姸鎬侀壌瀹氬伐鍗曠鐞嗛〉闈�',
+ selectedOrderData: {},
// 琛ㄥご
columns: [
{
title: '#',
dataIndex: '',
- key:'rowIndex',
- width:60,
- align:"center",
- customRender:function (t,r,index) {
- return parseInt(index)+1;
- }
- },
- {
- title: '鍒犻櫎鏍囪',
- align:"center",
- dataIndex: 'delFlag'
- },
- {
+ key: 'rowIndex',
+ width: 60,
+ align: 'center',
+ customRender: function(t, r, index) {
+ return parseInt(index) + 1
+ },
+ fixed: 'left'
+ },
+ {
+ title: '缁熶竴缂栫爜',
+ align: 'center',
+ dataIndex: 'equipmentCode',
+ fixed: 'left'
+ },
+ {
+ title: '璁惧鍚嶇О',
+ align: 'center',
+ dataIndex: 'equipmentName',
+ fixed: 'left'
+ },
+ {
+ title: '璁惧鍨嬪彿',
+ align: 'center',
+ dataIndex: 'equipmentModel',
+ fixed: 'left'
+ },
+ {
title: '宸ュ崟鍙�',
- align:"center",
+ align: 'center',
dataIndex: 'orderNum'
- },
- {
- title: '璁惧ID',
- align:"center",
- dataIndex: 'equipmentId'
- },
- {
- title: '瑙勮寖ID',
- align:"center",
- dataIndex: 'standardId'
- },
- {
- title: '璁″垝閴村畾鏃ユ湡;鎻愬墠70澶╃敓鎴愬伐鍗�',
- align:"center",
+ },
+ {
+ title: '璁″垝閴村畾鏃ユ湡',
+ align: 'center',
dataIndex: 'evaluationDate'
- },
- {
- title: '閿佸畾宸ュ崟鏃ユ湡;鎻愬墠55澶╅攣瀹氬伐鍗�',
- align:"center",
+ },
+ {
+ title: '閿佸畾宸ュ崟鏃ユ湡',
+ align: 'center',
dataIndex: 'freezeOrderDate'
- },
- {
- title: '宸ュ崟杩囨湡鏃ユ湡;鍒版湡鏈仛鐩存帴杩囨湡锛屽苟淇敼璁惧鎶�鏈姸鎬佷负绂佺敤',
- align:"center",
+ },
+ {
+ title: '宸ュ崟杩囨湡鏃ユ湡',
+ align: 'center',
dataIndex: 'orderExpirationDate'
- },
- {
+ },
+ {
title: '瀹為檯寮�濮嬫椂闂�',
- align:"center",
+ align: 'center',
dataIndex: 'actualStartTime'
- },
- {
+ },
+ {
title: '瀹為檯缁撴潫鏃堕棿',
- align:"center",
+ align: 'center',
dataIndex: 'actualEndTime'
- },
- {
- title: '閴村畾浜�',
- align:"center",
- dataIndex: 'evaluator'
- },
- {
- title: '閴村畾鐘舵��;寰呴壌瀹氥�侀壌瀹氫腑銆佺淮淇涓讳换绛惧瓧銆佸伐鑹轰汉鍛樼瀛椼�佹妧鏈富绠＄瀛椼�佽澶囨楠屽憳绛惧瓧銆佸凡瀹屾垚銆佸凡閿佸畾銆佸彉鏇翠腑銆佸凡杩囨湡',
- align:"center",
- dataIndex: 'evaluationStatus'
- },
- {
+ },
+ {
+ title: '棰嗗彇浜�',
+ align: 'center',
+ dataIndex: 'evaluator_dictText'
+ },
+ {
+ title: '閴村畾鐘舵��',
+ align: 'center',
+ dataIndex: 'evaluationStatus_dictText'
+ },
+ {
title: '鍒涘缓鏂瑰紡',
- align:"center",
- dataIndex: 'creationMethod'
- },
- {
- title: '瀹夊叏瑁呯疆妫�鏌ョ粨鏋�;鏄�佸惁',
- align:"center",
+ align: 'center',
+ dataIndex: 'creationMethod_dictText'
+ },
+ {
+ title: '瀹夊叏瑁呯疆妫�鏌ョ粨鏋�',
+ align: 'center',
dataIndex: 'safetyEquipmentCheckResult'
- },
- {
- title: '绮惧害鍙傛暟妫�鏌ョ粨鏋�;鏄�佸惁銆佹棤',
- align:"center",
+ },
+ {
+ title: '绮惧害鍙傛暟妫�鏌ョ粨鏋�',
+ align: 'center',
dataIndex: 'precisionCheckResult'
- },
- {
- title: '鍔熻兘鐘舵�佹鏌ョ粨鏋�;鏄�佸惁',
- align:"center",
+ },
+ {
+ title: '鍔熻兘鐘舵�佹鏌ョ粨鏋�',
+ align: 'center',
dataIndex: 'functionalCheckResult'
- },
- {
- title: '鍏朵粬妫�鏌ョ粨鏋�;鏄�佸惁銆佹棤',
- align:"center",
+ },
+ {
+ title: '鍏朵粬妫�鏌ョ粨鏋�',
+ align: 'center',
dataIndex: 'otherCheckResult'
- },
- {
+ },
+ {
title: '缁翠慨瀹や富浠荤瀛�',
- align:"center",
+ align: 'center',
dataIndex: 'repairManagerSignature'
- },
- {
+ },
+ {
title: '缁翠慨瀹や富浠荤瀛楁椂闂�',
- align:"center",
+ align: 'center',
dataIndex: 'repairManagerSignatureTime1'
- },
- {
- title: '璇曚欢妫�鏌ョ粨鏋�;鍚堟牸銆佷笉鍚堟牸',
- align:"center",
+ },
+ {
+ title: '璇曚欢妫�鏌ョ粨鏋�',
+ align: 'center',
dataIndex: 'sampleCheckResult'
- },
- {
+ },
+ {
title: '宸ヨ壓鍛樼瀛�',
- align:"center",
+ align: 'center',
dataIndex: 'processTechnicianSignature'
- },
- {
+ },
+ {
title: '宸ヨ壓鍛樼瀛楁椂闂�',
- align:"center",
+ align: 'center',
dataIndex: 'processTechnicianSignatureTime'
- },
- {
- title: '閴村畾缁撴灉;鍚堟牸銆侀檺鐢ㄣ�佺鐢�',
- align:"center",
+ },
+ {
+ title: '閴村畾缁撴灉',
+ align: 'center',
dataIndex: 'evaluationResult'
- },
- {
- title: '闄怽绂佺敤鍘熷洜(澶氶��);瀹夊叏瑁呯疆銆佽澶囧姛鑳姐�佺簿搴︺�佽瘯浠躲�佸叾浠�',
- align:"center",
+ },
+ {
+ title: '闄�/绂佺敤鍘熷洜',
+ align: 'center',
dataIndex: 'evaluationReason'
- },
- {
+ },
+ {
title: '璁惧妫�鏌ヤ汉绛惧瓧',
- align:"center",
+ align: 'center',
dataIndex: 'inspectorSignature'
- },
- {
+ },
+ {
title: '璁惧妫�鏌ヤ汉绛惧瓧鏃堕棿',
- align:"center",
+ align: 'center',
dataIndex: 'inspectorSignatureTime'
- },
- {
+ },
+ {
title: '闄勫綍A HF缂栫爜',
- align:"center",
+ align: 'center',
dataIndex: 'hfCodeA'
- },
- {
+ },
+ {
title: '闄勫綍B HF缂栫爜',
- align:"center",
+ align: 'center',
dataIndex: 'hfCodeB'
- },
- {
+ },
+ {
title: '闄勫綍C HF缂栫爜',
- align:"center",
+ align: 'center',
dataIndex: 'hfCodeC'
- },
- {
+ },
+ {
title: '闄勫綍D HF缂栫爜',
- align:"center",
+ align: 'center',
dataIndex: 'hfCodeD'
- },
- {
- title: '澶囨敞',
- align:"center",
- dataIndex: 'remark'
- },
+ },
{
title: '鎿嶄綔',
dataIndex: 'action',
- align:"center",
+ align: 'center',
scopedSlots: { customRender: 'action' },
+ fixed: 'right'
}
],
- url: {
- list: "/eam/eamTechnicalStatusEvaluationOrder/list",
- delete: "/eam/eamTechnicalStatusEvaluationOrder/delete",
- deleteBatch: "/eam/eamTechnicalStatusEvaluationOrder/deleteBatch",
- exportXlsUrl: "eam/eamTechnicalStatusEvaluationOrder/exportXls",
- importExcelUrl: "eam/eamTechnicalStatusEvaluationOrder/importExcel",
- },
- }
- },
- computed: {
- importExcelUrl: function(){
- return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
- }
- },
+ url: {
+ list: '/eam/eamTechnicalStatusEvaluationOrder/list',
+ receive: '/eam/eamTechnicalStatusEvaluationOrder/collect'
+ }
+ }
+ },
methods: {
-
+ /**
+ * 鐐瑰嚮棰嗗彇鏃惰Е鍙�
+ * @param id
+ */
+ handleReceive(id) {
+ let that = this
+ this.loading = true
+ getAction(that.url.receive, { id })
+ .then(res => {
+ if (res.success) {
+ that.$notification.success({
+ message: '娑堟伅',
+ description: res.message
+ })
+ that.loadData()
+ } else {
+ 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.selectedOrderData = Object.assign({}, record)
+ this.$refs.technicalStatusEvaluationApprovalModal.title = '璇︽儏'
+ this.$refs.technicalStatusEvaluationApprovalModal.visible = true
+ this.$refs.technicalStatusEvaluationApprovalModal.disableSubmit = true
+ this.$refs.technicalStatusEvaluationApprovalModal.recordDetail(record)
+ }
}
}
-</script>
-<style scoped>
- @import '~@assets/less/common.less';
-</style>
\ No newline at end of file
+</script>
\ No newline at end of file
--
Gitblit v1.9.3