接口

pages/General/machine-order.vue

@@ -21,7 +21,7 @@
 					<view class="zd-col-14">
 						<input type="text" placeholder="输入物料关键字" class="filter_input" v-model="keyword" @focus="handleFocus">
 					</view>
-					<button class="mini-btn" type="primary" size="mini" @tap="searchList">查询</button>
+					<button class="mini-btn" type="primary" size="mini" @tap="_queryBomInfo">查询</button>
 				</view>
 			</view>
 			<view class="zd_wrapper grid-wraper">
@@ -29,28 +29,31 @@
 					<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" :class="{'checked': e.material_id === pkId}" @tap="toCheck(e)">
+							<tr v-for="(e, i) in dataList" :key="i" :class="{'checked': e.bom_id === pkId}" @tap="toCheck(e)">
+								<td>{{e.device_code}}</td>
+								<td>{{e.device_name}}</td>
+								<td>{{e.bom_code}}</td>
 								<td>{{e.material_code}}</td>
 								<td>{{e.material_name}}</td>
-								<td>{{e.material_spec}}</td>
-								<td>{{e.unit_id}}</td>
-								<td>{{e.single_weight}}</td>
-								<td>{{e.pcsn}}</td>
+								<td>{{e.call_qty}}</td>
+								<td>{{e.qty_unit_name}}</td>
+								<td>{{e.start_time}}</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"/>
 		</view>
 		<view class="zd-row submit-bar">
 			<button class="zd-col-24 button-primary" :class="{'button-info': !pkId}" @tap="toSure">确认</button>
@@ -62,7 +65,7 @@
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
 	import {getDate} from '@/utils/utils.js'
-	import {groupMaterList} from '@/utils/getData2.js'
+	import {queryBomInfo} from '@/utils/mork2.js'
 	export default {
 		components: {
 			NavBar,
@@ -78,17 +81,7 @@
 				date: currentDate,
 				dataList: [],
 				pkId: '',
-				pkObj: {},
-				reload: false,
-				status: 'more',
-				contentText: {
-					contentdown: '查看更多',
-					contentrefresh: '加载中',
-					contentnomore: '没有更多'
-				},
-				totalCount: 0,
-				pageNum: 1,
-				pageSize: 10
+				pkObj: {}
 			};
 		},
 		computed: {
@@ -101,6 +94,7 @@
 		},
 		onLoad (options) {
 			this.title = options.title
+			this._queryBomInfo()
 		},
 		methods: {
 			handleFocus () {
@@ -109,42 +103,21 @@
 			bindDateChange: function(e) {
 				this.date = e.detail.value
 			},
-			searchList () {
-				this.dataList = []
-				this.pageNum = 1
-				this._groupMaterList()
-			},
-			async _groupMaterList () {
-				let res = await groupMaterList(this.pageNum + '', this.pageSize + '', 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
+			async _queryBomInfo () {
+				try {
+					let res = await queryBomInfo(this.date, this.keyword)
+					if (res && res.data.length > 0) {
+						this.dataList = [...res.data]
 					} else {
 						this.dataList = []
 					}
-					if (this.totalCount == this.dataList.length) {
-						this.reload = false
-						this.status = 'noMore'
-					}
-				}
-			},
-			onReachBottom () {
-				if (this.totalCount > this.dataList.length) {
-					this.status = 'loading'
-					setTimeout(() => {
-						this.pageNum++
-						this._groupMaterList()
-					}, 1000)
-				} else { //停止加载
-					this.status = 'noMore'
+				} catch (e) {
+					this.dataList = []
 				}
 			},
 			toCheck (e) {
-				this.pkId = this.pkId === e.material_id ? '' : e.material_id
-				this.pkObj = this.pkId === e.material_id ? e : {}
+				this.pkId = this.pkId === e.bom_id ? '' : e.bom_id
+				this.pkObj = this.pkId === e.bom_id ? e : {}
 			},
 			toSure () {
 				if (this.pkId) {