前端 sdy

pages/erp/exWarehousing/exWarehousing.vue

@@ -6,8 +6,15 @@
 		</view>
 		<view class="content">
 			<view class="row">
+				<view class="left">任务编号</view>
+				<view @click='inOutShow=true'>{{detailData.inOutTaskNo ? detailData.inOutTaskNo : "请选择任务编号"}}</view>
+				<u-picker :range="inOutNoList" range-key="inOutTaskNo" @confirm='inOutChange' v-model="inOutShow" mode="selector">
+				</u-picker>
+			</view>
+			<view class="row row-bottom">
 				<view class="left">合同编号</view>
-				<view @click='slectcontractNo'>{{detailData.contractNo}}</view>
+				<!-- <view @click='slectcontractNo'>{{detailData.contractNo}}</view> -->
+				<input v-model='detailData.contractNo' class="right-bottom" placeholder="暂未获取到合同编号" disabled=""></input>
 			</view>
 			<view class="row">
 				<view class="left">货名</view>
@@ -275,7 +282,9 @@
 					month: true,
 					day: true,
 				},
-				// netWeight: 0,
+				netWeight: "",
+				inOutShow:false,
+				inOutNoList:[],
 			}
 		},
 		computed: {
@@ -347,10 +356,31 @@
 			if (helper.erpWarehouse.personCharge) {
 				this.detailData.agent = helper.erpWarehouse.personCharge
 			}
+			//查看任务编号
+			this.inOutNo()
 			//经办人
 			this.handler()
 		},
 		methods: {
+			inOutNo(){
+				this.$api.doRequest('get', '/inOutWarehouseTask/selectInOutWarehouseNo', {flag:1}).then(res => {
+					this.inOutNoList = res.data.data
+					this.detailData.inOutTaskNo = this.inOutNoList[0].inOutTaskNo
+					this.detailData.agent = this.inOutNoList[0].agent
+					this.detailData.contractNo = this.inOutNoList[0].contractNo
+					this.detailData.goodsName = this.inOutNoList[0].goodsName
+					this.detailData.grade = this.inOutNoList[0].grade
+					this.detailData.inOutType = this.inOutNoList[0].inOutType
+				})
+			},
+			inOutChange(e){
+				this.detailData.inOutTaskNo = this.inOutNoList[e[0]].inOutTaskNo
+				this.detailData.agent = this.inOutNoList[e[0]].agent
+				this.detailData.contractNo = this.inOutNoList[e[0]].contractNo
+				this.detailData.goodsName = this.inOutNoList[e[0]].goodsName
+				this.detailData.grade = this.inOutNoList[e[0]].grade
+				this.detailData.inOutType = this.inOutNoList[e[0]].inOutType
+			},
 			toUpperCase(val) {
 				this.detailData.boxNo = val.detail.value.toUpperCase()
 			},

pages/erp/improvedExWaehousing/improvedExWaehousingDetail.vue

@@ -6,8 +6,15 @@
 		</view>
 		<view class="content">
 			<view class="row">
+				<view class="left">任务编号</view>
+				<view @click='inOutShow=true'>{{detailData.inOutTaskNo ? detailData.inOutTaskNo : "请选择任务编号"}}</view>
+				<u-picker :range="inOutNoList" range-key="inOutTaskNo" @confirm='inOutChange' v-model="inOutShow" mode="selector">
+				</u-picker>
+			</view>
+			<view class="row row-bottom">
 				<view class="left">合同编号</view>
-				<view @click='slectcontractNo'>{{detailData.contractNo}}</view>
+				<!-- <view @click='slectcontractNo'>{{detailData.contractNo}}</view> -->
+				<input v-model='detailData.contractNo' class="right-bottom" placeholder="暂未获取到合同编号" disabled></input>
 			</view>
 			<view class="row">
 				<view class="left">货名</view>
@@ -235,6 +242,9 @@
 				},
 				netWeight: "",
 				imgUrl: [], //图片展示
+				netWeight: "",
+				inOutShow:false,
+				inOutNoList:[],
 			}
 		},
 		computed: {
@@ -298,10 +308,31 @@
 			}
 			//出库类型
 			this.outWarehouse()
