修改补料任务

.env.development

@@ -1,11 +1,12 @@
-VITE_BASE_URL=http://172.21.32.14:81/api/admin-api
+VITE_BASE_URL=http://172.22.32.8:81/api/admin-api
-VITE_BASE_URL_IMAGE=http://172.21.32.14:81/admin-api
+VITE_BASE_URL_IMAGE=http://172.22.32.8:81/admin-api
 
 # 租户配置
-VITE_TENANT='[{"text":"长春1379","value":1}]'
+VITE_TENANT='[{"text":"成都1397","value":2},{"text":"长春2379","value":3}]'
 
 # 是否是测试环境
-VITE_isDevelopment=true
+VITE_isDevelopment=false
+
 
 # 积木报表请求路径
-VITE_JMREPORT_BASE_URL='http://172.21.32.14:90'
+VITE_JMREPORT_BASE_URL='http://172.22.32.8:90'

src/manifest.json

@@ -3,8 +3,8 @@
     "package" : "uni.UNI43932FE",
     "appid" : "__UNI__C9CF4BF",
     "description" : "",
-    "versionName" : "1.0.42",
+    "versionName" : "1.0.44",
-    "versionCode" : 42,
+    "versionCode" : 44,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

src/pages/repleinsh/job/repleinshJob.vue

@@ -11,7 +11,8 @@
 					<uni-swipe-action-item
 						:right-options="item.status=='2'?detailGiveupOptions:item.status=='1'?detailCloseOptions:detailOptions"
 						@click="swipeClick($event,item)">
-						<com-repleinsh-job-card :dataContent="item" @click='openJobDetail(item)'></com-repleinsh-job-card>
+						<com-repleinsh-job-card :dataContent="item"
+							@click='openJobDetail(item)'></com-repleinsh-job-card>
 					</uni-swipe-action-item>
 				</view>
 			</uni-swipe-action>
@@ -22,17 +23,18 @@
 
 		</view>
 		<win-scan-button @goScan='openScanPopup' v-if="jobList.length>0"></win-scan-button>
-		<winScanPackJob ref="scanPopup" @getResult='getScanResult' ></winScanPackJob>
+		<winComScanBalance ref="scanPopup" @getBalance='getScanResult' :bussinessCode="businessTypeCode">
+		</winComScanBalance>
+		<!-- <winScanPackJob ref="scanPopup" @getResult='getScanResult' ></winScanPackJob> -->
 		<comMessage ref="comMessage"></comMessage>
 	</view>
 </template>
 
 <script>
-	
 	import {
 		getRepleinshJobList,
 		cancleTakeRepleinshJob,
-		closeTakeRepleinshJob
+		closeTakeRepleinshJob,
 	} from '@/api/request2.js';
 
 	import {
@@ -40,6 +42,10 @@
 		updateTitle
 	} from '@/common/basic.js';
 
+	import {
+		getBusinessType
+	} from '@/common/record.js';
+
 	import {
 		getDetailOption,
 		getDetailGiveupOption,
@@ -54,6 +60,7 @@
 	import repleinshInfoPopup from '@/pages/repleinsh/coms/repleinshInfoPopup.vue'
 	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
 	import winScanPackJob from "@/mycomponents/scan/winScanPackJob.vue"
+	import winComScanBalance from '@/mycomponents/scan/winComScanBalance.vue'
 
 	export default {
 		name: 'repleinsh',
@@ -65,6 +72,7 @@
 			repleinshInfoPopup,
 			winScanPackJob,
 			winScanButton,
+			winComScanBalance
 		},
 		data() {
 			return {
@@ -81,11 +89,17 @@
 				detailGiveupOptions: [],
 				detailCloseOptions: [],
 				title: '',
-				scanMessage:""
+				scanMessage: "",
+				businessTypeCode: "Repleinment",
+				businessType: null,
+				scanBalance: {},
+				inInventoryStatus: "", //目标入库库存状态
+				outInventoryStatus: "", //来源出库库存状态
 			};
 		},
 		onLoad(option) {
 			this.title = option.title
+			this.getBusinessTypeFunc()
 		},
 
 		onShow() {
@@ -128,8 +142,20 @@
 		},
 
 		methods: {
-			getList(type, fromLocationCode = '') {
+			getBusinessTypeFunc() {
+				getBusinessType(this.businessTypeCode, res => {
+					if (res.success) {
+						this.businessType = res.businessType;
+						this.fromInventoryStatuses = getDirectoryItemArray(res.fromInventoryStatuses);
+						this.fromLocationAreaTypeList = res.fromLocationAreaTypeList
+						// this.openScanPopup();
+					} else {
+						this.showErrorMessage(res.message)
+					}
+				});
+			},
 
+			getList(type, fromLocationCode = '') {
 				let that = this;
 				uni.showLoading({
 					title: "加载中­....",
@@ -210,9 +236,10 @@
 				this.getList('refresh', fromLocationCode, '')
 			},
 
-			openJobDetail(item,scanMessage = '') {
+			openJobDetail(item, scanMessage) {
 				uni.navigateTo({
-					url: './repleinshDetail?id=' + item.masterId + '&status=' + item.status+'&scanMessage=' + scanMessage +'&title='+this.title
+					url: './repleinshDetail?id=' + item.masterId + '&status=' + item.status + '&scanMessage=' +
+						scanMessage + '&title=' + this.title
 				});
 				this.scanMessage = ""
 			},
@@ -350,13 +377,20 @@
 				});
 			},
 			openScanPopup() {
-				this.$refs.scanPopup.openScanPopup();
+				if (this.businessType == null) {
+					this.getBusinessTypeFunc()
+				} else {
+					this.$refs.scanPopup.openScanPopup(this.businessType);
+				}
+
 			},
 			selectItem(item) {
 				this.$refs.scanPopup.closeScanPopup();
 				this.openJobDetail(item, this.scanMessage);
 			},
 			getScanResult(result) {
+				let balance = result.balance;
+				if (balance != null) {
 					this.scanMessage = ""
 					if (!result.label.batch) {
 						this.showMessage("批次为空")
@@ -367,8 +401,7 @@
 						return;
 					}
 					try {
-					var filters = [
+						var filters = [{
-						{
 								column: "status",
 								action: "in",
 								value: '1,2'
@@ -387,6 +420,11 @@
 								column: "accept_user_id",
 								action: "==",
 								value: this.$store.state.user.id
+							},
+							{
+								column: "fromLocationCode",
+								action: "==",
+								value: balance.locationCode
 							}
 						]
 						getRepleinshJobList({
@@ -413,7 +451,8 @@
 									this.selectItem(list[0])
 								}
 							} else {
-							this.showMessage("物料号["+result.label.itemCode+"]批次["+result.label.batch+']未查找到任务<br>'+"扫描["+result.scanMessage+"]")
+								this.showMessage("物料号[" + result.label.itemCode + "]批次[" + result.label.batch +
+									']未查找到任务<br>' + "扫描[" + result.scanMessage + "]")
 							}
 						}).catch(error => {
 							this.showMessage(error + "<br>扫描[" + result.scanMessage + "]")
@@ -422,6 +461,11 @@
 					} catch (e) {
 						this.showMessage(e.message)
 					}
+				}
+				// else
+				// {
+				// 	this.showMessage(error + "<br>扫描[" + result.scanMessage + "]")
+				// }
 			},
 		}
 	}