ysy 1 rok temu
rodzic
commit
168b840ae7

+ 1 - 1
api/pda/workOrder.js

@@ -147,7 +147,7 @@ export async function feedOutInOrder(params) {
 // 查询库存台账首页列表
 export async function pageeLedgerMain(params) {
 	const data = await get(
-		Vue.prototype.apiUrl + `/wms/outin/getRealTimeInventory`, params, true,
+		Vue.prototype.apiUrl + `/wms/outInDetailPda/page`, params, true,
 	);
 	if (data.code == 0) {
 		return data.data;

+ 10 - 5
pages/pda/picking/components/boatBom.vue

@@ -45,20 +45,25 @@
 				<view class="item">
 					<view class="lable rx-cc">数量 </view>
 					<view class="content content_num">
-						<input class="uni-input" style="width: 300rpx;" v-model="item.demandQuantity" type='digit'></input>  {{ item.unit}}  <text style="font-size: 20rpx;margin-left: 18rpx;"> 数量: {{ Number(item.count || 0) * Number(resObj.formingNum) }} </text>
+						<input class="uni-input" style="width: 300rpx;" v-model="item.demandQuantity"
+							type='digit'></input> {{ item.unit}} <text style="font-size: 20rpx;margin-left: 18rpx;"> 数量:
+							{{ Number(item.count || 0) * Number(resObj.formingNum) }} </text>
 
 					</view>
 				</view>
-				
+
 				<view class="item">
 					<view class="lable rx-cc">领料仓库</view>
+
+
 					<view class="content pd4">
-						<zxz-uni-data-select :localdata="item.warehouseList" v-model="item.warehouseId"
-							dataValue='id' format='{name}' dataKey="name" filterable
+						<zxz-uni-data-select :localdata="item.warehouseLists" v-model="item.warehouseId"
+							dataValue='warehouse_id' format='{warehouse_name}' dataKey="warehouse_name" filterable
 							:clear='false'></zxz-uni-data-select>
+
 					</view>
 				</view>
-				
+
 
 			</view>
 

+ 5 - 3
pages/pda/picking/components/instanceBom.vue

@@ -47,9 +47,11 @@
 
 				<view class="item">
 					<view class="lable rx-cc">领料仓库</view>
-					<view class="content ">
-						{{ mate.pathName }}
-					</view>
+				<view class="content pd4">
+									<zxz-uni-data-select :localdata="mate.warehouseLists" v-model="mate.warehouseId"
+										dataValue='warehouse_id' format='{warehouse_name}' dataKey="warehouse_name" filterable
+										:clear='false'></zxz-uni-data-select>
+								</view>
 				</view>
 
 			</view>

+ 14 - 5
pages/pda/picking/components/modelBom.vue

@@ -16,7 +16,7 @@
 			<view class="content_table">
 
 				<view class="item " v-for="(tab, tIdx) in tableH(5)" :key="tIdx">
-         
+
 					<view class="item " v-if="Array.isArray(tab.prop) && item.automatic == 2">
 						<view class="lable lable300 rx-sc"> {{ item[tab.prop[0]]  }}</view>
 						<view class="content">
@@ -30,8 +30,8 @@
 							{{ item['code']  }}
 						</view>
 					</view>
-					
-	
+
+
 
 
 					<view class="item" v-if="!Array.isArray(tab.prop)">
@@ -44,8 +44,17 @@
 							{{tab.extInfo ?  item.extInfo[tab.prop] : item[tab.prop]}}
 						</view>
 					</view>
-					
-		          
+
+
+					<view class="item">
+						<view class="lable rx-cc">领料仓库</view>
+						<view class="content pd4">
+							<zxz-uni-data-select :localdata="item.warehouseLists" v-model="item.warehouseId"
+								dataValue='warehouse_id' format='{warehouse_name}' dataKey="warehouse_name" filterable
+								:clear='false'></zxz-uni-data-select>
+						</view>
+					</view>
+
 
 
 

+ 5 - 3
pages/pda/picking/components/packingBom.vue

@@ -53,9 +53,11 @@
 
 				<view class="item">
 					<view class="lable rx-cc">领料仓库</view>
-					<view class="content ">
-						{{ mate.pathName }}
-					</view>
+				<view class="content pd4">
+					<zxz-uni-data-select :localdata="mate.warehouseLists" v-model="mate.warehouseId"
+						dataValue='warehouse_id' format='{warehouse_name}' dataKey="warehouse_name" filterable
+						:clear='false'></zxz-uni-data-select>
+				</view>
 				</view>
 
 			</view>

+ 5 - 3
pages/pda/picking/components/semiProductBom.vue

@@ -73,9 +73,11 @@
 				
 				<view class="item">
 					<view class="lable rx-cc">领料仓库</view>
-					<view class="content ">
-						{{ mate.pathName }}
-					</view>
+				<view class="content pd4">
+					<zxz-uni-data-select :localdata="mate.warehouseLists" v-model="mate.warehouseId"
+						dataValue='warehouse_id' format='{warehouse_name}' dataKey="warehouse_name" filterable
+						:clear='false'></zxz-uni-data-select>
+				</view>
 				</view>