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

合并代码

This commit is contained in:
Teng 2026-03-09 17:27:46 +08:00
parent ca60f4fca7
commit b5cec43517
26 changed files with 266 additions and 3828 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
component/public/newgame/joysticknew.vue
View File

@ -67,11 +67,11 @@
}, },
movebottom: { movebottom: {
type: Number, type: Number,
default: 30 default: 80
}, },
moveright: { moveright: {
type: Number, type: Number,
default:60 default:70
}, },
pao:{ pao:{
type: Boolean, type: Boolean,

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

@ -18,8 +18,11 @@
<image class="pao-img" :src="`/static/index/newindex/states/ris.png`" /> <image class="pao-img" :src="`/static/index/newindex/states/ris.png`" />
</view> </view>
<view class="bots" v-if="plsbuy.length>1"> <view class="bots" v-if="plsbuy.length>1">
<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':''"
:style="v?.chaoshitime?'background:red':''" @click="change({'detail':{'current':i}})"></view> @click="change({'detail':{'current':i}})">
<view class="bots-red" v-if="v?.chaoshitime"></view>
</view>
<!-- :style="v?.chaoshitime?'background:red':''" -->
</view> </view>
<swiper class="swiper" :circular="true" :indicator-dots="false" :autoplay="autoplay" :interval="3000" <swiper class="swiper" :circular="true" :indicator-dots="false" :autoplay="autoplay" :interval="3000"
:duration="500" :current="current2" @change="change"> :duration="500" :current="current2" @change="change">
@ -201,7 +204,8 @@
<view class="photowall-other"> <view class="photowall-other">
<view class="bottom-title" v-for="(v,k) in zdxzarr" :key='k' @click="zdwu(v,k)" <view class="bottom-title" v-for="(v,k) in zdxzarr" :key='k' @click="zdwu(v,k)"
:style="v.flag?{borderColor: `rgba(1, 125, 233, 0.3)`}:''"> :style="v.flag?{borderColor: `rgba(1, 125, 233, 0.3)`}:''">
<image style="width: 5.5vw;height: 5.5vw;border-radius: 50%;margin: 0 auto;margin-bottom: 1.5vw;margin-top: 2.2vw;" <image
style="width: 5.5vw;height: 5.5vw;border-radius: 50%;margin: 0 auto;margin-bottom: 1.5vw;margin-top: 2.2vw;"
:src="v.headPath?serverpicUrl+v.headPath:'/static/shouye/xd.png'" /> :src="v.headPath?serverpicUrl+v.headPath:'/static/shouye/xd.png'" />
<view class="name-weight"> <view class="name-weight">
{{v.name }} {{v.name }}
@ -250,8 +254,7 @@
<video style="width: 100%;height: 100%;border-radius: 30rpx;" :id="'myVideo'+index" <video style="width: 100%;height: 100%;border-radius: 30rpx;" :id="'myVideo'+index"
:src="servervideoUrl+item" direction="180" mode="aspectFill"></video> :src="servervideoUrl+item" direction="180" mode="aspectFill"></video>
<view @click.stop="ilanarr.splice(index,1)" <view @click.stop="ilanarr.splice(index,1)"
v-if="topbuttontarget>0&&(listobj?.izStart=='Y'&& listobj?.izFinish=='N')" v-if="topbuttontarget>0&&(listobj?.izStart=='Y'&& listobj?.izFinish=='N')" class="del">
class="del">
<image src="/static/index/warehouse/procurement/x.png" mode="aspectFill" style="width: 1.4vw; <image src="/static/index/warehouse/procurement/x.png" mode="aspectFill" style="width: 1.4vw;
height: 1.4vw;"></image> height: 1.4vw;"></image>
</view> </view>
@ -267,7 +270,7 @@
点击上传{{topbuttontarget==1?'图片':'录像'}} 点击上传{{topbuttontarget==1?'图片':'录像'}}
</view> </view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
@ -592,7 +595,7 @@
} }
const pici = ref(0); const pici = ref(0);
const del = (v, i) => { const del = (v, i) => {
console.log("?????",i) console.log("?????", i)
pici.value = i; pici.value = i;
} }
const del1 = () => { const del1 = () => {
@ -884,7 +887,6 @@
</script> </script>
<style scoped lang="less"> <style scoped lang="less">
.del { .del {
width: 2.5vw; width: 2.5vw;
height: 2.5vw; height: 2.5vw;
@ -907,9 +909,9 @@
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
.uplods-info{ .uplods-info {
width:90%; width: 90%;
height: 85%; height: 85%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
@ -962,6 +964,16 @@
background: #DCDCDC; background: #DCDCDC;
border-radius: 0.2vw; border-radius: 0.2vw;
margin: 0.7vw; margin: 0.7vw;
position: relative;
.bots-red{
position: absolute;
left: 0.2vw;
bottom: -0.4vw;
background-color: red;
width: 0.6vw;
height: 0.6vw;
border-radius: 50%;
}
} }
.dot { .dot {
@ -1077,6 +1089,7 @@
left: 50%; left: 50%;
transform: translate(-50%, 0); transform: translate(-50%, 0);
z-index: -1; z-index: -1;
opacity: 0.3;
} }
.cardbox { .cardbox {
@ -1794,7 +1807,7 @@
border: 2rpx solid #dedede; border: 2rpx solid #dedede;
padding: 1vw; padding: 1vw;
// background-color: #f9f9f9; // background-color: #f9f9f9;
video { video {
width: 100%; width: 100%;
@ -2010,7 +2023,8 @@
.bottom-title { .bottom-title {
border: 2px solid #f8f8f8; border: 2px solid #f8f8f8;
width: 16.5vw; width: 16.5vw;
margin-right: 1.6vw;; margin-right: 1.6vw;
;
margin-bottom: 1.6vw; margin-bottom: 1.6vw;
height: 17vw; height: 17vw;
border-radius: 1.1vw; border-radius: 1.1vw;

1817
pages/NursingNew/component/logistics/index.vue
View File

File diff suppressed because it is too large Load Diff

6
pages/NursingNew/component/logistics/newindex.vue
View File

@ -1698,10 +1698,10 @@
const emotionTagList = ref([]); const emotionTagList = ref([]);
const bodyTagList = ref([]); const bodyTagList = ref([]);
const geteverything = () => { const geteverything = () => {
console.log("为啥",uni.getStorageSync('nuId'))
if (uni.getStorageSync('nuId')) { if (uni.getStorageSync('nuId')) {
getNclist(uni.getStorageSync('nuId')).then((res : any) => { getNclist(uni.getStorageSync('nuId')).then((res : any) => {
// console.log("通了吗",res) console.log("通了吗",res)
timearr.value = Array.from({ length: 24 }, (_, hour) => ({ timearr.value = Array.from({ length: 24 }, (_, hour) => ({
positioning: hour.toString(), positioning: hour.toString(),
children: minuteArr.map(time => ({ children: minuteArr.map(time => ({
@ -2100,6 +2100,7 @@
const lastClick = ref(0) const lastClick = ref(0)
let singleTimer = null let singleTimer = null
const clickaddnew = (item, index) => { const clickaddnew = (item, index) => {
isTuoing.value = false isTuoing.value = false
killbaddata.value = true killbaddata.value = true
thirdmenuIndex.value = index thirdmenuIndex.value = index
@ -2210,6 +2211,7 @@
}) })
} else { } else {
addDirective(postdata).then((res) => { addDirective(postdata).then((res) => {
console.log("wtf",res)
if (res.success) { if (res.success) {
geteverything() geteverything()
setTimeout(() => { setTimeout(() => {

37
pages/NursingNew/component/nurse/bigindex.css
View File

@ -609,22 +609,32 @@
} }
font-size: 33rpx; font-size: 33rpx;
margin-top: 10rpx; margin-top: 5rpx;
display:flex; display:flex;
position: relative; position: relative;
} }
.history-right { .blue-button-left {
border: 2rpx solid #fff;
border-radius: 50%;
width: 2.5vw;
height: 2.5vw;
position: absolute;
left: -0.8vw;
top: 0;
}
width: 7vw; .history-right {
height: 2.8vw; width: 7.7vw;
height: 2.5vw;
background: linear-gradient(to bottom, #009DEF, #0076FF); background: linear-gradient(to bottom, #009DEF, #0076FF);
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
border-radius: 10rpx; border-radius: 30rpx;
color: #fff; color: #fff;
font-size: 30rpx; padding-left: 1.4vw;
font-size: 26rpx;
position: relative; position: relative;
} }
} }
@ -686,7 +696,7 @@
margin-left: 6rpx; margin-left: 6rpx;
margin-top: 15rpx; margin-top: 15rpx;
margin-bottom: 10rpx; margin-bottom: 10rpx;
} }
.history-name { .history-name {
@ -1027,25 +1037,26 @@
background-color: red; background-color: red;
} }
.que-nomessage{ .que-nomessage {
width: 25.2vw; width: 25.2vw;
height: 26vw; height: 26vw;
position: absolute; position: absolute;
top: 58%; top: 55%;
left: 50%; left: 50%;
transform: translate(-50%,-50%); transform: translate(-50%, -50%);
border-radius: 30rpx; border-radius: 30rpx;
border: 1rpx solid #d9d9d9; border: 1rpx solid #d9d9d9;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
image{ image {
width: 10vw; width: 10vw;
height: 10vw; height: 10vw;
} }
view{
view {
width: 100%; width: 100%;
text-align: center; text-align: center;
font-weight: 300; font-weight: 300;

3
pages/NursingNew/component/nurse/bigindex.vue
View File

@ -250,10 +250,11 @@
服务指令 服务指令
</view> </view>
<view class="history-right"> <view class="history-right">
<image class="blue-button-left" src="/static/index/newindex/leftmenu/zzbq.png" mode="aspectFill"></image>
长者标签 长者标签
</view> </view>
</view> </view>
<view class="que-nomessage"> <view class="que-nomessage" v-if="!downmenuarray.length">
<image src="/static/index/procurement/haven.png" mode="aspectFill"></image> <image src="/static/index/procurement/haven.png" mode="aspectFill"></image>
<view>暂无数据</view> <view>暂无数据</view>
</view> </view>

2
pages/NursingNew/component/nurse/component/default.vue
View File

@ -18,7 +18,7 @@
<style scoped lang="less"> <style scoped lang="less">
.que{ .que{
width: 25.2vw; width: 25.2vw;
height: 21vw; height: 22.5vw;
position: absolute; position: absolute;
top: 48%; top: 48%;
left: 50%; left: 50%;

19
pages/NursingNew/component/pleasetake/common/carditem.vue
View File

@ -353,9 +353,9 @@
left: 0; left: 0;
.cardp { .cardp {
position: absolute; // position: absolute;
left: 0; // left: 0;
top: 11vw; // top: 11vw;
width: 15vw; width: 15vw;
display: flex; display: flex;
margin: 0.3vw auto; margin: 0.3vw auto;
@ -382,19 +382,22 @@
} }
.imgs { .imgs {
width: 11vw; width: 12vw;
height: 11vw; height: 12vw;
// background: #fff; // background: #fff;
border-radius: 1.1vw; border-radius: 1.1vw;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
margin: 0.8vw auto 0; margin: 1.2vw auto 0;
padding: 0.3vw; // padding: 0.3vw;
// background-color: red;
>image { >image {
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
} }
} }

6
pages/NursingNew/component/pleasetake/common/submits.vue
View File

@ -263,8 +263,10 @@
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
margin: 0.5vw auto 0; margin: 1.2vw auto 0;
padding: 0.2vw; // padding: 0.2vw;
// background-color: red;
>image { >image {
width: 100%; width: 100%;
height: 100%; height: 100%;

7
pages/NursingNew/component/pleasetake/component/requestform.vue
View File

@ -1128,15 +1128,16 @@
padding: 0.5vw 0; padding: 0.5vw 0;
.bgimg { .bgimg {
width: 8vw; width: 7vw;
height: 8vw; height: 7vw;
margin: 0.3vw auto 0.25vw; margin: 1.5vw auto 0.25vw;
border-radius: 1.1vw; border-radius: 1.1vw;
background: #fff; background: #fff;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
padding: 0.2vw; padding: 0.2vw;
// background-color: red;
>image { >image {
width: 100%; width: 100%;

12
pages/NursingNew/component/pleasetake/component/takehomep.vue
View File

@ -180,11 +180,7 @@
} }
queryGwcInfo(obj).then(res => { queryGwcInfo(obj).then(res => {
addMaterial.value = res.result; addMaterial.value = res.result;
if(!addMaterial.value.length){
isemity.value = true
}else{
isemity.value = false
}
// console.log("看看数组",addMaterial.value) // console.log("看看数组",addMaterial.value)
}) })
} }
@ -197,6 +193,12 @@
item.zk = false; item.zk = false;
item.scrollleft = 0; item.scrollleft = 0;
}) })
// console.log("数据干哪去了啊",res)
if(!res.result.records.length && form.pageNo == 1){
isemity.value = true
}else{
isemity.value = false
}
listarr.value.push(...res.result.records) listarr.value.push(...res.result.records)
status.value = (res.result.total == listarr.value.length ? 'nomore' : 'loadmore') status.value = (res.result.total == listarr.value.length ? 'nomore' : 'loadmore')
}) })

2
pages/NursingNew/component/warehousematrix/api.js
View File

@ -11,7 +11,7 @@ export const getServiceTree = () => {
}) })
} }
// 查询表格 // 查询表格
export const getNclist = (nuId,elderId) => { export const getNclist = (nuId) => {
return request({ return request({
url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/directive/getNclist?nuId=${nuId}&elderId=${``}`, url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/directive/getNclist?nuId=${nuId}&elderId=${``}`,
method: 'get', method: 'get',

1817
pages/NursingNew/component/warehousematrix/index.vue
View File

File diff suppressed because it is too large Load Diff

1
pages/NursingNew/component/warehousematrix/newindex.vue
View File

@ -1531,6 +1531,7 @@
const doaddDirective = (element : any) => { const doaddDirective = (element : any) => {
addDirective(element).then((res) => { addDirective(element).then((res) => {
// console.log("?????0",res)
if (res.success) { if (res.success) {
geteverything() geteverything()
} }

89
pages/Warehouse/finish.vue
View File

@ -651,13 +651,15 @@
<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}}
</view> </view>
<image class="middle-img" <view class="title-flex">
:src="v.materialImg?serverUrl + v.materialImg : '/static/index/warehouse/procurement/k.png'" <image class="middle-img"
mode="aspectFill"></image> :src="v.materialImg?serverUrl + v.materialImg : '/static/index/warehouse/procurement/k.png'"
mode="aspectFill"></image>
<view class="right-title">
{{ v.wlName }}
</view>
</view>
<view class="middle-right"> <view class="middle-right">
<view class="right-title">
{{ v.wlName }}
</view>
<view class="juzhong"> <view class="juzhong">
<view class=""> <view class="">
<text style="color: #888888;"> <text style="color: #888888;">
@ -2332,7 +2334,7 @@
.pls-card-middle { .pls-card-middle {
width: 100%; width: 100%;
height: 11vh; height: 11vh;
margin-top: 2vh; margin-top: 2.5vh;
display: flex; display: flex;
position: relative; position: relative;
@ -2407,6 +2409,7 @@
.pls-card-end { .pls-card-end {
width: 100%; width: 100%;
margin-top: 20rpx;
height: 7.7vh; height: 7.7vh;
display: flex; display: flex;
@ -2579,10 +2582,10 @@
// justify-content: space-around; // justify-content: space-around;
.middle-img { .middle-img {
margin-top: 10rpx; max-width: 130rpx;
width: 150rpx; max-height: 130rpx;
height: 150rpx;
border-radius: 1vw; border-radius: 1vw;
margin-right: 7rpx;
} }
.middle-right { .middle-right {
@ -2591,20 +2594,7 @@
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
.right-title {
width: 85%;
white-space: nowrap;
/* 不换行 */
overflow: hidden;
/* 超出隐藏 */
text-overflow: ellipsis;
/* 显示省略号 */
display: block;
font-weight: 800;
font-size: 30rpx;
margin-bottom: 20rpx;
text-align: center;
}
.right-middle { .right-middle {
// margin-bottom: 7rpx; // margin-bottom: 7rpx;
@ -2673,10 +2663,10 @@
padding-top: 30rpx; padding-top: 30rpx;
.left-img { .left-img {
width: 250rpx; width: 280rpx;
height: 250rpx; height: 280rpx;
margin-left: 50rpx; margin-left: 20rpx;
margin-top: 2vw; margin-top: 0.5vw;
border-radius: 1vw; border-radius: 1vw;
} }
@ -3112,8 +3102,8 @@
.juzhong { .juzhong {
align-items: center; align-items: center;
height: 40rpx; height: 45rpx;
font-size: 25rpx; font-size: 28rpx;
display: flex; display: flex;
width: 335rpx; width: 335rpx;
color: black; color: black;
@ -3123,22 +3113,22 @@
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
width: 210rpx; width: 190rpx;
height: 40rpx; height: 40rpx;
} }
} }
.up-tags { .up-tags {
position: absolute; position: absolute;
right: 15rpx; right: 120rpx;
top: 15rpx; top: 100rpx;
width: 110rpx; width: 120rpx;
height: 50rpx; height: 50rpx;
border-radius: 40rpx; border-radius: 40rpx;
background-color: #fff; background-color: #fff;
color: #555555; color: #555555;
border: 1rpx solid #C3C3C3; border: 1rpx solid #C3C3C3;
font-size: 24rpx; font-size: 27rpx;
z-index: 2; z-index: 2;
display: flex; display: flex;
justify-content: center; justify-content: center;
@ -3147,15 +3137,15 @@
.up-tags-target { .up-tags-target {
position: absolute; position: absolute;
right: 15rpx; right: 120rpx;
top: 15rpx; top: 100rpx;
width: 110rpx; width: 120rpx;
height: 50rpx; height: 50rpx;
border-radius: 40rpx; border-radius: 40rpx;
background-color: #fff; background-color: #fff;
color: #1083F8; color: #1083F8;
border: 1rpx solid #A4D5FE; border: 1rpx solid #A4D5FE;
font-size: 24rpx; font-size: 27rpx;
z-index: 2; z-index: 2;
display: flex; display: flex;
justify-content: center; justify-content: center;
@ -3502,6 +3492,7 @@
width: 88%; width: 88%;
height: 110rpx; height: 110rpx;
display: flex; display: flex;
margin-top: 10rpx;
.right-end { .right-end {
// background-color: red; // background-color: red;
@ -3584,4 +3575,24 @@
border-radius: 30rpx; border-radius: 30rpx;
z-index: 100; z-index: 100;
} }
.title-flex{
display: flex;
justify-content: center;
align-items: center;
padding: 20rpx 0;
padding-top: 30rpx;
}
.right-title {
width: 10vw;
white-space: nowrap;
/* 不换行 */
overflow: hidden;
/* 超出隐藏 */
text-overflow: ellipsis;
/* 显示省略号 */
display: block;
font-weight: 800;
font-size: 30rpx;
margin-bottom: 60rpx;
}
</style> </style>

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

@ -1340,7 +1340,7 @@
width: 14vw; width: 14vw;
height: 2vw; height: 2vw;
display: flex; display: flex;
justify-content: space-around; // justify-content: space-around;
margin-top: 2.5vw; margin-top: 2.5vw;
view { view {

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

@ -65,7 +65,7 @@
</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"
@ -97,7 +97,7 @@
// 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([
@ -217,13 +217,13 @@
}, 100) }, 100)
console.log('医疗矩阵') console.log('医疗矩阵')
break; break;
case 'kzgn_hqjz': // case 'kzgn_hqjz':
swipdex.value = 9; // swipdex.value = 9;
setTimeout(() => { // setTimeout(() => {
menuop.value = 9; // menuop.value = 9;
}, 100) // }, 100)
console.log('后勤矩阵') // console.log('后勤矩阵')
break; // break;
case 'kzgn_kfjz': case 'kzgn_kfjz':
swipdex.value = 10; swipdex.value = 10;
setTimeout(() => { setTimeout(() => {

95
pages/Warehouse/picking.vue
View File

@ -4,7 +4,7 @@
:style="opencgr||opengys||opendata ?{background:`transparent`}:{}" :style="opencgr||opengys||opendata ?{background:`transparent`}:{}"
@click="moreindex=-1; topbuttontarget=-1;openjianhuo=false;opengaijia=false;opendata=false;opencgr=false;opengys=false;albumlist=[]"> @click="moreindex=-1; topbuttontarget=-1;openjianhuo=false;opengaijia=false;opendata=false;opencgr=false;opengys=false;albumlist=[]">
</view> </view>
<view class="mengban" style="background: #fff;width:100vw;right:0;left: 0;top: -5vh;height: 110vh;" <view class="mengban" style="background: #fff;width:100vw;right:0;left: 0vw;top: -5vh;height: 110vh;"
v-if="nomessageshow"> v-if="nomessageshow">
<defaultr cont="暂无数据" style="z-index: 999;"></defaultr> <defaultr cont="暂无数据" style="z-index: 999;"></defaultr>
</view> </view>
@ -689,13 +689,17 @@
<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}}
</view> </view>
<image class="middle-img" <view class="title-flex">
:src="v.materialImg?serverUrl + v.materialImg : '/static/index/warehouse/procurement/k.png'" <image class="middle-img"
mode="aspectFill"></image> :src="v.materialImg?serverUrl + v.materialImg : '/static/index/warehouse/procurement/k.png'"
mode="aspectFill"></image>
<view class="right-title">
{{ v.wlName }}
</view>
</view>
<view class="middle-right"> <view class="middle-right">
<view class="right-title">
{{ v.wlName }}
</view>
<view class="juzhong"> <view class="juzhong">
<view class=""> <view class="">
<text style="color: #888888;"> <text style="color: #888888;">
@ -2513,10 +2517,10 @@
// justify-content: space-around; // justify-content: space-around;
.middle-img { .middle-img {
margin-top: 10rpx; max-width: 130rpx;
width: 150rpx; max-height: 130rpx;
height: 150rpx;
border-radius: 1vw; border-radius: 1vw;
margin-right: 7rpx;
} }
.middle-right { .middle-right {
@ -2525,20 +2529,7 @@
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
.right-title {
width: 85%;
white-space: nowrap;
/* 不换行 */
overflow: hidden;
/* 超出隐藏 */
text-overflow: ellipsis;
/* 显示省略号 */
display: block;
font-weight: 800;
font-size: 30rpx;
margin-bottom: 20rpx;
text-align: center;
}
.right-middle { .right-middle {
// margin-bottom: 7rpx; // margin-bottom: 7rpx;
@ -2548,7 +2539,20 @@
} }
} }
} }
.right-title {
width: 10vw;
white-space: nowrap;
/* 不换行 */
overflow: hidden;
/* 超出隐藏 */
text-overflow: ellipsis;
/* 显示省略号 */
display: block;
font-weight: 800;
font-size: 30rpx;
margin-bottom: 60rpx;
// text-align: center;
}
.wuliao-title { .wuliao-title {
margin-top: 18rpx; margin-top: 18rpx;
margin-left: 30rpx; margin-left: 30rpx;
@ -2596,12 +2600,11 @@
padding-top: 30rpx; padding-top: 30rpx;
.left-img { .left-img {
width: 250rpx; width: 280rpx;
height: 250rpx; height: 280rpx;
margin-left: 50rpx; margin-left: 20rpx;
margin-top: 2vw; margin-top: 0.5vw;
border-radius: 1vw; border-radius: 1vw;
// margin-right: 50rpx;
} }
.left-tags { .left-tags {
@ -2897,8 +2900,8 @@
.juzhong { .juzhong {
align-items: center; align-items: center;
height: 40rpx; height: 45rpx;
font-size: 25rpx; font-size: 28rpx;
display: flex; display: flex;
width: 335rpx; width: 335rpx;
color: black; color: black;
@ -2908,22 +2911,22 @@
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
width: 210rpx; width: 190rpx;
height: 40rpx; height: 40rpx;
} }
} }
.up-tags { .up-tags {
position: absolute; position: absolute;
right: 15rpx; right: 120rpx;
top: 15rpx; top: 100rpx;
width: 110rpx; width: 120rpx;
height: 50rpx; height: 50rpx;
border-radius: 40rpx; border-radius: 40rpx;
background-color: #fff; background-color: #fff;
color: #555555; color: #555555;
border: 1rpx solid #C3C3C3; border: 1rpx solid #C3C3C3;
font-size: 24rpx; font-size: 27rpx;
z-index: 2; z-index: 2;
display: flex; display: flex;
justify-content: center; justify-content: center;
@ -2932,15 +2935,15 @@
.up-tags-target { .up-tags-target {
position: absolute; position: absolute;
right: 15rpx; right: 120rpx;
top: 15rpx; top: 100rpx;
width: 110rpx; width: 120rpx;
height: 50rpx; height: 50rpx;
border-radius: 40rpx; border-radius: 40rpx;
background-color: #fff; background-color: #fff;
color: #1083F8; color: #1083F8;
border: 1rpx solid #A4D5FE; border: 1rpx solid #A4D5FE;
font-size: 24rpx; font-size: 27rpx;
z-index: 2; z-index: 2;
display: flex; display: flex;
justify-content: center; justify-content: center;
@ -3349,7 +3352,8 @@
width: 88%; width: 88%;
height: 110rpx; height: 110rpx;
display: flex; display: flex;
margin-top: 10rpx;
.right-end { .right-end {
// background-color: red; // background-color: red;
width: 33%; width: 33%;
@ -3417,4 +3421,11 @@
border-radius: 30rpx; border-radius: 30rpx;
z-index: 100; z-index: 100;
} }
.title-flex{
display: flex;
justify-content: center;
align-items: center;
padding: 20rpx 0;
padding-top: 30rpx;
}
</style> </style>

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

@ -190,6 +190,7 @@
// console.log("啥啊",i) // console.log("啥啊",i)
v.zk = !v.zk; v.zk = !v.zk;
havezk.value = v.zk havezk.value = v.zk
// console.log("头疼啊",havezk.value)
if (v.zk) { if (v.zk) {
if (props.pddType == '1') { uni.setStorageSync('valitem', v); } if (props.pddType == '1') { uni.setStorageSync('valitem', v); }
setTimeout(() => { setTimeout(() => {
@ -343,7 +344,7 @@
return y <= (h * 1 / 2); return y <= (h * 1 / 2);
} }
const isbottom = ref(false); const isbottom = ref(false);
const clicklock = ref(false) // const clicklock = ref(false)
/** 事件处理示例 */ /** 事件处理示例 */
function onTap(e) { function onTap(e) {
const top = isTopHalfApp(e); const top = isTopHalfApp(e);
@ -352,19 +353,24 @@
return; return;
} }
if (havezk.value) { if (havezk.value) {
// console.log("top", top, clicklock.value)
if (!clicklock.value) { // if (!clicklock.value) {
if (!top) { // if (!top) {
isbottom.value = true // isbottom.value = true
// console.log("开启了") // // console.log("开启了")
} else { // } else {
isbottom.value = false // isbottom.value = false
} // }
clicklock.value = true // clicklock.value = true
// }
if (!top) {
isbottom.value = true
// console.log("开启了")
} else {
isbottom.value = false
} }
} else { } else {
clicklock.value = false // clicklock.value = false
} }
// uni.showToast({ title: top ? '上半部分' : '下半部分', icon: 'none' }); // uni.showToast({ title: top ? '上半部分' : '下半部分', icon: 'none' });
@ -780,7 +786,7 @@
height: 100%; height: 100%;
overflow: hidden; overflow: hidden;
position: absolute; position: absolute;
left: 18vw; left: 15.5vw;
top: 0.5vw; top: 0.5vw;
.wltwo { .wltwo {
@ -863,7 +869,7 @@
display: flex; display: flex;
flex-direction: column; flex-direction: column;
position: absolute; position: absolute;
left: 2vw; left: 0.5vw;
top: 1.5vw; top: 1.5vw;
.cardp { .cardp {
@ -902,22 +908,25 @@
} }
.imgs { .imgs {
width: 13vw; width: 10vw;
height: 9vw; height: 10vw;
// background: #F8F8F8; // background: #F8F8F8;
border-radius: 1.1vw; border-radius: 1.1vw;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
margin-top: 1.2vw; // margin-top: 1.2vw;
// background-color: blue;
margin-left: 2.5vw;
margin-top: 0.5vw;
// margin: 0.8vw auto 0; // margin: 0.8vw auto 0;
// padding: 0.5vw; // padding: 0.5vw;
>image { >image {
width: 9vw; width: 100%;
height: 9vw; height: 100%;
margin-left: 1vw; // margin-left: 1vw;
border-radius: 0.4vw; // border-radius: 0.4vw;
} }
} }

2
pages/procurement/components/Inventory.vue
View File

@ -27,7 +27,7 @@
<text style="white-space: nowrap;display: block;"> 规格型号: {{v.specificationModel}}</text> <text style="white-space: nowrap;display: block;"> 规格型号: {{v.specificationModel}}</text>
</view> </view>
<view> <view>
<text v-if="v.multiUnitType=='1'">采购单价: <text v-if="v.multiUnitType=='1'">采购单价:111111111111111
￥{{v.oneUnitPrice?Number(v.oneUnitPrice).toFixed(2):""}} </text> ￥{{v.oneUnitPrice?Number(v.oneUnitPrice).toFixed(2):""}} </text>
<text v-if="v.multiUnitType=='1'">采购单位: {{ v.oneUnit}}</text> <text v-if="v.multiUnitType=='1'">采购单位: {{ v.oneUnit}}</text>
<text v-if="v.multiUnitType=='2'">采购单价: <text v-if="v.multiUnitType=='2'">采购单价:

4
pages/procurement/components/carditem.vue
View File

@ -467,12 +467,14 @@
.imghs { .imghs {
width: 12vw; width: 12vw;
height: 12vw; height: 12vw;
margin: 0.8vw auto 0.25vw; margin: 0vw auto 0.25vw;
padding: 0.2vw; padding: 0.2vw;
padding-top: 0;
background: #fff; background: #fff;
border-radius: 1.1vw; border-radius: 1.1vw;
>image { >image {
margin-top: -0.6vw;
width: 100%; width: 100%;
height: 100%; height: 100%;
border-radius: 1.1vw; border-radius: 1.1vw;

3
pages/procurement/material.vue
View File

@ -920,9 +920,10 @@
image { image {
width: 7vw; width: 7vw;
height: 7vw; height: 7vw;
margin: 0.5vw auto 0.5vw; margin: 1vw auto 0.3vw;
display: block; display: block;
border-radius: 0.7vw; border-radius: 0.7vw;
// background-color: red;
} }
>view { >view {

9
pages/procurement/outbound.vue
View File

@ -197,7 +197,7 @@
<view class="right-one" v-for="(item,index) in rightarray" :key="index"> <view class="right-one" v-for="(item,index) in rightarray" :key="index">
<view class="right-one-left"> <view class="right-one-left">
<view class="bgimg"> <view class="bgimg">
<image class="left-image" <image
:src="item.materialInfo?.materialImg?serverUrl+item.materialInfo?.materialImg:'/static/index/procurement/k.png'" :src="item.materialInfo?.materialImg?serverUrl+item.materialInfo?.materialImg:'/static/index/procurement/k.png'"
mode="aspectFill"></image> mode="aspectFill"></image>
</view> </view>
@ -1243,11 +1243,10 @@
padding: 0.5vw 0; padding: 0.5vw 0;
.bgimg { .bgimg {
width: 8vw; width: 7vw;
height: 8vw; height: 7vw;
margin: 0.3vw auto 0.25vw; margin: 1.3vw auto 0.25vw;
border-radius: 1.1vw; border-radius: 1.1vw;
background: #fff;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;

12
pages/procurement/purchaseorder.vue
View File

@ -1123,8 +1123,9 @@
.middle-img { .middle-img {
width: 150rpx; width: 150rpx;
height: 150rpx; height: 150rpx;
margin: 0.3vw 0 0 0.15vw; margin: 0vw 0 0 0.15vw;
border-radius: 1vw; border-radius: 1vw;
// background-color: red;
} }
.middle-right { .middle-right {
@ -1196,11 +1197,12 @@
padding-top: 30rpx; padding-top: 30rpx;
.left-img { .left-img {
width: 250rpx; width: 280rpx;
height: 250rpx; height: 280rpx;
margin-left: 50rpx; margin-left: 20rpx;
margin-top: 2vw; margin-top: 0.5vw;
border-radius: 1vw; border-radius: 1vw;
// background-color: blue;
} }
.left-tags { .left-tags {

36
pages/watch/full.vue
View File

@ -349,7 +349,7 @@
} }
break break
case 8: case 8:
jumpopen.value = true jumpopen.value = !jumpopen.value
break break
case 9: case 9:
@ -546,7 +546,7 @@
height: 100%; height: 100%;
width: 100%; width: 100%;
position: relative; position: relative;
padding: 60rpx; padding: 50rpx;
.scroll-vi { .scroll-vi {
height: 100rpx; height: 100rpx;
@ -584,7 +584,7 @@
} }
.big-bgc { .big-bgc {
margin-left: -15rpx; // margin-left: -15rpx;
margin-top: 20rpx; margin-top: 20rpx;
width: 1600rpx; width: 1600rpx;
height: 1000rpx; height: 1000rpx;
@ -616,20 +616,20 @@
.right-right { .right-right {
position: absolute; position: absolute;
right: -20rpx; right: -90rpx;
top: 60rpx; top: 27rpx;
height: calc(100% - 250rpx); height: calc(100% - 250rpx);
width: 570rpx; width: 570rpx;
} }
.bottom-view { .bottom-view {
margin-left: 90rpx; // margin-left: 90rpx;
margin-top: 20rpx; margin-top: 20rpx;
width: 440rpx; width: 440rpx;
height: 800rpx; height: 800rpx;
border-radius: 50rpx; border-radius: 50rpx;
background-color: rgba(226, 227, 231, 0.5); // background-color: rgba(226, 227, 231, 0.5);
position: relative; position: relative;
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
@ -640,7 +640,7 @@
.button-father { .button-father {
margin-top: 20rpx; margin-top: 20rpx;
margin-bottom: 0; margin-bottom: 0;
margin-left: 28rpx; margin-left: 30rpx;
text-align: center; text-align: center;
.bottom-button { .bottom-button {
@ -648,8 +648,8 @@
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
width: 110rpx; width: 115rpx;
height: 110rpx; height: 115rpx;
border: 1rpx solid #CDD3DD; border: 1rpx solid #CDD3DD;
border-radius: 35rpx; border-radius: 35rpx;
margin-bottom: 5rpx; margin-bottom: 5rpx;
@ -679,34 +679,34 @@
.picture { .picture {
display: flex; display: flex;
margin-top: 40rpx; margin-top: 25rpx;
.picture-card { .picture-card {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
margin-left: 20rpx; margin-right: 25rpx;
margin-right: 10rpx; // margin-right: 10rpx;
width: 200rpx; width: 200rpx;
// background-color: red;
.bgc-card { .bgc-card {
width: 100%; width: 100%;
height: 130rpx; height: 150rpx;
background-color: rgba(226, 227, 231, 0.5); background-color: rgba(226, 227, 231, 0.5);
border-radius: 30rpx; border-radius: 30rpx;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
margin-bottom: 10rpx; margin-bottom: 20rpx;
} }
} }
} }
.jump-white { .jump-white {
position: absolute; position: absolute;
bottom: 20rpx; bottom: 35rpx;
left: 50rpx; left: 30rpx;
width: 300rpx; width: 300rpx;
height: 400rpx; height: 400rpx;
background-color: #fff; background-color: #fff;

BIN
static/index/procurement/k.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 28 KiB