diff --git a/pages/procurement/addtory.vue b/pages/procurement/addtory.vue index b9ea2fe..ea8acf7 100644 --- a/pages/procurement/addtory.vue +++ b/pages/procurement/addtory.vue @@ -6,28 +6,28 @@ 盘点单 - 101P20251012001 - 梁嘉豪 | 2025.10.12 + {{pddobj.pddNo}} + {{pddobj.pddStartBy}} | {{pddobj.pddStartTime.substring(0,10)}} - 生活用品库 + {{pddobj.nuName}} + v-for="(item,index) in ['全部','盘盈','盘亏','已盘点','未盘点']" @click="changetype(index)"> {{ item }} - 盘点中 - 已完成 + {{pddobj.pddType_dictText}} + - + 取消盘点 @@ -39,10 +39,11 @@ diff --git a/pages/procurement/api/lunpan.js b/pages/procurement/api/lunpan.js index f4406a4..b20931b 100644 --- a/pages/procurement/api/lunpan.js +++ b/pages/procurement/api/lunpan.js @@ -378,4 +378,11 @@ export const addPddMain = (params) => { method: 'post', data: params, }) -} \ No newline at end of file +} +export const queryPddInfoList = (params) => { + return request({ + url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/pdd/queryPddInfoList`, + method: 'get', + data: params, + }) +} diff --git a/pages/procurement/common/toryitem.vue b/pages/procurement/common/toryitem.vue index 1c299d1..572adae 100644 --- a/pages/procurement/common/toryitem.vue +++ b/pages/procurement/common/toryitem.vue @@ -2,63 +2,65 @@ - + + - - {{v.categoryId_dictText}} - {{v.typeId_dictText}} - {{v.medicationId_dictText}} - 123123123 - 1232131212321312 - 213213213 + {{v.categoryName}} + {{v.typeName}} + {{v.medicationName}} - 纸尿裤-拉拉裤纸尿裤-拉拉裤 + {{v?.materialName}} 物料编码: - 040601022 + {{v?.materialNo}} 物料单位: - 片 + {{v?.materialUnits}} - + 规格型号: - 800mm*680mm + {{v?.specificationModel}} - 20 + {{v?.dqkcsl}} 库存数量 - 15 + {{v?.pdsl?v?.pdsl:'--'}} 盘点数量 - -5 + + {{v?.pdType==2?'-':''}}{{v?.cesl!=null?v?.cesl:'--'}} 差额 - + + + + - + 备注 - 5 + 1 @@ -101,7 +103,7 @@ 取消 - 确定 + 确定 @@ -110,6 +112,9 @@ + + + @@ -120,14 +125,38 @@ import { onShow, onLoad, onHide, onPageScroll } from "@dcloudio/uni-app" import { queryQld } from '../api/lunpan.js' import torytor from './torytor.vue' + import defaultr from '../components/default.vue' const open = ref(0) const scrolltop = ref(0) const list = ref([]); - + const serverUrl = ref(uni.getStorageSync('serverUrl') + '/sys/common/static/') + const props = defineProps({ + pddlist: { + type: Array + }, + status: { + type: String + } + }) + const listflag = ref(false) onMounted(() => { - for (let i = 0; i < 20; i++) { - list.value.push({ zk: false, yczk: false, bz: false, model: '', pz: false }) - } + nextTick(()=>{ + props.pddlist.forEach(item=>{ + item.zk = false; + item.yczk=false; + item.bz=false; + item.model=''; + item.pz=false; + item.ce = ''; + }) + }) + + setTimeout(()=>{ + listflag.value = true; + },1000) + // for (let i = 0; i < 20; i++) { + // list.value.push({ zk: false, yczk: false, bz: false, model: '', pz: false }) + // } }) const zhankai = (v, i) => { let s = Math.ceil((i + 1) / 3); @@ -150,7 +179,7 @@ gb(i) } const gb = (i) => { - list.value.forEach((item, k) => { + props.pddlist.forEach((item, k) => { if (i != k) { item.zk = false; item.bz = false; @@ -164,8 +193,20 @@ // console.log(e.detail.scrollTop) top.value = e.detail.scrollTop; } + const pddjjnum = (e,i) =>{ + let ce = 0; + props.pddlist[i].pdsl = e; + ce = e - props.pddlist[i].dqkcsl; + props.pddlist[i].cesl = Math.abs(ce) ; + props.pddlist[i].pdType = ce==0?'':(ce>0?1:2) + console.log(e) + } + const config = (e,i) =>{ + // 没点确认情况下把pdsl,cesl ,pdType 归 null 需要加字段 + } + const emit = defineEmits([ 'scrolltolower' ]) const scrolltolower = () => { - + emit('scrolltolower') } @@ -620,9 +661,8 @@ flex-wrap: wrap; margin: 0 auto; align-items: center; - view { - min-width: 3.5vw; + min-width: 5vw; height: 1.8vw; border-radius: 0.9vw; border: 1px solid #D2D2D2; diff --git a/pages/procurement/common/torytor.vue b/pages/procurement/common/torytor.vue index 4ec6663..a9aad11 100644 --- a/pages/procurement/common/torytor.vue +++ b/pages/procurement/common/torytor.vue @@ -4,7 +4,7 @@ 数量 - + {{item}} @@ -55,24 +55,34 @@ const props = defineProps({ show: { type: Boolean - } + }, + tb:{ + type:Number + }, + idex:{ + type:Number + } }); + const emit = defineEmits([ 'pddjjnum' ]) const isZero = ref(false); const clickKuai = (item : any, index : number) => { if (item == "AE") { - relNumber.value = 55; + relNumber.value = props.tb; stringShow.value = toFixed4ByPadStart(relNumber.value); + emit('pddjjnum',relNumber.value,props.idex); return } if (item == "AC") { relNumber.value = Math.trunc(relNumber.value / 10) stringShow.value = toFixed4ByPadStart(relNumber.value); + emit('pddjjnum',relNumber.value,props.idex); return } if(isZero.value == false){ isZero.value = true; relNumber.value = item; stringShow.value = toFixed4ByPadStart(relNumber.value); + emit('pddjjnum',relNumber.value,props.idex); return } if (digitCountByString(relNumber.value) > 3) { @@ -83,6 +93,7 @@ } else { relNumber.value = relNumber.value * 10 + item; } + emit('pddjjnum',relNumber.value,props.idex); stringShow.value = toFixed4ByPadStart(relNumber.value) } @@ -101,13 +112,12 @@ }, 120); } const jjnum = (e:number)=>{ - let num = Number(props.caigouobj.upperLimit)-Number(props.caigouobj.kcsl); - let m = Math.floor(num/type.value.num) - if(m<=relNumber.value&&e==1){relNumber.value = m; return} - if(relNumber.value<=1&&e==-1){relNumber.value = 1; return} + let num = 9999; + if(num<=relNumber.value&&e==1){relNumber.value = num; return} + if(relNumber.value<=0&&e==-1){relNumber.value = 0; return} relNumber.value+=e; stringShow.value = toFixed4ByPadStart(relNumber.value) - // emit('jjnum',e) + emit('pddjjnum',relNumber.value,props.idex) } function digitCountByString(n) { const s = Math.abs(n).toString(); diff --git a/pages/procurement/inventory.vue b/pages/procurement/inventory.vue index b51d474..0f269f6 100644 --- a/pages/procurement/inventory.vue +++ b/pages/procurement/inventory.vue @@ -30,7 +30,7 @@ - + 新增 @@ -52,7 +52,7 @@ - + @@ -534,6 +534,11 @@ } }) } + + const pdurl = (v)=>{ + console.log(v) + uni.navigateTo({url:'/pages/procurement/addtory?pddobj='+JSON.stringify(v)}) + }