From 9044f1637cd85a053a65b3333fb3b030e8102bd3 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Tue, 28 Nov 2023 19:45:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9error?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mycomponents/detail/comDetailCard.vue               |  2 +-
 mycomponents/recommend/recommend.vue                |  4 ++--
 pages.json                                          |  2 +-
 pages/count/job/countDetail.vue                     |  9 +++++----
 pages/count/record/countRecord.vue                  | 10 +++-------
 pages/inspect/job/inspectJob.vue                    |  7 +++----
 pages/inventoryMove/coms/comInventoryDetailCard.vue | 13 +------------
 pages/issue/js/issue.js                             |  1 +
 pages/scrap/job/scrapJobDetail.vue                  | 12 +++++-------
 .../record/supplierDeliverRecordDetail.vue          | 12 ------------
 pages/transfer/coms/comTransferRecord.vue           | 11 ++++++-----
 .../record/{issueRecord.vue => deliverRecord.vue}   |  2 +-
 pages/transfer/record/receiptRecord.vue             |  2 +-
 13 files changed, 30 insertions(+), 57 deletions(-)
 rename pages/transfer/record/{issueRecord.vue => deliverRecord.vue} (80%)

diff --git a/mycomponents/detail/comDetailCard.vue b/mycomponents/detail/comDetailCard.vue
index 07589a53..e0ca6925 100644
--- a/mycomponents/detail/comDetailCard.vue
+++ b/mycomponents/detail/comDetailCard.vue
@@ -15,8 +15,8 @@
 							</recommend>
 						</uni-swipe-action-item>
 					</uni-swipe-action>
-					<u-line />
 				</view>
+				<u-line />
 			</uni-collapse-item>
 		</uni-collapse>
 		<balance-qty-edit ref="qtyEdit" :settingParam="settingParam" @confirm="confirm"></balance-qty-edit>
diff --git a/mycomponents/recommend/recommend.vue b/mycomponents/recommend/recommend.vue
index 0362abc4..3e0f7196 100644
--- a/mycomponents/recommend/recommend.vue
+++ b/mycomponents/recommend/recommend.vue
@@ -5,7 +5,7 @@
 			<view>
 				<pack v-if="isShowPack" :packingCode="detail.packingNumber"></pack>
 				<batch v-if="isShowBatch" :batch="detail.batch"></batch>
-				<location v-if="isShowLocation" title="来源库位" :locationCode="detail.fromLocationCode">
+				<location v-if="isShowFromLocation" title="来源库位" :locationCode="detail.fromLocationCode">
 				</location>
 				<location v-if="isShowToLocation" title="目标库位" :locationCode="detail.toLocationCode">
 				</location>
@@ -60,7 +60,7 @@
 				type: Boolean,
 				default: true
 			},
