This commit is contained in:
wangweidong 2026-01-09 16:25:02 +08:00
parent 21416aaf1b
commit 48514d94be
12 changed files with 136 additions and 84 deletions

View File

@ -119,7 +119,7 @@
</view>
</view>
</view>
<view class="mengban" v-if="jszlshow" @click="jszlshow = false"></view>
<view class="mengban" v-if="jszlshow" @click="jszlshow = false" ></view>
<view class="photo-father">
<view class="juzhong" style="margin-left: -30rpx;" :style="indexmessage?.startTime?{}:{filter: `grayscale(60%)`}">
<donghua :width="`1300rpx`" :height="`900rpx`" :links="blueArray" :playing="photoplay" :loop="true"
@ -140,11 +140,12 @@
<view class="pao-father" v-show="indexmessage?.startTime">
<image class="pao-img" :src="`/static/index/newindex/states/pao.png`" />
<view style="z-index: 1;">
待执行
{{indexmessage?.izStart=='N'?'待执行':'执行中'}}
</view>
</view>
</view>
<tanchuang :show="open==3" font="是否结束服务指令?" @back="open = 0" @right="ends()"> </tanchuang>
<image class="big-img" v-if="topbuttontarget==0" :style="!indexmessage?.previewFile?'width: 450rpx':''"
:src="indexmessage?.previewFile? 'https://www.focusnu.com/media/upFiles/' + indexmessage?.previewFile: `/static/index/newindex/wendu/2.png`" mode="aspectFill"/>
<view style="display: flex;align-items: center;">
@ -152,14 +153,14 @@
{{ indexmessage?.directiveName }}
</view>
</view>
<view style="display: flex;margin-top: 40rpx;">
<view style="display: flex;margin-top: 40rpx;" v-if="indexmessage?.startTime">
<view style="width: 240rpx;height: 90rpx;margin-right: 40rpx;">
<view :class="indexmessage?.izStart=='N'?'start-button':'end-button'" v-show="indexmessage?.startTime" @click="start(indexmessage)">
开始服务
</view>
</view>
<view style="width: 240rpx;height: 90rpx;">
<view :class="(indexmessage?.izStart=='Y'&& indexmessage?.izFinish=='N')?'start-button':'end-button'" v-show="indexmessage?.startTime" @click="end(indexmessage)">
<view :class="(indexmessage?.izStart=='Y'&& indexmessage?.izFinish=='N')?'start-button':'end-button'" @click="end(indexmessage)">
结束服务
</view>
</view>
@ -349,32 +350,35 @@
</view>
</view>
</view>
<view class="fixed-card" :style="openleft?{}:{right:`-33vw`}">
<view class="fixed-card" :style="openleft?{}:{right:`-33vw`}" v-show="indexmessage?.startTime">
<view class="fixed-card-left">
<image class="card-left-img" :src="`/static/index/newindex/wendu/2.png`" />
<image class="card-left-img" v-if="topbuttontarget==0" :style="!indexmessage?.previewFile?'width: 450rpx':''"
:src="indexmessage?.previewFile? 'https://www.focusnu.com/media/upFiles/' + indexmessage?.previewFile: `/static/index/newindex/wendu/2.png`" mode="aspectFill"/>
<view class="">
库存盘点
{{ indexmessage?.directiveName }}
</view>
</view>
<view>
<view class="big-time">
10:00 - 10:10
<view class="big-time" v-if="indexmessage?.startTime">
{{ indexmessage?.startTime.slice(11, 16) }}
-
{{ indexmessage?.endTime.slice(11, 16) }}
</view>
<view class="icon-people">
<image class="people-img" src="/static/index/newindex/leftmenu/iconleft.png" />
单人执行
<image style="margin-left: 1vw;" class="people-img"
src="/static/index/newindex/leftmenu/iconright.png" />
王金福
{{indexmessage.employeeName}}
</view>
<view style="color: #555555;">
<!-- <view style="color: #555555;">
业务单号P10120251010001
</view>
</view> -->
<view class="icon-button">
<view class="button-left">
<view :class="indexmessage?.izStart=='N'?'button-right':'button-left'" @click="start(indexmessage)">
开始服务
</view>
<view class="button-right">
<view :class="(indexmessage?.izStart=='Y'&& indexmessage?.izFinish=='N')?'button-right':'button-left'" @click="end(indexmessage)">
结束服务
</view>
</view>
@ -418,7 +422,7 @@
height: 1.4vw;"></image>
</view>
</view>
<view v-if="topbuttontarget==2" style="width: 100%;height: 70%;border-radius: 30rpx ;position: relative;" @click="clik(serverUrl + item)">
<view v-if="topbuttontarget==2" style="width: 100%;height: 70%;border-radius: 30rpx ;position: relative;" >
<video style="width: 100%;height: 100%;border-radius: 30rpx;" :id="'myVideo'+index"
:src="servervideoUrl+item"
mode="aspectFill" ></video>
@ -478,12 +482,25 @@
</view>
</scroll-view>
<view style="position: absolute;right: 2vw;bottom: 0.8vw;height: 4vw;" v-if="topbuttontarget>0&&(listobj.izStart=='Y'&& listobj.izFinish=='N')">
<button type="primary" style="width: 9vw; position: absolute;right: 0vw;bottom: 0.vw;" @click="submit" >确定</button>
<view
style="width: 8.2vw;
height: 3.3vw;
background: #EDEDEF;
border-radius: 1.6vw;
font-weight: 400;
font-size: 1.6vw;
color: #888888;
display: flex;
justify-content: center;
align-items: center;
border: 1px solid #EDEDEF;
background: linear-gradient(0deg, #CAE0F9, #E9F4FF);
border: 1px solid rgba(3,133,250,0.34);
color: #0385FA;" @click="submit" >确定</view>
</view>
</view>
<tanchuang :show="open==1" font="是否删除此图片" @back="open = 0" @right="del1()"> </tanchuang>
</view>
</template>
@ -494,7 +511,8 @@
// import {startOrder,endOrder} from './doctorask/api/api.js'
import {queryOrderList,queryOrderInfoList,startOrder,endOrder,editSubPicPath,editSubMp4} from '../component/doctorask/api/api.js'
import { getNclist } from "./nurse/api.js";
const serverUrl = ref(uni.getStorageSync('serverUrl') + '/sys/common/static/')
const servervideoUrl = ref(uni.getStorageSync('serverUrl') + '/sys/commonVideo/staticVideo/')
const form = reactive({
pageNo: 1,
pageSize: 10,
@ -512,17 +530,16 @@
if(res.result.records.length>0){
clickLeftMenu(0,res.result.records[0])
}else{
indexmessage.value = [];
indexmessage.value = {};
}
})
}
const clickLeftMenu = (index : any, item : object) => {
queryOrderInfoList({ mainId: item.id }).then(res => {
console.log(res)
if(res.result.length>0){
indexmessage.value = res.result[0]
}else{
indexmessage.value = [];
indexmessage.value = {};
}
})
}
@ -531,7 +548,6 @@
const topbuttontarget = ref(0);
const ilanarr = ref([]);
const listobj = ref({});
const ysptp = (v,i,r) =>{
// v.manuallyPicPath
if(r == 1&&v.manuallyPicPath){
@ -625,7 +641,7 @@
if(res.success){
topbuttontarget.value = 0;
donghuaopo.value = false;
clickLeftMenu(lefttarget.value,plsbuy.value[lefttarget.value])
clickLeftMenu(0,{id:indexmessage.value.mainId})
}
})
}else{
@ -633,7 +649,7 @@
if(res.success){
topbuttontarget.value = 0;
donghuaopo.value = false;
clickLeftMenu(lefttarget.value,plsbuy.value[lefttarget.value])
clickLeftMenu(0,{id:indexmessage.value.mainId})
}
})
}
@ -815,16 +831,20 @@
})
}
const end = (v)=>{
console.log(v)
if(v.izStart=='Y'&& v.izFinish=='N'){
endOrder({id:v.id}).then(res=>{
console.log(res)
if(indexmessage.value.izStart=='Y'&& indexmessage.value.izFinish=='N'){
open.value=3;
}
}
const ends = ()=>{
endOrder({id:indexmessage.value.id}).then(res=>{
if(res.success){
open.value=0;
firstgetqueryCgdList(uni.getStorageSync('nuId'))
}else{
}
})}
})
}
//
@ -1751,12 +1771,12 @@
display: flex;
align-items: center;
transition: all 0.5s ease;
padding:0 0 0 1.5vw;
.fixed-card-left {
display: flex;
flex-direction: column;
align-items: center;
margin-right:1.2vw;
.card-left-img {
width: 12vw;
height: 8vw;
@ -1785,7 +1805,8 @@
display: flex;
margin-top: 1vw;
font-size: 1.5vw;
width: 18.5vw;
justify-content: space-around;
.button-left {
width: 8.5vw;
height: 3.3vw;
@ -1808,7 +1829,6 @@
border-radius: 1.2vw;
border: 1rpx solid #5AAEFF;
color: #249BFA;
margin-left: 1vw;
background: linear-gradient(to bottom, #fff, #D1EAFF);
}
}

View File

@ -1,7 +1,7 @@
<template>
<view>
<view class="letbox" :style="style">
<view class="logomain tp">
<view class="logomain">
<image src="/static/shouye/logo2.png" mode="aspectFill"></image>
</view>
<view class="topcpnt">
@ -47,10 +47,13 @@
},
style:{
type:String
},
userInfo:{
type:Object
}
});
const serverUrl = ref(uni.getStorageSync('serverUrl'))
const userInfo = uni.getStorageSync('userInfo');
// const userInfo = uni.getStorageSync('userInfo');
const emit = defineEmits(['navurl'])
const dexleft = ref(0);
const scrolltop = ref(0)
@ -142,10 +145,19 @@
margin-top: 0.6vw;
color: #666666;
}
.tp image{
width: 100%;
height: 100%;
border-radius: 50%;
}
}
.logomain{
width: 6vw;
height: 6vw;
image{
width: 100%;
height: 100%;
}
}
.topcpnt{
width: 6vw;
@ -240,11 +252,7 @@
}
}
}
.tp image{
width: 100%;
height: 100%;
border-radius: 50%;
}
.guodu {
transition: .4s;
-webkit-transform-style: preserve-3d;

View File

@ -250,7 +250,7 @@
.leftbox {
width: 13vw;
height: 12;
height: 12vw;
border-right: 2px solid #E5E5E5;
display: flex;
flex-direction: column;

View File

@ -49,8 +49,7 @@
<addwl :Material="addMaterial" @delall="delall" @del="adddel" @submit="submit"></addwl>
<carditem :InvoicingList="listarr" @scrolltolower="scrolltolower" :status="status" @comfig="comfig"></carditem>
<takeing :show="takeshow" :objtake="objtake" @fill="takeshow = false" @right="right"></takeing>
<cgdclass @confirm="confirm" :show="ification" :typenum="0" ref="classication" @fill="ification = false">
</cgdclass>
<cgdclass @confirm="confirm" :show="ification" :typenum="0" ref="classication" @fill="ification = false"> </cgdclass>
<medetails :show="detaishow" @fill="detaishow = false" @confirm="confirm" :objtake="objtake"></medetails>
<tanchuang @back="tanshow = false" :show="tanshow" font="确定将该物料从本次请领清单中移除吗?" @right="del"></tanchuang>
<takerecord :objtake="objtake" :show="recordshow" @fill="recordshow = false"></takerecord>

View File

@ -8,8 +8,6 @@
{{ uni.getStorageSync('nuName')}}
</text>
<view class="right-icons">
<image class="right-icons-img" src="/static/index/requestform/touxiang.png" />
<view>{{uni.getStorageSync('realname')}}</view>
<image class="right-icons-img-back" src="/static/index/requestform/back.png" v-if="hometype>0" @click="hometype=0" />
<view v-if="hometype>0" @click="hometype=0">返回</view>
</view>

View File

@ -1,7 +1,7 @@
<template>
<view class="backgroundContainer">
<!-- 左侧菜单 -->
<leftcontent :list="arrlist" @navurl="navurl"></leftcontent>
<leftcontent :list="arrlist" @navurl="navurl" :userInfo="userInfo"></leftcontent>
<!-- 主页 -->
<index :isShow="menuIndex==0" v-if="swipedex==0" @swip="swip"/>
<!-- 户嘱页 -->
@ -270,6 +270,10 @@
messageopit.value = true;
}, 200)
}
const userInfo = ref({})
onShow(()=>{
userInfo.value = uni.getStorageSync('userInfo');
})
</script>
<style lang="less" scoped>

