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/EamReportProductHazardsList.vue | 266 ++++++++++++++++++++++++++++-------------------------
1 files changed, 140 insertions(+), 126 deletions(-)
diff --git a/src/views/eam/repair/EamReportProductHazardsList.vue b/src/views/eam/repair/EamReportProductHazardsList.vue
index 14c19ed..2bbfd70 100644
--- a/src/views/eam/repair/EamReportProductHazardsList.vue
+++ b/src/views/eam/repair/EamReportProductHazardsList.vue
@@ -1,23 +1,60 @@
<template>
<a-card :bordered="false">
+
<!-- 鏌ヨ鍖哄煙 -->
<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="鎶ヤ慨ID">
+ <a-input placeholder="璇疯緭鍏ユ姤淇甀D" v-model="queryParam.reportId"></a-input>
+ </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.equipmentId"></a-input>
+ </a-form-item>
+ </a-col>
+ <template v-if="toggleSearchStatus">
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-form-item label="鎿嶄綔宸�">
+ <a-input placeholder="璇疯緭鍏ユ搷浣滃伐" v-model="queryParam.confirmer"></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.confirmTime"></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.productLoss"></a-input>
+ </a-form-item>
+ </a-col>
+ </template>
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <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>
- <!-- 鏌ヨ鍖哄煙-END -->
<!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
<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>
- <!-- 楂樼骇鏌ヨ鍖哄煙 -->
- <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+<!-- <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>
@@ -36,36 +73,15 @@
<a-table
ref="table"
size="middle"
- :scroll="{x:true}"
bordered
rowKey="id"
:columns="columns"
:dataSource="dataSource"
:pagination="ipagination"
:loading="loading"
+ :scroll="{x:'max-content'}"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
- class="j-table-force-nowrap"
@change="handleTableChange">
-
- <template slot="htmlSlot" slot-scope="text">
- <div v-html="text"></div>
- </template>
- <template slot="imgSlot" slot-scope="text,record">
- <span v-if="!text" style="font-size: 12px;font-style: italic;">鏃犲浘鐗�</span>
- <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
- </template>
- <template slot="fileSlot" slot-scope="text">
- <span v-if="!text" style="font-size: 12px;font-style: italic;">鏃犳枃浠�</span>
- <a-button
- v-else
- :ghost="true"
- type="primary"
- icon="download"
- size="small"
- @click="downloadFile(text)">
- 涓嬭浇
- </a-button>
- </template>
<span slot="action" slot-scope="text, record">
<a @click="handleEdit(record)">缂栬緫</a>
@@ -74,9 +90,6 @@
<a-dropdown>
<a class="ant-dropdown-link">鏇村 <a-icon type="down" /></a>
<a-menu slot="overlay">
- <a-menu-item>
- <a @click="handleDetail(record)">璇︽儏</a>
- </a-menu-item>
<a-menu-item>
<a-popconfirm title="纭畾鍒犻櫎鍚�?" @confirm="() => handleDelete(record.id)">
<a>鍒犻櫎</a>
@@ -88,146 +101,147 @@
</a-table>
</div>
+ <!-- table鍖哄煙-end -->
- <eam-report-product-hazards-modal ref="modalForm" @ok="modalFormOk"></eam-report-product-hazards-modal>
+ <!-- 琛ㄥ崟鍖哄煙 -->
+ <eamReportProductHazards-modal ref="modalForm" @ok="modalFormOk"></eamReportProductHazards-modal>
</a-card>
</template>
<script>
-
import '@/assets/less/TableExpand.less'
- import { mixinDevice } from '@/utils/mixin'
- import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import EamReportProductHazardsModal from './modules/EamReportProductHazardsModal'
+ import { JeecgListMixin } from '@/mixins/JeecgListMixin'
export default {
- name: 'EamReportProductHazardsList',
- mixins:[JeecgListMixin, mixinDevice],
+ name: "EamReportProductHazardsList",
+ mixins:[JeecgListMixin],
components: {
EamReportProductHazardsModal
+ },
+ 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;
- }
+ key: 'rowIndex',
+ width: 60,
+ align: 'center',
+ customRender: function(t, r, index) {
+ return parseInt(index) + 1
+ },
+ fixed: 'left'
},
{
- title:'鎿嶄綔宸�',
+ 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: 'confirmer'
- },
- {
- title:'鎿嶄綔宸ョ‘璁ゆ椂闂�',
+ },
+ {
+ title: '鎿嶄綔宸ョ‘璁ゆ椂闂�',
align:"center",
- dataIndex: 'confirmTime',
- customRender:function (text) {
- return !text?"":(text.length>10?text.substr(0,10):text)
- }
- },
- {
- title:'浜у搧鎹熷け鎯呭喌',
+ dataIndex: 'confirmTime'
+ },
+ {
+ title: '浜у搧鎹熷け鎯呭喌;鏄� 鍚�',
align:"center",
dataIndex: 'productLoss'
- },
- {
- title:'浜у搧鎹熷け璐ㄩ噺褰卞搷鍒嗘瀽',
+ },
+ {
+ title: '浜у搧鎹熷け璐ㄩ噺褰卞搷鍒嗘瀽',
align:"center",
dataIndex: 'qualityAnalysis'
- },
- {
- title:'涓荤宸ヨ壓',
+ },
+ {
+ title: '涓荤宸ヨ壓',
align:"center",
dataIndex: 'technologist'
- },
- {
- title:'涓荤宸ヨ壓纭鏃堕棿',
+ },
+ {
+ title: '涓荤宸ヨ壓纭鏃堕棿',
align:"center",
- dataIndex: 'technologistTime',
- customRender:function (text) {
- return !text?"":(text.length>10?text.substr(0,10):text)
- }
- },
- {
- title:'涓荤宸ヨ壓纭鎰忚',
+ dataIndex: 'technologistTime'
+ },
+ {
+ title: '涓荤宸ヨ壓纭鎰忚',
align:"center",
dataIndex: 'technologistComment'
- },
- {
- title:'閮ㄧ骇棰嗗',
+ },
+ {
+ title: '閮ㄧ骇棰嗗',
align:"center",
dataIndex: 'deputyDepartment'
- },
- {
- title:'閮ㄧ骇棰嗗纭鏃堕棿',
+ },
+ {
+ title: '閮ㄧ骇棰嗗纭鏃堕棿',
align:"center",
- dataIndex: 'deputyDepartmentTime',
- customRender:function (text) {
- return !text?"":(text.length>10?text.substr(0,10):text)
- }
- },
- {
- title:'閮ㄧ骇棰嗗纭鎰忚',
+ dataIndex: 'deputyDepartmentTime'
+ },
+ {
+ title: '閮ㄧ骇棰嗗纭鎰忚',
align:"center",
dataIndex: 'deputyDepartmentComment'
- },
- {
- title: '鎿嶄綔',
- dataIndex: 'action',
- align:"center",
- fixed:"right",
- width:147,
- scopedSlots: { customRender: 'action' }
- }
+ },
],
- url: {
+ selectRepairOrderData: {},
+ url: {
list: "/eam/eamReportProductHazards/list",
delete: "/eam/eamReportProductHazards/delete",
deleteBatch: "/eam/eamReportProductHazards/deleteBatch",
- exportXlsUrl: "/eam/eamReportProductHazards/exportXls",
+ exportXlsUrl: "eam/eamReportProductHazards/exportXls",
importExcelUrl: "eam/eamReportProductHazards/importExcel",
-
- },
- dictOptions:{},
- superFieldList:[],
- }
- },
+ },
+ }
+ },
created() {
- this.getSuperFieldList();
- },
- computed: {
- importExcelUrl: function(){
- return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
- },
+ if (!this.isDisplayOperation) this.queryParam = Object.assign({}, this.propsQueryParam)
+ else {
+ const operationColumn = {
+ title: '鎿嶄綔',
+ dataIndex: 'action',
+ align: 'center',
+ scopedSlots: { customRender: 'action' },
+ width: 200,
+ fixed: 'right'
+ }
+ this.columns = [...this.columns, operationColumn]
+ }
+ this.loadData(1)
},
methods: {
- initDictConfig(){
- },
- getSuperFieldList(){
- let fieldList=[];
- fieldList.push({type:'string',value:'reportId',text:'鎶ヤ慨ID',dictCode:''})
- fieldList.push({type:'string',value:'equipmentId',text:'璁惧ID',dictCode:''})
- fieldList.push({type:'string',value:'confirmer',text:'鎿嶄綔宸�',dictCode:''})
- fieldList.push({type:'date',value:'confirmTime',text:'鎿嶄綔宸ョ‘璁ゆ椂闂�'})
- fieldList.push({type:'string',value:'productLoss',text:'浜у搧鎹熷け鎯呭喌',dictCode:''})
- fieldList.push({type:'string',value:'qualityAnalysis',text:'浜у搧鎹熷け璐ㄩ噺褰卞搷鍒嗘瀽',dictCode:''})
- fieldList.push({type:'string',value:'technologist',text:'涓荤宸ヨ壓',dictCode:''})
- fieldList.push({type:'date',value:'technologistTime',text:'涓荤宸ヨ壓纭鏃堕棿'})
- fieldList.push({type:'string',value:'technologistComment',text:'涓荤宸ヨ壓纭鎰忚',dictCode:''})
- fieldList.push({type:'string',value:'deputyDepartment',text:'閮ㄧ骇棰嗗',dictCode:''})
- fieldList.push({type:'date',value:'deputyDepartmentTime',text:'閮ㄧ骇棰嗗纭鏃堕棿'})
- fieldList.push({type:'string',value:'deputyDepartmentComment',text:'閮ㄧ骇棰嗗纭鎰忚',dictCode:''})
- this.superFieldList = fieldList
- }
+
}
}
</script>
--
Gitblit v1.9.3