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

同步

This commit is contained in:
wangweidong 2026-01-15 16:07:55 +08:00
parent 4f53774549
commit 0f74b7dc17
13 changed files with 97 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
component/public/errorshow.vue
View File

@ -69,6 +69,7 @@
flex-wrap: wrap;
margin-bottom: 4vw;
text-align: center;
overflow-wrap: break-word;
}
.qd {

9
pages/NursingNew/component/doctorask/api/api.js
View File

@ -69,3 +69,12 @@ export const assistOrder = (params) => {
data: params,
})
}
// 业务）生成即时指令工单接口
export const generateInstant = (params) => {
return request({
url: `${uni.getStorageSync('serverUrl')}/api/pad/serviceorder/generateInstant`,
method: 'post',
data: params,
})
}

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

@ -114,7 +114,7 @@
</scroll-view>
<view class="submit" >
<view @click.stop="jszlshow = false">取消</view>
<view @click="subitshowing">确定</view>
<view @click="subitshowing" v-if="fwzldex>0">确定</view>
</view>
</view>
</view>
@ -139,7 +139,7 @@
<view class="pao-father" v-show="indexmessage?.startTime">
<image class="pao-img" :src="`/static/index/newindex/states/pao.png`" />
<view style="z-index: 1;">
<view style="z-index: 1;" v-if="topbuttontarget==0">
{{indexmessage?.izStart=='N'?'待执行':'执行中'}}
</view>
@ -152,9 +152,11 @@
<view class="server-name" v-if="indexmessage?.startTime">
{{ indexmessage?.directiveName }}
</view>
<view style="width: 6.5vw;height: 2vw;margin-left: 1vw;position: relative;" v-if="indexmessage?.startTime">
<view style="width: 6.5vw;height: 2vw;margin-left: 1vw;position: relative;" v-if="indexmessage?.categoryName">
<image src="/static/index/newindex/wendu/bgc.png" mode="aspectFill" style="width: 100%;height: 100%;position: relative;z-index: 0;margin-top: 0.9vw;"></image>
<view class="bgc-font" style="top: 0;left: 0;padding-left:0.45vw;width: 100%;height: 100%;z-index: 2;position: absolute;line-height:3.7vw;font-size: 1.1vw;">{{indexmessage.categoryName}}</view>
<view class="bgc-font" v-if="topbuttontarget==0" style="top: 0;left: 0;padding-left:0.65vw;width: 100%;height: 100%;z-index: 2;position: absolute;line-height:3.7vw;font-size: 1.1vw;">
{{indexmessage.categoryName}}
</view>
</view>
</view>
<view style="display: flex;margin-top: 40rpx;" v-if="indexmessage?.startTime">
@ -294,6 +296,7 @@
</view>
</view>
<errorshow :show="openerror" :font="errmsg" @close="openerror=false" :icons="false" style="left: 44%;"/>
<errorshow :show="error" :font="msg" @close="error=false" style="left: 44%;"/>
<view class="index-content-right" :style="transition?{opacity: `1`}:{opacity: `0`}">
<view class="right-time">
<view class="time-top">
@ -475,7 +478,7 @@
<view class="mengban" v-if="topbuttontarget>0" @click="topbuttontarget=0"></view>
<view class="photowall" v-show="topbuttontarget>0" :style="donghuaopo?{opacity:1}:{opacity:0}">
<view class="photowall" v-show="topbuttontarget>0" :style="donghuaopo?{opacity:1}:{opacity:0}" >
<view class="photowall-title">
<view class="photowall-name">
{{ topbuttontarget==1?`照片`:`录像` }}
@ -509,7 +512,7 @@
</view>
<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"
:src="servervideoUrl+item" direction="180"
mode="aspectFill" ></video>
<view @click.stop="ilanarr.splice(index,1)"
v-if="topbuttontarget>0&&(listobj.izStart=='Y'&& listobj.izFinish=='N')"
@ -597,7 +600,7 @@
import { queryPadPageList } from '@/pages/watch/api/lunpan.js'
import { queryWorkOrderList,queryCountByType,queryAll } from './api.js'
// import {startOrder,endOrder} from './doctorask/api/api.js'
import {queryOrderList,queryOrderInfoList,startOrder,endOrder,editSubPicPath,editSubMp4,queryEmpList,transferOrder,assistOrder} from '../component/doctorask/api/api.js'
import {queryOrderList,queryOrderInfoList,startOrder,endOrder,editSubPicPath,editSubMp4,queryEmpList,transferOrder,assistOrder,generateInstant} 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/')
@ -990,6 +993,7 @@
if(e==2){
fwzlarr.value = zlarr.value.logistics
}
console.log(fwzlarr.value)
}
const zldex = (e) =>{
if(e>-1&&e==fwzldex.value){
@ -998,8 +1002,27 @@
fwzldex.value = e
}
}
const error = ref(false)
const msg = ref('')
const subitshowing = () =>{
jszlshow.value = false
if(fwzldex.value<0){
return
}
let code = fwzlindex.value==0?1:fwzlindex.value==1?2:4
let obj = {
id:fwzlarr.value[fwzldex.value].id,
triggerMode:1,
orderType:code
}
console.log(obj)
generateInstant(obj).then(res=>{
if(res.success){
jszlshow.value = false
}else{
error.value = true;
msg.value = res.message
}
})
}
function calcAge(dateOfBirth : string) {

2
pages/NursingNew/component/pleasetake/common/addwl.vue
View File

@ -211,7 +211,7 @@
.more {
margin-left: 0.6vw;
position: relative;
background: RGBA(239, 240, 244, 1);
background: RGBA(239, 240, 244, 0);
.righ0 {

1
pages/Warehouse/finish.vue
View File

@ -1081,6 +1081,7 @@
<tanchuang :show="badshow" font="确定要作废这个采购单吗" @back="badshow=false;" @right="zuofei"> </tanchuang>
<tanchuang :show="open==1" font="是否删除此图片" @back="open = 0" @right="del()"> </tanchuang>
<tanchuang :show="open==2" font="是否销账此物料？" @back="open = 0" @right="sctp(1)"> </tanchuang>
<severcard></severcard>
</view>
</template>

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

@ -67,10 +67,11 @@
</scroll-view>
<view class="submit" >
<view @click.stop="jszlshow = false">取消</view>
<view @click="subitshowing">确定</view>
<view @click="subitshowing" v-if="fwzldex>0">确定</view>
</view>
</view>
</view>
<errorshow :show="error" :font="msg" @close="error=false" style="left: 44%;"/>
<view class="mengban" v-if="jszlshow" @click="jszlshow = false"></view>
</view>
<view class="photo-father">
@ -348,10 +349,13 @@
</view>
<view class="icon-people">
<image class="people-img" src="/static/index/newindex/leftmenu/iconleft.png" />
单人执行
<text v-if="indexmessage.optType == 1" style="white-space: nowrap;">单人执行</text>
<text v-if="indexmessage.optType == 2" style="white-space: nowrap;">协助执行</text>
<image style="margin-left: 1vw;" class="people-img"
src="/static/index/newindex/leftmenu/iconright.png" />
{{indexmessage.employeeName}}
<text v-if="indexmessage.optType == 1">{{indexmessage.employeeName}}</text>
<text v-if="indexmessage.optType == 2">{{indexmessage.optNames}}</text>
</view>
<!-- <view style="color: #555555;">
业务单号：P10120251010001
@ -490,7 +494,7 @@
import { ref, onMounted, onBeforeUnmount, computed, nextTick, watch,reactive } from 'vue';
import { queryPadPageList } from '@/pages/watch/api/lunpan.js'
import { queryWorkOrderList,queryCountByType,queryAll } from '@/pages/NursingNew/component/api.js'
import {queryOrderList,queryOrderInfoList,startOrder,endOrder,editSubPicPath,editSubMp4,queryEmpList,transferOrder,assistOrder} from '@/pages/NursingNew/component/doctorask/api/api.js'
import {queryOrderList,queryOrderInfoList,startOrder,endOrder,editSubPicPath,editSubMp4,queryEmpList,transferOrder,assistOrder,generateInstant} from '@/pages/NursingNew/component/doctorask/api/api.js'
const jszlshow = ref(false)
const props = defineProps({
isShow: {
@ -904,8 +908,25 @@
fwzldex.value = e
}
}
const error = ref(false)
const msg = ref('')
const subitshowing = () =>{
jszlshow.value = false
if(fwzldex.value<0){
return
}
let obj = {
id:zlarr.value[fwzldex.value].id,
triggerMode:1,
orderType:3
}
generateInstant(obj).then(res=>{
if(res.success){
jszlshow.value = false
}else{
error.value = true;
msg.value = res.message
}
})
}
const tagarray = ["市医保", "半失能", "正常计费"]

21
pages/Warehouse/picking.vue
View File

@ -222,10 +222,8 @@
</view>
<view style="display: flex;flex-wrap: wrap;width: 60%;">
<view class="moban-photo" v-for="(item,index) in albumlist" :key="index">
<view
style="border-radius: 0.3vw;width: 1.6vw;height: 1.6vw;z-index: 20;position: absolute; right: 0.1vw;top: 0.1vw;background: rgba(255, 255, 255, 0.7);display: flex;justify-content: center;align-items: center;"
@click.stop="deldex=index;open=1">
<image src="/static/index/procurement/del1.png" mode="aspectFill" style="width: 75%;height: 75%;"></image>
<view @click.stop="deldex=index;open=1">
<image src="/static/index/keyimg/deletebutton.png" mode="aspectFill" style="width: 75%;height: 70%;"></image>
</view>
<image style="width: 100%;height: 100%;" :src="item?item:'/static/zhanwei.png'" mode="aspectFill"
@click="previewImage(item,index,albumlist)" />
@ -1050,6 +1048,7 @@
<tanchuang :show="open==1" font="是否删除此图片" @back="open = 0" @right="del()"> </tanchuang>
<tanchuang :show="open==2" font="是否销账此物料？" @back="open = 0" @right="sctp(1)"> </tanchuang>
<errorshow :show="openerror" :font="errmsg" @close="openerror=false" />
<severcard></severcard>
</view>
</template>
@ -3368,10 +3367,22 @@
display: flex;
justify-content: center;
align-items: center;
border-radius: 20rpx;
border-radius: 0.6vw;
overflow: hidden;
position: relative;
>view {
width: 2vw;
height: 2vw;
z-index: 20;
position: absolute;
right: 0.1vw;
top: 0.1vw;
border-radius:10rpx 0.6vw 10rpx 10rpx;
background: rgba(255, 255, 255, 1);
display: flex;
justify-content: center;
align-items: center;
}
}
.moban-photo-special {

2
pages/procurement/common/thitem.vue
View File

@ -49,7 +49,7 @@
<!-- <image v-if="v.isAdd!=1" :src="'/static/index/procurement/+.png'" mode="aspectFill"></image>
<image v-if="v.isAdd==1" :src="'/static/index/procurement/-.png'" mode="aspectFill"></image> -->
</view>
<view class="nextadd" @click.stop="clkzk(v,index)">
<view class="nextadd" @click.stop="clkzk(v,index)" v-if="status==0">
<image class="guodu" :style="v.zk?'transform: rotate(180deg);':''"
:src="'/static/index/procurement/l.png'" mode="aspectFill"></image>
</view>

2
pages/procurement/common/thwl.vue
View File

@ -27,7 +27,7 @@
<defaultr cont="暂无数据" v-if="Material.length==0&&timeout"
style="position: absolute;width: 10vw;height: 10vw;"></defaultr>
</scroll-view>
<view class="kjlt more guodu" :style="qb?'width:15vw':'' " @touchstart="ts" @touchmove="canmove"
<view class="kjlt more guodu" :style="qb?'width:16vw':'' " @touchstart="ts" @touchmove="canmove"
v-if="status==0">
<view @click="zksq" class="righ0">
{{!qb?'更多':'收起'}}

12
pages/procurement/common/toryitem.vue
View File

@ -91,8 +91,9 @@
<image :src="serverUrl+p" mode="aspectFill"></image>
<!-- <image :src="'/static/zhanwei.png'" mode="aspectFill" style="width: 2.1vw;height: 2.1vw;">
</image> -->
<view @click.stop="open=1;del(v,o)" style="border-radius: 0.35vw;">
<image src="/static/index/procurement/del1.png" mode="aspectFill" style="width: 75%;height: 70%;"></image>
<view @click.stop="open=1;del(v,o)" >
<image src="/static/index/keyimg/deletebutton.png" mode="aspectFill" style="width: 75%;height: 70%;"></image>
</view>
</view>
<view class="clkpz" @click="uplod(v,i)" v-if="v.picPatharr?.length<6&&pddType == 1">
@ -449,13 +450,14 @@
background: #F9F9F9;
overflow: hidden;
view {
width: 1.6vw;
height: 1.6vw;
width: 2vw;
height: 2vw;
z-index: 20;
position: absolute;
right: 0.1vw;
top: 0.1vw;
background: rgba(255, 255, 255, 0.7);
border-radius:0.6vw 1.1vw 0.6vw 0.6vw;
background: rgba(255, 255, 255, 1);
display: flex;
justify-content: center;
align-items: center;

1
pages/procurement/inventory.vue
View File

@ -256,6 +256,7 @@
</view>
<tanchuang :show="addshow" font="确定要新增盘点单吗" @back="addshow=false;" @right="addnew"> </tanchuang>
<errorshow :show="openmessage" :font="errormessage" @close="openmessage=false" />
<severcard></severcard>
</template>
<script setup lang="ts">

1
pages/procurement/outbound.vue
View File

@ -249,6 +249,7 @@
<errorshow :show="openerror" font="注意：只能选择待出库的请领单" @close="openerror=false" />
<errorshow :show="qinglingshow" font="注意：批量选择模式请选择一项或以上的请领单" @close="qinglingshow=false" />
<errorshow :show="chukuerror" :font="chukuvalue" @close="chukuerror=false" />
<severcard></severcard>
</template>
<script setup lang="ts">

1
pages/procurement/retstock.vue
View File

@ -164,6 +164,7 @@
src="/static/index/newindex/leftmenu/openleft.png" />
</view>
</view>
<severcard></severcard>
</view>
</template>