From 2d662c159c1dfac64d936b1d27fa5ef8716531a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com> Date: Wed, 17 Apr 2024 15:13:44 +0800 Subject: [PATCH 1/7] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qms/basicDataManage/dynamicRule/index.vue | 1 - src/views/qms/basicDataManage/inspectionTemplate/index.vue | 1 - src/views/qms/basicDataManage/selectedSet/index.vue | 7 ------- src/views/qms/inspection/inspectionJob/index.vue | 4 ---- src/views/qms/inspection/inspectionRecord/index.vue | 4 ---- src/views/qms/inspectionMethod/index.vue | 3 --- src/views/qms/qualityNotice/components/notaicType.vue | 1 - src/views/qms/qualityNotice/components/qualityBatch.vue | 4 ---- src/views/qms/qualityNotice/components/qualityNotice.vue | 1 - src/views/qms/qualityNotice/index.vue | 2 -- 10 files changed, 28 deletions(-) diff --git a/src/views/qms/basicDataManage/dynamicRule/index.vue b/src/views/qms/basicDataManage/dynamicRule/index.vue index bdce56369..b8363ba05 100644 --- a/src/views/qms/basicDataManage/dynamicRule/index.vue +++ b/src/views/qms/basicDataManage/dynamicRule/index.vue @@ -306,7 +306,6 @@ const submitForm = async (formType, data) => { return } data.inspectionStageDOList = tableData.value// 拼接子表数据参数 - console.log(data.subList) try { if (formType === 'create') { await DynamicRuleApi.createDynamicRule(data) diff --git a/src/views/qms/basicDataManage/inspectionTemplate/index.vue b/src/views/qms/basicDataManage/inspectionTemplate/index.vue index 109d8a0fc..f23a456ee 100644 --- a/src/views/qms/basicDataManage/inspectionTemplate/index.vue +++ b/src/views/qms/basicDataManage/inspectionTemplate/index.vue @@ -148,7 +148,6 @@ const openForm = (type: string, row?: any) => { // form表单提交 const submitForm = async (formType,data) => { - console.log(data.value) if (formType === 'create') { await InspectionProcessPageApi.inspectionTemplateCreat(data.value) message.success(t('common.createSuccess')) diff --git a/src/views/qms/basicDataManage/selectedSet/index.vue b/src/views/qms/basicDataManage/selectedSet/index.vue index 2ac80a8ef..b8a3a29cd 100644 --- a/src/views/qms/basicDataManage/selectedSet/index.vue +++ b/src/views/qms/basicDataManage/selectedSet/index.vue @@ -110,9 +110,6 @@ const optionsList = ref() routeName.value = route.name const tableColumns = ref(SelectedSet.allSchemas.tableColumns) - - - // 查询页面返回 const searchTableSuccess = (formField, searchField, val, formRef) => { nextTick(() => { @@ -324,7 +321,6 @@ const submitForm = async (formType, data) => { dictionaryLabel }; }); - console.log(data.subList) try { if (formType === 'create') { await SelectedSetApi.createSelectedSet(data) @@ -414,8 +410,6 @@ const detailOpenForm = (type, row, masterParmas) => { const detailBasiFormOnChange = (field,val,detailFormRef) => { - console.log(field) - console.log(33,detailFormRef) if(field == 'dictionaryTypeAndCode'){ // 按照 '-%%%-'' 拆分 dictionaryCode const [dictionaryCode, dictionaryValue] = val.split('-%%%-'); @@ -432,7 +426,6 @@ const detailBasiFormOnChange = (field,val,detailFormRef) => { } const formSelectChange = (a,b,c,d) => { - console.log(111) } const getDicDetails = ()=>{ diff --git a/src/views/qms/inspection/inspectionJob/index.vue b/src/views/qms/inspection/inspectionJob/index.vue index 0413a48aa..5b6e79114 100644 --- a/src/views/qms/inspection/inspectionJob/index.vue +++ b/src/views/qms/inspection/inspectionJob/index.vue @@ -66,7 +66,6 @@ import TableHead from '@/components/TableHead/src/TableHead.vue' import AddForm from './addForm.vue' import Detail from './detail.vue' - console.log(InspectionJobMain) // 采购订单 defineOptions({ name: 'InspectionJobMain' }) @@ -177,12 +176,10 @@ const listTableRef = ref() const list = await InspectionJobMainApi.getInspectionJobPackageList(row.id) listTableRef.value.openPackage(row,'包装信息',InspectionJobPackage.allSchemas.tableColumns,list) }else if (val == 'mainJobAba') { // 放弃 - console.log('列表-操作按钮事件-放弃') handleAbandon(row.id) } else if (val == 'mainJobClo') { // 关闭 handleClose(row.id) } else if (val == 'mainJobAcc') { // 承接 - console.log('列表-操作按钮事件-承接') handleAccept(row.id) } } @@ -270,7 +267,6 @@ const listTableRef = ref() // 主子数据 提交 const submitForm = async (formType, data) => { - console.log(data) // return try { if (formType === 'create') { diff --git a/src/views/qms/inspection/inspectionRecord/index.vue b/src/views/qms/inspection/inspectionRecord/index.vue index 235e2c5b5..a46422ffb 100644 --- a/src/views/qms/inspection/inspectionRecord/index.vue +++ b/src/views/qms/inspection/inspectionRecord/index.vue @@ -133,10 +133,7 @@ import { DICT_TYPE, getStrDictOptions } from '@/utils/dict' const listTableRef = ref() const useDecisionList = getStrDictOptions(DICT_TYPE.USAGE_DECISION) - console.log(11,useDecisionList) - // console.log(55,InspectionRecordMain.allSchemas.formSchema) // const useDecisionList = InspectionRecordMain.allSchemas.formSchema.filter(item=>item.field == "useDecision") - // console.log(11,useDecisionList) // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { if (val == 'applyDecision') { // 编辑 @@ -145,7 +142,6 @@ import { DICT_TYPE, getStrDictOptions } from '@/utils/dict' InspectionRecordMain.allSchemas.formSchema.forEach((itemColumn) =>{ if(itemColumn.field == "useDecision"){ itemColumn.componentProps.options=useDecisionList?.filter(item=>item.value==1) - console.log(88, useDecisionList) } }) }else if(row.estimateCode == 2){ diff --git a/src/views/qms/inspectionMethod/index.vue b/src/views/qms/inspectionMethod/index.vue index ba2d7158f..01bf866cd 100644 --- a/src/views/qms/inspectionMethod/index.vue +++ b/src/views/qms/inspectionMethod/index.vue @@ -43,7 +43,6 @@ ref="basicFormRef" @success="formsSuccess" :sumFormDataByForm ="(formRef,formModel)=>{ - console.log(formModel) const {videoAddress} = formModel formRef.value.setValues({ installPackageUrl:videoAddress @@ -156,8 +155,6 @@ const buttonTableClick = async (val, row) => { /** 添加/修改操作 */ const basicFormRef = ref() const openForm = (type: string, row?: any) => { - // debugger - console.log(row) if(row && row.videoAddress.trim()){ row.filePathList = row.videoAddress.split(',') } diff --git a/src/views/qms/qualityNotice/components/notaicType.vue b/src/views/qms/qualityNotice/components/notaicType.vue index 75ea8a76b..0b33c796c 100644 --- a/src/views/qms/qualityNotice/components/notaicType.vue +++ b/src/views/qms/qualityNotice/components/notaicType.vue @@ -176,7 +176,6 @@ nextTick(()=>{ q1.value = props.data?.q1 ? props.data?.q1 :{} q2.value = props.data?.q2 ? props.data?.q2 :{} q3.value = props.data?.q3 ? props.data?.q3 :{}, - console.log(998,props.data) }) // 质量通知校验 diff --git a/src/views/qms/qualityNotice/components/qualityBatch.vue b/src/views/qms/qualityNotice/components/qualityBatch.vue index f4d3c89a7..ce7799ee0 100644 --- a/src/views/qms/qualityNotice/components/qualityBatch.vue +++ b/src/views/qms/qualityNotice/components/qualityBatch.vue @@ -548,7 +548,6 @@ const buttonBaseClick1 = (val) => { } dialogVisible.value = false } else { - console.log('error submit!') return false } }) @@ -572,7 +571,6 @@ const buttonBaseClick1 = (val) => { } dialogVisible.value = false } else { - console.log('error submit!') return false } }) @@ -592,7 +590,6 @@ const buttonBaseClick1 = (val) => { } dialogVisible.value = false } else { - console.log('error submit!') return false } }) @@ -626,7 +623,6 @@ const buttonBaseClick1 = (val) => { editableTabsValue.value = newTabName dialogVisible.value = false } else { - console.log('error submit!') return false } }) diff --git a/src/views/qms/qualityNotice/components/qualityNotice.vue b/src/views/qms/qualityNotice/components/qualityNotice.vue index ceffbcdff..3d23da8db 100644 --- a/src/views/qms/qualityNotice/components/qualityNotice.vue +++ b/src/views/qms/qualityNotice/components/qualityNotice.vue @@ -171,7 +171,6 @@ nextTick(()=>{ // 选择是否停机 const changeHalt= (e)=>{ - console.log(rules.value.machineHaltStartTime[0]) if(e){ rules.value.machineHaltStartTime[0].required = true rules.value.machineHaltEndTime[0].required = true diff --git a/src/views/qms/qualityNotice/index.vue b/src/views/qms/qualityNotice/index.vue index a746e3b9f..012cdc29c 100644 --- a/src/views/qms/qualityNotice/index.vue +++ b/src/views/qms/qualityNotice/index.vue @@ -183,8 +183,6 @@ // 主子数据 提交 const submitForm = async (formType, data) => { - console.log(data) - // return try { if (formType === 'create') { await qualityNoticeApi.qualityNoticeCreat(data) From e9c3080314052f8eb450186c7f91a662b700a2c0 Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Wed, 17 Apr 2024 15:33:24 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E4=B8=BB=E8=A1=A8id?= =?UTF-8?q?=E4=B8=BAmasterId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sparereceiptRequestMain/index.vue | 16 +++++------ .../supplierdeliverRequestMain/index.vue | 27 ++++++++++--------- 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue index 93cc5552a..0278bc37b 100644 --- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue @@ -275,25 +275,25 @@ const butttondata = (row) => { // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { if (val == 'mainClose') { // 关闭 - handleClose(row.id) + handleClose(row.masterId) } else if (val == 'mainReAdd') { // 重新添加 - handleReAdd(row.id) + handleReAdd(row.masterId) } else if (val == 'mainSubmit') { // 提交审批 - handleSubmit(row.id) + handleSubmit(row.masterId) } else if (val == 'mainTurnDown') { // 驳回 - handleRefused(row.id) + handleRefused(row.masterId) } else if (val == 'mainApprove') { // 审批通过 - handleAgree(row.id) + handleAgree(row.masterId) } else if (val == 'mainHandle') { // 处理 - handleHandle(row.id) + handleHandle(row.masterId) } else if (val == 'edit') { // 编辑 openForm('update', row) } else if(val == 'ssbq'){ // 生成标签 // 生成标签 detatableData.params = { - masterId:row.id + masterId:row.masterId } - genLabelId.value = row.id + genLabelId.value = row.masterId await getDetailList() formLabelRef.value.open('create', row, null,'createLabel')//创建标签页面 createLabel 标题 }else if (val == 'point') { diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue index 6951269e9..2eb63b41d 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue @@ -444,42 +444,42 @@ const butttondata = (row) => { const buttonTableClick = async (val, row) => { if (val == 'mainPurPlanOpe') { // 打开 - handleOpe(row.id) + handleOpe(row.masterId) } else if (val == 'mainPurPlanClo') { // 关闭 - handleClo(row.id) + handleClo(row.masterId) } else if (val == 'mainPlanUploadQualityReport') { // 上传质量报告 handleUploadQualityReport(row) } else if (val == 'mainPlanSub') { // 提交审批 - handleSub(row.id) + handleSub(row.masterId) } else if (val == 'mainPlanApp') { // 审批通过 - handleApp(row.id) + handleApp(row.masterId) } else if (val == 'mainPlanTur') { // 驳回按钮 - handleTur(row.id) + handleTur(row.masterId) } else if (val == 'genRecords') { // 处理 - genRecords(row.id) + genRecords(row.masterId) } else if (val == 'edit') { // 编辑 openForm('update', row) } else if (val == 'delete') { // 删除 - handleDelete(row.id) + handleDelete(row.masterId) } else if (val == 'ssbq') { - await SupplierdeliverRequestMainApi.selfCheckReport(row.id).then(async (res) => { + await SupplierdeliverRequestMainApi.selfCheckReport(row.masterId).then(async (res) => { if(!res){ message.warning("请先上传自检报告!") return }else{ // 生成标签 detatableData.params = { - masterId:row.id + masterId:row.masterId } - genLabelId.value = row.id + genLabelId.value = row.masterId await getDetailList() formLabelRef.value.open('create', row, null,'createLabel')//创建标签页面 createLabel 标题 } @@ -491,7 +491,7 @@ const buttonTableClick = async (val, row) => { labelPrint(row) } else if (val == 'documentPrint') { // 单据打印 - handleDocumentPrint(row.id) + handleDocumentPrint(row.masterId) } } @@ -598,9 +598,9 @@ const handleUploadQualityReport = async (row) => { console.log('SupplierdeliverInspectionDetail',SupplierdeliverInspectionDetail.allSchemas) const uploadFile = SupplierdeliverInspectionDetail.allSchemas.formSchema.find(item=>item.field=='uploadFile') if(uploadFile){ - uploadFile['componentProps']['upData']['tableId'] = row.id + uploadFile['componentProps']['upData']['tableId'] = row.masterId } - ploadQualityReportRef.value.open('create', null, {masterId:row.id},'上传质量报告')//创建标签页面 createLabel 标题 + ploadQualityReportRef.value.open('create', null, {masterId:row.masterId},'上传质量报告')//创建标签页面 createLabel 标题 const tableFormKeys = {} SupplierdeliverInspectionDetail.allSchemas.tableFormColumns.forEach((item) => { tableFormKeys[item.field] = item.default ? item.default : '' @@ -736,6 +736,7 @@ const submitFormLabel = async (formType, data) => { await SupplierdeliverRequestMainApi.genLabel(data) isCreateLabel.value = true message.success('创建标签成功') + getList() } finally { formLabelRef.value.formLoading = false formLabelRef.value.dialogVisible = false From 6ab49a293c534ba32c530df3886ed207654a7e2a Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Wed, 17 Apr 2024 15:46:54 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E4=B8=AD---=E4=B8=BB=E8=A1=A8id=E6=9B=B4=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Detail/src/Detail.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue index 936e133cd..1c089e084 100644 --- a/src/components/Detail/src/Detail.vue +++ b/src/components/Detail/src/Detail.vue @@ -548,18 +548,18 @@ const openDetail = async (row: any, titleName: any, titleValue: any, tableName: titleNameRef.value = titleName titleValueRef.value = titleValue remarksData.data = { - tableId: row.id, + tableId: row.masterId||row.id, tableName: tableName } count.value++ // 加载明细列表 if (!props.isBasic) { // 设置主表id - masterParmas.value.masterId = row.id + masterParmas.value.masterId = row.masterId||row.id masterParmas.value.number = row.number masterParmas.value.status = row.status tableObjectRef.value.params = { - masterId: row.id + masterId: row.masterId||row.id } await getList() } From 60458dd17e5a9bac238de1f2e05e62ca4c04101b Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Wed, 17 Apr 2024 15:58:56 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../labelManage/callmaterials/index.vue | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue b/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue index f3a4a5498..2d2bf5222 100644 --- a/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue +++ b/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue @@ -68,6 +68,7 @@ import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import Detail from '@/components/Detail/src/Detail.vue' import { formatTime } from '@/utils/index' import { getAccessToken } from '@/utils/auth' +import * as PackageApi from '@/api/wms/package' defineOptions({ name: 'Callmaterials' }) @@ -233,7 +234,7 @@ const handleExport = async () => { } finally { exportLoading.value = false } - + } const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL @@ -243,12 +244,19 @@ const handlePoint = async (row) => { window.open(src.value+'&relateNumber='+row.id) } // 批量打印 -const handleSelectionPoint = ()=>{ +const handleSelectionPoint = async ()=>{ let rows:any = [] selectionRows.value.forEach(item=>{ rows = [...rows,...item.selectionRows.map(item1=>item1.id)] }) - console.log('批量打印',rows) + console.log('批量打印',rows.join(',')) + await PackageApi.batchPrintingLable(rows.join(',')).then(res => { + console.log(res) + message.success('创建标签成功') + }).catch(err => { + console.log(err) + message.error('创建标签失败') + }) } /** 导入 */ const importFormRef = ref() From 006420ca6bf163ba802dbfc723d2325a4e57f8aa Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Wed, 17 Apr 2024 16:47:29 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E4=B8=BB=E8=A1=A8id?= =?UTF-8?q?=E4=B8=BAmasterId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../demandforecastingMain/index.vue | 2 +- .../purchasePlanMain/index.vue | 16 +++++++------- .../supplierdeliverRecordMain/index.vue | 2 +- .../supplierinvoiceRequestMain/index.vue | 22 +++++++++---------- .../supplierinvoiceInvoiced/index.vue | 4 ++-- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue index 317471c07..95fd5b06b 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue @@ -218,7 +218,7 @@ const buttonTableClick = async (val, row) => { } else if (val == 'edit') { // 编辑 openForm('update', row) } else if (val == 'delete') { // 删除 - handleDelete(row.id) + handleDelete(row.masterId) } } diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue index 30ba31a82..206fea3ff 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue @@ -289,23 +289,23 @@ const getSearchTableData = async (number,formField,searchField)=>{ // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { if (val == 'mainPurPlanOpe') { // 打开 - handleOpen(row.id) + handleOpen(row.masterId) } else if (val == 'mainPurPlanClo') {// 关闭 - handleClose(row.id) + handleClose(row.masterId) } else if (val == 'mainPurPlanPub') { // 发布 - handlePublish(row.id) + handlePublish(row.masterId) } else if (val == 'mainPurPlanAcc') { // 接受 - handleAcc(row.id) + handleAcc(row.masterId) } else if (val == 'mainPurPlanRej') { // 不接受 - handleRej(row.id) + handleRej(row.masterId) } else if (val == 'mainPurPlanWit') { // 下架 - handleWit(row.id) + handleWit(row.masterId) } else if(val == 'mainPurPlanMod'){ // 修改 - handleReOpen(row.id) + handleReOpen(row.masterId) }else if (val == 'edit') { // 编辑 openForm('update', row) } else if (val == 'delete') { // 删除 - handleDelete(row.id) + handleDelete(row.masterId) } } diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue index efa1778cf..3fe99d4af 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue @@ -157,7 +157,7 @@ const buttonTableClick = async (val, row) => { handlerCreatePurchasereceiptRequest(row.number) }else if (val == 'documentPrint') { // 单据打印 - handleDocumentPrint(row.id) + handleDocumentPrint(row.masterId) } } diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue index c7617d4fa..f7b9dc57c 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue @@ -329,27 +329,27 @@ const handleImport = () => { // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { if (val == 'mainPurPlanOpe') { // 打开 - handleOpe(row.id) + handleOpe(row.masterId) } else if (val == 'mainPurPlanClo') {// 关闭 - handleClo(row.id) + handleClo(row.masterId) } else if (val == 'mainPlanSub') { // 提交审批 - handleSub(row.id) + handleSub(row.masterId) } else if (val == 'purchase_mainPlanSub') { // 采购审批通过 - handleApp(row.id) + handleApp(row.masterId) } else if (val == 'purchase_mainPlanTur') { // 采购驳回按钮 - handleTur(row.id) + handleTur(row.masterId) } else if (val == 'invoice_sent_out') { // 发票寄出确认 - handleInvoiceSentOut(row.id) + handleInvoiceSentOut(row.masterId) } else if(val == 'finance_mainPlanSub'){ // 财务审批通过 - handleFinanceApp(row.id) + handleFinanceApp(row.masterId) } else if(val == 'finance_mainPlanTur'){ //财务审批拒绝 - handleFinaceTur(row.id) + handleFinaceTur(row.masterId) } else if (val == 'genRecords') { // 处理 - genRecords(row.id) + genRecords(row.masterId) } else if (val == 'edit') { // 编辑 openForm('update', row) } else if (val == 'delete') { // 删除 - handleDelete(row.id) + handleDelete(row.masterId) } } @@ -368,7 +368,7 @@ const handleImport = () => { const openDetail = (row : any, titleName : any, titleValue : any) => { 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 + clicKRowId.value = row.masterId detailRef.value.openDetail(row, titleName, titleValue) } diff --git a/src/views/wms/supplierManage/supplierinvoiceInvoiced/index.vue b/src/views/wms/supplierManage/supplierinvoiceInvoiced/index.vue index 19982feb2..238e38c71 100644 --- a/src/views/wms/supplierManage/supplierinvoiceInvoiced/index.vue +++ b/src/views/wms/supplierManage/supplierinvoiceInvoiced/index.vue @@ -171,9 +171,9 @@ const buttonTableClick = async (val, row) => { if (val == 'edit') { // 编辑 openForm('update', row) } else if (val == 'delete') { // 删除 - handleDelete(row.id) + handleDelete(row.masterId) } else if(val == 'agree'){ - handleAgree(row.id) + handleAgree(row.masterId) } } From 7d3e69c96bcc53b927dea39dc695a2af82e9596f Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Wed, 17 Apr 2024 16:59:49 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E5=A4=87=E4=BB=B6=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E7=9A=84=E6=96=B0=E5=A2=9E=E5=92=8C=E9=87=87?= =?UTF-8?q?=E8=B4=AD=E6=94=B6=E8=B4=A7=E7=94=B3=E8=AF=B7=E7=9A=84=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=8A=9F=E8=83=BD=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sparereceiptRequestMain/index.vue | 80 ++++++- .../sparereceiptRequestMain.data.ts | 224 ++++++++++-------- 2 files changed, 192 insertions(+), 112 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue index 0278bc37b..e60b685b0 100644 --- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue @@ -56,6 +56,7 @@ @searchTableSuccess="searchTableSuccess" @submitForm="submitForm" @formFormDateChange="formFormDateChange" + @onEnter="onEnter" /> @@ -115,6 +116,8 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' import { formatDate } from '@/utils/formatTime' import * as SupplieritemApi from '@/api/wms/supplieritem' import { getAccessToken } from '@/utils/auth' +import * as PurchaseDetailApi from '@/api/wms/purchaseDetail' +import { PurchaseDetail } from '../../supplierdeliver/purchaseMain/purchaseMain.data' // 采购收货申请 defineOptions({ name: 'PurchasereceiptRequestMain' }) @@ -147,17 +150,23 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => } else if(formField == 'poNumber') { row['poNumber'] = val[0]['number'] } else if(formField == 'poLine'){ - row['poLine'] = val[0]['lineNumber'] - row['itemCode'] = val[0]['itemCode'] - row['uom'] = val[0]['uom'] - let supplierCode = formRef.formModel.supplierCode; - let itemCode = val[0]['itemCode'] - let queryData = { - supplierCode:supplierCode, - itemCode:itemCode - } - SupplieritemApi.getDefaultLocationCode(queryData as SupplieritemApi.SupplieritemVO).then(res =>{ - row['defaultToLocationCode'] = res + //添加费用明细--点击确定 + val.forEach(item=>{ + if(tableData.value.find(item1=>item1['id'] == item['id'])) return + const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...row})) + newRow['poLine'] = item['lineNumber'] + newRow['itemCode'] = item['itemCode'] + newRow['uom'] = item['uom'] + newRow['poNumber'] = item['number'] + let supplierCode = formRef.formModel.supplierCode; + let queryData = { + supplierCode:supplierCode, + itemCode: item['itemCode'] + } + SupplieritemApi.getDefaultLocationCode(queryData as SupplieritemApi.SupplieritemVO).then(res =>{ + newRow['defaultToLocationCode'] = res + tableData.value.push(newRow) + }) }) }else if (formField == 'packQty'){ row['packQty'] = val[0]['packQty'] @@ -165,12 +174,59 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => } } else { const setV = {} + if(formField == 'supplierCode'){ + setV['supplierCode'] = val[0]['code'] + }else if(formField == 'ppNumber') { + //新增--采购订单-- + setV['supplierCode'] = val[0]['supplierCode'] + setV['poNumber'] = val[0]['number'] + const newRow = val[0] + newRow['poNumber'] = val[0]['number'] + // 请求明细数据 + getSearchTableData(val[0]['number']) + // tableData.value = [newRow] + // formRef.handleAddTable() + } setV[formField] = val[0][searchField] - setV['supplierCode'] = val[0]['code'] formRef.setValues(setV) } }) } +const onEnter = async (field,value)=>{ + console.log(field,value) + getSearchTableData(value,true) +} +const getSearchTableData = async (number,isEnter=false)=>{ + const {tableObject ,tableMethods} = useTable({ + defaultParams:{number}, + getListApi: PurchaseDetailApi.getPurchaseDetailPage // 分页接口 + }) + // 获得表格的各种操作 + const { getList:getList1 } = tableMethods + await getList1() + const tableColumns = PurchaseDetail.allSchemas.tableFormColumns + tableColumns.forEach((item) => { + item.width = item.table?.width || 150 + }) + tableData.value = [] + tableObject.tableList.forEach(row=>{ + const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...row})) + newRow['poLine'] = row['lineNumber'] + newRow['itemCode'] = row['itemCode'] + newRow['uom'] = row['uom'] + newRow['poNumber'] =row['number'] + newRow['defaultToLocationCode'] =row['defaultLocation'] + tableData.value.push(newRow) + if(isEnter){ + //回车--供应商代码 + const setV = {} + setV['poNumber'] = number + setV['supplierCode'] = row.supplierCode + formRef.value.formRef.setValues(setV) + + } + }) +} // 查询页面返回——详情 const searchTableSuccessDetail = (formField, searchField, val, formRef ) => { nextTick(() => { diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts index bc0b477cd..f89e6b02c 100644 --- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts @@ -51,24 +51,25 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive( isSearch: true, }, { - label: '供应商代码', - field: 'supplierCode', + label: '采购订单', + field: 'ppNumber', sort: 'custom', table: { - width: 150 + width: 180 }, - isSearch: true, form: { // labelMessage: '信息提示说明！！！', componentProps: { + enterSearch: true, isSearchList: true, // 开启查询弹窗 - searchListPlaceholder: '请选择供应商代码', // 输入框占位文本 - searchField: 'code', // 查询弹窗赋值字段 - searchTitle: '供应商信息', // 查询弹窗标题 - searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类 - searchPage: SupplierApi.getSupplierPage // 查询弹窗所需分页方法 + searchListPlaceholder: '请选择采购订单', // 输入框占位文本 + searchField: 'number', // 查询弹窗赋值字段 + searchTitle: '采购订单信息', // 查询弹窗标题 + searchAllSchemas: PurchaseMain.allSchemas, // 查询弹窗所需类 + searchPage: PurchaseMainApi.getPurchaseMainPage, // 查询弹窗所需分页方法 } - } + }, + isForm: true, }, { label: '发货单号', @@ -80,42 +81,62 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive( isForm: true, }, { - label: '要货计划单号', - field: 'ppNumber', + label: '供应商代码', + field: 'supplierCode', sort: 'custom', table: { - width: 180 + width: 150 }, + isSearch: true, form: { // labelMessage: '信息提示说明！！！', componentProps: { isSearchList: true, // 开启查询弹窗 - searchListPlaceholder: '请选择要货计划单号', // 输入框占位文本 - searchField: 'number', // 查询弹窗赋值字段 - searchTitle: '要货计划信息', // 查询弹窗标题 - searchAllSchemas: PurchasePlanMain.allSchemas, // 查询弹窗所需类 - searchPage: PurchasePlanMainApi.getPurchasePlanMainPage, // 查询弹窗所需分页方法 - searchCondition: [ - { - key: 'supplierCode', - value: 'supplierCode', - message: '请填写供应商代码！', - isMainValue: true - }, - { - key: 'status', - value: 4, - isMainValue: false - }, - { - key: 'available', - value: "TRUE", - isMainValue: false - }] + searchListPlaceholder: '请选择供应商代码', // 输入框占位文本 + searchField: 'code', // 查询弹窗赋值字段 + searchTitle: '供应商信息', // 查询弹窗标题 + searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类 + searchPage: SupplierApi.getSupplierPage // 查询弹窗所需分页方法 } - }, - isForm: true, + } }, + // { + // label: '要货计划单号', + // field: 'ppNumber', + // sort: 'custom', + // table: { + // width: 180 + // }, + // form: { + // // labelMessage: '信息提示说明！！！', + // componentProps: { + // isSearchList: true, // 开启查询弹窗 + // searchListPlaceholder: '请选择要货计划单号', // 输入框占位文本 + // searchField: 'number', // 查询弹窗赋值字段 + // searchTitle: '要货计划信息', // 查询弹窗标题 + // searchAllSchemas: PurchasePlanMain.allSchemas, // 查询弹窗所需类 + // searchPage: PurchasePlanMainApi.getPurchasePlanMainPage, // 查询弹窗所需分页方法 + // searchCondition: [ + // { + // key: 'supplierCode', + // value: 'supplierCode', + // message: '请填写供应商代码！', + // isMainValue: true + // }, + // { + // key: 'status', + // value: 4, + // isMainValue: false + // }, + // { + // key: 'available', + // value: "TRUE", + // isMainValue: false + // }] + // } + // }, + // isForm: true, + // }, { label: '承运商', field: 'carrierCode', @@ -142,22 +163,22 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive( width: 150 }, }, - { - label: '数据来源', - field: 'sourceType', - dictType: DICT_TYPE.PURCHASERECEIPT_SOURCE_TYPE, - sort: 'custom', - table: { - width: 150 - }, - form: { - value: 'spare_PartsReceipt', - componentProps: { - disabled: true - } - }, - isSearch: false, - }, + // { + // label: '数据来源', + // field: 'sourceType', + // dictType: DICT_TYPE.PURCHASERECEIPT_SOURCE_TYPE, + // sort: 'custom', + // table: { + // width: 150 + // }, + // form: { + // value: 'spare_PartsReceipt', + // componentProps: { + // disabled: true + // } + // }, + // isSearch: false, + // }, { label: '从仓库代码', field: 'fromWarehouseCode', @@ -304,50 +325,50 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive( }, isForm: false, }, - { - label: '截止时间', - field: 'dueTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - sort: 'custom', - table: { - width: 180 - }, - form: { - component: 'DatePicker', - componentProps: { - style: {width:'100%'}, - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', - } - }, - }, - { - label: '部门', - field: 'departmentCode', - sort: 'custom', - table: { - width: 150 - }, - formatter: (_: Recordable, __: TableColumn, cellValue: number) => { - return userDeptArray.find((account) => account.id == cellValue)?.name - }, - form: { - value: userDept.id, - component: 'Select', - api: () => userDeptArray, - componentProps: { - disabled: true, - optionsAlias: { - labelField: 'name', - valueField: 'id' - } - } - } - }, + // { + // label: '截止时间', + // field: 'dueTime', + // formatter: dateFormatter, + // detail: { + // dateFormat: 'YYYY-MM-DD HH:mm:ss' + // }, + // sort: 'custom', + // table: { + // width: 180 + // }, + // form: { + // component: 'DatePicker', + // componentProps: { + // style: {width:'100%'}, + // type: 'datetime', + // dateFormat: 'YYYY-MM-DD HH:mm:ss', + // valueFormat: 'x', + // } + // }, + // }, + // { + // label: '部门', + // field: 'departmentCode', + // sort: 'custom', + // table: { + // width: 150 + // }, + // formatter: (_: Recordable, __: TableColumn, cellValue: number) => { + // return userDeptArray.find((account) => account.id == cellValue)?.name + // }, + // form: { + // value: userDept.id, + // component: 'Select', + // api: () => userDeptArray, + // componentProps: { + // disabled: true, + // optionsAlias: { + // labelField: 'name', + // valueField: 'id' + // } + // } + // } + // }, { label: '状态', field: 'status', @@ -477,6 +498,9 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive( //表单校验 export const PurchasereceiptRequestMainRules = reactive({ + ppNumber: [ + { required: true, message: '请输入采购订单', trigger: 'blur' } + ], supplierCode: [ { required: true, message: '请输入供应商代码', trigger: 'blur' } ], @@ -486,9 +510,9 @@ export const PurchasereceiptRequestMainRules = reactive({ toAreaTypes: [ { required: true, message: '请输入到库区类型范围', trigger: 'blur' } ], - departmentCode: [ - { required: true, message: '请输入部门', trigger: 'blur' } - ], + // departmentCode: [ + // { required: true, message: '请输入部门', trigger: 'blur' } + // ], autoCommit: [ { required: true, message: '请选择是否自动提交', trigger: 'change' } ], From e7efa8b49b1474dba3eb1bf97ad74a2bad333466 Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Wed, 17 Apr 2024 17:10:02 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=AD=90=E8=A1=A8?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Detail/src/Detail.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue index 1c089e084..44149fdbf 100644 --- a/src/components/Detail/src/Detail.vue +++ b/src/components/Detail/src/Detail.vue @@ -54,6 +54,7 @@ :pagination="{ total: tableObjectRef.total }" v-model:pageSize="tableObjectRef.pageSize" v-model:currentPage="tableObjectRef.currentPage" + v-model:sort="tableObjectRef.sort" >