This commit is contained in:
wangweidong 2025-11-26 13:36:16 +08:00
commit 3fd5753c1f
11 changed files with 309 additions and 68 deletions

View File

@ -105,20 +105,6 @@
"path": "pages/NursingNew/index", "path": "pages/NursingNew/index",
"style": { "style": {
"navigationStyle": "custom", "navigationStyle": "custom",
"app-plus": {
// "subNVues": [{
// "id": "monitorSub",
// "path": "pages/smallcarmera",
// "style": {
// "position": "absolute",
// "left": "230px",
// "top": "150px",
// "width": "680px",
// "height": "520px",
// "background": "transparent"
// }
// }]
}
} }
}, },
@ -204,16 +190,6 @@
{ {
"path" : "pages/Warehouse/warehome" "path" : "pages/Warehouse/warehome"
} }
// {
// "path": "pages/somethingmove/index",
// "style": {
// "navigationStyle": "custom"
// }
// }
], ],
"globalStyle": { "globalStyle": {
"navigationBarTextStyle": "black", "navigationBarTextStyle": "black",

View File

@ -2097,7 +2097,7 @@
directiveName: '' // directiveName directiveName: '' // directiveName
})) }))
})) }))
console.log("wtf", res) // console.log("wtf", res)
res.result.serviceList.forEach((res : any) => { res.result.serviceList.forEach((res : any) => {
timearr.value[res.positioning].children[res.positioningLong] = res; timearr.value[res.positioning].children[res.positioningLong] = res;
}) })
@ -2126,16 +2126,8 @@
} }
const savePackagelist = ref([]); const savePackagelist = ref([]);
onMounted(() => { onMounted(() => {
// console.log("jiance",uni.getStorageSync('serverUrl'))
// uni.setStorageSync('serverUrl', `http://localhost:8091/nursing-unit_101`);
savePackagelist.value = uni.getStorageSync('Packagelist') || [] savePackagelist.value = uni.getStorageSync('Packagelist') || []
let res = uni.getStorageSync('saveTree') let res = uni.getStorageSync('saveTree')
console.log("saveTree", res)
let goodArray = [] let goodArray = []
myArray.forEach((element : any) => { myArray.forEach((element : any) => {
element.children.forEach((element1 : any) => { element.children.forEach((element1 : any) => {

View File

@ -0,0 +1,287 @@
<template>
<view class="index-content-other" :style="transition?{opacity: `1`}:{opacity: `0`}">
<view class="right-container-title-nav">
<text style="margin-left: 30rpx;">
NUID{{ uni.getStorageSync('nuId')}}
</text>
<text class="new-weight">
{{ uni.getStorageSync('nuName')}}
</text>
<view class="right-icons">
<image class="right-icons-img" src="/static/index/requestform/touxiang.png" />
<view>{{name}}</view>
<image class="right-icons-img-back" src="/static/index/requestform/back.png" />
<view>返回</view>
</view>
</view>
<view class="buttons-father">
<view class="ipt">
<input type="text" placeholder="物料名称/物料简拼" />
</view>
<view class="scr">
检索
</view>
<view class="shx">
<image src="/static/index/requestform/shaixuan.png" mode="aspectFill"></image>
<view class="shx-font">
筛选
</view>
</view>
<view class="shx">
<image src="/static/index/requestform/chongzhi.png" mode="aspectFill"></image>
<view class="shx-font">
重置
</view>
</view>
</view>
<view class="other-contain">
<view class="other-contain-left">
<view class="left-selecttype">
<view :class="selectType===index?`selecttype-target`: `selecttype`" v-for="(item,index) in tagsarray" @click="changetype(index)" >
{{ item }}
<view class="heng-blue" v-if="selectType===index"></view>
</view>
</view>
</view>
<view class="other-contain-right">
</view>
</view>
</view>
</template>
<script setup lang="ts">
import { ref, onMounted, onBeforeUnmount, computed, nextTick, defineProps, watch } from 'vue';
const transition = ref(false);
const tagsarray = ref(["全部","待出库","已出库","已收货 ","已作废"])
const props = defineProps({
isShow: {
type: Boolean,
required: true,
},
});
watch(
() => props.isShow,
(newVal, oldVal) => {
// falsetrue0.2
if (!oldVal && newVal) {
transition.value = false;
setTimeout(() => {
transition.value = true;
}, 50)
} else {
transition.value = false;
}
}
)
const name = ref("");
onMounted(() => {
name.value = uni.getStorageSync('realname')
})
const lanjie = ref(false);
const selectType = ref(0)
const changetype = (index:number) => {
selectType.value = index
}
</script>
<style scoped lang="less">
.index-content-other {
width: calc(100% - 260rpx);
// background-color: red;
height: 100%;
transition: opacity 1s ease;
position: relative;
}
.right-container-title-nav {
margin-top: 60rpx;
display: flex;
align-items: center;
height: 60rpx;
position: relative;
font-size: 28rpx;
.new-weight {
margin-left: 30rpx;
font-weight: 600;
}
.right-icons {
position: absolute;
right: 40rpx;
top: 0;
display: flex;
align-items: center;
height: 60rpx;
font-size: 30rpx;
}
.right-icons-img {
width: 40rpx;
height: 40rpx;
margin-left: 20rpx;
margin-right: 20rpx;
}
.right-icons-img-back {
width: 38rpx;
height: 38rpx;
margin-left: 60rpx;
margin-right: 3rpx;
}
}
.right-container-tem {
display: flex;
.right-container-tem-text {
font-size: 30rpx;
margin-right: 20rpx;
}
.right-container-tem-img {
width: 38rpx;
height: 38rpx;
}
}
.buttons-father{
width: 100%;
height: 100rpx;
// background-color: red;
display: flex;
.ipt {
display: flex;
align-items: center;
width: 18vw;
background: #E2E4E9;
border-radius: 1.65vw;
height: 3.3vw;
image {
width: 2.2vw;
height: 2.2vw;
margin:0 0.5vw;
}
input {
width: 18vw;
height: 3.5vw;
font-size: 1.4vw;
padding-left: 1.6vw;
}
}
.scr {
border-radius: 1.65vw;
font-weight: 400;
font-size: 1.4vw;
display: flex;
justify-content: center;
align-items: center;
width: 6.5vw;
height: 3.3vw;
margin: 0 0 0 0.7vw;
background: rgba(255, 255, 255, 0.6);
border: 1px solid #D9DADC;
color: #555555;
box-shadow: 0.5rpx 3rpx 3rpx #dadee1;
}
.shx {
width: 6.5vw;
height: 3.3vw;
background: rgba(255, 255, 255, 0.6);
border-radius: 1.65vw;
border: 1rpx solid #D9DADC;
font-weight: 400;
font-size: 1.2vw;
color: #222;
display: flex;
justify-content: center;
align-items: center;
box-shadow: 0.5rpx 3rpx 3rpx #dadee1;
margin: 0 0 0 0.5vw;
color: #555555;
image {
width: 1.8vw;
height: 1.8vw;
margin: 0 0.2vw 0 0;
}
.shx-font{
margin-top: 3rpx;
// margin-left: -5rpx;
}
}
}
.other-contain{
width: 100%;
height: 1050rpx;
display: flex;
.other-contain-left{
width: 35%;
height: 100%;
.left-selecttype{
width: 100%;
height: 80rpx;
border-radius: 40rpx;
background-color: #FFFFFF;
display: flex;
padding: 0 30rpx;
.heng-blue{
position: absolute;
bottom: 0;
left: 50%;
transform: translateX(-50%);
width: 25rpx;
height: 8rpx;
border-radius: 10rpx;
background-color: #1083F8;
}
.selecttype{
width: 20%;
height: 100%;
display: flex;
justify-content: center;
align-items: center;
color: #999999;
font-size: 31rpx;
position: relative;
}
.selecttype-target{
width: 20%;
height: 100%;
display: flex;
justify-content: center;
align-items: center;
color: #222222;
font-size: 31rpx;
font-weight: 600;
position: relative;
}
}
}
.other-contain-right{
width: 65%;
height: 100%;
// background-color: red;
}
}
</style>

View File

@ -57,26 +57,11 @@
<!-- 设备页 --> <!-- 设备页 -->
<equipment :isShow="menuIndexshowfifth" v-if="menuIndex==4" :propsmove="propsmove" :isMain="isMain" <equipment :isShow="menuIndexshowfifth" v-if="menuIndex==4" :propsmove="propsmove" :isMain="isMain"
@back="movecard(5)" @cleanmain="movecard(1)" @canback="canmoveit" /> @back="movecard(5)" @cleanmain="movecard(1)" @canback="canmoveit" />
<requestform :isShow="menuIndexshowfourth" v-if="menuIndex==3" />
<!-- 户嘱页 --> <!-- 户嘱页 -->
<nurse :isold="isOld===2" :liang="indexNumber" :isshow="menuIndexshowsecond" <nurse :isold="isOld===2" :liang="indexNumber" :isshow="menuIndexshowsecond"
v-if="menuIndex==1&&isOld===2&&uni.getStorageSync('customerId')&&uni.getStorageSync('nuId')" v-if="menuIndex==1&&isOld===2&&uni.getStorageSync('customerId')&&uni.getStorageSync('nuId')"
:propsmove="propsmove" :isMain="isMain" @vip="canmoveit" /> :propsmove="propsmove" :isMain="isMain" @vip="canmoveit" />
<!-- <arrowkeys @movecard="movecard" /> -->
<!-- 超凶表格 -->
<!-- 旧表格 -->
<!-- <rightItemssecond ref="ruler" :liang="indexNumber" :isshow="menuIndexshowsecond" :canmove="canmove"
:darkFans="darkFans" v-show="menuIndex==1&&!isOld" @darkchange="darkchange" @savename="openname"
@saveruler="openruler" @changefangkuang="changefangkuang" @cleanname="closename" @changeold="isOldchange" /> -->
<!-- 新表格 -->
<!-- <specialruler ref="rulernew" :isold="isOld===1" :liang="indexNumber" :isshow="menuIndexshowsecond" :canmove="canmove"
:darkFans="darkFans" v-show="menuIndex==1&&isOld===1" @darkchange="darkchange" @savename="openname"
@saveruler="openruler" @changefangkuang="changefangkuang" @cleanname="closename" @changeold="isOldchange" /> -->
<!-- 新表格 -->
<!-- <rightItemssecondrelnew ref="rulernew" :isold="isOld===2" :liang="indexNumber" :isshow="menuIndexshowsecond" :canmove="canmove"
:darkFans="darkFans" v-show="menuIndex==1&&isOld===2" @darkchange="darkchange" @savename="openname"
@saveruler="openruler" @changefangkuang="changefangkuang" @cleanname="closename" @changeold="isOldchange" /> -->
</view> </view>
</template> </template>
@ -85,9 +70,10 @@
import type { Link } from "./index"; import type { Link } from "./index";
import index from "./component/index.vue" import index from "./component/index.vue"
import equipment from "./component/equipment.vue" import equipment from "./component/equipment.vue"
import requestform from "./component/requestform.vue"
import nurse from "./component/nurse/index.vue" import nurse from "./component/nurse/index.vue"
import { onShow } from '@dcloudio/uni-app'; import { onShow } from '@dcloudio/uni-app';
import { getServiceTree,getNcPackagelist } from './component/nurse/api.js' import { getServiceTree, getNcPackagelist } from './component/nurse/api.js'
onMounted(() => { onMounted(() => {
menuIndex.value = -1; menuIndex.value = -1;
@ -191,6 +177,7 @@
const menuIndex = ref<number>(-1); const menuIndex = ref<number>(-1);
const menuIndexshow = ref<boolean>(false); const menuIndexshow = ref<boolean>(false);
const menuIndexshowsecond = ref<boolean>(false); const menuIndexshowsecond = ref<boolean>(false);
const menuIndexshowfourth = ref<boolean>(false);
const menuIndexshowfifth = ref<boolean>(false); const menuIndexshowfifth = ref<boolean>(false);
// //
const darkFans = ref<boolean>(false); const darkFans = ref<boolean>(false);
@ -226,6 +213,7 @@
menuIndex.value = index; menuIndex.value = index;
menuIndexshow.value = false menuIndexshow.value = false
menuIndexshowsecond.value = false menuIndexshowsecond.value = false
menuIndexshowfourth.value = false;
menuIndexshowfifth.value = false menuIndexshowfifth.value = false
setTimeout(() => { setTimeout(() => {
switch (index) { switch (index) {
@ -234,7 +222,8 @@
break; break;
case 1: case 1:
menuIndexshowsecond.value = true menuIndexshowsecond.value = true
case 3:
menuIndexshowfourth.value = true
break; break;
case 4: case 4:
menuIndexshowfifth.value = true; menuIndexshowfifth.value = true;
@ -251,6 +240,7 @@
menuIndex.value = index; menuIndex.value = index;
menuIndexshow.value = false menuIndexshow.value = false
menuIndexshowsecond.value = false menuIndexshowsecond.value = false
menuIndexshowfourth.value = false;
menuIndexshowfifth.value = false menuIndexshowfifth.value = false
if (index === 5) { if (index === 5) {
uni.navigateBack() uni.navigateBack()
@ -264,6 +254,9 @@
case 1: case 1:
menuIndexshowsecond.value = true menuIndexshowsecond.value = true
break;
case 3:
menuIndexshowfourth.value = true
break; break;
case 4: case 4:
menuIndexshowfifth.value = true; menuIndexshowfifth.value = true;
@ -608,7 +601,7 @@
height: 100%; height: 100%;
// background-color: blue; // background-color: blue;
.left-head { .left-head {
display: flex; display: flex;
@ -640,7 +633,7 @@
} }
} }
} }
.title-time-border-yellow { .title-time-border-yellow {

View File

@ -543,16 +543,11 @@
style="border-top-left-radius: 20rpx;border-bottom-left-radius: 20rpx;"></view> style="border-top-left-radius: 20rpx;border-bottom-left-radius: 20rpx;"></view>
<view class="middle-heng" style="border-radius: 20rpx;background-color: #1083F8;"> <view class="middle-heng" style="border-radius: 20rpx;background-color: #1083F8;">
</view> </view>
<!-- <view class="middle-heng" v-if="Number(v.status)<3 "
style="border-radius: 20rpx;background-color: #1083F8;"></view> -->
<!-- <view class="middle-ball"
:style="Number(v.status)<3?{backgroundColor: `#1083F8`}:{} "></view> -->
<view class="middle-ball" :style="{backgroundColor: `#1083F8`}"></view> <view class="middle-ball" :style="{backgroundColor: `#1083F8`}"></view>
</view> </view>
<view class="end-font"> <view class="end-font">
<!-- <view class="" :style="Number(v.status)<3?{color: `#1083F8`}:{} ">
采购
</view> -->
<view class="" :style="{color: `#1083F8`}"> <view class="" :style="{color: `#1083F8`}">
采购 采购
</view> </view>
@ -567,9 +562,7 @@
</view> </view>
<view class="middle-heng-father"> <view class="middle-heng-father">
<view class="middle-heng"></view> <view class="middle-heng"></view>
<view class="middle-heng"
style="border-radius: 20rpx;width: 105%;margin-left: -5%;">
</view>
<view class="middle-heng" v-if="Number(v.status)>=1" <view class="middle-heng" v-if="Number(v.status)>=1"
style="border-radius: 20rpx;background-color: #1083F8;width: 105%;margin-left: -5%;"> style="border-radius: 20rpx;background-color: #1083F8;width: 105%;margin-left: -5%;">
</view> </view>
@ -687,7 +680,7 @@
<scroll-view scroll-x="true" class="middle-Y" :scroll-left="Invoiscroll" scroll-with-animation> <scroll-view scroll-x="true" class="middle-Y" :scroll-left="Invoiscroll" scroll-with-animation>
<view class="middle-Y-father"> <view class="middle-Y-father">
<view class="middle-one" v-for="(v,i) in InvoicingList" :key='i' <view class="middle-one" v-for="(v,i) in InvoicingList" :key='i'
:style="{border: middletarget === i? '4rpx solid #1083F8': '4rpx solid transparent',backgroundColor:middletarget === i?`#F9FCFF`:``}" :style="{border: middletarget === i? '4rpx dashed #1083F8': '4rpx solid transparent',backgroundColor:middletarget === i?`#F9FCFF`:``}"
@click="clickmiddle(i)"> @click="clickmiddle(i)">
<view :class="v.status<2?`up-tags-target`: `up-tags`"> <view :class="v.status<2?`up-tags-target`: `up-tags`">
{{v.status_dictText}} {{v.status_dictText}}
@ -1433,7 +1426,7 @@
const lefttarget = ref(0); const lefttarget = ref(0);
const clickLeftMenu = (index : any,item:any) => { const clickLeftMenu = (index : any,item:any) => {
let num = Math.ceil((index + 1)) let num = Math.ceil((index + 1))
leftscrolltop.value = (num - 2) * 186; leftscrolltop.value = (num - 2) * 180;
lefttarget.value = index; lefttarget.value = index;
form.cgdId = plsbuy.value[index].id form.cgdId = plsbuy.value[index].id
form.pageNo = 1 form.pageNo = 1

Binary file not shown.

After

Width:  |  Height:  |  Size: 656 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 817 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 848 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

@ -7,8 +7,8 @@
"id": "__UNI__FB2D473", "id": "__UNI__FB2D473",
"name": "护理单元", "name": "护理单元",
"version": { "version": {
"name": "1.0.009", "name": "1.0.011",
"code": 10009 "code": 10011
}, },
"description": "护理单元", "description": "护理单元",
"developer": { "developer": {

View File

@ -1 +1 @@
{"@platforms":["android","iPhone","iPad"],"id":"__UNI__FB2D473","name":"护理单元","version":{"name":"1.0.009","code":10009},"description":"护理单元","developer":{"name":"","email":"","url":""},"permissions":{"Share":{},"VideoPlayer":{},"Camera":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"render":"always","id":"1","kernel":"WKWebview"},"usingComponents":true,"nvueStyleCompiler":"uni-app","compilerVersion":3,"nativePlugins":{"MonitorModule":{"__plugin_info__":{"name":"MonitorModule","description":"bugly升级","platforms":"Android","url":"","android_package_name":"","ios_bundle_id":"","isCloud":false,"bought":-1,"pid":"","parameters":{}}}},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#F8F8F8"},"uniStatistics":{"enable":false},"allowsInlineMediaPlayback":true,"uni-app":{"control":"uni-v3","vueVersion":"3","compilerVersion":"4.76","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal","webView":{"minUserAgentVersion":"49.0"}}},"app-harmony":{"useragent":{"value":"uni-app","concatenate":true},"uniStatistics":{"enable":false}},"screenOrientation":["landscape-primary","landscape-secondary"],"launch_path":"__uniappview.html"} {"@platforms":["android","iPhone","iPad"],"id":"__UNI__FB2D473","name":"护理单元","version":{"name":"1.0.011","code":10011},"description":"护理单元","developer":{"name":"","email":"","url":""},"permissions":{"Share":{},"VideoPlayer":{},"Camera":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"render":"always","id":"1","kernel":"WKWebview"},"usingComponents":true,"nvueStyleCompiler":"uni-app","compilerVersion":3,"nativePlugins":{"MonitorModule":{"__plugin_info__":{"name":"MonitorModule","description":"bugly升级","platforms":"Android","url":"","android_package_name":"","ios_bundle_id":"","isCloud":false,"bought":-1,"pid":"","parameters":{}}}},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#F8F8F8"},"uniStatistics":{"enable":false},"allowsInlineMediaPlayback":true,"uni-app":{"control":"uni-v3","vueVersion":"3","compilerVersion":"4.76","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal","webView":{"minUserAgentVersion":"49.0"}}},"app-harmony":{"useragent":{"value":"uni-app","concatenate":true},"uniStatistics":{"enable":false}},"screenOrientation":["landscape-primary","landscape-secondary"],"launch_path":"__uniappview.html"}