From da97cbc5c95cf4c3603b650e95e7522cc7a4f5f7 Mon Sep 17 00:00:00 2001
From: Teng <461587751@qq.com>
Date: Fri, 28 Nov 2025 10:19:59 +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
---
pages/NursingNew/component/nurse/api.js | 22 ++++++-------
.../pleasetake/component/requestform.vue | 19 ++++++-----
pages/Warehouse/picking.vue | 32 ++++++++++---------
pages/procurement/components/purorder.vue | 14 ++++++--
pages/procurement/materialcar.vue | 1 +
pages/procurement/purchaseorder.vue | 7 ++--
6 files changed, 56 insertions(+), 39 deletions(-)
diff --git a/pages/NursingNew/component/nurse/api.js b/pages/NursingNew/component/nurse/api.js
index 98f2a92..2c16e73 100644
--- a/pages/NursingNew/component/nurse/api.js
+++ b/pages/NursingNew/component/nurse/api.js
@@ -6,21 +6,21 @@ import request from '@/request/index.js'
// 查询服务类型
export const getServiceTree = () => {
return request({
- url: `${uni.getStorageSync('serverUrl')}/nuIpadApi/nuConfigServiceCategory/getServiceTree`,
+ url: `${uni.getStorageSync('serverUrl')}/api/pad/care/directive/getServiceTree`,
method: 'get',
})
}
// 查询表格
export const getNclist = (nuId,customerId) => {
return request({
- url: `${uni.getStorageSync('serverUrl')}/nuIpadApi/nuBizNuCustomerServer/getNclist?nuId=${nuId}&customerId=${customerId}`,
+ url: `${uni.getStorageSync('serverUrl')}/api/pad/care/directive/getNclist?nuId=${nuId}&customerId=${customerId}`,
method: 'get',
})
}
// 保存表格
export const addBatch = (params) => {
return request({
- url: `${uni.getStorageSync('serverUrl')}/nuIpadApi/nuBizNuCustomerServer/addBatch`,
+ url: `${uni.getStorageSync('serverUrl')}/api/pad/care/directive/addBatch`,
method: 'post',
data: params,
})
@@ -28,7 +28,7 @@ export const addBatch = (params) => {
// 查询指令包
export const getNcPackagelist = (nuId,customerId) => {
return request({
- url: `${uni.getStorageSync('serverUrl')}/nuIpadApi/nuBizNuCustomerServer/getNcPackagelist`,
+ url: `${uni.getStorageSync('serverUrl')}/api/pad/care/directive/getNcPackagelist`,
method: 'get',
})
}
@@ -36,7 +36,7 @@ export const getNcPackagelist = (nuId,customerId) => {
// 新增服务指令
export const addDirective = (params) => {
return request({
- url: `${uni.getStorageSync('serverUrl')}/nuIpadApi/nuBizNuCustomerServer/addDirective`,
+ url: `${uni.getStorageSync('serverUrl')}/api/pad/care/directive/addDirective`,
method: 'post',
data: params,
})
@@ -45,7 +45,7 @@ export const addDirective = (params) => {
// 新增即时指令
export const addInstant = (params) => {
return request({
- url: `${uni.getStorageSync('serverUrl')}/nuIpadApi/nuBizNuCustomerServer/addInstant`,
+ url: `${uni.getStorageSync('serverUrl')}/api/pad/care/directive/addInstant`,
method: 'post',
data: params,
})
@@ -54,7 +54,7 @@ export const addInstant = (params) => {
// 新增情绪/体型标签
export const addElderTag = (params) => {
return request({
- url: `${uni.getStorageSync('serverUrl')}/nuIpadApi/nuBizNuCustomerServer/addElderTag`,
+ url: `${uni.getStorageSync('serverUrl')}/api/pad/care/directive/addElderTag`,
method: 'post',
data: params,
})
@@ -63,7 +63,7 @@ export const addElderTag = (params) => {
// 编排护理流程-删除服务指令
export const deleteDirective = (params) => {
return request({
- url: `${uni.getStorageSync('serverUrl')}/nuIpadApi/nuBizNuCustomerServer/deleteDirective`,
+ url: `${uni.getStorageSync('serverUrl')}/api/pad/care/directive/deleteDirective`,
method: 'post',
data: params,
})
@@ -72,7 +72,7 @@ export const deleteDirective = (params) => {
// 编排护理流程-删除即时服务指令
export const deleteInstant = (params) => {
return request({
- url: `${uni.getStorageSync('serverUrl')}//nuIpadApi/nuBizNuCustomerServer/deleteInstant`,
+ url: `${uni.getStorageSync('serverUrl')}//api/pad/care/directive/deleteInstant`,
method: 'post',
data: params,
})
@@ -81,7 +81,7 @@ export const deleteInstant = (params) => {
// 编排护理流程-删除情绪/体型标签
export const deleteElderTag = (params) => {
return request({
- url: `${uni.getStorageSync('serverUrl')}/nuIpadApi/nuBizNuCustomerServer/deleteElderTag`,
+ url: `${uni.getStorageSync('serverUrl')}/api/pad/care/directive/deleteElderTag`,
method: 'post',
data: params,
})
@@ -89,7 +89,7 @@ export const deleteElderTag = (params) => {
// 编排护理流程-修改服务指令
export const editDirective = (params) => {
return request({
- url: `${uni.getStorageSync('serverUrl')}/nuIpadApi/nuBizNuCustomerServer/editDirective`,
+ url: `${uni.getStorageSync('serverUrl')}/api/pad/care/directive/editDirective`,
method: 'post',
data: params,
})
diff --git a/pages/NursingNew/component/pleasetake/component/requestform.vue b/pages/NursingNew/component/pleasetake/component/requestform.vue
index a3f1fe9..cfbefeb 100644
--- a/pages/NursingNew/component/pleasetake/component/requestform.vue
+++ b/pages/NursingNew/component/pleasetake/component/requestform.vue
@@ -28,8 +28,8 @@
{{ item }}
-
+
-
暂无拣货记录
@@ -1604,6 +1604,7 @@
icon: 'success', // 'none' 表示不带图标
duration: 2000
})
+ lefttarget.value = 0;
badshow.value = false;
InvoicingList.value = [];
plsbuy.value = []
@@ -1835,14 +1836,13 @@
cgdId: showvalue.value.cgdId
}
pickingInfo(obj).then(res => {
- console.log(res)
+ // console.log(`提交数据`,res)
uni.showToast({
icon: 'none',
title: res.message ? res.message : '操作成功'
})
if (res.success) {
- console.log(res.result.cgdInfo)
- console.log(plsbuy.value[lefttarget.value])
+ plsbuy.value[lefttarget.value].totalPrice = res.result.cgdTotalPrice
albumlist.value = [];
addupimg.value = [];
openjianhuo.value = false;
@@ -2324,7 +2324,7 @@
// background-color: yellow;
.middle-title {
width: 100%;
- height: 2vh;
+ height: 2.1vh;
// background-color: #007CFF;
color: #888888;
text-align: center;
@@ -3122,7 +3122,7 @@
transform: translate(-50%, -50%);
width: 50%;
height: 55%;
- border-radius: 30rpx;
+ border-radius: 40rpx;
background-color: #fff;
transition: all 0.3s;
z-index: 999;
@@ -3137,7 +3137,7 @@
transform: translate(-50%, -50%);
width: 50%;
height: 95%;
- border-radius: 30rpx;
+ border-radius: 40rpx;
background-color: #fff;
transition: all 0.3s;
z-index: 999;
@@ -3171,6 +3171,7 @@
display: flex;
justify-content: space-between;
width: 100%;
+ margin-bottom: 50rpx;
.photowall-name {
font-size: 38rpx;
@@ -3422,14 +3423,15 @@
.noarray-img {
margin-top: -200rpx;
- width: 400rpx;
- height: 400rpx;
+ width: 350rpx;
+ height: 350rpx;
}
}
.noarray-font{
- margin-top: -70rpx;
+ margin-top: -60rpx;
color: #888888;
+ font-size: 25rpx;
}
.nomessage-samll{
width: 100%;
diff --git a/pages/procurement/components/purorder.vue b/pages/procurement/components/purorder.vue
index 567e206..7066f6b 100644
--- a/pages/procurement/components/purorder.vue
+++ b/pages/procurement/components/purorder.vue
@@ -202,10 +202,20 @@
() => props.show,
() => {
if (props.show == true) {
- console.log(props.arrlist)
+ console.log(`111`,props.arrlist)
generatedPurchaseViewOrder(props.arrlist).then(res => {
+ console.log("咋回事",res)
console.log(res.result)
- generatedOrder.value = res.result;
+ if(res.success){
+ generatedOrder.value = res.result;
+ }else{
+ uni.showToast({
+ title: res.message,
+ icon: 'none',
+ duration:5000
+ })
+ }
+
})
}
}
diff --git a/pages/procurement/materialcar.vue b/pages/procurement/materialcar.vue
index 903a679..fbe957a 100644
--- a/pages/procurement/materialcar.vue
+++ b/pages/procurement/materialcar.vue
@@ -235,6 +235,7 @@
}
})
caigouarr.value = arr;
+ console.log("????",arr)
if(arr.length==0){
uni.showToast({
title:'请选择物料!',
diff --git a/pages/procurement/purchaseorder.vue b/pages/procurement/purchaseorder.vue
index 69acd08..846270c 100644
--- a/pages/procurement/purchaseorder.vue
+++ b/pages/procurement/purchaseorder.vue
@@ -201,7 +201,7 @@
{{ showvalue?.wlName }}
-
+
@@ -786,6 +786,7 @@
bottom: 6rpx;
width: 40rpx;
height: 40rpx;
+ filter: brightness(0.8);
}
}
}
@@ -820,7 +821,7 @@
// background-color: yellow;
.middle-title {
width: 100%;
- height: 2vh;
+ height: 2.1vh;
// background-color: #007CFF;
color: #888888;
text-align: center;