From e1da115362b9774f9fced834dda4687f1b3806cf Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Mon, 22 Apr 2024 10:15:07 +0800 Subject: [PATCH 1/5] =?UTF-8?q?SCP=E5=8F=91=E7=A5=A8=E2=80=94=E2=80=94?= =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91=E8=B4=A7=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=EF=BC=8C=E6=89=B9=E6=AC=A1=E4=BF=A1=E6=81=AF=E9=80=9A=E8=BF=87?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E7=AC=AC=E4=B8=80=E6=9D=A1=E7=9A=84=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=EF=BC=8C=E7=94=9F=E6=88=90=E6=89=B9=E6=AC=A1=EF=BC=8C?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=BA=94=E7=94=A8=E5=88=B0=E6=89=80=E6=9C=89?= =?UTF-8?q?=E8=A1=8C=E6=89=B9=E6=AC=A1=E4=BF=A1=E6=81=AF=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliver/supplierdeliverRequestMain/index.vue | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue index 39e1fe719..8a39363c1 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue @@ -928,6 +928,13 @@ const formFormDateChange = (field, val,row, index) => { if(field == 'produceDate'){ let produceDateStr = formatDate(val,'YYYYMMDD'); row.batch = produceDateStr + tableData.value.forEach(item=>{ + console.log("item.produceDate",item.produceDate) + if(!item.produceDate){ + item.produceDate = val + item.batch = produceDateStr + } + }) } } From 705390194c0df2454ac54c69024fd1ee0eb72098 Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Mon, 22 Apr 2024 10:26:10 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=BF=98=E5=8E=9F?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliverRequestMain/index.vue | 73 +++++++++---------- 1 file changed, 33 insertions(+), 40 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue index 8a39363c1..b9fe2e310 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue @@ -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) => { @@ -928,13 +928,6 @@ const formFormDateChange = (field, val,row, index) => { if(field == 'produceDate'){ let produceDateStr = formatDate(val,'YYYYMMDD'); row.batch = produceDateStr - tableData.value.forEach(item=>{ - console.log("item.produceDate",item.produceDate) - if(!item.produceDate){ - item.produceDate = val - item.batch = produceDateStr - } - }) } } From de27cb80c35bfc5409a2d394ae05360e45abd78f Mon Sep 17 00:00:00 2001 From: chenfang Date: Mon, 22 Apr 2024 10:47:01 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=AD=A3=E5=88=99=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/validator.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 { From ca601540778bb8ca8c6d83e8c678fd6bec325968 Mon Sep 17 00:00:00 2001 From: chenfang Date: Mon, 22 Apr 2024 10:48:12 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E8=AF=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliver/purchaseMain/purchaseMain.data.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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' } 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 5/5] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?= =?UTF-8?q?=E7=A5=A8=E8=AE=B0=E5=BD=95=EF=BC=8C=E6=B7=BB=E5=8A=A0=E4=B8=8B?= =?UTF-8?q?=E8=BD=BD=E6=8C=89=E9=92=AE=EF=BC=8C=E9=9A=90=E8=97=8F=E5=88=A0?= =?UTF-8?q?=E9=99=A4=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',