From 31d62d0ac0bf6fdcb200ffeaa7b4e15aaf2d4946 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期五, 25 七月 2025 16:40:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/eam/repair/EamReportAccidentsRegisterList.vue | 567 +++++++++++++++++++++++++++++---------------------------
1 files changed, 293 insertions(+), 274 deletions(-)
diff --git a/src/views/eam/repair/EamReportAccidentsRegisterList.vue b/src/views/eam/repair/EamReportAccidentsRegisterList.vue
index 2d8df63..e2df2e8 100644
--- a/src/views/eam/repair/EamReportAccidentsRegisterList.vue
+++ b/src/views/eam/repair/EamReportAccidentsRegisterList.vue
@@ -5,121 +5,97 @@
<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="6" :lg="7" :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-form-item label="鎶ヤ慨ID">
- <a-input placeholder="璇疯緭鍏ユ姤淇甀D" v-model="queryParam.reportId"></a-input>
+ <a-col :xl="6" :lg="7" :md="8" :sm="12">
+ <a-form-item label="鐧昏鐘舵��">
+ <j-dict-select-tag placeholder="璇烽�夋嫨鐧昏鐘舵��" v-model="queryParam.registerStatus"
+ dict-code="eam_report_accidents_register_status"/>
</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-form-item>
- </a-col>
- <a-col :xl="6" :lg="7" :md="8" :sm="24">
- <a-form-item label="鏄惁鏈夎澶囨搷浣滆瘉;鏄� 鍚�">
- <a-input placeholder="璇疯緭鍏ユ槸鍚︽湁璁惧鎿嶄綔璇�;鏄� 鍚�" v-model="queryParam.operationCertificate"></a-input>
- </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.powerOffRestart"></a-input>
- </a-form-item>
- </a-col>
- </template>
- <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-col :xl="6" :lg="7" :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>
- <!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
- <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" :scroll="{x:'max-content'}" @change="handleTableChange">
- <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">
+ <!--鏄惁鏈夎澶囨搷浣滆瘉-->
+ <template slot="operationCertificate" slot-scope="text">
+ <a-switch checked-children="鏄�" un-checked-children="鍚�" :checked="Boolean(+text)" disabled/>
+ </template>
- <span slot="action" slot-scope="text, record">
- <a @click="handleEdit(record)">缂栬緫</a>
+ <!--鏄惁鏂數閲嶅惎-->
+ <template slot="powerOffRestart" slot-scope="text">
+ <a-switch checked-children="鏄�" un-checked-children="鍚�" :checked="Boolean(+text)" disabled/>
+ </template>
- <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>
+ <!--鏄惁涓烘壒娆￠浠�-->
+ <template slot="batchFirstPiece" slot-scope="text">
+ <a-switch checked-children="鏄�" un-checked-children="鍚�" :checked="Boolean(+text)" disabled/>
+ </template>
+
+ <!--鍙樺姩鍥犵礌-->
+ <template slot="variableFactors" slot-scope="text">
+ <a-switch checked-children="鏄�" un-checked-children="鍚�" :checked="Boolean(+text)" disabled/>
+ </template>
+
+ <!--鍘熷洜鍒嗘瀽鏍稿-->
+ <template slot="checkAgree" slot-scope="text">
+ <a-switch v-if="text" checked-children="鍚屾剰" un-checked-children="涓嶅悓鎰�" :checked="Boolean(text)" disabled/>
+ </template>
+
+ <span slot="action" slot-scope="text, record">
+ <template v-if="record.registerStatus==='PENDING_SUBMIT'">
+ <a @click="handleEdit(record)">缂栬緫</a>
+ <a-divider type="vertical"/>
+ <a-popconfirm title="纭畾鎻愪氦鍚�?" @confirm="() => handleSubmit(record.id)">
+ <a>鎻愪氦</a>
+ </a-popconfirm>
+ </template>
+
+ <a v-else @click="handleDetail(record)">璇︽儏</a>
</span>
- </a-table>
- </div>
+ </a-table>
<!-- table鍖哄煙-end -->
<!-- 琛ㄥ崟鍖哄煙 -->
- <eamReportAccidentsRegister-modal ref="modalForm" @ok="modalFormOk"></eamReportAccidentsRegister-modal>
+ <eamReportAccidentsRegister-modal ref="modalForm" @ok="modalFormOk"/>
+
+ <!--瀹℃壒绐楀彛-->
+ <report-accidents-register-approval-modal ref="reportAccidentsRegisterApprovalModal"
+ :selectShenpiData="selectedRowData"/>
</a-card>
</template>
<script>
- import '@/assets/less/TableExpand.less'
import EamReportAccidentsRegisterModal from './modules/EamReportAccidentsRegisterModal'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+ import LxSearchEquipmentSelect from '../equipment/modules/LxSearchEquipmentSelect'
+ import { getAction } from '@/api/manage'
+ import ReportAccidentsRegisterApprovalModal
+ from '../../flowable/workflow/repairOrder/ReportAccidentsRegisterApprovalModal'
export default {
- name: "EamReportAccidentsRegisterList",
- mixins:[JeecgListMixin],
+ name: 'EamReportAccidentsRegisterList',
+ mixins: [JeecgListMixin],
components: {
+ ReportAccidentsRegisterApprovalModal,
+ LxSearchEquipmentSelect,
EamReportAccidentsRegisterModal
},
- data () {
+ data() {
return {
description: '璁惧浜嬫晠鐧昏琛ㄧ鐞嗛〉闈�',
// 琛ㄥご
@@ -127,259 +103,302 @@
{
title: '#',
dataIndex: '',
- key:'rowIndex',
- width:60,
- align:"center",
- customRender:function (t,r,index) {
- return parseInt(index)+1;
- }
- },
- {
- title: '鍒犻櫎鏍囪',
- align:"center",
- dataIndex: 'delFlag'
- },
- {
- title: '鎶ヤ慨ID',
- align:"center",
- dataIndex: 'reportId'
- },
- {
- title: '璁惧ID',
- align:"center",
- dataIndex: 'equipmentId'
- },
- {
- title: '鏄惁鏈夎澶囨搷浣滆瘉;鏄� 鍚�',
- align:"center",
- dataIndex: 'operationCertificate'
- },
- {
+ key: 'rowIndex',
+ width: 60,
+ align: 'center',
+ customRender: function(t, r, index) {
+ return parseInt(index) + 1
+ },
+ fixed: 'left'
+ },
+ {
+ title: '缁熶竴缂栫爜',
+ align: 'center',
+ dataIndex: 'equipmentCode',
+ fixed: 'left',
+ scopedSlots: { customRender: 'equipmentCode' }
+ },
+ {
+ title: '璁惧鍚嶇О',
+ align: 'center',
+ dataIndex: 'equipmentName',
+ fixed: 'left'
+ },
+ {
+ title: '璁惧鍨嬪彿',
+ align: 'center',
+ dataIndex: 'equipmentModel',
+ fixed: 'left'
+ },
+ {
+ title: '鐧昏鐘舵��',
+ align: 'center',
+ dataIndex: 'registerStatus_dictText',
+ fixed: 'left'
+ },
+ {
+ title: '搴熷搧浠跺彿',
+ align: 'center',
+ dataIndex: 'scrapPartNumber'
+ },
+ {
+ title: '搴熷搧浠舵暟',
+ align: 'center',
+ dataIndex: 'scrapPartQuantity'
+ },
+ {
+ title: '搴熷搧浠峰��',
+ align: 'center',
+ dataIndex: 'scrapPartValue'
+ },
+ {
+ title: '鏄惁鏈夎澶囨搷浣滆瘉',
+ align: 'center',
+ dataIndex: 'operationCertificate',
+ scopedSlots: { customRender: 'operationCertificate' }
+ },
+ {
title: '鏄惁鏂數閲嶅惎',
- align:"center",
- dataIndex: 'powerOffRestart'
- },
- {
+ align: 'center',
+ dataIndex: 'powerOffRestart',
+ scopedSlots: { customRender: 'powerOffRestart' }
+ },
+ {
title: '鏄惁涓烘壒娆￠浠�',
- align:"center",
- dataIndex: 'batchFirstPiece'
- },
- {
- title: '鍙樺姩鍥犵礌;濉啓鏄垨鍚�',
- align:"center",
- dataIndex: 'variableFactors'
- },
- {
- title: '鍙樺姩鍥犵礌鍐呭;鍒�鍏锋洿鎹€�佸伐鑹烘洿鏀广�佸姞宸ョ▼搴忔洿鏀广�佸垁鍏疯ˉ鍋垮�兼洿鏀广��',
- align:"center",
- dataIndex: 'variableFactorsValue'
- },
- {
+ align: 'center',
+ dataIndex: 'batchFirstPiece',
+ scopedSlots: { customRender: 'batchFirstPiece' }
+ },
+ {
+ title: '鍙樺姩鍥犵礌',
+ align: 'center',
+ dataIndex: 'variableFactors',
+ scopedSlots: { customRender: 'variableFactors' }
+ },
+ {
+ title: '鍙樺姩鍥犵礌鍐呭',
+ align: 'center',
+ dataIndex: 'variableFactorsValue_dictText'
+ },
+ {
title: '鎵ц绋嬪簭',
- align:"center",
+ align: 'center',
dataIndex: 'executeNc'
- },
- {
+ },
+ {
title: '浜嬫晠鐜拌薄',
- align:"center",
+ align: 'center',
dataIndex: 'accidentPhenomenon'
- },
- {
+ },
+ {
title: '閲囧彇鎺柦',
- align:"center",
+ align: 'center',
dataIndex: 'measure'
- },
- {
+ },
+ {
title: '閫犳垚缁撴灉',
- align:"center",
+ align: 'center',
dataIndex: 'causingResults'
- },
- {
+ },
+ {
title: '鎿嶄綔宸�',
- align:"center",
- dataIndex: 'confirmer'
- },
- {
+ align: 'center',
+ dataIndex: 'confirmer_dictText'
+ },
+ {
title: '鎿嶄綔宸ョ‘璁ゆ椂闂�',
- align:"center",
+ align: 'center',
dataIndex: 'confirmTime'
- },
- {
+ },
+ {
title: '鍖洪暱',
- align:"center",
- dataIndex: 'district'
- },
- {
+ align: 'center',
+ dataIndex: 'district_dictText'
+ },
+ {
title: '鍖洪暱纭鏃堕棿',
- align:"center",
+ align: 'center',
dataIndex: 'districtTime'
- },
- {
+ },
+ {
title: '涓績涓讳换',
- align:"center",
- dataIndex: 'centerDirector'
- },
- {
+ align: 'center',
+ dataIndex: 'centerDirector_dictText'
+ },
+ {
title: '涓績涓讳换纭鏃堕棿',
- align:"center",
+ align: 'center',
dataIndex: 'centerDirectorTime'
- },
- {
+ },
+ {
title: '缁翠慨寮�濮嬫椂闂�',
- align:"center",
+ align: 'center',
dataIndex: 'reportStartTime'
- },
- {
+ },
+ {
title: '璁惧鐘舵��',
- align:"center",
- dataIndex: 'equipmentStatus'
- },
- {
+ align: 'center',
+ dataIndex: 'equipmentStatus_dictText'
+ },
+ {
title: '鍘熷洜鍒嗘瀽',
- align:"center",
+ align: 'center',
dataIndex: 'causeAnalysis'
- },
- {
+ },
+ {
title: '妫�鏌ョ粨鏋�',
- align:"center",
- dataIndex: 'inspectionResults'
- },
- {
+ align: 'center',
+ dataIndex: 'inspectionResults_dictText'
+ },
+ {
title: '閲囧彇鎺柦',
- align:"center",
+ align: 'center',
dataIndex: 'takeSteps'
- },
- {
+ },
+ {
title: '寤鸿閲囧彇鎺柦',
- align:"center",
+ align: 'center',
dataIndex: 'suggestionTakeSteps'
- },
- {
+ },
+ {
title: '寤鸿閲囧彇鎺柦鏃堕棿',
- align:"center",
+ align: 'center',
dataIndex: 'suggestionTakeStepsTime'
- },
- {
+ },
+ {
title: '缁翠慨纭',
- align:"center",
- dataIndex: 'repairConfirm'
- },
- {
- title: '缁翠慨纭鎰忚',
- align:"center",
- dataIndex: 'repairConfirmComment'
- },
- {
+ align: 'center',
+ dataIndex: 'repairConfirm_dictText'
+ },
+ {
title: '缁翠慨纭鏃堕棿',
- align:"center",
+ align: 'center',
dataIndex: 'repairConfirmTime'
- },
- {
+ },
+ {
title: '缁翠慨缁勯暱纭',
- align:"center",
- dataIndex: 'repairGroupLeader'
- },
- {
- title: '缁翠慨缁勯暱鎰忚',
- align:"center",
- dataIndex: 'repairGroupLeaderComment'
- },
- {
+ align: 'center',
+ dataIndex: 'repairGroupLeader_dictText'
+ },
+ {
title: '缁翠慨缁勯暱纭鏃堕棿',
- align:"center",
+ align: 'center',
dataIndex: 'repairGroupLeaderTime'
- },
- {
+ },
+ {
title: '缁翠慨缁勯暱纭',
- align:"center",
- dataIndex: 'repairDistrict'
- },
- {
- title: '缁翠慨缁勯暱鎰忚',
- align:"center",
- dataIndex: 'repairDistrictComment'
- },
- {
+ align: 'center',
+ dataIndex: 'repairDistrict_dictText'
+ },
+ {
title: '缁翠慨缁勯暱纭鏃堕棿',
- align:"center",
+ align: 'center',
dataIndex: 'repairDistrictTime'
- },
- {
- title: '鍘熷洜鍒嗘瀽鏍稿;鍚屾剰銆佷笉鍚屾剰',
- align:"center",
- dataIndex: 'checkAgree'
- },
- {
+ },
+ {
+ title: '鍘熷洜鍒嗘瀽鏍稿',
+ align: 'center',
+ dataIndex: 'checkAgree',
+ scopedSlots: { customRender: 'checkAgree' }
+ },
+ {
title: '涓嶅悓鎰忓師鍥犲垎鏋�',
- align:"center",
+ align: 'center',
dataIndex: 'disagreeReason'
- },
- {
+ },
+ {
title: '鏁存敼鎺柦',
- align:"center",
+ align: 'center',
dataIndex: 'rectificationMeasures'
- },
- {
+ },
+ {
title: '浜嬫晠缁撹',
- align:"center",
+ align: 'center',
dataIndex: 'accidentConclusion'
- },
- {
+ },
+ {
title: '鎶�鏈礋璐ｄ汉',
- align:"center",
- dataIndex: 'technicalDirector'
- },
- {
+ align: 'center',
+ dataIndex: 'technicalDirector_dictText'
+ },
+ {
title: '鎶�鏈礋璐ｄ汉纭鏃堕棿',
- align:"center",
+ align: 'center',
dataIndex: 'technicalDirectorTime'
- },
- {
+ },
+ {
title: '鎶�鏈富绠″绾ч瀵�',
- align:"center",
- dataIndex: 'technicalDirectorLeader'
- },
- {
+ align: 'center',
+ dataIndex: 'technicalDirectorLeader_dictText'
+ },
+ {
title: '鎶�鏈富绠″绾ч瀵肩‘璁ゆ椂闂�',
- align:"center",
+ align: 'center',
dataIndex: 'technicalDirectorLeaderTime'
- },
- {
+ },
+ {
title: '涓荤閮ㄧ骇棰嗗',
- align:"center",
- dataIndex: 'technicalDirectorPart'
- },
- {
+ align: 'center',
+ dataIndex: 'technicalDirectorPart_dictText'
+ },
+ {
title: '涓荤閮ㄧ骇棰嗗纭鏃堕棿',
- align:"center",
+ align: 'center',
dataIndex: 'technicalDirectorPartTime'
- },
+ },
{
title: '鎿嶄綔',
dataIndex: 'action',
- align:"center",
+ align: 'center',
scopedSlots: { customRender: 'action' },
+ width: 200,
+ fixed: 'right'
}
],
- url: {
- list: "/eam/eamReportAccidentsRegister/list",
- delete: "/eam/eamReportAccidentsRegister/delete",
- deleteBatch: "/eam/eamReportAccidentsRegister/deleteBatch",
- exportXlsUrl: "eam/eamReportAccidentsRegister/exportXls",
- importExcelUrl: "eam/eamReportAccidentsRegister/importExcel",
- },
- }
- },
- computed: {
- importExcelUrl: function(){
- return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
- }
- },
+ selectedRowData: {},
+ url: {
+ list: '/eam/eamReportAccidentsRegister/list',
+ submit: '/eam/eamReportAccidentsRegister/submit',
+ delete: '/eam/eamReportAccidentsRegister/delete'
+ }
+ }
+ },
methods: {
-
+ /**
+ * 鐐瑰嚮鎻愪氦鏃惰Е鍙�
+ * @param id
+ */
+ handleSubmit(id) {
+ this.loading = true
+ getAction(this.url.submit, { id })
+ .then(res => {
+ if (res.success) {
+ this.$notification.success({
+ message: '娑堟伅',
+ description: res.message
+ })
+ this.loadData()
+ } else {
+ this.$notification.warning({
+ message: '娑堟伅',
+ description: res.message
+ })
+ this.loading = false
+ }
+ })
+ },
+
+ /**
+ * 鐐瑰嚮璇︽儏鏃惰Е鍙戞椂瑙﹀彂
+ * @param record
+ */
+ handleDetail(record) {
+ this.selectedRowData = Object.assign({}, record)
+ this.$refs.reportAccidentsRegisterApprovalModal.title = '璇︽儏'
+ this.$refs.reportAccidentsRegisterApprovalModal.disableSubmit = true
+ this.$refs.reportAccidentsRegisterApprovalModal.visible = true
+ this.$refs.reportAccidentsRegisterApprovalModal.handleDetail(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