From 63caef1eec37e7e7943ca0b43946a54cfb411bc6 Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <123456>
Date: Tue, 15 Aug 2023 21:22:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AF=B9=E6=A2=A6=E5=A4=A9?=
=?UTF-8?q?=E5=B7=A5=E7=A8=8B=20=E8=BD=A6=E6=AC=A1=E5=92=8C=E5=8C=85?=
=?UTF-8?q?=E9=97=B4=E7=9A=84=E6=9F=A5=E7=9C=8B=20=E5=A2=9E=E5=8A=A0?=
=?UTF-8?q?=E5=AF=B9=E8=BD=A6=E6=AC=A1=E5=92=8C=E5=8C=85=E9=97=B4=E7=9A=84?=
=?UTF-8?q?=E6=8E=A8=E9=80=81=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/factory/mt/factoryOrderMain.js | 11 +
src/api/factory/mt/packageInfo.js | 12 +-
src/option/factory/mt/factoryOrderMain.js | 6 +-
src/option/factory/mt/packageInfo.js | 28 +-
src/views/factory/mt/factoryOrderMain.vue | 486 ++++++++++++--------
src/views/factory/mt/packageInfo.vue | 525 ++++++++++++++--------
6 files changed, 690 insertions(+), 378 deletions(-)
diff --git a/src/api/factory/mt/factoryOrderMain.js b/src/api/factory/mt/factoryOrderMain.js
index d47eeb37..2f163c5e 100644
--- a/src/api/factory/mt/factoryOrderMain.js
+++ b/src/api/factory/mt/factoryOrderMain.js
@@ -48,3 +48,14 @@ export const update = (row) => {
})
}
+export const beachPush = (ids,data) => {
+ return request({
+ url: '/logpm-factory/mtfactoryOrderMain/beachPush',
+ method: 'post',
+ params: {
+ ids,
+ data
+ }
+ })
+}
+
diff --git a/src/api/factory/mt/packageInfo.js b/src/api/factory/mt/packageInfo.js
index 18af877a..93f27afd 100644
--- a/src/api/factory/mt/packageInfo.js
+++ b/src/api/factory/mt/packageInfo.js
@@ -2,7 +2,7 @@ import request from '@/axios';
export const getList = (current, size, params) => {
return request({
- url: '/logpm-factory/mtpackageInfo/list',
+ url: '/logpm-factory/mtpackageInfo/listBySendData',
method: 'get',
params: {
...params,
@@ -48,3 +48,13 @@ export const update = (row) => {
})
}
+export const beachPush = (ids,data) => {
+ return request({
+ url: '/logpm-factory/mtpackageInfo/beachPush',
+ method: 'post',
+ params: {
+ ids,
+ data
+ }
+ })
+}
diff --git a/src/option/factory/mt/factoryOrderMain.js b/src/option/factory/mt/factoryOrderMain.js
index c8b0d961..2820dc7a 100644
--- a/src/option/factory/mt/factoryOrderMain.js
+++ b/src/option/factory/mt/factoryOrderMain.js
@@ -6,7 +6,10 @@ export default {
searchMenuSpan: 6,
border: true,
index: true,
- viewBtn: true,
+ addBtn:false,
+ viewBtn: false,
+ editBtn: false,
+ delBtn: false,
selection: true,
dialogClickModal: false,
column: [
@@ -23,6 +26,7 @@ export default {
label: "发货单编号",
prop: "invoiceOrderCode",
type: "input",
+ search: true
},
{
label: "中心仓编号",
diff --git a/src/option/factory/mt/packageInfo.js b/src/option/factory/mt/packageInfo.js
index 72763800..33126a60 100644
--- a/src/option/factory/mt/packageInfo.js
+++ b/src/option/factory/mt/packageInfo.js
@@ -6,7 +6,10 @@ export default {
searchMenuSpan: 6,
border: true,
index: true,
- viewBtn: true,
+ viewBtn: false,
+ delBtn: false,
+ addBtn:false,
+ editBtn: false,
selection: true,
dialogClickModal: false,
column: [
@@ -19,6 +22,18 @@ export default {
viewDisplay: false,
hide: true,
},
+ {
+ label: "发货单编号",
+ prop: "invoiceOrderCode",
+ type: "input",
+ search: true,
+ width: "100",
+ },
+ {
+ label: "订单自编码",
+ prop: "orderCode",
+ type: "input",
+ },
{
label: "出库人",
prop: "outboundMan",
@@ -69,14 +84,10 @@ export default {
prop: "size",
type: "input",
},
+
{
- label: "订单id",
- prop: "orderId",
- type: "input",
- },
- {
- label: "订单自编码",
- prop: "orderCode",
+ label: "推送状态",
+ prop: "pushStatusName",
type: "input",
},
{
@@ -142,5 +153,6 @@ export default {
viewDisplay: false,
hide: true,
},
+
]
}
diff --git a/src/views/factory/mt/factoryOrderMain.vue b/src/views/factory/mt/factoryOrderMain.vue
index 5bfcc4ba..3a5967aa 100644
--- a/src/views/factory/mt/factoryOrderMain.vue
+++ b/src/views/factory/mt/factoryOrderMain.vue
@@ -1,224 +1,342 @@
-
+
- 删 除
+
+ 导 出
- 导 出
+
+ 推 送
+
+
+ 查看
+
+
+
+
+
+
+
+
+
+
+
+