Browse Source

前端 小程序调整选择合同 sdy

zhongtianhaoyuan 3 years ago
parent
commit
b74606c728

+ 3 - 0
pages/erp/exWarehousing/exWarehousing.vue

@@ -352,11 +352,14 @@
 				this.detailData.warehouseName = helper.erpWarehouse.warehouseName
 				this.detailData.positionId = helper.erpWarehouse.baseId
 				this.detailData.binNumber = this.binNumber
+				console.log(this.detailData.positionId,"仓库id")
+				console.log(this.detailData.binNumber,"仓库号")
 				this.detailData.goodsNameKey = uni.getStorageSync('erpContractNo').goodsNameKey;
 				console.log(this.detailData.goodsNameKey,"|key值")
 				this.detailData.compId = helper.erpWarehouse.compId
 				this.detailData.inOutFlag = 1
 				this.detailData.taskType = "出库任务"
+				this.detailData.pcFlag = 0 
 				let title = ""
 				if(num == 1 ){
 					this.detailData.statusFlag = 1

+ 10 - 4
pages/erp/improvedExWaehousing/improvedExWaehousing.vue

@@ -26,11 +26,14 @@
 </template>
 
 <script>
+	import helper from '@/common/helper.js'; 
 	export default {
 		data() {
 			return {
 				show1:false,
 				show2:false,
+				currentPage: 1,
+				pageSize: 10,
 				warehouseName: '鲅鱼圈一号库',
 				positionName: '102仓位',
 					warehouseList: [
@@ -68,15 +71,18 @@
 			}
 		},
 		onLoad() {
+			console.log(helper.erpWarehouse.baseId,"仓库id")
 			this.getList()
 		},
 		methods: {
 			getList(){
-				that.$api.doRequest('get', '/warehouseInOutInfo/selectWarehouseInOutInfo',
-					that.detailData).then(res => {
+				// this.detailData.positionId = helper.erpWarehouse.baseId
+				// this.detailData.binNumber = this.binNumber
+				this.$api.doRequest('get', '/warehouseInOutInfo/selectWarehouseInOutInfo',
+					{positionId:helper.erpWarehouse.baseId,binNumber:helper.erpWarehouse.binNumber,currentPage:this.currentPage,pageSize:this.pageSize}).then(res => {
 					if (res.data.code == 200) {
-						that.$api.msg(title)
-						uni.navigateBack()
+						// this.$api.msg(title)
+						// uni.navigateBack()
 					}
 				})
 			},

+ 4 - 2
pages/erp/warehousing/selectContractNo.vue

@@ -75,11 +75,13 @@
 				}
 				uni.setStorageSync('erpContractNoList', _list);
 				uni.setStorageSync('erpContractNo', item);
+				console.log(item)
+				return
 				uni.navigateBack({})
 			},
 			getContractNoList() {
 				this.$api.doRequest('get', '/warehouseBaseInfo/selectContractNoList', {
-					// compId: this.compId,
+					compId: helper.erpWarehouse.compId,
 					flag: 7,
 				}).then(res => {
 					if (res.data.code == 200) {
@@ -89,7 +91,7 @@
 					}
 				})
 				this.$api.doRequest('get', '/warehouseBaseInfo/selectContractNoList', {
-					// compId: this.compId,
+					compId: helper.erpWarehouse.compId,
 					flag: 6,
 				}).then(res => {
 					if (res.data.code == 200) {

+ 2 - 0
pages/erp/warehousing/warehousing.vue

@@ -364,6 +364,8 @@
 				this.isEditYF = false
 			},
 			submit() {
+				this.detailData.taskType = "入库任务"
+				this.detailData.pcFlag = 0 
 				if (!this.detailData.grossWeight) {
 					this.$api.msg('毛重不能为空')
 					return