Browse Source

出库经办人 sdy

zhongtianhaoyuan 3 years ago
parent
commit
5a8b3678fc
2 changed files with 11 additions and 14 deletions
  1. 5 11
      pages/erp/exWarehousing/exWarehousing.vue
  2. 6 3
      pages/erp/index.vue

+ 5 - 11
pages/erp/exWarehousing/exWarehousing.vue

@@ -61,7 +61,7 @@
 			<view class="row">
 			<view class="row">
 				<view class="left">经办人</view>
 				<view class="left">经办人</view>
 				<view @click='show6=true'>{{detailData.agent}}</view>
 				<view @click='show6=true'>{{detailData.agent}}</view>
-				<u-picker :range="handlerList" range-key="name" @confirm='handlerPicker($event)' v-model="show6"
+				<u-picker :range="handlerList" range-key="staffName" @confirm='handlerPicker($event)' v-model="show6"
 					mode="selector">
 					mode="selector">
 				</u-picker>
 				</u-picker>
 			</view>
 			</view>
@@ -209,7 +209,6 @@
 				},
 				},
 				inOutDate1: "",
 				inOutDate1: "",
 			}
 			}
-
 		},
 		},
 		onLoad(options) {
 		onLoad(options) {
 			this.id = options.id
 			this.id = options.id
@@ -219,8 +218,7 @@
 			//出库类型
 			//出库类型
 			this.outWarehouse()
 			this.outWarehouse()
 			//经办人
 			//经办人
-			//this.handler()
-			// 
+			this.handler()
 		},
 		},
 		methods: {
 		methods: {
 			outWarehouse(){
 			outWarehouse(){
@@ -233,9 +231,9 @@
 			handler(){
 			handler(){
 				this.$api.doRequest('get', '/staff/query/getStaffListByCompIdAndWarehouseId', {
 				this.$api.doRequest('get', '/staff/query/getStaffListByCompIdAndWarehouseId', {
 					compId:helper.erpWarehouse.compId,
 					compId:helper.erpWarehouse.compId,
-					
+					warehouseId:helper.erpWarehouse.warehouseId
 				}).then(res => {
 				}).then(res => {
-					this.warehousingTypeList = res.data.data
+					this.handlerList = res.data.data
 				})
 				})
 			},
 			},
 			contractNopicker(e) {
 			contractNopicker(e) {
@@ -248,16 +246,14 @@
 				this.detailData.grade = this.pjList[e].type
 				this.detailData.grade = this.pjList[e].type
 			},
 			},
 			handlerPicker(e) {
 			handlerPicker(e) {
-				this.detailData.agent = this.handlerList[e].name
+				this.detailData.agent = this.handlerList[e].staffName
 			},
 			},
 			dateChange(e) {
 			dateChange(e) {
-				// console.log(e,"时间")
 				this.detailData.inOutDate = e.year + "-" + e.month + "-" + e.day
 				this.detailData.inOutDate = e.year + "-" + e.month + "-" + e.day
 				this.inOutDate1 = e.year + "-" + e.month + "-" + e.day + "-" + e.hour + "-" + e.minute + "-" + e.second
 				this.inOutDate1 = e.year + "-" + e.month + "-" + e.day + "-" + e.hour + "-" + e.minute + "-" + e.second
 			},
 			},
 			warehousingTypePicker(e) {
 			warehousingTypePicker(e) {
 				this.detailData.inOutType = this.warehousingTypeList[e].constValue
 				this.detailData.inOutType = this.warehousingTypeList[e].constValue
-				console.log(e)
 			},
 			},
 			filterFileType(index, lists) {
 			filterFileType(index, lists) {
 				if (lists[index].fileType != 'jpg' && lists[index].fileType != 'png' && lists[index].fileType != 'gif') {
 				if (lists[index].fileType != 'jpg' && lists[index].fileType != 'png' && lists[index].fileType != 'gif') {
@@ -294,7 +290,6 @@
 					id: this.id
 					id: this.id
 				}).then(res => {
 				}).then(res => {
 					if (res.data.code == 200) {
 					if (res.data.code == 200) {
-						console.log(res)
 						this.detailData = res.data.data
 						this.detailData = res.data.data
 					}
 					}
 				})
 				})
@@ -336,7 +331,6 @@
 					return
 					return
 				}
 				}
 				this.detailData.compId = helper.erpWarehouse.compId
 				this.detailData.compId = helper.erpWarehouse.compId
-				console.log(this.detailData.compId)
 				let title = ""
 				let title = ""
 				if(num == 1 ){
 				if(num == 1 ){
 					this.detailData.inOutFlag = 1
 					this.detailData.inOutFlag = 1

+ 6 - 3
pages/erp/index.vue

@@ -60,6 +60,7 @@ import helper from '@/common/helper.js';
 				warehouseName: '暂无仓库',
 				warehouseName: '暂无仓库',
 				binNumber: '暂无',
 				binNumber: '暂无',
 				compId:'',
 				compId:'',
+				warehouseId:"",
 				warehouseList: [],
 				warehouseList: [],
 				warehouseCWList:[],
 				warehouseCWList:[],
 				gridCol: 4,
 				gridCol: 4,
@@ -203,12 +204,13 @@ import helper from '@/common/helper.js';
 					})
 					})
 				} else {
 				} else {
 					if (item.url) {
 					if (item.url) {
+						console.log(this.warehouseId,"id")
 						helper.erpWarehouse = {
 						helper.erpWarehouse = {
 							warehouseName:this.warehouseName,
 							warehouseName:this.warehouseName,
 							binNumber:this.binNumber,
 							binNumber:this.binNumber,
 							compId:this.compId,
 							compId:this.compId,
-							agent:this.agent
-							
+							agent:this.agent,
+							warehouseId:this.warehouseId
 						}
 						}
 						uni.navigateTo({
 						uni.navigateTo({
 							url: item.url
 							url: item.url
@@ -235,6 +237,7 @@ import helper from '@/common/helper.js';
 							this.agent = res.data.data[0].agent
 							this.agent = res.data.data[0].agent
 							this.binNumber = res.data.data[0].positionInfos[0].binNumber
 							this.binNumber = res.data.data[0].positionInfos[0].binNumber
 							this.warehouseCWList = res.data.data[0].positionInfos
 							this.warehouseCWList = res.data.data[0].positionInfos
+							this.warehouseId = res.data.data[0].id
 							console.log('this.warehouseCWList',this.warehouseCWList)
 							console.log('this.warehouseCWList',this.warehouseCWList)
 							// this.makeBinNumber()
 							// this.makeBinNumber()
 						}
 						}
@@ -248,8 +251,8 @@ import helper from '@/common/helper.js';
 				this.warehouseName = this.warehouseList[e[0]].warehouseName
 				this.warehouseName = this.warehouseList[e[0]].warehouseName
 				this.compId = this.warehouseList[e[0]].compId
 				this.compId = this.warehouseList[e[0]].compId
 				this.agent = this.warehouseList[e[0]].agent
 				this.agent = this.warehouseList[e[0]].agent
+				this.warehouseId =this.warehouseList[e[0]].id
 				this.warehouseCWList = this.warehouseList[e[0]].positionInfos
 				this.warehouseCWList = this.warehouseList[e[0]].positionInfos
-				console.log(e)
 			},
 			},
 			warehouseCWchange(e){
 			warehouseCWchange(e){
 				this.binNumber = this.warehouseCWList[e[0]].binNumber
 				this.binNumber = this.warehouseCWList[e[0]].binNumber