diff --git a/pages/Warehouse/picking.vue b/pages/Warehouse/picking.vue index dc37cba..20533ef 100644 --- a/pages/Warehouse/picking.vue +++ b/pages/Warehouse/picking.vue @@ -803,17 +803,19 @@ {{showvalue.categoryId_dictText}} - {{showvalue.typeId_dictText}} - + @@ -1474,7 +1476,7 @@ } const tagsArray = [`待入库`, `挂账中`, `已入库`, `已销账`,] const clickmiddle = (index : number) => { - // console.log(showvalue.value) + console.log(showvalue.value) middletarget.value = index; showvalue.value = InvoicingList.value[index]; showvalue.value.jianhuobtn = false; @@ -2606,6 +2608,7 @@ height: 100%; width: 30%; padding-left: 30rpx; + padding-top: 30rpx; .left-img { width: 250rpx; diff --git a/pages/procurement/components/calculator.vue b/pages/procurement/components/calculator.vue index abf3a04..221320e 100644 --- a/pages/procurement/components/calculator.vue +++ b/pages/procurement/components/calculator.vue @@ -182,7 +182,8 @@ cgdwflag.value = false; type.value = {}; sx.value = false; - gysidnum.value = 0 + gysidnum.value = 0; + isZero.value = false; } }) const jssl=()=>{ @@ -216,7 +217,7 @@ const calculatorArray = [1, 2, 3, 4, 5, 6, 7, 8, 9, "AC", 0, "AE"]; const stringShow = ref("0000"); const relNumber = ref(0); - // const isZero = ref(false); + const isZero = ref(false); const clickKuai = (item : any, index : number) => { blueNumber.value = index; setTimeout(() => { @@ -234,7 +235,13 @@ cy() return } - + if(isZero.value == false){ + isZero.value = true; + relNumber.value = item; + stringShow.value = toFixed4ByPadStart(relNumber.value); + cy() + return + } if (digitCountByString(relNumber.value) > 3) { } else { diff --git a/pages/procurement/purchaseorder.vue b/pages/procurement/purchaseorder.vue index d1c82c6..3bb3177 100644 --- a/pages/procurement/purchaseorder.vue +++ b/pages/procurement/purchaseorder.vue @@ -94,7 +94,7 @@ 拣货 - + {{ "[ " + v.jhBy + " ]" }} @@ -123,7 +123,7 @@ 完结 - + {{ "[ " + v.wjBy + " ]" }} @@ -504,7 +504,7 @@ const form = reactive({ nuId: uni.getStorageSync('nuId'), pageNo: 1, - pageSize: 9, + pageSize: -1, categoryId: '', typeId: '', medicationId: '', @@ -529,12 +529,12 @@ middletarget.value = index; showvalue.value = InvoicingList.value[index]; Object.assign(form, mobanform) - + form.pageSize = -1; } const InvoicingList = ref([]) const queryInvo = () => { queryCgdInfoList(form).then(res => { - // console.log(res.result.records) + console.log(res.result.records,form) InvoicingList.value = []; InvoicingList.value.push(...res.result.records); clickmiddle(middletarget.value); @@ -935,6 +935,7 @@ .middle-img { width: 150rpx; height: 150rpx; + margin: 0.3vw 0 0 0.15vw; } .middle-right { @@ -1002,11 +1003,13 @@ .right-bottom-left { height: 100%; width: 30%; - padding-left: 30rpx; + padding-left: 55rpx; .left-img { - width: 300rpx; - height: 300rpx; + width: 270rpx; + height: 270rpx; + margin-left: 2vw; + margin-top: 5vw; } .left-tags {