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-28 10:21:19 +08:00
parent da97cbc5c9 91a3c89185
commit 35d378bdee
5 changed files with 73 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
<template> <template>
<view class="plsbuy-contain" v-if="show"> <view class="plsbuy-contain guodu" :class="show?'':'unclass'" :style="showbox?'z-index:220':'z-index:-2'">
<view class="gys"> <view class="gys">
<view class="tlt">供应商</view> <view class="tlt">供应商</view>
<view class="gssel" @click="gysflag = true"> <view class="gssel" @click="gysflag = true">
@ -133,6 +133,7 @@
// } // }
// ) // )
const cgdwec = ref(false) const cgdwec = ref(false)
const showbox = ref(false)
watch(()=>cgdwflag.value, watch(()=>cgdwflag.value,
()=>{ ()=>{
if(cgdwflag.value==true){ if(cgdwflag.value==true){
@ -196,6 +197,9 @@
}else{ }else{
jssl() jssl()
} }
setTimeout(()=>{
showbox.value = true;
},50)
}else{ }else{
gysflag.value = false; gysflag.value = false;
cgdwflag.value = false; cgdwflag.value = false;
@ -204,6 +208,9 @@
sx.value = false; sx.value = false;
gysidnum.value = 0; gysidnum.value = 0;
isZero.value = false; isZero.value = false;
setTimeout(() => {
showbox.value = false;
}, 400)
} }
}) })
const jssl=()=>{ const jssl=()=>{
@ -337,6 +344,9 @@
height: 0 !important; height: 0 !important;
} }
} }
.unclass {
opacity: 0 !important;
}
.cgdw{ .cgdw{
width: 24.3vw; width: 24.3vw;
display: flex; display: flex;
@ -344,7 +354,7 @@
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
margin :0.8vw auto 0; margin :0.8vw auto 0;
background: #F8F8FA; background: #F3F5F9;
border-radius: 1.65vw; border-radius: 1.65vw;
padding: 0 1vw; padding: 0 1vw;
position: relative; position: relative;
@ -429,6 +439,7 @@
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
white-space: nowrap; white-space: nowrap;
height: 3.3vw;
view{ view{
width: 8.6vw; width: 8.6vw;
font-weight: 400; font-weight: 400;
@ -455,8 +466,8 @@
border-radius: 1.1vw; border-radius: 1.1vw;
padding: 0 1.4vw; padding: 0 1.4vw;
position: absolute; position: absolute;
right: 1vw; left: 3vw;
top: 7vw; top: 6.5vw;
z-index: 211; z-index: 211;
.gysscrol{ .gysscrol{
width: 100%; width: 100%;
@ -499,7 +510,7 @@
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
margin :0.8vw auto 0; margin :0.8vw auto 0;
background: #F8F8FA; background: #F3F5F9;
border-radius: 1.65vw; border-radius: 1.65vw;
padding: 0 1vw; padding: 0 1vw;
text{ text{
@ -546,7 +557,6 @@
top: 2.5vw; top: 2.5vw;
left: 32vw; left: 32vw;
position: fixed; position: fixed;
z-index: 200;
padding:1.5vw 1vw; padding:1.5vw 1vw;
} }
@ -581,7 +591,7 @@
} }
.calculator-father { .calculator-father {
width: 24vw; width: 25vw;
height: 45vh; height: 45vh;
margin :0 auto 0; margin :0 auto 0;
flex-wrap: wrap; flex-wrap: wrap;
@ -614,6 +624,7 @@
margin-top:0.5vw; margin-top:0.5vw;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center;
.jj{ .jj{
width: 5vw; width: 5vw;
height: 5vw; height: 5vw;
@ -640,7 +651,7 @@
.stringShow-kuai { .stringShow-kuai {
display: flex; display: flex;
align-items: center; align-items: center;
width: 18.5vw; width: 11.5vw;
height: 5vw; height: 5vw;
background: #F3F5F9; background: #F3F5F9;
border-radius: 1vw; border-radius: 1vw;
@ -653,7 +664,7 @@
align-items: center; align-items: center;
font-size: 42rpx; font-size: 42rpx;
font-weight: 500; font-weight: 500;
width:3.5vw; width:2.5vw;
height: 5vw; height: 5vw;
} }
} }

48
pages/procurement/components/classification.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<view> <view>
<view class="ifclass guodu" :class="show?'':'unclass'"> <view class="ifclass guodu" :class="show?'':'unclass'" :style="showbox?'z-index:220':'z-index:-2'">
<view class="gyss"> <view class="gyss">
<view class="lef">供 应 商</view> <view class="lef">供 应 商</view>
<view class="set" @click="selt = !selt"> <view class="set" @click="selt = !selt">
@ -74,6 +74,8 @@
const serverUrl = ref(''); const serverUrl = ref('');
const selt = ref(false); const selt = ref(false);
const showbox = ref(false);
const emit = defineEmits(['confirm']) const emit = defineEmits(['confirm'])
const typescroll = (e : number, i : number, v : object) => { const typescroll = (e : number, i : number, v : object) => {
if (e == 1) { if (e == 1) {
@ -200,7 +202,14 @@
() => props.show, () => props.show,
() => { () => {
if (props.show == false) { if (props.show == false) {
selt.value = false selt.value = false;
setTimeout(()=>{
showbox.value = false;
},400)
}else{
setTimeout(() => {
showbox.value = true;
}, 50)
} }
}) })
const xiala = ()=>{ const xiala = ()=>{
@ -231,8 +240,8 @@
position: fixed; position: fixed;
top: 0; top: 0;
left: 0; left: 0;
z-index:125; z-index:221;
background: RGBA(239, 240, 244, 0.55); background: RGBA(239, 240, 244, 0);
} }
.gyss { .gyss {
width: 100%; width: 100%;
@ -247,8 +256,8 @@
} }
.xuze { .xuze {
width: 23vw; width: 32vw;
height: calc(85vh - 22vw); height: calc(85vh - 20vw);
background: #fff; background: #fff;
border-radius: 1.6vw; border-radius: 1.6vw;
box-shadow: 0rpx 0rpx 1.3vw 0rpx rgba(163, 167, 182, 0.16); box-shadow: 0rpx 0rpx 1.3vw 0rpx rgba(163, 167, 182, 0.16);
@ -259,7 +268,7 @@
.gysscrol { .gysscrol {
width: 100%; width: 100%;
height: calc(85vh - 24vw); height: calc(85vh - 20vw);
.acts { .acts {
color: #0385FA !important; color: #0385FA !important;
@ -336,7 +345,7 @@
} }
.unclass { .unclass {
top: -86vh !important; opacity: 0 !important;
} }
.ifclass { .ifclass {
@ -349,7 +358,7 @@
border-radius: 1.6vw; border-radius: 1.6vw;
top: 10vh; top: 10vh;
left: 32vw; left: 32vw;
padding: 2.5vw 3vw; padding: 2.5vw 2.5vw;
.btnbotm { .btnbotm {
width: 100%; width: 100%;
@ -394,29 +403,26 @@
justify-content: space-around; justify-content: space-around;
.scrl1 { .scrl1 {
width: 9vw; width: 10vw;
view {
width: 8.8vw;
}
} }
.scrl2, .scrl2,
.scrl3 { .scrl3 {
width: 8vw; width: 10vw;
display: flex;
justify-content: flex-end;
view { view {
width: 7.7vw; width: 8vw;
margin-left: 1vw;
} }
} }
.scroll-Y { .scroll-Y {
width: 8.5vw; width: 10vw;
height: calc(85vh - 23vw); height: calc(85vh - 23vw);
view { view {
width: 100%; min-width: 8.5vw;
max-width: 10vw;
height: 3.8vw; height: 3.8vw;
background: #F5F5F8; background: #F5F5F8;
border-radius: 1.9vw; border-radius: 1.9vw;

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

@ -244,7 +244,7 @@
timerflag.value = false; timerflag.value = false;
generatedPurchaseOrder(generatedOrder.value).then(res => { generatedPurchaseOrder(generatedOrder.value).then(res => {
uni.showToast({ uni.showToast({
icon: res.success ? 'success' : 'error', icon: res.success ? 'success' : 'none',
title: res.message title: res.message
}) })
setTimeout(() => { setTimeout(() => {
@ -253,7 +253,6 @@
timerflag.value = true; timerflag.value = true;
} }
}, 700) }, 700)
}) })
} }
</script> </script>

7
pages/procurement/material.vue
View File

@ -650,9 +650,8 @@
margin-top: 10px; margin-top: 10px;
} }
} }
&:nth-child(2) { &:nth-child(2) {
right: 4.5vw; right: 4.2vw;
z-index: 3; z-index: 3;
} }
@ -754,7 +753,7 @@
input { input {
width: 25vw; width: 25vw;
height: 3.3vw; height: 3.3vw;
font-size: 1.5vw; font-size: 1.4vw;
padding-left: 1.6vw; padding-left: 1.6vw;
} }
@ -797,7 +796,7 @@
align-items: center; align-items: center;
width: 7.3vw; width: 7.3vw;
height: 3.3vw; height: 3.3vw;
margin: 0 0 0 1.2vw; margin: 0 0 0 0.7vw;
background: rgba(255, 255, 255, 0.6); background: rgba(255, 255, 255, 0.6);
border: 1px solid #D9DADC; border: 1px solid #D9DADC;
color: #555555; color: #555555;

29
pages/procurement/materialcar.vue
View File

@ -50,14 +50,14 @@
<view class="mengban" v-if="addflag" @click="addflag = false"></view> <view class="mengban" v-if="addflag" @click="addflag = false"></view>
<calculator :show="addflag" :caigouobj="caigouobj" @colse="addflag = false" @right="right"></calculator> <calculator :show="addflag" :caigouobj="caigouobj" @colse="addflag = false" @right="right"></calculator>
<view class="mengban" v-if="caigouflag" @click="caigouflag = false"></view> <view class="mengban" v-if="caigouflag" @click="caigouflag = false"></view>
<purorder :arrlist="caigouarr" :show="caigouflag" @cloe="caigouflag = false" @config="configr"></purorder> <purorder :arrlist="generatedOrder" :show="caigouflag" @cloe="caigouflag = false" @config="configr"></purorder>
</view> </view>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { ref, onMounted, reactive, onBeforeUnmount, computed, nextTick, defineProps ,defineComponent} from 'vue'; import { ref, onMounted, reactive, onBeforeUnmount, computed, nextTick, defineProps ,defineComponent} from 'vue';
import { onShow, onLoad, onHide, onPageScroll } from "@dcloudio/uni-app" import { onShow, onLoad, onHide, onPageScroll } from "@dcloudio/uni-app"
import {eddShoppingCartList, queryShoppingCartList, getGwcMaterialTreeData, queryNuInfoByNuId, updateKfstatus,deleteQgInfoById,emptiedQgInfo ,queryWlInfoByWlId,generatedPurchaseOrder,generatedPurchaseViewOrder } from './api/lunpan.js' import {generatedPurchaseViewOrder,eddShoppingCartList, queryShoppingCartList, getGwcMaterialTreeData, queryNuInfoByNuId, updateKfstatus,deleteQgInfoById,emptiedQgInfo ,queryWlInfoByWlId,generatedPurchaseOrder } from './api/lunpan.js'
import carlist from './components/carlist.vue'; import carlist from './components/carlist.vue';
import tanchuang from './components/tanchuang.vue'; import tanchuang from './components/tanchuang.vue';
import classification from './components/classification.vue' import classification from './components/classification.vue'
@ -82,6 +82,7 @@
const status = ref('loading') const status = ref('loading')
const open = ref(0) const open = ref(0)
onShow(()=>{ onShow(()=>{
InvoicingList.value = [];
queryInvo() queryInvo()
}) })
const classication = ref<InstanceType<typeof ChildComponent>>() const classication = ref<InstanceType<typeof ChildComponent>>()
@ -227,8 +228,11 @@
} }
const caigouflag = ref(false) const caigouflag = ref(false)
const caigouarr = ref([]) const caigouarr = ref([])
const generatedOrder = ref([])
const caigouclk =()=>{ const caigouclk =()=>{
uni.showLoading()
let arr = []; let arr = [];
caigouarr.value = [];
InvoicingList.value.forEach(item=>{ InvoicingList.value.forEach(item=>{
if(item.flag){ if(item.flag){
arr.push(item) arr.push(item)
@ -243,7 +247,18 @@
}) })
return return
} }
caigouflag.value = true; generatedPurchaseViewOrder(caigouarr.value).then(res=>{
if(res.success){
generatedOrder.value = res.result;
caigouflag.value = true;
uni.hideLoading();
}else{
uni.showToast({
title:res.message,
icon:'none'
})
}
})
} }
</script> </script>
@ -281,7 +296,7 @@
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
margin-left:0.6vw; margin-left:0.7vw;
color: #555555; color: #555555;
border: 1px solid #D9DADC; border: 1px solid #D9DADC;
image { image {
@ -308,7 +323,7 @@
input { input {
width: 25vw; width: 25vw;
height: 3.3vw; height: 3.3vw;
font-size: 1.5vw; font-size: 1.4vw;
padding-left: 1.6vw; padding-left: 1.6vw;
} }
@ -348,7 +363,7 @@
align-items: center; align-items: center;
width: 7.3vw; width: 7.3vw;
height: 3.3vw; height: 3.3vw;
margin: 0 0 0 1.2vw; margin: 0 0 0 0.7vw;
background: rgba(255, 255, 255, 1); background: rgba(255, 255, 255, 1);
border: 1px solid #D9DADC; border: 1px solid #D9DADC;
color: #555555; color: #555555;
@ -371,7 +386,7 @@
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
margin: 0 0 0 1.2vw; margin: 0 0 0 0.7vw;
color: #555555; color: #555555;
image { image {