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

合并

This commit is contained in:
Teng 2025-11-27 13:48:25 +08:00
parent af5f44c6bb 227d43dd12
commit 32d96cdd3b
9 changed files with 119 additions and 240 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pages/Warehouse/picking.vue
View File

@ -329,7 +329,6 @@
<view class="photowall-title"> <view class="photowall-title">
<view class="photowall-name"> <view class="photowall-name">
{{ !topbuttontarget?`拣货照片`:`随行单` }} {{ !topbuttontarget?`拣货照片`:`随行单` }}
</view> </view>
<view class=""> <view class="">
<text class="photowall-left"> <text class="photowall-left">
@ -374,7 +373,7 @@
</view> </view>
</scroll-view> </scroll-view>
<scroll-view scroll-y="true" class="photowall-other" scroll-with-animation v-if="topbuttontarget==1"> <scroll-view scroll-y="true" class="photowall-other" scroll-with-animation v-if="topbuttontarget==1" style="margin-top:0 !important;">
<view class="photowall-other-one" v-for="(item,index) in suixingdanarr" :key="index" <view class="photowall-other-one" v-for="(item,index) in suixingdanarr" :key="index"
@click="previewImage(item,index,suixingdanarr,1)"> @click="previewImage(item,index,suixingdanarr,1)">
<image style="width: 100%;height: 70%;border-radius: 30rpx;" <image style="width: 100%;height: 70%;border-radius: 30rpx;"
@ -3203,7 +3202,6 @@
border-radius: 30rpx; border-radius: 30rpx;
display: inline-block; display: inline-block;
position: relative; position: relative;
// background-color: red;
} }
} }
} }
@ -3404,7 +3402,7 @@
.title-input-button:active, .title-input-button:active,
.donghua-do:active, .donghua-do:active,
.contain-right-button:active, .contain-right-button:active,
.jianhuobutton-gray:active, .jianhuobutton-gray:active
{ {
color: #1083F8; color: #1083F8;
background: linear-gradient(-45deg, rgba(223, 244, 252, 1), rgba(204, 228, 249, 0.43)); background: linear-gradient(-45deg, rgba(223, 244, 252, 1), rgba(204, 228, 249, 0.43));

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

@ -215,7 +215,7 @@
} }
&:nth-child(1) { &:nth-child(1) {
background: #C2C4C9; background: #dcdee1;
color: #555555; color: #555555;
} }
} }

133
pages/procurement/components/calculator.vue
View File

