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

src/mycomponents/qty/balanceQtyEdit.vue

@@ -36,7 +36,7 @@
 								<text>数量 : </text>
 								<view class="uni-flex uni-row uni-center" style="align-items: center;">
 									<input class="qty_input" v-model="allQty" :focus="true" type="number"
-                         @confirm="confirm()" @input="checkNum" :maxlength="maxlength" disabled :style="{background:'#f5f5f5',color:'#bbbbbb'}"/>
+                         @confirm="confirm()" @input="checkNum" :maxlength="maxlength" :disabled="!allowEditQty" :style="allowEditQty?{}:{background:'#f5f5f5',color:'#bbbbbb'}"/>
 									<uom :uom="dataContent.uom"></uom>
 								</view>
 							</view>
@@ -119,7 +119,11 @@
 			queryBalance: {
 				type: Boolean,
 				default: true
-			}
+			},
+			allowEditQty: {
+				type: Boolean,
+				default: true
+			},
 		},
 		watch:{
 			'allQty'(newVal){

src/pages/inventoryMove/coms/comInventoryDetailCard.vue

@@ -17,7 +17,7 @@
 				<!-- <view class='split_line'></view> -->
 			</uni-collapse-item>
 		</uni-collapse>
-		<balance-qty-edit ref="qtyEdit" :settingParam="settingParam" @confirm="confirm" :allowEditStatus="true"></balance-qty-edit>
+		<balance-qty-edit ref="qtyEdit" :allowEditQty="allowEditQty" :settingParam="settingParam" @confirm="confirm" :allowEditStatus="true"></balance-qty-edit>
 		<win-scan-location ref="scanLocationCode" title="目标库位" @getLocation='getLocation'
 			></win-scan-location>
 		<detail-info-popup ref="detailInfoPopup"></detail-info-popup>
@@ -67,6 +67,10 @@
 				type: Object,
 				default: {}
 			},
+			allowEditQty: {
+				type: Boolean,
+				default: true
+			}
 		},
 		watch: {
 			// dataContent: {

src/pages/inventoryMove/job/inventoryMoveDetail.vue

@@ -12,7 +12,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="">
-						<comInventoryDetailCard :dataContent="item" :settingParam="jobContent" @remove="updateData"
+						<comInventoryDetailCard :allowEditQty="false" :dataContent="item" :settingParam="jobContent" @remove="updateData"
 							@updateData='updateData' @openDetail="openDetail">
 						</comInventoryDetailCard>
 					</view>

src/pages/transfer/job/transferDetail.vue

@@ -12,7 +12,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="">
-						<comInventoryDetailCard :dataContent="item" :settingParam="jobContent" @remove="updateData"
+						<comInventoryDetailCard :allowEditQty="true" :dataContent="item" :settingParam="jobContent" @remove="updateData"
 							@updateData='updateData'>
 						</comInventoryDetailCard>
 					</view>