From 89a699602d78bb55c6ac70c5e9fd0306429d5e23 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期二, 29 四月 2025 09:31:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/eam/repair/EamReportRepairList.vue | 63 +++++++++++++++++++------------
1 files changed, 39 insertions(+), 24 deletions(-)
diff --git a/src/views/eam/repair/EamReportRepairList.vue b/src/views/eam/repair/EamReportRepairList.vue
index fb7d04e..54655ba 100644
--- a/src/views/eam/repair/EamReportRepairList.vue
+++ b/src/views/eam/repair/EamReportRepairList.vue
@@ -12,28 +12,18 @@
</a-form-item>
</a-col>
<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-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"
@@ -69,11 +59,11 @@
<!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
<div class="table-operator" v-if="isDisplayOperation">
<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-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">
@@ -105,7 +95,7 @@
:pagination="ipagination"
:loading="loading"
class="j-table-force-nowrap"
- :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange,type:isDisplayOperation?'checkbox':'radio'}"
+ :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange,type:isDisplayOperation?'checkbox':'radio',getCheckboxProps:getCheckboxProps}"
@change="handleTableChange">
<template slot="imageFiles" slot-scope="text, record" v-if="text">
@@ -114,6 +104,10 @@
<span slot="action" slot-scope="text, record" v-if="record.reportStatus=='WAIT_REPAIR'">
<a @click="handleEdit(record)">缂栬緫</a>
+
+ <a-divider type="vertical"/>
+
+ <a @click="handleAssign(record)">鎸囨淳</a>
<a-divider type="vertical"/>
@@ -131,6 +125,8 @@
@ok="modalFormOk"/>
<!-- 鍥剧墖棰勮寮圭獥 -->
<images-preview-modal ref="imagesPreviewModalRef" :imageListUrl="currentImageListUrl"/>
+ <!--鎸囨淳鎶ヤ慨寮圭獥-->
+ <assign-repair-report-modal ref="assignRepairReportModalRef" @ok="modalFormOk"/>
</a-card>
</template>
@@ -142,12 +138,14 @@
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: {
+ AssignRepairReportModal,
ImagesPreviewModal,
LxSearchEquipmentSelect,
EamReportRepairModal
@@ -184,7 +182,7 @@
width: 200
},
{
- title: '鐘舵��',
+ title: '鎶ヤ慨鐘舵��',
align: 'center',
dataIndex: 'reportStatus_dictText',
width: 100
@@ -255,17 +253,17 @@
created() {
this.initDictData('breakdown_flag')
this.initDictData('report_repair_status')
- this.getFaultReasonListByApi()
- if (!this.isDisplayOperation) this.queryParam = Object.assign({} ,this.propsQueryParam)
+ if (!this.isDisplayOperation) this.queryParam = Object.assign({}, this.propsQueryParam)
else {
const operationColumn = {
title: '鎿嶄綔',
dataIndex: 'action',
align: 'center',
scopedSlots: { customRender: 'action' },
- width: 150
+ width: 200
}
this.columns = [...this.columns, operationColumn]
+ this.getFaultReasonListByApi()
}
this.loadData(1)
},
@@ -317,6 +315,23 @@
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)
--
Gitblit v1.9.3