@ -6,10 +6,15 @@
<view> <view>
{{gysarr[gysidnum]?.name}} {{gysarr[gysidnum]?.name}}
</view> </view>
<text @click.stop="gysflag = !gysflag">调整</text> <text @click.stop="gysflag = !gysflag">
<image class="guodu"
:style="gysflag?'transform: rotate(180deg);':''"
:src=" '/static/index/procurement/sj.png' "
mode="aspectFill"></image>
</text>
</view> </view>
<view class="tanchu" v-if="gysflag"> <view class="tanchu guodu" :class="gysflag?'':'hei0'">
<scroll-view scroll-y="true" class="gysscrol"> <scroll-view scroll-y="true" class="gysscrol" v-if="gysflag">
<view v-for="(v,i) in gysarr" :key='i' :class="gysidnum==i?'acts':''" @click="gysid(i)"> <view v-for="(v,i) in gysarr" :key='i' :class="gysidnum==i?'acts':''" @click="gysid(i)">
<text>{{v.name}}</text> <text>{{v.name}}</text>
<image src="/static/index/procurement/d.png" mode="aspectFill"></image> <image src="/static/index/procurement/d.png" mode="aspectFill"></image>
@ -43,13 +48,18 @@
</view> </view>
</view> </view>
<view class="cgdw"> <view class="cgdw">
<view class="leftr"> <view class="leftr" @click.stop="cgdwflag = !cgdwflag,cgdwec = false">
<view>采购单位</view> <view>{{type.unit}}</view>
<text>{{type.unit}}</text> <text>
<image class="guodu"
:style="!cgdwflag?'transform: rotate(180deg);':''"
:src=" '/static/index/procurement/sj.png' "
mode="aspectFill"></image>
</text>
</view> </view>
<view class="tz" @click="cgdwflag=!cgdwflag">调整</view> <!-- <view class="tz" @click="cgdwflag=!cgdwflag">调整</view> -->
<view class="dwdw" v-if="cgdwflag"> <view class="dwdw guodu" :class="cgdwflag?'':'hei0'">
<view class="gysscrol"> <view class="gysscrol guodu" v-if="cgdwec" :class="cgdwflag?'':'hei0'" >
<view v-for="(v,i) in cgdwarr" :key='i' :class="type.multiUnitType==v.multiUnitType?'acts':''" <view v-for="(v,i) in cgdwarr" :key='i' :class="type.multiUnitType==v.multiUnitType?'acts':''"
@click="cd(v,i)" :style="v.unit&&v.num?'':'height:0 !important;margin-top:-0.5vw'"> @click="cd(v,i)" :style="v.unit&&v.num?'':'height:0 !important;margin-top:-0.5vw'">
<text v-if="v.unit&&v.num">{{v.unit}}</text><text v-if="v.unit&&v.num">{{v.num}}{{caigouobj.materialUnits}}</text> <text v-if="v.unit&&v.num">{{v.unit}}</text><text v-if="v.unit&&v.num">{{v.num}}{{caigouobj.materialUnits}}</text>
@ -66,7 +76,7 @@
确定 确定
</view> </view>
</view> </view>
<view class="mengban" v-if="cgdwflag||gysflag" @click="gysflag = false;cgdwflag = false"></view> <view class="mengban" v-if="cgdwflag||gysflag" @click="gysflag = false;cgdwflag = false;cgdwec = false;"></view>
</view> </view>
</template> </template>
@ -122,6 +132,15 @@
// } // }
// } // }
// ) // )
const cgdwec = ref(false)
watch(()=>cgdwflag.value,
()=>{
if(cgdwflag.value==true){
setTimeout(()=>{
cgdwec.value = true
},200)
}
})
watch( watch(
()=>props.show, ()=>props.show,
()=>{ ()=>{
@ -180,6 +199,7 @@
}else{ }else{
gysflag.value = false; gysflag.value = false;
cgdwflag.value = false; cgdwflag.value = false;
cgdwec.value = false;
type.value = {}; type.value = {};
sx.value = false; sx.value = false;
gysidnum.value = 0; gysidnum.value = 0;
@ -208,6 +228,7 @@
const cd =(v,i)=>{ const cd =(v,i)=>{
type.value = v; type.value = v;
cgdwflag.value = false; cgdwflag.value = false;
cgdwec.value = false;
jssl() jssl()
} }
const gysid = (e:number)=>{ const gysid = (e:number)=>{
@ -310,28 +331,49 @@
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.hei0 {
height: 0 !important;
view{
height: 0 !important;
}
}
.cgdw{ .cgdw{
width: 90%; width: 24.3vw;
height: 3.5vw;
display: flex; display: flex;
height: 3.3vw;
justify-content: space-between; justify-content: space-between;
margin: 1.5vw auto 0.8vw; align-items: center;
margin :0.8vw auto 0;
background: #F8F8FA;
border-radius: 1.65vw;
padding: 0 1vw;
position: relative; position: relative;
text{
width: 3.3vw;
height: 3.3vw;
display: flex;
justify-content: center;
align-items: center;
image {
width: 1.6vw;
height: 1.6vw;
}
}
.dwdw{ .dwdw{
width: 15vw; width: 24.3vw;
height: 11vw; height: 14vw;
background: #FFFFFF; background: #FFFFFF;
box-shadow: 0rpx 0rpx 0.5vw 0rpx rgba(174,175,176,0.35); box-shadow: 0rpx 0rpx 0.5vw 0rpx rgba(174,175,176,0.35);
border-radius: 1.1vw; border-radius: 1.1vw;
padding: 0 1vw; padding: 0 1vw;
position: absolute; position: absolute;
left:7vw; left:0vw;
top: -16vw; bottom: 3.5vw;
z-index: 211; z-index: 211;
.gysscrol{ .gysscrol{
width: 100%; width: 100%;
height: 10vw; height: 10vw;
.acts{ >.acts{
color: #0385FA !important; color: #0385FA !important;
image{ image{
display: block; display: block;
@ -347,13 +389,18 @@
margin-bottom: 1.2vw; margin-bottom: 1.2vw;
padding-right: 1.5vw; padding-right: 1.5vw;
position: relative; position: relative;
white-space: nowrap;
text{
white-space: nowrap;
padding-right: 1vw;
}
&:nth-child(1){ &:nth-child(1){
margin-top: 1vw; margin-top: 1vw;
} }
image{ >image{
position: absolute; position: absolute;
right: 0.2vw; right: 0.2vw;
top: 25%; top: 33%;
width: 1vw !important; width: 1vw !important;
height: 0.7vw !important; height: 0.7vw !important;
display: none; display: none;
@ -377,9 +424,10 @@
color: #555555; color: #555555;
} }
.leftr{ .leftr{
width: 21vw; width: 100%;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between;
white-space: nowrap; white-space: nowrap;
view{ view{
width: 8.6vw; width: 8.6vw;
@ -400,19 +448,19 @@
position: relative; position: relative;
margin-top: 0.5vw; margin-top: 0.5vw;
>.tanchu{ >.tanchu{
width: 25vw; width: 24.5vw;
height: 15vw; height: 25.8vw;
background: #FFFFFF; background: #FFFFFF;
box-shadow: 0rpx 0rpx 0.5vw 0rpx rgba(174,175,176,0.35); box-shadow: 0rpx 0rpx 0.5vw 0rpx rgba(174,175,176,0.35);
border-radius: 1.1vw; border-radius: 1.1vw;
padding: 0 1.4vw; padding: 0 1.4vw;
position: absolute; position: absolute;
right: 7.2vw; right: 1vw;
top: 7vw; top: 7vw;
z-index: 211; z-index: 211;
.gysscrol{ .gysscrol{
width: 100%; width: 100%;
height: 15vw; height: 25vw;
.acts{ .acts{
color: #0385FA !important; color: #0385FA !important;
image{ image{
@ -445,23 +493,25 @@
} }
.gssel{ .gssel{
width: 100%; width: 24.3vw;
display: flex; display: flex;
height: 3.3vw;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
margin-top:0.8vw; margin :0.8vw auto 0;
background: #F8F8FA;
border-radius: 1.65vw;
padding: 0 1vw;
text{ text{
width: 7.1vw; width: 3.3vw;
height: 3.3vw; height: 3.3vw;
border-radius: 1.65vw;
font-weight: 400;
font-size: 1.5vw;
color: #555;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
border: 1px solid #D9DADC; image {
box-shadow: 0.05vw 0.5vw 0.5vw #dadee1; width: 1.6vw;
height: 1.6vw;
}
} }
view{ view{
width: 22vw; width: 22vw;
@ -477,15 +527,17 @@
} }
.tlt{ .tlt{
font-weight: bold; font-weight: bold;
font-size: 1.8vw; font-size: 1.5vw;
color: #333333; color: #333333;
padding-left: 3vw;
font-weight: 400;
} }
} }
.plsbuy-contain { .plsbuy-contain {
display: flex; display: flex;
align-items: center; align-items: center;
flex-direction: column; flex-direction: column;
width: 36vw; width: 32vw;
height: 95vh; height: 95vh;
background: rgba(250, 251, 252, 1); background: rgba(250, 251, 252, 1);
overflow: hidden; overflow: hidden;
@ -495,7 +547,7 @@
left: 32vw; left: 32vw;
position: fixed; position: fixed;
z-index: 200; z-index: 200;
padding:1.5vw 2.8vw; padding:1.5vw 1vw;
} }
@ -619,6 +671,11 @@
top: 0; top: 0;
left: 0; left: 0;
z-index:210; z-index:210;
background: RGBA(239, 240, 244, 0.55); background: RGBA(239, 240, 244, 0);
}
.guodu {
transition: .4s;
-webkit-transform-style: preserve-3d;
-webkit-overflow-scrolling: touch;
} }
</style> </style>

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

@ -222,7 +222,7 @@
} }
&:nth-child(1) { &:nth-child(1) {
background: #C2C4C9; background: #dcdee1;
color: #555555; color: #555555;
} }
} }
@ -299,6 +299,7 @@
&:nth-child(3) { &:nth-child(3) {
width: 30%; width: 30%;
text-align: right;
align-items: right; align-items: right;
} }

5
pages/procurement/components/carlist.vue
View File

@ -269,7 +269,7 @@
} }
} }
&:nth-child(1) { &:nth-child(1) {
background: #C2C4C9; background: #dcdee1;
color: #555555; color: #555555;
} }
} }
@ -319,7 +319,7 @@
display: inline-block; display: inline-block;
>view { >view {
margin-top: 0.8vw; margin-top: 0.65vw;
&:nth-child(5) { &:nth-child(5) {
width: 28vw; width: 28vw;
@ -328,6 +328,7 @@
justify-content: space-between; justify-content: space-between;
position: relative; position: relative;
left: 0; left: 0;
top: 0.3vw;
>view { >view {
width: 25%; width: 25%;
height: 100%; height: 100%;

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

@ -216,7 +216,7 @@
} }
&:nth-child(1) { &:nth-child(1) {
background: #C2C4C9; background:#dcdee1;
color: #555555; color: #555555;
} }
} }

183
pages/procurement/components/equiment.vue
View File

@ -1,183 +0,0 @@
<template>
<view>
<view class="zhezhao" v-show="open" @click="emit('back')">
<view class="neuro-box" @click.stop v-if="open">
<view class="button-father">
<view :class="buttonposition?`buttontarget button`:`button-white` " @click="emit('back')">
取消</view>
<view :class="!buttonposition?`buttontarget button`:`button-white` " @click="config()">确定</view>
</view>
<view class="card-font">
{{content}}
</view>
</view>
</view>
</view>
</template>
<script lang="ts" setup>
import { ref, onMounted, onBeforeUnmount, computed, nextTick, defineProps, watch, onUnmounted ,defineEmits } from 'vue';
const emit = defineEmits(["back", "del"])
const props = defineProps({
open: {
type: Boolean,
required: true,
},
content: {
type: String
},
});
const buttonposition = ref(false)
const config = ()=>{
emit('del')
}
</script>
<style scoped lang="less">
.card-font {
margin-top: 70rpx;
width: 600rpx;
justify-content: center;
display: flex;
}
.button-white {
width: 40%;
border: 2rpx solid #c3cacd;
background: linear-gradient(to bottom, #f3f3f5, #dee4e9);
display: flex;
justify-content: center;
align-items: center;
font-size: 25rpx;
border-radius: 30rpx;
}
.button {
width: 40%;
background-color: #ddf0ff;
display: flex;
justify-content: center;
align-items: center;
color: #007CFF;
border: 1rpx solid #007CFF;
font-size: 25rpx;
border-radius: 30rpx;
}
.button-father {
position: absolute;
bottom: 60rpx;
left: 50%;
transform: translateX(-50%);
width: 100%;
height: 60rpx;
display: flex;
justify-content: space-around;
padding: 0 50rpx;
}
.neuro-box {
position: absolute;
left: 0;
top: 0;
bottom: 0;
right: 0;
margin: auto;
width: 400rpx;
height: 270rpx;
border-radius: 30rpx;
background-color: #fff;
display: flex;
flex-direction: column;
align-items: center;
z-index: 21;
padding: 0 10%;
z-index: 999;
}
.zhezhao {
position: fixed;
top: 0;
left: 0;
width: 100vw;
height: 100vh;
z-index: 125;
}
.zerotarget {
--color: #99C9FD;
--thick: 2px;
--radius: 50rpx;
--outline-offset: 0rpx;
/* 外扩多少 */
/* 内层虚线（你现在用的） */
border-radius: var(--radius);
background-color: white;
/* 内部背景 */
animation: scalePulse 360ms cubic-bezier(.2, .8, .2, 1);
/* 外层虚线：放在 outline（不会影响元素尺寸） */
outline: var(--thick) dashed var(--color);
outline-offset: var(--outline-offset);
/* 保证文本 / 子元素在最上层 */
position: relative;
z-index: 0;
}
.firsttarget {
--color: #99C9FD;
--thick: 2px;
--radius: 50%;
--outline-offset: 0rpx;
/* 外扩多少 */
/* 内层虚线（你现在用的） */
border-radius: var(--radius);
background-color: white;
/* 内部背景 */
animation: scalePulse 360ms cubic-bezier(.2, .8, .2, 1);
/* 外层虚线：放在 outline（不会影响元素尺寸） */
outline: var(--thick) dashed var(--color);
outline-offset: var(--outline-offset);
/* 保证文本 / 子元素在最上层 */
position: relative;
z-index: 0;
}
.buttontarget {
--color: #99C9FD;
--thick: 2px;
--radius: 30rpx;
--outline-offset: 0rpx;
/* 外扩多少 */
/* 内层虚线（你现在用的） */
border-radius: var(--radius);
background-color: white;
/* 内部背景 */
animation: scalePulse 360ms cubic-bezier(.2, .8, .2, 1);
/* 外层虚线：放在 outline（不会影响元素尺寸） */
outline: var(--thick) dashed var(--color);
outline-offset: var(--outline-offset);
/* 保证文本 / 子元素在最上层 */
position: relative;
z-index: 0;
}
@keyframes scalePulse {
0% {
transform: scale(1);
}
25% {
/* 先收缩一点点 */
transform: scale(0.94);
}
65% {
/* 再放大到略超出的感觉 */
transform: scale(1.08);
}
100% {
transform: scale(1);
}
}
</style>

3
pages/procurement/components/purorder.vue
View File

@ -459,7 +459,7 @@
align-items: center; align-items: center;
view { view {
width: 5.5vw; min-width: 5.5vw;
height: 1.8vw; height: 1.8vw;
border-radius: 0.9vw; border-radius: 0.9vw;
border: 1px solid #D2D2D2; border: 1px solid #D2D2D2;
@ -470,6 +470,7 @@
font-weight: 400; font-weight: 400;
font-size: 1vw; font-size: 1vw;
color: #555555; color: #555555;
padding:0 0.5vw;
} }
} }

22
pages/procurement/material.vue
View File

@ -27,7 +27,7 @@
<view class="kjlt" @click="tx=!tx"> <view class="kjlt" @click="tx=!tx">
库存预警 库存预警
</view> </view>
<scroll-view scroll-x="true" class="kcscrol guodu" :style="tx?(qb?'width:46.4vw':'width:54.4vw') : (qb?'width:91vw':'width:91vw') " <scroll-view scroll-x="true" class="kcscrol guodu" :style="tx?(qb?'width:46.4vw':'width:54.4vw') : (qb?'width:78.4vw':'width:86.4vw') "
scroll-with-animation :scroll-top="scrolltop" @scrolltolower="scrolltolower(1)"> scroll-with-animation :scroll-top="scrolltop" @scrolltolower="scrolltolower(1)">
<view class="yjbox" v-for="(v,i) in Material" :key="i" @click="clickaddcar(v,i)"> <view class="yjbox" v-for="(v,i) in Material" :key="i" @click="clickaddcar(v,i)">
<image :src="v.materialImg?serverUrl+v.materialImg:'/static/index/procurement/k.png'" mode="aspectFill"></image> <image :src="v.materialImg?serverUrl+v.materialImg:'/static/index/procurement/k.png'" mode="aspectFill"></image>
@ -44,7 +44,7 @@
<view class="guodu" :class="qb?(moredex==2?'avt':''):'righ0'" @click="moredex=2">添加全部</view> <view class="guodu" :class="qb?(moredex==2?'avt':''):'righ0'" @click="moredex=2">添加全部</view>
</view> </view>
<view class="kaprght"> <view class="kaprght guodu">
<view class="ksfw guodu" :style="tx?'':'right: -38vw !important;'"> <view class="ksfw guodu" :style="tx?'':'right: -38vw !important;'">
<view class="lcar"> <view class="lcar">
<image :src="'/static/index/procurement/k.png'" mode="aspectFill"></image> <image :src="'/static/index/procurement/k.png'" mode="aspectFill"></image>
@ -440,12 +440,14 @@
height: 10vw; height: 10vw;
display: flex; display: flex;
margin-top: 1vw; margin-top: 1vw;
position: relative;
.kaprght { .kaprght {
width: 32vw; width: 32vw;
height: 10vw; height: 10vw;
margin-left: 0.6vw; margin-left: 0.6vw;
position: relative; position: absolute;
right: 0;
bottom: 0;
.ksfw { .ksfw {
width: 100%; width: 100%;
@ -500,7 +502,6 @@
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
line-height: 1.9vw;
>image { >image {
position: absolute; position: absolute;
@ -551,10 +552,9 @@
.zhxng { .zhxng {
width: 100%; width: 100%;
height: 2.8vw; height: 2.8vw;
margin-top: 0.4vw; margin-top: 1vw;
display: flex; display: flex;
padding: 1.1vw 0 1.1vw 0; padding: 1.1vw 0 1.1vw 0;
border-bottom: 2px solid #E5E5E5;
view { view {
display: flex; display: flex;
@ -583,7 +583,7 @@
font-weight: bold; font-weight: bold;
font-size: 1.5vw; font-size: 1.5vw;
color: #555555; color: #555555;
margin: 1vw auto 0; margin: 2vw auto 0;
} }
.tm { .tm {
@ -592,7 +592,7 @@
font-size: 2.2vw; font-size: 2.2vw;
font-weight: bolder; font-weight: bolder;
color: #555555; color: #555555;
margin-top: 2vw; margin-top:0.5vw;
} }
} }
@ -610,6 +610,8 @@
justify-content: center; justify-content: center;
letter-spacing: 3px; letter-spacing: 3px;
font-size: 1.4vw; font-size: 1.4vw;
position: relative;
z-index: 100;
} }
.more { .more {
@ -673,6 +675,8 @@
height: 10vw; height: 10vw;
white-space: nowrap; white-space: nowrap;
margin-left: 0.6vw; margin-left: 0.6vw;
position: relative;
z-index: 99;
.yjbox { .yjbox {
display: inline-block; display: inline-block;