From ae2c3f847da927b6124e872d8d74c0457a1eea14 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 17 九月 2025 15:27:00 +0800
Subject: [PATCH] 现场编制功能适配
---
src/views/dataex/mdmprogramimp.vue | 38 +++++++++++++++++++++-----------------
1 files changed, 21 insertions(+), 17 deletions(-)
diff --git a/src/views/dataex/mdmprogramimp.vue b/src/views/dataex/mdmprogramimp.vue
index 139e30d..321c8fc 100644
--- a/src/views/dataex/mdmprogramimp.vue
+++ b/src/views/dataex/mdmprogramimp.vue
@@ -11,11 +11,11 @@
<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-circle-plus" plain @click="handleWarehouse" style="margin-left: 12px;">涓嬩紶</el-button>
</div>
</template>
</avue-crud>
- <el-dialog title="DNC鏂囦欢瀵煎叆" append-to-body v-model="excelBox" width="555px">
+ <el-dialog title="娑夊瘑缃戞枃浠跺鍏�" append-to-body v-model="excelBox" width="555px">
<avue-form :option="excelOption" v-model="excelForm" :upload-after="uploadAfter">
<!-- <template #excelTemplate>
<el-button type="primary" @click="handleTemplate">
@@ -54,25 +54,29 @@
// hide: true
// },
{
- label: '浠诲姟缂栧彿',
- prop: 'programNo'
+ label: '鍥惧彿',
+ prop: 'drawingNo'
},
- {
+ {
label: '绋嬪簭鍚嶇О',
- prop: 'programName',
+ prop: 'name',
},
{
- label: '鏂囦欢鍒拌揪鏃堕棿',
- prop: 'fileBackTime',
+ label: '鏂囦欢',
+ prop: 'filename',
},
{
- label: '鏂囦欢鏁版嵁搴撶紪鍙�',
- prop: 'id',
+ label: '鏈哄簥缂栧彿',
+ prop: 'machineCode',
},
- // {
- // label: '澶勭悊鐘舵��',
- // prop: '',
- // },
+ {
+ label: '鍥哄寲鐘舵��',
+ prop: 'programStatus'/*,
+ formatter: (val, value, label) => {
+
+ return `${val?.variables?.machineCode}`;
+ }*/
+ },
// {
// label: '澶勭悊鏂瑰紡',
// prop: ''
@@ -102,13 +106,13 @@
prop: 'excelFile',
type: 'upload',
drag: true,
- loadText: 'DNC鏂囦欢瀵煎叆锛岃绋嶇瓑',
+ loadText: '娑夊瘑缃戞枃浠跺鍏ワ紝璇风◢绛�',
span: 24,
propsHttp: {
res: 'data',
},
tip: '',
- action: '/blade-mdm/program/dncsendback/upload',
+ action: '/blade-mdm/program/mdmimport/upload',
},
],
},
@@ -141,7 +145,7 @@
ids: selection.join(","),
}
axios({
- url: '/blade-mdm/program/mdmimport/upload',
+ url: '/blade-mdm/program/mdmimport/accept',
method: 'post',
params: obj,
}).then(
--
Gitblit v1.9.3