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

同步
2025-11-25 14:39:14 +08:00 · 2025-11-25 14:39:06 +08:00
10 changed files with 101 additions and 45 deletions
--- a/pages.json
+++ b/pages.json
@ -200,6 +200,9 @@
 			{
 				"navigationBarTitleText" : ""
 			}
+		},
+		{
+			"path" : "pages/Warehouse/warehome" 
 		}

 		// {
--- a/pages/Warehouse/api/lunpan.js
+++ b/pages/Warehouse/api/lunpan.js
@ -209,3 +209,10 @@ export const queryPickingRecordList = (params) => {
 		data: params
 	})
 } 
+export const editIzNew = (params) => {
+ 	return request({
+ 		url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/editIzNew`,
+ 		method: 'post',
+ 		data: params,
+ 	})
+ }
--- a/pages/Warehouse/picking.vue
+++ b/pages/Warehouse/picking.vue
@ -512,8 +512,12 @@
 			<view class="left-menu-father">
 				<scroll-view scroll-y="true" scroll-with-animation class="left-menu-scroll" :scroll-top="leftscrolltop"
 					@scrolltolower="plsbuytolower" :lower-threshold="400">
-					<view class="pls-card" v-for="(v,i) in plsbuy" :key='i' @click="clickLeftMenu(i)"
+					<view class="pls-card" v-for="(v,i) in plsbuy" :key='i' @click="clickLeftMenu(i,v)"
 						:style="{borderColor: i==lefttarget? ``:`#fff` }">
+						<text style="display: block;background: #ff5757;
+						position: absolute;width: 1.3vw;height: 1.3vw;border-radius: 50%;right: -0.1vw;top: -0.1vw;"
+							v-if="v.izNew=='Y'">
+						</text>
 						<view class="pls-card-title">
 							<view class="title-left">
 								{{ v.cgdNo }}
@ -563,50 +567,57 @@
 								</view>
 								<view class="middle-heng-father">
 									<view class="middle-heng"></view>
-									<!-- <view class="middle-heng"
+									<view class="middle-heng"
+										style="border-radius: 20rpx;width: 105%;margin-left: -5%;">
+									</view>
+									<view class="middle-heng" v-if="Number(v.status)>=1"
 										style="border-radius: 20rpx;background-color: #1083F8;width: 105%;margin-left: -5%;">
+									</view>
+									<view class="middle-ball" :style="{backgroundColor: `#1083F8`}"></view>
+									<view class="middle-ball"
+										:style="Number(v.status)>=1?{backgroundColor: `#1083F8`}:{} ">
+									</view>
+									<!-- <view class="middle-ball"
+										:style="Number(v.status)>=1?{backgroundColor: `#1083F8`}:{} ">
 									</view> -->
-									<view class="middle-heng" v-if="Number(v.status)==1"
-										style="border-radius: 20rpx;background-color: #1083F8;width: 105%;margin-left: -5%;">
-									</view>
-									<view class="middle-ball"
-										:style="Number(v.status)==1?{backgroundColor: `#1083F8`}:{} ">
-									</view>
-									<!-- <view class="middle-ball" :style="{backgroundColor: `#1083F8`}"></view> -->
-									<view class="middle-ball"
-										:style="Number(v.status)==1?{backgroundColor: `#1083F8`}:{} ">
-									</view>
 								</view>
 								<view class="end-font">
 									<!-- <view class=""
 										:style="Number(v.status)<3 && Number(v.status)>0?{color: `#1083F8`}:{} ">
 										拣货
 									</view> -->
-									<view class="" :style="Number(v.status)==1?{color: `#1083F8`}:{}">
+									
+									<view class="" :style="Number(v.status)>=1?{color: `#1083F8`}:{}">
 										拣货
 									</view>
-									<view style="font-size: 25rpx;" v-if="Number(v.status)==1 && v.jhBy">
+									<view style="font-size: 25rpx;" v-if="Number(v.status)>=1 && v.jhBy">
 										{{ "[ " + v.jhBy + " ]" }}
 									</view>
 								</view>
 							</view>
 							<view class="pls-card-middle-one">
 								<view class="middle-title">
-
+									{{ Number(v.status)>=2 ? v.wjTime?.slice(0,10) :""}}
 								</view>
+
 								<view class="middle-heng-father">
 									<view class="middle-heng"
 										style="border-top-right-radius: 20rpx;border-bottom-right-radius: 20rpx;">
 									</view>
-
-									<view class="middle-ball">
+									<view class="middle-heng" v-if="Number(v.status)>=2"
+										style="border-radius: 20rpx;background-color: #1083F8;width: 105%;margin-left: -5%;">
+									</view>
+									<view class="middle-ball" :style="{backgroundColor: `#1083F8`}"></view>
+									<view class="middle-ball"
+										:style="Number(v.status)>=2?{backgroundColor: `#1083F8`}:{} ">
 									</view>
 								</view>
 								<view class="end-font">
-									<view class="">
+									<view :style="Number(v.status)>=2?{color: `#1083F8`}:{}">
 										完结
 									</view>
-									<view class="">
+									<view style="font-size: 25rpx;" v-if="Number(v.status)>=2 && v.wjBy">
+										{{ "[ " + v.wjBy + " ]" }}
 									</view>
 								</view>
 							</view>
@ -1074,7 +1085,7 @@

 <script setup lang="ts">
 	import { ref, onMounted, reactive, onBeforeUnmount, computed, nextTick, defineProps, onUnmounted } from 'vue';
-	import { queryPickingRecordList, queryJhzpList, addSxd, querySxdList, queryInvoicingList, getCgdMaterialTreeData, queryNuInfoByNuId, updateKfstatus, queryCgdList, queryCgdInfoList, queryWlInfoByWlId, voidedCgdMain, getCgrLis, getGysList, upload, editPrice, pickingInfo } from './api/lunpan.js'
+	import { editIzNew,queryPickingRecordList, queryJhzpList, addSxd, querySxdList, queryInvoicingList, getCgdMaterialTreeData, queryNuInfoByNuId, updateKfstatus, queryCgdList, queryCgdInfoList, queryWlInfoByWlId, voidedCgdMain, getCgrLis, getGysList, upload, editPrice, pickingInfo } 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'
@ -1320,7 +1331,7 @@

 	const searchValue = ref("");
 	const middletarget = ref(0);
-	const tagesstatues = ["待入库", "待完结"];
+	const tagesstatues = ["待入库", "待完结", '已完结'];

 	const topbuttontarget = ref(-1);

@ -1336,7 +1347,7 @@
 		startTime: "",
 		endTime: "",
 		cgBy: "",
-		nuId:uni.getStorageSync('nuId')
+		nuId: uni.getStorageSync('nuId')
 	})
 	const mobanplzinfo = {
 		pageNo: 1,
@ -1348,7 +1359,7 @@
 		startTime: "",
 		endTime: "",
 		cgBy: "",
-		nuId:uni.getStorageSync('nuId')
+		nuId: uni.getStorageSync('nuId')
 	}
 	// 销毁日历
 	const xiaohui = ref(true);
@ -1420,7 +1431,7 @@
 		})
 	}
 	const lefttarget = ref(0);
