ysy 2 лет назад
Родитель
Сommit
76d536d3fe
2 измененных файлов с 28 добавлено и 13 удалено
  1. 15 9
      pages/pda/components/workCard.vue
  2. 13 4
      pages/pda/workOrder/index/index.vue

+ 15 - 9
pages/pda/components/workCard.vue

@@ -3,17 +3,17 @@
 	<view class="card_box" @click="handleDetail">
 		<view class="item_box rx-sc">
 			<view class="round">1</view>
-			<view class="orderId">W2345933453  </view>
+			<view class="orderId">{{item.code}}  </view>
 		</view>
 
 		<view class="item_box rx-bc">
 			<view class="item_one perce50 rx-sc">
 				<view class="lable">产品编码:</view>
-				<view>13231232</view>
+				<view>{{item.productCode}}</view>
 			</view>
 			<view class="item_one perce50 rx-sc">
 				<view>名称:</view>
-				<view>13231232</view>
+				<view>{{item.productName}}</view>
 			</view>
 		</view>
 
@@ -21,11 +21,11 @@
 		<view class="item_box rx-bc">
 			<view class="item_one perce50 rx-sc">
 				<view class="lable">牌号:</view>
-				<view>13231232</view>
+				<view>{{item.brandNo}}</view>
 			</view>
 			<view class="item_one perce50 rx-sc">
 				<view>型号:</view>
-				<view>13231232</view>
+				<view>{{item.model}}</view>
 			</view>
 		</view>
 
@@ -33,11 +33,11 @@
 		<view class="item_box rx-bc">
 			<view class="item_one perce50 rx-sc">
 				<view class="lable">生产数量:</view>
-				<view>231</view>
+				<view>{{item.formingWeight}}</view>
 			</view>
 			<view class="item_one perce50 rx-sc">
 				<view>状态:</view>
-				<view>完成</view>
+				<view>{{statusList[item.status]}}</view>
 			</view>
 		</view>
 
@@ -45,7 +45,7 @@
 		<view class="item_box rx-sc">
 			<view class="item_one rx-sc">
 				<view class="lable">工艺路线:</view>
-				<view class="gylx">工具棒精加棒-切割+无心磨+倒角</view>
+				<view class="gylx">{{item.produceRoutingName}}</view>
 			</view>
 
 		</view>
@@ -68,7 +68,13 @@
 		
 		data() {
 			return {
-				
+				statusList:{
+					4:'待生产',
+					5:'生产中',
+					6:'已完成',
+					7:'已延期',
+					8:'待下达'
+				}
 			}
 		},
 		methods: {

+ 13 - 4
pages/pda/workOrder/index/index.vue

@@ -47,7 +47,7 @@
 			return {
 				page: 1,
 
-				dataList: [{a: 1},{a: 2}, {a: 3}, {a: 4},{a: 5}, {a: 6},{a: 7} ],
+				dataList: [],
 
 				searchFrom: {
 					keyWord: null
@@ -63,13 +63,22 @@
 		async	getList() {
 				let params = {
 					 page: this.page,
-					   size: 10,
-					      ...this.searchFrom
+					 size: 5,
+					 status: [4,5,6,7],
+					 ...this.searchFrom
 				}
 				
 				 isEnd = false
 				 const res = await workorderPage(params)
-				 console.log((res))
+				 console.log(res)
+				 
+				 if (params.page === 1) {
+				   this.dataList = []
+				 }
+				 
+				   this.dataList.push(...res.list)
+				   
+				      isEnd = this.dataList.length >= res.count
 				 
 			},