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

# Conflicts:
#	.env.development

.env.development

@@ -1 +1,6 @@
+VITE_BASE_URL=http://dev.ccwin-in.com:25300/api/admin-api
+VITE_BASE_URL_IMAGE=http://dev.ccwin-in.com:25300/api/admin-api
 VITE_BASE_URL=http://172.21.32.14:81/api/admin-api
VITE_BASE_URL_IMAGE=http://172.21.32.14:81/api/admin-api

# 租户配置
VITE_TENANT='[{"text":"长春","value":1},{"text":"成都","value":2}]'
+
+# 是否是测试环境
+VITE_isDevelopment=true

.env.hella13

@@ -3,3 +3,6 @@ VITE_BASE_URL_IMAGE=http://172.21.32.13:81/admin-api
 
 # 租户配置
 VITE_TENANT='[{"text":"长春","value":1}]'
+
+# 是否是测试环境
+VITE_isDevelopment=false

.env.hella14

@@ -3,3 +3,6 @@ VITE_BASE_URL_IMAGE=http://172.21.32.14:81/admin-api
 
 # 租户配置
 VITE_TENANT='[{"text":"长春","value":1}]'
+
+# 是否是测试环境
+VITE_isDevelopment=false

.env.hella15

@@ -3,3 +3,6 @@ VITE_BASE_URL_IMAGE=http://172.21.32.15:81/admin-api
 
 # 租户配置
 VITE_TENANT='[{"text":"长春","value":1}]'
+
+# 是否是测试环境
+VITE_isDevelopment=false

.env.hella16

@@ -3,3 +3,6 @@ VITE_BASE_URL_IMAGE=http://172.21.32.16:81/admin-api
 
 # 租户配置
 VITE_TENANT='[{"text":"长春","value":1},{"text":"成都","value":2}]'
+
+# 是否是测试环境
+VITE_isDevelopment=false

.env.hella8

@@ -3,3 +3,6 @@ VITE_BASE_URL_IMAGE=http://172.22.32.8:81/admin-api
 
 # 租户配置
 VITE_TENANT='[{"text":"成都","value":2}]'
+
+# 是否是测试环境
+VITE_isDevelopment=false

.env.hella9

@@ -3,3 +3,6 @@ VITE_BASE_URL_IMAGE=http://172.22.32.9:81/admin-api
 
 # 租户配置
 VITE_TENANT='[{"text":"成都","value":2}]'
+
+# 是否是测试环境
+VITE_isDevelopment=false

.env.production

@@ -1 +1,4 @@
 VITE_BASE_URL=http://172.21.32.14:81/api/admin-api
VITE_BASE_URL_IMAGE=http://172.21.32.14:81/admin-api

# 租户配置
VITE_TENANT='[{"text":"长春","value":1},{"text":"成都","value":2}]'
+
+# 是否是测试环境
+VITE_isDevelopment=false

.env.test

@@ -4,3 +4,6 @@ VITE_BASE_URL_IMAGE=http://dev.ccwin-in.com:25300/admin-api
 
 # 租户配置
 VITE_TENANT='[{"text":"长春","value":1},{"text":"成都","value":2}]'
+
+# 是否是测试环境
+VITE_isDevelopment=false

src/mycomponents/qty/balanceQtyEdit.vue

@@ -14,11 +14,11 @@
 					<view class="uni-flex uni-column" style="background-color: white; height:60%;">
 						<view class="uni-flex uni-column  ">
 							<view class="uni-flex uni-row space-between padding title ">
-								<text>标包个数 : </text>
+								<text>包装数量 : </text>
 								<view class="uni-flex uni-row u-col-center">
 									<uni-number-box @change="calcQty($event,stdCount)" :value="stdCount">
 									</uni-number-box>
-									<uom :uom="dataContent.uom"></uom>
+<!-- 									<uom :uom="dataContent.uom"></uom -->
 									<!-- <uom :uom="dataContent.packUnit"></uom> -->
 								</view>
 							</view>
@@ -94,9 +94,7 @@
 				maxlength: 10
 			}
 		},
-		watch: {
 		
-		},
 		created() {
 
 		},
@@ -119,6 +117,18 @@
 				default: false
 			}
 		},
+		watch:{
+			'allQty'(newVal){
+				if(newVal % Number(this.dataContent.packQty)>0){
+					this.stdCount = Math.floor(Number(newVal)/Number(this.dataContent.packQty))+1
+					
+				}else{
+					this.stdCount = Math.floor(Number(newVal)/Number(this.dataContent.packQty))
+					
+				}
+				console.log('allQty===',newVal)
+			}
+		},
 		methods: {
 			checkNum(e) {
 				let value = e.detail.value;

src/mycomponents/status/balanceStatus.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="uni-flex u-col-center" style="background-color: #fff;">
-		<status :status='status' style='font-size: 70rpx;'></status>
+		<!-- <status :status='status' style='font-size: 70rpx;'></status> -->
 		<text :class="statusStyle(status)" style='font-size: 38rpx;margin-right: 15rpx;'>
 			{{statusDesc(status) }}</text>
 			 <!-- v-show="allowEdit" -->

src/pages/customerReturn/job/returnDetail.vue

@@ -18,7 +18,7 @@
 			<view class="uni-flex u-col-center space-between padding_10"
 				style="background-color:ghostwhite; width: 100%; ">
 				<view class="">
-					<locationCompare ref='comScanLocation' title="目标库位" :recommendLocationCode="jobToLocationCode" :locationCode="toLocationCode"
+					<locationCompare ref='comScanLocation' :isShowEdit="jobContent.allowModifyLocation=='TRUE'" title="目标库位" :recommendLocationCode="jobToLocationCode" :locationCode="toLocationCode"
 						@getLocation='scanLocationCode' 
 						:locationAreaTypeList="toLocationAreaTypeList"></locationCompare>
 				</view>

src/pages/productReceipt/job/fgProductReceiptDetail.vue

@@ -50,7 +50,7 @@
 			<view class="uni-flex u-col-center space-between padding_10"
 				style="background-color:ghostwhite; width: 100%; ">
 				<view class="">
-					<locationCompare title="收货库位" :recommendLocationCode="jobToLocationCode"
+					<locationCompare title="收货库位" :isShowEdit="jobContent.allowModifyLocation=='TRUE'" :recommendLocationCode="jobToLocationCode"
 						:locationCode="toLocationCode" @getLocation='scanLocationCode'
 						:locationTypeList="toLocationTypeList"></locationCompare>
 				</view>

src/pages/productReceipt/job/productReceiptDetail.vue

@@ -53,7 +53,7 @@
 			<view class="uni-flex u-col-center space-between padding_10"
 				style="background-color:ghostwhite; width: 100%; ">
 				<view class="">
-					<locationCompare title="收货库位" :recommendLocationCode="jobToLocationCode"
+					<locationCompare title="收货库位" :isShowEdit="jobContent.allowModifyLocation=='TRUE'" :recommendLocationCode="jobToLocationCode"
 						:locationCode="toLocationCode" @getLocation='scanLocationCode'
 						:locationAreaTypeList="toLocationAreaTypeList"></locationCompare>
 				</view>

src/static/config.js

@@ -1,7 +1,7 @@
 let request_url = "http://dev.ccwin-in.com:25300/api/admin-api"
 // let request_url = "http://192.168.0.128:12080/admin-api"
 
-let isDevelopment = false
+let isDevelopment = import.meta.env.VITE_isDevelopment=='true';
 
 export default {
 	request_url,