diff --git a/pages/entry/groupplate-instore.vue b/pages/entry/groupplate-instore.vue index 7aee03a..ac54566 100644 --- a/pages/entry/groupplate-instore.vue +++ b/pages/entry/groupplate-instore.vue @@ -137,8 +137,10 @@ this.disabled = false return } + console.log(0) try { - let res = await confirmIn(this.val1, this.val2, this.index) + // this.$store.getters.loginName + let res = await confirmIn(this.val1, this.val2, this.index, JSON.parse(this.$store.getters.userInfo).user.user_id) if (res.code === '200') { uni.showToast({ title: res.message, @@ -151,7 +153,9 @@ icon: 'none' }) this.disabled = false + console.log(2) } + console.log(3) } catch (e) { this.disabled = false } diff --git a/pages/entry/mater-group.vue b/pages/entry/mater-group.vue index 186805c..ca11509 100644 --- a/pages/entry/mater-group.vue +++ b/pages/entry/mater-group.vue @@ -167,7 +167,7 @@ // return // } try { - let res = await groupPlate(this.dataList, this.val2, this.val1) + let res = await groupPlate(this.dataList, this.val2, this.val1, JSON.parse(this.$store.getters.userInfo).user.user_id) if (res.code === '200') { uni.showToast({ title: res.message, diff --git a/pages/entry/pick-yl-return-store.vue b/pages/entry/pick-yl-return-store.vue index 07cf1e0..c33e082 100644 --- a/pages/entry/pick-yl-return-store.vue +++ b/pages/entry/pick-yl-return-store.vue @@ -156,7 +156,7 @@ } try { this.currentData.site_code = this.val2 - let res = await confirmReturnMaterial(this.index, this.currentData) + let res = await confirmReturnMaterial(this.index, this.currentData, JSON.parse(this.$store.getters.userInfo).user.user_id) if (res.code === '200') { uni.showToast({ title: res.message, diff --git a/utils/getData3.js b/utils/getData3.js index 617e4c7..db6a420 100644 --- a/utils/getData3.js +++ b/utils/getData3.js @@ -40,14 +40,14 @@ export const getMaterialList = (search, page, size) => request({ // 入库管理 // 物料组盘确认 -export const groupPlate = (arr, vcode, ecode, siteCode) => request({ +export const groupPlate = (arr, vcode, ecode, siteCode, uid) => request({ url:'api/pda/iosIn/groupPlate', - data: {data: arr, vehicle_code: vcode, ext_code: ecode, siteCode: siteCode} + data: {data: arr, vehicle_code: vcode, ext_code: ecode, siteCode: siteCode, user_id: uid} }) // 组盘入库确认 -export const confirmIn = (vcode, sitecode, sid) => request({ +export const confirmIn = (vcode, sitecode, sid, uid) => request({ url:'api/pda/iosIn/confirmIn', - data: {vehicle_code: vcode, site_code: sitecode, sect_id: sid} + data: {vehicle_code: vcode, site_code: sitecode, sect_id: sid, user_id: uid} }) // 空载具入库确认 export const emptyconfirmIn = (vcode, sitecode, sid, isempty, type) => request({ @@ -65,9 +65,9 @@ export const getReturnMaterial = (search) => request({ data: {search: search} }) // 拣选余料回库确认 -export const confirmReturnMaterial = (sid, obj) => request({ +export const confirmReturnMaterial = (sid, obj, uid) => request({ url:'api/pda/iosIn/confirmReturnMaterial', - data: {sect_id: sid, obj: obj} + data: {sect_id: sid, obj: obj, user_id: uid} }) // 出库管理 diff --git a/vuex/modules/user.js b/vuex/modules/user.js index 1b4b61d..2b69980 100644 --- a/vuex/modules/user.js +++ b/vuex/modules/user.js @@ -1,6 +1,6 @@ import * as types from '../types' -const baseUrl = process.env.NODE_ENV === 'development' ? 'http://192.168.10.72:8011' : 'http://192.168.10.72:8011' +const baseUrl = process.env.NODE_ENV === 'development' ? 'http://192.168.10.73:8011' : 'http://192.168.10.73:8011' const acsUrl = process.env.NODE_ENV === 'development' ? 'http://192.168.18.250:8012' : 'http://192.168.18.250:8012' const printUrl = process.env.NODE_ENV === 'development' ? 'http://192.168.81.162:8010' : 'http://192.168.81.162:8010' const state = {