From 9943f00ea036dd39e978ab8559dc6d9795e4e81a Mon Sep 17 00:00:00 2001
From: zhangdi <1104545947@qq.com>
Date: Wed, 15 Apr 2026 20:33:36 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/productionManagement/reworkOrder.js | 2 +-
.../shortageApplication.js | 6 +-
src/api/zhgd-work/dacangDispatch.js | 10 +
src/router/views/index.js | 15 ++
.../basicData/components/jobTransferAdd.vue | 197 ++++++++++++++++++
src/views/basicData/jobTransferManagement.vue | 99 +++++----
.../components/addLogisticsDialog.vue | 3 +-
.../components/addPackingDialog.vue | 2 +
.../components/materialDetails.vue | 1 -
.../components/returnDialog.vue | 9 +-
.../components/unbindDialog.vue | 4 +-
src/views/wel/components/quickAccess.vue | 46 +++-
src/views/zhgd-work/dacangDispatch/index.vue | 87 ++++++++
13 files changed, 419 insertions(+), 62 deletions(-)
create mode 100644 src/api/zhgd-work/dacangDispatch.js
create mode 100644 src/views/basicData/components/jobTransferAdd.vue
create mode 100644 src/views/zhgd-work/dacangDispatch/index.vue
diff --git a/src/api/productionManagement/reworkOrder.js b/src/api/productionManagement/reworkOrder.js
index e929d2a..a5472f8 100644
--- a/src/api/productionManagement/reworkOrder.js
+++ b/src/api/productionManagement/reworkOrder.js
@@ -25,7 +25,7 @@ export const receiveOrder = (params) => {
export const getReceiveOrder = (params) => {
return request({
url: '/blade-desk/ReworkProcess/receiveOrder',
- method: 'get',
+ method: 'post',
params: params,
});
};
diff --git a/src/api/productionManagement/shortageApplication.js b/src/api/productionManagement/shortageApplication.js
index 3c87cc9..f0351ac 100644
--- a/src/api/productionManagement/shortageApplication.js
+++ b/src/api/productionManagement/shortageApplication.js
@@ -21,11 +21,11 @@ export const del = data => {
};
// 通过零件获取批次号
-export const queryBatch = data => {
+export const queryBatch = params => {
return request({
url: '/blade-desk/deductionPreserve/queryBatch',
- method: 'post',
- data: data,
+ method: 'get',
+ params: params,
});
};
diff --git a/src/api/zhgd-work/dacangDispatch.js b/src/api/zhgd-work/dacangDispatch.js
new file mode 100644
index 0000000..6d56961
--- /dev/null
+++ b/src/api/zhgd-work/dacangDispatch.js
@@ -0,0 +1,10 @@
+import request from '@/axios';
+
+// 订单接收
+export const yieldOrderConfirm = (params) => {
+ return request({
+ url: '/blade-desk/order/yieldOrder/confirm',
+ method: 'POST',
+ params: params
+ })
+}
\ No newline at end of file
diff --git a/src/router/views/index.js b/src/router/views/index.js
index 8ea84ea..90aa493 100644
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@@ -196,6 +196,21 @@ export default [
},
],
},
+ {
+ path: '/dacangDispatch',
+ component: Layout,
+ redirect: '/dacangDispatch/index',
+ children: [
+ {
+ path: 'index',
+ component: () => import(/* webpackChunkName: "page" */ '@/views/zhgd-work/dacangDispatch/index.vue'),
+ name: '订单接收',
+ meta: {
+ i18n: 'info',
+ },
+ },
+ ],
+ },
{
path: '/work/process/leave',
diff --git a/src/views/basicData/components/jobTransferAdd.vue b/src/views/basicData/components/jobTransferAdd.vue
new file mode 100644
index 0000000..743adf3
--- /dev/null
+++ b/src/views/basicData/components/jobTransferAdd.vue
@@ -0,0 +1,197 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/basicData/jobTransferManagement.vue b/src/views/basicData/jobTransferManagement.vue
index 049598e..aed66f8 100644
--- a/src/views/basicData/jobTransferManagement.vue
+++ b/src/views/basicData/jobTransferManagement.vue
@@ -19,6 +19,7 @@
@on-load="onLoad"
>
+
批量删除
@@ -39,6 +40,7 @@
导 入
+
转岗
@@ -141,11 +143,18 @@
importUrl="/blade-desk/postHandle/importExcel"
@closeDialog="closeDialog"
>
+
+
+