所属项目改为项目订单号

pages/login/wxLogin.vue

@@ -25,8 +25,8 @@
 			decryptPhoneNumber(e){
 				if(uni.getStorageSync('token')){
 					uni.reLaunch({
-						// url:'/pagesStorage/home'
-						url:'/pagesClockin/index'
+						url:'/pagesStorage/home'
+						// url:'/pagesClockin/index'
 					})
 					return
 				}
@@ -54,8 +54,8 @@
 								that.$showToast('登录成功');
 								setTimeout(()=>{
 									uni.reLaunch({
-										// url:'/pagesStorage/home'
-										url:'/pagesClockin/index'
+										url:'/pagesStorage/home'
+										// url:'/pagesClockin/index'
 									})
 								},1500)
 							}else that.$showToast(res.data.msg)

pagesStorage/checkStorage/add.vue

@@ -16,10 +16,10 @@
 						<text>{{checkDto.warehouseName}} ></text>
 					</div>
 				</div>
-				<div class="item" v-if="checkDto.projectName">
-					<div class="left">项目</div>
+				<div class="item" v-if="checkDto.orderNo2">
+					<div class="left">项目订单号</div>
 					<div class="right">
-						<text>{{checkDto.projectName}} ></text>
+						<text>{{checkDto.orderNo2}} ></text>
 					</div>
 				</div>
 				<div class="item">
@@ -82,7 +82,7 @@
 					warehouseId: '',
 					warehouseName: '',
 					projectId: '',
-					projectName: '',
+					orderNo2: '',
 					totalQuantity: 0,
 					details: []
 				},
@@ -97,7 +97,7 @@
 			this.checkDto.warehouseId = option.warehouseId;
 			this.checkDto.warehouseName = option.warehouseName;
 			this.checkDto.projectId = option.projectId;
-			this.checkDto.projectName = option.projectName;
+			this.checkDto.orderNo2 = option.orderNo;
 			this.getGoodList();
 		},
 		// onReachBottom() {

pagesStorage/checkStorage/index.vue

@@ -51,10 +51,10 @@
 					</div>
 				</div>
 				<div class="storage" style="margin-top: 20rpx;">
-					<div class="left">项目</div>
+					<div class="left">项目订单号</div>
 					<div class="right" @tap="selectProject">
-						<text v-if="projectName">{{projectName}} ></text>
-						<text class="tip" v-else>请选择项目 ></text>
+						<text v-if="orderNo">{{orderNo}} ></text>
+						<text class="tip" v-else>请选择项目订单号 ></text>
 					</div>
 				</div>
 				<div class="btn" @tap="addCheck">确定</div>
@@ -63,7 +63,7 @@
 		<u-picker :itemHeight="88" title="仓库" :show="warehouseShow" :columns="warehouseList" keyName="warehouseName" 
 			@cancel="warehouseShow=false" @confirm="warehouseConfirm">
 		</u-picker>
-		<u-picker :itemHeight="88" title="项目" :show="projectShow" :columns="projectList" keyName="projectName" 
+		<u-picker :itemHeight="88" title="项目订单号" :show="projectShow" :columns="projectList" keyName="orderNo" 
 			@cancel="projectShow=false" @confirm="projectConfirm" :immediateChange="true">
 		</u-picker>
 	</view>
@@ -98,7 +98,7 @@
 				warehouseShow:false,
 				warehouseList:[],
 				projectId:'',
-				projectName:'',
+				orderNo:'',
 				projectShow:false,
 				projectList:[]
 			}