View File

@ -2,16 +2,16 @@
<view>
<view class="flex">
<view class="left">
<leftcontent :list="arrlist" @navurl="navurl"></leftcontent>
<leftcontent :list="arrlist" @navurl="navurl" :userInfo="userInfo"></leftcontent>
</view>
<view class="boxrt">
<index :isShow="menuop == 0" v-if="swipdex == 0" @swip="swip"/>
<material :isShow="menuop == 1" v-if="swipdex == 1"></material>
<material :isShow="menuop == 1" v-if="swipdex == 1" ref="materials"></material>
<picking :isShow="menuop == 2" v-if="swipdex == 2"></picking>
<finish :isShow="menuop == 3" v-if="swipdex == 3"></finish>
<outbound :isShow="menuop == 4" v-if="swipdex == 4"></outbound>
<retstock :isShow="menuop == 5" v-if="swipdex == 5"></retstock>
<inventory :isShow="menuop == 6" v-if="swipdex == 6"></inventory>
<inventory :isShow="menuop == 6" v-if="swipdex == 6" ref="inventorys"></inventory>
<nurse :isshow="menuop == 7" v-if="swipdex==7&&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')" />
@ -193,6 +193,18 @@
arrlist.value.push(...back);
}))
}
const materials = ref<InstanceType<typeof ChildComponent>>();
const inventorys = ref<InstanceType<typeof ChildComponent>>()
const userInfo = ref({})
onShow(()=>{
userInfo.value = uni.getStorageSync('userInfo');
if(menuop.value == 1){
materials.value.gwcsx();
}
if(menuop.value == 6){
inventorys.value.firstgetqueryCgdList()
}
})
</script>
<style scoped lang="less">

