From eb7e4c1a855a7382ba5a8ca121b6c11e0087c55a Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 22 九月 2025 19:04:14 +0800
Subject: [PATCH] 工控网显示临时更改单号
---
src/views/dataex/programonmachineimp.vue | 4 ++++
src/views/statreport/sendrecord.vue | 6 +++---
src/views/dataex/mdmprogramimp.vue | 32 ++++++++------------------------
3 files changed, 15 insertions(+), 27 deletions(-)
diff --git a/src/views/dataex/mdmprogramimp.vue b/src/views/dataex/mdmprogramimp.vue
index 321c8fc..4746303 100644
--- a/src/views/dataex/mdmprogramimp.vue
+++ b/src/views/dataex/mdmprogramimp.vue
@@ -10,8 +10,9 @@
>
<template #menu-left>
<div style="display: flex;">
- <el-button type="primary" size="default" icon="el-icon-circle-plus" @click="importData">瀵煎叆</el-button>
- <el-button type="primary" size="default" icon="el-icon-circle-plus" plain @click="handleWarehouse" style="margin-left: 12px;">涓嬩紶</el-button>
+ <el-button type="primary" size="default" icon="el-icon-upload" @click="importData">瀵煎叆</el-button>
+ <el-button type="warning" size="default" icon="el-icon-delete" @click="clearList">娓呯┖</el-button>
+ <el-button type="primary" size="default" icon="el-icon-check" plain @click="handleWarehouse" style="margin-left: 12px;">涓嬩紶</el-button>
</div>
</template>
</avue-crud>
@@ -70,28 +71,8 @@
prop: 'machineCode',
},
{
- label: '鍥哄寲鐘舵��',
- prop: 'programStatus'/*,
- formatter: (val, value, label) => {
-
- return `${val?.variables?.machineCode}`;
- }*/
- },
- // {
- // label: '澶勭悊鏂瑰紡',
- // prop: ''
- // },
- // {
- // label: '澶勭悊鏃堕棿',
- // prop: ''
- // },
- // {
- // label: '澶勭悊浜�',
- // prop: ''
- // },
- {
- label: 'MD5鍊�',
- prop: 'md5',
+ label: '绋嬪簭鐘舵��',
+ prop: 'programStatus'
}
],
},
@@ -132,6 +113,9 @@
this.data = res || []
done();
},
+ clearList(){
+ this.data = [];
+ },
handleWarehouse(row,index) {
if(this.selection.length == 0) {
this.$message.error("璇烽�夋嫨鏁版嵁")
diff --git a/src/views/dataex/programonmachineimp.vue b/src/views/dataex/programonmachineimp.vue
index 34a73fd..0134a3a 100644
--- a/src/views/dataex/programonmachineimp.vue
+++ b/src/views/dataex/programonmachineimp.vue
@@ -80,6 +80,10 @@
prop: 'deviation'
},
{
+ label: '涓存椂鏇存敼鍗曞簭鍙�',
+ prop: 'deviationSerial'
+ },
+ {
label: '鏈哄簥缂栧彿',
prop: 'machineCode',
},
diff --git a/src/views/statreport/sendrecord.vue b/src/views/statreport/sendrecord.vue
index ec7fbb3..f8941c7 100644
--- a/src/views/statreport/sendrecord.vue
+++ b/src/views/statreport/sendrecord.vue
@@ -23,7 +23,7 @@
</template>
<template #menu-left>
<div class="menuLeft">
- <el-button type="primary" size="default" icon="el-icon-circle-plus" plain @click="handleExport">瀵煎嚭</el-button>
+ <el-button type="primary" size="default" icon="el-icon-download" plain @click="handleExport">瀵煎嚭</el-button>
<el-button type="primary" size="default" icon="el-icon-compass" plain @click="preMonth">涓婃湀</el-button>
<el-button type="primary" size="default" icon="el-icon-aim" plain @click="thisMonth">鏈湀</el-button>
</div>
@@ -93,7 +93,7 @@
total: 0,
},
fileViewModel:false,
- fileContent:'',
+ appContent:'',
option: {
index: true,
addBtn: false,
@@ -144,7 +144,7 @@
methods: {
showContent(row) {
this.fileViewModel = true;
- this.fileContent = '';
+ this.appContent = '';
axios({
url: '/blade-mdm/ossfile/file-content',
method: 'get',
--
Gitblit v1.9.3