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

合并

This commit is contained in:
Teng 2025-12-08 15:32:29 +08:00
parent c3fb9b1956
commit 4c53353584
8 changed files with 1441 additions and 622 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pages/NursingNew/component/pleasetake/component/returnorder.vue
View File

@ -21,7 +21,7 @@
<view class="button-tilte">
回退单
</view>
<view class="right-button-father">
<view class="right-button-father" v-if="rightarray.length || !rightdonghua">
<view class="right-button" @click="badshow=true">
<image src="/static/index/warehouse/procurement/picking/bebad.png" />
<view>
@ -220,10 +220,11 @@
</view>
</view>
</view>
<defaultr cont="暂无数据" v-if="rightarray.length==0 && rightdonghua"
style="width: 30%;height: 30%;position: absolute;">
</defaultr>
</scroll-view>
<defaultr cont="暂无数据" v-if="rightarray.length==0 && rightdonghua"
style="width: 30%;height: 30%;position: absolute;">
</defaultr>
</view>
</view>
</template>

1969
pages/Warehouse/finish.vue
View File

File diff suppressed because it is too large Load Diff

45
pages/Warehouse/picking.vue
View File

@ -1,7 +1,7 @@
<template>
<view class="contain">
<view
v-show="moreindex!=-1 || topbuttontarget!=-1 || openjianhuo || opengaijia || opendata || opencgr || opengys"
v-show="moreindex!=-1 || topbuttontarget!=-1 || openjianhuo || opengaijia || opendata"
class="mengban" :style="opencgr||opengys||opendata ?{background:`transparent`}:{}"
@click="moreindex=-1; topbuttontarget=-1;openjianhuo=false;opengaijia=false;opendata=false;opencgr=false;opengys=false;albumlist=[]">
</view>
@ -255,7 +255,6 @@
<view class="gray-input" style="width:12vw;">
<text v-for="(v,i) in stringjh" :key="i">{{v}}</text>
</view>
<!-- <text></text>{{showvalue.num}} -->
<view class="gray-button" @click="jjnum(1)" @longpress="handleTouchStart(1)" @touchend="handleTouchEnd">
+
</view>
@ -414,8 +413,6 @@
</scroll-view>
</view>
<view class="contain-left">
<view v-show="openselect" class="mengban" style="background: transparent;" @click="openselect=false"></view>
<view class="left-select-more" v-show="openselect">
@ -428,7 +425,6 @@
<text style="font-size: 25rpx;margin-top: 5rpx;" v-if="alltotal>=99">
(99+采购单)
</text>
</view>
</view>
<view class="more-title">
@ -449,7 +445,6 @@
</view>
</view>
<view class="more-time">
采购日期
</view>
@ -591,8 +586,6 @@
</view>
<view class="middle-heng-father">
<!-- <view class="middle-ball" :style="{backgroundColor: `#1083F8`}"></view> -->
<view class="middle-ball" :style="{backgroundColor: `#E5E5E5`}"
v-if="Number(v.status)!=2"></view>
<image class="middle-ball-img" v-else src="/static/index/requestform/isok.png" />
@ -628,7 +621,6 @@
<view class="left-top-tags">
<view class="wuliao-title">
物料信息
<!-- <view class="wuliao-heng"></view> -->
</view>
</view>
<view :class=" `contain-right-button`" @click="donghuastart(0)" style="width: 10vw;">
@ -670,7 +662,6 @@
<image class="middle-img"
:src="v.materialImg?serverUrl + v.materialImg : '/static/index/warehouse/procurement/k.png'"
mode="aspectFill"></image>
<!-- <image class="middle-img" :src=" '/static/zhiniaoku.png'" mode="aspectFill"></image> -->
<view class="middle-right">
<view class="right-title">
{{ v.wlName }}
@ -802,15 +793,6 @@
<view class="title-left">
{{showvalue.wlName}}
</view>
<!-- <view class="title-right">
<text
style="position: absolute;top: 8rpx;left: -35rpx;font-weight: 300;font-size: 28rpx;">
￥
</text>
<view style="color: #555555;">
{{Number(showvalue.totalPrice).toFixed(2) }}
</view>
</view> -->
</view>
<view class="bottom-right-middle">
<view class="middle-onecard">
@ -860,7 +842,6 @@
</view>
<view class="gray-heng"></view>
</view>
<!-- <view class="gray-heng"></view> -->
<view class="middle-onecard">
<view class="threeone">
<view class="gray-text">
@ -888,7 +869,6 @@
</view>
<view class="gray-heng"></view>
</view>
<!-- <view class="gray-heng"></view> -->
<view class="middle-onecard">
<view class="threeone">
<view class="gray-text">
@ -987,16 +967,6 @@
</view>
</view>
</view>
<!-- <view
style="width: 100%;display: flex;justify-content: center;color: #C3C3C3;margin-top: 20rpx;"
v-if="lhjlarr.length">
<image v-if="statustory=='loading'"
style="width: 25rpx;height: 25rpx;margin-right: 10rpx;margin-top: 5rpx;margin-left: -10rpx;"
src="/static/index/warehouse/procurement/picking/loading.png" />
<text v-if="statustory=='loading'">上划加载更多</text>
<text v-if="statustory=='nomore'">已加载全部~</text>
<text v-if="statustory=='loadmore'">加载中~</text>
</view> -->
</scroll-view>
<view style="width: 100%;display: flex;justify-content: center;color: #C3C3C3;margin-top: 40rpx;"
@ -1179,6 +1149,7 @@
const filteredCgrList = ref([]);
const closefilteredCgrList = () => {
console.log("?????????")
filteredCgrList.value = [];
cgrvalue.value = plzinfo.cgBy;
}
@ -1497,7 +1468,7 @@
middletarget.value = index;
showvalue.value = InvoicingList.value[index];
showvalue.value.jianhuobtn = false;
Invoiscroll.value = (index - 2) * 205;
Invoiscroll.value = (index - 2) * 172;
if (Number(showvalue.value.status) == 0 || (Number(showvalue.value.status) > 0 && Number(showvalue.value.wrksl) > 0)) {
showvalue.value.maxnum = (showvalue.value.rksl == 0 && showvalue.value.wrksl == 0 && showvalue.value.xzsl == 0) ? showvalue.value.purchaseQuantity : showvalue.value.wrksl
showvalue.value.num = showvalue.value.maxnum;
@ -2524,21 +2495,19 @@
margin-top: 20rpx;
.middle-Y {
width: 100%;
width: 97%;
height: 100%;
margin-left: 3%;
.middle-Y-father {
display: flex;
// flex-wrap: wrap;
// width: 100%;
padding-left: 20rpx;
.middle-one {
min-width: 325rpx;
height: 450rpx;
background-color: #F9F9F9;
border-radius: 30rpx;
margin-left: 20rpx;
margin-right: 20rpx;
margin-bottom: 30rpx;
display: flex;
flex-direction: column;

2
pages/login/login.vue
View File

@ -191,7 +191,7 @@
return typeof str === 'string' && str.length === 11;
}
const jumpTo = (url : string) => {
uni.redirectTo({
uni.navigateTo({
url: url
});
}

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

@ -156,7 +156,7 @@
()=>props.show,
()=>{
if(props.show){
console.log(props.caigouobj)
// console.log(props.caigouobj)
let a = [
{
multiUnitType:1,
@ -172,16 +172,17 @@
},
{
multiUnitType:3,
price:props.caigouobj.referenceUnitPrice,
price:props.caigouobj.unitPrice,
unit:props.caigouobj.materialUnits,
num:1
}
];
if(props.caigouobj.wlUnits){
type.value = a.find(item=>
item.unit == props.caigouobj.wlUnits
);
console.log(props.caigouobj.wlUnits,type.value)
// console.log(props.caigouobj.wlUnits,type.value)
}else{
type.value = a.find(item=>
item.multiUnitType == props.caigouobj.multiUnitType
@ -190,13 +191,15 @@
cgdwarr.value = []
downslength.value = 0;
// console.log("a",a)
a.forEach((element:any)=>{
if(element.unit&&element.num){
cgdwarr.value.push(element)
// console.log("!!!!",element)
}
})
console.log("a",a)
// console.log("a",a)
let n = [];
let id = [];
gysarr.value = [];
@ -252,7 +255,10 @@
console.log(sx.value,num,bl)
}
const cd =(v,i)=>{
// return
type.value = v;
// console.log("cd",type.value,cgdwarr.value)
cgdwflag.value = false;
cgdwec.value = false;
jssl()
@ -334,6 +340,7 @@
return
}
emit('right', relNumber.value,gysarr.value[gysidnum.value],type.value)
}
const colse = ()=>{

4
pages/procurement/material.vue
View File

@ -379,6 +379,7 @@
return
}
timers.value = false;
let dt = {
nuId: form.nuId,
purchaseQuantity: num,
@ -390,7 +391,10 @@
referenceUnitPrice: type.price,
dhbl: type.num
}
console.log("注意",dt)
addShoppingCartList([dt]).then(res => {
uni.showToast({
icon: res.success ? 'success' : 'none',
title: res.message

13
pages/procurement/materialcar.vue
View File

@ -105,7 +105,7 @@
item.zk = false;
item.scrollleft = 0;
})
console.log(res.result.records)
// console.log(`最上层`,res.result.records)
InvoicingList.value.push(...res.result.records);
status.value = res.result.total == InvoicingList.value.length ? 'nomore' : 'loadmore';
})
@ -118,8 +118,9 @@
}
const addcartory =(e:any)=>{
console.log(e)
console.log(`eeeeeeeeeee`,e)
caigouobj.value = e;
addflag.value = true;
}
const confirm =(e:any)=>{
@ -187,7 +188,10 @@
})
}
const right = (n:number,nm:any,type:Object) => {
connfig(nm,n,type)
setTimeout(()=>{
connfig(nm,n,type)
},30)
}
const timers = ref(true)
const connfig = (nm:any,num:Number,type:Object) =>{
@ -206,7 +210,8 @@
dhbl:type.num
}
console.log(dt)
console.log(`111111111111111111111111111111`,dt)
eddShoppingCartList(dt).then(res=>{
uni.showToast({
icon:res.success?'success':'none',

6
pages/watch/index.vue
View File

@ -232,7 +232,7 @@
<script setup lang="ts">
import { ref, onMounted, onBeforeUnmount, computed, reactive } from 'vue';
import { onShow, onLoad, onHide } from "@dcloudio/uni-app"
import { onShow, onLoad, onHide,onBackPress } from "@dcloudio/uni-app"
import { movedirection, queryPadPageList } from './api/lunpan.js'
import joysticknew from '@/component/public/newgame/joysticknew.vue';
@ -240,6 +240,10 @@
onLoad(() => {
cameraArray.value = cameraSmall;
})
// 我这么写是为了防止安卓组件被销毁
onBackPress(() => {
return true; // 禁止返回
})
const zyupgrade = ref(null);
const menuIndex = ref(-1);
const typeNow = ref(-1);