From f6f8dc9a6d4111a541fffe105d3979b40a2c2f75 Mon Sep 17 00:00:00 2001
From: Houjie <714924425@qq.com>
Date: 星期二, 10 六月 2025 09:42:15 +0800
Subject: [PATCH] 刀具刃磨-新增异常调整 工具报损 -选择工具调整 刃磨-选择工具调整
---
src/views/eam/repair/EamReportRepairList.vue | 422 ++++++++++++++++++++++++++++------------------------
1 files changed, 225 insertions(+), 197 deletions(-)
diff --git a/src/views/eam/repair/EamReportRepairList.vue b/src/views/eam/repair/EamReportRepairList.vue
index 1dfec40..0984200 100644
--- a/src/views/eam/repair/EamReportRepairList.vue
+++ b/src/views/eam/repair/EamReportRepairList.vue
@@ -7,32 +7,23 @@
<a-row :gutter="24">
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="璁惧缂栧彿">
- <a-input placeholder="璇疯緭鍏ヨ澶囩紪鍙�" v-model="queryParam.equipmentId"/>
+ <!--<a-input placeholder="璇疯緭鍏ヨ澶囩紪鍙�" v-model="queryParam.equipmentId"/>-->
+ <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-form-item label="鍗曟嵁鐘舵��">
- <a-select placeholder="璇烽�夋嫨鍗曟嵁鐘舵��" v-model="queryParam.reportStatus" allow-clear>
+ <a-col :xl="6" :lg="7" :md="8" :sm="24" v-if="isDisplayOperation">
+ <a-form-item label="鎶ヤ慨鐘舵��">
+ <a-select placeholder="璇烽�夋嫨鎶ヤ慨鐘舵��" v-model="queryParam.reportStatus" allow-clear>
<a-select-option v-for="item in report_repair_status_list" :key="item.value">{{ item.label }}
</a-select-option>
</a-select>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
- <a-form-item label="鏁呴殰绠�绉�">
- <!-- <a-select placeholder="璇烽�夋嫨鏁呴殰绠�绉�" v-model="queryParam.faultName" allow-clear>-->
- <!-- <a-select-option v-for="item in faultReasonList" :key="item.faultName">-->
- <!-- {{ item.faultName }}-->
- <!-- </a-select-option>-->
- <!-- </a-select>-->
- <a-input placeholder="璇疯緭鍏ユ晠闅滅畝绉�" v-model="queryParam.faultName" allow-clear/>
+ <a-form-item label="鏁呴殰鎻忚堪">
+ <a-input placeholder="璇疯緭鍏ユ晠闅滄弿杩�" v-model="queryParam.faultDescription" allow-clear/>
</a-form-item>
</a-col>
- <!-- <a-col :xl="6" :lg="7" :md="8" :sm="24">-->
- <!-- <a-form-item label="鏁呴殰鍒嗙被">-->
- <!-- <a-input placeholder="璇疯緭鍏ユ晠闅滃垎绫�" v-model="queryParam.faultType"></a-input>-->
- <!-- </a-form-item>-->
- <!-- </a-col>-->
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="鏁呴殰鏃堕棿">
<a-range-picker showTime v-model="faultTimeRange" value-format="YYYY-MM-DD HH:mm:ss"
@@ -66,16 +57,16 @@
</div>
<!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
- <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>
+ <div class="table-operator" v-if="isDisplayOperation">
+ <a-button @click="handleAdd" type="primary" icon="plus" v-if="isShowAuth('eam:reportRepair:add')">鏂板</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-menu-item key="1" @click="batchDel" v-if="isShowAuth('eam:reportRepair:abolish')">
<a-icon type="delete"/>
浣滃簾
</a-menu-item>
@@ -88,7 +79,7 @@
<!-- table鍖哄煙-begin -->
<div>
- <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+ <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;" v-if="isDisplayOperation">
<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>
@@ -104,7 +95,7 @@
:pagination="ipagination"
:loading="loading"
class="j-table-force-nowrap"
- :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+ :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange,type:isDisplayOperation?'checkbox':'radio',getCheckboxProps:getCheckboxProps}"
@change="handleTableChange">
<template slot="imageFiles" slot-scope="text, record" v-if="text">
@@ -112,23 +103,17 @@
</template>
<span slot="action" slot-scope="text, record" v-if="record.reportStatus=='WAIT_REPAIR'">
- <a @click="handleEdit(record)">缂栬緫</a>
+ <a @click="handleEdit(record)" v-if="isShowAuth('eam:reportRepair:edit')">缂栬緫</a>
- <a-divider type="vertical"/>
+ <a-divider type="vertical" v-if="isShowAuth('eam:reportRepair:edit')"/>
- <a-popconfirm title="纭畾浣滃簾鍚�?" @confirm="() => handleDelete(record.id)">
+ <a @click="handleAssign(record)" v-if="isShowAuth('eam:reportRepair:assign')">鎸囨淳</a>
+
+ <a-divider type="vertical" v-if="isShowAuth('eam:reportRepair:assign')"/>
+
+ <a-popconfirm title="纭畾浣滃簾鍚�?" @confirm="() => handleDelete(record.id)" v-if="isShowAuth('eam:reportRepair:abolish')">
<a>浣滃簾</a>
</a-popconfirm>
- <!-- <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>-->
</span>
</a-table>
@@ -140,185 +125,228 @@
@ok="modalFormOk"/>
<!-- 鍥剧墖棰勮寮圭獥 -->
<images-preview-modal ref="imagesPreviewModalRef" :imageListUrl="currentImageListUrl"/>
+ <!--鎸囨淳鎶ヤ慨寮圭獥-->
+ <assign-repair-report-modal ref="assignRepairReportModalRef" @ok="modalFormOk"/>
</a-card>
</template>
<script>
-import '@/assets/less/TableExpand.less'
-import EamReportRepairModal from './modules/EamReportRepairModal'
-import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-import LxSearchEquipmentSelect from '@views/eam/equipment/modules/LxSearchEquipmentSelect.vue'
-import { ajaxGetDictItems, getDictItemsFromCache } from '@/api/api'
-import ImagesPreviewModal from '@views/eam/repair/modules/ImagesPreviewModal.vue'
-import { getAction } from '@/api/manage'
+ import '@/assets/less/TableExpand.less'
+ import EamReportRepairModal from './modules/EamReportRepairList/EamReportRepairModal'
+ import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+ import LxSearchEquipmentSelect from '@views/eam/equipment/modules/LxSearchEquipmentSelect.vue'
+ import { ajaxGetDictItems, getDictItemsFromCache } from '@/api/api'
+ import ImagesPreviewModal from '@views/eam/repair/modules/ImagesPreviewModal.vue'
+ import { getAction } from '@/api/manage'
+ import AssignRepairReportModal from './modules/EamReportRepairList/AssignRepairReportModal'
-export default {
- name: 'EamReportRepairList',
- mixins: [JeecgListMixin],
- components: {
- ImagesPreviewModal,
- LxSearchEquipmentSelect,
- EamReportRepairModal
- },
- data() {
- return {
- description: '鏁呴殰鎶ヤ慨绠＄悊椤甸潰',
- // 琛ㄥご
- columns: [
- {
- title: '#',
- dataIndex: '',
- key: 'rowIndex',
- width: 60,
- align: 'center',
- customRender: function(t, r, index) {
- return parseInt(index) + 1
+ export default {
+ name: 'EamReportRepairList',
+ mixins: [JeecgListMixin],
+ components: {
+ AssignRepairReportModal,
+ ImagesPreviewModal,
+ LxSearchEquipmentSelect,
+ EamReportRepairModal
+ },
+ props: {
+ isDisplayOperation: {
+ type: Boolean,
+ default: true
+ },
+ propsQueryParam: {
+ type: Object
+ }
+ },
+ data() {
+ return {
+ description: '鏁呴殰鎶ヤ慨绠＄悊椤甸潰',
+ disableMixinCreated: true,
+ // 琛ㄥご
+ columns: [
+ {
+ title: '#',
+ dataIndex: '',
+ key: 'rowIndex',
+ width: 60,
+ align: 'center',
+ customRender: function(t, r, index) {
+ return parseInt(index) + 1
+ }
+ },
+ {
+ title: '璁惧缂栧彿',
+ align: 'center',
+ dataIndex: 'equipmentCode',
+ width: 200
+ },
+ {
+ title: '璁惧鍚嶇О',
+ align: 'center',
+ dataIndex: 'equipmentName',
+ width: 200
+ },
+ {
+ title: '鎶ヤ慨鐘舵��',
+ align: 'center',
+ dataIndex: 'reportStatus_dictText',
+ width: 100
+ },
+ {
+ title: '鏁呴殰绠�绉�',
+ align: 'center',
+ dataIndex: 'faultName',
+ width: 100
+ },
+ {
+ title: '鏁呴殰鍒嗙被',
+ align: 'center',
+ dataIndex: 'faultType_dictText',
+ width: 100
+ },
+ {
+ title: '鏁呴殰鎻忚堪',
+ align: 'center',
+ dataIndex: 'faultDescription',
+ width: 200
+ },
+ {
+ title: '鏁呴殰寮�濮嬫椂闂�',
+ align: 'center',
+ dataIndex: 'faultStartTime',
+ width: 200
+ },
+ {
+ title: '鏄惁鍋滄満',
+ align: 'center',
+ dataIndex: 'breakdownFlag_dictText',
+ width: 100
+ },
+ {
+ title: '鎶ヤ慨鍥剧墖',
+ align: 'center',
+ dataIndex: 'imageFiles',
+ scopedSlots: { customRender: 'imageFiles' },
+ width: 100
+ },
+ {
+ title: '澶囨敞',
+ align: 'center',
+ dataIndex: 'remark'
}
- },
- {
- title: '璁惧缂栧彿',
- align: 'center',
- dataIndex: 'equipmentId_dictText',
- width: 200
- },
- {
- title: '鐘舵��',
- align: 'center',
- dataIndex: 'reportStatus_dictText',
- width: 100
- },
- {
- title: '鏁呴殰绠�绉�',
- align: 'center',
- dataIndex: 'faultName',
- width: 100
- },
- {
- title: '鏁呴殰鍒嗙被',
- align: 'center',
- dataIndex: 'faultType_dictText',
- width: 100
- },
- {
- title: '鏁呴殰鎻忚堪',
- align: 'center',
- dataIndex: 'faultDescription',
- width: 200
- },
- {
- title: '鏁呴殰寮�濮嬫椂闂�',
- align: 'center',
- dataIndex: 'faultStartTime',
- width: 200
- },
- {
- title: '鏄惁鍋滄満',
- align: 'center',
- dataIndex: 'breakdownFlag_dictText',
- width: 100
- },
- {
- title: '鎶ヤ慨鍥剧墖',
- align: 'center',
- dataIndex: 'imageFiles',
- scopedSlots: { customRender: 'imageFiles' },
- width: 100
- },
- {
- title: '澶囨敞',
- align: 'center',
- dataIndex: 'remark'
- },
- {
+ ],
+ breakdown_flag_list: [],
+ report_repair_status_list: [],
+ faultTimeRange: [],
+ faultReasonList: [],
+ currentImageListUrl: '',
+ url: {
+ list: '/eam/eamReportRepair/list',
+ delete: '/eam/eamReportRepair/abolish',
+ deleteBatch: '/eam/eamReportRepair/abolishBatch',
+ exportXlsUrl: 'eam/eamReportRepair/exportXls',
+ importExcelUrl: 'eam/eamReportRepair/importExcel',
+ faultReasonList: '/eam/equipmentFaultReason/list'
+ }
+ }
+ },
+ computed: {
+ importExcelUrl: function() {
+ return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
+ }
+ },
+ created() {
+ this.initDictData('breakdown_flag')
+ this.initDictData('report_repair_status')
+ if (!this.isDisplayOperation) this.queryParam = Object.assign({}, this.propsQueryParam)
+ else {
+ const operationColumn = {
title: '鎿嶄綔',
dataIndex: 'action',
align: 'center',
scopedSlots: { customRender: 'action' },
- width: 150
+ width: 200
}
- ],
- breakdown_flag_list: [],
- report_repair_status_list: [],
- faultTimeRange: [],
- faultReasonList: [],
- currentImageListUrl: '',
- url: {
- list: '/eam/eamReportRepair/list',
- delete: '/eam/eamReportRepair/abolish',
- deleteBatch: '/eam/eamReportRepair/abolishBatch',
- exportXlsUrl: 'eam/eamReportRepair/exportXls',
- importExcelUrl: 'eam/eamReportRepair/importExcel',
- faultReasonList: '/eam/equipmentFaultReason/list'
+ this.columns = [...this.columns, operationColumn]
+ this.getFaultReasonListByApi()
}
- }
- },
- computed: {
- importExcelUrl: function() {
- return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
- }
- },
- created() {
- this.initDictData('breakdown_flag')
- this.initDictData('report_repair_status')
- this.getFaultReasonListByApi()
- },
- methods: {
- /**
- * 鑾峰彇鏁版嵁瀛楀吀鍊�
- * @param dictCode 鏁版嵁瀛楀吀瀵瑰簲璁板綍缂栫爜
- */
- initDictData(dictCode) {
- // //浼樺厛浠庣紦瀛樹腑璇诲彇瀛楀吀閰嶇疆
- if (getDictItemsFromCache(dictCode)) {
- this[dictCode + '_list'] = getDictItemsFromCache(dictCode)
- return
- }
- //鏍规嵁瀛楀吀Code, 鍒濆鍖栧瓧鍏告暟缁�
- ajaxGetDictItems(dictCode, null).then((res) => {
- if (res.success) {
- this[dictCode + '_list'] = res.result
+ this.loadData(1)
+ },
+ methods: {
+ /**
+ * 鑾峰彇鏁版嵁瀛楀吀鍊�
+ * @param dictCode 鏁版嵁瀛楀吀瀵瑰簲璁板綍缂栫爜
+ */
+ initDictData(dictCode) {
+ // //浼樺厛浠庣紦瀛樹腑璇诲彇瀛楀吀閰嶇疆
+ if (getDictItemsFromCache(dictCode)) {
+ this[dictCode + '_list'] = getDictItemsFromCache(dictCode)
return
}
- })
- },
-
- // 璋冪敤鎺ュ彛鑾峰彇鏁呴殰鍘熷洜鍒楄〃
- getFaultReasonListByApi() {
- const that = this
- getAction(this.url.faultReasonList)
- .then(res => {
- console.log('res', res)
- that.faultReasonList = res.result.records
+ //鏍规嵁瀛楀吀Code, 鍒濆鍖栧瓧鍏告暟缁�
+ ajaxGetDictItems(dictCode, null).then((res) => {
+ if (res.success) {
+ this[dictCode + '_list'] = res.result
+ return
+ }
})
- },
+ },
- /**
- * 鏁呴殰鏃堕棿閫夋嫨鍣ㄥ彉鍖栨椂瑙﹀彂
- * @param valueArray
- */
- handleTimeRangeChange(valueArray) {
- this.queryParam.startTime = valueArray[0]
- this.queryParam.endTime = valueArray[1]
- },
+ // 璋冪敤鎺ュ彛鑾峰彇鏁呴殰鍘熷洜鍒楄〃
+ getFaultReasonListByApi() {
+ const that = this
+ getAction(this.url.faultReasonList)
+ .then(res => {
+ console.log('res', res)
+ that.faultReasonList = res.result.records
+ })
+ },
- /**
- * 棰勮鍥剧墖
- * @param imageFiles 琛ㄦ牸琛屽浘鐗囧湴鍧�
- */
- handlePreviewImages({ imageFiles }) {
- this.currentImageListUrl = imageFiles
- this.$refs.imagesPreviewModalRef.visible = true
- },
+ /**
+ * 鏁呴殰鏃堕棿閫夋嫨鍣ㄥ彉鍖栨椂瑙﹀彂
+ * @param valueArray
+ */
+ handleTimeRangeChange(valueArray) {
+ this.queryParam.startTime = valueArray[0]
+ this.queryParam.endTime = valueArray[1]
+ },
- searchReset() {
- this.queryParam = {}
- this.faultTimeRange = []
- this.loadData(1)
+ /**
+ * 棰勮鍥剧墖
+ * @param imageFiles 琛ㄦ牸琛屽浘鐗囧湴鍧�
+ */
+ handlePreviewImages({ imageFiles }) {
+ this.currentImageListUrl = imageFiles
+ this.$refs.imagesPreviewModalRef.visible = true
+ },
+
+ /**
+ * 鎸囨淳鎶ヤ慨鍗�
+ * @param record 琛ㄦ牸琛屼俊鎭�
+ */
+ handleAssign(record) {
+ this.$refs.assignRepairReportModalRef.visible = true
+ this.$refs.assignRepairReportModalRef.model = Object.assign({}, { id: record.id })
+ },
+
+ getCheckboxProps(record) {
+ return {
+ props: {
+ disabled: record.reportStatus !== 'WAIT_REPAIR'
+ }
+ }
+ },
+
+ searchReset() {
+ if (this.isDisplayOperation) this.queryParam = {}
+ else this.queryParam = Object.assign({}, this.propsQueryParam)
+ this.faultTimeRange = []
+ this.loadData(1)
+ }
}
}
-}
</script>
<style scoped>
-@import '~@assets/less/common.less';
+ @import '~@assets/less/common.less';
</style>
\ No newline at end of file
--
Gitblit v1.9.3