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

mycomponents/balance/moveStatus.vue

@@ -1,7 +1,8 @@
 <template>
 	<view class="uni-row uni-flex center" style="font-size: 30rpx;">
 		<status :status='fromInventoryStatus' :showDesc="true"></status>
-		<view class="uni-flex uni-row center" v-if='showToInventoryStatus  && toInventoryStatus!=fromInventoryStatus'>
+		<view class="uni-flex uni-row center"
+			v-if='showToInventoryStatus  && toInventoryStatus!="" &&   toInventoryStatus!=fromInventoryStatus'>
 			<text style="color:#909399 ; ">
 				—>
 			</text>

mycomponents/scan/winScanPackAndLocation.vue

@@ -267,14 +267,14 @@
 					this.packCallBack(balance);
 
 					//因为盘点时有负库存，暂时去掉判断  2023年12月28日
-					// if (balance.qty > 0) {
+					if (balance.qty > 0) {
-					// 	this.packCallBack(balance);
+						this.packCallBack(balance);
-					// } else {
+					} else {
-					// 	this.showErrorMessage(this.getQueryCondition() + '<br>查找到库存记录数量为[' + balance.qty + "],<br>不可以进行操作",
+						this.showErrorMessage(this.getQueryCondition() + '<br>查找到库存记录数量为[' + balance.qty + "],<br>不可以进行操作",
-					// 		res => {
+							res => {
-					// 			this.packGetFocus();
+								this.packGetFocus();
-					// 		})
+							})
-					// }
+					}
 				} else {
 					this.showBalanceSelect(datas);
 				}

pages/inspect/job/inspectResult.vue

@@ -124,17 +124,13 @@
 									</view>
 									<u-line />
 								</view>
-
-
 							</view>
 						</scroll-view>
 					</view>
 				</uni-collapse-item>
 			</uni-collapse>
-
 		</view>
 
-
 		<view class="bottom" style="padding-bottom: 20rpx;">
 			<button :disabled="submitting" type="primary" class="save-button" @click="commit">提交</button>
 		</view>
@@ -342,10 +338,10 @@
 			},
 
 			commit() {
-					if (this.nextAction == null) {
+				if (this.nextAction == null) {
-						this.showMessage("请选择下一步动作")
+					this.showMessage("请选择下一步动作")
-						return
+					return
-					}
+				}
 
 				if (this.nextAction == "ALL_OK") {
 					//全合格

pages/inventoryMove/coms/comInventoryDetailCard.vue

@@ -17,7 +17,7 @@
 				<u-line />
 			</uni-collapse-item>
 		</uni-collapse>
-		<balance-qty-edit ref="qtyEdit" :settingParam="settingParam" @confirm="confirm"></balance-qty-edit>
+		<balance-qty-edit ref="qtyEdit" :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>

pages/inventoryMove/coms/comMoveRecord.vue

@@ -168,7 +168,7 @@
 			initData() {
 				if (this.businessTypeCode == "Move") {
 					this.title = "库存转移记录";
-					this.toInventoryStatus = "OK"
+					this.toInventoryStatus = ""
 					this.toLocationCode = ""
 				} else if (this.businessTypeCode == "HoldToOk") {
 					this.title = "隔离转合格记录";

static/config.json

@@ -22,7 +22,7 @@
 			"dev2": "http://192.168.0.157:12080/admin-api",
 			"chefang": "http://192.168.0.176:12080/admin-api",
 			"chenxinming": "http://192.168.0.230:12080/admin-api",
-			"liuchen": "http://192.168.0.159:12080/admin-api",
+			"liuchen": "http://192.168.0.157:12080/admin-api",
 			"xuebing": "http://192.168.0.106:12080/admin-api",
 			"dev": "http://dev.ccwin-in.com:25100/api/admin-api",
 			"local": "http://localhost:12080",