View File

@ -49,7 +49,7 @@
bottom: 0;
margin: auto;
padding: 2.8vw;
z-index: 9120;
z-index: 9120000000000000000000000000000000000000000000000000000000;
>view {
&:nth-child(4) {

View File

@ -282,15 +282,7 @@
setTimeout(() => {
transition.value = true;
}, 50)
})
watch(
() => props.isShow,
(newVal, oldVal) => {
if (!oldVal && newVal) {
}
}
)
})
watch(
() => props.isShow,
(newVal, oldVal) => {
@ -586,6 +578,9 @@
console.log(v)
uni.navigateTo({ url: '/pages/procurement/addtory?pddobj=' + JSON.stringify(v) })
}
defineExpose({
firstgetqueryCgdList
})
</script>
<style scoped lang="less">

View File

@ -186,25 +186,25 @@
type: Boolean
},
});
onMounted(()=>{
form.pageNo = 1;
warn.pageNo = 1;
Material.value = [];
InvoicingList.value = [];
moredex.value = 0;
shoppcar();
getWaringMaterial()
nextTick(() => {
chongzhi()
})
setTimeout(()=>{
timeout.value = true
},500)
transition.value = false;
setTimeout(() => {
transition.value = true;
}, 50)
})
// onMounted(()=>{
// form.pageNo = 1;
// warn.pageNo = 1;
// Material.value = [];
// InvoicingList.value = [];
// moredex.value = 0;
// shoppcar();
// getWaringMaterial()
// nextTick(() => {
// chongzhi()
// })
// setTimeout(()=>{
// timeout.value = true
// },500)
// transition.value = false;
// setTimeout(() => {
// transition.value = true;
// }, 50)
// })
watch(
() => props.isShow,
(newVal, oldVal) => {
@ -240,6 +240,7 @@
item.zk = false;
item.scrollleft = 0;
})
console.log(res.result.records)
Material.value.push(...res.result.records);
statustory.value = (res.result.total == Material.value.length ? 'nomore' : 'loadmore')
setout1.value = (res.result.total == Material.value.length ? false : true)
@ -358,7 +359,7 @@
form.suppliers = '';
form.pageNo = 1;
form.wlParamInfo = '',
InvoicingList.value = [];
InvoicingList.value = [];
classication.value.typescroll(1, -1, {});
classication.value.qingkong();
classication.value.config();
@ -501,6 +502,21 @@
crkobj.value = v;
crkflag.value = true
}
const gwcsx=()=>{
form.pageNo = 1;
warn.pageNo = 1;
Material.value = [];
InvoicingList.value = [];
moredex.value = 0;
shoppcar();
getWaringMaterial()
nextTick(() => {
chongzhi()
})
}
defineExpose({
gwcsx
})
</script>
<style scoped lang="less">
@ -509,8 +525,8 @@
height: 12vw;
position: fixed;
z-index: 200;
right: 2vw;
bottom: 6vw;
right: 0.8vw;
bottom: 8vw;
display: flex;
flex-direction: column;
justify-content: space-between;

View File

@ -574,7 +574,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
)
]);
}
const camera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/hldy_app_mini/pages/camera.nvue"]]);
const camera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/项目/hldy_app_mini/pages/camera.nvue"]]);
export {
camera as default
};

View File

@ -578,7 +578,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
)
]);
}
const fullcamera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/hldy_app_mini/pages/fullcamera.nvue"]]);
const fullcamera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/项目/hldy_app_mini/pages/fullcamera.nvue"]]);
export {
fullcamera as default
};