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/utils/validator.ts b/src/utils/validator.ts
index 4bb0e51d0..3588e20a2 100644
--- a/src/utils/validator.ts
+++ b/src/utils/validator.ts
@@ -21,7 +21,7 @@ export function validateCode(rule, value, callback) {
//校验邮箱
export function validateEmail(rule, value, callback) {
if (value) {
- const mailReg = /^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(.[a-zA-Z0-9_-])+/
+ const mailReg = /^([a-zA-Z0-9_-]+.)+@([a-zA-Z0-9_-])+(.[a-zA-Z0-9_-]+.)+/
if (mailReg.test(value)) {
callback()
} else {
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
index 144dcc421..7c4f18e26 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
@@ -360,7 +360,7 @@ export const PurchaseMainRules = reactive({
],
contactEmail: [
{ max: 50, message: '不得超过50个字符', trigger: 'blur' },
- { validator:validateEmail, message: '请输入正确的手机号', trigger: 'blur'}
+ { validator:validateEmail, message: '请输入正确的邮箱格式', trigger: 'blur'}
],
remark: [
{ max: 50, message: '不得超过50个字符', trigger: 'blur' }
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index 39e1fe719..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 => {
@@ -760,40 +760,40 @@ const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAcces
// 标签打印
const searchTableRef = ref()
const labelPrint = async (row) => {
- tableObject.loading = true
- const subTableDFata = await PackageApi.getLabel(row.masterId)
- tableObject.loading = false
- const tableObject1 = {
- // 当前页
- currentPage: 1,
- // 导出加载中
- exportLoading: false,
- // 加载中
- loading: false,
- // 页数
- pageSize: subTableDFata.length,
- params:null,
- // 排序
- sort: {
- order: '', // 排序规则
- prop: '' // 排序字段
- },
- // 总条数
- total: subTableDFata.length,
- // 表格数据
- tableList: subTableDFata,
- currentRow:null
- }
- console.log("标签打印",subTableDFata,tableObject1,SupplierdeliverRequestPackage.allSchemas)
-
- const tableColumns = SupplierdeliverRequestPackage.allSchemas.tableFormColumns
-
- tableColumns.forEach((item) => {
- item.width = item.table?.width || 150
- })
- searchTableRef.value.openData("采购收货记录单号",tableObject1,{tableColumns},true)
+ // tableObject.loading = true
+ // const subTableDFata = await PackageApi.getLabel(row.masterId)
+ // tableObject.loading = false
+ // const tableObject1 = {
+ // // 当前页
+ // currentPage: 1,
+ // // 导出加载中
+ // exportLoading: false,
+ // // 加载中
+ // loading: false,
+ // // 页数
+ // pageSize: subTableDFata.length,
+ // params:null,
+ // // 排序
+ // sort: {
+ // order: '', // 排序规则
+ // prop: '' // 排序字段
+ // },
+ // // 总条数
+ // total: subTableDFata.length,
+ // // 表格数据
+ // tableList: subTableDFata,
+ // currentRow:null
+ // }
+ // console.log("标签打印",subTableDFata,tableObject1,SupplierdeliverRequestPackage.allSchemas)
+
+ // const tableColumns = SupplierdeliverRequestPackage.allSchemas.tableFormColumns
+
+ // tableColumns.forEach((item) => {
+ // item.width = item.table?.width || 150
+ // })
+ // searchTableRef.value.openData("采购收货记录单号",tableObject1,{tableColumns},true)
- // window.open(src.value + '&asn_number=' + row.asnNumber)
+ window.open(src.value + '&asn_number=' + row.asnNumber)
}
// 批量打印
const searchTableSuccess1 = async (formField, searchField, val, formRef, type, row) => {
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 8ae30675a..8ea75e0c4 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',