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:
Teng 2025-11-24 14:09:33 +08:00
parent 4a44c13bef 4d54274ee3
commit f0261ea170
7 changed files with 29 additions and 216 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

184
pages/Warehouse/components/equiment.vue
View File

@ -1,184 +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;
border: 1px solid #999;
}
.zhezhao {
position: fixed;
top: 0;
left: 0;
width: 100vw;
height: 100vh;
z-index: 1125;
}
.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>

20
pages/Warehouse/picking.vue
View File

@ -1065,25 +1065,6 @@
</view>
</view>
<!-- <view :class="['neuro-wrapper', donghuacs ? 'is-active' : '']" v-show="badshow">
<view class="neuro-mask" @click="badshow=false;"></view>
<view class="neuro-box" @click.stop>
<view class="button-father">
<view class="button-white" @click="badshow=false;">取消</view>
<view class="button" @click="zuofei">确定</view>
</view>
<view class="title">作废</view>
<view class="card-font">
确定要作废这个采购单吗
</view>
</view>
</view> -->
<!-- <view class="mengban" v-if="open==1"> </view>
<equiment :open="open==1" @del="del()" @back="open = 0" :content="'是否删除此图片？'"></equiment>
<equiment :open="open==2" @del="sctp(1)" @back="open = 0" :content="'是否销账此物料？'"></equiment> -->
<tanchuang :show="badshow" font="确定要作废这个采购单吗" @back="badshow=false;" @right="zuofei"> </tanchuang>
<tanchuang :show="open==1" font="是否删除此图片" @back="open = 0" @right="del()"> </tanchuang>
<tanchuang :show="open==2" font="是否销账此物料？" @back="open = 0" @right="sctp(1)"> </tanchuang>
@ -1096,7 +1077,6 @@
import { onShow, onLoad, onHide, onPageScroll } from "@dcloudio/uni-app"
import calendar from '@/component/public/calendar.vue'
import superpicker from '@/component/public/superpicker.vue'
import equiment from './components/equiment.vue';
import nomessageimge from '@/pages/procurement/components/nomessage.vue';
import tanchuang from '@/pages/procurement/components/tanchuang.vue';

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

@ -426,7 +426,7 @@
align-items: center;
view {
width: 5.5vw;
min-width: 5.5vw;
height: 1.8vw;
border-radius: 0.9vw;
border: 1px solid #D2D2D2;
@ -437,6 +437,7 @@
font-weight: 400;
font-size: 1vw;
color: #555555;
padding: 0 0.5vw;
}
}
@ -444,6 +445,7 @@
width: 9vw;
height: 8vw;
margin: 1vw auto 0;
border-radius: 1.1vw;
}
}
}

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

@ -56,7 +56,7 @@
</view>
<view class="btnbotm">
<view class="bt" @click="typescroll(1,-1,{});qingkong()">重置</view>
<view class="bt" @click="typescroll(1,-1,{});qingkong();config()">重置</view>
<view class="bt qd" @click="config">确定 <text v-if="num>0">（{{num>99?'99+':num}}件物料）</text></view>
</view>
</view>
@ -213,13 +213,14 @@
const qingkong = () => {
if (gysidnum.value > -1) {
gysidnum.value = -1;
getTreelnum()
getTreelnum();
}
}
defineExpose({
typescroll,
config,
qingkong
qingkong,
getTreelnum
})
</script>

7
pages/procurement/material.vue
View File

@ -169,7 +169,11 @@
serverUrl.value = uni.getStorageSync('serverUrl') + '/sys/common/static/';
})
onShow(()=>{
config()
shoppcar();
getWaringMaterial();
nextTick(()=>{
chongzhi()
})
})
const Material = ref([])
const getWaringMaterial=()=>{
@ -193,7 +197,6 @@
shoppcar();
queryInvo();
getWaringMaterial()
shoppcar();
}
const carnum = ref(0)

16
pages/procurement/materialcar.vue
View File

@ -38,8 +38,8 @@
</view>
<carlist :InvoicingList="InvoicingList" :status="status" @delindex="opendelindex" @addcartory="addcartory"></carlist>
<equiment :open="open==1" @del="del()" @back="open = 0" :content="'是否清空购物车？'"></equiment>
<equiment :open="open==2" @del="delindex()" @back="open = 0" :content="'是否删除此物料？'"></equiment>
<tanchuang :show="open==1" font="是否清空购物车？" @back="open = 0" @right="del()"> </tanchuang>
<tanchuang :show="open==2" font="是否删除此物料？" @back="open = 0" @right="delindex()"> </tanchuang>
<!-- 筛选 -->
<view class="mengban" v-if="ification" @click="ification = false"></view>
@ -58,7 +58,7 @@
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 carlist from './components/carlist.vue';
import equiment from './components/equiment.vue';
import tanchuang from './components/tanchuang.vue';
import classification from './components/classification.vue'
import defaultr from './components/default.vue'
import calculator from './components/calculator.vue'
@ -80,7 +80,10 @@
const InvoicingList = ref([])
const status = ref('loading')
const open = ref(0)
onLoad(()=>{
onShow(()=>{
nextTick(()=>{
chongzhi();
})
queryInvo()
})
const classication = ref<InstanceType<typeof ChildComponent>>()
@ -103,7 +106,6 @@
item.zk = false;
item.scrollleft = 0;
})
console.log(res.result.records)
InvoicingList.value.push(...res.result.records);
status.value = res.result.total == InvoicingList.value.length ? 'nomore' : 'loadmore';
setout.value = (res.result.total == InvoicingList.value.length ? false : true)
@ -154,7 +156,7 @@
if(res.success){
form.pageNo=1;
InvoicingList.value = [];
queryInvo()
chongzhi()
}
open.value = 0;
// uni.showToast({
@ -180,6 +182,8 @@
if(res.success){
InvoicingList.value.splice(delobj.value.index,1);
open.value = 0;
status.value = InvoicingList.value.length == 0 ? 'nomore' : 'loadmore';
classication.value.getTreelnum()
}
},800)

7
pages/procurement/purchaseorder.vue
View File

@ -450,12 +450,14 @@
const middletarget = ref(0);
const plzinfo = reactive({
nuId: uni.getStorageSync('nuId'),
pageNo: 1,
pageSize: 10,
canpull: true,
cgdParamInfo: ""
})
const mobanplzinfo = {
nuId: uni.getStorageSync('nuId'),
pageNo: 1,
pageSize: 10,
canpull: true,
@ -490,6 +492,7 @@
form.suppliers = e.suppliers;
form.cgdId = e.cgdId;
form.pageNo = 1;
middletarget.value = 0;
InvoicingList.value = [];
queryInvo();
ification.value = false
@ -518,6 +521,9 @@
}
const lefttarget = ref(0);
const clickLeftMenu = (index : any, item : object) => {
if(lefttarget.value!=index){
middletarget.value = 0;
}
let num = Math.ceil((index + 1))
leftscrolltop.value = (num - 2) * 186;
lefttarget.value = index;
@ -1071,6 +1077,7 @@
height: 270rpx;
margin-left: 2vw;
margin-top: 5vw;
border-radius: 1vw;
}
.left-tags {