From f921484671e564b5bfa75a22dcf68bae2655395a Mon Sep 17 00:00:00 2001 From: Teng <461587751@qq.com> Date: Fri, 12 Dec 2025 14:13:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pleasetake/component/takehomep.vue | 5 +- pages/Warehouse/api/lunpan.js | 66 +- pages/Warehouse/picking.vue | 3 +- pages/procurement/api/lunpan.js | 15 + pages/procurement/inventory.vue | 1154 ++++------------- 5 files changed, 280 insertions(+), 963 deletions(-) diff --git a/pages/NursingNew/component/pleasetake/component/takehomep.vue b/pages/NursingNew/component/pleasetake/component/takehomep.vue index 2e92ac5..bbcc1e7 100644 --- a/pages/NursingNew/component/pleasetake/component/takehomep.vue +++ b/pages/NursingNew/component/pleasetake/component/takehomep.vue @@ -190,6 +190,7 @@ thshow.value = false; errmsg.value = res.message; openerror.value = true; + console.log("?????") } }) } @@ -339,7 +340,6 @@ elderId: form.elderId } submitQld(obj).then(res => { - console.log("入参", obj, "res", res) if (res.success && res.result.status == 'success') { uni.showToast({ icon: 'success', @@ -351,7 +351,8 @@ changePage(1) }, 800) } else { - errmsg.value = res.result.message; + // console.log("!!!!!",res) + errmsg.value = res.result.message?res.result.message:res.message openerror.value = true; } }) diff --git a/pages/Warehouse/api/lunpan.js b/pages/Warehouse/api/lunpan.js index ff33762..d1449f6 100644 --- a/pages/Warehouse/api/lunpan.js +++ b/pages/Warehouse/api/lunpan.js @@ -1,6 +1,6 @@ // 引入 request 文件 import request from '@/request/index.js' - + // 查询仓库对应物料 export const queryInvoicingList = (params) => { return request({ @@ -8,21 +8,22 @@ export const queryInvoicingList = (params) => { method: 'get', data: params, }) -} +} // 获取物料分类树（请购列表使用） export const getMaterialTreeData = (params) => { return request({ - url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/getMaterialTreeData?nuId=`+params.nuId, + url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/getMaterialTreeData?nuId=` + params.nuId, method: 'get', data: params, }) -} +} // （业务）获取物料分类树（购物车使用） export const getGwcMaterialTreeData = (params) => { return request({ - url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/getGwcMaterialTreeData?nuId=`+params.nuId, + url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/getGwcMaterialTreeData?nuId=` + params + .nuId, method: 'get', data: params }) @@ -30,7 +31,8 @@ export const getGwcMaterialTreeData = (params) => { // （业务）获取物料分类树（采购单使用） export const getCgdMaterialTreeData = (params) => { return request({ - url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/getCgdMaterialTreeData?nuId=`+params.nuId, + url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/getCgdMaterialTreeData?nuId=` + params + .nuId, method: 'get', data: params, }) @@ -42,7 +44,7 @@ export const queryNuInfoByNuId = (params) => { method: 'get', data: params, }) -} +} // 修改库房启用停用 export const updateKfstatus = (params) => { @@ -51,7 +53,7 @@ export const updateKfstatus = (params) => { method: 'post', data: params, }) -} +} //获得采购单信息 export const queryCgdList = (params) => { return request({ @@ -59,7 +61,7 @@ export const queryCgdList = (params) => { method: 'get', data: params, }) -} +} // 查询采购项目 export const queryCgdInfoList = (params) => { @@ -68,7 +70,7 @@ export const queryCgdInfoList = (params) => { method: 'get', data: params, }) -} +} // 查询采购项目的详情 export const queryWlInfoByWlId = (params) => { return request({ @@ -76,21 +78,21 @@ export const queryWlInfoByWlId = (params) => { method: 'get', data: params, }) -} +} export const addShoppingCartList = (params) => { return request({ url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/addShoppingCartList`, method: 'post', data: params, }) -} +} export const queryShoppingCartList = (params) => { return request({ url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/queryShoppingCartList`, method: 'get', data: params, }) -} +} export const generatedPurchaseOrder = (params) => { return request({ url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/generatedPurchaseOrder`, @@ -107,14 +109,14 @@ export const generatedPurchaseViewOrder = (params) => { } export const deleteQgInfoById = (params) => { return request({ - url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/deleteQgInfoById?id=`+params, - method: 'DELETE' + url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/deleteQgInfoById?id=` + params, + method: 'DELETE' }) } export const emptiedQgInfo = (params) => { return request({ url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/emptiedQgInfo`, - method: 'DELETE' + method: 'DELETE' }) } @@ -125,7 +127,7 @@ export const upload = (params) => { method: 'post', data: params, }) -} +} // 作废 export const voidedCgdMain = (params) => { return request({ @@ -133,7 +135,7 @@ export const voidedCgdMain = (params) => { method: 'post', data: params, }) -} +} //修改库房物料是否启用 export const updateWarehouserEnabled = (params) => { @@ -142,14 +144,14 @@ export const updateWarehouserEnabled = (params) => { method: 'post', data: params, }) -} +} //获得采购人 export const getCgrLis = () => { return request({ url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/getCgrList`, method: 'get' }) -} +} //获得采购人 export const getGysList = () => { @@ -157,7 +159,7 @@ export const getGysList = () => { url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/getGysList`, method: 'get' }) -} +} //改价 export const editPrice = (params) => { @@ -166,7 +168,7 @@ export const editPrice = (params) => { method: 'post', data: params, }) -} +} //(业务)拣货、销账操作 export const pickingInfo = (params) => { @@ -175,7 +177,7 @@ export const pickingInfo = (params) => { method: 'post', data: params }) -} +} //（业务）查询随行单照片集合 export const querySxdList = (params) => { @@ -184,7 +186,7 @@ export const querySxdList = (params) => { method: 'get', data: params }) -} +} //（业务）查询随行单照片集合 export const addSxd = (params) => { return request({ @@ -200,7 +202,7 @@ export const queryJhzpList = (params) => { method: 'get', data: params }) -} +} // （业务）采购单拣货记录 export const queryPickingRecordList = (params) => { return request({ @@ -208,11 +210,11 @@ export const queryPickingRecordList = (params) => { method: 'get', data: params }) -} +} export const editIzNew = (params) => { - return request({ - url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/editIzNew`, - method: 'post', - data: params, - }) - } \ No newline at end of file + return request({ + url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/editIzNew`, + method: 'post', + data: params, + }) +} diff --git a/pages/Warehouse/picking.vue b/pages/Warehouse/picking.vue index 6fade28..06ef1a9 100644 --- a/pages/Warehouse/picking.vue +++ b/pages/Warehouse/picking.vue @@ -1051,7 +1051,7 @@ import { onShow, onLoad, onHide, onPageScroll } from "@dcloudio/uni-app" import calendar from '@/component/public/calendar.vue' import nomessageimge from '@/pages/procurement/components/nomessage.vue'; - import tanchuang from '@/pages/procurement/components/tanchuang.vue'; + const open = ref(0); const typechange = ref(0); @@ -1512,6 +1512,7 @@ // if (!plzinfo.cgdParamInfo) return plzinfo.pageNo = 1; plsbuy.value = []; + plzinfo.canpull = true queryCgdList(plzinfo).then((res : any) => { plsbuy.value.push(...res.result.records) alltotal.value = res.result.total diff --git a/pages/procurement/api/lunpan.js b/pages/procurement/api/lunpan.js index d96ce92..f4406a4 100644 --- a/pages/procurement/api/lunpan.js +++ b/pages/procurement/api/lunpan.js @@ -363,4 +363,19 @@ export const queryPddList = (params) => { method: 'get', data: params, }) +} +//获得采购人 +export const queryPddStartByList = (params) => { + return request({ + url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/pdd/queryPddStartByList`, + method: 'get', + data: params, + }) +} +export const addPddMain = (params) => { + return request({ + url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/pdd/addPddMain`, + method: 'post', + data: params, + }) } \ No newline at end of file diff --git a/pages/procurement/inventory.vue b/pages/procurement/inventory.vue index 5bd9cf7..359dcc0 100644 --- a/pages/procurement/inventory.vue +++ b/pages/procurement/inventory.vue @@ -2,8 +2,7 @@ - + 检索 @@ -21,21 +20,8 @@ 重置 - - - + @@ -44,7 +30,7 @@ - + 新增 @@ -61,12 +47,10 @@ - - + @scrolltolower="plsbuytolower" :lower-threshold="200"> @@ -78,7 +62,7 @@ 盘盈 - + 盘亏 @@ -91,11 +75,9 @@ - {{ item.pddStartTime.split(' ')[0] }} + {{ item.pddStartTime?.split(' ')[0] }} - - @@ -111,11 +93,12 @@ - {{ item.pddEndTime.split(' ')[0] }} + {{ item.pddEndTime?.split(' ')[0] }} - + @@ -139,190 +122,8 @@ - - + + @@ -332,9 +133,6 @@ 确定 - - （{{ alltotal }}采购单） - @@ -355,21 +153,22 @@ - - + + 盘点人 - - + + @@ -382,7 +181,7 @@ {{ plzinfo.startTime }} - + 至 @@ -400,9 +199,9 @@ - + - + √ @@ -411,9 +210,9 @@ - + - + √ @@ -427,56 +226,53 @@ - + - - + + + + + + + + {{ item.name }} + + + 暂无数据 + + + + \ No newline at end of file