接口

pages/ftdl/man-get-goods.vue

@@ -20,38 +20,28 @@
 					<table>
 						<thead>
 							<tr>
-								<th>载具号</th>
-								<th>起点</th>
-								<th>终点</th>
-								<th>状态</th>
-								<th>作业号</th>
-								<th>作业类型</th>
-								<th>设备号</th>
-								<th>当前步骤</th>
-								<th>异常信息</th>
+								<th>卷号</th>
+								<th>物料名称</th>
+								<th>批次</th>
+								<th>单位</th>
 							</tr>
 						</thead>
 						<tbody>
 							<tr v-for="(e, i) in dataList" :key="i">
-								<td>{{e.task_type}}</td>
-								<td>{{e.task_code}}</td>
-								<td>{{e.vehicle_code}}</td>
-								<td>{{e.status}}</td>
-								<td>{{e.point_code1}}</td>
-								<td>{{e.point_code2}}</td>
-								<td>{{e.create_time}}</td>
-								<td>{{e.create_time}}</td>
-								<td>{{e.create_time}}</td>
+								<td>{{e.container_code}}</td>
+								<td>{{e.material_name}}</td>
+								<td>{{e.pscn}}</td>
+								<td>{{e.measure_unit_id}}</td>
 							</tr>
 						</tbody>
 					</table>
 				</view>
 			</view>
-			<uni-load-more color="#007AFF" iconType="circle" :status="status" :icon-size="14" :content-text="contentText" v-if="dataList.length > 0"/>
+			<!-- <uni-load-more color="#007AFF" iconType="circle" :status="status" :icon-size="14" :content-text="contentText" v-if="dataList.length > 0"/> -->
 		</view>
 		<view class="zd-row submit-bar">
 			<button class="zd-col-6 button-default" @tap="clearUp">清空</button>
-			<button class="zd-col-7 button-primary" :class="{'button-info': !dataList.length}" :disabled="disabled" @tap="toSure('80')">确认取货</button>
+			<button class="zd-col-7 button-primary" :class="{'button-info': !val1 || !dataList.length}" :disabled="disabled" @tap="_comfirmGetting">确认取货</button>
 		</view>
 	</view>
 </template>
@@ -59,7 +49,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {schBaseTask, saveCheckTask} from '@/utils/getData2.js'
+	import {getMaterialInfoByPoint, comfirmGetting} from '@/utils/getData4.js'
 	export default {
 		components: {
 			NavBar,
@@ -95,23 +85,24 @@
 			searchList () {
 				this.dataList = []
 				this.pageNum = 1
-				this._schBaseTask()
+				this._getMaterialInfoByPoint()
 			},
-			async _schBaseTask () {
-				let res = await schBaseTask(this.pageNum + '', this.pageSize + '', this.val1)
+			async _getMaterialInfoByPoint () {
+				let res = await getMaterialInfoByPoint(this.val1)
 				if (res.code === '200') {
-					this.totalCount = res.totalElements
-					if (res.totalElements > 0) {
-						const dataMap = res.content
-						this.dataList = this.reload ? dataMap : this.dataList.concat(dataMap)
-						this.reload = false
-					} else {
-						this.dataList = []
-					}
-					if (this.totalCount == this.dataList.length) {
-						this.reload = false
-						this.status = 'noMore'
-					}
+					this.dataList = res.data
+					// this.totalCount = res.totalElements
+					// if (res.totalElements > 0) {
+					// 	const dataMap = res.content
+					// 	this.dataList = this.reload ? dataMap : this.dataList.concat(dataMap)
+					// 	this.reload = false
+					// } else {
+					// 	this.dataList = []
+					// }
+					// if (this.totalCount == this.dataList.length) {
+					// 	this.reload = false
+					// 	this.status = 'noMore'
+					// }
 				}
 			},
 			onReachBottom () {
@@ -119,20 +110,20 @@
 					this.status = 'loading'
 					setTimeout(() => {
 						this.pageNum++
-						this._schBaseTask()
+						this._getMaterialInfoByPoint()
 					}, 1000)
 				} else { //停止加载
 					this.status = 'noMore'
 				}
 			},
-			async toSure (status) {
+			async _comfirmGetting () {
 				this.disabled = true
-				if (!this.dataList.length) {
+				if (!this.val1 || !this.dataList.length) {
 					this.disabled = false
 					return
 				}
 				try {
-					let res = await saveCheckTask(this.dataList)
+					let res = await comfirmGetting(this.val1, this.dataList)
 					if (res.code === '200') {
 						this.val1 = ''
 						this.dataList = []