+			//查看任务编号
+			this.inOutNo()
 			//经办人
 			this.handler()
 		},
 		methods: {
+			inOutNo(){
+				this.$api.doRequest('get', '/inOutWarehouseTask/selectInOutWarehouseNo', {flag:1}).then(res => {
+					this.inOutNoList = res.data.data
+					this.detailData.inOutTaskNo = this.inOutNoList[0].inOutTaskNo
+					this.detailData.agent = this.inOutNoList[0].agent
+					this.detailData.contractNo = this.inOutNoList[0].contractNo
+					this.detailData.goodsName = this.inOutNoList[0].goodsName
+					this.detailData.grade = this.inOutNoList[0].grade
+					this.detailData.inOutType = this.inOutNoList[0].inOutType
+				})
+			},
+			inOutChange(e){
+				this.detailData.inOutTaskNo = this.inOutNoList[e[0]].inOutTaskNo
+				this.detailData.agent = this.inOutNoList[e[0]].agent
+				this.detailData.contractNo = this.inOutNoList[e[0]].contractNo
+				this.detailData.goodsName = this.inOutNoList[e[0]].goodsName
+				this.detailData.grade = this.inOutNoList[e[0]].grade
+				this.detailData.inOutType = this.inOutNoList[e[0]].inOutType
+			},
 			toUpperCase(val){
 				this.detailData.boxNo = val.detail.value.toUpperCase()
 			},

pages/erp/improvedWrehousing/improvedWrehousingDetail.vue

@@ -6,8 +6,15 @@
 		</view>
 		<view class="content">
 			<view class="row">
+				<view class="left">任务编号</view>
+				<view @click='inOutShow=true'>{{detailData.inOutTaskNo ? detailData.inOutTaskNo : "请选择任务编号"}}</view>
+				<u-picker :range="inOutNoList" range-key="inOutTaskNo" @confirm='inOutChange' v-model="inOutShow" mode="selector">
+				</u-picker>
+			</view>
+			<view class="row row-bottom">
 				<view class="left">合同编号</view>
-				<view @click='slectcontractNo'>{{detailData.contractNo}}</view>
+				<!-- <view @click='slectcontractNo'>{{detailData.contractNo}}</view> -->
+				<input  v-model='detailData.contractNo' class="right-bottom" placeholder="暂未获取到合同编号" disabled></input>
 			</view>
 			<view class="row">
 				<view class="left">货名</view>
@@ -269,7 +276,8 @@
 					netWeight: 0,
 					warehouseInOutDetail: {},
 				},
-				
+				 inOutShow:false,
+				 inOutNoList:[],
 			}
 		},
 		onLoad(options) {
@@ -338,8 +346,8 @@
 					// this.detailData.carNo = uni.setStorageSync('erpContractNoList')[0].carNo
 				}
 			
-			// 获取入库类型
-			// this.getrkType()
+			// 获取任务编号列表
+			this.inOutNo()
 			//获取经办人
 			this.getPerson()
 		},
