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/repair/EamReportProductHazardsList.vue | 11 +++
src/views/eam/maintenance/EamThirdMaintenanceOrderList.vue | 12 ++++
src/views/eam/repair/EamReportRepairList.vue | 11 +++
src/views/eam/technical/EamTechnicalStatusEvaluationApplicationList.vue | 11 +++
src/views/eam/base/EamMaintenanceStandardList.vue | 11 +++
src/views/eam/technical/EamTechnicalStatusEvaluationOrderList.vue | 11 +++
src/views/eam/maintenance/EamInspectionOrderList.vue | 12 ++++
src/views/eam/maintenance/EamThirdMaintenanceChangeList.vue | 12 ++++
src/views/eam/repair/EamReportAccidentsRegisterList.vue | 11 +++
src/views/eam/repair/EamRepairOrderList.vue | 12 ++++
src/views/eam/repair/EamReportThreeNoSpareList.vue | 12 ++++
src/views/eam/technical/EamTechnicalStatusEvaluationOrderChangeList.vue | 12 ++++
src/views/eam/maintenance/EamThirdMaintenanceFurnaceList.vue | 11 +++
src/views/eam/maintenance/EamSecondMaintenanceOrderList.vue | 12 ++++
14 files changed, 161 insertions(+), 0 deletions(-)
diff --git a/src/views/eam/base/EamMaintenanceStandardList.vue b/src/views/eam/base/EamMaintenanceStandardList.vue
index a4b9b75..52406b7 100644
--- a/src/views/eam/base/EamMaintenanceStandardList.vue
+++ b/src/views/eam/base/EamMaintenanceStandardList.vue
@@ -96,6 +96,12 @@
:pagination="ipagination" :loading="loading" :scroll="{x:'max-content'}"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" :customRow='clickThenSelect'
@change="handleTableChange">
+
+ <!--浣跨敤閮ㄩ棬-->
+ <template slot="factoryOrgCode" slot-scope="text,record">
+ {{[record.zxfactoryOrgCode_dictText].filter(item=>item).join('/')}}
+ </template>
+
<span slot="action" slot-scope="text, record">
<a v-has="'standard:upgrade'" v-if="record.standardStatus === 'START'"
@click.stop="handleUpgrade(record)">鍗囩増</a>
@@ -230,6 +236,11 @@
dataIndex: 'equipmentModel',
},
{
+ title: '浣跨敤閮ㄩ棬',
+ align: 'center',
+ scopedSlots: { customRender: 'factoryOrgCode' },
+ },
+ {
title: '瑙勮寖鐘舵��',
align: 'center',
dataIndex: 'standardStatus_dictText',
diff --git a/src/views/eam/maintenance/EamInspectionOrderList.vue b/src/views/eam/maintenance/EamInspectionOrderList.vue
index 1da8178..81f848c 100644
--- a/src/views/eam/maintenance/EamInspectionOrderList.vue
+++ b/src/views/eam/maintenance/EamInspectionOrderList.vue
@@ -83,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>
@@ -193,6 +199,12 @@
fixed: 'left'
},
{
+ title: '浣跨敤閮ㄩ棬',
+ align: 'center',
+ scopedSlots: { customRender: 'factoryOrgCode' },
+ fixed: 'left'
+ },
+ {
title: '鐐规鐘舵��',
align: 'center',
dataIndex: 'inspectionStatus_dictText',
diff --git a/src/views/eam/maintenance/EamSecondMaintenanceOrderList.vue b/src/views/eam/maintenance/EamSecondMaintenanceOrderList.vue
index a675c0b..f96349d 100644
--- a/src/views/eam/maintenance/EamSecondMaintenanceOrderList.vue
+++ b/src/views/eam/maintenance/EamSecondMaintenanceOrderList.vue
@@ -93,6 +93,12 @@
<a-table ref="table" size="middle" bordered rowKey="id" :columns="columns" :dataSource="dataSource"
:pagination="ipagination" :loading="loading" class="j-table-force-nowrap" :scroll="{x:'max-content'}"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @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.maintenanceStatus === 'WAIT_MAINTENANCE'">
<a v-has="'secondMaintenanceOrder:edit'" @click="handleEdit(record)">缂栬緫</a>
@@ -220,6 +226,12 @@
fixed: 'left'
},
{
+ title: '浣跨敤閮ㄩ棬',
+ align: 'center',
+ scopedSlots: { customRender: 'factoryOrgCode' },
+ fixed: 'left'
+ },
+ {
title: '淇濆吇鐘舵��',
align: 'center',
dataIndex: 'maintenanceStatus_dictText',
diff --git a/src/views/eam/maintenance/EamThirdMaintenanceChangeList.vue b/src/views/eam/maintenance/EamThirdMaintenanceChangeList.vue
index b03ad95..5865d08 100644
--- a/src/views/eam/maintenance/EamThirdMaintenanceChangeList.vue
+++ b/src/views/eam/maintenance/EamThirdMaintenanceChangeList.vue
@@ -40,6 +40,12 @@
<a-table ref="table" size="middle" bordered rowKey="id" :columns="columns" :dataSource="dataSource"
:pagination="ipagination" :loading="loading" :scroll="{x:'max-content'}"
@change="handleTableChange">
+
+ <!--浣跨敤閮ㄩ棬-->
+ <template slot="factoryCode" slot-scope="text,record">
+ {{[record.zxfactoryOrgCode_dictText].filter(item=>item).join('/')}}
+ </template>
+
<span slot="action" slot-scope="text, record">
<template v-if="record.changeStatus=='WAIT_SUBMIT'">
<a @click="handleEdit(record)">缂栬緫</a>
@@ -131,6 +137,12 @@
fixed: 'left'
},
{
+ title: '浣跨敤閮ㄩ棬',
+ align: 'center',
+ scopedSlots: { customRender: 'factoryCode' },
+ fixed: 'left'
+ },
+ {
title: '鍙樻洿鐘舵��',
align: 'center',
dataIndex: 'changeStatus_dictText',
diff --git a/src/views/eam/maintenance/EamThirdMaintenanceFurnaceList.vue b/src/views/eam/maintenance/EamThirdMaintenanceFurnaceList.vue
index 90e6b31..5387ea4 100644
--- a/src/views/eam/maintenance/EamThirdMaintenanceFurnaceList.vue
+++ b/src/views/eam/maintenance/EamThirdMaintenanceFurnaceList.vue
@@ -74,6 +74,11 @@
<a-switch v-if="text" checked-children="鏄�" un-checked-children="鍚�" :checked="Boolean(+text)" disabled/>
</template>
+ <!--浣跨敤閮ㄩ棬-->
+ <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.maintenanceStatus==='WAIT_MAINTENANCE'">
<a @click="handleEdit(record)">缂栬緫</a>
@@ -159,6 +164,12 @@
fixed: 'left'
},
{
+ title: '浣跨敤閮ㄩ棬',
+ align: 'center',
+ scopedSlots: { customRender: 'factoryOrgCode' },
+ fixed: 'left'
+ },
+ {
title: '淇濆吇鐘舵��',
align: 'center',
dataIndex: 'maintenanceStatus_dictText',
diff --git a/src/views/eam/maintenance/EamThirdMaintenanceOrderList.vue b/src/views/eam/maintenance/EamThirdMaintenanceOrderList.vue
index b1a95d3..1731a7b 100644
--- a/src/views/eam/maintenance/EamThirdMaintenanceOrderList.vue
+++ b/src/views/eam/maintenance/EamThirdMaintenanceOrderList.vue
@@ -63,6 +63,12 @@
:pagination="ipagination" :loading="loading" :scroll="{x:'max-content'}"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@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.maintenanceStatus === 'WAIT_MAINTENANCE'">
<a-popconfirm title="纭畾棰嗗彇鍚�?" @confirm="() => handlerCollect(record.id)">
@@ -170,6 +176,12 @@
fixed: 'left'
},
{
+ title: '浣跨敤閮ㄩ棬',
+ align: 'center',
+ scopedSlots: { customRender: 'factoryOrgCode' },
+ fixed: 'left'
+ },
+ {
title: '淇濆吇鐘舵��',
align: 'center',
dataIndex: 'maintenanceStatus_dictText',
diff --git a/src/views/eam/repair/EamRepairOrderList.vue b/src/views/eam/repair/EamRepairOrderList.vue
index d7946bc..6c787b6 100644
--- a/src/views/eam/repair/EamRepairOrderList.vue
+++ b/src/views/eam/repair/EamRepairOrderList.vue
@@ -61,6 +61,12 @@
:pagination="ipagination" :loading="loading"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange"
:scroll="{x:'max-content'}">
+
+ <!--浣跨敤閮ㄩ棬-->
+ <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.repairStatus=='PENDING_REPAIR'||record.repairStatus=='UNDER_MAINTENANCE' ||record.repairStatus=='REJECTED'">
<a-popconfirm v-if="record.claimStatus=='0' || record.claimStatus==null " title="纭畾鎻愪氦鍚�?" @confirm="() => handleClaim(record.id)">
@@ -161,6 +167,12 @@
fixed: 'left'
},
{
+ title: '浣跨敤閮ㄩ棬',
+ align: 'center',
+ scopedSlots: { customRender: 'factoryOrgCode' },
+ fixed: 'left'
+ },
+ {
title: '缁翠慨鐘舵��',
align: 'center',
dataIndex: 'repairStatus_dictText',
diff --git a/src/views/eam/repair/EamReportAccidentsRegisterList.vue b/src/views/eam/repair/EamReportAccidentsRegisterList.vue
index a01df26..f2b99df 100644
--- a/src/views/eam/repair/EamReportAccidentsRegisterList.vue
+++ b/src/views/eam/repair/EamReportAccidentsRegisterList.vue
@@ -68,6 +68,11 @@
<a-switch v-if="text" checked-children="鍚屾剰" un-checked-children="涓嶅悓鎰�" :checked="Boolean(text)" disabled/>
</template>
+ <!--浣跨敤閮ㄩ棬-->
+ <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.registerStatus==='PENDING_SUBMIT'">
<a @click="handleEdit(record)">缂栬緫</a>
@@ -162,6 +167,12 @@
fixed: 'left'
},
{
+ title: '浣跨敤閮ㄩ棬',
+ align: 'center',
+ scopedSlots: { customRender: 'factoryOrgCode' },
+ fixed: 'left'
+ },
+ {
title: '鐧昏鐘舵��',
align: 'center',
dataIndex: 'registerStatus_dictText',
diff --git a/src/views/eam/repair/EamReportProductHazardsList.vue b/src/views/eam/repair/EamReportProductHazardsList.vue
index 24e6ddc..36d63fa 100644
--- a/src/views/eam/repair/EamReportProductHazardsList.vue
+++ b/src/views/eam/repair/EamReportProductHazardsList.vue
@@ -52,6 +52,11 @@
:pagination="ipagination" :loading="loading" :scroll="{x:'max-content'}"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @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.confirmStatus==='PENDING_SUBMIT'">
<a @click="handleEdit(record)">缂栬緫</a>
@@ -150,6 +155,12 @@
fixed: 'left'
},
{
+ title: '浣跨敤閮ㄩ棬',
+ align: 'center',
+ scopedSlots: { customRender: 'factoryOrgCode' },
+ fixed: 'left'
+ },
+ {
title: '纭鐘舵��',
align: 'center',
dataIndex: 'confirmStatus_dictText',
diff --git a/src/views/eam/repair/EamReportRepairList.vue b/src/views/eam/repair/EamReportRepairList.vue
index 228bbd0..38a0f5f 100644
--- a/src/views/eam/repair/EamReportRepairList.vue
+++ b/src/views/eam/repair/EamReportRepairList.vue
@@ -89,6 +89,11 @@
<a-switch checked-children="鏄�" un-checked-children="鍚�" :checked="Boolean(+text)" disabled/>
</template>
+ <!--浣跨敤閮ㄩ棬-->
+ <template slot="factoryOrgCode" slot-scope="text,record">
+ {{[record.zxfactoryOrgCode_dictText].filter(item=>item).join('/')}}
+ </template>
+
<span slot="action" slot-scope="text, record">
<a @click="handleEdit(record)">缂栬緫</a>
@@ -184,6 +189,12 @@
fixed: 'left'
},
{
+ title: '浣跨敤閮ㄩ棬',
+ align: 'center',
+ scopedSlots: { customRender: 'factoryOrgCode' },
+ fixed: 'left'
+ },
+ {
title: '鎶ヤ慨鐘舵��',
align: 'center',
dataIndex: 'reportStatus_dictText',
diff --git a/src/views/eam/repair/EamReportThreeNoSpareList.vue b/src/views/eam/repair/EamReportThreeNoSpareList.vue
index cdea0ba..f69bbb4 100644
--- a/src/views/eam/repair/EamReportThreeNoSpareList.vue
+++ b/src/views/eam/repair/EamReportThreeNoSpareList.vue
@@ -60,6 +60,12 @@
:pagination="ipagination" :loading="loading" :scroll="{x:'max-content'}"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@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>
<a v-if="record.submitStatus=='PENDING_SUBMIT'||record.submitStatus=='REJECTED'"
@@ -184,6 +190,12 @@
fixed: 'left'
},
{
+ title: '浣跨敤閮ㄩ棬',
+ align: 'center',
+ scopedSlots: { customRender: 'factoryOrgCode' },
+ fixed: 'left'
+ },
+ {
title: '鐘舵��',
align: 'center',
dataIndex: 'submitStatus_dictText',
diff --git a/src/views/eam/technical/EamTechnicalStatusEvaluationApplicationList.vue b/src/views/eam/technical/EamTechnicalStatusEvaluationApplicationList.vue
index 4a5127d..f8a68a2 100644
--- a/src/views/eam/technical/EamTechnicalStatusEvaluationApplicationList.vue
+++ b/src/views/eam/technical/EamTechnicalStatusEvaluationApplicationList.vue
@@ -53,6 +53,11 @@
<a-table ref="table" size="middle" bordered rowKey="id" :columns="columns" :dataSource="dataSource"
:pagination="ipagination" :loading="loading" :scroll="{x:'max-content'}" @change="handleTableChange">
+ <!--浣跨敤閮ㄩ棬-->
+ <template slot="factoryCode" slot-scope="text,record">
+ {{[record.zxfactoryOrgCode_dictText].filter(item=>item).join('/')}}
+ </template>
+
<span slot="action" slot-scope="text, record">
<template v-if="record.applicationStatus=='WAIT_SUBMIT'">
<a @click.stop="handleEdit(record)">缂栬緫</a>
@@ -138,6 +143,12 @@
fixed: 'left'
},
{
+ title: '浣跨敤閮ㄩ棬',
+ align: 'center',
+ scopedSlots: { customRender: 'factoryCode' },
+ fixed: 'left'
+ },
+ {
title: '鐢宠鍗曠姸鎬�',
align: 'center',
dataIndex: 'applicationStatus_dictText',
diff --git a/src/views/eam/technical/EamTechnicalStatusEvaluationOrderChangeList.vue b/src/views/eam/technical/EamTechnicalStatusEvaluationOrderChangeList.vue
index af6f18f..a181cde 100644
--- a/src/views/eam/technical/EamTechnicalStatusEvaluationOrderChangeList.vue
+++ b/src/views/eam/technical/EamTechnicalStatusEvaluationOrderChangeList.vue
@@ -40,6 +40,12 @@
<!-- table鍖哄煙-begin -->
<a-table ref="table" size="middle" bordered rowKey="id" :columns="columns" :dataSource="dataSource"
:pagination="ipagination" :loading="loading" :scroll="{x:'max-content'}" @change="handleTableChange">
+
+ <!--浣跨敤閮ㄩ棬-->
+ <template slot="factoryOrgCode" slot-scope="text,record">
+ {{[record.zxfactoryOrgCode_dictText].filter(item=>item).join('/')}}
+ </template>
+
<span slot="action" slot-scope="text, record">
<tamplate v-if="record.changeStatus=='WAIT_SUBMIT'">
<a @click="handleEdit(record)">缂栬緫</a>
@@ -123,6 +129,12 @@
fixed: 'left'
},
{
+ title: '浣跨敤閮ㄩ棬',
+ align: 'center',
+ scopedSlots: { customRender: 'factoryOrgCode' },
+ fixed: 'left'
+ },
+ {
title: '宸ュ崟鍙�',
align: 'center',
dataIndex: 'orderId'
diff --git a/src/views/eam/technical/EamTechnicalStatusEvaluationOrderList.vue b/src/views/eam/technical/EamTechnicalStatusEvaluationOrderList.vue
index 92eb74e..c135acf 100644
--- a/src/views/eam/technical/EamTechnicalStatusEvaluationOrderList.vue
+++ b/src/views/eam/technical/EamTechnicalStatusEvaluationOrderList.vue
@@ -72,6 +72,11 @@
<a-switch checked-children="鏄�" un-checked-children="鍚�" :checked="Boolean(+text)" disabled/>
</template>
+ <!--浣跨敤閮ㄩ棬-->
+ <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.evaluationStatus === 'WAIT_EVALUATION'">
<a-popconfirm title="纭畾棰嗗彇鍚楋紵" @confirm="handleReceive(record.id)">
@@ -164,6 +169,12 @@
fixed: 'left'
},
{
+ title: '浣跨敤閮ㄩ棬',
+ align: 'center',
+ scopedSlots: { customRender: 'factoryOrgCode' },
+ fixed: 'left'
+ },
+ {
title: '閴村畾鐘舵��',
align: 'center',
dataIndex: 'evaluationStatus_dictText',
--
Gitblit v1.9.3