From 7356107de1bf67186d4aa849db422277f77f27ad Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Mon, 22 Apr 2024 10:57:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91=E7=A5=A8?=
=?UTF-8?q?=E8=AE=B0=E5=BD=95=EF=BC=8C=E6=B7=BB=E5=8A=A0=E4=B8=8B=E8=BD=BD?=
=?UTF-8?q?=E6=8C=89=E9=92=AE=EF=BC=8C=E9=9A=90=E8=97=8F=E5=88=A0=E9=99=A4?=
=?UTF-8?q?=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/Annex/src/Annex.vue | 11 ++++++-
src/components/Detail/src/Detail.vue | 31 +++++++++++++------
.../supplierdeliverRequestMain/index.vue | 4 +--
.../supplierinvoiceRecordMain/index.vue | 18 ++++++++---
.../supplierinvoiceRequestMain/index.vue | 4 ++-
5 files changed, 50 insertions(+), 18 deletions(-)
diff --git a/src/components/Annex/src/Annex.vue b/src/components/Annex/src/Annex.vue
index 7acc34996..ef289c6a8 100644
--- a/src/components/Annex/src/Annex.vue
+++ b/src/components/Annex/src/Annex.vue
@@ -16,7 +16,8 @@
{{ item.size }}KB
来自 {{ item.nickname }}
-
+
+
{{ formatDate(item.createTime) }}
@@ -44,6 +45,14 @@ const props = defineProps({
type: Object,
required: true
},
+ showDownload: {
+ type: Boolean,
+ required: false
+ },
+ hiddenDelete: {
+ type: Boolean,
+ required: false
+ },
})
// 子传父的时候需要先定义好emit这个方法
const emit = defineEmits(['handleAnnexSuccess', 'deleteAnnexSuccess'])
diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue
index 27d53e1c1..e6fe04d8c 100644
--- a/src/components/Detail/src/Detail.vue
+++ b/src/components/Detail/src/Detail.vue
@@ -27,7 +27,7 @@
-
+
-
-
+
- []
- },
+ },
//展示附件组件的tab标签
- annexAliasLabel: {
- type: String,
+ annexAlias: {
+ type: Object,
required: false,
- default: '附件'
+ default: ()=>({
+ label: '附件',
+ showDownload:false,
+ hiddenDelete:false
+ })
},
+
// 是否是基础数据 展现详情顶部表单
isBasic: {
type: Boolean,
@@ -383,7 +392,7 @@ if (props.isBasic == true) {
}
const otherList = [...props.annexTable,{
- label:props.annexAliasLabel,
+ label:props.annexAlias.label,
prop:'Annex'
},{
label:'备注',
@@ -463,7 +472,9 @@ const getAnnexFileList = async (row:id) => {
tableName: item?.tableName || '',
annexList,
hasSubDetail:item.hasSubDetail||false,
- subDetailTableData:item.subDetailTableData
+ subDetailTableData:item.subDetailTableData,
+ showDownload:item.showDownload||false, // 是否展示下载按钮
+ hiddenDelete:item.hiddenDelete || false, // 是否展示删除按钮
})
if(item?.subDetailTableData){
const { tableObject:subTableObject, tableMethods:subTableMethods } = useTable({
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index b9fe2e310..5a09e488b 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -683,13 +683,13 @@ const handleTur = async (id: number) => {
/** 处理按钮操作 */
const genRecords = async (id: number) => {
try {
- await SupplierdeliverRequestMainApi.selfCheckReport(id).then(res => {
+ await SupplierdeliverRequestMainApi.selfCheckReport(id).then(async res => {
if(!res){
message.warning("请先上传自检报告!")
return
}else{
// 处理的二次确认
- message.confirm('是否处理所选中数据？')
+ await message.confirm('是否处理所选中数据？')
tableObject.loading = true
// 发起处理
SupplierdeliverRequestMainApi.genRecordsSupplierdeliverRequestMain(id).then(res => {
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
index a8576d009..1333f4297 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
@@ -56,17 +56,27 @@
:annexTable="[{
label: '合同附件',
prop: 'Annex',
- tableName:'contract'
+ tableName:'contract',
+ showDownload:true,
+ hiddenDelete:true,
},{
label: '发票附件',
prop: 'Annex',
- tableName:'invoice'
+ tableName:'invoice',
+ showDownload:true,
+ hiddenDelete:true,
},{
label: '货运单附件',
prop: 'Annex',
- tableName:'waybill'
+ tableName:'waybill',
+ showDownload:true,
+ hiddenDelete:true,
}]"
- annexAliasLabel="其他附件"
+ :annexAlias="{
+ label:'其他附件',
+ showDownload:true,
+ hiddenDelete:true
+ }"
:isBasic="false"
:allSchemas="SupplierinvoiceRecordMain.allSchemas"
:detailAllSchemas="SupplierinvoiceRecordDetail.allSchemas"
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
index e36fa9ecf..f0d72db54 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@@ -88,7 +88,9 @@
prop: 'Annex',
tableName:'waybill'
}]"
- annexAliasLabel="其他附件"
+ :annexAlias="{
+ label:'其他附件'
+ }"
:otherHeadButttonData="[{
label: '打印明细',
name: 'printing',