From ea7ce795b2cbba673e9d89cbb7de5621692a6800 Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Wed, 17 Jul 2024 17:19:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=95=BF=E6=98=A5=E7=9A=84?=
=?UTF-8?q?=E5=AE=8C=E5=B7=A5=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/request2.js | 14 +
src/pages.json | 58 +-
.../job/ccProductReceiptDetail.vue | 512 ++++++++++++++++++
.../job/ccProductReceiptJob.vue | 424 +++++++++++++++
4 files changed, 995 insertions(+), 13 deletions(-)
create mode 100644 src/pages/productReceipt/job/ccProductReceiptDetail.vue
create mode 100644 src/pages/productReceipt/job/ccProductReceiptJob.vue
diff --git a/src/api/request2.js b/src/api/request2.js
index 7f5ead99..1b5cf8fa 100644
--- a/src/api/request2.js
+++ b/src/api/request2.js
@@ -2063,6 +2063,20 @@ export function productReceiptJobsubmit(params) {
});
}
+
+/**
+ * 长春制品收货任务 提交
+ * @param {*} params
+ */
+export function ccProductReceiptJobsubmit(params) {
+ return request({
+ url: baseApi + "/wms/productreceipt-job-main/executeForCC",
+ method: "put",
+ data: params,
+ });
+}
+
+
/**
* 制品收货记录 提交
* @param {*} params
diff --git a/src/pages.json b/src/pages.json
index a5408210..8637d870 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -64,15 +64,15 @@
"buttons": [
// 右边按钮
{
-
+
"float": "right",
"fontSize": "58rpx", //按钮上文字的大小
"text": "\ue696",
"fontSrc": "/static/ali_icon/iconfont.ttf"
-
+
},
{
-
+
"float": "right",
"fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2",
@@ -234,15 +234,15 @@
"buttons": [
// 右边按钮
{
-
+
"float": "right",
"fontSize": "58rpx", //按钮上文字的大小
"text": "\ue696",
"fontSrc": "/static/ali_icon/iconfont.ttf"
-
+
},
{
-
+
"float": "right",
"fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2",
@@ -1003,7 +1003,39 @@
"enablePullDownRefresh": false
}
},
+ {
+ "path": "pages/productReceipt/job/ccProductReceiptJob",
+ "style": {
+ "navigationBarTitleText": "装配报工收货任务",
+ "enablePullDownRefresh": true,
+ "titleNView": {
+ // "autoBackButton": "true",
+ "buttons": [
+ // 右边按钮
+ {
+ "float": "right",
+ "fontSize": "58rpx", //按钮上文字的大小
+ "text": "\ue696",
+ "fontSrc": "/static/ali_icon/iconfont.ttf"
+ },
+ {
+ "float": "right",
+ "fontSize": "52rpx", //按钮上文字的大小
+ "text": "\ue6e2",
+ "fontSrc": "/static/ali_icon/iconfont.ttf"
+ }
+ ]
+ }
+ }
+ },
+ {
+ "path": "pages/productReceipt/job/ccProductReceiptDetail",
+ "style": {
+ "navigationBarTitleText": "装配完工收货详情",
+ "enablePullDownRefresh": false
+ }
+ },
{
"path": "pages/productReceipt/job/scrapReceiptJob",
"style": {
@@ -1566,7 +1598,7 @@
"fontSize": "58rpx", //按钮上文字的大小
"text": "\ue696",
"fontSrc": "/static/ali_icon/iconfont.ttf"
-
+
},
{
"float": "right",
@@ -1836,7 +1868,7 @@
"style": {
"navigationBarTitleText": "盘点详细",
"enablePullDownRefresh": false
-
+
}
},
{
@@ -1852,7 +1884,7 @@
"style": {
"navigationBarTitleText": "盘点详细(明盘)",
"enablePullDownRefresh": false
-
+
}
},
{
@@ -2100,25 +2132,25 @@
"navigationBarTitleText": "翻包任务详情",
"enablePullDownRefresh": false
}
- },{
+ }, {
"path": "pages/point/index",
"style": {
"navigationBarTitleText": "打印",
"enablePullDownRefresh": false
}
- },{
+ }, {
"path": "pages/pointProductReceipt/index",
"style": {
"navigationBarTitleText": "打印",
"enablePullDownRefresh": false
}
- },{
+ }, {
"path": "pages/pointProductReceipt/webview",
"style": {
"navigationBarTitleText": "打印",
"enablePullDownRefresh": false
}
- },{
+ }, {
"path": "pages/pointPutawayJob/index",
"style": {
"navigationBarTitleText": "打印",
diff --git a/src/pages/productReceipt/job/ccProductReceiptDetail.vue b/src/pages/productReceipt/job/ccProductReceiptDetail.vue
new file mode 100644
index 00000000..a9cf863b
--- /dev/null
+++ b/src/pages/productReceipt/job/ccProductReceiptDetail.vue
@@ -0,0 +1,512 @@
+
+
+
+
+
+
+
+
+
+
+ 车间
+
+ {{jobContent.workShopCode}}
+
+
+
+ 生产线
+
+ {{item.subList[0].productionLineCode}}
+
+
+
+ 班组
+
+ {{jobContent.team}}
+
+
+
+ 班次
+
+ {{jobContent.shift}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/productReceipt/job/ccProductReceiptJob.vue b/src/pages/productReceipt/job/ccProductReceiptJob.vue
new file mode 100644
index 00000000..6eb4f6a4
--- /dev/null
+++ b/src/pages/productReceipt/job/ccProductReceiptJob.vue
@@ -0,0 +1,424 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file