From 48ec3c31eb6f989b3c6c0c1758928fdac3773d3e Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Mon, 11 Mar 2024 15:05:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9F=A5=E7=9C=8B=E5=85=B6?=
=?UTF-8?q?=E4=BB=96=E5=8C=85=E8=A3=85=E6=95=B0=E6=8D=AE=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../wms/supplierdeliverRecordDetail/index.ts | 11 +
.../wms/supplierdeliverRecordMain/index.ts | 3 +-
.../wms/supplierdeliverRequestDetail/index.ts | 1 +
.../wms/supplierdeliverRequestMain/index.ts | 6 +-
src/locales/en-US.ts | 3 +-
src/locales/zh-CN.ts | 3 +-
.../supplierdeliverRecordMain/index.vue | 52 +-
.../supplierdeliverRecordMain.data.ts | 625 ++++++++++++++++--
.../supplierdeliverRequestMain/index.vue | 34 +-
.../supplierdeliverRequestMain.data.ts | 162 ++---
10 files changed, 740 insertions(+), 160 deletions(-)
diff --git a/src/api/wms/supplierdeliverRecordDetail/index.ts b/src/api/wms/supplierdeliverRecordDetail/index.ts
index ec852973c..2efc8aa17 100644
--- a/src/api/wms/supplierdeliverRecordDetail/index.ts
+++ b/src/api/wms/supplierdeliverRecordDetail/index.ts
@@ -85,3 +85,14 @@ export const exportSupplierdeliverRecordDetail = async (params) => {
export const importTemplate = () => {
return request.download({ url: '/wms/supplierdeliver-record-detail/get-import-template' })
}
+
+// 查询供应商发货记录
+export const queryChildPickingNumber = async (params) => {
+ if (params.isSearch) {
+ delete params.isSearch
+ const data = {...params}
+ return await request.post({ url: '/wms/supplierdeliver-record-detail/queryChildPickingNumberSenior', data })
+ } else {
+ return await request.get({ url: `/wms/supplierdeliver-record-detail/queryChildPickingNumberPage`, params })
+ }
+}
\ No newline at end of file
diff --git a/src/api/wms/supplierdeliverRecordMain/index.ts b/src/api/wms/supplierdeliverRecordMain/index.ts
index e67f3b5a6..659794ff4 100644
--- a/src/api/wms/supplierdeliverRecordMain/index.ts
+++ b/src/api/wms/supplierdeliverRecordMain/index.ts
@@ -84,4 +84,5 @@ export const importTemplate = () => {
// 创建采购申请
export const createPurchasereceiptRequest = async (number:string) => {
return await request.post({ url: `/wms/supplierdeliver-record-main/createPurchasereceiptRequest?number=`+number })
-}
\ No newline at end of file
+}
+
diff --git a/src/api/wms/supplierdeliverRequestDetail/index.ts b/src/api/wms/supplierdeliverRequestDetail/index.ts
index 214db6c78..64580a04e 100644
--- a/src/api/wms/supplierdeliverRequestDetail/index.ts
+++ b/src/api/wms/supplierdeliverRequestDetail/index.ts
@@ -32,6 +32,7 @@ export interface SupplierdeliverRequestDetailVO {
toOwnerCode: string
}
+
// 查询供应商发货申请子列表
export const getSupplierdeliverRequestDetailPage = async (params) => {
if (params.isSearch) {
diff --git a/src/api/wms/supplierdeliverRequestMain/index.ts b/src/api/wms/supplierdeliverRequestMain/index.ts
index b6f9f4bc8..1c4a4d2de 100644
--- a/src/api/wms/supplierdeliverRequestMain/index.ts
+++ b/src/api/wms/supplierdeliverRequestMain/index.ts
@@ -1,4 +1,5 @@
import request from '@/config/axios'
+import { SupplierdeliverRequestDetailVO } from '../supplierdeliverRequestDetail'
export interface SupplierdeliverRequestMainVO {
ppNumber: string
@@ -90,11 +91,10 @@ export const selfCheckReport = async (id) => {
}
// 生成标签
-export const genLabel = async (id) => {
- return await request.post({ url: `/wms/supplierdeliver-request-main/genLabel?id=` + id })
+export const genLabel = async (data:SupplierdeliverRequestMainVO) => {
+ return await request.post({ url: `/wms/supplierdeliver-request-main/genLabel`,data })
}
-
// 生成记录
export const genRecordsSupplierdeliverRequestMain = async (id) => {
return await request.post({ url: `/wms/supplierdeliver-request-main/genRecords?id=` + id })
diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts
index 754c51198..22c41afaa 100644
--- a/src/locales/en-US.ts
+++ b/src/locales/en-US.ts
@@ -311,7 +311,8 @@ export default {
dataCreate: 'Dict Data Create',
dataUpdate: 'Dict Data Eidt',
fileUpload: 'File Upload',
- createLabel: 'create label'
+ createLabel: 'create label',
+ viewDetail:'Detailed list'
},
dialog: {
dialog: 'Dialog',
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index 4f308a7cb..7ab623b0b 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -310,7 +310,8 @@ export default {
typeUpdate: '字典类型编辑',
dataCreate: '字典数据新增',
dataUpdate: '字典数据编辑',
- createLabel: '创建标签'
+ createLabel: '创建标签',
+ viewDetail:'明细列表'
},
dialog: {
dialog: '弹窗',
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue
index 65c78e8bb..0283c3a2c 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue
@@ -57,12 +57,27 @@
:detailAllSchemas="SupplierdeliverRecordDetail.allSchemas"
:detailAllSchemasRules="SupplierdeliverRecordDetailRules"
:apiPage="SupplierdeliverRecordDetailApi.getSupplierdeliverRecordDetailPage"
+ :buttondataTable="buttondataTable"
+ @tableFormButton="tableFormButton"
/>
+
+
+
+