-	const clickLeftMenu = (index : any) => {
+	const clickLeftMenu = (index : any,item:any) => {
 		let num = Math.ceil((index + 1))
 		leftscrolltop.value = (num - 2) * 186;
 		lefttarget.value = index;
@ -1436,6 +1447,11 @@
 				clickmiddle(0);
 			}
 		})
+		if (item.izNew == 'Y') {
+			item.izNew = 'N'
+			editIzNew({ id: item.id })
+		}
+		
 	}
 	const showvalue = ref({
 		materialImg: "",
@ -1503,7 +1519,6 @@
 	const InvoicingList = ref([])
 	const queryInvo = (index : number) => {
 		queryCgdInfoList(form).then(res => {
-			console.log(res.result.records)
 			InvoicingList.value = res.result.records;
 			clickmiddle(index);
 		})
@ -1673,7 +1688,7 @@
 			filePath: e,
 			name: 'file',
 			formData: {
-				biz: 'sxdPic/' + year + '/' + month
+				biz: year + '/' + month + '/sxdPic'
 			},
 			header: {
 				'X-Access-Token': uni.getStorageSync('token')
@ -1842,16 +1857,22 @@
 			cgdId: showvalue.value.cgdId
 		}
 		pickingInfo(obj).then(res => {
+			console.log(res)
 			uni.showToast({
 				icon: 'none',
-				title: res.message
+				title: res.message ? res.message : '操作成功'
 			})
-			albumlist.value = [];
-			addupimg.value = [];
-			openjianhuo.value = false;
-			open.value = 0;
-			form.cgdId = plsbuy.value[lefttarget.value].id;
-			queryInvo(middletarget.value)
+			if (res.success) {
+				console.log(res.result.cgdInfo)
+				console.log(plsbuy.value[lefttarget.value])
+				albumlist.value = [];
+				addupimg.value = [];
+				openjianhuo.value = false;
+				open.value = 0;
+				form.cgdId = plsbuy.value[lefttarget.value].id;
+				plsbuy.value[lefttarget.value] = res.result.cgdInfo;
+				queryInvo(middletarget.value)
+			}
 		})
 	}
 	const addupimg = ref([])
@ -1869,7 +1890,7 @@
 				filePath: item,
 				name: 'file',
 				formData: {
-					biz: 'jhPic/' + year + '/' + month
+					biz: year + '/' + month + '/jhPic'
 				},
 				header: {
 					'X-Access-Token': uni.getStorageSync('token')
@ -3177,6 +3198,7 @@
 			height: 67vh;
 			display: flex;
 			margin-top: 20rpx;
+
 			.photowall-other-one {
 				width: 28.5%;
 				height: 430rpx;
--- a/pages/Warehouse/warehome.vue
+++ b/pages/Warehouse/warehome.vue
@ -0,0 +1,22 @@
+<template>
+	<view>
+		<view class="home tp"> <image src="/static/index/warehouse/home/Back2.jpg"></image></view>
+	</view>
+</template>
+
+<script setup lang="ts">
+	 
+</script>
+
+<style scoped lang="less">
+.home{
+	width: 100vw;
+	height: 100vh;
+}
+.tp {
+	image{
+		width: 100%;
+		height: 100%;
+	}
+}
+</style>
--- a/pages/procurement/components/details.vue
+++ b/pages/procurement/components/details.vue
@ -2,12 +2,12 @@
 	<view>
 		<view class="qbkyj" v-if="show">
 			<view class="titletop">详情</view>
-			<scroll-view scroll-y="true" class="crdcroll"  scroll-with-animation 
+			<view scroll-y="true" class="crdcroll"  scroll-with-animation 
 					@scrolltolower="scrolltolower">
 					<view  class="fler">
 						<scroll-view class="carditem guodu" v-for="(v,index) in InvoicingList" :key="index"
 						 @touchend="handleTouchEnd($event,v,index)"  @touchstart="touchstart($event,v,index)"
-						  scroll-with-animation scroll-x="true" :scroll-left="v.scrollleft" @scroll="scroll($event,v)">
+						  scroll-with-animation scroll-x="true" :scroll-left="v.scrollleft" >
 								<view class="speitem guodu" :class="v.zk?'spleft':''">
 									<image :src="v.materialImg?serverUrl+v.materialImg:'/static/index/procurement/k.png'" mode="aspectFill"></image>
 									<view class="cardp">
@ -61,10 +61,7 @@
 								</view>
 						</scroll-view>
 					</view>
-					<view style="height:3vw;width: 100%;display: flex;align-items: center;justify-content: center;">
-						<u-loadmore :status="status" :loadText="{nomore:'暂无更多数据'}" v-if="InvoicingList.length>6"/>
-					</view>
-			</scroll-view>
+			</view>
 		</view>
 	</view>
 </template>
@ -106,7 +103,7 @@
 			v.scrollleft = 0
 		}else{
 			v.zk = true;
-			v.scrollleft = 150;
+			v.scrollleft = 180;
 		}
 		solleft(v,i)
 	 }
@ -144,7 +141,7 @@
 		caigouobj.value.Limitnum =  Number(caigouobj.value?.upperLimit)-Number(caigouobj.value.kcsl);
 		caigouobj.value.index = i;
 		v.zk = x>pageX.value?false:true;
-		v.scrollleft = v.zk?150 : 0;
+		v.scrollleft = v.zk?180 : 0;
 		
 	 }
 	 const solleft =(v:any,i:number)=>{
--- a/pages/procurement/material.vue
+++ b/pages/procurement/material.vue
@ -264,6 +264,7 @@
 		queryInvo();
 	}
 	const queryInvo = () => {
+		console.log(form)
 		queryInvoicingList(form).then(res => {
 			res.result.records.forEach(item=>{
 				item.zk = false;
--- a/pages/procurement/purchaseorder.vue
+++ b/pages/procurement/purchaseorder.vue
@ -513,7 +513,9 @@
 		if (!plzinfo.canpull) return
 		queryCgdList(plzinfo).then((res : any) => {
 			plsbuy.value.push(...res.result.records)
-			clickLeftMenu(lefttarget.value, plsbuy.value[lefttarget.value])
+			if(plzinfo.pageNo==1){
+				clickLeftMenu(lefttarget.value, plsbuy.value[lefttarget.value])
+			}
 			if (res.result.records.length < plzinfo.pageSize) {
 				plzinfo.canpull = false;
 			}
--- a/pages/watch/index.vue
+++ b/pages/watch/index.vue
@ -696,7 +696,6 @@
 		handleKey(type)
 	}
 	const savetypeNow = ref(0);
-
 	const doubleclick = () => {
 		savetypeNow.value = leftTargetIndex.value
 		uni.setStorageSync('nuId', filteredMenu.value[savetypeNow.value].nuId);
@ -763,8 +762,11 @@
 						})
 					} else if (typeNow.value === 2) {
 						uni.navigateTo({
-							url: '/pages/Warehouse/Warehouse'
+							url: '/pages/Warehouse/Warehouse',
 						})
+						// uni.navigateTo({
+						// 	url: '/pages/Warehouse/warehome',
+						// })
 					}

 					break
--- a/static/index/warehouse/home/Back2.jpg
+++ b/static/index/warehouse/home/Back2.jpg
--- a/static/index/warehouse/home/warehouse.png
+++ b/static/index/warehouse/home/warehouse.png
Author	SHA1	Message	Date
wangweidong	73333560cf	Merge branch 'main' of http://47.115.223.229:8888/yangjun/hldy_app_mini	2025-11-25 14:39:14 +08:00
wangweidong	a16a1422e2	同步	2025-11-25 14:39:06 +08:00