Merge branch 'master' of gitlab.gavelinfo.com:lisu/xgdlapp

components/InfoCard/InfoCard.vue

@@ -32,20 +32,15 @@
 			},
 			getKeys: function(e) {
 				let keyList = {
-					
-					"wlname":"物料名称",
-					"wlgg": "物料规格",
-					"wlph": "物料批号",
 					"tpcode":"托盘号",
 					"ztsl":"数量",
-					"wlcode":"物料编码",
 					"rwdh":"任务单号",
 					"rwzt":"任务状态",
 					"agvrwdh":"agv任务单号",
 					"agvrwzt":"agv任务状态",
 					"djid":"生产订单",
 					"wlxxName":"产品名称",
-					"ph":"批号"
+					"zlh":"批号信息"
 				};
 				return keyList[e]
 			},
@@ -72,12 +67,8 @@
 		data() {
 			return {
 				whiteList:[
-					"wlname",
-					"wlgg",
-					"wlph",
 					"tpcode",
 					"ztsl",
-					"wlcode",
 					"rwdh",
 					"rwzt",
 					"agvrwdh",
@@ -86,7 +77,7 @@
 					"djid",
 					"cpname",
 					"wlxxName",
-					"ph"
+					"zlh"
 					
 				]
 			};

pages/dl_outin/index.vue

@@ -15,12 +15,12 @@
 				<view class="tbtit">
 					<view class="tbtit_son">配盘单号</view>
 					<view class="tbtit_son">批号</view>
-					<view style="flex: 1;">仓库</view>
+					<!--<view style="flex: 1;">仓库</view>-->
 				</view>
 				<view class="tbtit_row " :class="item.selected?'selected':''" v-for="(item,index) in jhList" :key="index" @tap="selectTb(item,index)" @longtap="longtapTb(item,index)">
 					<view class="tbtit_row_son1">{{item.djid}}</view>
 					<view style="flex: 1">{{item.ph}}</view>
-					<view class="tbtit_row_son3">{{item.ckName||'未知'}}</view>
+					<!--<view class="tbtit_row_son3">{{item.ckName||'未知'}}</view>-->
 				</view>
 				<view class="tbtit_row " style="display: flex;" v-if="!jhList[0]" >
 					<span style="flex: 1;">

pages/index/index.vue

@@ -122,12 +122,12 @@
 						useCount: 1000,
 						page: "putin_storage"
 					},
-					{
+				/* 	{
 						title: "出库登记",
 						icon: "/static/icon/work3.png",
 						useCount: 1000,
 						page: "putout_storage"
-					}
+					} */
 				],
 				newckglList: [],
 				gwjlList: [{
@@ -137,10 +137,10 @@
 						page: "cmaterial"
 					},
 					{
-						title: "清空库位",
-						icon: "/static/icon/adjust.png",
-						useCount: 1000,
-						page: "kwAdjust"
+						"title": "空托出库",
+						"icon": "/static/icon/off.png",
+						"useCount": 1000,
+						"page": "trayOutbound"
 					}
 				],
 				newgwjlList: [],
@@ -157,10 +157,10 @@
 						page: "trayClear"
 					},
 					{
-						"title": "空托出库",
-						"icon": "/static/icon/off.png",
-						"useCount": 1000,
-						"page": "trayOutbound"
+						title: "清空库位",
+						icon: "/static/icon/adjust.png",
+						useCount: 1000,
+						page: "kwAdjust"
 					}
 				],
 				newtpglList: [],