接口

pages/hdyy/zpgl/mater-zupan.vue

@@ -38,14 +38,14 @@
 						<tbody>
 							<tr v-for="(e, i) in dataList" :key="i">
 								<td>{{i+1}}</td>
-								<td>{{e.code}}</td>
+								<td>{{e.bag_code}}</td>
 								<td>{{e.material_code}}</td>
 								<td>{{e.material_name}}</td>
-								<td>{{e.leibie}}</td>
+								<td>{{e.class_name}}</td>
 								<td>{{e.pcsn}}</td>
 								<td>{{e.qty}}</td>
-								<td>{{e.unit}}</td>
-								<td>{{e.gys}}</td>
+								<td>{{e.qty_unit_name}}</td>
+								<td>{{e.supp_name}}</td>
 							</tr>
 						</tbody>
 					</table>
@@ -54,7 +54,7 @@
 		</view>
 		<view class="zd-row submit-bar">
 			<button class="zd-col-5 button-default" @tap="toEmpty">清空</button>
-			<button class="zd-col-18 button-primary" :class="{'button-info': !val1 || !index || !dataList.length}" :disabled="disabled" @tap="_packInConfirm">确认组盘</button>
+			<button class="zd-col-18 button-primary" :class="{'button-info': !val1 || !dataList.length}" :disabled="disabled" @tap="_confirmPalletAssembly">确认组盘</button>
 		</view>
 	</view>
 </template>
@@ -62,7 +62,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {queryPointInDownload, queryPointInDtl, packInConfirm} from '@/utils/getData3.js'
+	import {getBagAssembly, confirmPalletAssembly} from '@/utils/getData3.js'
 	export default {
 		components: {
 			NavBar,
@@ -71,8 +71,6 @@
 		data() {
 			return {
 				title: '',
-				options: [],
-				index: '',
 				val1: '',
 				dataList: [],
 				// dataList: [{material_code: 'm001', qty: 100, checked: false, initialQty: 100}, {material_code: 'm002', qty: 200, checked: false, initialQty: 200}],
@@ -81,7 +79,6 @@
 		},
 		onLoad (options) {
 			this.title = options.title
-			this._queryPointInDownload()
 		},
 		methods: {
 			toScanAdd () {
@@ -156,24 +153,9 @@
 				this.dataList = []
 				this.disabled = false
 			},
-			async _queryPointInDownload () {
+			async _getBagAssembly () {
 				try {
-					let res = await queryPointInDownload()
-					if (res) {
-						this.options = res.data
-					} else {
-						this.options = []
-					}
-				} catch (e) {
-					this.options = []
-				}
-			},
-			selectChange (e) {
-				this.index = e
-			},
-			async _queryPointInDtl () {
-				try {
-					let res = await queryPointInDtl(this.val1)
+					let res = await getBagAssembly(this.val1)
 					if (res && res.data.length > 0) {
 						this.dataList = [...res.data]
 					} else {
@@ -183,14 +165,14 @@
 					this.dataList = []
 				}
 			},
-			async _packInConfirm () {
+			async _confirmPalletAssembly () {
 				this.disabled = true
-				if (!this.val1 || !this.index || !this.dataList.length) {
+				if (!this.val1 || !this.dataList.length) {
 					this.disabled = false
 					return
 				}
 				try {
-					let res = await packInConfirm(this.val1, this.index, this.dataList)
+					let res = await confirmPalletAssembly(this.val1, this.dataList)
 					if (res) {
 						uni.showToast({
 							title: res.message,