接口

pages/General/material.vue

@@ -11,7 +11,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="_queryMaterial">查询</button>
 				</view>
 			</view>
 			<view class="zd_wrapper grid-wraper">
@@ -32,15 +32,14 @@
 								<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.material_model}}</td>
+								<td>{{e.quality_time}}</td>
+								<td>{{e.execution_stand}}</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>
@@ -51,7 +50,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {groupMaterList} from '@/utils/getData2.js'
+	import {queryMaterial} from '@/utils/mork2.js'
 	export default {
 		components: {
 			NavBar,
@@ -63,57 +62,27 @@
 				keyword: null,
 				dataList: [],
 				pkId: '',
-				pkObj: {},
-				reload: false,
-				status: 'more',
-				contentText: {
-					contentdown: '查看更多',
-					contentrefresh: '加载中',
-					contentnomore: '没有更多'
-				},
-				totalCount: 0,
-				pageNum: 1,
-				pageSize: 10
+				pkObj: {}
 			};
 		},
 		onLoad (options) {
 			this.title = options.title
+			this._queryMaterial()
 		},
 		methods: {
 			handleFocus () {
 				this.keyword = null
 			},
-			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 _queryMaterial () {
+				try {
+					let res = await queryMaterial(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) {