118

manifest.json

@@ -2,8 +2,8 @@
     "name" : "恒森",
     "appid" : "__UNI__8D175E0",
     "description" : "恒森WMS手持系统",
-    "versionName" : "1.1.7",
+    "versionName" : "1.1.8",
-    "versionCode" : 117,
+    "versionCode" : 118,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pages/entry/bill-to-store.vue

@@ -42,7 +42,7 @@
 						<span class="filter_label filter_input_disabled">单位</span>
 					</view>
 					<view class="zd-col-18">
-						<input type="text" class="filter_input filter_input_disabled" v-model="currentData.unit_id" disabled>
+						<input type="text" class="filter_input filter_input_disabled" v-model="currentData.unit_name" disabled>
 					</view>
 				</view>
 				<view class="zd-row border-bottom">
@@ -95,10 +95,11 @@
 									<th>序号</th>
 									<th>物料编码</th>
 									<th>物料名称</th>
-									<th>物料规格</th>
-									<th>单位</th>
-									<th>物料批次</th>
 									<th>物料数量</th>
+									<th>单位</th>
+									<th>单据状态</th>
+									<th>物料批次</th>
+									
 								</tr>
 							</thead>
 							<tbody>
@@ -106,10 +107,11 @@
 									<td>{{i+1}}</td>
 									<td>{{e.material_code}}</td>
 									<td>{{e.material_name}}</td>
-									<td>{{e.material_spec}}</td>
-									<td>{{e.unit_name}}</td>
-									<td>{{e.pcsn}}</td>
 									<td>{{e.qty}}</td>
+									<td>{{e.unit_name}}</td>
+									<td>{{e.bill_status}}</td>
+									<td>{{e.pcsn}}</td>
+									
 								</tr>
 							</tbody>
 						</table>
@@ -190,7 +192,7 @@
 			},
 			async _getBillNoInfo (e) {
 				try {
-					let res = await getBillNoInfo(e)
+					let res = await getBillNoInfo(e, this.index1)
 					if (res && res.length) {
 						this.dataList = [...res]
 						this.pkId = ''
@@ -204,6 +206,9 @@
 				} catch (e) {}
 			},
 			toCheck (e) {
+				if (e.status === '80') {
+					return
+				}
 				this.pkId = this.pkId === e.material_code ? '' : e.material_code
 				this.pkObj = this.pkId === e.material_code ? e : {}
 			},

utils/getData2.js

@@ -254,7 +254,7 @@ export const inStorageOrder = () => request({
 	method: 'GET',
 	url:'api/pda/inStorage/order'
 })
-export const getBillNoInfo = (id) => request({
+export const getBillNoInfo = (code, type) => request({
-	url:'api/pda/inStorage/getBillNoInfo/' + id,
+	url:'api/pda/inStorage/getBillNoInfo',
-	method: 'GET'
+	data: {code, form_type: type}
 })