From a4e30e05d79cf2750874cb23580323da86f77578 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Mon, 22 Apr 2024 09:13:22 +0800 Subject: [PATCH 01/82] =?UTF-8?q?=E6=89=93=E5=8D=B0=E5=85=A8=E9=83=A8?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/supplierinvoiceRequestMain/index.ts | 5 ++++ .../supplierinvoiceRequestMain/index.vue | 27 +++++++++---------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/src/api/wms/supplierinvoiceRequestMain/index.ts b/src/api/wms/supplierinvoiceRequestMain/index.ts index e5e1d5e8c..ced9da32c 100644 --- a/src/api/wms/supplierinvoiceRequestMain/index.ts +++ b/src/api/wms/supplierinvoiceRequestMain/index.ts @@ -101,6 +101,11 @@ export const printSupplierRecord = async (asnBillNum:string) => { return await request.post({ url: `/wms/supplierinvoice-request-main/querySupplierRecord?asnBillNum=`+asnBillNum }) } +// 打印单挑供应商发货记录 +export const printSupplierRecordByMasterId = async (masterId:number) => { + return await request.post({ url: `/wms/supplierinvoice-request-main/querySupplierRecordByMasterId?masterId=`+masterId }) +} + // 导出供应商发票申请主 Excel export const exportSupplierinvoiceRequestMain = async (params) => { if(params.isSearch){ diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue index a6b533ffa..6273b2fb0 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue @@ -338,21 +338,8 @@ link: true, // 文本展现按钮 hasPermi: '' }, - // defaultButtons.mainListPlanAppBtn({ hide: isShowMainButton(row, ['2']) }), // 审批通过 - //defaultButtons.mainListPlanTurBtn({ hide: isShowMainButton(row, ['2']) }), // 驳回按钮 defaultButtons.mainListEditBtn({ hasPermi: 'wms:supplierinvoice-request-main:update' , hide: isShowMainButton(row, ['1','8','6'])}), // 编辑 defaultButtons.mainListPurchasePlanCloBtn({ hide: isShowMainButton(row, ['1','8','6']) }), // 关闭 - // 生成记录 - // { - // label: '处理', - // name: 'genRecords', - // hide: isShowMainButton(row, ['3']), - // type: 'primary', - // icon: '', - // color: '', - // hasPermi: '', - // link: true, // 文本展现按钮 - // }, // defaultButtons.mainListDeleteBtn({hasPermi:'wms:supplierinvoice-request-main:delete'}), // 删除 ] } @@ -666,7 +653,7 @@ const importSuccess = () => { handleDocumentPrint(clicKRowId.value) }else if(val === 'printing-all'){ //打印全部发货单 - + handlePrintAll(clicKRowId.value) }else if(val === 'export-detail'){ console.log("导出明细:",clicKRowId.value) handleDetailExport() @@ -715,6 +702,18 @@ const importSuccess = () => { window.open(documentSrc.value + '&id=' + id) } + const handlePrintAll = async (masterId) => { + // 打印 + SupplierinvoiceRequestMainApi.printSupplierRecordByMasterId(masterId).then(res =>{ + if(res && res.length > 0){ + for(let i=0;i { getList() From 225002980cee9fcf23c020ce25057492e36be638 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Mon, 22 Apr 2024 09:39:19 +0800 Subject: [PATCH 02/82] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierinvoice/supplierinvoiceRequestMain/index.vue | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue index 6273b2fb0..e36fa9ecf 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue @@ -656,7 +656,7 @@ const importSuccess = () => { handlePrintAll(clicKRowId.value) }else if(val === 'export-detail'){ console.log("导出明细:",clicKRowId.value) - handleDetailExport() + handleDetailExport(clicKRowId.value) } } @@ -680,7 +680,10 @@ const importSuccess = () => { await message.exportConfirm() // 发起导出导出明细 exportLoadingDetail.value = true - const data = await SupplierinvoiceRequestMainApi.exportSupplierinvoiceRequestDetail(masterId) + let params = { + masterId: masterId + } + const data = await SupplierinvoiceRequestMainApi.exportSupplierinvoiceRequestDetail(params) download.excel(data, '供应商发票申请明细.xlsx') } catch { } finally { From aa2c9482e28b89ee53c5a34506654e1d56169d22 Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Mon, 22 Apr 2024 09:54:38 +0800 Subject: [PATCH 03/82] =?UTF-8?q?=E8=BF=87=E6=BB=A4=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereceiptRequestMain.data.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts index 7d5fb1ff4..816f46cf4 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts @@ -66,6 +66,12 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive( searchTitle: '采购订单信息', // 查询弹窗标题 searchAllSchemas: PurchaseMain.allSchemas, // 查询弹窗所需类 searchPage: PurchaseMainApi.getPurchaseMainPage, // 查询弹窗所需分页方法 + searchCondition: [{ + key:'status', + value:'2', + message: '状态已', + isMainValue: false + }] } }, isForm: true, From 42334bc248937f18e50ff4c49d6874f481dd22f0 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Mon, 22 Apr 2024 09:57:19 +0800 Subject: [PATCH 04/82] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/supplierManage/supplierinvoiceInvoiced/index.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/wms/supplierManage/supplierinvoiceInvoiced/index.vue b/src/views/wms/supplierManage/supplierinvoiceInvoiced/index.vue index 813a084f4..22d53bb2a 100644 --- a/src/views/wms/supplierManage/supplierinvoiceInvoiced/index.vue +++ b/src/views/wms/supplierManage/supplierinvoiceInvoiced/index.vue @@ -152,16 +152,16 @@ const butttondata = (row) =>{ type: 'primary', color: '', link: true, // 文本展现按钮 - hasPermi: '' + hasPermi: 'wms:supplierinvoice-invoiced:agree' }, { - label: '审核拒绝', + label: '作废', name: 'refuse', hide: isShowMainButton(row, ['1']), type: 'danger', color: '', link: true, // 文本展现按钮 - hasPermi: '' + hasPermi: 'wms:supplierinvoice-invoiced:refuse' } ] } 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 05/82] =?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 06/82] =?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 07/82] =?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 08/82] =?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 09/82] =?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', From df81b265ba83b64f1f7fbbd1b23d538df157ff5b Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Mon, 22 Apr 2024 11:14:33 +0800 Subject: [PATCH 10/82] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierinvoiceRequestMain/index.vue | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue index e36fa9ecf..8ae30675a 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue @@ -291,8 +291,8 @@ return [] } return [ - defaultButtons.mainListPurchasePlanOpeBtn({ hide: isShowMainButton(row, ['1','6']) }), // 打开 - defaultButtons.mainListPlanSubBtn({ hide: isShowMainButton(row, ['1','6']) }), // 提交审批 + defaultButtons.mainListPurchasePlanOpeBtn({ hide: isShowMainButton(row, ['1','6']) ,hasPermi: 'wms:supplierinvoice-request-main:open'}), // 打开 + defaultButtons.mainListPlanSubBtn({ hide: isShowMainButton(row, ['1','6']),hasPermi: 'wms:supplierinvoice-request-main:sub' }), // 提交审批 { label: '采购通过', name: 'purchase_mainPlanSub', @@ -300,7 +300,7 @@ type: 'primary', icon: '', color: '', - hasPermi: '', + hasPermi: 'wms:supplierinvoice-request-main:app', link: true, // 文本展现按钮 },{ label: '采购驳回', @@ -309,7 +309,7 @@ type: 'danger', color: '', link: true, // 文本展现按钮 - hasPermi: '' + hasPermi: 'wms:supplierinvoice-request-main:rej' }, { label: '供应商确认', @@ -318,7 +318,7 @@ type: 'danger', color: '', link: true, // 文本展现按钮 - hasPermi: '' + hasPermi: 'wms:supplierinvoice-request-main:invoiceSentOut' }, { label: '财务通过', @@ -327,7 +327,7 @@ type: 'primary', icon: '', color: '', - hasPermi: '', + hasPermi: 'wms:supplierinvoice-request-main:financeApp', link: true, // 文本展现按钮 },{ label: '财务驳回', @@ -336,7 +336,7 @@ type: 'danger', color: '', link: true, // 文本展现按钮 - hasPermi: '' + hasPermi: 'wms:supplierinvoice-request-main:financeRej' }, defaultButtons.mainListEditBtn({ hasPermi: 'wms:supplierinvoice-request-main:update' , hide: isShowMainButton(row, ['1','8','6'])}), // 编辑 defaultButtons.mainListPurchasePlanCloBtn({ hide: isShowMainButton(row, ['1','8','6']) }), // 关闭 From fe96af0830479e07fe9f8efe7c2bb4fc3edade1a Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Mon, 22 Apr 2024 11:53:23 +0800 Subject: [PATCH 11/82] =?UTF-8?q?=E6=B7=BB=E5=8A=A0isTableValue=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/BasicForm/src/BasicForm.vue | 3 +++ .../supplierdeliverRequestMain.data.ts | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue index 9da0725be..b43adc7f7 100644 --- a/src/components/BasicForm/src/BasicForm.vue +++ b/src/components/BasicForm/src/BasicForm.vue @@ -376,6 +376,9 @@ const opensearchTable = ( message.warning(searchCondition[i].message?searchCondition[i].message:'前置条件未选择！') return } + }else if(searchCondition[i].isTableValue){ + //查询当前table表数据的值 + _searchCondition[searchCondition[i].key] = row[searchCondition[i].value] } else { // 扩展 转换为筛选条件进行查询 if (searchCondition[i].isSearch) { diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts index 92b0517ce..cb8c9fb2f 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts @@ -1451,7 +1451,7 @@ export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive Date: Mon, 22 Apr 2024 11:54:38 +0800 Subject: [PATCH 12/82] isTableRowValue --- src/components/BasicForm/src/BasicForm.vue | 2 +- .../supplierdeliverRequestMain.data.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue index b43adc7f7..8b7c75020 100644 --- a/src/components/BasicForm/src/BasicForm.vue +++ b/src/components/BasicForm/src/BasicForm.vue @@ -376,7 +376,7 @@ const opensearchTable = ( message.warning(searchCondition[i].message?searchCondition[i].message:'前置条件未选择！') return } - }else if(searchCondition[i].isTableValue){ + }else if(searchCondition[i].isTableRowValue){ //查询当前table表数据的值 _searchCondition[searchCondition[i].key] = row[searchCondition[i].value] } else { diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts index cb8c9fb2f..58ec559cb 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts @@ -1460,7 +1460,7 @@ export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive Date: Mon, 22 Apr 2024 14:29:55 +0800 Subject: [PATCH 13/82] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layout/components/Menu/src/Menu.vue | 7 +++++-- src/store/modules/app.ts | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/layout/components/Menu/src/Menu.vue b/src/layout/components/Menu/src/Menu.vue index b89ae0503..829298d9f 100644 --- a/src/layout/components/Menu/src/Menu.vue +++ b/src/layout/components/Menu/src/Menu.vue @@ -100,14 +100,13 @@ export default defineComponent({ const renderMenu = () => { return ( - diff --git a/src/store/modules/app.ts b/src/store/modules/app.ts index 269f51189..2ec165b7e 100644 --- a/src/store/modules/app.ts +++ b/src/store/modules/app.ts @@ -79,7 +79,7 @@ export const useAppStore = defineStore('app', { // 左侧菜单背景颜色 leftMenuBgColor: 'rgb(241,243,244)', // 左侧菜单浅色背景颜色 - leftMenuBgLightColor: 'rgb(241,243,244)', + leftMenuBgLightColor: '#fff', // 左侧菜单选中背景颜色 leftMenuBgActiveColor: 'rgb(241,243,244)', // 左侧菜单收起选中背景颜色 From 9cff4a9965a84068fb4fb180a298ad8e7176c68c Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Mon, 22 Apr 2024 14:40:24 +0800 Subject: [PATCH 14/82] =?UTF-8?q?=E7=94=9F=E6=88=90=E6=A0=87=E7=AD=BE--?= =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=94=B6=E8=8E=B7=E8=AE=B0=E5=BD=95=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliverRequestMain/index.vue | 2 +- .../supplierdeliverRequestMain.data.ts | 19 ++++++++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue index 5a09e488b..69b2dc1d8 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue @@ -148,7 +148,7 @@ - + diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts index 58ec559cb..a6519e6c7 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts @@ -1692,7 +1692,15 @@ export const SupplierdeliverRequestPackage = useCrudSchemas(reactive Date: Mon, 22 Apr 2024 14:43:58 +0800 Subject: [PATCH 15/82] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BF=AE=E6=94=B9=E5=8F=82=E8=80=83=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E5=8F=B7=E5=92=8C=E5=8F=82=E8=80=83=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E8=A1=8C=E5=8E=BB=E6=8E=89=E6=A3=80=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qms/inspection/inspectionRequest/inspectionMain.data.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/views/qms/inspection/inspectionRequest/inspectionMain.data.ts b/src/views/qms/inspection/inspectionRequest/inspectionMain.data.ts index b0c0dddc0..5e3ec8d56 100644 --- a/src/views/qms/inspection/inspectionRequest/inspectionMain.data.ts +++ b/src/views/qms/inspection/inspectionRequest/inspectionMain.data.ts @@ -13,8 +13,6 @@ export const InspectionMainRules = reactive({ requestEndTime: [required], batch: [required,{ validator:validateInteger, message: '请输入正确的整数', trigger: 'blur'}], requestInspectionNum: [required,{ validator:validateTwoNum, message: '小数点后最多2位', trigger: 'blur'}], - referenceOrderCode: [required], - referenceOrderRow: [required,{ validator:validateInteger, message: '请输入正确的整数', trigger: 'blur'}], referenceCertificateCode: [required], referenceCertificateRow: [required,{ validator:validateInteger, message: '请输入正确的整数', trigger: 'blur'}], inspectionType: [required], From 71e40b04c04de2cff687842a7bda2ab4753d7c2b Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Mon, 22 Apr 2024 14:49:05 +0800 Subject: [PATCH 16/82] =?UTF-8?q?=E5=8C=85=E8=A3=85=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=90=8E=E9=9C=80=E9=87=8D=E6=96=B0=E6=89=93=E5=8D=B0=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=EF=BC=8C=E6=98=AF=E5=90=A6=E7=BB=A7=E7=BB=AD=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=EF=BC=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wms/inventoryManage/package/index.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/wms/inventoryManage/package/index.vue b/src/views/wms/inventoryManage/package/index.vue index 4b4bc7fad..5f27e619f 100644 --- a/src/views/wms/inventoryManage/package/index.vue +++ b/src/views/wms/inventoryManage/package/index.vue @@ -246,8 +246,9 @@ const formsSuccess = async (formType,data) => { await PackageApi.createPackage(data) message.success(t('common.createSuccess')) } else { + await message.confirm('包装修改后需重新打印标签，是否继续保存？') await PackageApi.updatePackage(data) - message.success(t('common.updateSuccess')) + message.success(t('包装信息已修改，请重新打印标签')) } basicFormRef.value.dialogVisible = false getList() From 67aa521203791d59a830100e509d3b69a89cd235 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Mon, 22 Apr 2024 15:12:53 +0800 Subject: [PATCH 17/82] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=B0=83=E7=94=A8?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=20=E6=B7=BB=E5=8A=A0=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E5=AD=97=E5=85=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/dict.ts | 2 +- src/views/wms/agvManage/interfaceInfo/index.vue | 1 + src/views/wms/agvManage/interfaceInfo/interfaceInfo.data.ts | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/utils/dict.ts b/src/utils/dict.ts index 3bfea0b0c..fc448b1ca 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -325,5 +325,5 @@ export enum DICT_TYPE { SUPPLIERINVOICE_STATUS = 'supplierinvoice_status', //待开票审核状态 BASIC_TEAM_TYPE='basic_team_type',//班组类型 TAX_RATE_DICT='tax_rate_dict', //税率 - + INTERFACE_STATUS = 'interfaceStatus', // 接口调用信息 接口状态 } diff --git a/src/views/wms/agvManage/interfaceInfo/index.vue b/src/views/wms/agvManage/interfaceInfo/index.vue index ec8913d10..f89506d15 100644 --- a/src/views/wms/agvManage/interfaceInfo/index.vue +++ b/src/views/wms/agvManage/interfaceInfo/index.vue @@ -66,6 +66,7 @@ import TableHead from '@/components/TableHead/src/TableHead.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import Detail from '@/components/Detail/src/Detail.vue' +// 接口调用信息 defineOptions({ name: 'InterfaceInfo' }) const message = useMessage() // 消息弹窗 diff --git a/src/views/wms/agvManage/interfaceInfo/interfaceInfo.data.ts b/src/views/wms/agvManage/interfaceInfo/interfaceInfo.data.ts index 6c9898302..1dc1ecd7f 100644 --- a/src/views/wms/agvManage/interfaceInfo/interfaceInfo.data.ts +++ b/src/views/wms/agvManage/interfaceInfo/interfaceInfo.data.ts @@ -31,6 +31,8 @@ export const InterfaceInfo = useCrudSchemas(reactive([ { label: '状态', field: 'interfaceStatus', + dictType: DICT_TYPE.INTERFACE_STATUS, + dictClass: 'string', sort: 'custom', form: { component: 'Radio' From 0aa3b883e55590fa00d25eb2a0317b1805531f99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Mon, 22 Apr 2024 15:14:56 +0800 Subject: [PATCH 18/82] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=B0=83=E7=94=A8?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=20=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wms/agvManage/interfaceInfo/interfaceInfo.data.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/views/wms/agvManage/interfaceInfo/interfaceInfo.data.ts b/src/views/wms/agvManage/interfaceInfo/interfaceInfo.data.ts index 1dc1ecd7f..833f53691 100644 --- a/src/views/wms/agvManage/interfaceInfo/interfaceInfo.data.ts +++ b/src/views/wms/agvManage/interfaceInfo/interfaceInfo.data.ts @@ -11,7 +11,6 @@ export const InterfaceInfo = useCrudSchemas(reactive([ label: '序号', field: 'number', sort: 'custom', - isSearch: true, }, { label: '接口类型', @@ -37,12 +36,12 @@ export const InterfaceInfo = useCrudSchemas(reactive([ form: { component: 'Radio' }, + isSearch: true, }, { label: '请求地址', field: 'url', sort: 'custom', - isSearch: true, }, { label: '请求参数', From d0e311ff0f41d17e346c285b9d20f194044aef9d Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Mon, 22 Apr 2024 15:19:33 +0800 Subject: [PATCH 19/82] =?UTF-8?q?=E5=8F=91=E8=B4=A7=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=88=97=E8=A1=A8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliver/supplierdeliverRequestMain/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue index 69b2dc1d8..d4d2dd5b4 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue @@ -694,11 +694,11 @@ const genRecords = async (id: number) => { // 发起处理 SupplierdeliverRequestMainApi.genRecordsSupplierdeliverRequestMain(id).then(res => { message.success(t('处理成功!')) + // 刷新列表 + getList() // 单据打印 handleDocumentPrint(res) }) - // 刷新列表 - getList() } }).catch(err => { console.log("自检报告校验异常",err) From 8393eaf5716426f165203c8aee42f7a165aea566 Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Mon, 22 Apr 2024 15:22:45 +0800 Subject: [PATCH 20/82] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layout/components/Menu/src/Menu.vue | 12 +++++++++++- src/store/modules/app.ts | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/layout/components/Menu/src/Menu.vue b/src/layout/components/Menu/src/Menu.vue index 829298d9f..2b96ea9f7 100644 --- a/src/layout/components/Menu/src/Menu.vue +++ b/src/layout/components/Menu/src/Menu.vue @@ -100,7 +100,7 @@ export default defineComponent({ const renderMenu = () => { return ( - .el-sub-menu__title:hover{ + background-color: rgb(241,243,244) !important; +} +.v-menu .el-menu .el-sub-menu.is-active>.el-sub-menu__title{ + background-color: #fff !important; + color:#666 !important; +} diff --git a/src/store/modules/app.ts b/src/store/modules/app.ts index 2ec165b7e..8aeea337e 100644 --- a/src/store/modules/app.ts +++ b/src/store/modules/app.ts @@ -77,7 +77,7 @@ export const useAppStore = defineStore('app', { // 左侧菜单边框颜色 leftMenuBorderColor: 'inherit', // 左侧菜单背景颜色 - leftMenuBgColor: 'rgb(241,243,244)', + leftMenuBgColor: '#fff', // 左侧菜单浅色背景颜色 leftMenuBgLightColor: '#fff', // 左侧菜单选中背景颜色 From 31fe4dc05e9adcba07cafd0a25c233b200e7d7ec Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Mon, 22 Apr 2024 15:26:03 +0800 Subject: [PATCH 21/82] =?UTF-8?q?=E9=A2=84=E7=94=9F=E4=BA=A7=E6=94=B6?= =?UTF-8?q?=E8=B4=A7--=E4=B8=BB=E5=AD=90=E8=A1=A8=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productreceiptJobMain/index.vue | 6 +++--- .../productreceiptRecordMain/index.vue | 2 +- .../productreceiptRequestMain/index.vue | 18 +++++++++--------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue index c5d25cea2..e1ceea466 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue +++ b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue @@ -262,11 +262,11 @@ const buttonTableClick = async (val, row) => { } ProductreceiptJobMainApi.executeProductreceiptMain(aaa) } else if (val == 'mainJobAba') { // 放弃 - ProductreceiptJobMainApi.abandonProductreceiptMain(row.id) + ProductreceiptJobMainApi.abandonProductreceiptMain(row.masterId) } else if (val == 'mainJobClo') { // 关闭 - ProductreceiptJobMainApi.closeProductreceiptMain(row.id) + ProductreceiptJobMainApi.closeProductreceiptMain(row.masterId) } else if (val == 'mainJobAcc') { // 承接 - ProductreceiptJobMainApi.acceptProductreceiptMain(row.id) + ProductreceiptJobMainApi.acceptProductreceiptMain(row.masterId) } } // 获取部门 用于详情 部门回显 diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue index d4535b809..b8a9fdcde 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue +++ b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue @@ -223,7 +223,7 @@ const tableFormButton = async (val , row) => { bomModelVisible.value = true DialogTitle.value = '物料代码【' + row.itemCode + '】——Bom信息' detatableDataBom.params = { - masterId: row.id + masterId: row.masterId } await getDetailListBom() } diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue index 60e04c0ee..e32d37e14 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue @@ -295,7 +295,7 @@ const buttonTableClick = async (val, row) => { if (val == 'mainClose') { // 关闭 await message.confirm('确认要关闭吗？') tableObject.loading = true - ProductreceiptRequestMainApi.close(row.id).then(() => { + ProductreceiptRequestMainApi.close(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false getList() @@ -306,7 +306,7 @@ const buttonTableClick = async (val, row) => { } else if (val == 'mainReAdd') { // 重新添加 await message.confirm('确认要重新添加吗？') tableObject.loading = true - ProductreceiptRequestMainApi.reAdd(row.id).then(() => { + ProductreceiptRequestMainApi.reAdd(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false getList() @@ -317,7 +317,7 @@ const buttonTableClick = async (val, row) => { } else if (val == 'mainSubmit') { // 提交审批 await message.confirm('确认要提交审批吗？') tableObject.loading = true - ProductreceiptRequestMainApi.submit(row.id).then(() => { + ProductreceiptRequestMainApi.submit(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false getList() @@ -328,7 +328,7 @@ const buttonTableClick = async (val, row) => { } else if (val == 'mainTurnDown') { // 驳回 await message.confirm('确认要驳回吗？') tableObject.loading = true - ProductreceiptRequestMainApi.refused(row.id).then(() => { + ProductreceiptRequestMainApi.refused(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false getList() @@ -339,7 +339,7 @@ const buttonTableClick = async (val, row) => { } else if (val == 'mainApprove') { // 审批通过 await message.confirm('确认要审批通过吗？') tableObject.loading = true - ProductreceiptRequestMainApi.agree(row.id).then(() => { + ProductreceiptRequestMainApi.agree(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false getList() @@ -363,7 +363,7 @@ const buttonTableClick = async (val, row) => { return } detatableData.params = { - masterId:row.id + masterId:row.masterId } await getDetailList() // 打开创建标签页面 @@ -432,7 +432,7 @@ const buttonTableClick = async (val, row) => { return } tableObject.loading = true - ProductreceiptRequestMainApi.handle(row.id).then(() => { + ProductreceiptRequestMainApi.handle(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false getList() @@ -442,7 +442,7 @@ const buttonTableClick = async (val, row) => { } else if (val == 'edit') { // 编辑 openForm('update', row) } else if (val == 'delete') { // 删除 - handleDelete(row.id) + handleDelete(row.masterId) } else if (val == 'point') { // 标签打印 handlePoint(row) } @@ -615,7 +615,7 @@ const tableFormButton = async (val , row) => { bomModelVisible.value = true DialogTitle.value = '物料代码【' + row.itemCode + '】——Bom信息' detatableDataBom.params = { - masterId: row.id + masterId: row.masterId } await getDetailListBom() } From 4b468556e45e8ecbe83a9b7dd6e639cf75b8755f Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Mon, 22 Apr 2024 15:35:51 +0800 Subject: [PATCH 22/82] =?UTF-8?q?=E8=A3=85=E9=85=8D=E6=94=B6=E8=B4=A7--?= =?UTF-8?q?=E4=B8=BB=E5=AD=90=E8=A1=A8=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productreceiptAssembleJobMain/index.vue | 6 +++--- .../productreceiptAssembleRecordMain/index.vue | 2 +- .../index.vue | 18 +++++++++--------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/index.vue index 3dfa825d1..3e4958241 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/index.vue +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/index.vue @@ -261,11 +261,11 @@ const buttonTableClick = async (val, row) => { } ProductreceiptJobMainApi.executeProductreceiptMain(aaa) } else if (val == 'mainJobAba') { // 放弃 - ProductreceiptJobMainApi.abandonProductreceiptMain(row.id) + ProductreceiptJobMainApi.abandonProductreceiptMain(row.masterId) } else if (val == 'mainJobClo') { // 关闭 - ProductreceiptJobMainApi.closeProductreceiptMain(row.id) + ProductreceiptJobMainApi.closeProductreceiptMain(row.masterId) } else if (val == 'mainJobAcc') { // 承接 - ProductreceiptJobMainApi.acceptProductreceiptMain(row.id) + ProductreceiptJobMainApi.acceptProductreceiptMain(row.masterId) } } // 获取部门 用于详情 部门回显 diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue index a54d37524..661e9d905 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue @@ -222,7 +222,7 @@ const tableFormButton = async (val , row) => { bomModelVisible.value = true DialogTitle.value = '物料代码【' + row.itemCode + '】——Bom信息' detatableDataBom.params = { - masterId: row.id + masterId: row.masterId } await getDetailListBom() } diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue index 2517ae8ba..d78f717ab 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue @@ -294,7 +294,7 @@ const buttonTableClick = async (val, row) => { if (val == 'mainClose') { // 关闭 await message.confirm('确认要关闭吗？') tableObject.loading = true - ProductreceiptRequestMainApi.close(row.id).then(() => { + ProductreceiptRequestMainApi.close(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false getList() @@ -305,7 +305,7 @@ const buttonTableClick = async (val, row) => { } else if (val == 'mainReAdd') { // 重新添加 await message.confirm('确认要重新添加吗？') tableObject.loading = true - ProductreceiptRequestMainApi.reAdd(row.id).then(() => { + ProductreceiptRequestMainApi.reAdd(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false getList() @@ -316,7 +316,7 @@ const buttonTableClick = async (val, row) => { } else if (val == 'mainSubmit') { // 提交审批 await message.confirm('确认要提交审批吗？') tableObject.loading = true - ProductreceiptRequestMainApi.submit(row.id).then(() => { + ProductreceiptRequestMainApi.submit(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false getList() @@ -327,7 +327,7 @@ const buttonTableClick = async (val, row) => { } else if (val == 'mainTurnDown') { // 驳回 await message.confirm('确认要驳回吗？') tableObject.loading = true - ProductreceiptRequestMainApi.refused(row.id).then(() => { + ProductreceiptRequestMainApi.refused(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false getList() @@ -338,7 +338,7 @@ const buttonTableClick = async (val, row) => { } else if (val == 'mainApprove') { // 审批通过 await message.confirm('确认要审批通过吗？') tableObject.loading = true - ProductreceiptRequestMainApi.agree(row.id).then(() => { + ProductreceiptRequestMainApi.agree(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false getList() @@ -362,7 +362,7 @@ const buttonTableClick = async (val, row) => { return } detatableData.params = { - masterId:row.id + masterId:row.masterId } await getDetailList() // 打开创建标签页面 @@ -431,7 +431,7 @@ const buttonTableClick = async (val, row) => { return } tableObject.loading = true - ProductreceiptRequestMainApi.handle(row.id).then(() => { + ProductreceiptRequestMainApi.handle(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false getList() @@ -441,7 +441,7 @@ const buttonTableClick = async (val, row) => { } else if (val == 'edit') { // 编辑 openForm('update', row) } else if (val == 'delete') { // 删除 - handleDelete(row.id) + handleDelete(row.masterId) } else if (val == 'point') { // 标签打印 handlePoint(row) } @@ -614,7 +614,7 @@ const tableFormButton = async (val , row) => { bomModelVisible.value = true DialogTitle.value = '物料代码【' + row.itemCode + '】——Bom信息' detatableDataBom.params = { - masterId: row.id + masterId: row.masterId } await getDetailListBom() } From fef9c448d1cf1267e631a83d99b8cbd343bb7187 Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Mon, 22 Apr 2024 15:37:33 +0800 Subject: [PATCH 23/82] =?UTF-8?q?=E5=88=B6=E5=93=81=E5=9B=9E=E6=94=B6--?= =?UTF-8?q?=E4=B8=BB=E5=AD=90=E8=A1=A8=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productredressJobMain/index.vue | 2 +- .../productredressRequestMain/index.vue | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/views/wms/productionManage/productredress/productredressJobMain/index.vue b/src/views/wms/productionManage/productredress/productredressJobMain/index.vue index 0aa46d0a0..dfad00521 100644 --- a/src/views/wms/productionManage/productredress/productredressJobMain/index.vue +++ b/src/views/wms/productionManage/productredress/productredressJobMain/index.vue @@ -120,7 +120,7 @@ const buttonTableClick = async (val, row) => { if (val == 'edit') { // 编辑 openForm('update', row) } else if (val == 'delete') { // 删除 - handleDelete(row.id) + handleDelete(row.masterId) } } diff --git a/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue b/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue index 1fbc433a2..a3341aa2d 100644 --- a/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue +++ b/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue @@ -233,7 +233,7 @@ const buttonTableClick = async (val, row) => { if (val == 'mainClose') { // 关闭 await message.confirm('确认要关闭吗？') tableObject.loading = true - ProductredressRequestMainApi.close(row.id).then(() => { + ProductredressRequestMainApi.close(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false getList() @@ -244,7 +244,7 @@ const buttonTableClick = async (val, row) => { } else if (val == 'mainReAdd') { // 重新添加 await message.confirm('确认要重新添加吗？') tableObject.loading = true - ProductredressRequestMainApi.reAdd(row.id).then(() => { + ProductredressRequestMainApi.reAdd(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false getList() @@ -255,7 +255,7 @@ const buttonTableClick = async (val, row) => { } else if (val == 'mainSubmit') { // 提交审批 await message.confirm('确认要提交审批吗？') tableObject.loading = true - ProductredressRequestMainApi.submit(row.id).then(() => { + ProductredressRequestMainApi.submit(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false getList() @@ -266,7 +266,7 @@ const buttonTableClick = async (val, row) => { } else if (val == 'mainTurnDown') { // 驳回 await message.confirm('确认要驳回吗？') tableObject.loading = true - ProductredressRequestMainApi.refused(row.id).then(() => { + ProductredressRequestMainApi.refused(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false getList() @@ -277,7 +277,7 @@ const buttonTableClick = async (val, row) => { } else if (val == 'mainApprove') { // 审批通过 await message.confirm('确认要审批通过吗？') tableObject.loading = true - ProductredressRequestMainApi.agree(row.id).then(() => { + ProductredressRequestMainApi.agree(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false getList() @@ -288,7 +288,7 @@ const buttonTableClick = async (val, row) => { } else if (val == 'mainHandle') { // 处理 tableObject.loading = true - ProductredressRequestMainApi.handle(row.id).then(() => { + ProductredressRequestMainApi.handle(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false getList() @@ -298,7 +298,7 @@ const buttonTableClick = async (val, row) => { } else if (val == 'edit') { // 编辑 openForm('update', row) } else if (val == 'delete') { // 删除 - handleDelete(row.id) + handleDelete(row.masterId) } } @@ -446,7 +446,7 @@ const searchFormClick = (searchData) => { // bomModelVisible.value = true // DialogTitle.value = '物料代码【' + row.itemCode + '】——Bom信息' // detatableDataBom.params = { -// masterId: row.id +// masterId: row.masterId // } // await getDetailListBom() // } From 3f564710f46f09aa8091ada8ff2bac8516b4af80 Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Mon, 22 Apr 2024 15:39:15 +0800 Subject: [PATCH 24/82] =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E6=94=B6=E8=B4=A7--?= =?UTF-8?q?=E4=B8=BB=E5=AD=90=E8=A1=A8=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productreceiptscrapJobMain/index.vue | 6 +++--- .../productreceiptscrapRecordMain/index.vue | 2 +- .../productreceiptscrapRequestMain/index.vue | 18 +++++++++--------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue index ab2a2e6eb..698719437 100644 --- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue +++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue @@ -257,11 +257,11 @@ const buttonTableClick = async (val, row) => { } ProductreceiptJobMainApi.executeProductreceiptMain(aaa) } else if (val == 'mainJobAba') { // 放弃 - ProductreceiptJobMainApi.abandonProductreceiptMain(row.id) + ProductreceiptJobMainApi.abandonProductreceiptMain(row.masterId) } else if (val == 'mainJobClo') { // 关闭 - ProductreceiptJobMainApi.closeProductreceiptMain(row.id) + ProductreceiptJobMainApi.closeProductreceiptMain(row.masterId) } else if (val == 'mainJobAcc') { // 承接 - ProductreceiptJobMainApi.acceptProductreceiptMain(row.id) + ProductreceiptJobMainApi.acceptProductreceiptMain(row.masterId) } } // 获取部门 用于详情 部门回显 diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue index 26c572eb3..a48648c8a 100644 --- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue +++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue @@ -221,7 +221,7 @@ const tableFormButton = async (val , row) => { bomModelVisible.value = true DialogTitle.value = '物料代码【' + row.itemCode + '】——Bom信息' detatableDataBom.params = { - masterId: row.id + masterId: row.masterId } await getDetailListBom() } diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue index 0adcefdce..12518e7cd 100644 --- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue @@ -294,7 +294,7 @@ const buttonTableClick = async (val, row) => { if (val == 'mainClose') { // 关闭 await message.confirm('确认要关闭吗？') tableObject.loading = true - ProductreceiptRequestMainApi.close(row.id).then(() => { + ProductreceiptRequestMainApi.close(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false getList() @@ -305,7 +305,7 @@ const buttonTableClick = async (val, row) => { } else if (val == 'mainReAdd') { // 重新添加 await message.confirm('确认要重新添加吗？') tableObject.loading = true - ProductreceiptRequestMainApi.reAdd(row.id).then(() => { + ProductreceiptRequestMainApi.reAdd(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false getList() @@ -316,7 +316,7 @@ const buttonTableClick = async (val, row) => { } else if (val == 'mainSubmit') { // 提交审批 await message.confirm('确认要提交审批吗？') tableObject.loading = true - ProductreceiptRequestMainApi.submit(row.id).then(() => { + ProductreceiptRequestMainApi.submit(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false getList() @@ -327,7 +327,7 @@ const buttonTableClick = async (val, row) => { } else if (val == 'mainTurnDown') { // 驳回 await message.confirm('确认要驳回吗？') tableObject.loading = true - ProductreceiptRequestMainApi.refused(row.id).then(() => { + ProductreceiptRequestMainApi.refused(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false getList() @@ -338,7 +338,7 @@ const buttonTableClick = async (val, row) => { } else if (val == 'mainApprove') { // 审批通过 await message.confirm('确认要审批通过吗？') tableObject.loading = true - ProductreceiptRequestMainApi.agree(row.id).then(() => { + ProductreceiptRequestMainApi.agree(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false getList() @@ -362,7 +362,7 @@ const buttonTableClick = async (val, row) => { return } detatableData.params = { - masterId:row.id + masterId:row.masterId } await getDetailList() // 打开创建标签页面 @@ -431,7 +431,7 @@ const buttonTableClick = async (val, row) => { return } tableObject.loading = true - ProductreceiptRequestMainApi.handle(row.id).then(() => { + ProductreceiptRequestMainApi.handle(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false getList() @@ -441,7 +441,7 @@ const buttonTableClick = async (val, row) => { } else if (val == 'edit') { // 编辑 openForm('update', row) } else if (val == 'delete') { // 删除 - handleDelete(row.id) + handleDelete(row.masterId) } else if (val == 'point') { // 标签打印 handlePoint(row) } @@ -613,7 +613,7 @@ const tableFormButton = async (val , row) => { bomModelVisible.value = true DialogTitle.value = '物料代码【' + row.itemCode + '】——Bom信息' detatableDataBom.params = { - masterId: row.id + masterId: row.masterId } await getDetailListBom() } From 66f73b3b609c6256216d4e931eb96a7f691c41ce Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Mon, 22 Apr 2024 15:48:53 +0800 Subject: [PATCH 25/82] =?UTF-8?q?=E5=88=B6=E5=93=81=E6=8B=86=E8=A7=A3---?= =?UTF-8?q?=E4=B8=BB=E5=AD=90=E8=A1=A8=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productdismantleJobMain/index.vue | 15 ++++++--- .../productdismantleRecordMain/index.vue | 19 +++++++---- .../productdismantleRequestMain/index.vue | 33 +++++++++++-------- 3 files changed, 41 insertions(+), 26 deletions(-) diff --git a/src/views/wms/productionManage/productdismantle/productdismantleJobMain/index.vue b/src/views/wms/productionManage/productdismantle/productdismantleJobMain/index.vue index 31e5dce4c..8add1f184 100644 --- a/src/views/wms/productionManage/productdismantle/productdismantleJobMain/index.vue +++ b/src/views/wms/productionManage/productdismantle/productdismantleJobMain/index.vue @@ -1,7 +1,7 @@ -