Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-uniapp into master_hella

src/mycomponents/detail/comDetailCard.vue

@@ -20,7 +20,7 @@
 				</view>
 			</uni-collapse-item>
 		</uni-collapse>
-		<balance-qty-edit ref="qtyEdit" :settingParam="settingParam" @confirm="confirm"></balance-qty-edit>
+		<balance-qty-edit ref="qtyEdit" :settingParam="settingParam" :queryBalance="queryBalance" @confirm="confirm"></balance-qty-edit>
 		<win-scan-location ref="scanLocationCode" title="目标库位" @getLocation='getLocation'
 			:locationAreaTypeList="locationAreaTypeList"></win-scan-location>
 		<comMessage ref="message"></comMessage>
@@ -70,6 +70,10 @@
 				type: Array,
 				default: null
 			},
+			queryBalance: {
+				type: Boolean,
+				default: true
+			},
 		},
 		watch: {
 			dataContent: {

src/mycomponents/job/jobComMainDetailCard.vue

@@ -9,7 +9,7 @@
 				</pack>
 				<batch v-if="isShowBatch && dataContent.batch!=null" :batch="dataContent.batch"></batch>
 				<div class="u-flex justify-between">
-					<location v-if="isShowFromLocation" title="来源库位" :locationCode="dataContent.fromLocationCode">
+					<location v-if="isShowFromLocation&&dataContent.fromLocationCode" title="来源库位" :locationCode="dataContent.fromLocationCode">
 					</location>
 					<!-- 	<to-location></to-location> -->
 					<to-location v-if="isShowToLocation" title="目标库位" :locationCode="dataContent.toLocationCode">

src/mycomponents/qty/balanceQtyEdit.vue

@@ -41,15 +41,15 @@
 								</view>
 							</view>
 							<view class='split_line'></view>
-							<view class="uni-flex uni-row space-between padding title u-col-center">
+							<view class="uni-flex uni-row space-between padding title u-col-center" v-if="queryBalance">
 								<text>库存数量 : </text>
 								<view class="uni-flex uni-row uni-center" style="align-items: center;">
 									<text class="text_recommend">{{Number(dataContent.balanceQty)}}</text>
 									<uom :uom="dataContent.uom"></uom>
 								</view>
 							</view>
-							<view class='split_line'></view>
-							<view v-if="isShowStatus" class="uni-flex uni-row space-between  title u-col-center"
+							<view class='split_line' v-if="queryBalance"></view>
+							<view v-if="isShowStatus&&queryBalance" class="uni-flex uni-row space-between  title u-col-center"
 								style="padding-left: 30rpx;">
 								<text>库存状态 : </text>
 								<view class="uni-flex uni-row uni-center" style="align-items: center;">
@@ -58,7 +58,7 @@
 									</balanceStatus>
 								</view>
 							</view>
-							<view class='split_line'></view>
+							<view class='split_line' v-if="queryBalance"></view>
 						</view>
 					</view>
 				</view>
@@ -115,6 +115,10 @@
 			allowEditStatus: {
 				type: Boolean,
 				default: false
+			},
+			queryBalance: {
+				type: Boolean,
+				default: true
 			}
 		},
 		watch:{
@@ -145,10 +149,13 @@
 				}
 			},
 			openEditPopup(item, handleQty) {
-				this.dataContent = item
-				this.inventoryStatus = this.dataContent.inventoryStatus
-				this.originalInventoryStatus =this.dataContent.inventoryStatus;
-				this.toInventoryStatus = this.dataContent.toInventoryStatus
+				
+				if(item){
+					this.dataContent = item 
+					this.inventoryStatus = this.dataContent.inventoryStatus
+					this.originalInventoryStatus =this.dataContent.inventoryStatus;
+					this.toInventoryStatus = this.dataContent.toInventoryStatus
+				}
 				this.allQty = handleQty
 				setTimeout(res => {
 					this.$refs.popup.open('bottom')

src/pages/purchaseReturn/job/returnDetail.vue

@@ -14,7 +14,7 @@
 			<scroll-view scroll-y="true" class="page-main-scroll">
 				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
 					<view class="">
-						<com-detail-card :dataContent="item" :settingParam="jobContent" @remove="updateData"
+						<com-detail-card :dataContent="item" :settingParam="jobContent" @remove="updateData" :queryBalance="false"
 					
 							@updateData='updateData' @openDetail="openDetail">
 						</com-detail-card>