From 282e032b5771da13d224214d3b0b71f3efde9a42 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 25 八月 2023 18:45:42 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmMes
---
web_standard/src/views/ext/deviceExt.vue | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/web_standard/src/views/ext/deviceExt.vue b/web_standard/src/views/ext/deviceExt.vue
index e609b81..aa0b933 100644
--- a/web_standard/src/views/ext/deviceExt.vue
+++ b/web_standard/src/views/ext/deviceExt.vue
@@ -55,6 +55,15 @@
<template v-slot:table-wrap>
<ul class="toolbar">
<li><el-button type="primary" @click="$refs.operaDeviceExtWindow.open('鏂板缓璁惧')" v-permissions="['ext:deviceext:create']">鏂板</el-button></li>
+ <li v-permissions="['ext:deviceExt:importExcel']">
+ <ImportButton
+ text="瀵煎叆"
+ template-name="device_import_template.xlsx"
+ template-path="/template/device_import_template.xlsx"
+ action="/ext/deviceExt/importBatch"
+ @success="search"
+ />
+ </li>
<li>
<el-button
type="primary"
@@ -86,12 +95,12 @@
</el-table-column>
<el-table-column prop="wpmodel.unionName" label="寰呯敓浜ц揣浣�" show-overflow-tooltip min-width="100px">
<template slot-scope="{row}">
- <span class="long-title-style">{{ row.wpmodel.unionName }}</span>
+ <span class="long-title-style">{{ row.wpmodel ? row.wpmodel.unionName : '-' }}</span>
</template>
</el-table-column>
<el-table-column prop="wfmodel.unionName" label="宸插畬宸ヨ揣浣�" show-overflow-tooltip min-width="100px">
<template slot-scope="{row}">
- <span class="long-title-style">{{ row.wfmodel.unionName }}</span>
+ <span class="long-title-style">{{ row.wfmodel ? row.wfmodel.unionName : '-' }}</span>
</template>
</el-table-column>
<el-table-column prop="stationCode" label="宸ヤ綅缂栧彿" min-width="100px"></el-table-column>
@@ -143,6 +152,7 @@
<script>
import BaseTable from '@/components/base/BaseTable'
import TableLayout from '@/layouts/TableLayout'
+import ImportButton from '@/components/common/ImportButton'
// import SearchFormCollapse from '@/components/common/SearchFormCollapse'
import Pagination from '@/components/common/Pagination'
import OperaDeviceExtWindow from '@/components/ext/OperaDeviceExtWindow'
@@ -153,7 +163,7 @@
export default {
name: 'DeviceExt',
extends: BaseTable,
- components: { TableLayout, Pagination, OperaDeviceExtWindow, QrCodeLabel },
+ components: { TableLayout, Pagination, OperaDeviceExtWindow, ImportButton, QrCodeLabel },
data () {
return {
// 鎼滅储
@@ -256,4 +266,7 @@
}
}
}
+/**
+ *
+ */
</script>
--
Gitblit v1.9.3