@@ -148,7 +148,7 @@
 			addCheck(){
 				if(!this.warehouseId) return this.$showToast('请先选择仓库')
 				uni.navigateTo({
-					url:'/pagesStorage/checkStorage/add?warehouseId='+this.warehouseId+'&warehouseName='+this.warehouseName+'&projectId='+this.projectId+'&projectName='+this.projectName
+					url:'/pagesStorage/checkStorage/add?warehouseId='+this.warehouseId+'&warehouseName='+this.warehouseName+'&projectId='+this.projectId+'&orderNo='+this.orderNo
 				})
 			},
 			close(){
@@ -174,7 +174,7 @@
 			selectProject(){
 				this.projectShow = true;
 				this.$nextTick(()=>{
-					this.$api.get('/wms/project/page',{page:1,limit:-1}).then(res=>{
+					this.$api.get('/wms/project/getOrderPage',{page:1,limit:-1}).then(res=>{
 						if(res.data.code===0){
 							this.projectList = [res.data.data.list];
 						}else this.$showToast(res.data.msg)
@@ -183,7 +183,7 @@
 			},
 			projectConfirm(e){
 				this.projectId = e.value[0].id;
-				this.projectName = e.value[0].projectName;
+				this.orderNo = e.value[0].orderNo;
 				this.projectShow = false;
 			}
 		}

pagesStorage/inStorage/add.vue

@@ -18,10 +18,10 @@
 					</div>
 				</div>
 				<div class="item">
-					<div class="left"><span>*</span>所属项目</div>
+					<div class="left"><span>*</span>项目订单号</div>
 					<div class="right" @tap="selectProject">
-						<text v-if="receiptDto.projectName">{{receiptDto.projectName}} ></text>
-						<text class="tip" v-else>请选择项目 ></text>
+						<text v-if="receiptDto.orderNo2">{{receiptDto.orderNo2}} ></text>
+						<text class="tip" v-else>请选择项目订单号 ></text>
 					</div>
 				</div>
 				<div class="item">
@@ -109,7 +109,7 @@
 		<u-picker :itemHeight="88" title="仓库" :show="warehouseShow" :columns="warehouseList" keyName="warehouseName" 
 			@cancel="warehouseShow=false" @confirm="warehouseConfirm" :immediateChange="true" style="height: 500rpx;">
 		</u-picker>
-		<u-picker :itemHeight="88" title="所属项目" :show="projectShow" :columns="projectList" keyName="projectName" 
+		<u-picker :itemHeight="88" title="项目订单号" :show="projectShow" :columns="projectList" keyName="orderNo" 
 			@cancel="projectShow=false" @confirm="projectConfirm" :immediateChange="true">
 		</u-picker>
 		<u-picker :itemHeight="88" title="入库类型" :show="receiptTypeShow" :columns="receiptTypeList" keyName="dictLabel" 
@@ -147,7 +147,7 @@
 					arrivalDate:'',
 					details: [],
 					projectId:'',
-					projectName:'',
+					orderNo2:'',
 					purchaser:'',
 				},
 				warehouseShow:false,
@@ -189,7 +189,7 @@
 			selectProject(){
 				this.projectShow = true;
 				this.$nextTick(()=>{
-					this.$api.get('/wms/project/page',{page:1,limit:-1}).then(res=>{
+					this.$api.get('/wms/project/getOrderPage',{page:1,limit:-1}).then(res=>{
 						if(res.data.code===0){
 							this.projectList = [res.data.data.list];
 						}else this.$showToast(res.data.msg)
@@ -198,7 +198,7 @@
 			},
 			projectConfirm(e){
 				this.receiptDto.projectId = e.value[0].id;
-				this.receiptDto.projectName = e.value[0].projectName;
+				this.receiptDto.orderNo2 = e.value[0].orderNo;
 				this.projectShow = false;
 			},
 			selectReceiptType(){
@@ -312,7 +312,7 @@
 			saveReceipt(){
 				if(!this.receiptDto.orderNo) return this.$showToast('请输入入库单号');
 				if(!this.receiptDto.warehouseId) return this.$showToast('请选择仓库');
-				if(!this.receiptDto.projectId) return this.$showToast('请选择所属项目');
+				if(!this.receiptDto.projectId) return this.$showToast('请选择项目订单号');
 				if(!this.receiptDto.optType) return this.$showToast('请选择入库类型');
 				if(!this.receiptDto.arrivalDate) return this.$showToast('请选择到货日期');
 				if(!this.receiptDto.purchaser) return this.$showToast('请输入采购负责人');

pagesStorage/inStorage/index.vue

@@ -40,8 +40,8 @@
 						<div class="nr">{{ item.arrivalDate||'' }}</div>
 					</div>
 					<div class="pre">
-						<div class="title">所属项目</div>
-						<div class="nr">{{ item.projectName||'' }}</div>
+						<div class="title">项目订单号</div>
+						<div class="nr">{{ item.orderNo2||'' }}</div>
 					</div>
 					<div class="pre bfb">
 						<div class="title">时间</div>
@@ -103,9 +103,11 @@
 					orderStatus:''
 				},
 				dataList:[],
+				orderList:[]
 			}
 		},
 		async onLoad() {
+			await this.selectProject();
 			await this.getSeceiptStatus();
 			await this.getSeceiptType();
 			this.getDataList();
@@ -115,6 +117,15 @@
 			this.getDataList();
 		},
 		methods:{
+			selectProject(){
+				this.$nextTick(()=>{
+					this.$api.get('/wms/project/getOrderPage',{page:1,limit:-1}).then(res=>{
+						if(res.data.code===0){
+							this.orderList = res.data.data.list;
+						}else this.$showToast(res.data.msg)
+					})
+				})
+			},
 			changeType(status){
 				this.dataList = [];
 				this.params.orderStatus = status;
@@ -149,6 +160,7 @@
 							this.params.page++;
 							this.dataList = [...this.dataList,...res.data.data.list];
 							this.dataList.forEach((d,i)=>{
+								d.orderNo2 = this.orderList.find(o=>o.id==d.projectId)?.orderNo||'';
 								this.$set(this.dataList[i],'goodsList',[]);
 								this.$set(this.dataList[i],'goodsShow',false);
 							})
@@ -240,7 +252,7 @@
 						margin-top: 36rpx;
 						display: flex;
 						.title{
-							width: 116rpx;
+							width: 126rpx;
 							font-family: PingFangSC, PingFang SC;
 							font-weight: 400;
 							font-size: 24rpx;
@@ -248,7 +260,7 @@
 							text-align: left;
 						}
 						.nr{
-							width: calc(100% - 116rpx);
+							width: calc(100% - 126rpx);
 							font-family: PingFangSC, PingFang SC;
 							font-weight: bold;
 							font-size: 26rpx;

pagesStorage/moveStorage/add.vue

@@ -18,10 +18,10 @@
 					</div>
 				</div>
 				<div class="item">
-					<div class="left"><span>*</span>所属项目</div>
+					<div class="left"><span>*</span>项目订单号</div>
 					<div class="right" @tap="selectProject">
-						<text v-if="movementDto.projectName">{{movementDto.projectName}} ></text>
-						<text class="tip" v-else>请选择项目 ></text>
+						<text v-if="movementDto.orderNo2">{{movementDto.orderNo2}} ></text>
+						<text class="tip" v-else>请选择项目订单号 ></text>
 					</div>
 				</div>
 				<div class="item">
@@ -82,7 +82,7 @@
 		<u-picker :itemHeight="88" title="源仓库" :show="sourceWarehouseShow" :columns="sourceWarehouseList" keyName="warehouseName" 
 			@cancel="sourceWarehouseShow=false" @confirm="sourceWarehouseConfirm" :immediateChange="true">
 		</u-picker>
-		<u-picker :itemHeight="88" title="所属项目" :show="projectShow" :columns="projectList" keyName="projectName" 
+		<u-picker :itemHeight="88" title="项目订单号" :show="projectShow" :columns="projectList" keyName="orderNo" 
 			@cancel="projectShow=false" @confirm="projectConfirm" :immediateChange="true">
 		</u-picker>
 		<u-picker :itemHeight="88" title="目标仓库" :show="targetWarehouseShow" :columns="targetWarehouseList" keyName="warehouseName" 
@@ -108,7 +108,7 @@
 					totalQuantity: 0,
 					details: [],
 					projectId:'',
-					projectName:''
+					orderNo2:''
 				},
 				sourceWarehouseShow:false,
 				sourceWarehouseList:[],
@@ -140,7 +140,7 @@
 			selectProject(){
 				this.projectShow = true;
 				this.$nextTick(()=>{
-					this.$api.get('/wms/project/page',{page:1,limit:-1}).then(res=>{
+					this.$api.get('/wms/project/getOrderPage',{page:1,limit:-1}).then(res=>{
 						if(res.data.code===0){
 							this.projectList = [res.data.data.list];
 						}else this.$showToast(res.data.msg)
@@ -149,7 +149,7 @@
 			},
 			projectConfirm(e){
 				this.movementDto.projectId = e.value[0].id;
-				this.movementDto.projectName = e.value[0].projectName;
+				this.movementDto.orderNo2 = e.value[0].orderNo;
 				this.projectShow = false;
 			},
 			selectTargetWarehouse(){
@@ -176,7 +176,7 @@
 			},
 			toAddGoods(){
 				if(!this.movementDto.sourceWarehouseId) return this.$showToast('请选择源仓库')
-				if(!this.movementDto.projectId) return this.$showToast('请选择项目')
+				if(!this.movementDto.projectId) return this.$showToast('请选择项目订单号')
 				let ids = this.movementDto.details.map(d=>d.skuId);
 				uni.navigateTo({
 					url:'/pagesStorage/moveStorage/goods?ids='+ids+'&warehouseId='+this.movementDto.sourceWarehouseId+'&projectId='+this.movementDto.projectId,
@@ -221,7 +221,7 @@
 			saveShipment(){
 				if(!this.movementDto.orderNo) return this.$showToast('请输入移库单号');
 				if(!this.movementDto.sourceWarehouseId) return this.$showToast('请选择源仓库')
-				if(!this.movementDto.projectId) return this.$showToast('请选择项目')
+				if(!this.movementDto.projectId) return this.$showToast('请选择项目订单号')
 				if(!this.movementDto.targetWarehouseId) return this.$showToast('请选择目标仓库')
 				
 				let temp = JSON.parse(JSON.stringify(this.movementDto.details));

pagesStorage/moveStorage/index.vue

@@ -28,8 +28,8 @@
 						<div class="nr">{{ item.targetWarehouseName||'' }}</div>
 					</div>
 					<div class="pre">
-						<div class="title">所属项目</div>
-						<div class="nr">{{ item.projectName||'' }}</div>
+						<div class="title">项目订单号</div>
+						<div class="nr">{{ item.orderNo2||'' }}</div>
 					</div>
 					<div class="pre">
 						<div class="title">移库人</div>
@@ -90,9 +90,11 @@
 					orderStatus:''
 				},
 				dataList:[],
+				orderList:[]
 			}
 		},
 		async onLoad() {
+			await this.selectProject();
 			await this.getMovementStatus();
 			this.getDataList();
 		},
@@ -101,6 +103,15 @@
 			this.getDataList();
 		},
 		methods:{
+			selectProject(){
+				this.$nextTick(()=>{
+					this.$api.get('/wms/project/getOrderPage',{page:1,limit:-1}).then(res=>{
+						if(res.data.code===0){
+							this.orderList = res.data.data.list;
+						}else this.$showToast(res.data.msg)
+					})
+				})
+			},
 			changeType(status){
 				this.dataList = [];
 				this.params.orderStatus = status;
@@ -127,6 +138,7 @@
 							this.params.page++;
 							this.dataList = [...this.dataList,...res.data.data.list];
 							this.dataList.forEach((d,i)=>{
+								d.orderNo2 = this.orderList.find(o=>o.id==d.projectId)?.orderNo||'';
 								this.$set(this.dataList[i],'goodsList',[]);
 								this.$set(this.dataList[i],'goodsShow',false);
 							})
@@ -218,7 +230,7 @@
 						margin-top: 36rpx;
 						display: flex;
 						.title{
-							width: 116rpx;
+							width: 126rpx;
 							font-family: PingFangSC, PingFang SC;
 							font-weight: 400;
 							font-size: 24rpx;
@@ -226,7 +238,7 @@
 							text-align: left;
 						}
 						.nr{
-							width: calc(100% - 116rpx);
+							width: calc(100% - 126rpx);
 							font-family: PingFangSC, PingFang SC;
 							font-weight: bold;
 							font-size: 26rpx;

pagesStorage/outStorage/add.vue

@@ -18,10 +18,10 @@
 					</div>
 				</div>
 				<div class="item">
-					<div class="left"><span>*</span>所属项目</div>
+					<div class="left"><span>*</span>项目订单号</div>
 					<div class="right" @tap="selectProject">
-						<text v-if="shipmentDto.projectName">{{shipmentDto.projectName}} ></text>
-						<text class="tip" v-else>请选择项目 ></text>
+						<text v-if="shipmentDto.orderNo2">{{shipmentDto.orderNo2}} ></text>
+						<text class="tip" v-else>请选择项目订单号 ></text>
 					</div>
 				</div>
 				<div class="item">
@@ -108,7 +108,7 @@
 		<u-picker :itemHeight="88" title="仓库" :show="warehouseShow" :columns="warehouseList" keyName="warehouseName" 
 			@cancel="warehouseShow=false" @confirm="warehouseConfirm" :immediateChange="true">
 		</u-picker>
-		<u-picker :itemHeight="88" title="所属项目" :show="projectShow" :columns="projectList" keyName="projectName" 
+		<u-picker :itemHeight="88" title="项目订单号" :show="projectShow" :columns="projectList" keyName="orderNo" 
 			@cancel="projectShow=false" @confirm="projectConfirm" :immediateChange="true">
 		</u-picker>
 		<u-picker :itemHeight="88" title="出库类型" :show="ShipmentTypeShow" :columns="ShipmentTypeList" keyName="dictLabel" 
@@ -143,7 +143,7 @@
 					collector:'',
 					details: [],
 					projectId:'',
-					projectName:''
+					orderNo2:''
 				},
 				warehouseShow:false,
 				warehouseList:[],
@@ -182,7 +182,7 @@
 			selectProject(){
 				this.projectShow = true;
 				this.$nextTick(()=>{
-					this.$api.get('/wms/project/page',{page:1,limit:-1}).then(res=>{
+					this.$api.get('/wms/project/getOrderPage',{page:1,limit:-1}).then(res=>{
 						if(res.data.code===0){
 							this.projectList = [res.data.data.list];
 						}else this.$showToast(res.data.msg)
@@ -191,7 +191,7 @@
 			},
 			projectConfirm(e){
 				this.shipmentDto.projectId = e.value[0].id;
-				this.shipmentDto.projectName = e.value[0].projectName;
+				this.shipmentDto.orderNo2 = e.value[0].orderNo;
 				this.projectShow = false;
 			},
 			selectShipmentType(){
@@ -232,7 +232,7 @@
 			},
 			toAddGoods(){
 				if(!this.shipmentDto.warehouseId) return this.$showToast('请选择仓库')
-				if(!this.shipmentDto.projectId) return this.$showToast('请选择项目')
+				if(!this.shipmentDto.projectId) return this.$showToast('请选择项目订单号')
 				let ids = this.shipmentDto.details.map(d=>d.skuId);
 				uni.navigateTo({
 					url:'/pagesStorage/outStorage/goods?ids='+ids+'&warehouseId='+this.shipmentDto.warehouseId+'&projectId='+this.shipmentDto.projectId,
@@ -293,7 +293,7 @@
 			saveShipment(){
 				if(!this.shipmentDto.orderNo) return this.$showToast('请输入出库单号');
 				if(!this.shipmentDto.warehouseId) return this.$showToast('请选择仓库');
-				if(!this.shipmentDto.projectId) return this.$showToast('请选择所属项目');
+				if(!this.shipmentDto.projectId) return this.$showToast('请选择项目订单号');
 				if(!this.shipmentDto.optType) return this.$showToast('请选择出库类型');
 				if(!this.shipmentDto.shipmentDate) return this.$showToast('请选择出库日期');
 				if(!this.shipmentDto.collector) return this.$showToast('请输入领料人');

pagesStorage/outStorage/index.vue

@@ -40,8 +40,8 @@
 						<div class="nr">{{ item.shipmentDate||'' }}</div>
 					</div>
 					<div class="pre">
-						<div class="title">所属项目</div>
-						<div class="nr">{{ item.projectName||'' }}</div>
+						<div class="title">项目订单号</div>
+						<div class="nr">{{ item.orderNo2||'' }}</div>
 					</div>
 					<div class="pre bfb">
 						<div class="title">时间</div>
@@ -103,9 +103,11 @@
 					orderStatus:''
 				},
 				dataList:[],
+				orderList:[]
 			}
 		},
 		async onLoad() {
+			await this.selectProject();
 			await this.getSeceiptStatus();
 			await this.getSeceiptType();
 			this.getDataList();
@@ -115,6 +117,15 @@
 			this.getDataList();
 		},
 		methods:{
+			selectProject(){
+				this.$nextTick(()=>{
+					this.$api.get('/wms/project/getOrderPage',{page:1,limit:-1}).then(res=>{
+						if(res.data.code===0){
+							this.orderList = res.data.data.list;
+						}else this.$showToast(res.data.msg)
+					})
+				})
+			},
 			changeType(status){
 				this.dataList = [];
 				this.params.orderStatus = status;
@@ -149,6 +160,7 @@
 							this.params.page++;
 							this.dataList = [...this.dataList,...res.data.data.list];
 							this.dataList.forEach((d,i)=>{
+								d.orderNo2 = this.orderList.find(o=>o.id==d.projectId)?.orderNo||'';
 								this.$set(this.dataList[i],'goodsList',[]);
 								this.$set(this.dataList[i],'goodsShow',false);
 							})
@@ -240,7 +252,7 @@
 						margin-top: 36rpx;
 						display: flex;
 						.title{
-							width: 116rpx;
+							width: 126rpx;
 							font-family: PingFangSC, PingFang SC;
 							font-weight: 400;
 							font-size: 24rpx;
@@ -248,7 +260,7 @@
 							text-align: left;
 						}
 						.nr{
-							width: calc(100% - 116rpx);
+							width: calc(100% - 126rpx);
 							font-family: PingFangSC, PingFang SC;
 							font-weight: bold;
 							font-size: 26rpx;