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

Merge branch 'main' of http://47.115.223.229:8888/yangjun/hldy_app_mini

This commit is contained in:
wangweidong 2025-11-27 17:26:46 +08:00
parent a1024967f3 38c409d14b
commit 91a3c89185
5 changed files with 134 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

207
pages/NursingNew/component/requestform.vue → pages/NursingNew/component/pleasetake/component/requestform.vue
View File

@ -1,19 +1,6 @@
<template> <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="buttons-father">
<view class="ipt"> <view class="ipt">
<input type="text" placeholder="物料名称/物料简拼" /> <input type="text" placeholder="物料名称/物料简拼" />
@ -67,7 +54,7 @@
<view class="middle-heng"></view> <view class="middle-heng"></view>
<view class="pls-card-middle-one"> <view class="pls-card-middle-one">
<view class="middle-title"> <view class="middle-title">
{{ v.qgDate }} {{ v.qgDate.replace(/-/g, '.') }}
</view> </view>
<view class="middle-heng-father"> <view class="middle-heng-father">
<image class="middle-ball-img" src="/static/index/requestform/isok.png" /> <image class="middle-ball-img" src="/static/index/requestform/isok.png" />
@ -85,7 +72,7 @@
<view class="pls-card-middle-one"> <view class="pls-card-middle-one">
<view class="middle-title" :style=" v?.cgdType=='9' ?{color:`#FF5757`}:{}"> <view class="middle-title" :style=" v?.cgdType=='9' ?{color:`#FF5757`}:{}">
{{ v?.cgdType=='9' ?v.zfTime?.slice(0,10):v.jhTime?.slice(0,10) }} {{ v?.cgdType=='9' ?v.zfTime?.slice(0,10).replace(/-/g, '.'):v.jhTime?.slice(0,10).replace(/-/g, '.') }}
</view> </view>
<view class="middle-heng-father"> <view class="middle-heng-father">
@ -108,7 +95,7 @@
</view> </view>
<view class="pls-card-middle-one"> <view class="pls-card-middle-one">
<view class="middle-title"> <view class="middle-title">
{{ Number(v.status)>=2 ? v.wjTime?.slice(0,10) :""}} {{ Number(v.status)>=2 ? v.wjTime?.slice(0,10).replace(/-/g, '.') :""}}
</view> </view>
<view class="middle-heng-father"> <view class="middle-heng-father">
@ -148,7 +135,46 @@
<scroll-view scroll-y="true" scroll-with-animation class="right-contain"> <scroll-view scroll-y="true" scroll-with-animation class="right-contain">
<view class="right-ones"> <view class="right-ones">
<view class="right-one" v-for="(item,index) in nottrue" :key="index" > <view class="right-one" v-for="(item,index) in nottrue" :key="index" >
<!-- <image :src=" '/static/zhiniaoku.png'" mode="aspectFill"></image> --> <view class="right-one-left">
<image class="left-image" :src=" '/static/zhiniaoku.png'" mode="aspectFill"></image>
<view class="left-tages" style="margin-top: -15rpx;">
耗材用品
</view>
<view class="left-tages">
支架
</view>
</view>
<view class="right-one-right">
<view class="right-title">
纸尿裤-拉拉裤...
</view>
<view class="right-setting">
规格型号
</view>
<view class="right-mm">
800mm*680mm
</view>
<view class="right-down">
<view class="">
<view class="right-first-num">
20
</view>
<view class="right-first-type">
请领数量
</view>
</view>
<view class="right-shu"></view>
<view class="">
<view class="right-first-num" style="font-weight: 500;">
片
</view>
<view class="right-first-type">
请领单位
</view>
</view>
</view>
</view>
</view> </view>
</view> </view>
@ -158,7 +184,7 @@
</view>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
@ -166,35 +192,12 @@
import { onShow, onLoad, onHide, onPageScroll } from "@dcloudio/uni-app" import { onShow, onLoad, onHide, onPageScroll } from "@dcloudio/uni-app"
import { queryCgdList } from '@/pages/Warehouse/api/lunpan.js' import { queryCgdList } from '@/pages/Warehouse/api/lunpan.js'
const transition = ref(false);
const tagsarray = ref(["全部", "待出库", "已出库", "已收货 ", "已作废"]) const tagsarray = ref(["全部", "待出库", "已出库", "已收货 ", "已作废"])
const nottrue = Array(10).fill(null) const nottrue = Array(10).fill(null)
const props = defineProps({
isShow: {
type: Boolean,
required: true,
},
});
watch(
() => props.isShow,
(newVal, oldVal) => {
// 当旧值为false，新值为true时延迟0.2秒调用方法
if (!oldVal && newVal) {
transition.value = false;
setTimeout(() => {
transition.value = true;
}, 50)
} else {
transition.value = false;
}
}
)
const name = ref("");
onMounted(() => { onMounted(() => {
name.value = uni.getStorageSync('realname')
}) })
const lanjie = ref(false); const lanjie = ref(false);
@ -305,53 +308,6 @@
</script> </script>
<style scoped lang="less"> <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 { .right-container-tem {
display: flex; display: flex;
@ -377,7 +333,7 @@
.ipt { .ipt {
display: flex; display: flex;
align-items: center; align-items: center;
width: 18vw; width: 16vw;
background: #E2E4E9; background: #E2E4E9;
border-radius: 1.65vw; border-radius: 1.65vw;
height: 3.3vw; height: 3.3vw;
@ -465,7 +421,7 @@
border: #0f9fff 3rpx solid; border: #0f9fff 3rpx solid;
background-color: #fff; background-color: #fff;
border-radius: 40rpx; border-radius: 40rpx;
margin-bottom: 2vh; margin-bottom: 1.5vh;
// margin: 1vh 0; // margin: 1vh 0;
padding: 0 30rpx; padding: 0 30rpx;
position: relative; position: relative;
@ -630,6 +586,7 @@
justify-content: center; justify-content: center;
background-color: #FDEBEC; background-color: #FDEBEC;
color: #FF5757; color: #FF5757;
border: 1rpx solid #FF5757;
position: absolute; position: absolute;
right: 0rpx; right: 0rpx;
bottom: 20rpx; bottom: 20rpx;
@ -720,6 +677,70 @@
margin-bottom: 15rpx; margin-bottom: 15rpx;
background-color: #fff; background-color: #fff;
border-radius: 30rpx; border-radius: 30rpx;
display: flex;
.right-one-left{
height: 100%;
width: 40%;
display: flex;
flex-direction: column;
align-items: center;
.left-image{
width: 170rpx;
height: 170rpx;
// margin-top: 5rpx;
}
.left-tages{
width: 130rpx;
height: 43rpx;
border-radius: 30rpx;
display: flex;
justify-content: center;
align-items: center;
color: #555555;
border: 1rpx solid #D2D2D2;
margin-top: 5rpx;
font-size: 23rpx;
}
}
.right-one-right{
height: 100%;
width: 60%;
.right-title{
font-size: 34rpx;
font-weight: 600;
margin-top: 25rpx;
color: #222222;
}
.right-setting{
color: #888888;
margin-top: 5rpx;
font-size: 25rpx;
}
.right-mm{
color: #555555;
font-size: 28rpx;
}
.right-down{
display: flex;
margin-top: 15rpx;
.right-first-num{
font-size: 35rpx;
color: #555555;
font-weight: 600;
}
.right-first-type{
color: #888888;
font-size: 23rpx;
}
.right-shu{
width: 2rpx;
height: 50rpx;
background-color: #C9C9C9;
margin: 0 40rpx;
margin-top: 10rpx;
}
}
}
} }
} }

