Browse Source

bug 修复

lilei 2 years ago
parent
commit
76ec7429bd

+ 12 - 3
manifest.json

@@ -2,8 +2,8 @@
     "name" : "iSCM智慧供应链",
     "appid" : "__UNI__5B57B68",
     "description" : "iSCM智慧供应链系统",
-    "versionName" : "1.1.6",
-    "versionCode" : 116,
+    "versionName" : "1.1.7",
+    "versionCode" : 117,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -89,7 +89,16 @@
             "ios" : {
                 "idfa" : false,
                 "dSYMs" : false,
-                "UIBackgroundModes" : "audio,bluetooth-central"
+                "UIBackgroundModes" : "audio,bluetooth-central",
+                "privacyDescription" : {
+                    //可选,JSON对象,iOS隐私信息访问的许可描述
+                    "NSPhotoLibraryUsageDescription" : "为了方便识别产品二维码,需要开启相册", //可选,字符串类型,系统相册读取权限描述
+                    "NSPhotoLibraryAddUsageDescription" : "为了方便识别产品二维码,需要开启相册", //可选,字符串类型,系统相册写入权限描述
+                    "NSCameraUsageDescription" : "为了方便识别产品二维码,需要开启相机", //可选,字符串类型,摄像头使用权限描述
+                    "NSLocationWhenInUseUsageDescription" : "为了连接蓝牙打印机,需要开启定位", //可选,字符串类型,运行期访问位置权限描述
+                    "NSBluetoothPeripheralUsageDescription" : "为了连接蓝牙打印机,需要开启蓝牙", //可选,字符串类型,使用蓝牙权限描述
+                    "NSBluetoothAlwaysUsageDescription" : "为了连接蓝牙打印机,需要开启蓝牙" //可选,字符串类型,后台使用蓝牙权限描述
+                }
             },
             /* SDK配置 */
             "sdkConfigs" : {

+ 1 - 1
pages/shelfSetting/shelfSet.vue

@@ -324,7 +324,7 @@
 			},
 			getHasCartNotEmpty(){
 				shelfCartNotEmpty({ shelfSn: this.shelfSn }).then(res => {
-					this.showDot = this.placeTab.length && res.data == 1
+					this.showDot = res.data == 1
 				})
 			}
 		}

+ 2 - 2
pages/stockCheck/editModal.vue

@@ -14,7 +14,7 @@
 				 <view class="p-info flex align_center">
 				 	<text>可用库存</text> {{infoData.currQty}}
 				 </view>
-				 <view class="p-info flex align_center">
+				 <!-- <view class="p-info flex align_center">
 				 	<text>冻结库存</text>
 					<view class="flex align_center">
 						{{infoData.freezeQty}}
@@ -23,7 +23,7 @@
 							<u-icon name="arrow-right"></u-icon>
 						</view>
 					</view>
-				 </view>
+				 </view> -->
 				 <view class="p-info flex align_center">
 				 	<text>结算价格</text>
 					<view>

+ 11 - 8
pages/stockCheck/shelfList.vue

@@ -46,10 +46,10 @@
 								可用库存:
 								<text class="item-detail-text">{{item.totalStockQty}}</text>
 							</view>
-							<view>
+							<!-- <view>
 								冻结库存:
 								<text class="item-detail-text">{{item.totalFreezeQty}}</text>
-							</view>
+							</view> -->
 						</view>
 					</view>
 					<view class="item-info button-box justify_between align_center" v-if="item.checkState=='WAIT'">
@@ -155,13 +155,16 @@
 			},
 			viewDetail(item){
 				this.tempData = item
+				// 去库存盘点
+				this.toCheck()
+				
 				// 如果有冻结库存
-				if(item.totalFreezeQty>0){
-					 this.showModal = true
-				}else{
-					// 去库存盘点
-					this.toCheck()
-				}
+				// if(item.totalFreezeQty>0){
+				// 	 this.showModal = true
+				// }else{
+				// 	// 去库存盘点
+				// 	this.toCheck()
+				// }
 			},
 			toCheck(){
 				uni.navigateTo({

+ 3 - 3
pages/stockCheck/startCheck.vue

@@ -133,9 +133,9 @@
 										<text class="item-detail-text">
 											可用:{{item.stockQty?item.stockQty:0}} {{item.product&&item.product.unit}}
 										</text>
-										<text class="item-detail-text">
+										<!-- <text class="item-detail-text">
 											冻结:{{item.freezeQty?item.freezeQty:0}} {{item.product&&item.product.unit}}
-										</text>
+										</text> -->
 									</view>
 								</view>
 							</view>
@@ -170,7 +170,7 @@
 				<view class="tabs">
 					<view>
 						<view :class="'available'==curType?'active':''" @click="curType=curType=='available'?'':'available'">有可用库存的产品</view>
-						<view :class="'blocked'==curType?'active':''" @click="curType=curType=='blocked'?'':'blocked'">有冻结库存的产品</view>
+						<!-- <view :class="'blocked'==curType?'active':''" @click="curType=curType=='blocked'?'':'blocked'">有冻结库存的产品</view> -->
 					</view>
 					<view class="flex">
 						<view :class="item==curTab?'active':''" v-for="item in placeTab" :key="item" @click="curTab=curTab==item?'':item">{{item}}层</view>

+ 2 - 2
pages/stockCheck/submitStockCheck.vue

@@ -46,12 +46,12 @@
 										</text>
 										{{item.stockQty||0}}
 									</view>
-									<view>
+									<!-- <view>
 										<text class="item-detail-text">
 											冻结:
 										</text>
 										{{item.freezeQty||0}}
-									</view>
+									</view> -->
 									<view>
 										<text class="item-detail-text">
 											实际可用: