提交

pages/Warehouse/index/component/index.vue

@@ -819,7 +819,8 @@
 	const emit = defineEmits(['swip'])
 	const clickmenu = (index : number) => { 
 		menutarget.value = index
-		let data = filteredMenu(2)[index]
+		let data = filteredMenu(2)[index];
+		console.log(data)
 		uni.setStorageSync('nuId', data.nuId);
 		uni.setStorageSync('nuName', data.nuName);
 		uni.setStorageSync('elderId', data?.elderInfo ? data.elderInfo?.id : null);
@@ -836,6 +837,7 @@
 			nuId:nuId 
 		}
 		queryCountByType(data).then(res=>{
+			console.log(res)
 			hldyobj.value = res.result
 		})
 	}
@@ -1025,17 +1027,15 @@
 	const getmenu = () => {
 		queryPadPageList().then((res => {
 			leftMenuArray.value = res.result.records;
-			// console.log(leftMenuArray.value)
+			let arr = filteredMenu(2);
-			filteredMenu(2).forEach((element : any, index : number) => {
+			arr.forEach((element : any, index : number) => {
-				// console.log(element.nuId , uni.getStorageSync('NUall').nuId,filteredMenu(2))
 				if (element.nuId == uni.getStorageSync('NUall').nuId) {
 					menutarget.value = index;
 					clickmenu(index)
 				}
 				if(element.readList==null){
 					element.flag = false
-				}
+				}else if(element.readList.length>0){
-				if(element.readList.length>0){
 					element.readList.forEach(k=>{
 						if(k.type=='pdd'){
 							element.flag = true

pages/Warehouse/picking.vue

@@ -1512,7 +1512,7 @@
 		middletarget.value = index;
 		showvalue.value = InvoicingList.value[index];
 		showvalue.value.jianhuobtn = false;
-		Invoiscroll.value = (index - 2) * 172;
+		Invoiscroll.value = (index - 1) * 172;
 		if (Number(showvalue.value.status) == 0 || (Number(showvalue.value.status) > 0 && Number(showvalue.value.wrksl) > 0)) {
 			showvalue.value.maxnum = (showvalue.value.rksl == 0 && showvalue.value.wrksl == 0 && showvalue.value.xzsl == 0) ? showvalue.value.purchaseQuantity : showvalue.value.wrksl
 			showvalue.value.num = showvalue.value.maxnum;
@@ -2546,7 +2546,7 @@
 				margin-left: 5%;
 
 				.middle-Y {
-					width: 98%;
+					width: 96%;
 					height: 100%;
 					margin-left: 2%;
 					// margin-right: 2%;

pages/procurement/components/calculator.vue

@@ -177,7 +177,6 @@
 					type.value = a.find(item=>
 						item.unit == props.caigouobj.wlUnits
 					);
-					console.log(props.caigouobj.wlUnits,type.value)
 				}else{
 					type.value = a.find(item=>
 						item.multiUnitType == props.caigouobj.multiUnitType

pages/procurement/components/carlist.vue

@@ -136,6 +136,7 @@
 		let absy = Math.abs(y - pageY.value)
 		if (absy > 30 && absx+10<absy&& absx<70) {
 			if(v.zk==false){
+				v.scrollleft = 1
 				 setTimeout(()=>{
 					v.scrollleft = 0
 				 },20)
@@ -460,6 +461,7 @@
 				>image {
 					width: 100%;
 					height: 100%;
+					border-radius: 1.1vw;
 				}
 			}
 		}

pages/procurement/materialcar.vue

@@ -120,7 +120,6 @@
 	 }
 	 
 	 const addcartory =(e:any)=>{
-	 	console.log(`eeeeeeeeeee`,e)
 	 	 caigouobj.value = e;
 		 
 	 	 addflag.value = true;
@@ -173,7 +172,6 @@
 		const delindex =()=>{
 			let delstr = delobj.value.id;
 			deleteQgInfoById(delstr).then(res=>{
-				
 				if(res.success){
 					uni.showToast({
 						icon:res.success?'success':'none',
@@ -247,7 +245,17 @@
 					wlParamInfo:v.wlMaterialNo,
 				 }
 				queryShoppingCartList(forms).then(res => { 
-					let obj = res.result.records[0];
+					let obj = {};
+					if(res.result.records.length>1){
+						res.result.records.forEach(item=>{
+							if(item.id==v.id){
+								obj = item
+							}
+						})
+					}else{
+						obj = res.result.records[0];
+					}
+					
 					 InvoicingList.value.forEach((item,i)=>{
 					 	if(item.id == obj.id){
 							obj.flag = v.flag;

unpackage/dist/dev/.nvue/pages/camera.js

@@ -570,7 +570,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     )
   ]);
 }
-const camera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/hldy_app_mini/pages/camera.nvue"]]);
+const camera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/项目/hldy_app_mini/pages/camera.nvue"]]);
 export {
   camera as default
 };

unpackage/dist/dev/.nvue/pages/fullcamera.js

@@ -578,7 +578,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     )
   ]);
 }
-const fullcamera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/hldy_app_mini/pages/fullcamera.nvue"]]);
+const fullcamera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/项目/hldy_app_mini/pages/fullcamera.nvue"]]);
 export {
   fullcamera as default
 };