root/hht-oulun-uni
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

userid

Browse Source
This commit is contained in:
xiangxy
2026-01-08 15:54:45 +08:00
parent df9ef8b48e
commit 69b43ee468
5 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pages/entry/groupplate-instore.vue
View File

@@ -137,8 +137,10 @@
this.disabled = false this.disabled = false
return return
} }
console.log(0)
try { 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') { if (res.code === '200') {
uni.showToast({ uni.showToast({
title: res.message, title: res.message,
@@ -151,7 +153,9 @@
icon: 'none' icon: 'none'
}) })
this.disabled = false this.disabled = false
console.log(2)
} }
console.log(3)
} catch (e) { } catch (e) {
this.disabled = false this.disabled = false
} }

2
pages/entry/mater-group.vue
View File

@@ -167,7 +167,7 @@
// return // return
// } // }
try { 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') { if (res.code === '200') {
uni.showToast({ uni.showToast({
title: res.message, title: res.message,

2
pages/entry/pick-yl-return-store.vue
View File

@@ -156,7 +156,7 @@
} }
try { try {
this.currentData.site_code = this.val2 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') { if (res.code === '200') {
uni.showToast({ uni.showToast({
title: res.message, title: res.message,

12
utils/getData3.js
View File

@@ -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', 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', 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({ export const emptyconfirmIn = (vcode, sitecode, sid, isempty, type) => request({
@@ -65,9 +65,9 @@ export const getReturnMaterial = (search) => request({
data: {search: search} data: {search: search}
}) })
// 拣选余料回库确认 // 拣选余料回库确认
export const confirmReturnMaterial = (sid, obj) => request({ export const confirmReturnMaterial = (sid, obj, uid) => request({
url:'api/pda/iosIn/confirmReturnMaterial', url:'api/pda/iosIn/confirmReturnMaterial',
data: {sect_id: sid, obj: obj} data: {sect_id: sid, obj: obj, user_id: uid}
}) })
// 出库管理 // 出库管理

2
vuex/modules/user.js
View File

@@ -1,6 +1,6 @@
import * as types from '../types' 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 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 printUrl = process.env.NODE_ENV === 'development' ? 'http://192.168.81.162:8010' : 'http://192.168.81.162:8010'
const state = { const state = {