From c7109f39a1761d3c3cf0b9b221660d880928de56 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Wed, 19 Jun 2024 15:02:04 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?= =?UTF-8?q?=E7=A5=A8=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierinvoiceRecordMain/index.vue | 20 +++++++++++++++++++ .../supplierinvoiceRequestMain/index.vue | 18 ++++++++++++++--- 2 files changed, 35 insertions(+), 3 deletions(-) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue index 6a4dbe03c..4f7eb706c 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue @@ -140,6 +140,7 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ defaultButtons.defaultExportBtn({hasPermi:'wms:supplierinvoice-record-main:export'}), // 导出 + // defaultButtons.mainLisSelectiontPointBtn(null), // 批量打印 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 @@ -157,6 +158,8 @@ const HeadButttondata = [ const buttonBaseClick = (val, item) => { if (val == 'export') { // 导出 handleExport() + }else if (val=='selection_point'){// 批量打印 + handleSelectionPoint() } else if (val == 'refresh') { // 刷新 if (tableObject.params.filters && tableObject.params.filters.length > 0 ) { searchFormClick({ @@ -170,7 +173,24 @@ const buttonBaseClick = (val, item) => { console.log('其他按钮', item) } } +const handleSelectionPoint = async ()=>{ + let rows:any = [] + selectionRows.value.forEach(item=>{ + rows = [...rows,...item.selectionRows.map(item1=>item1.id)] + }) + if(rows.length==0){ + return + } + console.log('批量打印',rows.join(',')) + // let getLoading = ElLoading.service({ + // lock: true, + // text: 'loading...', + // background: 'rgba(0, 0, 0, 0.7)' + // }) + // getLoading?.close() + +} // 列表-操作按钮 const butttondata = (row,$index) => { return [] diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue index 445310021..02a7893fd 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue @@ -362,7 +362,7 @@ const searchTableSuccessDetail = async (formField, searchField, val, formRef,sea { label: t('ts.供应商确认'), name: 'invoice_sent_out', - hide: isShowMainButton(row, ['8']), + hide: isShowMainButton(row, ['3','7']), type: 'danger', color: '', link: true, // 文本展现按钮 @@ -544,7 +544,9 @@ const handleImport = () => { },{ label: t('ts.发票附件'), prop: 'Annex', - tableName:'invoice' + tableName:'invoice', + hiddenDelete:false, + hiddenUpload:false },{ label: t('ts.货运单附件'), prop: 'Annex', @@ -554,7 +556,17 @@ const handleImport = () => { const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode)) clicKRowId.value = row.id - if(row.status=='1'||row.status=='2'||row.status=='3'||row.status=='6'){ + + // 合同附件 + if(row.status=='1'||row.status=='2'||row.status=='3'||row.status=='6'||row.status=='7'){ + detailAnnexTable.value[0].hiddenDelete = false + detailAnnexTable.value[0].hiddenUpload = false + }else{ + detailAnnexTable.value[0].hiddenDelete = true + detailAnnexTable.value[0].hiddenUpload = true + } + // 发票附件 + if(row.status=='7'){ detailAnnexTable.value[0].hiddenDelete = false detailAnnexTable.value[0].hiddenUpload = false }else{ From 85beb7d524b258e56fb78832c6a04cbfc6190cb7 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Wed, 19 Jun 2024 15:07:49 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=85=B3=E9=97=AD=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E5=88=B7=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wms/issueManage/repleinsh/repleinshJobMain/index.vue | 3 ++- .../productreceipt/productreceiptJobMain/index.vue | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/views/wms/issueManage/repleinsh/repleinshJobMain/index.vue b/src/views/wms/issueManage/repleinsh/repleinshJobMain/index.vue index 3a4f229a0..4ed66d5b7 100644 --- a/src/views/wms/issueManage/repleinsh/repleinshJobMain/index.vue +++ b/src/views/wms/issueManage/repleinsh/repleinshJobMain/index.vue @@ -304,7 +304,8 @@ const buttonTableClick = async (val, row) => { } else if (val == 'mainJobAba') { // 放弃 RepleinshJobMainApi.abandonRepleinshMain(row.masterId) } else if (val == 'mainJobClo') { // 关闭 - RepleinshJobMainApi.closeRepleinshMain(row.masterId) + await RepleinshJobMainApi.closeRepleinshMain(row.masterId) + getList() } else if (val == 'mainJobAcc') { // 承接 RepleinshJobMainApi.acceptRepleinshMain(row.masterId) } diff --git a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue index 121c40439..e84e4f14d 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue +++ b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue @@ -323,7 +323,8 @@ const buttonTableClick = async (val, row) => { } else if (val == 'mainJobAba') { // 放弃 ProductreceiptJobMainApi.abandonProductreceiptMain(row.masterId) } else if (val == 'mainJobClo') { // 关闭 - ProductreceiptJobMainApi.closeProductreceiptMain(row.masterId) + await ProductreceiptJobMainApi.closeProductreceiptMain(row.masterId) + getList() } else if (val == 'mainJobAcc') { // 承接 ProductreceiptJobMainApi.acceptProductreceiptMain(row.masterId) } From 2820d707beafb86f187caf3ca69fb424e69ef87b Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Wed, 19 Jun 2024 15:10:35 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E7=A9=BA=E7=99=BD=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productputawayRecordMain.data.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/wms/productionManage/productputaway/productputawayRecordMain/productputawayRecordMain.data.ts b/src/views/wms/productionManage/productputaway/productputawayRecordMain/productputawayRecordMain.data.ts index 417fda392..8b077a0c0 100644 --- a/src/views/wms/productionManage/productputaway/productputawayRecordMain/productputawayRecordMain.data.ts +++ b/src/views/wms/productionManage/productputaway/productputawayRecordMain/productputawayRecordMain.data.ts @@ -318,7 +318,7 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive([ field: 'fromPackingNumber', sort: 'custom', table: { - width: 150 + width: 220 }, sortTableDefault:6, }, @@ -420,9 +420,9 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive( label: '物料名称', field: 'itemName', sort: 'custom', - table: { - width: 150 - }, + // table: { + // width: 150 + // }, sortTableDefault:3, }, // { From 86c6c2b7404ddac9aca7bcc0575c0d4c0adfd68c Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Wed, 19 Jun 2024 15:39:58 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierinvoice/supplierinvoiceRequestMain/index.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue index 02a7893fd..874052c19 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue @@ -567,11 +567,11 @@ const handleImport = () => { } // 发票附件 if(row.status=='7'){ - detailAnnexTable.value[0].hiddenDelete = false - detailAnnexTable.value[0].hiddenUpload = false + detailAnnexTable.value[1].hiddenDelete = false + detailAnnexTable.value[1].hiddenUpload = false }else{ - detailAnnexTable.value[0].hiddenDelete = true - detailAnnexTable.value[0].hiddenUpload = true + detailAnnexTable.value[1].hiddenDelete = true + detailAnnexTable.value[1].hiddenUpload = true } detailRef.value.openDetail(row, titleName, titleValue) From e237727273121dc789a0bcb9145b4e112db62359 Mon Sep 17 00:00:00 2001 From: bjang03 Date: Wed, 19 Jun 2024 16:08:27 +0800 Subject: [PATCH 5/7] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D=201=E3=80=81=E9=87=87?= =?UTF-8?q?=E8=B4=AD=E8=A7=92=E8=89=B2=E4=B8=8D=E6=98=BE=E7=A4=BA=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E6=8C=89=E9=92=AEBUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierinvoiceRequestMain/index.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue index 874052c19..70e11f5fe 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue @@ -386,12 +386,12 @@ const searchTableSuccessDetail = async (formField, searchField, val, formRef,sea link: true, // 文本展现按钮 hasPermi: 'wms:supplierinvoice-request-main:financeRej' }, - defaultButtons.mainListEditBtn({ hasPermi: 'wms:supplierinvoice-request-main:update' , hide: isShowMainButton(row, ['1','8','6'])}), // 编辑 - defaultButtons.mainListPurchasePlanCloBtn({ hasPermi: 'wms:supplierinvoice-request-main:close' ,hide: isShowMainButton(row, ['1','8','6']) }), // 关闭 + defaultButtons.mainListEditBtn({ hasPermi: 'wms:supplierinvoice-request-main:update' , hide: isShowMainButton(row, ['1','3','6'])}), // 编辑 + defaultButtons.mainListPurchasePlanCloBtn({ hasPermi: 'wms:supplierinvoice-request-main:close' ,hide: isShowMainButton(row, ['1','3','6']) }), // 关闭 { label: t('ts.作废'), name: 'repeal', - hide: isShowMainButton(row, ['1','8','6']), + hide: isShowMainButton(row, ['1','3','6']), type: 'danger', color: '', link: true, // 文本展现按钮 @@ -499,7 +499,7 @@ const handleImport = () => { }) } - if(row && row.status == '8'){ + if(row && (row.status == '3' || row.status == '7')){ SupplierinvoiceRequestMainRules.invoiceTime[0].required = true SupplierinvoiceRequestMainRules.goldenTaxInvoiceNumber[0].required = true }else{ @@ -566,7 +566,7 @@ const handleImport = () => { detailAnnexTable.value[0].hiddenUpload = true } // 发票附件 - if(row.status=='7'){ + if(row.status=='3' || row.status=='7'){ detailAnnexTable.value[1].hiddenDelete = false detailAnnexTable.value[1].hiddenUpload = false }else{ From 95ac4b7c03db9dd23fb7b917a34e30420fed3fa7 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Wed, 19 Jun 2024 16:32:08 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E4=BE=9B=E5=BA=94?= =?UTF-8?q?=E5=95=86=E8=A7=92=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/supplierinvoiceRequestMain/index.ts | 6 ++++++ .../supplierinvoiceRequestMain/index.vue | 16 +++++++++++++--- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/src/api/wms/supplierinvoiceRequestMain/index.ts b/src/api/wms/supplierinvoiceRequestMain/index.ts index 9dd8e60e8..ec37ab88c 100644 --- a/src/api/wms/supplierinvoiceRequestMain/index.ts +++ b/src/api/wms/supplierinvoiceRequestMain/index.ts @@ -141,3 +141,9 @@ export const queryUserInfoByRoleCode = async (params) => { return await request.get({ url: `/wms/supplierinvoice-request-main/queryUserInfoByRoleCodePage`, params }) } +// 获取供应商角色 +export const getLoginUserRoleList = async () => { + return await request.get({ url: `/wms/supplierinvoice-request-main/getLoginUserRoleList`}) + +} + diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue index 70e11f5fe..b3867aba9 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue @@ -558,7 +558,7 @@ const handleImport = () => { clicKRowId.value = row.id // 合同附件 - if(row.status=='1'||row.status=='2'||row.status=='3'||row.status=='6'||row.status=='7'){ + if((roleList.value.indexOf('supplier_operator')>-1||roleList.value.indexOf('purchase')>-1)&&(row.status=='1'||row.status=='2'||row.status=='3'||row.status=='6'||row.status=='7')){ detailAnnexTable.value[0].hiddenDelete = false detailAnnexTable.value[0].hiddenUpload = false }else{ @@ -566,7 +566,7 @@ const handleImport = () => { detailAnnexTable.value[0].hiddenUpload = true } // 发票附件 - if(row.status=='3' || row.status=='7'){ + if(roleList.value.indexOf('supplier_operator')>-1&&(row.status=='3'||row.status=='7')){ detailAnnexTable.value[1].hiddenDelete = false detailAnnexTable.value[1].hiddenUpload = false }else{ @@ -978,11 +978,21 @@ const importSuccess = () => { } }) } - + const roleList = ref([]) + const getLoginUserRoleList = async ()=>{ + let res = await SupplierinvoiceRequestMainApi.getLoginUserRoleList() + console.log('roleList',res) + if(res&&res.length>0){ + roleList.value = res + }else{ + roleList.value = [] + } + } /** 初始化 **/ onMounted(async () => { getList() getDefaultSupplier() + getLoginUserRoleList() importTemplateData.templateUrl = await SupplierinvoiceRequestMainApi.importTemplate() }) From c74cc79ded48ccfe6c8880a7ddae8e9ec74396a4 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Wed, 19 Jun 2024 17:08:42 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E5=8F=91=E6=96=99=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=EF=BC=8C=E5=88=B0=E5=BA=93=E4=BD=8D=E4=BB=A3=E7=A0=81bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/issueManage/issue/issueJobMain/index.vue | 4 ++-- .../repleinshRequestMain/repleinshRequestMain.data.ts | 11 ++--------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/src/views/wms/issueManage/issue/issueJobMain/index.vue b/src/views/wms/issueManage/issue/issueJobMain/index.vue index c3d3dd676..4bc931a4a 100644 --- a/src/views/wms/issueManage/issue/issueJobMain/index.vue +++ b/src/views/wms/issueManage/issue/issueJobMain/index.vue @@ -33,9 +33,9 @@ {{ row.number }} - + diff --git a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts index e05bee599..3553cbea4 100644 --- a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts +++ b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts @@ -480,6 +480,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive([ sortSearchDefault:1000, isSearch: true, sortTableDefault:1100, + isTableForm: false, form: { // labelMessage: '信息提示说明！！！', componentProps: { @@ -560,15 +561,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive([ disabled: true } }, - { - label: '到库位代码', - field: 'toLocationCode', - sort: 'custom', - table: { - width: 150 - }, - isTableForm: false, - }, + { label: '单据号', field: 'number',