@@ -349,6 +357,26 @@
 			},
 		},
 		methods: {
+			inOutNo(){
+				this.$api.doRequest('get', '/inOutWarehouseTask/selectInOutWarehouseNo', {flag:2}).then(res => {
+					this.inOutNoList = res.data.data
+					this.inOutNoList = res.data.data
+					this.detailData.inOutTaskNo = this.inOutNoList[0].inOutTaskNo
+					this.detailData.agent = this.inOutNoList[0].agent
+					this.detailData.contractNo = this.inOutNoList[0].contractNo
+					this.detailData.goodsName = this.inOutNoList[0].goodsName
+					this.detailData.grade = this.inOutNoList[0].grade
+					this.detailData.inOutType = this.inOutNoList[0].inOutType
+				})
+			},
+			inOutChange(e){
+				this.detailData.inOutTaskNo = this.inOutNoList[e[0]].inOutTaskNo
+				this.detailData.agent = this.inOutNoList[e[0]].agent
+				this.detailData.contractNo = this.inOutNoList[e[0]].contractNo
+				this.detailData.goodsName = this.inOutNoList[e[0]].goodsName
+				this.detailData.grade = this.inOutNoList[e[0]].grade
+				this.detailData.inOutType = this.inOutNoList[e[0]].inOutType
+			},
 			toUpperCase(val){
 				this.detailData.boxNo = val.detail.value.toUpperCase()
 			},
@@ -360,7 +388,6 @@
 			},
 			outtypeChange(e){
 				this.detailData.outType=this.multiSelector[e].name
-				console.log(e)
 			},
 			getContractNoList() {
 				// this.imgUrl = []
@@ -369,19 +396,14 @@
 					flag: 7,
 				}).then(res => {
 					if (res.data.code == 200) {
-						console.log(res.data.data)
-						console.log(this.id)
 						for (let i = 0; i < res.data.data.length; i++) {
-							console.log(this.contractNo)
 							if (res.data.data[i].contractNo == this.detailData.contractNo) {
 								if (res.data.data[i].tranCarInfoList) {
 									this.isPC = true
 									uni.setStorageSync('erpContractNoCarList', res.data.data[i].tranCarInfoList);
 									
 									if(this.detailData.carNo){
-									console.log(uni.getStorageSync('erpContractNoCarList'))
 										for(let i = 0 ; i < uni.getStorageSync('erpContractNoCarList').length;i++){
-											console.log(uni.getStorageSync('erpContractNoCarList'))
 											if(uni.getStorageSync('erpContractNoCarList')[i].carNo == this.detailData.carNo)
 											this.detailData.tranCarNo = uni.getStorageSync('erpContractNoCarList')[i].tranCarNo
 										}
@@ -839,11 +861,11 @@
 					}
 				})
 			},
-			slectcontractNo() {
-				uni.navigateTo({
-					url: '/pages/erp/warehousing/selectContractNo?compId=' + this.compId
-				})
-			},
+			// slectcontractNo() {
+			// 	uni.navigateTo({
+			// 		url: '/pages/erp/warehousing/selectContractNo?compId=' + this.compId
+			// 	})
+			// },
 			slectCarNo() {
 				uni.navigateTo({
 					url: '/pages/erp/warehousing/selectCarNo'

pages/erp/warehousing/warehousing.vue

@@ -6,8 +6,15 @@
 		</view>
 		<view class="content">
 			<view class="row">
+				<view class="left">任务编号</view>
+				<view @click='inOutShow=true'>{{detailData.inOutTaskNo}}</view>
+				<u-picker :range="inOutNoList" range-key="inOutTaskNo" @confirm='inOutChange' v-model="inOutShow" mode="selector">
+				</u-picker>
+			</view>
+			<view class="row row-bottom">
 				<view class="left">合同编号</view>
-				<view @click='slectcontractNo'>{{detailData.contractNo}}</view>
+				<!-- <view @click='slectcontractNo'>{{detailData.contractNo}}</view> -->
+				<input v-model='detailData.contractNo' class="right-bottom" placeholder="未获取到合同编号" disabled></input>
 			</view>
 			<view class="row">
 				<view class="left">货名</view>
@@ -36,26 +43,26 @@
 			</view>
 			<view class="row row-bottom">
 				<view class="left">净重（吨）</view>
-				<input type="number" @input='' v-model='netWeight' class="right-bottom" placeholder="不可编辑,自动计算"
+				<input type="number"  v-model='netWeight' class="right-bottom" placeholder="不可编辑,自动计算"
 					:disabled="true"></input>
 			</view>
 			<view class="row row-bottom">
 				<view class="left">扣款（元/吨）</view>
-				<input type="number" @input='' v-model='detailData.deductionAmount' class="right-bottom" placeholder="输入扣款"></input>
+				<input type="number" v-model='detailData.deductionAmount' class="right-bottom" placeholder="输入扣款"></input>
 			</view>
 			<view class="row row-bottom" v-if="detailData.type=='潮粮'">
 				<view class="left">扣重比</view>
-				<input type="number" @input='' v-model='detailData.buckleWeightRatio' class="right-bottom" placeholder="输入扣重比"
+				<input type="number" v-model='detailData.buckleWeightRatio' class="right-bottom" placeholder="输入扣重比"
 					@input="pureWeightCount"></input>
 			</view>
 			<view class="row row-bottom" v-if="detailData.type=='潮粮'">
 				<view class="left">干粮水分（%）</view>
-				<input type="number" @input='' v-model='detailData.solidGrainWater' class="right-bottom" placeholder="输入干粮水分占比"
+				<input type="number"  v-model='detailData.solidGrainWater' class="right-bottom" placeholder="输入干粮水分占比"
 					@input="pureWeightCount"></input>
 			</view>
 			<view class="row row-bottom" v-if="detailData.type=='潮粮'">
 				<view class="left">潮粮水分（%）</view>
-				<input type="number" @input='' v-model='detailData.tidalGrainWater' class="right-bottom" placeholder="输入潮粮水分占比"
+				<input type="number"  v-model='detailData.tidalGrainWater' class="right-bottom" placeholder="输入潮粮水分占比"
 					@input="pureWeightCount"></input>
 			</view>
 			<view class="row row-bottom" v-if="detailData.type=='潮粮'">
@@ -97,7 +104,7 @@
 			</view>
 			<view class="row row-bottom">
 				<view class="left">车牌号</view>
-				<input v-if="!isPC" @input='' v-model='detailData.carNo' class="right-bottom"
+				<input v-if="!isPC"  v-model='detailData.carNo' class="right-bottom"
 					placeholder="请输入车牌号"></input>
 				<view @click='slectCarNo' v-if="isPC">{{detailData.carNo}}</view>
 			</view>
@@ -208,6 +215,7 @@
 				show6: false,
 				isPC: true,
 				isSelectType:true,
+				inOutShow:false,
 				params: {
 					year: true,
 					month: true,
@@ -244,6 +252,7 @@
 						grade: "等外"
 					}
 				],
+				inOutNoList:[],
 				show8:false,
 				handlerList: [],
 				warehousingTypeList: [{constValue:'移库入库'},{constValue:'退库'}],
@@ -251,7 +260,7 @@
 				maxSize: 50 * 1024 * 1024, //限制文件大小 50M
 				btnLoading: false, //防止重复点击
 				isAdd: true,
-				// netWeight: 0,
+				netWeight: "",
 				inOutDate1: "",
 				detailData: {
 					contractNo: "请选择合同编号",
@@ -281,7 +290,6 @@
 			...mapState(['hasLogin', 'userInfo']),
 		},
 		onShow() {
-		console.log("当前合同",uni.getStorageSync('erpContractNo'))
 			let _data = uni.getStorageSync('erpContractNo')==''?{}:uni.getStorageSync('erpContractNo')
 			if(helper.erpWarehouse.personCharge)
 			this.detailData.agent = helper.erpWarehouse.personCharge
@@ -356,8 +364,8 @@
 			if (!this.detailData.goodsName) {
 				this.detailData.goodsName = '货名'
 			}
-			// 获取入库类型
-			// this.getrkType()
+			// 获取任务编号
+			this.inOutNo()
 			//获取经办人
 			this.getPerson()
 
@@ -368,6 +376,25 @@
 			},
 		},
 		methods: {
+			inOutNo(){
+				this.$api.doRequest('get', '/inOutWarehouseTask/selectInOutWarehouseNo', {flag :2}).then(res => {
+					this.inOutNoList = res.data.data
+					this.detailData.inOutTaskNo = this.inOutNoList[0].inOutTaskNo
+					this.detailData.agent = this.inOutNoList[0].agent
+					this.detailData.contractNo = this.inOutNoList[0].contractNo
+					this.detailData.goodsName = this.inOutNoList[0].goodsName
+					this.detailData.grade = this.inOutNoList[0].grade
+					this.detailData.inOutType = this.inOutNoList[0].inOutType
+				})
+			},
+			inOutChange(e){
+				this.detailData.inOutTaskNo = this.inOutNoList[e[0]].inOutTaskNo
+				this.detailData.agent = this.inOutNoList[e[0]].agent
+				this.detailData.contractNo = this.inOutNoList[e[0]].contractNo
+				this.detailData.goodsName = this.inOutNoList[e[0]].goodsName
+				this.detailData.grade = this.inOutNoList[e[0]].grade
+					this.detailData.inOutType = this.inOutNoList[e[0]].inOutType
+			},
 			toUpperCase(val){
 				this.detailData.boxNo = val.detail.value.toUpperCase()
 			},
@@ -831,11 +858,11 @@
 					}
 				})
 			},
-			slectcontractNo() {
-				uni.navigateTo({
-					url: '/pages/erp/warehousing/selectContractNo?compId=' + this.compId
-				})
-			},
+			// slectcontractNo() {
+			// 	uni.navigateTo({
+			// 		url: '/pages/erp/warehousing/selectContractNo?compId=' + this.compId
+			// 	})
+			// },
 			slectCarNo() {
 				uni.navigateTo({
 					url: '/pages/erp/warehousing/selectCarNo'