5
pages/NursingNew/component/pleasetake/takehome.vue
View File

@ -9,11 +9,12 @@
</text> </text>
<view class="right-icons"> <view class="right-icons">
<image class="right-icons-img" src="/static/index/requestform/touxiang.png" /> <image class="right-icons-img" src="/static/index/requestform/touxiang.png" />
<view>{{name}}</view> <view>{{uni.getStorageSync('realname')}}</view>
<image class="right-icons-img-back" src="/static/index/requestform/back.png" /> <image class="right-icons-img-back" src="/static/index/requestform/back.png" />
<view>返回</view> <view>返回</view>
</view> </view>
</view> </view>
<requestformView />
</view> </view>
</template> </template>
@ -21,6 +22,8 @@
import { ref, onMounted, onBeforeUnmount, computed, nextTick, defineProps, watch, reactive } from 'vue'; import { ref, onMounted, onBeforeUnmount, computed, nextTick, defineProps, watch, reactive } from 'vue';
import { onShow, onLoad, onHide, onPageScroll } from "@dcloudio/uni-app" import { onShow, onLoad, onHide, onPageScroll } from "@dcloudio/uni-app"
import { queryCgdList } from '@/pages/Warehouse/api/lunpan.js' import { queryCgdList } from '@/pages/Warehouse/api/lunpan.js'
import requestformView from './component/requestform.vue'
const transition = ref(false); const transition = ref(false);
const props = defineProps({ const props = defineProps({
isShow: { isShow: {

28
pages/Warehouse/picking.vue
View File

@ -132,7 +132,7 @@
</view> </view>
<view style="display: flex;margin-top: 10rpx;"> <view style="display: flex;margin-top: 10rpx;">
<view class="" style="width: 33%;"> <view class="" style="width: 33%;">
<view style="color: #999999;margin-top: 10rpx;"> <view style="color: #999999;margin-top: 10rpx;font-size: 25rpx;">
物料编码 物料编码
</view> </view>
<view class="" style="margin-top: 5rpx;font-size: 34rpx;"> <view class="" style="margin-top: 5rpx;font-size: 34rpx;">
@ -140,7 +140,7 @@
</view> </view>
</view> </view>
<view style="width: 33%;"> <view style="width: 33%;">
<view style="color: #999999;margin-top: 10rpx;white-space: nowrap;"> <view style="color: #999999;margin-top: 10rpx;white-space: nowrap;font-size: 25rpx;">
规格型号 规格型号
</view> </view>
<view <view
@ -151,7 +151,7 @@
</view> </view>
<view style="display: flex;margin-top: 20rpx;"> <view style="display: flex;margin-top: 20rpx;">
<view class="" style="width: 33%;"> <view class="" style="width: 33%;">
<view style="color: #999999;margin-top: 10rpx;"> <view style="color: #999999;margin-top: 10rpx;font-size: 25rpx;">
采购单价 采购单价
</view> </view>
<view class="text-anim" style="margin-top: 5rpx;font-weight: 600;font-size: 34rpx;"> <view class="text-anim" style="margin-top: 5rpx;font-weight: 600;font-size: 34rpx;">
@ -159,7 +159,7 @@
</view> </view>
</view> </view>
<view class="" style="width: 33%;"> <view class="" style="width: 33%;">
<view style="color: #999999;margin-top: 10rpx;"> <view style="color: #999999;margin-top: 10rpx;font-size: 25rpx;">
采购数量 采购数量
</view> </view>
<view class="" style="margin-top: 5rpx;font-weight: 600;font-size: 34rpx;"> <view class="" style="margin-top: 5rpx;font-weight: 600;font-size: 34rpx;">
@ -167,7 +167,7 @@
</view> </view>
</view> </view>
<view class="" style="width: 33%;"> <view class="" style="width: 33%;">
<view style="color: #999999;margin-top: 10rpx;"> <view style="color: #999999;margin-top: 10rpx;font-size: 25rpx;">
采购单位 采购单位
</view> </view>
<view class="" style="margin-top: 5rpx;font-size: 34rpx;"> <view class="" style="margin-top: 5rpx;font-size: 34rpx;">
@ -178,13 +178,13 @@
<view style="width: 95%;height: 0.5rpx; background-color: #eff1f3;margin-top: 10rpx;margin-bottom: 5rpx;"> <view style="width: 95%;height: 0.5rpx; background-color: #eff1f3;margin-top: 10rpx;margin-bottom: 5rpx;">
</view> </view>
<view style=""> <view style="">
<view style="font-weight: 600;font-size: 30rpx;"> <view style="font-weight: 600;font-size: 30rpx;margin-top: 10rpx;">
入库信息 入库信息
</view> </view>
</view> </view>
<view style="display: flex;margin-top: 10rpx;"> <view style="display: flex;margin-top: 10rpx;">
<view class="" style="width: 33%;"> <view class="" style="width: 33%;">
<view style="color: #999999;margin-top: 10rpx;"> <view style="color: #999999;margin-top: 10rpx;font-size: 25rpx;">
入库数量 入库数量
</view> </view>
<view class="" style="margin-top: 5rpx;font-size: 34rpx;"> <view class="" style="margin-top: 5rpx;font-size: 34rpx;">
@ -192,7 +192,7 @@
</view> </view>
</view> </view>
<view class="" style="width: 33%;"> <view class="" style="width: 33%;">
<view style="color: #999999;margin-top: 10rpx;"> <view style="color: #999999;margin-top: 10rpx;font-size: 25rpx;">
挂账数量 挂账数量
</view> </view>
<view class="" style="margin-top: 5rpx;font-size: 34rpx;"> <view class="" style="margin-top: 5rpx;font-size: 34rpx;">
@ -200,7 +200,7 @@
</view> </view>
</view> </view>
<view class="" style="width: 33%;"> <view class="" style="width: 33%;">
<view style="color: #999999;margin-top: 10rpx;"> <view style="color: #999999;margin-top: 10rpx;font-size: 25rpx;">
销账数量 销账数量
</view> </view>
<view class="" style="margin-top: 5rpx;font-size: 34rpx;"> <view class="" style="margin-top: 5rpx;font-size: 34rpx;">
@ -211,7 +211,7 @@
<view style="width: 95%;height: 0.5rpx; background-color: #eff1f3;margin-top: 10rpx;margin-bottom: 5rpx;"> <view style="width: 95%;height: 0.5rpx; background-color: #eff1f3;margin-top: 10rpx;margin-bottom: 5rpx;">
</view> </view>
<view style=""> <view style="">
<view style="font-weight: 600;font-size: 30rpx;"> <view style="font-weight: 600;font-size: 30rpx;margin-top: 10rpx;">
拣货拍照 拣货拍照
</view> </view>
</view> </view>
@ -244,7 +244,7 @@
数量 数量
</view> </view>
</view> </view>
<view style="display: flex;margin-top: 30rpx;margin-left: 20rpx;"> <view style="display: flex;margin-top: 20rpx;">
<view class="gray-button" @click="jjnum(-1)" @longpress="handleTouchStart(-1)" <view class="gray-button" @click="jjnum(-1)" @longpress="handleTouchStart(-1)"
@touchend="handleTouchEnd"> @touchend="handleTouchEnd">
- -
@ -3126,7 +3126,7 @@
background-color: #fff; background-color: #fff;
transition: all 0.3s; transition: all 0.3s;
z-index: 999; z-index: 999;
box-shadow: 0 0 10rpx rgba(0, 0, 0, 0.2); box-shadow: 0 0 10rpx rgba(0, 0, 0, 0.1);
padding: 0 60rpx; padding: 0 60rpx;
} }
@ -3141,7 +3141,7 @@
background-color: #fff; background-color: #fff;
transition: all 0.3s; transition: all 0.3s;
z-index: 999; z-index: 999;
box-shadow: 0 0 10rpx rgba(0, 0, 0, 0.2); box-shadow: 0 0 10rpx rgba(0, 0, 0, 0.1);
padding: 0 60rpx; padding: 0 60rpx;
.jianhuobutton { .jianhuobutton {
@ -3163,7 +3163,7 @@
background-color: #fff; background-color: #fff;
transition: all 0.3s; transition: all 0.3s;
z-index: 999; z-index: 999;
box-shadow: 0 0 10rpx rgba(0, 0, 0, 0.2); box-shadow: 0 0 10rpx rgba(0, 0, 0, 0.1);
padding: 0 90rpx; padding: 0 90rpx;
.photowall-title { .photowall-title {

2
unpackage/dist/dev/.nvue/pages/camera.js vendored
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 { export {
camera as default camera as default
}; };

2
unpackage/dist/dev/.nvue/pages/fullcamera.js vendored
View File

@ -577,7 +577,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 { export {
fullcamera as default fullcamera as default
}; };