diff --git a/pages/Warehouse/Warehouse.vue b/pages/Warehouse/Warehouse.vue index 78f8ce4..321f61f 100644 --- a/pages/Warehouse/Warehouse.vue +++ b/pages/Warehouse/Warehouse.vue @@ -116,7 +116,7 @@ lastTap.value = 0 } else { setout.value = setTimeout(() => { - console.log("点击哪个了", index) + // console.log("点击哪个了", index) if (index === 5) { uni.navigateTo({ url: "/pages/watch/full" diff --git a/pages/Warehouse/picking.vue b/pages/Warehouse/picking.vue index cb8d9b3..a0d9c52 100644 --- a/pages/Warehouse/picking.vue +++ b/pages/Warehouse/picking.vue @@ -1107,6 +1107,7 @@ const stringjh = ref("") const serverUrl = ref(""); const opengaijia = ref(false); + const guiling = ref(false); const openjianhuo = ref(false); const opendata = ref(false); const gaijia = ref(""); @@ -1126,6 +1127,12 @@ } // 计算器 function press(k : string) { + + if(guiling.value){ + gaijia.value = ''; + guiling.value = false + } + if (k === 'AC') { gaijia.value = '' return @@ -1174,6 +1181,7 @@ } const opengaijiaclick = () => { opengaijia.value = true; + guiling.value = true gaijia.value = (showvalue.value.arrivalPrice ? showvalue.value.arrivalPrice : showvalue.value.procurementPrice).toString() donghuaopo.value = false; setTimeout(() => { @@ -1445,7 +1453,21 @@ }) } const showvalue = ref({ - materialImg: "" + materialImg: "", + cgrvalue: "", + gysvalue: "", + wlName: "", + procurementPrice: "", + wlMaterialNo: "", + wlSpecificationModel: "", + purchaseQuantity: "", + wlUnits: "", + kcsl: "", + wlUpperLimit: "", + wlLowerLimit: "", + suppliersName: "", + jianhuobtn:false, + }) const goback = () => { @@ -1476,7 +1498,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; @@ -2000,6 +2022,7 @@ height: 95vh; width: 30%; position: relative; + z-index: 99; .left-select-more { position: absolute; @@ -3278,7 +3301,7 @@ width: 610rpx; // height: 300rpx; border-radius: 30rpx; - z-index: 999; + z-index: 102; background-color: #fff; box-shadow: 0 0 10px rgba(0, 0, 0, 0.2); padding: 40rpx 30rpx; diff --git a/pages/procurement/purchaseorder.vue b/pages/procurement/purchaseorder.vue index bd9c4c8..0126c21 100644 --- a/pages/procurement/purchaseorder.vue +++ b/pages/procurement/purchaseorder.vue @@ -331,7 +331,7 @@ - + @@ -422,12 +422,14 @@ const plzinfo = reactive({ pageNo: 1, pageSize: 10, - canpull: true + canpull: true, + cgdParamInfo:"" }) const mobanplzinfo = { pageNo: 1, pageSize: 10, - canpull: true + canpull: true, + cgdParamInfo:"" } const leftscrolltop = ref(0) @@ -436,7 +438,7 @@ const firstgetqueryCgdList = () => { queryCgdList(plzinfo).then((res : any) => { plsbuy.value.push(...res.result.records) - console.log("zzzz", plsbuy.value) + // console.log("zzzz", plsbuy.value) if (!res.result.total) { nomessageshow.value = true; } @@ -495,7 +497,21 @@ queryInvo(); } const showvalue = ref({ - materialImg: "" + materialImg: "", + cgrvalue: "", + gysvalue: "", + wlName: "", + procurementPrice: "", + wlMaterialNo: "", + wlSpecificationModel: "", + purchaseQuantity: "", + wlUnits: "", + kcsl: "", + wlUpperLimit: "", + wlLowerLimit: "", + suppliersName: "", + categoryId_dictText:"", + typeId_dictText:"", }) const goback = () => {