From 6b8a6b0591e97aa7d175c5f6c61d64534f038124 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期一, 12 五月 2025 14:56:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/eam/equipment/modules/EamEquipmentModal.vue | 34 -------
src/views/flowable/workflow/InspectionOrder/InspectionOrderHandle.vue | 26 ++++++
src/views/eam/maintenance/EamWeekMaintenanceOrderList.vue | 8 +
src/views/flowable/workflow/weekMaintenance/WeekMaintenanceApprovalModal.vue | 13 +++
src/views/eam/equipment/EamEquipmentList.vue | 124 +++++++++++++++++++-----------
5 files changed, 125 insertions(+), 80 deletions(-)
diff --git a/src/views/eam/equipment/EamEquipmentList.vue b/src/views/eam/equipment/EamEquipmentList.vue
index e136054..4ec8b0c 100644
--- a/src/views/eam/equipment/EamEquipmentList.vue
+++ b/src/views/eam/equipment/EamEquipmentList.vue
@@ -43,7 +43,7 @@
<a-form-item label="浣跨敤杞﹂棿">
<a-tree-select v-model="queryParam.orgId"
style="width: 100%"
- :tree-data="treeData"
+ :tree-data="treeDataAlias"
:dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
placeholder="璇烽�夋嫨浣跨敤杞﹂棿"
allow-clear
@@ -127,15 +127,15 @@
<span slot="mdcFlag" slot-scope="text">
<lx-switch v-model="text" disabled checked-children="鏄�" un-checked-children="鍚�"/>
</span>
- <span slot="processParametersFlag" slot-scope="text">
+<!-- <span slot="processParametersFlag" slot-scope="text">
<lx-switch v-model="text" disabled checked-children="鏈�" un-checked-children="鏃�"/>
- </span>
- <span slot="precisionParametersFlag" slot-scope="text">
+ </span>-->
+<!-- <span slot="precisionParametersFlag" slot-scope="text">
<lx-switch v-model="text" disabled checked-children="鏈�" un-checked-children="鏃�"/>
- </span>
- <span slot="specialEquipment" slot-scope="text">
+ </span>-->
+<!-- <span slot="specialEquipment" slot-scope="text">
<lx-switch v-model="text" disabled checked-children="鏄�" un-checked-children="鍚�"/>
- </span>
+ </span>-->
<span slot="action" slot-scope="text, record">
<a @click.stop="handleEdit(record)">缂栬緫</a>
@@ -389,42 +389,42 @@
dataIndex: 'mdcFlag',
scopedSlots: { customRender: 'mdcFlag' }
},
- {
- title: '鏈夋棤宸ヨ壓鍙傛暟',
- align: 'center',
- width: 120,
- dataIndex: 'processParametersFlag',
- scopedSlots: { customRender: 'processParametersFlag' }
- },
- {
- title: '鏈夋棤绮惧害鍙傛暟',
- align: 'center',
- width: 120,
- dataIndex: 'precisionParametersFlag',
- scopedSlots: { customRender: 'precisionParametersFlag' }
- },
- {
- title: '鏄惁涓虹壒绉嶈澶�',
- align: 'center',
- width: 120,
- dataIndex: 'specialEquipment',
- scopedSlots: { customRender: 'specialEquipment' }
- },
- {
- title: '閲嶉噺',
- align: 'center',
- dataIndex: 'equipmentWeight'
- },
- {
- title: '璁惧绔彛',
- align: 'center',
- dataIndex: 'equipmentPort'
- },
- {
- title: '鍧愭爣鏁伴噺',
- align: 'center',
- dataIndex: 'coordinateNum'
- },
+ // {
+ // title: '鏈夋棤宸ヨ壓鍙傛暟',
+ // align: 'center',
+ // width: 120,
+ // dataIndex: 'processParametersFlag',
+ // scopedSlots: { customRender: 'processParametersFlag' }
+ // },
+ // {
+ // title: '鏈夋棤绮惧害鍙傛暟',
+ // align: 'center',
+ // width: 120,
+ // dataIndex: 'precisionParametersFlag',
+ // scopedSlots: { customRender: 'precisionParametersFlag' }
+ // },
+ // {
+ // title: '鏄惁涓虹壒绉嶈澶�',
+ // align: 'center',
+ // width: 120,
+ // dataIndex: 'specialEquipment',
+ // scopedSlots: { customRender: 'specialEquipment' }
+ // },
+ // {
+ // title: '閲嶉噺',
+ // align: 'center',
+ // dataIndex: 'equipmentWeight'
+ // },
+ // {
+ // title: '璁惧绔彛',
+ // align: 'center',
+ // dataIndex: 'equipmentPort'
+ // },
+ // {
+ // title: '鍧愭爣鏁伴噺',
+ // align: 'center',
+ // dataIndex: 'coordinateNum'
+ // },
{
title: '鍒涘缓浜�',
align: 'center',
@@ -474,7 +474,8 @@
printedRows: [],
activeTabKey: 1,
appHomeUrl: '',
- currentTableRowRecord: {}
+ currentTableRowRecord: {},
+ treeDataAlias: [],
}
},
computed: {
@@ -492,6 +493,8 @@
getAction(this.url.loadProductionOptions).then(res => {
if (res.success) {
this.treeData = [...res.result]
+ this.treeDataAlias = this.deepCopyAndModify(res.result)
+ console.info('treeDataAlias====', this.treeDataAlias)
} else {
that.$message.warning(res.message)
}
@@ -581,7 +584,38 @@
this.appHomeUrl = res.result.settingValue
}
})
- }
+ },
+ deepCopyAndModify(arr) {
+ // 濡傛灉褰撳墠鍏冪礌涓嶆槸鏁扮粍鎴栧璞★紝鐩存帴杩斿洖
+ if (!Array.isArray(arr) && typeof arr !== 'object' || arr === null || arr.length === 0) {
+ return arr;
+ }
+
+ // 濡傛灉鏄暟缁勶紝鍒涘缓涓�涓柊鏁扮粍骞堕�掑綊澶勭悊姣忎釜鍏冪礌
+ if (Array.isArray(arr)) {
+ const newArray = [];
+ for (let i = 0; i < arr.length; i++) {
+ newArray.push(this.deepCopyAndModify(arr[i]));
+ }
+ return newArray;
+ }
+
+ // 濡傛灉鏄璞★紝鍒涘缓涓�涓柊瀵硅薄骞堕�掑綊澶勭悊姣忎釜灞炴��
+ const newObj = {};
+ for (const key in arr) {
+ if (arr.hasOwnProperty(key)) {
+ if(key === 'selectable') {
+ newObj[key] = true;
+ } else if(key === 'children') {
+ newObj[key] = this.deepCopyAndModify(arr[key]);
+ }else {
+ newObj[key] = arr[key];
+ }
+
+ }
+ }
+ return newObj;
+ },
}
}
</script>
diff --git a/src/views/eam/equipment/modules/EamEquipmentModal.vue b/src/views/eam/equipment/modules/EamEquipmentModal.vue
index 63a550d..8f8c0c5 100644
--- a/src/views/eam/equipment/modules/EamEquipmentModal.vue
+++ b/src/views/eam/equipment/modules/EamEquipmentModal.vue
@@ -85,30 +85,6 @@
</a-col>
</a-row>
- <a-row :gutter="24">
- <a-col :span="6">
- <a-form-model-item prop="equipmentWeight" label="閲嶉噺">
- <a-input :placeholder="disableSubmit?'':'璇疯緭鍏ラ噸閲�'" v-model="model.equipmentWeight" :disabled="disableSubmit"/>
- </a-form-model-item>
- </a-col>
- <a-col :span="6">
- <a-form-model-item prop="equipmentPort" label="璁惧绔彛">
- <a-input :placeholder="disableSubmit?'':'璇疯緭鍏ヨ澶囩鍙�'" v-model="model.equipmentPort" :disabled="disableSubmit"/>
- </a-form-model-item>
- </a-col>
- <a-col :span="6">
- <a-form-model-item prop="coordinateNum" label="鍧愭爣鏁伴噺">
- <a-input-number :placeholder="disableSubmit?'':'璇疯緭鍏ュ潗鏍囨暟閲�'" v-model="model.coordinateNum" style="width: 100%" :disabled="disableSubmit"/>
- </a-form-model-item>
- </a-col>
- <a-col :span="6">
- <a-form-model-item prop="assetStatus" label="璧勪骇鐘舵��">
- <j-dict-select-tag dict-code="asset_status" v-model="model.assetStatus"
- disabled/>
- </a-form-model-item>
- </a-col>
- </a-row>
-
<a-divider orientation="center" style="font-size: large;font-style: italic;color: #66aeed;"> 鍑哄巶淇℃伅
</a-divider>
@@ -211,13 +187,9 @@
</a-form-model-item>
</a-col>
<a-col :span="6">
- <a-form-model-item prop="processParametersFlag" label="鏈夋棤宸ヨ壓鍙傛暟">
- <lx-switch checked-children='鏈�' un-checked-children='鏃�' v-model="model.processParametersFlag" :disabled="disableSubmit"/>
- </a-form-model-item>
- </a-col>
- <a-col :span="6">
- <a-form-model-item prop="precisionParametersFlag" label="鏈夋棤绮惧害鍙傛暟">
- <lx-switch checked-children='鏈�' un-checked-children='鏃�' v-model="model.precisionParametersFlag" :disabled="disableSubmit"/>
+ <a-form-model-item prop="assetStatus" label="璧勪骇鐘舵��">
+ <j-dict-select-tag dict-code="asset_status" v-model="model.assetStatus"
+ disabled/>
</a-form-model-item>
</a-col>
</a-row>
diff --git a/src/views/eam/maintenance/EamWeekMaintenanceOrderList.vue b/src/views/eam/maintenance/EamWeekMaintenanceOrderList.vue
index 2b5c30b..7569df5 100644
--- a/src/views/eam/maintenance/EamWeekMaintenanceOrderList.vue
+++ b/src/views/eam/maintenance/EamWeekMaintenanceOrderList.vue
@@ -28,7 +28,13 @@
v-model="queryParam.maintenanceStatus"/>
</a-form-item>
</a-col>
- <a-col :xl="4" :lg="7" :md="8" :sm="24">
+ <a-col :xl="3" :lg="4" :md="8" :sm="24">
+ <a-form-item label="鎶芥鏍囪">
+ <j-dict-select-tag placeholder="璇烽�夋嫨鎶芥鏍囪" dict-code="yn"
+ v-model="queryParam.randomInspectionFlag"/>
+ </a-form-item>
+ </a-col>
+ <a-col :xl="3" :lg="4" :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>
diff --git a/src/views/flowable/workflow/InspectionOrder/InspectionOrderHandle.vue b/src/views/flowable/workflow/InspectionOrder/InspectionOrderHandle.vue
index c99495f..2ae88f7 100644
--- a/src/views/flowable/workflow/InspectionOrder/InspectionOrderHandle.vue
+++ b/src/views/flowable/workflow/InspectionOrder/InspectionOrderHandle.vue
@@ -65,6 +65,11 @@
<a-input v-model="tableRowRecord.operator_dictText" readOnly/>
</a-form-model-item>
</a-col>
+ <a-col :span='span'>
+ <a-form-model-item label="浣滀笟鎸囧">
+ <a-button @click="handlePreview(tableRowRecord.referenceFile)" type="primary" icon="eye">棰勮</a-button>
+ </a-form-model-item>
+ </a-col>
</a-row>
<a-row>
@@ -190,6 +195,8 @@
</template>
</a-form-model>
</a-spin>
+
+ <lx-file-preview ref="lxFilePreview" :fileUrl="fileUrl"></lx-file-preview>
</j-modal>
</template>
@@ -309,7 +316,8 @@
selectedRowKeys: [],
disableSubmit: false,
activeTabKey: '1',
- title: ''
+ title: '',
+ fileUrl: '',
}
},
computed: {
@@ -414,10 +422,11 @@
})
},
- autoCompleteForm({ standardName, maintenancePeriod, standardCode }) {
+ autoCompleteForm({ standardName, maintenancePeriod, standardCode, referenceFile }) {
this.$set(this.tableRowRecord, 'standardName', standardName)
this.$set(this.tableRowRecord, 'maintenancePeriod', maintenancePeriod)
this.$set(this.tableRowRecord, 'standardCode', standardCode)
+ this.$set(this.tableRowRecord, 'referenceFile', referenceFile)
},
// 鎵归噺閫夋嫨鎵�鏈夌偣妫�缁撴灉
@@ -482,6 +491,19 @@
})
}
},
+ handlePreview: function (fileJson) {
+ if(fileJson) {
+ let obj = JSON.parse(fileJson)
+ if(obj.filePath) {
+ this.$refs.lxFilePreview.preview(obj.filePath);
+ }else {
+ that.$message.warning('娌℃湁涓婁紶鎿嶄綔鎸囧鍥剧墖')
+ }
+ }else {
+ that.$message.warning('娌℃湁涓婁紶鎿嶄綔鎸囧鍥剧墖')
+ }
+
+ },
}
}
</script>
diff --git a/src/views/flowable/workflow/weekMaintenance/WeekMaintenanceApprovalModal.vue b/src/views/flowable/workflow/weekMaintenance/WeekMaintenanceApprovalModal.vue
index fc68d77..4ac6ac7 100644
--- a/src/views/flowable/workflow/weekMaintenance/WeekMaintenanceApprovalModal.vue
+++ b/src/views/flowable/workflow/weekMaintenance/WeekMaintenanceApprovalModal.vue
@@ -164,7 +164,7 @@
:disabled="disableSubmit || finalAcceptanceDisable"/>
</a-form-model-item>
</a-col>
- <a-col :span="12">
+ <a-col :span="6">
<a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="initialAcceptanceFilesResult"
label="鍒濋獙鏀堕檮浠�">
<lx-upload :returnUrl="false"
@@ -173,6 +173,17 @@
v-model="model.initialAcceptanceFilesResult"/>
</a-form-model-item>
</a-col>
+ <a-col :span="6">
+ <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="randomInspectionFlag"
+ label="鎶芥鏍囪">
+ <lx-switch
+ checked-children='鏄�'
+ un-checked-children='鍚�'
+ v-model="model.randomInspectionFlag"
+ :disabled="disableSubmit || finalAcceptanceDisable"
+ />
+ </a-form-model-item>
+ </a-col>
</a-row>
</div>
<div v-if="finalAcceptanceDisable">
--
Gitblit v1.9.3