From 5ec150affc0fc777b2a645a888d377f65501e08b Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期五, 05 九月 2025 10:06:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/eam/maintenance/EamInspectionOrderList.vue | 98 +++++++++++++++++++++++++++++++++++++++----------
1 files changed, 78 insertions(+), 20 deletions(-)
diff --git a/src/views/eam/maintenance/EamInspectionOrderList.vue b/src/views/eam/maintenance/EamInspectionOrderList.vue
index 7342365..81f848c 100644
--- a/src/views/eam/maintenance/EamInspectionOrderList.vue
+++ b/src/views/eam/maintenance/EamInspectionOrderList.vue
@@ -40,21 +40,35 @@
<!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
<div class="table-operator" v-if="isDisplayOperation">
<a-button v-has="'eam:inspection:add'" @click="handleAdd" type="primary" icon="plus">鏂板</a-button>
- <a-dropdown v-if="selectedRowKeys.length > 0">
- <a-menu slot="overlay">
- <a-menu-item key="1" @click="batchZf('ABOLISH')" v-has="'eam:inspection:abolish'">
- <a-icon type="snippets"/>
- 浣滃簾
- </a-menu-item>
- <a-menu-item key="2" @click="batchLq('UNDER_INSPECTION')" v-has="'eam:inspection:collect'">
- <a-icon type="form"/>
- 棰嗗彇
- </a-menu-item>
- </a-menu>
- <a-button style="margin-left: 8px"> 鎵归噺鎿嶄綔
- <a-icon type="down"/>
- </a-button>
- </a-dropdown>
+ <!--<a-dropdown v-if="selectedRowKeys.length > 0">-->
+ <!--<a-menu slot="overlay">-->
+ <!--<a-menu-item key="1" @click="batchZf('ABOLISH')" v-has="'eam:inspection:abolish'">-->
+ <!--<a-icon type="snippets"/>-->
+ <!--浣滃簾-->
+ <!--</a-menu-item>-->
+ <!--<a-menu-item key="2" @click="batchLq('UNDER_INSPECTION')" v-has="'eam:inspection:collect'">-->
+ <!--<a-icon type="form"/>-->
+ <!--棰嗗彇-->
+ <!--</a-menu-item>-->
+ <!--<a-menu-item key="3" @click="handleBatchPrint">-->
+ <!--<a-icon type="printer"/>-->
+ <!--鎵撳嵃-->
+ <!--</a-menu-item>-->
+ <!--</a-menu>-->
+ <!--<a-button style="margin-left: 8px"> 鎵归噺鎿嶄綔-->
+ <!--<a-icon type="down"/>-->
+ <!--</a-button>-->
+ <!--</a-dropdown>-->
+
+
+ <a-button type="primary" icon="form" @click="batchLq('UNDER_INSPECTION')" v-has="'eam:inspection:collect'"
+ :disabled="selectedRowKeys.length===0">鎵归噺棰嗗彇
+ </a-button>
+ <a-button type="primary" icon="monitor" @click="handleBatchPrint" :disabled="selectedRowKeys.length===0">鎵归噺棰勮
+ </a-button>
+ <a-button type="danger" icon="delete" @click="batchZf('ABOLISH')" v-has="'eam:inspection:abolish'"
+ :disabled="selectedRowKeys.length===0">鎵归噺浣滃簾
+ </a-button>
</div>
<!-- table鍖哄煙-begin -->
@@ -69,6 +83,12 @@
:dataSource="dataSource" :pagination="ipagination" :loading="loading"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" class="j-table-force-nowrap"
@change="handleTableChange">
+
+ <!--浣跨敤閮ㄩ棬-->
+ <template slot="factoryOrgCode" slot-scope="text,record">
+ {{[record.zxfactoryOrgCode_dictText].filter(item=>item).join('/')}}
+ </template>
+
<span slot="action" slot-scope="text, record">
<template v-if=" record.inspectionStatus === 'WAIT_INSPECTION'">
<a @click="handleEdit(record)">缂栬緫</a>
@@ -97,20 +117,26 @@
</template>
<template v-else>
- <template v-if="record.inspectionStatus=='COMPLETE'">
- <a @click="handlePrint(record)">棰勮</a>
- <a-divider type="vertical"/>
- </template>
-
<a @click="handleDetail(record)">璇︽儏</a>
+
+ <template v-if="record.inspectionStatus=='COMPLETE'">
+ <a-divider type="vertical"/>
+
+ <a @click="handlePrint(record)">棰勮</a>
+ </template>
</template>
</span>
</a-table>
</div>
+ <!--琛ㄥ崟寮圭獥-->
<eam-inspection-order-modal ref="modalForm" @ok="modalFormOk"/>
+ <!--瀹℃壒寮圭獥-->
<inspection-order-handle ref="modalFormXq" :selectShenpiData="selectInspectionOrderXqData"/>
+
+ <!--鎵归噺鎵撳嵃寮圭獥-->
+ <eam-inspection-order-batch-print-modal ref="batchPrintModal"/>
</a-card>
</template>
@@ -120,11 +146,13 @@
import { deleteAction, getAction } from '@api/manage'
import InspectionOrderHandle from '../../flowable/workflow/InspectionOrder/InspectionOrderHandle'
import LxSearchEquipmentSelect from '../equipment/modules/LxSearchEquipmentSelect'
+ import EamInspectionOrderBatchPrintModal from './modules/EamInspectionOrderBatchPrintModal'
export default {
name: 'EamInspectionOrderList',
mixins: [JeecgListMixin],
components: {
+ EamInspectionOrderBatchPrintModal,
LxSearchEquipmentSelect,
InspectionOrderHandle,
EamInspectionOrderModal
@@ -168,6 +196,12 @@
title: '璁惧鍨嬪彿',
align: 'center',
dataIndex: 'equipmentModel',
+ fixed: 'left'
+ },
+ {
+ title: '浣跨敤閮ㄩ棬',
+ align: 'center',
+ scopedSlots: { customRender: 'factoryOrgCode' },
fixed: 'left'
},
{
@@ -281,6 +315,10 @@
this.$refs.modalFormXq.handleDetail(record)
},
+ /**
+ * 棰嗗彇
+ * @param id
+ */
handleInspection(id) {
var that = this
this.loading = true
@@ -302,6 +340,10 @@
})
},
+ /**
+ * 浣滃簾
+ * @param id
+ */
handleAbolish(id) {
var that = this
this.loading = true
@@ -323,6 +365,10 @@
})
},
+ /**
+ * 鎵归噺浣滃簾
+ * @param type
+ */
batchZf(type) {
var ids = ''
for (var a = 0; a < this.selectedRowKeys.length; a++) {
@@ -356,6 +402,10 @@
})
},
+ /**
+ * 鎵归噺棰嗗彇
+ * @param type
+ */
batchLq(type) {
var ids = ''
for (var a = 0; a < this.selectedRowKeys.length; a++) {
@@ -390,11 +440,19 @@
})
},
+ /**
+ * 棰勮
+ * @param record
+ */
handlePrint(record) {
let href = `${window._CONFIG['domianURL']}/jmreport/view/1105664887569121280?equipmentCode=` + record.equipmentCode
window.open(href, '_blank')
},
+ handleBatchPrint() {
+ this.$refs.batchPrintModal.handlePreview(this.selectedRowKeys.join())
+ },
+
onInspectionDateChange: function(value, dateString) {
this.queryParam.inspectionDateBegin = dateString[0]
this.queryParam.inspectionDateEnd = dateString[1]
--
Gitblit v1.9.3