Merge branch 'main' of http://47.115.223.229:8888/yangjun/hldy_app_mini

pages/NursingNew/component/nurse/index.vue

@@ -1575,8 +1575,9 @@
 	const shakyTable = ref(false);
 	const reldata = ref([]);
 	const deleteRuler = (index0 : number, index1 : number) => {
+		console.log("?????",timearr.value[index0].children[index1])
 		deleteDirective(timearr.value[index0].children[index1]).then((res : any) => {
-			console.log("?????",res)
+			
 			if (res.success) {
 				geteverything()
 			}
@@ -1859,7 +1860,7 @@
 					// 实现即时指令动画
 					cleansettimeout.value = setTimeout(() => {
 						bottomItems.value[0].target = `#fff`;
-						// console.log("看看进入了啥",pushValue)
+						console.log("即时指令看看进入了啥",pushValue)
 						addInstant(pushValue).then((res : any) => {
 							if (res.success) {
 								geteverything()
@@ -1958,6 +1959,7 @@
 			index1: saveEditIndex.value.index1
 		}
 		whereEvent(data);
+		console.log("日常指令看看进入了啥",param)
 		if (haveValue) {
 			editDirective(param).then((res : any) => {
 				if (res.success) {

pages/Warehouse/picking.vue

@@ -544,7 +544,7 @@
 							</view>
 							<view class="pls-card-middle-one">
 								<view class="middle-title">
-									{{ v.jhTime }}
+									{{ v.jhTime.slice(0,10) }}
 								</view>
 								<view class="middle-heng-father">
 									<view class="middle-heng"></view>
@@ -577,6 +577,7 @@
 							</view>
 							<view class="pls-card-middle-one">
 								<view class="middle-title">
+									
 								</view>
 								<view class="middle-heng-father">
 									<view class="middle-heng"
@@ -1447,6 +1448,7 @@
 	}
 	const tagsArray = [`待入库`, `挂账中`, `已入库`, `已销账`,]
 	const clickmiddle = (index : number) => {
+		console.log(showvalue.value)
 		middletarget.value = index;
 		showvalue.value = InvoicingList.value[index];
 		showvalue.value.jianhuobtn = false;
@@ -1628,6 +1630,93 @@
 		const intPart = Math.floor(Math.abs(n));
 		return String(intPart).padStart(4, '0');
 	}
+	// 加减
+	const InteroutId = ref(null)
+	const handleTouchStart = (e:number)=> {
+		Interval(e)
+	}
+	const handleTouchEnd=()=> {
+	  clearInterval(InteroutId.value);
+	  // 清除定时器
+	}
+	const Interval = (e:number)=>{
+		InteroutId.value = setInterval(() => {
+		  jjnum(e); 
+		}, 120); 
+	}
+	const jjnum = (e:number)=>{
+		let m  = showvalue.value.maxnum;
+		if(m<=showvalue.value.num&&e==1){showvalue.value.num = m; return}
+		if(showvalue.value.num<=1&&e==-1){showvalue.value.num =1; return}
+		showvalue.value.num+=e;
+		stringjh.value = toFixed4ByPadStart(showvalue.value.num)
+	}
+	// 
+	const fag=(e)=>{
+		let str = '';
+		addupimg.value.forEach(item=>{
+			str+=item+','
+		})
+		
+		let obj = {
+			jhId:showvalue.value.id,
+			jhNum:showvalue.value.num,
+			jhType:xdex.value,
+			jhPic:str==''?null:str,
+			cgdId:showvalue.value.cgdId
+		}
+		pickingInfo(obj).then(res=>{
+			uni.showToast({
+				icon:'none',
+				title: res.message
+			})
+			addupimg.value = [];
+			openjianhuo.value = false;
+			queryInvo()
+		})
+	}
+	const xdex = ref(-1)
+	const addupimg = ref([])
+	const sctp = (e:number)=>{
+		if(albumlist.value.length==0){
+			fag(e)
+			return
+		}
+		albumlist.value.forEach(item=>{
+			 uni.uploadFile({
+			    url: uni.getStorageSync('serverUrl')+'/sys/common/upload',  
+			    filePath:item,
+			    name: 'file',  
+				formData:{
+					biz:'jhPic'
+				},
+				header:{
+					'X-Access-Token':uni.getStorageSync('token')
+				},
+			    success: res => {
+			      const data = JSON.parse(res.data)
+				  addupimg.value.push(data.message)
+				  if(addupimg.value.length == albumlist.value.length){
+				  	fag(e)
+				  }
+			    },
+			    fail: () => {
+			      uni.showToast({ title: '上传失败', icon: 'none' })
+			    }
+			  })
+			
+		})
+		
+	}
+	
+	const config=(e)=>{
+		xdex.value = e;
+		if(e==1){
+			open.value = 2;
+		}else{
+			sctp(0)
+		}
+	}
 	// 配置
 	const SEG_COUNT = 8;       // 分段数量
 	const PADDING = 2;        // 外层 padding（rpx）

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

@@ -574,7 +574,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

@@ -577,7 +577,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
 };