From 3a8181119526dd55814fc69ac0566f93009fa71f Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期三, 23 七月 2025 17:31:07 +0800
Subject: [PATCH] 1、各类审批状态提至列表靠前位置 2、新增二保、技术鉴定状态申请以及技术鉴定工单变更流程驳回时的审批节点展示条件
---
src/views/eam/technical/EamTechnicalStatusEvaluationOrderList.vue | 487 +++++++++++++++++++++++++++++------------------------
1 files changed, 268 insertions(+), 219 deletions(-)
diff --git a/src/views/eam/technical/EamTechnicalStatusEvaluationOrderList.vue b/src/views/eam/technical/EamTechnicalStatusEvaluationOrderList.vue
index c45aab9..8a25359 100644
--- a/src/views/eam/technical/EamTechnicalStatusEvaluationOrderList.vue
+++ b/src/views/eam/technical/EamTechnicalStatusEvaluationOrderList.vue
@@ -6,18 +6,23 @@
<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" />
+ <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-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-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">
@@ -40,235 +45,279 @@
:scroll="{ x: 'max-content' }" :loading="loading" @change="handleTableChange">
<span slot="action" slot-scope="text, record">
- <a-popconfirm v-if="record.evaluationStatus === 'WAIT_EVALUATION'" title="纭畾棰嗗彇鍚楋紵"
- @confirm="handleReceive(record.id)">
+ <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)">璇︽儏</a>
</span>
</a-table>
<!-- table鍖哄煙-end -->
- <!-- 琛ㄥ崟鍖哄煙 -->
- <eamTechnicalStatusEvaluationOrder-modal ref="modalForm" @ok="modalFormOk" />
+ <!--宸ュ崟寮圭獥-->
+ <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 EamTechnicalStatusEvaluationOrderModal from './modules/EamTechnicalStatusEvaluationOrderModal'
-import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-import TechnicalStatusEquipmentSelect from '../equipment/modules/TechnicalStatusEquipmentSelect'
-import { getAction } from '@/api/manage'
+ 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],
- components: {
- TechnicalStatusEquipmentSelect,
- EamTechnicalStatusEvaluationOrderModal
- },
- data() {
- return {
- description: '鎶�鏈姸鎬侀壌瀹氬伐鍗曠鐞嗛〉闈�',
- // 琛ㄥご
- columns: [
- {
- title: '#',
- dataIndex: '',
- key: 'rowIndex',
- width: 60,
- align: 'center',
- customRender: function(t, r, index) {
- return parseInt(index) + 1
+ export default {
+ name: 'EamTechnicalStatusEvaluationOrderList',
+ mixins: [JeecgListMixin],
+ components: {
+ TechnicalStatusEvaluationApprovalModal,
+ LxSearchEquipmentSelect,
+ EamTechnicalStatusEvaluationOrderModal,
+ EamTechnicalStatusEvaluationOrderChangeModal
+ },
+ data() {
+ return {
+ description: '鎶�鏈姸鎬侀壌瀹氬伐鍗曠鐞嗛〉闈�',
+ selectedOrderData: {},
+ // 琛ㄥご
+ columns: [
+ {
+ title: '#',
+ dataIndex: '',
+ key: 'rowIndex',
+ width: 60,
+ align: 'center',
+ customRender: function(t, r, index) {
+ return parseInt(index) + 1
+ },
+ fixed: 'left'
},
- 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',
- dataIndex: 'orderNum',
- fixed: 'left'
- },
- {
- title: '璁″垝閴村畾鏃ユ湡',
- align: 'center',
- dataIndex: 'evaluationDate',
- fixed: 'left'
- },
- {
- title: '閿佸畾宸ュ崟鏃ユ湡',
- align: 'center',
- dataIndex: 'freezeOrderDate'
- },
- {
- title: '宸ュ崟杩囨湡鏃ユ湡',
- align: 'center',
- dataIndex: 'orderExpirationDate'
- },
- {
- title: '瀹為檯寮�濮嬫椂闂�',
- align: 'center',
- dataIndex: 'actualStartTime'
- },
- {
- title: '瀹為檯缁撴潫鏃堕棿',
- align: 'center',
- dataIndex: 'actualEndTime'
- },
- {
- title: '閴村畾浜�',
- align: 'center',
- dataIndex: 'evaluator'
- },
- {
- title: '閴村畾鐘舵��',
- align: 'center',
- dataIndex: 'evaluationStatus_dictText'
- },
- {
- title: '鍒涘缓鏂瑰紡',
- align: 'center',
- dataIndex: 'creationMethod_dictText'
- },
- {
- title: '瀹夊叏瑁呯疆妫�鏌ョ粨鏋�',
- align: 'center',
- dataIndex: 'safetyEquipmentCheckResult'
- },
- {
- title: '绮惧害鍙傛暟妫�鏌ョ粨鏋�',
- align: 'center',
- dataIndex: 'precisionCheckResult'
- },
- {
- title: '鍔熻兘鐘舵�佹鏌ョ粨鏋�',
- align: 'center',
- dataIndex: 'functionalCheckResult'
- },
- {
- title: '鍏朵粬妫�鏌ョ粨鏋�',
- align: 'center',
- dataIndex: 'otherCheckResult'
- },
- {
- title: '缁翠慨瀹や富浠荤瀛�',
- align: 'center',
- dataIndex: 'repairManagerSignature'
- },
- {
- title: '缁翠慨瀹や富浠荤瀛楁椂闂�',
- align: 'center',
- dataIndex: 'repairManagerSignatureTime1'
- },
- {
- title: '璇曚欢妫�鏌ョ粨鏋�',
- align: 'center',
- dataIndex: 'sampleCheckResult'
- },
- {
- title: '宸ヨ壓鍛樼瀛�',
- align: 'center',
- dataIndex: 'processTechnicianSignature'
- },
- {
- title: '宸ヨ壓鍛樼瀛楁椂闂�',
- align: 'center',
- dataIndex: 'processTechnicianSignatureTime'
- },
- {
- title: '閴村畾缁撴灉',
- align: 'center',
- dataIndex: 'evaluationResult'
- },
- {
- title: '闄�/绂佺敤鍘熷洜',
- align: 'center',
- dataIndex: 'evaluationReason'
- },
- {
- title: '璁惧妫�鏌ヤ汉绛惧瓧',
- align: 'center',
- dataIndex: 'inspectorSignature'
- },
- {
- title: '璁惧妫�鏌ヤ汉绛惧瓧鏃堕棿',
- align: 'center',
- dataIndex: 'inspectorSignatureTime'
- },
- {
- title: '闄勫綍A HF缂栫爜',
- align: 'center',
- dataIndex: 'hfCodeA'
- },
- {
- title: '闄勫綍B HF缂栫爜',
- align: 'center',
- dataIndex: 'hfCodeB'
- },
- {
- title: '闄勫綍C HF缂栫爜',
- align: 'center',
- dataIndex: 'hfCodeC'
- },
- {
- title: '闄勫綍D HF缂栫爜',
- align: 'center',
- dataIndex: 'hfCodeD'
- },
- {
- title: '鎿嶄綔',
- dataIndex: 'action',
- align: 'center',
- scopedSlots: { customRender: 'action' },
- fixed: 'right'
+ {
+ title: '缁熶竴缂栫爜',
+ align: 'center',
+ dataIndex: 'equipmentCode',
+ fixed: 'left'
+ },
+ {
+ title: '璁惧鍚嶇О',
+ align: 'center',
+ dataIndex: 'equipmentName',
+ fixed: 'left'
+ },
+ {
+ title: '璁惧鍨嬪彿',
+ align: 'center',
+ dataIndex: 'equipmentModel',
+ fixed: 'left'
+ },
+ {
+ title: '宸ュ崟鍙�',
+ align: 'center',
+ dataIndex: 'orderNum'
+ },
+ {
+ title: '璁″垝閴村畾鏃ユ湡',
+ align: 'center',
+ dataIndex: 'evaluationDate'
+ },
+ {
+ title: '閿佸畾宸ュ崟鏃ユ湡',
+ align: 'center',
+ dataIndex: 'freezeOrderDate'
+ },
+ {
+ title: '宸ュ崟杩囨湡鏃ユ湡',
+ align: 'center',
+ dataIndex: 'orderExpirationDate'
+ },
+ {
+ title: '瀹為檯寮�濮嬫椂闂�',
+ align: 'center',
+ dataIndex: 'actualStartTime'
+ },
+ {
+ title: '瀹為檯缁撴潫鏃堕棿',
+ align: 'center',
+ dataIndex: 'actualEndTime'
+ },
+ {
+ title: '棰嗗彇浜�',
+ align: 'center',
+ dataIndex: 'evaluator_dictText'
+ },
+ {
+ title: '閴村畾鐘舵��',
+ align: 'center',
+ dataIndex: 'evaluationStatus_dictText'
+ },
+ {
+ title: '鍒涘缓鏂瑰紡',
+ align: 'center',
+ dataIndex: 'creationMethod_dictText'
+ },
+ {
+ title: '瀹夊叏瑁呯疆妫�鏌ョ粨鏋�',
+ align: 'center',
+ dataIndex: 'safetyEquipmentCheckResult'
+ },
+ {
+ title: '绮惧害鍙傛暟妫�鏌ョ粨鏋�',
+ align: 'center',
+ dataIndex: 'precisionCheckResult'
+ },
+ {
+ title: '鍔熻兘鐘舵�佹鏌ョ粨鏋�',
+ align: 'center',
+ dataIndex: 'functionalCheckResult'
+ },
+ {
+ title: '鍏朵粬妫�鏌ョ粨鏋�',
+ align: 'center',
+ dataIndex: 'otherCheckResult'
+ },
+ {
+ title: '缁翠慨瀹や富浠荤瀛�',
+ align: 'center',
+ dataIndex: 'repairManagerSignature'
+ },
+ {
+ title: '缁翠慨瀹や富浠荤瀛楁椂闂�',
+ align: 'center',
+ dataIndex: 'repairManagerSignatureTime1'
+ },
+ {
+ title: '璇曚欢妫�鏌ョ粨鏋�',
+ align: 'center',
+ dataIndex: 'sampleCheckResult'
+ },
+ {
+ title: '宸ヨ壓鍛樼瀛�',
+ align: 'center',
+ dataIndex: 'processTechnicianSignature'
+ },
+ {
+ title: '宸ヨ壓鍛樼瀛楁椂闂�',
+ align: 'center',
+ dataIndex: 'processTechnicianSignatureTime'
+ },
+ {
+ title: '閴村畾缁撴灉',
+ align: 'center',
+ dataIndex: 'evaluationResult'
+ },
+ {
+ title: '闄�/绂佺敤鍘熷洜',
+ align: 'center',
+ dataIndex: 'evaluationReason'
+ },
+ {
+ title: '璁惧妫�鏌ヤ汉绛惧瓧',
+ align: 'center',
+ dataIndex: 'inspectorSignature'
+ },
+ {
+ title: '璁惧妫�鏌ヤ汉绛惧瓧鏃堕棿',
+ align: 'center',
+ dataIndex: 'inspectorSignatureTime'
+ },
+ {
+ title: '闄勫綍A HF缂栫爜',
+ align: 'center',
+ dataIndex: 'hfCodeA'
+ },
+ {
+ title: '闄勫綍B HF缂栫爜',
+ align: 'center',
+ dataIndex: 'hfCodeB'
+ },
+ {
+ title: '闄勫綍C HF缂栫爜',
+ align: 'center',
+ dataIndex: 'hfCodeC'
+ },
+ {
+ 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'
}
- ],
- 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)
}
}
- },
- computed: {
- },
- methods: {
- 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
- }
- })
- }
}
-}
</script>
\ No newline at end of file
--
Gitblit v1.9.3