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

提交

This commit is contained in:
wangweidong 2026-04-02 14:37:12 +08:00
parent c2210d5c8e
commit a8e59bcc13
8 changed files with 237 additions and 277 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pages/NursingNew/component/index.vue
View File

@ -391,7 +391,7 @@
instructionTagId: e instructionTagId: e
} }
queryAll(data).then(res => { queryAll(data).then(res => {
console.log(res) // console.log(res)
fwzlarr.value = res.result.jsList; fwzlarr.value = res.result.jsList;
}) })
} }

6
pages/NursingNew/component/leftcontent/leftcontent.vue
View File

@ -11,7 +11,7 @@
</view> </view>
</view> </view>
<scroll-view class="cont" :scroll-y="true" :scroll-top="scrolltop" @scroll="scroll" scroll-with-animation lower-threshold="300" @scrolltoupper="scrolltoupper" @scrolltolower="scrolltolower"> <scroll-view class="cont" :scroll-y="true" :scroll-top="scrolltop" @scroll="scroll" scroll-with-animation lower-threshold="300" @scrolltoupper="scrolltoupper" @scrolltolower="scrolltolower">
<view class="items" v-for="(v,i) in list" :key='i' @click="naurl(i);emit('navurl',i,v)"> <view class="items" v-for="(v,i) in list" :key='i' @click="naurl(i,v)">
<view class="tm guodu" > <view class="tm guodu" >
<image :src="i==dexleft?v.url:v.urls" mode="aspectFill" class="guodu"></image> <image :src="i==dexleft?v.url:v.urls" mode="aspectFill" class="guodu"></image>
<text :style="i==dexleft?'color:#0080FC':''">{{v.name}}</text> <text :style="i==dexleft?'color:#0080FC':''">{{v.name}}</text>
@ -68,6 +68,7 @@
}else{ }else{
codesc.value = -1; codesc.value = -1;
} }
// naurl(dexleft.value,props.list[dexleft.value])
}) })
const scroll = (e)=>{ const scroll = (e)=>{
// console.log(e.detail.scrollTop) // console.log(e.detail.scrollTop)
@ -110,9 +111,10 @@
// 底 // 底
codesc.value = 2; codesc.value = 2;
} }
const naurl = (e)=>{ const naurl = (e,v)=>{
dexleft.value = e; dexleft.value = e;
scrolltop.value = (e - 2) * 52; scrolltop.value = (e - 2) * 52;
emit('navurl',e,v)
} }
</script> </script>

115
pages/NursingNew/component/leftcontent/serveswipe.vue
View File

