From 55cb96da2ad3c94221b86306e4d1fc80f713096d Mon Sep 17 00:00:00 2001 From: “linengliang” <vanSuperEnergy@163.com> Date: 星期二, 02 一月 2024 11:01:41 +0800 Subject: [PATCH] 小修改 --- src/views/eam/RepairOrderFaultAnalysisList.vue | 26 +++++++++++++------------- src/views/system/NewPermissionList.vue | 2 +- src/views/eam/RepairOrderActualWorkHoursList.vue | 10 +--------- src/views/eam/RepairOrderList.vue | 8 +++++++- 4 files changed, 22 insertions(+), 24 deletions(-) diff --git a/src/views/eam/RepairOrderActualWorkHoursList.vue b/src/views/eam/RepairOrderActualWorkHoursList.vue index d51329b..7b95468 100644 --- a/src/views/eam/RepairOrderActualWorkHoursList.vue +++ b/src/views/eam/RepairOrderActualWorkHoursList.vue @@ -138,18 +138,10 @@ } }, { - title: '浜哄憳缂栫爜', - dataIndex: 'username', - align: 'center' - - }, - { title: '浜哄憳鍚嶇О', - dataIndex: 'realname', + dataIndex: 'userId', align: 'center' - }, - { title: '涓绘壙淇汉', dataIndex: 'principalContractor_dictText', diff --git a/src/views/eam/RepairOrderFaultAnalysisList.vue b/src/views/eam/RepairOrderFaultAnalysisList.vue index 99fd6ac..5cf773b 100644 --- a/src/views/eam/RepairOrderFaultAnalysisList.vue +++ b/src/views/eam/RepairOrderFaultAnalysisList.vue @@ -177,35 +177,35 @@ } }, { - title: '鏁呴殰鍘熷洜', + title: '鏁呴殰妫�鏌�', dataIndex: 'faultCause', align: "center", scopedSlots: { customRender: 'faultCause' }, width: 250, }, + // { + // title: '鏁呴殰绫诲瀷', + // dataIndex: 'faultTypeName', + // align: "center", + // scopedSlots: { customRender: 'faultType' }, + // width: 250, + // }, { - title: '鏁呴殰绫诲瀷', - dataIndex: 'faultTypeName', - align: "center", - scopedSlots: { customRender: 'faultType' }, - width: 250, - }, - { - title: '鏁呴殰鍒嗘瀽', + title: '鏁呴殰鐜拌薄', dataIndex: 'faultCause', align: 'center', - width: 150, + width: 250, ellipsis: true, }, { - title: '缁翠慨鎺柦', + title: '鏁呴殰缁翠慨', dataIndex: 'maintenanceMeasures', align: 'center', - width: 150, + width: 250, ellipsis: true, }, { - title: '缁翠繚鏀硅繘鎰忚', + title: '鏁呴殰棰勯槻', dataIndex: 'suggestion', align: "center", scopedSlots: { customRender: 'suggestion' }, diff --git a/src/views/eam/RepairOrderList.vue b/src/views/eam/RepairOrderList.vue index 882ac0d..c2c0583 100644 --- a/src/views/eam/RepairOrderList.vue +++ b/src/views/eam/RepairOrderList.vue @@ -381,6 +381,7 @@ <a-tab-pane tab="缁翠慨瑕佹眰" key="2" + v-if="false" > <RepairOrderDetailList :mainId="repairOrderDetailMainId" @@ -391,6 +392,7 @@ tab="璁″垝鐢ㄦ枡" key="3" forceRender + v-if="false" > <RepairOrderPlanMaterialList :addStatus="sonsAddStatus" @@ -401,6 +403,7 @@ tab="鍗遍櫓闃叉帶" key="4" forceRender + v-if="false" > <RepairOrderRiskPreventionList :addStatus="sonsAddStatus" @@ -411,6 +414,7 @@ tab="浣滀笟鎸囧涔�" key="5" forceRender + v-if="false" > <EquipmentDocumentList :addStatus="sonsAddStatus" @@ -421,8 +425,10 @@ tab="瀹為檯鐢ㄦ枡" key="6" forceRender - v-if="!sonsAddStatus&&selectedRowKeys.length!=0" + + v-if="false" > + <!-- v-if="!sonsAddStatus&&selectedRowKeys.length!=0" --> <RepairOrderActualMaterialList :mainId="repairOrderActualMaterialMainId" /> </a-tab-pane> <a-tab-pane diff --git a/src/views/system/NewPermissionList.vue b/src/views/system/NewPermissionList.vue index 771e49b..8ec296e 100644 --- a/src/views/system/NewPermissionList.vue +++ b/src/views/system/NewPermissionList.vue @@ -11,7 +11,7 @@ type="primary" icon="delete">鎵归噺鍒犻櫎 </a-button> - <a-button @click="handleSecret" type="primary" icon="frown" v-if="selectionRows.length===1&&selectionRows[0].title==='鑺濋夯寮�闂�'">鏌ヨ</a-button> + <a-button @click="handleSecret" type="primary" icon="frown" v-if="selectionRows.length===1&&selectionRows[0].title==='kitty'">鏌ヨ</a-button> </div> <!-- table鍖哄煙-begin --> -- Gitblit v1.9.3