-			isShowLocation: {
+			isShowFromLocation: {
 				type: Boolean,
 				default: true
 			},
diff --git a/pages.json b/pages.json
index 4dd39be3..41a4d87e 100644
--- a/pages.json
+++ b/pages.json
@@ -1020,7 +1020,7 @@
 		},
 
 		{
-			"path": "pages/transfer/record/issueRecord",
+			"path": "pages/transfer/record/deliverRecord",
 			"style": {
 				"navigationBarTitleText": "调拨发出记录",
 				"enablePullDownRefresh": true
diff --git a/pages/count/job/countDetail.vue b/pages/count/job/countDetail.vue
index 2b5a9c3c..aae27b25 100644
--- a/pages/count/job/countDetail.vue
+++ b/pages/count/job/countDetail.vue
@@ -1,8 +1,6 @@
 <template>
 	<view class="page-wraper">
-		<requiredLocation title="盘点库位" :locationCode="fromLocationCode" :isShowEdit="jobContent.allowModifyLocation==1"
-			@getLocation='scanLocationCode' :locationTypeList="locationTypeList"></requiredLocation>
-		<u-line></u-line>
+		
 		<view class="page-main">
 			<scroll-view scroll-y="true" class="page-main-scroll">
 				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
@@ -21,6 +19,9 @@
 			<view class="uni-flex u-col-center space-between padding_10"
 				style="background-color:ghostwhite; width: 100%; ">
 				<view class="">
+					<requiredLocation title="盘点库位" :locationCode="fromLocationCode" :isShowEdit="jobContent.allowModifyLocation==1"
+						@getLocation='scanLocationCode' :locationTypeList="locationTypeList"></requiredLocation>
+					<u-line></u-line>
 				</view>
 				<view class=" uni-flex uni-row">
 					<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@@ -476,7 +477,7 @@
 
 			},
 			
-			async submitJob() {
+			 submitJob() {
 				uni.showLoading({
 					title: "提交中....",
 					mask: true
diff --git a/pages/count/record/countRecord.vue b/pages/count/record/countRecord.vue
index 73771c26..29f99d2e 100644
--- a/pages/count/record/countRecord.vue
+++ b/pages/count/record/countRecord.vue
@@ -188,15 +188,11 @@
 
 			getfromLocationCode(location) {
 				this.fromLocationInfo = location;
-				this.fromLocationCode = location.Code;
+				this.fromLocationCode = location.code;
 
 				//查询库位下的库存
-				let param = {
-					locationCode: this.fromLocationCode,
-					inventoryStatus: []
-				};
-				balanceByLocation(param, res => {
-					this.subList = res.Data;
+				balanceByLocation(this.fromLocationCode, res => {
+					this.subList = res.data.list;
 					this.detailSource = getDataSource(this.subList);
 					
 				});
diff --git a/pages/inspect/job/inspectJob.vue b/pages/inspect/job/inspectJob.vue
index 6a422185..55383eba 100644
--- a/pages/inspect/job/inspectJob.vue
+++ b/pages/inspect/job/inspectJob.vue
@@ -24,7 +24,6 @@
 </template>
 
 <script>
-
 	import {
 		cancleTakeInspectJob,
 		getInspectJobList,
@@ -211,12 +210,12 @@
 
 			cancleJob(id) {
 				cancleTakeInspectJob(id).then(res => {
-					if(res.data){
+					if (res.data) {
 						this.getList("refresh")
 						uni.showToast({
-							title:"放弃任务成功"
+							title: "放弃任务成功"
 						})
-					}else {
+					} else {
 						this.showMessage("放弃任务失败")
 					}
 				}).catch(error => {
diff --git a/pages/inventoryMove/coms/comInventoryDetailCard.vue b/pages/inventoryMove/coms/comInventoryDetailCard.vue
index db705ca7..50fd7c56 100644
--- a/pages/inventoryMove/coms/comInventoryDetailCard.vue
+++ b/pages/inventoryMove/coms/comInventoryDetailCard.vue
@@ -10,21 +10,10 @@
 					<uni-swipe-action ref="swipeAction">
 						<uni-swipe-action-item :right-options="item.scaned?scanOptions:detailOptions"
 							@click="swipeClick($event,item)">
-							<!-- <view class="uni-row ">
-								<view class="location_view uni-inline-item">
-									<text class="card_location">来源库位</text>
-									<text style="margin-left: 10px">{{item.fromLocationCode}}</text>
-								</view>
-								<view class="location_view uni-inline-item">
-									<text class="card_location">目标库位</text>
-									<text style="margin-right: 10px">{{item.toLocationCode}}</text>
-								</view>
-							</view> -->
 							<recommend :detail="item"  :isShowFromLocation="true" :isShowToLocation="true"></recommend>
-
-							<u-line />
 						</uni-swipe-action-item>
 					</uni-swipe-action>
+					<u-line />
 				</view>
 			</uni-collapse-item>
 		</uni-collapse>
diff --git a/pages/issue/js/issue.js b/pages/issue/js/issue.js
index e61d7cfe..979f49cd 100644
--- a/pages/issue/js/issue.js
+++ b/pages/issue/js/issue.js
@@ -3,6 +3,7 @@ export function getDataSource(list,subList) {
 		let detail = subList[i];
 		var location = list.find(r =>
 			r.toLocationCode == detail.toLocationCode)
+			
 		if (location == undefined) {
 			location = {
 				toLocationCode: detail.toLocationCode,
diff --git a/pages/scrap/job/scrapJobDetail.vue b/pages/scrap/job/scrapJobDetail.vue
index ed500f57..a8b5c49c 100644
--- a/pages/scrap/job/scrapJobDetail.vue
+++ b/pages/scrap/job/scrapJobDetail.vue
@@ -298,7 +298,7 @@
 				// 	if (res.data) {
 				// 		this.showCommitSuccessMessage("提交成功<br>生成计划外出库记录" + res.data )
 				// 	} else {
-				// 		this.showErrorMessage("提交失败[" + res.msg + "]")
+				// 		this.showErrorMessage("提交失败"+res.msg)
 				// 	}
 				// }).catch(error => {
 				// 	uni.hideLoading()
@@ -381,7 +381,7 @@
 			closeCommitMessage() {
 				setTimeout(() => {
 					uni.navigateTo({
-						url: './receipt'
+						url: './scrapJob'
 					})
 				})
 				//点关闭直接返回列表
@@ -390,11 +390,9 @@
 
 			showCommitSuccessMessage(hint) {
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
-					setTimeout(() => {
-						uni.navigateTo({
-							url: './receiptJob'
-						})
-					}, 3000)
+					uni.navigateTo({
+						url: './scrapJob'
+					})
 				})
 			},
 		}
diff --git a/pages/supplierDeliver/record/supplierDeliverRecordDetail.vue b/pages/supplierDeliver/record/supplierDeliverRecordDetail.vue
index fafc77cb..b6450fc9 100644
--- a/pages/supplierDeliver/record/supplierDeliverRecordDetail.vue
+++ b/pages/supplierDeliver/record/supplierDeliverRecordDetail.vue
@@ -157,7 +157,6 @@
 								this.showMessage("箱码【" + packingNumber + "】已经扫描")
 							} else {
 								itemDetail.scaned = true;
-								itemDetail.record = this.createRecordInfo(itemDetail, result.label);
 								calcHandleQty(this.detailSource);
 							}
 						}
@@ -168,17 +167,6 @@
 				}
 			},
 
-			createRecordInfo(detail, label) {
-				var record = {}
-				detail.scaned = true;
-				// let record = JSON.parse(JSON.stringify(detail));
-				//克隆对象，深度克隆，防止双向绑定同一个变量
-				Object.assign(record, detail)
-				record.qty = Number(label.qty);
-				record.toLocationCode = this.toLocationCode;
-				return record;
-			},
-
 			getScanCount(closeScan) {
 				let items = this.subList.filter(r => {
 					if (r.scaned) {
diff --git a/pages/transfer/coms/comTransferRecord.vue b/pages/transfer/coms/comTransferRecord.vue
index 6ae55d36..9aeea896 100644
--- a/pages/transfer/coms/comTransferRecord.vue
+++ b/pages/transfer/coms/comTransferRecord.vue
@@ -18,13 +18,14 @@
 				</scroll-view>
 			</view>
 
-			<requiredLocation title="目标库位" :locationCode="toLocationCode" @getLocation='getToLocationCode'
-				:locationTypeList="tolocationTypeList"></requiredLocation>
+			
 
 			<view class="page-footer">
 				<view class="uni-flex u-col-center space-between padding_10"
 					style="background-color:ghostwhite; width: 100%; ">
 					<view class="">
+						<requiredLocation title="目标库位" :locationCode="toLocationCode" @getLocation='getToLocationCode'
+							:locationTypeList="tolocationTypeList"></requiredLocation>
 					</view>
 					<view class=" uni-flex uni-row">
 						<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@@ -119,9 +120,9 @@
 		},
 		mounted(option) {
 			var typeCode =""
-			if(this.transferType=="transferIssue"){
-				 typeCode = "Transfer"
-			}else if(this.transferType=="transferReceipt"){
+			if(this.transferType=="TransferDeliver"){
+				 typeCode = "TransferDeliver"
+			}else if(this.transferType=="TransferReceipt"){
 				 typeCode = "TransferReceipt"
 			}
 			
diff --git a/pages/transfer/record/issueRecord.vue b/pages/transfer/record/deliverRecord.vue
similarity index 80%
rename from pages/transfer/record/issueRecord.vue
rename to pages/transfer/record/deliverRecord.vue
index a7dcceb2..d5b0a598 100644
--- a/pages/transfer/record/issueRecord.vue
+++ b/pages/transfer/record/deliverRecord.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="page-wraper">
-		<comTransferRecord transferType="transferIssue"> </comTransferRecord>
+		<comTransferRecord transferType="TransferDeliver"> </comTransferRecord>
 	</view>
 </template>
 
diff --git a/pages/transfer/record/receiptRecord.vue b/pages/transfer/record/receiptRecord.vue
index efd0c4ea..6dd30f40 100644
--- a/pages/transfer/record/receiptRecord.vue
+++ b/pages/transfer/record/receiptRecord.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="page-wraper">
-		<comTransferRecord transferType="transferReceipt"> </comTransferRecord>
+		<comTransferRecord transferType="TransferReceipt"> </comTransferRecord>
 	</view>
 </template>