From 440b8e2d6bfa2384240c1e84b563d054c3acf2da Mon Sep 17 00:00:00 2001 From: bb_pan Date: Sun, 15 Jun 2025 15:40:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E8=B4=AD=E9=85=8D=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages.json | 24 + src/pages/new-purchase/accept/index.vue | 3 +- src/pages/part/entry/inEntry.vue | 337 ++++++++++ src/pages/part/entry/index.vue | 617 ++++++++++++++++++ src/pages/part/parts-accept/acceptDetails.vue | 421 ++++++++++++ src/pages/part/parts-accept/index.vue | 440 +++++++++++++ src/pages/picking/outbound/details.vue | 4 +- src/pages/work/index.vue | 7 +- src/services/partLease.js | 44 +- 9 files changed, 1883 insertions(+), 14 deletions(-) create mode 100644 src/pages/part/entry/inEntry.vue create mode 100644 src/pages/part/entry/index.vue create mode 100644 src/pages/part/parts-accept/acceptDetails.vue create mode 100644 src/pages/part/parts-accept/index.vue diff --git a/src/pages.json b/src/pages.json index ca3e563..d49c0f8 100644 --- a/src/pages.json +++ b/src/pages.json @@ -268,6 +268,30 @@ "navigationBarTitleText": "配件领用详情" } }, + { + "path": "pages/part/parts-accept/index", + "style": { + "navigationBarTitleText": "配件新购验收" + } + }, + { + "path": "pages/part/parts-accept/acceptDetails", + "style": { + "navigationBarTitleText": "配件新购验收" + } + }, + { + "path": "pages/part/entry/index", + "style": { + "navigationBarTitleText": "配件新购入库" + } + }, + { + "path": "pages/part/entry/inEntry", + "style": { + "navigationBarTitleText": "配件新购入库" + } + }, /* 维修及其页面 */ // 1. 维修列表 diff --git a/src/pages/new-purchase/accept/index.vue b/src/pages/new-purchase/accept/index.vue index 1f25f3d..201e928 100644 --- a/src/pages/new-purchase/accept/index.vue +++ b/src/pages/new-purchase/accept/index.vue @@ -15,7 +15,6 @@ { const isFinished = item.taskStatusName == '已完成' const singLevel = { 2: '技术科', - 3: '库管班', + 3: '库管', } const deptName = uni.getStorageSync('deptName') if (!deptName.includes(singLevel[item.signLevel]) && !isFinished) { diff --git a/src/pages/part/entry/inEntry.vue b/src/pages/part/entry/inEntry.vue new file mode 100644 index 0000000..10310e3 --- /dev/null +++ b/src/pages/part/entry/inEntry.vue @@ -0,0 +1,337 @@ + + + + + diff --git a/src/pages/part/entry/index.vue b/src/pages/part/entry/index.vue new file mode 100644 index 0000000..2a56ca2 --- /dev/null +++ b/src/pages/part/entry/index.vue @@ -0,0 +1,617 @@ + + + + + diff --git a/src/pages/part/parts-accept/acceptDetails.vue b/src/pages/part/parts-accept/acceptDetails.vue new file mode 100644 index 0000000..c3b996c --- /dev/null +++ b/src/pages/part/parts-accept/acceptDetails.vue @@ -0,0 +1,421 @@ + + + + + diff --git a/src/pages/part/parts-accept/index.vue b/src/pages/part/parts-accept/index.vue new file mode 100644 index 0000000..00b8b37 --- /dev/null +++ b/src/pages/part/parts-accept/index.vue @@ -0,0 +1,440 @@ + + + + + diff --git a/src/pages/picking/outbound/details.vue b/src/pages/picking/outbound/details.vue index 2c310f9..7cc1535 100644 --- a/src/pages/picking/outbound/details.vue +++ b/src/pages/picking/outbound/details.vue @@ -179,11 +179,11 @@ const getOutboundDetailsData = async () => { if(taskStatus.value==3){ options.value = [ { text: '出库',style: {backgroundColor: '#84c649',color: '#fff',fontSize: '28rpx'} }, - { text: '退回',style: {backgroundColor: '#ed6042',color: '#fff',fontSize: '28rpx'} }, + // { text: '退回',style: {backgroundColor: '#ed6042',color: '#fff',fontSize: '28rpx'} }, { text: '查看',style: {backgroundColor: '#3784fb',color: '#fff',fontSize: '28rpx'} } ]; options2.value = [ - { text: '退回',style: {backgroundColor: '#ed6042',color: '#fff',fontSize: '28rpx'}}, + // { text: '退回',style: {backgroundColor: '#ed6042',color: '#fff',fontSize: '28rpx'}}, { text: '查看',style: {backgroundColor: '#3784fb',color: '#fff',fontSize: '28rpx'}} ] }else if(taskStatus.value==4){ diff --git a/src/pages/work/index.vue b/src/pages/work/index.vue index bfef163..31d2723 100644 --- a/src/pages/work/index.vue +++ b/src/pages/work/index.vue @@ -216,9 +216,14 @@ const partList = ref([ url: '/pages/part/part-lease/index', iconSrc: '../../static/workbench/partIn.png', }, + { + title: '配件新购验收', + url: '/pages/part/parts-accept/index', + iconSrc: '../../static/workbench/partIn.png', + }, { title: '配件新购入库', - url: '', + url: '/pages/part/entry/index', iconSrc: '../../static/workbench/partIn.png', }, // { diff --git a/src/services/partLease.js b/src/services/partLease.js index ae9df0d..0deecd8 100644 --- a/src/services/partLease.js +++ b/src/services/partLease.js @@ -45,15 +45,41 @@ export const getPartLeaseByTaskIdApi = (data) => { }) } - - - - - - - - - +// 新购配件验收-列表 +export const getPartArrivedListApi = (data) => { + return http({ + method: 'GET', + url: '/material/part_arrived/list', + data, + }) +} + +// 新购配件验收-详情 +export const getPartArrivedInfoApi = (data) => { + return http({ + method: 'GET', + url: '/material/part_arrived/getInfo', + data, + }) +} + +// 新购配件验收-验收 +export const innerVerify = (data) => { + return http({ + method: 'POST', + url: '/material/part_check/innerVerify', + data, + }) +} + +// 新购配件入库-入库 +export const partTypeWarehouseApi = (data) => { + return http({ + method: 'POST', + url: '/material/part_accept/partTypeWarehouse', + data, + }) +}