yangjun
/
hldy_app_mini
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

合并

This commit is contained in:
Teng 2025-11-28 10:19:59 +08:00
parent 38c409d14b
commit da97cbc5c9
6 changed files with 56 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pages/NursingNew/component/nurse/api.js
View File

@ -6,21 +6,21 @@ import request from '@/request/index.js'
// 查询服务类型 // 查询服务类型
export const getServiceTree = () => { export const getServiceTree = () => {
return request({ return request({
url: `${uni.getStorageSync('serverUrl')}/nuIpadApi/nuConfigServiceCategory/getServiceTree`, url: `${uni.getStorageSync('serverUrl')}/api/pad/care/directive/getServiceTree`,
method: 'get', method: 'get',
}) })
} }
// 查询表格 // 查询表格
export const getNclist = (nuId,customerId) => { export const getNclist = (nuId,customerId) => {
return request({ 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', method: 'get',
}) })
} }
// 保存表格 // 保存表格
export const addBatch = (params) => { export const addBatch = (params) => {
return request({ return request({
url: `${uni.getStorageSync('serverUrl')}/nuIpadApi/nuBizNuCustomerServer/addBatch`, url: `${uni.getStorageSync('serverUrl')}/api/pad/care/directive/addBatch`,
method: 'post', method: 'post',
data: params, data: params,
}) })
@ -28,7 +28,7 @@ export const addBatch = (params) => {
// 查询指令包 // 查询指令包
export const getNcPackagelist = (nuId,customerId) => { export const getNcPackagelist = (nuId,customerId) => {
return request({ return request({
url: `${uni.getStorageSync('serverUrl')}/nuIpadApi/nuBizNuCustomerServer/getNcPackagelist`, url: `${uni.getStorageSync('serverUrl')}/api/pad/care/directive/getNcPackagelist`,
method: 'get', method: 'get',
}) })
} }
@ -36,7 +36,7 @@ export const getNcPackagelist = (nuId,customerId) => {
// 新增服务指令 // 新增服务指令
export const addDirective = (params) => { export const addDirective = (params) => {
return request({ return request({
url: `${uni.getStorageSync('serverUrl')}/nuIpadApi/nuBizNuCustomerServer/addDirective`, url: `${uni.getStorageSync('serverUrl')}/api/pad/care/directive/addDirective`,
method: 'post', method: 'post',
data: params, data: params,
}) })
@ -45,7 +45,7 @@ export const addDirective = (params) => {
// 新增即时指令 // 新增即时指令
export const addInstant = (params) => { export const addInstant = (params) => {
return request({ return request({
url: `${uni.getStorageSync('serverUrl')}/nuIpadApi/nuBizNuCustomerServer/addInstant`, url: `${uni.getStorageSync('serverUrl')}/api/pad/care/directive/addInstant`,
method: 'post', method: 'post',
data: params, data: params,
}) })
@ -54,7 +54,7 @@ export const addInstant = (params) => {
// 新增情绪/体型标签 // 新增情绪/体型标签
export const addElderTag = (params) => { export const addElderTag = (params) => {
return request({ return request({
url: `${uni.getStorageSync('serverUrl')}/nuIpadApi/nuBizNuCustomerServer/addElderTag`, url: `${uni.getStorageSync('serverUrl')}/api/pad/care/directive/addElderTag`,
method: 'post', method: 'post',
data: params, data: params,
}) })
@ -63,7 +63,7 @@ export const addElderTag = (params) => {
// 编排护理流程-删除服务指令 // 编排护理流程-删除服务指令
export const deleteDirective = (params) => { export const deleteDirective = (params) => {
return request({ return request({
url: `${uni.getStorageSync('serverUrl')}/nuIpadApi/nuBizNuCustomerServer/deleteDirective`, url: `${uni.getStorageSync('serverUrl')}/api/pad/care/directive/deleteDirective`,
method: 'post', method: 'post',
data: params, data: params,
}) })
@ -72,7 +72,7 @@ export const deleteDirective = (params) => {
// 编排护理流程-删除即时服务指令 // 编排护理流程-删除即时服务指令
export const deleteInstant = (params) => { export const deleteInstant = (params) => {
return request({ return request({
url: `${uni.getStorageSync('serverUrl')}//nuIpadApi/nuBizNuCustomerServer/deleteInstant`, url: `${uni.getStorageSync('serverUrl')}//api/pad/care/directive/deleteInstant`,
method: 'post', method: 'post',
data: params, data: params,
}) })
@ -81,7 +81,7 @@ export const deleteInstant = (params) => {
// 编排护理流程-删除情绪/体型标签 // 编排护理流程-删除情绪/体型标签
export const deleteElderTag = (params) => { export const deleteElderTag = (params) => {
return request({ return request({
url: `${uni.getStorageSync('serverUrl')}/nuIpadApi/nuBizNuCustomerServer/deleteElderTag`, url: `${uni.getStorageSync('serverUrl')}/api/pad/care/directive/deleteElderTag`,
method: 'post', method: 'post',
data: params, data: params,
}) })
@ -89,7 +89,7 @@ export const deleteElderTag = (params) => {
// 编排护理流程-修改服务指令 // 编排护理流程-修改服务指令
export const editDirective = (params) => { export const editDirective = (params) => {
return request({ return request({
url: `${uni.getStorageSync('serverUrl')}/nuIpadApi/nuBizNuCustomerServer/editDirective`, url: `${uni.getStorageSync('serverUrl')}/api/pad/care/directive/editDirective`,
method: 'post', method: 'post',
data: params, data: params,
}) })

19
pages/NursingNew/component/pleasetake/component/requestform.vue
View File

@ -28,8 +28,8 @@
<view :class="selectType===index?`selecttype-target`: `selecttype`" <view :class="selectType===index?`selecttype-target`: `selecttype`"
v-for="(item,index) in tagsarray" @click="changetype(index)"> v-for="(item,index) in tagsarray" @click="changetype(index)">
{{ item }} {{ item }}
<view class="heng-blue" v-if="selectType===index"></view>
</view> </view>
<view class="heng-blue" :style="{ left: `${selectType === 0 ? 11.5 : 12 + selectType * 18.5}%` }" ></view>
</view> </view>
<scroll-view scroll-y="true" scroll-with-animation class="left-menu-scroll" :scroll-top="leftscrolltop" <scroll-view scroll-y="true" scroll-with-animation class="left-menu-scroll" :scroll-top="leftscrolltop"
@scrolltolower="plsbuytolower" :lower-threshold="400"> @scrolltolower="plsbuytolower" :lower-threshold="400">
@ -62,7 +62,7 @@
<view class="end-font"> <view class="end-font">
<view> <view>
采购 待出库
</view> </view>
<view style="font-size: 25rpx;"> <view style="font-size: 25rpx;">
{{ "[ " + v.qgBy + " ]" }} {{ "[ " + v.qgBy + " ]" }}
@ -84,7 +84,7 @@
<view class="end-font"> <view class="end-font">
<view :style=" v?.cgdType=='9' ?{color:`#FF5757`}:{}"> <view :style=" v?.cgdType=='9' ?{color:`#FF5757`}:{}">
{{ v?.cgdType=='9' ?`已作废`:`拣货` }} {{ v?.cgdType=='9' ?`已作废`:`已出库` }}
</view> </view>
<view style="font-size: 25rpx;" v-if="v?.jhBy || v?.zfBy" <view style="font-size: 25rpx;" v-if="v?.jhBy || v?.zfBy"
@ -107,8 +107,8 @@
<image class="middle-ball-img" v-else src="/static/index/requestform/isok.png" /> <image class="middle-ball-img" v-else src="/static/index/requestform/isok.png" />
</view> </view>
<view class="end-font"> <view class="end-font">
<view> <view v-if="v?.cgdType!='9'">
完结 已收货
</view> </view>
<view style="font-size: 25rpx;" v-if=" v.wjBy"> <view style="font-size: 25rpx;" v-if=" v.wjBy">
{{ "[ " + v.wjBy + " ]" }} {{ "[ " + v.wjBy + " ]" }}
@ -205,7 +205,7 @@
const changetype = (index : number) => { const changetype = (index : number) => {
selectType.value = index selectType.value = index
} }
const tagesstatues = ["待入库", "待完结", '已完结']; const tagesstatues = ["待出库", "已出库", '已收货'];
const plsbuy = ref([]) const plsbuy = ref([])
const alltotal = ref(0); const alltotal = ref(0);
const lefttarget = ref(0) const lefttarget = ref(0)
@ -237,7 +237,7 @@
const leftscrolltop = ref(0) const leftscrolltop = ref(0)
const firstgetqueryCgdList = () => { const firstgetqueryCgdList = () => {
queryCgdList(plzinfo).then((res : any) => { queryCgdList(plzinfo).then((res : any) => {
console.log("加载", res.result.records) // console.log("加载", res.result.records)
plsbuy.value.push(...res.result.records) plsbuy.value.push(...res.result.records)
alltotal.value = res.result.total alltotal.value = res.result.total
if (!res.result.total) { if (!res.result.total) {
@ -499,7 +499,7 @@
// background-color: yellow; // background-color: yellow;
.middle-title { .middle-title {
width: 100%; width: 100%;
height: 2vh; height: 2.1vh;
// background-color: #007CFF; // background-color: #007CFF;
color: #888888; color: #888888;
text-align: center; text-align: center;
@ -618,6 +618,8 @@
display: flex; display: flex;
padding-right: 30rpx; padding-right: 30rpx;
padding-left: 15rpx; padding-left: 15rpx;
position: relative;
.heng-blue { .heng-blue {
position: absolute; position: absolute;
@ -628,6 +630,7 @@
height: 8rpx; height: 8rpx;
border-radius: 10rpx; border-radius: 10rpx;
background-color: #1083F8; background-color: #1083F8;
transition: 0.3s all ease;
} }

32
pages/Warehouse/picking.vue
View File

@ -1,8 +1,8 @@
<template> <template>
<view class="contain"> <view class="contain">
<view v-show="moreindex!=-1 || topbuttontarget!=-1 || openjianhuo || opengaijia || opendata || opencgr || clickflag || opengys" <view v-show="moreindex!=-1 || topbuttontarget!=-1 || openjianhuo || opengaijia || opendata || opencgr || opengys"
class="mengban" :style="opencgr||opengys||opendata ?{background:`transparent`}:{}" class="mengban" :style="opencgr||opengys||opendata ?{background:`transparent`}:{}"
@click="moreindex=-1; topbuttontarget=-1;openjianhuo=false;opengaijia=false;opendata=false;opencgr=false;clickflag=false;opengys=false"> @click="moreindex=-1; topbuttontarget=-1;openjianhuo=false;opengaijia=false;opendata=false;opencgr=false;opengys=false">
</view> </view>
<!-- 没数据了，遮罩 --> <!-- 没数据了，遮罩 -->
<nomessageimge cont="暂无数据" :show="nomessageshow" /> <nomessageimge cont="暂无数据" :show="nomessageshow" />
@ -564,7 +564,7 @@
</view> </view>
<view class="pls-card-middle-one"> <view class="pls-card-middle-one">
<view class="middle-title"> <view class="middle-title">
{{ v.jhTime?.slice(0,10) }} {{ v.jhTime?.slice(0,10).replace(/-/g, '.') }}
</view> </view>
<view class="middle-heng-father"> <view class="middle-heng-father">
@ -804,7 +804,7 @@
<view class="title-left"> <view class="title-left">
{{showvalue.wlName}} {{showvalue.wlName}}
</view> </view>
<view class="title-right"> <!-- <view class="title-right">
<text <text
style="position: absolute;top: 8rpx;left: -35rpx;font-weight: 300;font-size: 28rpx;"> style="position: absolute;top: 8rpx;left: -35rpx;font-weight: 300;font-size: 28rpx;">
￥ ￥
@ -812,7 +812,7 @@
<view style="color: #555555;"> <view style="color: #555555;">
{{Number(showvalue.totalPrice).toFixed(2) }} {{Number(showvalue.totalPrice).toFixed(2) }}
</view> </view>
</view> </view> -->
</view> </view>
<view class="bottom-right-middle"> <view class="bottom-right-middle">
<view class="middle-onecard"> <view class="middle-onecard">
@ -1000,7 +1000,7 @@
</scroll-view> </scroll-view>
<view class="nomessage-samll" v-if="!lhjlarr.length"> <view class="nomessage-samll" v-if="!lhjlarr.length">
<image style="width: 350rpx;height: 350rpx;margin-top: -200rpx;" <image style="width: 300rpx;height: 300rpx;margin-top: -200rpx;"
src="/static/index/warehouse/procurement/picking/nomessage.png" /> src="/static/index/warehouse/procurement/picking/nomessage.png" />
<view class="noarray-font"> <view class="noarray-font">
暂无拣货记录 暂无拣货记录
@ -1604,6 +1604,7 @@
icon: 'success', // 'none' 表示不带图标 icon: 'success', // 'none' 表示不带图标
duration: 2000 duration: 2000
}) })
lefttarget.value = 0;
badshow.value = false; badshow.value = false;
InvoicingList.value = []; InvoicingList.value = [];
plsbuy.value = [] plsbuy.value = []
@ -1835,14 +1836,13 @@
cgdId: showvalue.value.cgdId cgdId: showvalue.value.cgdId
} }
pickingInfo(obj).then(res => { pickingInfo(obj).then(res => {
console.log(res) // console.log(`提交数据`,res)
uni.showToast({ uni.showToast({
icon: 'none', icon: 'none',
title: res.message ? res.message : '操作成功' title: res.message ? res.message : '操作成功'
}) })
if (res.success) { if (res.success) {
console.log(res.result.cgdInfo) plsbuy.value[lefttarget.value].totalPrice = res.result.cgdTotalPrice
console.log(plsbuy.value[lefttarget.value])
albumlist.value = []; albumlist.value = [];
addupimg.value = []; addupimg.value = [];
openjianhuo.value = false; openjianhuo.value = false;
@ -2324,7 +2324,7 @@
// background-color: yellow; // background-color: yellow;
.middle-title { .middle-title {
width: 100%; width: 100%;
height: 2vh; height: 2.1vh;
// background-color: #007CFF; // background-color: #007CFF;
color: #888888; color: #888888;
text-align: center; text-align: center;
@ -3122,7 +3122,7 @@
transform: translate(-50%, -50%); transform: translate(-50%, -50%);
width: 50%; width: 50%;
height: 55%; height: 55%;
border-radius: 30rpx; border-radius: 40rpx;
background-color: #fff; background-color: #fff;
transition: all 0.3s; transition: all 0.3s;
z-index: 999; z-index: 999;
@ -3137,7 +3137,7 @@
transform: translate(-50%, -50%); transform: translate(-50%, -50%);
width: 50%; width: 50%;
height: 95%; height: 95%;
border-radius: 30rpx; border-radius: 40rpx;
background-color: #fff; background-color: #fff;
transition: all 0.3s; transition: all 0.3s;
z-index: 999; z-index: 999;
@ -3171,6 +3171,7 @@
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
width: 100%; width: 100%;
margin-bottom: 50rpx;
.photowall-name { .photowall-name {
font-size: 38rpx; font-size: 38rpx;
@ -3422,14 +3423,15 @@
.noarray-img { .noarray-img {
margin-top: -200rpx; margin-top: -200rpx;
width: 400rpx; width: 350rpx;
height: 400rpx; height: 350rpx;
} }
} }
.noarray-font{ .noarray-font{
margin-top: -70rpx; margin-top: -60rpx;
color: #888888; color: #888888;
font-size: 25rpx;
} }
.nomessage-samll{ .nomessage-samll{
width: 100%; width: 100%;

14
pages/procurement/components/purorder.vue
View File

@ -202,10 +202,20 @@
() => props.show, () => props.show,
() => { () => {
if (props.show == true) { if (props.show == true) {
console.log(props.arrlist) console.log(`111`,props.arrlist)
generatedPurchaseViewOrder(props.arrlist).then(res => { generatedPurchaseViewOrder(props.arrlist).then(res => {
console.log("咋回事",res)
console.log(res.result) 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
})
}
}) })
} }
} }

1
pages/procurement/materialcar.vue
View File

@ -235,6 +235,7 @@
} }
}) })
caigouarr.value = arr; caigouarr.value = arr;
console.log("????",arr)
if(arr.length==0){ if(arr.length==0){
uni.showToast({ uni.showToast({
title:'请选择物料!', title:'请选择物料!',

7
pages/procurement/purchaseorder.vue
View File

@ -201,7 +201,7 @@
<view class="title-left"> <view class="title-left">
{{ showvalue?.wlName }} {{ showvalue?.wlName }}
</view> </view>
<view class="title-right"> <!-- <view class="title-right">
<text <text
style="position: absolute;top: 8rpx;left: -35rpx;font-weight: 300;font-size: 28rpx;"> style="position: absolute;top: 8rpx;left: -35rpx;font-weight: 300;font-size: 28rpx;">
￥ ￥
@ -210,7 +210,7 @@
{{Number(showvalue.totalPrice).toFixed(2) }} {{Number(showvalue.totalPrice).toFixed(2) }}
</view> </view>
</view> </view> -->
</view> </view>
<view class="bottom-right-middle"> <view class="bottom-right-middle">
<view class="middle-onecard"> <view class="middle-onecard">
@ -786,6 +786,7 @@
bottom: 6rpx; bottom: 6rpx;
width: 40rpx; width: 40rpx;
height: 40rpx; height: 40rpx;
filter: brightness(0.8);
} }
} }
} }
@ -820,7 +821,7 @@
// background-color: yellow; // background-color: yellow;
.middle-title { .middle-title {
width: 100%; width: 100%;
height: 2vh; height: 2.1vh;
// background-color: #007CFF; // background-color: #007CFF;
color: #888888; color: #888888;
text-align: center; text-align: center;