pages/NursingNew/component/nurse/index.vue

@@ -1575,9 +1575,8 @@
 	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()
 			}
@@ -1860,7 +1859,7 @@
 					// 实现即时指令动画
 					cleansettimeout.value = setTimeout(() => {
 						bottomItems.value[0].target = `#fff`;
-						console.log("即时指令看看进入了啥",pushValue)
+						// console.log("看看进入了啥",pushValue)
 						addInstant(pushValue).then((res : any) => {
 							if (res.success) {
 								geteverything()
@@ -1959,7 +1958,6 @@
 			index1: saveEditIndex.value.index1
 		}
 		whereEvent(data);
-		console.log("日常指令看看进入了啥",param)
 		if (haveValue) {
 			editDirective(param).then((res : any) => {
 				if (res.success) {
@@ -2093,7 +2091,7 @@
 						directiveName: '' // 默认的 directiveName
 					}))
 				}))
-				console.log("wtf",res)
+				console.log("wtf",res.result.serviceList)
 				res.result.serviceList.forEach((res : any) => {
 					timearr.value[res.positioning].children[res.positioningLong] = res;
 				})

pages/Warehouse/api/lunpan.js

@@ -158,16 +158,6 @@ export const getGysList = () => {
 		method: 'get'
 	})
 } 
