From 7052a2622d519f0ee81662cb36ee3b0f653bcd3f Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Tue, 9 Jan 2024 10:31:37 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E9=87=87=E8=B4=AD=E7=B4=A2=E8=B5=94?= =?UTF-8?q?=E9=87=91=E9=A2=9D=E8=87=AA=E5=8A=A8=E8=AE=A1=E7=AE=97=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchaseclaimRequestMain/index.vue | 11 ++++++- .../purchaseclaimRequestMain.data.ts | 31 ++++++++++--------- 2 files changed, 26 insertions(+), 16 deletions(-) diff --git a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue index 59aa208fb..5539a5f9c 100644 --- a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue +++ b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue @@ -35,7 +35,8 @@ :apiUpdate="PurchaseclaimRequestMainApi.updatePurchaseclaimRequestMain" :apiCreate="PurchaseclaimRequestMainApi.createPurchaseclaimRequestMain" :isBusiness="true" @handleAddTable="handleAddTable" @handleDeleteTable="handleDeleteTable" @searchTableSuccess="searchTableSuccess" - @submitForm="submitForm" /> + @submitForm="submitForm" + @inputStringBlur="inputStringBlur"/> { + console.log("headerItem:",headerItem) + console.log("row:",row) + if(headerItem == 'singlePrice'){ + // 输入完单价离开事件（金额 = 数量 乘以 单价） + row.amount = row.qty * row.singlePrice + } + } /** 初始化 **/ onMounted(async () => { diff --git a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/purchaseclaimRequestMain.data.ts b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/purchaseclaimRequestMain.data.ts index 6525476ef..0bfab063a 100644 --- a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/purchaseclaimRequestMain.data.ts +++ b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/purchaseclaimRequestMain.data.ts @@ -371,6 +371,13 @@ export const PurchaseclaimRequestDetail = useCrudSchemas(reactive( width: 150 }, }, + { + label: '批次', + field: 'batch', + table: { + width: 150 + }, + }, { label: '物品代码', field: 'itemCode', @@ -409,35 +416,29 @@ export const PurchaseclaimRequestDetail = useCrudSchemas(reactive( } }, { - label: '批次', - field: 'batch', - table: { - width: 150 - }, - }, - { - label: '原因', - field: 'reason', - // dictType: DICT_TYPE.PURCHASE_RETURN_REASON, - dictClass: 'string', + label: '单价', + field: 'singlePrice', table: { width: 150 }, }, { - label: '单价', - field: 'singlePrice', + label: '金额', + field: 'amount', table: { width: 150 }, }, { - label: '金额', - field: 'amount', + label: '原因', + field: 'reason', + // dictType: DICT_TYPE.PURCHASE_RETURN_REASON, + dictClass: 'string', table: { width: 150 }, }, + { label: '单据号', field: 'number', From 30402c737a48c855d0de652e0dac2d1bc6e8a7db Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Tue, 9 Jan 2024 10:40:48 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=96=B0=E6=8F=90=E7=9A=84=E9=9C=80?= =?UTF-8?q?=E6=B1=82=EF=BC=8C=E6=94=B9=E5=AE=8Cbug=E4=B9=8B=E5=90=8E?= =?UTF-8?q?=E5=86=8D=E5=BC=80=E5=8F=91=EF=BC=8C=E5=B1=8F=E8=94=BD=E5=88=B0?= =?UTF-8?q?=E8=B4=A7=E6=A3=80=E9=AA=8C=EF=BC=8C=E9=87=87=E8=B4=AD=E4=B8=8A?= =?UTF-8?q?=E6=9E=B6=E6=96=B0=E5=A2=9E=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereceiptManage/inspect/inspectRequestMain/index.vue | 2 +- .../purchasereceiptManage/putaway/putawayRequestMain/index.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue index 6babf91e1..663ae49b9 100644 --- a/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue @@ -115,7 +115,7 @@ // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn({ hasPermi: 'wms:inspect-request-main:create' }), // 新增——需要手动修改下权限 + // defaultButtons.defaultAddBtn({ hasPermi: 'wms:inspect-request-main:create' }), // 新增——需要手动修改下权限 // defaultButtons.defaultImportBtn({hasPermi:'wms:inspect-request-main:import'}), // 导入 defaultButtons.defaultExportBtn({ hasPermi: 'wms:inspect-request-main:export' }), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue index 5d445ab43..175407576 100644 --- a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue @@ -145,7 +145,7 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn({hasPermi:'wms:putaway-request-main:create'}), // 新增——需要手动修改下权限 + // defaultButtons.defaultAddBtn({hasPermi:'wms:putaway-request-main:create'}), // 新增——需要手动修改下权限 // defaultButtons.defaultImportBtn({hasPermi:'wms:putaway-request-main:import'}), // 导入 defaultButtons.defaultExportBtn({hasPermi:'wms:putaway-request-main:export'}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 From b0104a16b3f7faf3c2553a977ca0a9536724bbc2 Mon Sep 17 00:00:00 2001 From: chenfang Date: Tue, 9 Jan 2024 11:48:37 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?= =?UTF-8?q?=E7=A5=A8=E7=94=B3=E8=AF=B7=E5=AF=BC=E5=87=BA=E7=BC=96=E5=86=99?= =?UTF-8?q?=EF=BC=8C=E5=8F=91=E8=BF=90=E7=BB=93=E7=AE=97=E5=86=85=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E6=9C=80=E5=B0=8F=E5=80=BC=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/supplierinvoiceRequestMain/index.ts | 6 ++++- .../customerreturnRequestMain.data.ts | 8 +++++-- .../customerreturnRequestMain/index.vue | 22 ++++++++++++++++++- .../customersettleRequestMain/index.vue | 3 ++- .../deliverRequestMain.data.ts | 4 ++-- .../deliver/deliverRequestMain/index.vue | 13 +++++++++++ .../deliverPlanMain/deliverPlanMain.data.ts | 4 ++-- .../deliverplan/deliverPlanMain/index.vue | 13 +++++++++++ .../inventorychangeRequestMain/index.vue | 13 +++++++++++ .../inventorychangeRequestMain.data.ts | 9 +++++++- .../inventorymoveRequestMain/index.vue | 16 ++++++++++++-- .../inventorymoveRequestMain.data.ts | 4 ++-- .../supplierinvoiceRequestMain/index.vue | 2 +- 13 files changed, 102 insertions(+), 15 deletions(-) diff --git a/src/api/wms/supplierinvoiceRequestMain/index.ts b/src/api/wms/supplierinvoiceRequestMain/index.ts index 62d9231b5..c0bd6ec7a 100644 --- a/src/api/wms/supplierinvoiceRequestMain/index.ts +++ b/src/api/wms/supplierinvoiceRequestMain/index.ts @@ -82,5 +82,9 @@ export const genRecordsSupplierinvoiceRequestMain = async (id) => { } // 导出供应商发票申请主 Excel export const exportSupplierinvoiceRequestMain = async (params) => { - return await request.download({ url: `/wms/supplierinvoice-request-main/export-excel`, params }) + if(params.isSearch){ + return await request.downloadPost({ url: `/wms/supplierinvoice-request-main/export-excel-senior`, params }) + }else { + return await request.download({ url: `/wms/supplierinvoice-request-main/export-excel`, params }) + } } diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts index 7d7d1e349..8c3ea2732 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts @@ -497,6 +497,9 @@ export const CustomerreturnRequestMainRules = reactive({ customerCode: [ { required: true, message: '请选择客户代码', trigger: 'blur' } ], + Customerdock: [ + { required: true, message: '请选择客户月台代码', trigger: 'blur' } + ], departmentCode: [ { required: true, message: '请输入部门', trigger: 'blur' } ], @@ -737,13 +740,13 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive form: { component: 'InputNumber', componentProps: { - min: 1, + min: 0, precision: 6 } }, tableForm: { type: 'InputNumber', - min: 1, + min: 0, precision: 6 } }, @@ -952,4 +955,5 @@ export const CustomerreturnRequestDetailRules = reactive({ remark: [ { max: 50, message: '不得超过50个字符', trigger: 'blur' } ], + }) \ No newline at end of file diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue index 9013e6bf6..99276caa9 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue @@ -69,6 +69,7 @@ :apiDelete="CustomerreturnRequestDetailApi.deleteCustomerreturnRequestDetail" :Echo="Echo" @searchTableSuccessDetail="searchTableSuccessDetail" + :detailButtonIsShow = trueFalse /> @@ -176,7 +177,7 @@ const { tableObject, tableMethods } = useTable({ // 获得表格的各种操作 const { getList, setSearchParams } = tableMethods - +const trueFalse = ref() // 列表头部按钮 const HeadButttondata = [ defaultButtons.defaultAddBtn({hasPermi:'wms:customerreturn-request-main:create'}), // 新增——需要手动修改下权限 @@ -302,6 +303,12 @@ const openForm =async (type: string, row?: number) => { /** 详情操作 */ const detailRef = ref() const openDetail = (row: any, titleName: any, titleValue: any) => { + console.log(999,row.deliverPlanNumber); + if(row.deliverPlanNumber != null){ + trueFalse.value = false + }else { + trueFalse.value = true + } detailRef.value.openDetail(row, titleName, titleValue) } @@ -352,9 +359,22 @@ const handleDeleteTable = (item, index) => { tableData.value.splice(index, 1) } +//为true表示子表数据中存在数量为0的数据 +const flag = ref() + // 主子数据 提交 const submitForm = async (formType, data) => { data.subList = tableData.value // 拼接子表数据参数 + data.subList.forEach(obj => { + if(obj.qty == 0){ + message.error(`数量不能为0!`) + flag.value = true + return; + } + }) + if(flag){ + return + } try { if (formType === 'create') { await CustomerreturnRequestMainApi.createCustomerreturnRequestMain(data) diff --git a/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/index.vue b/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/index.vue index 28a65ce3e..cee1c2836 100644 --- a/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/index.vue @@ -69,6 +69,7 @@ :apiDelete="CustomersettleRequestDetailApi.deleteCustomersettleRequestDetail" :Echo="Echo" @searchTableSuccessDetail="searchTableSuccessDetail" + :detailButtonIsShow = true /> @@ -203,7 +204,7 @@ const butttondata = (row) => { defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:customersettle-request-main:refused'}), // 驳回 defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:customersettle-request-main:agree'}), // 审批通过 defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:customersettle-request-main:handle'}), // 处理 - defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:customersettle-request-main:update'}), // 编辑 + // defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:customersettle-request-main:update'}), // 编辑 ] } diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts index 270176ea5..f2b27ff8a 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts @@ -724,13 +724,13 @@ export const DeliverRequestDetail = useCrudSchemas(reactive([ form: { component: 'InputNumber', componentProps: { - min: 1, + min: 0, precision: 6 } }, tableForm: { type: 'InputNumber', - min: 1, + min: 0, precision: 6 } }, diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue index f6c0028ac..06d3fb374 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue @@ -373,9 +373,22 @@ const handleDeleteTable = (item, index) => { tableData.value.splice(index, 1) } +//为true表示子表数据中存在数量为0的数据 +const flag = ref() + // 主子数据 提交 const submitForm = async (formType, data) => { data.subList = tableData.value // 拼接子表数据参数 + data.subList.forEach(obj => { + if(obj.qty == 0){ + message.error(`数量不能为0!`) + flag.value = true + return; + } + }) + if(flag){ + return + } try { if (formType === 'create') { await DeliverRequestMainApi.createDeliverRequestMain(data) diff --git a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts index aa8957984..9cdb54c5a 100644 --- a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts @@ -433,13 +433,13 @@ export const DeliverPlanDetail = useCrudSchemas(reactive([ form: { component: 'InputNumber', componentProps: { - min: 1, + min: 0, precision: 6 } }, tableForm: { type: 'InputNumber', - min: 1, + min: 0, precision: 6 } }, diff --git a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue index 590fe3acb..dd12d7db1 100644 --- a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue +++ b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue @@ -323,9 +323,22 @@ const handleDeleteTable = (item, index) => { tableData.value.splice(index, 1) } +//为true表示子表数据中存在数量为0的数据 +const flag = ref() + // 主子数据 提交 const submitForm = async (formType, data) => { data.subList = tableData.value // 拼接子表数据参数 + data.subList.forEach(obj => { + if(obj.qty == 0){ + message.error(`数量不能为0!`) + flag.value = true + return; + } + }) + if(flag){ + return + } var isHave =DeliverPlanMain.allSchemas.formSchema.some(function (item) { return item.field === 'beginTime' || item.field === 'endTime'; }); diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue index 68916d7a5..e5457f191 100644 --- a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue +++ b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue @@ -360,9 +360,22 @@ const handleDeleteTable = (item, index) => { tableData.value.splice(index, 1) } +//为true表示子表数据中存在数量为0的数据 +const flag = ref() + // 主子数据 提交 const submitForm = async (formType, data) => { data.subList = tableData.value // 拼接子表数据参数 + data.subList.forEach(obj => { + if(obj.toQty == 0){ + message.error(`到数量不能为0!`) + flag.value = true + return; + } + }) + if(flag){ + return + } try { if (formType === 'create') { console.log(data) diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts index facc41bac..2e8e90435 100644 --- a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts +++ b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts @@ -447,6 +447,9 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive { tableData.value.splice(index, 1) } +//为true表示子表数据中存在数量为0的数据 +const flag = ref() + // 主子数据 提交 const submitForm = async (formType, data) => { - data.subList = tableData.value // 拼接子表数据参数 + data.subList = tableData.value // 拼接子表数据参数 data.subList.forEach(item => { + console.log(556565,item); if(fromInventoryStatus.value){ item.fromInventoryStatus = fromInventoryStatus.value item.toInventoryStatus = toInventoryStatus.value - } + } + if(item.qty == 0){ + message.error(`到数量不能为0!`) + flag.value = true + return; + } }) + if(flag){ + return + } try { if (formType === 'create') { await InventorymoveRequestMainApi.createInventorymoveRequestMain(data) diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts index 23e25d46b..375bb12d0 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts @@ -611,13 +611,13 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( form: { component: 'InputNumber', componentProps: { - min: 1, + min: 0, precision: 6 } }, tableForm: { type: 'InputNumber', - min: 1, + min: 0, precision: 6 } }, diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue index 0e33360e9..0df3b74ef 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue @@ -314,7 +314,7 @@ await message.exportConfirm() // 发起导出 exportLoading.value = true - const data = await SupplierinvoiceRequestMainApi.exportSupplierinvoiceRequestMain(setSearchParams) + const data = await SupplierinvoiceRequestMainApi.exportSupplierinvoiceRequestMain(tableObject.params) download.excel(data, '供应商发票申请主.xlsx') } catch { } finally { From a5e51dd488c1d298d67e1f9b9382154eeb34f01f Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Tue, 9 Jan 2024 14:29:55 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=B7=B2=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E6=A0=87=E7=AD=BE=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../unplannedreceiptRequestMain/index.vue | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue index 67338db68..31b592222 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue @@ -277,6 +277,19 @@ const buttonTableClick = async (val, row) => { } else if (val == 'delete') { // 删除 handleDelete(row.id) } else if( val == 'cjbq'){// 创建标签 + // 判断 是否已创建标签 + let isCreateLabel = false + await PackageApi.getPackagePage({ + requestNumber: row.number + }).then(res => { + if (res) { + if (res.list.length > 0) isCreateLabel = true + } + }) + if (isCreateLabel) { + message.warning('已创建过标签！！！') + return + } console.log("列表-操作按钮事件-创建标签") detatableData.params = { masterId:row.id