change

pages/entry/groupplate-instore.vue

@@ -139,7 +139,6 @@
 				}
 				console.log(0)
 				try {
-					// 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({

pages/entry/mater-group.vue

@@ -55,7 +55,7 @@
 		</view>
 		<view class="zd-row submit-bar">
 			<button class="zd-col-6 button-default" @tap="clearUp">清空</button>
-			<button class="zd-col-16 button-primary" :class="{'button-info': !this.val2 || !this.dataList.length}" :disabled="disabled" @tap="_groupPlate">组盘确认</button>
+			<button class="zd-col-16 button-primary" :class="{'button-info': !this.val2 || !this.dataList.length}" :disabled="disabled" @tap="_groupPlateRk">组盘确认</button>
 		</view>
 	</view>
 </template>
@@ -64,7 +64,7 @@
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
 	import NumberInput from '@/components/NumberInput.vue'
-	import {groupPlate} from '@/utils/getData3.js'
+	import {groupPlateRk} from '@/utils/getData3.js'
 	export default {
 		components: {
 			NavBar,
@@ -149,7 +149,7 @@
 				this.val2 = ''
 				this.disabled = false
 			},
-			async _groupPlate () {
+			async _groupPlateRk () {
 				this.disabled = true
 				if (!this.val2 || !this.dataList.length) {
 					this.disabled = false
@@ -167,7 +167,7 @@
 				// 	return
 				// }
 				try {
-					let res = await groupPlate(this.dataList, this.val2, this.val1, JSON.parse(this.$store.getters.userInfo).user.user_id)
+					let res = await groupPlateRk(this.dataList, this.val2, this.val1, JSON.parse(this.$store.getters.userInfo).user.user_id)
 					if (res.code === '200') {
 						uni.showToast({
 							title: res.message,

utils/getData3.js

@@ -39,10 +39,15 @@ export const getMaterialList = (search, page, size) => request({
 })
 
 // 入库管理
-// 物料组盘确认
-export const groupPlate = (arr, vcode, ecode, siteCode, uid) => request({
+// 物料组盘确认-预装管理
+export const groupPlate = (arr, vcode, ecode, siteCode) => request({
 	url:'api/pda/iosIn/groupPlate',
-	data: {data: arr, vehicle_code: vcode, ext_code: ecode, siteCode: siteCode, user_id: uid}
+	data: {data: arr, vehicle_code: vcode, ext_code: ecode, siteCode: siteCode}
+})
+// 物料组盘确认-入库管理
+export const groupPlateRk = (arr, vcode, ecode, uid) => request({
+	url:'api/pda/iosIn/groupPlate',
+	data: {data: arr, vehicle_code: vcode, ext_code: ecode, user_id: uid}
 })
 // 组盘入库确认
 export const confirmIn = (vcode, sitecode, sid, uid) => request({