-
-//改价
-export const editPrice = (params) => {
-	return request({
-		url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/editPrice`,
-		method: 'post',
-		data: params,
-	})
-} 
-
 //(业务)拣货、销账操作
 export const pickingInfo = (params) => {
 	return request({
@@ -175,4 +165,6 @@ export const pickingInfo = (params) => {
 		method: 'post',
 		data: params
 	})
-} 
+} 
+
+

pages/Warehouse/picking.vue

@@ -2,7 +2,7 @@
 	<view class="contain">
 		<view v-show="moreindex!=-1 || topbuttontarget!=-1 || openjianhuo || opengaijia || opendata || opencgr "
 			class="mengban"
-			@click="moreindex=-1; topbuttontarget=-1;openjianhuo=false;opengaijia=false;opendata=false;opencgr=false">
+			@click="moreindex=-1; topbuttontarget=-1;openjianhuo=false;opengaijia=false;opendata=false;opencgr=false;clickflag=false">
 		</view>
 		<!-- 给模糊搜索用的 -->
 		<view v-show="filteredCgrListsecond.length&&gysvalue" class="mengban" @click="closefilteredCgrListsecond">
@@ -39,7 +39,7 @@
 			<view style="width: 100%;margin-top: 50rpx;font-size: 30rpx;">
 				采购单价:
 				<text style="color: #888888;">
-					￥{{ gaijia }}
+					￥1.50
 				</text>
 
 			</view>
@@ -47,17 +47,17 @@
 				<view style="font-size: 30rpx;margin-bottom: 10rpx;">
 					到货单价
 				</view>
-				<view class="gray-input" style="width: 410rpx;">
+				<view class="gray-input">
-					¥ {{ gaijia }}
+					¥1500.00
 				</view>
 			</view>
 			<view style="position: absolute;right: 30rpx;bottom: 30rpx;">
 				<view style="display: flex;">
-					<view @click="opengaijia=false"
+					<view
 						style="width: 160rpx;height: 75rpx;background-color: #ebeced;color: #888888;display: flex;justify-content: center;align-items: center;font-size: 30rpx;border-radius: 40rpx;">
 						取消
 					</view>
-					<view @click="dogaijia"
+					<view
 						style="width: 160rpx;height: 75rpx;;color: #0385FA;display: flex;justify-content: center;align-items: center;font-size: 30rpx;border-radius: 40rpx;border: 1rpx solid #0385FA;background: linear-gradient(to bottom,#E9F4FF,#CAE0F9);margin: 0 40rpx;">
 						确定
 					</view>
@@ -66,50 +66,50 @@
 			</view>
 			<view class="jianhuo-jianpan" style="right: -40rpx;bottom: 150rpx;">
 				<view style="display: flex;width: 480rpx;">
-					<view class="gray-button-jianpan" @click="press('1')">
+					<view class="gray-button-jianpan">
 						1
 					</view>
-					<view class="gray-button-jianpan" @click="press('2')">
+					<view class="gray-button-jianpan">
 						2
 					</view>
 
-					<view class="gray-button-jianpan" @click="press('3')">
+					<view class="gray-button-jianpan">
 						3
 					</view>
 				</view>
 				<view style="display: flex;width: 480rpx;">
-					<view class="gray-button-jianpan" @click="press('4')">
+					<view class="gray-button-jianpan">
 						4
 					</view>
-					<view class="gray-button-jianpan" @click="press('5')">
+					<view class="gray-button-jianpan">
 						5
 					</view>
 
-					<view class="gray-button-jianpan" @click="press('6')">
+					<view class="gray-button-jianpan">
 						6
 					</view>
 				</view>
 				<view style="display: flex;width: 480rpx;">
-					<view class="gray-button-jianpan" @click="press('7')">
+					<view class="gray-button-jianpan">
 						7
 					</view>
-					<view class="gray-button-jianpan" @click="press('8')">
+					<view class="gray-button-jianpan">
 						8
 					</view>
 
-					<view class="gray-button-jianpan" @click="press('9')">
+					<view class="gray-button-jianpan">
 						9
 					</view>
 				</view>
 				<view style="display: flex;width: 480rpx;">
-					<view class="gray-button-jianpan" @click="press('AC')">
+					<view class="gray-button-jianpan">
 						AC
 					</view>
-					<view class="gray-button-jianpan" @click="press('0')">
+					<view class="gray-button-jianpan">
 						0
 					</view>
 
-					<view class="gray-button-jianpan" @click="press('.')">
+					<view class="gray-button-jianpan">
 						.
 					</view>
 				</view>
@@ -263,27 +263,28 @@
 				</view>
 			</view>
 			<view style="display: flex;margin-top: 30rpx;margin-left: 20rpx;">
-				<view class="gray-button">
+				<view class="gray-button"  @click="jjnum(-1)" @longpress="handleTouchStart(-1)" @touchend="handleTouchEnd">
 					-
 				</view>
-				<view class="gray-input">
+				<view class="gray-input" style="width:12vw;">
-					{{showvalue.num}}
+					<text v-for="(v,i) in stringjh" :key="i">{{v}}</text>
 				</view>
-				<view class="gray-button">
+				<!-- <text></text>{{showvalue.num}} -->
+				<view class="gray-button" @click="jjnum(1)" @longpress="handleTouchStart(1)" @touchend="handleTouchEnd">
 					+
 				</view>
 			</view>
 			<view class="jianhuobutton">
 				<view style="display: flex;">
-					<view @click="openjianhuo = false"
+					<view @click="openjianhuo = false;clickflag = false"
 						style="width: 160rpx;height: 75rpx;background-color: #ebeced;color: #888888;display: flex;justify-content: center;align-items: center;font-size: 30rpx;border-radius: 40rpx;">
 						关闭
 					</view>
-					<view
+					<view @click="config(1)"
 						style="width: 160rpx;height: 75rpx;;color: #0385FA;display: flex;justify-content: center;align-items: center;font-size: 30rpx;border-radius: 40rpx;border: 1rpx solid #0385FA;background: linear-gradient(to bottom,#E9F4FF,#CAE0F9);margin: 0 20rpx;">
 						销账
 					</view>
-					<view
+					<view @click="config(0)"
 						style="width: 160rpx;height: 75rpx;;color: #0385FA;display: flex;justify-content: center;align-items: center;font-size: 30rpx;border-radius: 40rpx;border: 1rpx solid #0385FA;background: linear-gradient(to bottom,#E9F4FF,#CAE0F9);">
 						入库
 					</view>
@@ -378,6 +379,7 @@
 					</view>
 				</view>
 				<view class="photowall-other-one" v-if="topbuttontarget==1">
+
 					<view
 						style="width: 100%;height: 70%;display: flex;flex-direction: column;justify-content: center;align-items: center;background-color:#fafdff ;border: 1rpx solid #78B1EB;border-radius: 30rpx;">
 						<image style="width: 70rpx;height: 70rpx;margin-bottom: 5rpx;"
@@ -641,10 +643,10 @@
 						随行单
 					</view>
 				</view>
-				<view :class="!Number(plsbuy[lefttarget]?.status)?`contain-right-button`: `contain-right-button-bad`"
+				<view :class="lefttarget==1?`contain-right-button`: `contain-right-button-bad`"
-					style="border-color: #D9DADC;box-shadow: 0 1rpx 3rpx #D9DADC;" @click="bebad">
+					style="border-color: #D9DADC;box-shadow: 0 1rpx 3rpx #D9DADC;">
 					<image class="buttont-img"
-						:src="`/static/index/warehouse/procurement/picking/bebad${!Number(plsbuy[lefttarget]?.status)?``:`target`}.png`" />
+						:src="`/static/index/warehouse/procurement/picking/bebad${lefttarget==1?``:`target`}.png`" />
 					<view class="button-font">
 						作废
 					</view>
@@ -1070,70 +1072,26 @@
 			</view>
 		</view>
 
-		<view class="mengban" v-if="open==1"> </view>
+		<view class="mengban" v-if="open>0" @click="open = 0"> </view>
 		<equiment :open="open==1" @del="del()" @back="open = 0" :content="'是否删除此图片？'"></equiment>
+		<equiment :open="open==2" @del="sctp(1)" @back="open = 0" :content="'是否销账此物料？'"></equiment>
 	</view>
 </template>
 
 <script setup lang="ts">
 	import { ref, onMounted, reactive, onBeforeUnmount, computed, nextTick, defineProps, onUnmounted } from 'vue';
-	import { queryInvoicingList, getCgdMaterialTreeData, queryNuInfoByNuId, updateKfstatus, queryCgdList, queryCgdInfoList, queryWlInfoByWlId, voidedCgdMain, getCgrLis, getGysList, upload, editPrice } from './api/lunpan.js'
+	import { pickingInfo,queryInvoicingList, getCgdMaterialTreeData, queryNuInfoByNuId, updateKfstatus, queryCgdList, queryCgdInfoList, queryWlInfoByWlId, voidedCgdMain, getCgrLis, getGysList, upload } from './api/lunpan.js'
 	import { onShow, onLoad, onHide, onPageScroll } from "@dcloudio/uni-app"
 	import calendar from '@/component/public/calendar.vue'
 	import superpicker from '@/component/public/superpicker.vue'
 	import equiment from './components/equiment.vue';
 	const open = ref(0);
 	const typechange = ref(0);
+	const stringjh = ref(0)
 	const serverUrl = ref("");
 	const opengaijia = ref(false);
 	const openjianhuo = ref(false);
 	const opendata = ref(false);
-	const gaijia = ref("");
-
-
-	// 改价
-	const dogaijia = () => {
-		// console.log("????",showvalue.value.id,gaijia.value)
-		editPrice({ id: showvalue.value.id, arrivalPrice: gaijia.value }).then((res) => {
-			// console.log("改价", showvalue.value.id,gaijia.value)
-			// console.log("res", res)
-			if (res.code == 200) {
-				showvalue.value.arrivalPrice = gaijia.value;
-				opengaijia.value = false;
-			}
-		})
-	}
-	// 计算器
-	function press(k : string) {
-		if (k === 'AC') {
-			gaijia.value = ''
-			return
-		}
-
-		// 小数点
-		if (k === '.') {
-			if (!gaijia.value.includes('.')) {
-				gaijia.value = gaijia.value === '' ? '0.' : gaijia.value + '.'
-			}
-			return
-		}
-
-		// 数字
-		if (/^\d$/.test(k)) {
-			// 有小数
-			if (gaijia.value.includes('.')) {
-				const [i, d] = gaijia.value.split('.')
-				if ((d || '').length < 2) gaijia.value += k
-				return
-			}
-
-			// 无小数，整数部分限制 4 位
-			let intPart = gaijia.value
-			if (intPart === '0') intPart = '' // 防止 01
-
-			if (intPart.length < 4) gaijia.value = intPart + k
-		}
-	}
 	// 模糊查询
 	const gysclick = (res : any) => {
 		console.log("///", res);
@@ -1145,6 +1103,7 @@
 			return
 		}
 		openjianhuo.value = true;
+		clickflag.value = true;
 		donghuaopo.value = false;
 		setTimeout(() => {
 			donghuaopo.value = true;
@@ -1153,7 +1112,6 @@
 
 	const opengaijiaclick = () => {
 		opengaijia.value = true;
-		gaijia.value = (showvalue.value.arrivalPrice ? showvalue.value.arrivalPrice : showvalue.value.procurementPrice).toString()
 		donghuaopo.value = false;
 		setTimeout(() => {
 			donghuaopo.value = true;
@@ -1289,7 +1247,6 @@
 	const opencgr = ref(false);
 	const opengys = ref(false);
 
-
 	const cgrlist = ref([]);
 	const gyslist = ref([]);
 
@@ -1299,7 +1256,6 @@
 		})
 		getGysList().then((res : any) => {
 			gyslist.value = res.result;
-			console.log("isright", res)
 		})
 	}
 
@@ -1363,12 +1319,10 @@
 		queryCgdList(plzinfo).then((res : any) => {
 			plsbuy.value.push(...res.result.records)
 			alltotal.value = res.result.total
-			console.log("请购单数据呢???", res)
 			if (res.result.records.length) {
 				form.cgdId = plsbuy.value[0].id
 				queryInvo();
 			}
-
 			if (res.result.records.length < plzinfo.pageSize) {
 				plzinfo.canpull = false;
 			}
@@ -1406,15 +1360,7 @@
 		form.cgdId = plsbuy.value[index].id
 		form.pageNo = 1
 		form.canpull = true;
-		// console.log("!!!!",form)
+		queryInvo()
-		queryCgdInfoList(form).then(res => {
-			InvoicingList.value = []
-			// console.log("数据呢", res.result.records)
-			InvoicingList.value.push(...res.result.records);
-			if (form.pageNo) {
-				clickmiddle(0);
-			}
-		})
 	}
 	const showvalue = ref({
 		materialImg: ""
@@ -1455,6 +1401,7 @@
 		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;
+			stringjh.value = toFixed4ByPadStart(showvalue.value.num);
 			showvalue.value.jianhuobtn = true;
 		}
 		Object.assign(form, mobanform)
@@ -1463,13 +1410,7 @@
 	const InvoicingList = ref([])
 	const queryInvo = () => {
 		queryCgdInfoList(form).then(res => {
-			// 	if (res.result.records.length == 1) {
+			InvoicingList.value=res.result.records;
-			// 		InvoicingList.value.push(...res.result.records);
-
-			// 	}
-			// console.log(res.result.records)
-			InvoicingList.value.push(...res.result.records);
-
 			clickmiddle(0);
 		})
 	}
@@ -1495,21 +1436,21 @@
 	}
 	const moreindex = ref(-1);
 	const zuofeiindex = ref(-1);
-	// const openmore = (index : number) => {
+	const openmore = (index : number) => {
-	// 	zuofeiindex.value = index;
+		zuofeiindex.value = index;
-	// 	if (plsbuy.value[index].cgdType == '9') {
+		if (plsbuy.value[index].cgdType == '9') {
-	// 		setTimeout(() => {
+			setTimeout(() => {
-	// 			uni.showToast({
+				uni.showToast({
-	// 				title: '该采购单已作废',
+					title: '该采购单已作废',
-	// 				icon: 'error', // 不显示小图标
+					icon: 'error', // 不显示小图标
-	// 				duration: 2000
+					duration: 2000
-	// 			})
+				})
-	// 		}, 300)
+			}, 300)
 
-	// 	} else {
+		} else {
-	// 		moreindex.value = index;
+			moreindex.value = index;
-	// 	}
+		}
-	// }
+	}
 	const shareShow = ref(false);
 	const deletedownisopacity = ref(false)
 	const share = () => {
@@ -1540,21 +1481,13 @@
 	const badshow = ref(false);
 	const donghuacs = ref(false)
 	const bebad = () => {
-		// console.log("ceshi",Number(plsbuy.value[lefttarget.value]?.status))
+		badshow.value = true;
-		// console.log("right?",plsbuy.value[lefttarget.value])
+		moreindex.value = -1;
-		if (!Number(plsbuy.value[lefttarget.value]?.status) && plsbuy.value.length) {
+		donghuacs.value = false;
-			badshow.value = true;
+		setTimeout(() => donghuacs.value = true, 50)
-			moreindex.value = -1;
-			donghuacs.value = false;
-			setTimeout(() => donghuacs.value = true, 50)
-		}
-		// return
-
-
 	}
 	const zuofei = () => {
-		voidedCgdMain({ id: plsbuy.value[lefttarget.value].id }).then((res : any) => {
+		voidedCgdMain({ id: plsbuy.value[zuofeiindex.value].id }).then((res : any) => {
-			// console.log("res", res)
 			if (res.success) {
 				uni.showToast({
 					title: res.message,
@@ -1576,7 +1509,6 @@
 		donghuaopo.value = false;
 		setTimeout(() => {
 			donghuaopo.value = true;
-			console.log("zzz", donghuaopo.value)
 		}, 100)
 	}
 	// 上传
@@ -1584,17 +1516,20 @@
 	const uplod = () => {
 		uni.chooseImage({
 			count: 1, //默认9
-			sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
+			sizeType: ['compressed'], //可以指定是原图还是压缩图，默认二者都有
 			sourceType: ['camera'], //从相册选择
+			crop:{
+				quality:60
+			},
 			success: (e) => {
-				console.log(JSON.stringify(e.tempFilePaths))
 				let ar = JSON.stringify(e.tempFilePaths)
-				albumlist.value.push(JSON.parse(ar)[0])
+				uni.compressImage({
-				// upload({file:url}).then(res=>{
+				  src: JSON.parse(ar)[0],
-				// 	albumlist.value.push(res.result)
+				  quality: 60,
-				// 	console.log(albumlist.value)
+				  success: res => {
-				// })
+					  albumlist.value.push(res.tempFilePath)
-				console.log(albumlist.value)
+				  }
+				})
 			}
 		});
 	}
@@ -1613,19 +1548,43 @@
 		open.value = 0;
 	}
 	//
+	const clickflag = ref(false);
 	const clknum = (item : any) => {
+		// showvalue.value.maxnum = showvalue.value.purchaseQuantity : showvalue.value.wrksl
+		// showvalue.value.num 
 		if (item == "AC") {
-
+			showvalue.value.num = 0;
+			stringjh.value = toFixed4ByPadStart(showvalue.value.num);
+			return
+		}
+		if (item == "AE") {
+			showvalue.value.num = Math.trunc(showvalue.value.num / 10)
+			stringjh.value = toFixed4ByPadStart(showvalue.value.num);
 
 			return
 		}
-		if (item == "CE") {
+		if(clickflag.value==true){
-
+			showvalue.value.num = item;
-
+			clickflag.value = false;
+			stringjh.value = toFixed4ByPadStart(showvalue.value.num)
 			return
 		}
+		if (digitCountByString(showvalue.value.num) > 3) {
+		} else {
+			if (!showvalue.value.num) {
+				showvalue.value.num = item
+			} else {
+				showvalue.value.num = showvalue.value.num * 10 + item;
+			}
+			// cy()
+			stringjh.value = toFixed4ByPadStart(showvalue.value.num)
+		}
 	}
 	// 数字转化
+	const digitCountByString=(n)=> {
+		const s = Math.abs(n).toString();
+		return s.length;
+	}
 	const toFixed4ByPadStart = (n) => {
 		const intPart = Math.floor(Math.abs(n));
 		return String(intPart).padStart(4, '0');
@@ -1672,6 +1631,8 @@
 			})
 			addupimg.value = [];
 			openjianhuo.value = false;
+			open.value = 0;
+			form.cgdId = plsbuy.value[lefttarget.value].id
 			queryInvo()
 		})
 	}
@@ -2126,7 +2087,6 @@
 									color: #888888;
 									text-align: center;
 									font-size: 25rpx;
-									overflow: hidden;
 								}
 
 								.middle-heng-father {
@@ -3047,11 +3007,10 @@
 		// width: 100rpx;
 		padding: 0 30rpx;
 		letter-spacing: 10rpx;
-
 		height: 100rpx;
 		border: 1rpx solid #CBCFD0;
 		display: flex;
-		justify-content: flex-end;
+		justify-content: center;
 		align-items: center;
 		padding-left: 40rpx;
 		margin-right: 10rpx;

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
 };