From f98cb0d953b895320f01907649dbf29ddcdd1209 Mon Sep 17 00:00:00 2001 From: bb_pan Date: Thu, 29 May 2025 18:52:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/manifest.json | 5 +- src/pages.json | 14 + src/pages/toolsLease/codeOut.vue | 764 +++++++++++++++++++++++++ src/pages/toolsLease/numOut.vue | 141 +++++ src/pages/toolsLease/toolsLease.vue | 20 +- src/pages/toolsLease/toolsLeaseAdd.vue | 13 +- src/pages/toolsLease/toolsLeaseOut.vue | 143 +++++ src/services/back.js | 18 + 8 files changed, 1110 insertions(+), 8 deletions(-) create mode 100644 src/pages/toolsLease/codeOut.vue create mode 100644 src/pages/toolsLease/numOut.vue create mode 100644 src/pages/toolsLease/toolsLeaseOut.vue diff --git a/src/manifest.json b/src/manifest.json index 97dd639..53d882e 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -1,6 +1,6 @@ { "name" : "material-app", - "appid" : "__UNI__2AF69B2", + "appid" : "__UNI__AEEB2B7", "description" : "", "versionName" : "1.0.1", "versionCode" : 101, @@ -27,6 +27,9 @@ "Barcode" : {}, "Record" : {} }, + "android" : { + "minSdkVersion" : "21" + }, /* 应用发布信息 */ "distribute" : { /* android打包配置 */ diff --git a/src/pages.json b/src/pages.json index 1adc1b5..27cb009 100644 --- a/src/pages.json +++ b/src/pages.json @@ -57,6 +57,20 @@ "navigationStyle": "custom" } }, + // 工器具领料-出库-数量出库 + { + "path": "pages/toolsLease/numOut", + "style": { + "navigationStyle": "custom" + } + }, + // 工器具领料-出库-编码出库 + { + "path": "pages/toolsLease/codeOut", + "style": { + "navigationStyle": "custom" + } + }, /* 新购及其页面 */ // 验收 { diff --git a/src/pages/toolsLease/codeOut.vue b/src/pages/toolsLease/codeOut.vue new file mode 100644 index 0000000..7822035 --- /dev/null +++ b/src/pages/toolsLease/codeOut.vue @@ -0,0 +1,764 @@ + + + + + diff --git a/src/pages/toolsLease/numOut.vue b/src/pages/toolsLease/numOut.vue new file mode 100644 index 0000000..f1b0265 --- /dev/null +++ b/src/pages/toolsLease/numOut.vue @@ -0,0 +1,141 @@ + + + + + diff --git a/src/pages/toolsLease/toolsLease.vue b/src/pages/toolsLease/toolsLease.vue index 4fcc7f4..d9c309d 100644 --- a/src/pages/toolsLease/toolsLease.vue +++ b/src/pages/toolsLease/toolsLease.vue @@ -196,9 +196,23 @@ const onClickSwipe = (e, item) => { // 出库 const leaseOut = (item) => { console.log('🚀 ~ leaseOut ~ item:', item) - // uni.navigateTo({ - // url: `/pages/toolsLease/toolsLeaseOut?params=${JSON.stringify(item)}`, - // }) + if (opts.value.isOut && item.taskStatus == 1) { + const params = JSON.stringify({ + id: item.id, + projectId: item.projectId, + projectName: item.projectName, + teamId: item.teamId, + teamName: item.teamName, + }) + uni.navigateTo({ + url: `/pages/toolsLease/toolsLeaseOut?params=${params}`, + }) + } else { + uni.showToast({ + title: '已完成出库', + icon: 'none', + }) + } } // 删除 diff --git a/src/pages/toolsLease/toolsLeaseAdd.vue b/src/pages/toolsLease/toolsLeaseAdd.vue index fe7f902..4fdc027 100644 --- a/src/pages/toolsLease/toolsLeaseAdd.vue +++ b/src/pages/toolsLease/toolsLeaseAdd.vue @@ -23,6 +23,7 @@ + @@ -116,7 +118,7 @@ import { getTypeTreeList, addLeaseTask, editLeaseTask, - detailsLeaseTask + detailsLeaseTask, } from '@/services/back.js' const title = ref('工器具领料申请') @@ -124,7 +126,7 @@ const opts = ref({}) const form = ref() const formData = reactive({ teamId: undefined, - projectId: '', + projectId: undefined, leasePerson: '', phone: '', }) @@ -157,7 +159,6 @@ const getDetailsById = async () => { Object.assign(formData, res.data.leaseApplyInfo) } catch (error) { console.log('🚀 ~ getDetailsById ~ error:', error) - } } // 获取班组 @@ -323,9 +324,13 @@ const submit = () => { const res = await editLeaseTask(params) back() } + // 提示 + uni.showToast({ + icon: 'none', + title: '操作成功', + }) } catch (error) { console.log('🚀 ~ .then ~ error:', error) - } }) .catch((err) => { diff --git a/src/pages/toolsLease/toolsLeaseOut.vue b/src/pages/toolsLease/toolsLeaseOut.vue new file mode 100644 index 0000000..5e31ec9 --- /dev/null +++ b/src/pages/toolsLease/toolsLeaseOut.vue @@ -0,0 +1,143 @@ + + + + + diff --git a/src/services/back.js b/src/services/back.js index 967f438..90b5c5a 100644 --- a/src/services/back.js +++ b/src/services/back.js @@ -296,4 +296,22 @@ export const getTypeTreeList = (data) => { url: '/material/ma_type/equipmentType', data, }) +} + +// 工机具出库详情-列表 +export const getOutNum = (data) => { + return http({ + method: 'GET', + url: '/material/lease_apply_info/getOutNum', + data, + }) +} + +// 工具出库-编码/数量 +export const leaseOutApi = (data) => { + return http({ + method: 'POST', + url: '/material/lease_apply_info/leaseOut', + data, + }) } \ No newline at end of file