优化

pages/pda/common.js

@@ -17,21 +17,21 @@ export const tableHeader = selectEquiType => {
 					prop: 'brandNum'
 				},
 
-				{
-					label: '包装库存',
-					prop: '',
-					formatter(row) {
-						return `${row.packingCountBase || '0'}/${row.minUnit || ''}`
-					}
-				},
-
-				{
-					label: '计量库存数量',
-					prop: '',
-					formatter(row) {
-						return `${row.availableCountBase || '0'}/${row.measuringUnit || ''}`
-					}
-				}
+				// {
+				// 	label: '包装库存',
+				// 	prop: '',
+				// 	formatter(row) {
+				// 		return `${row.packingCountBase || '0'}/${row.minUnit || ''}`
+				// 	}
+				// },
+
+				// {
+				// 	label: '计量库存数量',
+				// 	prop: '',
+				// 	formatter(row) {
+				// 		return `${row.availableCountBase || '0'}/${row.measuringUnit || ''}`
+				// 	}
+				// }
 			]
 
 
@@ -182,10 +182,7 @@ export const tableHeader = selectEquiType => {
 		case 23:
 			return [
 
-				{
-					label: '名称',
-					prop: 'name'
-				},
+
 
 				{
 					label: '型号',
@@ -198,7 +195,8 @@ export const tableHeader = selectEquiType => {
 				{
 					label: '牌号',
 					prop: 'brandNum'
-				}
+				},
+	
 			]
 
 	}

pages/pda/feeding/components/palletBom.vue

@@ -2,7 +2,7 @@
 
 	<view>
 
-		<view class="title_box rx-bc">
+		<view class="title_box rx-bc"  v-if='palletList.length > 0'>
 			<view class="name">舟皿</view>
 		</view>
 

pages/pda/feeding/components/revolvingDiskBom.vue

@@ -2,7 +2,7 @@
 
 	<view>
 
-		<view class="title_box rx-bc">
+		<view class="title_box rx-bc" v-if='revolvingDiskList.length > 0'>
 			<view class="name">周转盘</view>
 		</view>
 

pages/pda/jobBooking/components/byProductBom.vue

@@ -191,7 +191,7 @@
 
 
 			.unit {
-				width: 100rpx;
+				width: 108rpx;
 				font-size: 24rpx;
 				color: #404446;
 			}

pages/pda/picking/components/semiProductBom.vue

@@ -28,19 +28,6 @@
 
 
 
-				<!-- 				<view class="items"
-									v-if='([1,23].includes(Number(item.rootCategoryLevelId)) && item.isConsumable == 0) '>
-									<text></text>{{item.extInfo. }}
-								</view>
-
-
-								<view class="items"
-									v-if='([1,23].includes(Number(item.rootCategoryLevelId)) && item.isConsumable == 0) '>
-									<text>客户代号</text>{{item.extInfo.clientCode }}
-								</view> -->
-
-
-
 				<view class="item">
 					<view class="lable rx-cc">刻码</view>
 					<view class="content ">
@@ -64,6 +51,33 @@
 						{{mate.extInfo.clientCode }}
 					</view>
 				</view>
+				
+				<view class="item">
+					<view class="lable rx-cc">包装库存</view>
+					<view class="content">{{mate.packingCountBase}}/ {{mate.minUnit}}</view>
+				</view>
+				
+				
+				<view class="item">
+					<view class="lable rx-cc">领料数量</view>
+					<view class="content content_num">
+						<input class="uni-input" v-model="mate.demandQuantity"
+							@blur='mate.demandQuantity > mate.availableCountBase ?  mate.demandQuantity = mate.availableCountBase : mate.demandQuantity'
+							type="number"></input>
+						<view class="unit">/{{mate.measuringUnit}}</view>
+						<view>&nbsp;&nbsp; (库存:{{ mate.availableCountBase }} {{mate.measuringUnit}})</view>
+					</view>
+				</view>
+				
+				
+				
+				<view class="item">
+					<view class="lable rx-cc">领料仓库</view>
+					<view class="content ">
+						{{ mate.pathName }}
+					</view>
+				</view>
+				
 
 			</view>
 		</view>

pages/pda/workOrder/search/index.vue

@@ -32,7 +32,7 @@
 
 						<view class="listBox-sel">
 							<checkbox
-								v-if='item.rootCategoryLevelId != 23 && (item.rootCategoryLevelId != 11 || (item.rootCategoryLevelId == 11 && item.status != 1))'
+								v-if=' (item.rootCategoryLevelId != 11 || (item.rootCategoryLevelId == 11 && item.status != 1))'
 								:value="item.code" color="#fff" :disabled="item.disabled" :checked="item.checked" />
 						</view>
 
@@ -83,9 +83,17 @@
 								</view>
 
 
-								<view class="items" v-if='item.rootCategoryLevelId == 1 '>
+								<view class="items" v-if='item.rootCategoryLevelId == 1 || item.rootCategoryLevelId == 23'>
 									<text>包装库存</text>{{ item.packingCountBase }} {{item.minUnit}}
 								</view>
+								
+								<view class="items" v-if='item.rootCategoryLevelId == 1 || item.rootCategoryLevelId == 23'>
+									<text>计量库存数量</text>{{ item.availableCountBase }} {{item.measuringUnit}}
+								</view>
+								
+								
+							
+								
 
 								<view class="items" v-if='item.rootCategoryLevelId == 11'>
 									<text
@@ -132,16 +140,16 @@
 				</checkbox>
 			</view>
 			<view>
-				
-				<u-button v-if='rootCategoryLevelId != 23' type="success" size="small" class="u-reset-button"
+
+				<u-button  type="success" size="small" class="u-reset-button"
 					:disabled="!checkListLen" @click="jumpAdd(1)">
 					<view> 选择( {{ checkListLen }} ) </view>
 				</u-button>
 
-				<u-button v-if='rootCategoryLevelId == 23' type="success" size="small" class="u-reset-button"
+			<!-- 	<u-button v-if='rootCategoryLevelId == 23' type="success" size="small" class="u-reset-button"
 					@click="jumpAdd(2)">
 					<view> 确认 </view>
-				</u-button>
+				</u-button> -->
 
 			</view>
 		</view>
@@ -412,7 +420,7 @@
 				} else if (this.isType == 'zdy') {
 					params['ids'] = JSON.parse(this.classIds);
 				}
-				
+
 
 
 				treeByPid(params).then(res => {
@@ -459,15 +467,18 @@
 				isEnd = false
 				let URL = null
 				if (this.isType == 'pick') { // 领料
-					if (this.rootCategoryLevelId == 23) {
-						this.list = []
-						param = {}
-						param.workOrderId = this.pid
-						URL = listOutsourceInWarehouse
-					} else {
-						param.dimension = 1
-						URL = pageeLedgerMain
-					}
+					// if (this.rootCategoryLevelId == 23) {
+					// 	this.list = []
+					// 	param = {}
+					// 	param.workOrderId = this.pid
+					// 	URL = listOutsourceInWarehouse
+					// } else {
+					// 	param.dimension = 1
+					// 	URL = pageeLedgerMain
+					// }
+					param.dimension = 1
+					URL = pageeLedgerMain
+
 				} else if (this.isType == 'feed') { // 投料
 
 					if ([4, 7, 14].includes(Number(this.rootCategoryLevelId))) {