@ -21,7 +21,8 @@
<view class="bots" v-if="plsbuy.length>1" @touchmove.stop> <view class="bots" v-if="plsbuy.length>1" @touchmove.stop>
<view v-for="(v,i) in plsbuy" :key='i' :class="current==i?'dot':''" <view v-for="(v,i) in plsbuy" :key='i' :class="current==i?'dot':''"
@click="change({'detail':{'current':i,'key':1}})"> @click="change({'detail':{'current':i,'key':1}})">
<view class="bots-red" v-if="v?.chaoshitime"></view> <view class="bots-red" v-if="v?.chaoshitime "></view>
<!-- <view class="bots-red" v-if="v?.directiveList[swipdcurrent]?.chaoshitime&&v.izMulti=='Y'"></view> -->
</view> </view>
</view> </view>
<!-- :style="v?.chaoshitime?'background:red':''" --> <!-- :style="v?.chaoshitime?'background:red':''" -->
@ -35,27 +36,28 @@
<donghua :width="`1200rpx`" :height="`600rpx`" :links="blueArray" :playing="current==i" <donghua :width="`1200rpx`" :height="`600rpx`" :links="blueArray" :playing="current==i"
:loop="true" :interval="500" /> :loop="true" :interval="500" />
</view> </view>
<!-- <view class="timedjs" v-if="current==i&&indexmessage?.izStart=='Y'">
<text>服务倒计时</text>
<timeing v-if="indexmessage?.serviceDuration !==`0`" :initTime="djstinme"
:timeoutDuration="Number(indexmessage.timeoutDuration)*60" @timeend="timeend"></timeing>
<view class="no-time-all" v-else>
<view class="no-time-view">
<image class="no-time" src="/static/index/newindex/states/always.png" />
<view class="no-text">
MIN
</view>
</view>
<text style="color: #959595;font-size: 1.9vw;padding: 0 5rpx;">:</text>
<view class="no-time-view">
<image class="no-time" src="/static/index/newindex/states/always.png" />
<view class="no-text">
SEC
</view>
</view>
</view>
</view> -->
<view v-if="indexmessage.izMulti=='N'"> <view v-if="indexmessage.izMulti=='N'">
<view class="timedjs" v-if="current==i&&indexmessage?.izStart=='Y'">
<text>服务倒计时</text>
<timeing v-if="indexmessage?.serviceDuration !==`0`" :initTime="djstinme"
:timeoutDuration="Number(indexmessage.timeoutDuration)*60" ></timeing>
<view class="no-time-all" v-else>
<view class="no-time-view">
<image class="no-time" src="/static/index/newindex/states/always.png" />
<view class="no-text">
MIN
</view>
</view>
<text style="color: #959595;font-size: 1.9vw;padding: 0 5rpx;">:</text>
<view class="no-time-view">
<image class="no-time" src="/static/index/newindex/states/always.png" />
<view class="no-text">
SEC
</view>
</view>
</view>
</view>
<view class="weight-time"> <view class="weight-time">
<view > <view >
{{ indexmessage?.servStartTime?indexmessage?.servStartTime.slice(11, 16) :'' }} - {{ indexmessage?.servStartTime?indexmessage?.servStartTime.slice(11, 16) :'' }} -
@ -161,6 +163,26 @@
</view> </view>
</view> </view>
<view v-if="indexmessage.izMulti=='Y'"> <view v-if="indexmessage.izMulti=='Y'">
<view class="timedjs" v-if="current==i&&indexmessage?.directiveList[swipdcurrent].izStart=='Y'">
<text>服务倒计时</text>
<timeing v-if="indexmessage?.directiveList[swipdcurrent].serviceDuration !==`0`" :initTime="djstinme"
:timeoutDuration="Number(indexmessage.directiveList[swipdcurrent].timeoutDuration)*60" ></timeing>
<view class="no-time-all" v-else>
<view class="no-time-view">
<image class="no-time" src="/static/index/newindex/states/always.png" />
<view class="no-text">
MIN
</view>
</view>
<text style="color: #959595;font-size: 1.9vw;padding: 0 5rpx;">:</text>
<view class="no-time-view">
<image class="no-time" src="/static/index/newindex/states/always.png" />
<view class="no-text">
SEC
</view>
</view>
</view>
</view>
<view class="weight-time"> <view class="weight-time">
<view > <view >
{{ indexmessage?.directiveList[swipdcurrent]?indexmessage?.directiveList[swipdcurrent].servStartTime.slice(11, 16) :'' }} - {{ indexmessage?.directiveList[swipdcurrent]?indexmessage?.directiveList[swipdcurrent].servStartTime.slice(11, 16) :'' }} -
@ -393,7 +415,6 @@
<tanchuang :show="open==1" font="是否删除此图片" @back="open = 0" @right="del1()"> </tanchuang> <tanchuang :show="open==1" font="是否删除此图片" @back="open = 0" @right="del1()"> </tanchuang>
<tanchuang :show="zxzd>0" :font="zdcont" @back="zxzd = 0" @right="tijiaozx()"> </tanchuang> <tanchuang :show="zxzd>0" :font="zdcont" @back="zxzd = 0" @right="tijiaozx()"> </tanchuang>
<errorshow :show="openerror" :font="errmsg" @close="openerror=false" style="left: 44%;z-index: 9999;" /> <errorshow :show="openerror" :font="errmsg" @close="openerror=false" style="left: 44%;z-index: 9999;" />
<severcard ref="severcards"></severcard>
</view> </view>
</template> </template>
@ -418,12 +439,8 @@
const current = ref(-1) const current = ref(-1)
const current2 = ref(0) const current2 = ref(0)
const autoplay = ref(false) const autoplay = ref(false)
const severcards = ref<InstanceType<typeof ChildComponent>>()
const init = (e) => { const init = (e) => {
firstgetqueryCgdList(e); firstgetqueryCgdList(e);
setTimeout(() => {
severcards.value.firstgetqueryCgdList()
}, 120)
} }
defineExpose({ defineExpose({
init init
@ -439,26 +456,42 @@
current2.value = a current2.value = a
} }
botleft.value = (a-4)*20; botleft.value = (a-4)*20;
plsbuy.value.forEach((v, i) => {
if (i != a && v.izPackage == 'Y') {
v.flag = false
}
})
if (plsbuy.value[a]?.izStart == 'Y' && plsbuy.value[a]?.izFinish == 'N') { if (plsbuy.value[a]?.izStart == 'Y' && plsbuy.value[a]?.izFinish == 'N') {
}
if
( plsbuy.value[a]?.izMulti=='Y'
&&plsbuy.value[a]?.directiveList[swipdcurrent.value].izStart == 'Y'
&& plsbuy.value[a]?.directiveList[swipdcurrent.value].izFinish == 'N')
{
timeacde() timeacde()
} }
} }
const djstinme = ref(0) const djstinme = ref(0)
const timeacde = () => { const timeacde = () => {
let obj = plsbuy.value[current.value]; let obj = plsbuy.value[current.value];
let timestampMs = new Date(obj.servEndTime).getTime(); console.log(obj.izMulti,11111111111111)
let times = new Date().getTime(); if(obj.izMulti == "Y"){
let djs = timestampMs - times; let timestampMs = new Date(obj.directiveList[swipdcurrent.value].servEndTime).getTime();
let times = new Date().getTime();
djstinme.value = Math.round(djs / 1000); let djs = timestampMs - times;
if (djstinme.value < 0) { djstinme.value = Math.round(djs / 1000);
plsbuy.value[current.value].chaoshitime = true if (djstinme.value < 0) {
djstinme.value = 0;
plsbuy.value[current.value].directiveList[swipdcurrent.value].chaoshitime = true
}
console.log(plsbuy.value)
}else{
let timestampMs = new Date(obj.servEndTime).getTime();
let times = new Date().getTime();
let djs = timestampMs - times;
djstinme.value = Math.round(djs / 1000);
if (djstinme.value < 0) {
djstinme.value = 0;
plsbuy.value[current.value].chaoshitime = true
}
} }
console.log(plsbuy.value)
} }
// const timeend = () => { // const timeend = () => {
// // 结束超时 // // 结束超时
@ -661,7 +694,7 @@
form.nuId = nuId; form.nuId = nuId;
// console.log(nuId) // console.log(nuId)
queryOrderList(form).then(res => { queryOrderList(form).then(res => {
console.log(`这啥啊啊啊啊啊`,res.result.length, res) // console.log(`这啥啊啊啊啊啊`,res.result.length, res)
if (res.result.length > 0) { if (res.result.length > 0) {
res.result.forEach((item, l) => { res.result.forEach((item, l) => {
item.flag = false; item.flag = false;
@ -872,7 +905,6 @@
console.log(res) console.log(res)
if (res.success) { if (res.success) {
v.izStart = "Y"; v.izStart = "Y";
severcards.value.firstgetqueryCgdList()
timeacde() timeacde()
} else { } else {
@ -906,7 +938,6 @@
if (res.success) { if (res.success) {
open.value = 0; open.value = 0;
endobj.value = {}; endobj.value = {};
severcards.value.firstgetqueryCgdList()
firstgetqueryCgdList(uni.getStorageSync('nuId')) firstgetqueryCgdList(uni.getStorageSync('nuId'))
} else { } else {
@ -1244,7 +1275,7 @@
.timedjs { .timedjs {
position: absolute; position: absolute;
width: 7vw; width: 7vw;
right: 5.2vw; right: 2.8vw;
top: 0vw; top: 0vw;
display: flex; display: flex;
flex-direction: column; flex-direction: column;

2
pages/NursingNew/component/leftcontent/swipecard.vue
View File

@ -26,7 +26,7 @@
}; };
}, },
created() { created() {
console.log(this.indexmessage) // console.log(this.indexmessage)
}, },
methods:{ methods:{
cardSwiper(e) { cardSwiper(e) {

7
pages/NursingNew/component/leftcontent/sxy-Timeing.vue
View File

@ -134,6 +134,11 @@
this.isDown = this.initTime > 0 ? true : false this.isDown = this.initTime > 0 ? true : false
let time = Math.abs(this.initTime); let time = Math.abs(this.initTime);
// console.log(minutes,time) // console.log(minutes,time)
if(time==0){
this.topTime = 0;
// this.OneCycle(0);
return
}
this.timerTwo = setInterval(() => { this.timerTwo = setInterval(() => {
const flag = this.isDown ? time - 1 : time + 1; const flag = this.isDown ? time - 1 : time + 1;
if (flag === this.threshold) { if (flag === this.threshold) {
@ -144,7 +149,7 @@
if (flag >= this.timeoutDuration + 2 && this.isDown == false) { if (flag >= this.timeoutDuration + 2 && this.isDown == false) {
clearInterval(this.timerTwo); clearInterval(this.timerTwo);
clearInterval(this.timer); clearInterval(this.timer);
this.$emit('timeend') // this.$emit('timeend')
} }
this.OneCycle(time); this.OneCycle(time);
this.isDown ? time-- : time++; this.isDown ? time-- : time++;

286
pages/NursingNew/index.vue
View File

@ -48,36 +48,50 @@
<leftcontent :list="arrlist" @navurl="navurl" :userInfo="userInfo"></leftcontent> <leftcontent :list="arrlist" @navurl="navurl" :userInfo="userInfo"></leftcontent>
<!-- 主页 --> <!-- 主页 -->
<!-- <index :isShow="menuIndex==0" v-if="swipedex==0&&!specialPage" @swip="swip" @gospecial="gospecial" /> --> <!-- <index :isShow="menuIndex==0" v-if="swipedex==0&&!specialPage" @swip="swip" @gospecial="gospecial" /> -->
<index :isShow="menuIndex==0" v-if="swipedex==0&&!specialPage" @swip="swip" @gospecial="gospecial" /> <index :isShow="menuIndex=='jcgn_sy'" v-if="swipedex=='jcgn_sy'&&!specialPage" @swip="swip" @gospecial="gospecial" />
<!-- 新主页 --> <!-- 新主页 -->
<bignurse :isshow="menuIndex==0" <!-- <bignurse :isshow="menuIndex==0"
v-if="swipedex==0&&specialPage==1&&uni.getStorageSync('elderId')&&uni.getStorageSync('nuId')" /> v-if="swipedex==0&&specialPage==1&&uni.getStorageSync('elderId')&&uni.getStorageSync('nuId')" /> -->
<!-- 户嘱页 --> <!-- 户嘱页 -->
<newnurse :isshow="menuIndex==1" v-if="swipedex==1" :canmove="startmoveit" :sendxy="targetrule" :isblue='isblue' <newnurse :isshow="menuIndex=='jcgn_fw'" v-if="swipedex=='jcgn_fw'" :canmove="startmoveit" :sendxy="targetrule" :isblue='isblue'
:howtomove="howtomove" :targetrule="targetrule" @handsend="handsend" @rulepush="rulepush" :howtomove="howtomove" :targetrule="targetrule" @handsend="handsend" @rulepush="rulepush"
@cleanall="cleanall" /> @cleanall="cleanall" />
<!-- 医嘱 --> <!-- 医嘱 -->
<doctorask v-if="swipedex==2" /> <!-- <doctorask v-if="swipedex==2" /> -->
<logistics :isshow="menuIndex==3" v-if="swipedex==3" :canmove="startmoveit" :sendxy="targetrule" <!-- <logistics :isshow="menuIndex==3" v-if="swipedex==3" :canmove="startmoveit" :sendxy="targetrule"
:isblue='isblue' :howtomove="howtomove" :targetrule="targetrule" @handsend="handsend" @rulepush="rulepush" :isblue='isblue' :howtomove="howtomove" :targetrule="targetrule" @handsend="handsend" @rulepush="rulepush"
@cleanall="cleanall" /> @cleanall="cleanall" /> -->
<!-- <logistics :isshow="menuIndex==3" <!-- <logistics :isshow="menuIndex==3"
v-if="swipedex==3&&uni.getStorageSync('elderId')&&uni.getStorageSync('nuId')" /> --> v-if="swipedex==3&&uni.getStorageSync('elderId')&&uni.getStorageSync('nuId')" /> -->
<invoicing :isshow="menuIndex==6" <!-- <invoicing :isshow="menuIndex==6"
v-if="swipedex==6&&uni.getStorageSync('elderId')&&uni.getStorageSync('nuId')" /> v-if="swipedex==6&&uni.getStorageSync('elderId')&&uni.getStorageSync('nuId')" /> -->
<!-- 医嘱页 --> <!-- 医嘱页 -->
<!-- <logistics :isShow="menuIndexshowfourth" v-if="menuIndex==3" /> --> <!-- <logistics :isShow="menuIndexshowfourth" v-if="menuIndex==3" /> -->
<requestform :isShow="menuIndex==4" v-if="swipedex==4" /> <requestform :isShow="menuIndex=='jcgn_ql'" v-if="swipedex=='jcgn_ql'" />
<!-- 设备页 --> <!-- 设备页 -->
<equipment :isShow="menuIndex==5" v-if="swipedex==5" /> <equipment :isShow="menuIndex=='jcgn_wisb'" v-if="swipedex=='jcgn_wisb'" />
<!-- 没有数据 --> <!-- 没有数据 -->
<view class="nomessageclass" :style="messageopit?{opacity: `1`}:{opacity: `0`}" <view class="nomessageclass" :style="messageopit?{opacity: `1`}:{opacity: `0`}"
v-if="(menuIndex == 1 || menuIndex == 2) && (!uni.getStorageSync('elderId') ||!uni.getStorageSync('nuId'))"> v-if="(menuIndex == 1 || menuIndex == 2) && (!uni.getStorageSync('elderId') ||!uni.getStorageSync('nuId'))">
<defaultr cont="暂无老人入住"></defaultr> <defaultr cont="暂无老人入住"></defaultr>
</view> </view>
<material :isShow="menuIndex == 'jcgn_cg'" v-if="menuIndex == 'jcgn_cg'&&!specialPagedex" ref="materials"
@changepages="changeNumber"></material>
<materialcar v-if="menuIndex == 'jcgn_cg'&&specialPagedex==1" @gotoitem="specialPagedex=2"></materialcar>
<purchaseorder v-if="menuIndex == 1&&specialPagedex==2"></purchaseorder>
<picking :isShow="menuIndex == 'jcgn_jh'" v-if="menuIndex == 'jcgn_jh'"></picking>
<finish :isShow="menuIndex == 'jcgn_wj'" v-if="menuIndex == 'jcgn_wj'"></finish>
<outbound :isShow="menuIndex == 'jcgn_ql'" v-if="menuIndex == 'jcgn_ql'"></outbound>
<retstock :isShow="menuIndex == 'jcgn_qlrk'" v-if="menuIndex == 'jcgn_qlrk'"></retstock>
<inventory :isShow="menuIndex == 'jcgn_kcpd' " v-if="menuIndex == 'jcgn_kcpd'&& !specialPagedex" ref="inventorys"
@changepages="changepages"></inventory>
<addtory :isShow="menuIndex == 'jcgn_kcpd'" v-if="menuIndex == 'jcgn_kcpd'&&specialPagedex=='1'" :specialitem="specialitem">
</addtory>
</view> </view>
</template> </template>
@ -92,16 +106,26 @@
import requestform from "./component/pleasetake/takehome.vue" import requestform from "./component/pleasetake/takehome.vue"
import doctorask from "./component/doctorask/doctorask.vue" import doctorask from "./component/doctorask/doctorask.vue"
// import nurse from "./component/nurse/index.vue"
import bignurse from "./component/nurse/bigindex.vue" import bignurse from "./component/nurse/bigindex.vue"
import { onBackPress, onShow } from '@dcloudio/uni-app'; import { onBackPress, onShow } from '@dcloudio/uni-app';
import { getNcPackagelist } from './component/nurse/api.js' import { getNcPackagelist } from './component/nurse/api.js'
import leftcontent from "./component/leftcontent/leftcontent.vue" import leftcontent from "./component/leftcontent/leftcontent.vue"
import defaultr from '@/pages/procurement/components/default.vue'; import defaultr from '@/pages/procurement/components/default.vue';
import material from "@/pages/procurement/material.vue";
import materialcar from "@/pages/procurement/materialcar.vue";
import purchaseorder from "@/pages/procurement/purchaseorder.vue";
import picking from "@/pages/Warehouse/picking.vue";
import finish from "@/pages/Warehouse/finish.vue"
import outbound from "@/pages/procurement/outbound.vue";
import inventory from "@/pages/procurement/inventory.vue";
import addtory from "@/pages/procurement/addtory.vue";
import retstock from "@/pages/procurement/retstock.vue";
onBackPress(() => { onBackPress(() => {
if (specialPage.value) { if (specialPage.value) {
specialPage.value-- specialPage.value = ''
return true; // 禁止返回手势返回 return true; // 禁止返回手势返回
} else { } else {
return false; // 禁止返回手势返回 return false; // 禁止返回手势返回
@ -111,8 +135,8 @@
const listarr = ref([]); const listarr = ref([]);
onMounted(() => { onMounted(() => {
menuIndex.value = 0; menuIndex.value = '';
swipedex.value = 0; swipedex.value = '';
getNcPackagelist(`1`).then((res : any) => { getNcPackagelist(`1`).then((res : any) => {
//缓存指令包 //缓存指令包
@ -124,13 +148,20 @@
// console.log("缓存指令包", res) // console.log("缓存指令包", res)
uni.setStorageSync("Packagelist2", res.result) uni.setStorageSync("Packagelist2", res.result)
}) })
getPermissionList({ employeesId: uni.getStorageSync('userInfo').employeesId }).then(res => { swip()
listarr.value = res.result;
// console.log("这个是啥", res)
})
}) })
const gospecial = (index : number) => { const changeNumber = (item : any) => {
specialPage.value = index specialPage.value = item
// specialitem.value = item
}
const specialitem = ref({})
const changepages = (item : any) => {
specialPagedex.value = 1
specialitem.value = item
}
const specialPagedex = ref(0)
const gospecial = (index) => {
specialPagedex.value = index
} }
// 通用的生成函数 // 通用的生成函数
@ -143,147 +174,73 @@
}) })
} }
const tabbrarr = ref([ const tabbrarr = ref([
{ name: '服务', url: '/static/shouye/sy/n0.png', urls: '/static/shouye/sy/n1.png', type: 'kzgn_hljz' }, { name: '首页', url: '/static/shouye/sy/home0.png', urls: '/static/shouye/sy/home1.png', menuCode: 'jcgn_sy' },
{ name: '医疗', url: '/static/shouye/sy/y0.png', urls: '/static/shouye/sy/y1.png', type: 'kzgn_yljz' }, { name: '服务', url: '/static/shouye/sy/n0.png', urls: '/static/shouye/sy/n1.png', menuCode: 'jcgn_fw' },
{ name: '后勤', url: '/static/shouye/sy/q0.png', urls: '/static/shouye/sy/q1.png', type: 'kzgn_hqjz' }, { name: '请领', url: '/static/shouye/sy/l0.png', urls: '/static/shouye/sy/l1.png', menuCode: 'jcgn_ql' },
{ name: '库房', url: '/static/shouye/sy/l0.png', urls: '/static/shouye/sy/l1.png', type: 'kzgn_kfjz' }, { name: '退货', url: '/static/shouye/sy/g0.png', urls: '/static/shouye/sy/g1.png', menuCode: 'jcgn_th' },
{ name: '物料', url: '/static/shouye/sy/g0.png', urls: '/static/shouye/sy/g1.png', menuCode: 'jcgn_wl' },
{ name: '采购', url: '/static/shouye/ck/c0.png', urls: '/static/shouye/ck/c1.png', menuCode: 'jcgn_cg' },
{ name: '拣货', url: '/static/shouye/ck/j0.png', urls: '/static/shouye/ck/j1.png', menuCode: 'jcgn_jh' },
{ name: '完结', url: '/static/shouye/ck/w0.png', urls: '/static/shouye/ck/w1.png', menuCode: 'jcgn_wj' },
{ name: '库存盘点', url: '/static/shouye/ck/p0.png', urls: '/static/shouye/ck/p1.png', menuCode: 'jcgn_kcpd' },
{ name: '请领出库', url: '/static/shouye/ck/q0.png', urls: '/static/shouye/ck/q1.png', menuCode: 'jcgn_qlck' },
{ name: '退货入库', url: '/static/shouye/ck/t0.png', urls: '/static/shouye/ck/t1.png', menuCode: 'jcgn_qlrk' },
{ name: '物联', url: '/static/shouye/sy/g0.png', urls: '/static/shouye/sy/g1.png', menuCode: 'jcgn_wisb' }
]) ])
const specialPage = ref(0) const specialPage = ref('')
const navurl = (e, v) => { const navurl = (e, v) => {
swipedex.value = -1; swipedex.value = '';
specialPage.value = 0 specialPage.value = ''
switch (v.type) {
case 'hldy': if(v.menuCode == "back"){
swipedex.value = 0; uni.navigateBack()
setTimeout(() => { }else{
menuIndex.value = 0; swipedex.value = v.menuCode;
}, 100) setTimeout(() => {
// console.log('护理单元') menuIndex.value = v.menuCode;
break; }, 100)
case 'kzgn_hljz':
swipedex.value = 1;
setTimeout(() => {
menuIndex.value = 1;
}, 100)
// console.log('护理矩阵')
break;
case 'kzgn_yljz':
swipedex.value = 2;
setTimeout(() => {
menuIndex.value = 2;
}, 100)
// console.log('医疗矩阵')
break;
case 'kzgn_hqjz':
swipedex.value = 3;
setTimeout(() => {
menuIndex.value = 3;
}, 100)
// console.log('后勤矩阵')
break;
case 'kzgn_kfjz':
swipedex.value = 6;
setTimeout(() => {
menuIndex.value = 6;
}, 100)
//console.log('库房')
break;
case 'kf_cg':
//console.log('采购')
break;
case 'kf_jh':
//console.log('拣货')
break;
case 'kf_wj':
//console.log('完结')
break;
case 'hldy_ql':
swipedex.value = 4;
setTimeout(() => {
menuIndex.value = 4;
}, 100)
//console.log('请领')
break;
case 'kf_th':
//console.log('退货')
break;
case 'kf_pd':
//console.log('盘点')
break;
case 'wl':
swipedex.value = 5;
setTimeout(() => {
menuIndex.value = 5;
}, 100)
//console.log('物联')
break;
case 'back':
// 不这样写的话的话返回和uni.navigateBack()会冲突
uni.navigateBack()
uni.navigateBack()
break;
default:
break;
} }
//
} }
const arrlist = ref([ const arrlist = ref([
{ name: '首页', url: '/static/shouye/sy/h0.png', urls: '/static/shouye/sy/h1.png', type: 'hldy' } { name: '首页', url: '/static/shouye/sy/h0.png', urls: '/static/shouye/sy/h1.png', menuCode: 'jcgn_sy' },
]) ])
const swip = () => { const swip = () => {
getPermissionList({ employeesId: uni.getStorageSync('userInfo').employeesId }).then(res => {
listarr.value = res.result;
})
let nuId = uni.getStorageSync('nuId'); let nuId = uni.getStorageSync('nuId');
let arrs = []; let arrs = [];
// console.log("/???",listarr.value)
listarr.value.forEach(item => { listarr.value.forEach(item => {
if (item.nuId == nuId) { if (item.nuId == nuId) {
arrs = item.dataList arrs = item.dataList
} }
}) })
let nuName = uni.getStorageSync('nuName') let nuName = uni.getStorageSync('nuName')
let arr = []
queryPadPageList({ 'pageNo': -1, 'nuName': nuName }).then((res => { queryPadPageList({ 'pageNo': -1, 'nuName': nuName }).then((res => {
arr = res.result.records[0].permissionList;
let arr = res.result.records[0].permissionList; arrlist.value = [
// console.log("???????????????",res.result.records[0].permissionList) { name: '首页', url: '/static/shouye/sy/h0.png', urls: '/static/shouye/sy/h1.png', menuCode: 'jcgn_sy' },
arrlist.value = [{ name: '首页', url: '/static/shouye/sy/h0.png', urls: '/static/shouye/sy/h1.png', type: 'hldy' }]; ];
let tbr = [];
// console.log("xxxx",res) let result = getIntersection(arrs, arr);
if (arr) { let results = getIntersection( tabbrarr.value,result);
arr.forEach((v, i) => { arrlist.value.push(...results);
let obj = arrs.find(item =>
item.menuCode == v.menuCode
);
if (obj) {
tbr.push(v);
}
})
// console.log("是不是没了啊", tbr)
tbr.forEach(item => {
let obj = tabbrarr.value.find(r =>
r.type == item.menuCode
);
if (obj) {
arrlist.value.push(obj);
}
})
}
arrlist.value.push(...tabbrarr.value);
let back = [ let back = [
{ name: '请领', url: '/static/shouye/sy/l0.png', urls: '/static/shouye/sy/l1.png', type: 'hldy_ql' }, { name: '返回', url: '/static/shouye/sy/f0.png', urls: '/static/shouye/sy/f1.png', menuCode: 'back' }
{ name: '物联', url: '/static/shouye/sy/g0.png', urls: '/static/shouye/sy/g1.png', type: 'wl' },
{ name: '返回', url: '/static/shouye/sy/f0.png', urls: '/static/shouye/sy/f1.png', type: 'back' }
] ]
arrlist.value.push(...back); arrlist.value.push(...back);
// navurl(0,arrlist.value[0]) navurl(0,arrlist.value[0])
})) }))
} }
function getIntersection(arrA, arrB) {
const codeSet = new Set(arrB.map(item => item.menuCode));
return arrA.filter(item => codeSet.has(item.menuCode));
}
// 当前选中的菜单索引 // 当前选中的菜单索引
const menuIndex = ref<number>(-1); const menuIndex = ref('jcgn_sy');
const swipedex = ref<number>(-1); const swipedex = ref('jcgn_sy');
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 menuIndexshowfourth = ref<boolean>(false);
@ -291,54 +248,21 @@
const messageopit = ref<boolean>(false); const messageopit = ref<boolean>(false);
// 变更菜单 // 变更菜单
const changeMenu = (index : number) => { const changeMenu = (index) => {
if (index === menuIndex.value) { if (index === menuIndex.value) {
return return
} }
menuIndex.value = index; menuIndex.value = index;
menuIndexshow.value = false setTimeout(()=>{
menuIndexshowsecond.value = false swipedex.value = index;
menuIndexshowfourth.value = false; },50)
menuIndexshowfifth.value = false
if (index === arrlist.value.length - 1) {
uni.navigateBack()
return
}
setTimeout(() => {
switch (index) {
case 0:
menuIndexshow.value = true
break;
case 1:
menuIndexshowsecond.value = true
nomesssageshow()
break;
case 2:
nomesssageshow()
break;
case 3:
menuIndexshowfourth.value = true
break;
case 4:
menuIndexshowfifth.value = true;
break;
case 5:
menuIndexshowfourth.value = true
break;
default:
}
}, 50)
}; };
const clientX = ref(0); const clientX = ref(0);
const clientY = ref(0); const clientY = ref(0);
const savename = ref("") const savename = ref("")
// 生命周期钩子 // 生命周期钩子
onMounted(() => { onMounted(() => {
//首次加载和跳转回来需要重新做个动画 //首次加载和跳转回来需要重新做个动画
setTimeout(() => { setTimeout(() => {
changeMenu(menuIndex.value) changeMenu(menuIndex.value)
@ -386,7 +310,7 @@
const movelook = ref({ const movelook = ref({
url: "", url: "",
title: "", title: "",
type: 0 menuCode: 0
}) })
const startmoveit = ref(true) const startmoveit = ref(true)
const whoisit = ref(0); const whoisit = ref(0);
@ -409,13 +333,13 @@
} }
// console.log("咋没了",movelook.value.url) // console.log("咋没了",movelook.value.url)
movelook.value.title = look.title; movelook.value.title = look.title;
movelook.value.type = 0; movelook.value.menuCode = 0;
startmoveit.value = false startmoveit.value = false
} else if (look.packageName) { } else if (look.packageName) {
whoisit.value = 0; whoisit.value = 0;
movelook.value.url = `/static/index/packtarget.png` movelook.value.url = `/static/index/packtarget.png`
movelook.value.title = look.packageName; movelook.value.title = look.packageName;
movelook.value.type = 1; movelook.value.menuCode = 1;
startmoveit.value = false startmoveit.value = false
} }

4
pages/Warehouse/index/component/index.vue
View File

@ -76,7 +76,7 @@
<view class="spiw"> <view class="spiw">
<view v-for="(v,i) in ['库房']" :key="i" :class="i==0?'act':''">{{v}}</view> <view v-for="(v,i) in ['库房']" :key="i" :class="i==0?'act':''">{{v}}</view>
</view> </view>
<scroll-view class="scrol" scroll-y="true"> <!-- <scroll-view class="scrol" scroll-y="true">
<view v-for="(v,i) in zlarr" :key='i' :class="i==fwzldex?'act':''" class="cdk" <view v-for="(v,i) in zlarr" :key='i' :class="i==fwzldex?'act':''" class="cdk"
@click="zldex(i)"> @click="zldex(i)">
<image :src="fwzldex!=i?v.netImmediateFile:v.netPreviewFileSmall" mode="aspectFill"></image> <image :src="fwzldex!=i?v.netImmediateFile:v.netPreviewFileSmall" mode="aspectFill"></image>
@ -91,7 +91,7 @@
暂无服务指令 暂无服务指令
</view> </view>
</view> </view>
</scroll-view> </scroll-view> -->
<view class="submit"> <view class="submit">
<view @click.stop="jszlshow = false">取消</view> <view @click.stop="jszlshow = false">取消</view>
<view @click="subitshowing" v-if="fwzldex>0">确定</view> <view @click="subitshowing" v-if="fwzldex>0">确定</view>

92
pages/Warehouse/index/index.vue
View File

@ -63,13 +63,14 @@
@changepages="changepages"></inventory> @changepages="changepages"></inventory>
<addtory :isShow="menuop == 6" v-if="swipdex == 6&&specialPage=='1'" :specialitem="specialitem"> <addtory :isShow="menuop == 6" v-if="swipdex == 6&&specialPage=='1'" :specialitem="specialitem">
</addtory> </addtory>
<!-- <nurse :isshow="menuop == 7" v-if="swipdex==7&&uni.getStorageSync('nuId')" /> --> <!-- <nurse :isshow="menuop == 7" v-if="swipdex==7&&uni.getStorageSync('nuId')" /> -->
<!-- <invoicing :isshow="menuop == 8" v-if="swipdex==8&&uni.getStorageSync('nuId')" /> --> <!-- <invoicing :isshow="menuop == 8" v-if="swipdex==8&&uni.getStorageSync('nuId')" /> -->
<!-- <logistics :isshow="menuop == 9" v-if="swipdex==9&&uni.getStorageSync('nuId')" /> --> <!-- <logistics :isshow="menuop == 9" v-if="swipdex==9&&uni.getStorageSync('nuId')" /> -->
<!-- <warehousematrix :isshow="menuop == 10" v-if="swipdex==10&&uni.getStorageSync('nuId')" /> --> <!-- <warehousematrix :isshow="menuop == 10" v-if="swipdex==10&&uni.getStorageSync('nuId')" /> -->
<warehousematrix :isshow="menuop==10" v-if="swipdex==10" :canmove="startmoveit" :sendxy="targetrule" <!-- <warehousematrix :isshow="menuop==10" v-if="swipdex==10" :canmove="startmoveit" :sendxy="targetrule"
:isblue='isblue' :howtomove="howtomove" :targetrule="targetrule" @handsend="handsend" :isblue='isblue' :howtomove="howtomove" :targetrule="targetrule" @handsend="handsend"
@rulepush="rulepush" @cleanall="cleanall" /> @rulepush="rulepush" @cleanall="cleanall" /> -->
</view> </view>
</view> </view>
</view> </view>
@ -84,11 +85,8 @@
import materialcar from "@/pages/procurement/materialcar.vue"; import materialcar from "@/pages/procurement/materialcar.vue";
import purchaseorder from "@/pages/procurement/purchaseorder.vue"; import purchaseorder from "@/pages/procurement/purchaseorder.vue";
import { getNcPackagelist } from '@/pages/NursingNew/component/nurse/api.js' import { getNcPackagelist } from '@/pages/NursingNew/component/nurse/api.js'
import index from "./component/index.vue" import index from "./component/index.vue"
import picking from "../picking.vue"; import picking from "../picking.vue";
import finish from "@/pages/Warehouse/finish.vue" import finish from "@/pages/Warehouse/finish.vue"
import outbound from "@/pages/procurement/outbound.vue"; import outbound from "@/pages/procurement/outbound.vue";
import inventory from "@/pages/procurement/inventory.vue"; import inventory from "@/pages/procurement/inventory.vue";
@ -96,15 +94,15 @@
import retstock from "@/pages/procurement/retstock.vue"; import retstock from "@/pages/procurement/retstock.vue";
// import logistics from "@/pages/NursingNew/component/logistics/index.vue" // import logistics from "@/pages/NursingNew/component/logistics/index.vue"
import warehousematrix from "@/pages/NursingNew/component/warehousematrix/newindex.vue" // import warehousematrix from "@/pages/NursingNew/component/warehousematrix/newindex.vue"
// import logistics from "@/pages/NursingNew/component/logistics/index.vue" // import logistics from "@/pages/NursingNew/component/logistics/index.vue"
// import nurse from "@/pages/NursingNew/component/nurse/index.vue" // import nurse from "@/pages/NursingNew/component/nurse/index.vue"
const tabbrarr = ref([ const tabbrarr = ref([
{ name: '护理', url: '/static/shouye/sy/n0.png', urls: '/static/shouye/sy/n1.png', type: 'kzgn_hljz' }, // { name: '护理', url: '/static/shouye/sy/n0.png', urls: '/static/shouye/sy/n1.png', type: 'kzgn_hljz' },
{ name: '医疗', url: '/static/shouye/sy/y0.png', urls: '/static/shouye/sy/y1.png', type: 'kzgn_yljz' }, // { name: '医疗', url: '/static/shouye/sy/y0.png', urls: '/static/shouye/sy/y1.png', type: 'kzgn_yljz' },
{ name: '后勤', url: '/static/shouye/sy/l0.png', urls: '/static/shouye/sy/l1.png', type: 'kzgn_hqjz' }, // { name: '后勤', url: '/static/shouye/sy/l0.png', urls: '/static/shouye/sy/l1.png', type: 'kzgn_hqjz' },
{ name: '库房', url: '/static/shouye/sy/l0.png', urls: '/static/shouye/sy/l1.png', type: 'kzgn_kfjz' }, // { name: '库房', url: '/static/shouye/sy/l0.png', urls: '/static/shouye/sy/l1.png', type: 'kzgn_kfjz' },
]) ])
const menuop = ref(0) const menuop = ref(0)
const swipdex = ref(0) const swipdex = ref(0)
@ -161,62 +159,62 @@
specialPage.value = 0; specialPage.value = 0;
setTimeout(() => { setTimeout(() => {
switch (v.type) { switch (v.type) {
case 'sy': case 'jcgn_sy':
swipdex.value = 0; swipdex.value = 0;
setTimeout(() => { setTimeout(() => {
menuop.value = 0 menuop.value = 0
}, 100) }, 100)
break; break;
case 'kf_cg': case 'jcgn_cg':
swipdex.value = 1; swipdex.value = 1;
setTimeout(() => { setTimeout(() => {
menuop.value = 1 menuop.value = 1
}, 100) }, 100)
break; break;
case 'kf_jh': case 'jcgn_ih':
swipdex.value = 2; swipdex.value = 2;
setTimeout(() => { setTimeout(() => {
menuop.value = 3 menuop.value = 3
}, 100) }, 100)
break; break;
case 'kf_wj': case 'jcgn_wj':
swipdex.value = 3; swipdex.value = 3;
setTimeout(() => { setTimeout(() => {
menuop.value = 3 menuop.value = 3
}, 100) }, 100)
break; break;
case 'kf_ql': case 'jcgn_ql':
swipdex.value = 4; swipdex.value = 4;
setTimeout(() => { setTimeout(() => {
menuop.value = 4 menuop.value = 4
}, 100) }, 100)
break; break;
case 'kf_th': case 'jcgn_qlrk':
swipdex.value = 5; swipdex.value = 5;
setTimeout(() => { setTimeout(() => {
menuop.value = 5 menuop.value = 5
}, 100) }, 100)
break; break;
case 'kf_pd': case 'jcgn_kcpd':
swipdex.value = 6; swipdex.value = 6;
setTimeout(() => { setTimeout(() => {
menuop.value = 6 menuop.value = 6
}, 100) }, 100)
break; break;
case 'kzgn_hljz': // case 'kzgn_hljz':
swipdex.value = 7; // swipdex.value = 7;
setTimeout(() => { // setTimeout(() => {
menuop.value = 7; // menuop.value = 7;
}, 100) // }, 100)
console.log('护理矩阵') // console.log('护理矩阵')
break; // break;
case 'kzgn_yljz': // case 'kzgn_yljz':
swipdex.value = 7; // swipdex.value = 7;
setTimeout(() => { // setTimeout(() => {
menuop.value = 7; // menuop.value = 7;
}, 100) // }, 100)
console.log('医疗矩阵') // console.log('医疗矩阵')
break; // break;
// case 'kzgn_hqjz': // case 'kzgn_hqjz':
// swipdex.value = 9; // swipdex.value = 9;
// setTimeout(() => { // setTimeout(() => {
@ -256,13 +254,13 @@
queryPadPageList({ 'pageNo': -1, 'nuName': nuName }).then((res => { queryPadPageList({ 'pageNo': -1, 'nuName': nuName }).then((res => {
let arr = res.result.records[0].permissionList; let arr = res.result.records[0].permissionList;
arrlist.value = [ arrlist.value = [
{ name: '首页', url: '/static/shouye/ck/h0.png', urls: '/static/shouye/ck/h1.png', type: 'sy' }, { name: '首页', url: '/static/shouye/ck/h0.png', urls: '/static/shouye/ck/h1.png', type: 'jcgn_sy' },
{ name: '采购', url: '/static/shouye/ck/c0.png', urls: '/static/shouye/ck/c1.png', type: 'kf_cg' }, { name: '采购', url: '/static/shouye/ck/c0.png', urls: '/static/shouye/ck/c1.png', type: 'jcgn_cg' },
{ name: '拣货', url: '/static/shouye/ck/j0.png', urls: '/static/shouye/ck/j1.png', type: 'kf_jh' }, { name: '拣货', url: '/static/shouye/ck/j0.png', urls: '/static/shouye/ck/j1.png', type: 'jcgn_ih' },
{ name: '完结', url: '/static/shouye/ck/w0.png', urls: '/static/shouye/ck/w1.png', type: 'kf_wj' }, { name: '完结', url: '/static/shouye/ck/w0.png', urls: '/static/shouye/ck/w1.png', type: 'jcgn_wj' },
{ name: '请领出库', url: '/static/shouye/ck/q0.png', urls: '/static/shouye/ck/q1.png', type: 'kf_ql' }, { name: '请领出库', url: '/static/shouye/ck/q0.png', urls: '/static/shouye/ck/q1.png', type: 'jcgn_qlck' },
{ name: '退货入库', url: '/static/shouye/ck/t0.png', urls: '/static/shouye/ck/t1.png', type: 'kf_th' }, { name: '退货入库', url: '/static/shouye/ck/t0.png', urls: '/static/shouye/ck/t1.png', type: 'jcgn_qlrk' },
{ name: '库存盘点', url: '/static/shouye/ck/p0.png', urls: '/static/shouye/ck/p1.png', type: 'kf_pd' }, { name: '库存盘点', url: '/static/shouye/ck/p0.png', urls: '/static/shouye/ck/p1.png', type: 'jcgn_kcpd' },
]; ];
let tbr = []; let tbr = [];
if (arr) { if (arr) {
@ -293,15 +291,15 @@
const materials = ref<InstanceType<typeof ChildComponent>>(); const materials = ref<InstanceType<typeof ChildComponent>>();
const inventorys = ref<InstanceType<typeof ChildComponent>>() const inventorys = ref<InstanceType<typeof ChildComponent>>()
const userInfo = ref({}) const userInfo = ref({})
onShow(() => { // onShow(() => {
userInfo.value = uni.getStorageSync('userInfo'); // userInfo.value = uni.getStorageSync('userInfo');
if (menuop.value == 1) { // if (menuop.value == 1) {
materials.value.gwcsx(); // materials.value.gwcsx();
} // }
if (menuop.value == 6) { // if (menuop.value == 6) {
inventorys.value.firstgetqueryCgdList() // inventorys.value.firstgetqueryCgdList()
} // }
}) // })
const clientX = ref(0); const clientX = ref(0);
const clientY = ref(0); const clientY = ref(0);
const savename = ref("") const savename = ref("")