From bf4cb4fdbd57f1785cdd1ddeadfb20a835d5fb6f Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 05 六月 2025 15:18:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/tms/modules/outBound/OutboundListRight.vue | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/views/tms/modules/outBound/OutboundListRight.vue b/src/views/tms/modules/outBound/OutboundListRight.vue
index 76e3f79..ecea874 100644
--- a/src/views/tms/modules/outBound/OutboundListRight.vue
+++ b/src/views/tms/modules/outBound/OutboundListRight.vue
@@ -55,10 +55,10 @@
<a-button @click="handleAdd(nodeSelected)" type="primary" icon="plus" :disabled="!nodeSelected.key || nodeSelected.entity.leafFlag === '2'">鏂板</a-button>
</Tooltip>
<a-button type="primary" @click="selectOutboundOrder">鐢宠鍗曞嚭搴�</a-button>
- <a-button type="primary" icon="download" @click="handleExportXls('tms_tools_classify')">瀵煎嚭</a-button>
- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
- <a-button type="primary" icon="import">瀵煎叆</a-button>
- </a-upload>
+ <a-button type="primary" icon="download" @click="handleExportXls('宸ュ叿鍑哄簱娴佹按')">瀵煎嚭</a-button>
+<!-- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
+<!-- <a-button type="primary" icon="import">瀵煎叆</a-button>-->
+<!-- </a-upload>-->
</div>
<!-- table鍖哄煙-begin -->
@@ -210,7 +210,7 @@
{
title:'宸ュ叿绫诲瀷',
align:"center",
- dataIndex: 'signCode'
+ dataIndex: 'applicationType'
},
{
title:'涓枃鍚嶇О',
@@ -236,6 +236,11 @@
title:'鍑哄簱绫诲瀷',
align:"center",
dataIndex: 'outStorehouseType_dictText'
+ },
+ {
+ title:'鍑哄簱鏂瑰紡',
+ align:"center",
+ dataIndex: 'operateType'
},
{
title:'搴撲綅鍙�',
@@ -277,7 +282,7 @@
delete: "/tms/baseTools/delete",
deleteBatch: "/tms/baseTools/deleteBatch",
edit: '/tms/baseTools/edit',
- exportXlsUrl: "/tms/baseTools/exportXls",
+ exportXlsUrl: "/tms/outStoreDetail/exportXls",
importExcelUrl: "tms/baseTools/importExcel",
queryParaByToolCode:"/tms/baseTools/queryByToolCode",
queryByToolCode:"/tms/toolsConfigProperty/queryByToolCode"
--
Gitblit v1.9.3