From 871afa348ad060b07a2aee5ccb6e77c3a9f25d2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=BF=97=E5=9B=BD?= <854933521@qq.com>
Date: Wed, 13 Nov 2024 13:36:00 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20mycomponents=20=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=20Vue2=E5=8D=87=E7=BA=A7Vue3=2011-11/11-13?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/record.js                          | 17 +++++++++-
 .../detail/comRecommendDetailCard.vue         | 33 ++++++++++++-------
 src/mycomponents/job/jobComMainDetailCard.vue |  2 +-
 src/mycomponents/job/jobSettingInfo.vue       |  2 +-
 src/mycomponents/qty/compareQty.vue           |  2 +-
 src/mycomponents/qty/recommendHandleQty.vue   |  2 +-
 src/mycomponents/qty/recommendQtyEdit.vue     |  4 +--
 src/mycomponents/query/fifoQuery.vue          |  8 ++---
 .../scan/winScanPackAndLocation.vue           | 33 ++++++++++++++++---
 9 files changed, 77 insertions(+), 26 deletions(-)

diff --git a/src/common/record.js b/src/common/record.js
index 92c870ac..66dc276e 100644
--- a/src/common/record.js
+++ b/src/common/record.js
@@ -25,7 +25,22 @@ export function createItemInfo(balance, pack) {
 	item.containerNumber = pack.parentNumber ? pack.parentNumber : pack.number;
 	return item;
 }
-
+export function createItemInfoForLabel(balance, label) {
+	let item = {
+		itemCode: label.itemCode,
+		itemName: label.itemName,
+		packQty: '',
+		packUnit: '',
+		qty: new Decimal(balance.qty).toNumber(),
+		handleQty: new Decimal(0).toNumber(),
+		uom: balance.uom,
+		subList: [],
+		// packingNumber: pack.number,
+		// parentPackingNumber: pack.parentNumber,
+	}
+	item.containerNumber = balance.parentNumber ? balance.parentNumber : balance.number;
+	return item;
+}
 export function createDetailInfo(balance, pack) {
 	balance.scaned = true;
 	// data.toInventoryStatus = this.toInventoryStatus == "" ? data.inventoryStatus : this.toInventoryStatus;
diff --git a/src/mycomponents/detail/comRecommendDetailCard.vue b/src/mycomponents/detail/comRecommendDetailCard.vue
index c97f9eac..5a8808bb 100644
--- a/src/mycomponents/detail/comRecommendDetailCard.vue
+++ b/src/mycomponents/detail/comRecommendDetailCard.vue
@@ -13,20 +13,23 @@
                             style='padding:0px 0px  5px 0px;align-items: center;'
                             @click="(...event)=>swipeClick(event,item)">
             <view  v-if="item.isRecommend" class="uni-flex" style="flex-direction: row; align-items: center;background-color: antiquewhite;">
-              <view class="" style="font-size: 32rpx; color: black; font-weight: bold; text-align: center;">
-                推 荐
+              <view class="" style="font-size: 32rpx; color: #3c9cff; font-weight: bold; text-align: center;padding: 10px;">
+                推<br/>荐
               </view>
               <recommend :detail="item" :isShowStatus="isShowStatus"
-                         :isShowToLocation="false" style="flex: 1">
+                         :isShowFromLocation="isShowFromLocation"
+                         :isShowToLocation="isShowToLocation" style="flex: 1">
               </recommend>
             </view>
-            <view v-else class="uni-flex" style="flex-direction: row; align-items: center;background-color: antiquewhite; margin-top: 5rpx;">
-              <view class="" style="font-size: 32rpx; color: red; font-weight: bold; text-align: center;">
-                实
-                际
+            <view v-else class="uni-flex"
+                  :class="item.scaned?'scan_view':''"
+                  style="flex-direction: row; align-items: center;background-color: antiquewhite; margin-top: 5rpx;">
+              <view class="" style="font-size: 32rpx; color: rgb(107, 196, 78);; font-weight: bold; text-align: center;">
+                实<br/>际
               </view>
-              <recommend  :detail="item" :isShowStatus="isShowStatus"
-                          :isShowToLocation="false" style="flex: 1">
+              <recommend :detail="item" :isShowStatus="isShowStatus"
+                         :isShowFromLocation="isShowFromLocation"
+                         :isShowToLocation="isShowToLocation" style="flex: 1">
               </recommend>
             </view>
 					</u-swipe-action>
@@ -84,8 +87,16 @@ const props = defineProps({
   isShowStatus: {
     type: Boolean,
     default: true
-  }
-});
+  },
+  isShowFromLocation: {
+    type: Boolean,
+    default: true
+  },
+  isShowToLocation: {
+    type: Boolean,
+    default: true
+  },
+})
 const emit = defineEmits(['openDetail', 'remove', 'updateData']);
 
 const collapse1 = ref(null);
diff --git a/src/mycomponents/job/jobComMainDetailCard.vue b/src/mycomponents/job/jobComMainDetailCard.vue
index 7e617a58..f02f291b 100644
--- a/src/mycomponents/job/jobComMainDetailCard.vue
+++ b/src/mycomponents/job/jobComMainDetailCard.vue
@@ -7,7 +7,7 @@
       ></itemCompareQty>
       <view>
         <pack v-if="isShowPack && dataContent.packingNumber != null" :packingCode="dataContent.packingNumber"> </pack>
-        <batch v-if="isShowBatch && dataContent.batch != null" :batch="dataContent.batch"></batch>
+        <batch v-if="isShowBatch && dataContent.batch" :batch="dataContent.batch"></batch>
         <view class="u-flex justify-between u-p-b-16">
           <location v-if="isShowFromLocation && dataContent.fromLocationCode" title="来源库位" :locationCode="dataContent.fromLocationCode"> </location>
           <level title="优先级" :priority="dataContent.priority" v-if="dataContent.priority !== '' && dataContent.priority !== undefined && dataContent.priority !== null"> </level>
diff --git a/src/mycomponents/job/jobSettingInfo.vue b/src/mycomponents/job/jobSettingInfo.vue
index 37efe861..516291e5 100644
--- a/src/mycomponents/job/jobSettingInfo.vue
+++ b/src/mycomponents/job/jobSettingInfo.vue
@@ -29,7 +29,7 @@
 				</view>
 				<view class="item">
 					<text class="item_title">允许修改批次 : </text>
-					<text class="text_wrap">{{converter(dataContent.allowModifyBach)}} </text>
+					<text class="text_wrap">{{converter(dataContent.allowModifyBatch)}} </text>
 				</view>
 				<view class="item">
 					<text class="item_title">允许部分完成 : </text>
diff --git a/src/mycomponents/qty/compareQty.vue b/src/mycomponents/qty/compareQty.vue
index c4c32c50..5ba6351e 100644
--- a/src/mycomponents/qty/compareQty.vue
+++ b/src/mycomponents/qty/compareQty.vue
@@ -1,6 +1,6 @@
 <template>
   <view>
-    <status v-show="isShowStatus" :status="dataContent.inventoryStatus"></status>
+    <status v-show="isShowStatus  && dataContent.inventoryStatus" :status="dataContent.inventoryStatus"></status>
     <view class="u-flex u-row center">
       <view class="u-flex u-row">
         <view v-if="Number(handleQty) != 0">
diff --git a/src/mycomponents/qty/recommendHandleQty.vue b/src/mycomponents/qty/recommendHandleQty.vue
index b96ea388..14a7d20a 100644
--- a/src/mycomponents/qty/recommendHandleQty.vue
+++ b/src/mycomponents/qty/recommendHandleQty.vue
@@ -10,7 +10,7 @@
         {{ Number(dataContent.qty) }}
       </view>
     </view>
-
+    <uom :uom="dataContent.uom"></uom>
     <view>
       <pack-unit :dataContent="dataContent"></pack-unit>
       <!-- 	<std-pack-qty v-show="isShowStdPack" :dataContent="dataContent"></std-pack-qty> -->
diff --git a/src/mycomponents/qty/recommendQtyEdit.vue b/src/mycomponents/qty/recommendQtyEdit.vue
index 5de6cf6b..a3729503 100644
--- a/src/mycomponents/qty/recommendQtyEdit.vue
+++ b/src/mycomponents/qty/recommendQtyEdit.vue
@@ -21,8 +21,8 @@
                   {{ handleGetPackUnitName(dataContent.packUnit) }}
                 </view>
               </view>
-              <view class="split_line"></view>
-              <view class="uni-flex uni-row space-between padding title u-col-center">
+              <view class="split_line" v-if="dataContent.packQty"></view>
+              <view class="uni-flex uni-row space-between padding title u-col-center" v-if="dataContent.packQty">
                 <text>包装规格 : </text>
                 <view class="uni-flex u-col-center uni-row">
                   <packUnit :dataContent="dataContent"></packUnit>
diff --git a/src/mycomponents/query/fifoQuery.vue b/src/mycomponents/query/fifoQuery.vue
index 2b7b2390..dc6a71a6 100644
--- a/src/mycomponents/query/fifoQuery.vue
+++ b/src/mycomponents/query/fifoQuery.vue
@@ -241,10 +241,10 @@ const query = () => {
     return;
   }
 
-  if (warehouseCode.value === '') {
-    showErrorMessage('仓库代码为空,请输入仓库代码');
-    return;
-  }
+  // if (warehouseCode.value === '') {
+  //   showErrorMessage('仓库代码为空,请输入仓库代码');
+  //   return;
+  // }
 
   uni.showLoading({
     title: '查询中',
diff --git a/src/mycomponents/scan/winScanPackAndLocation.vue b/src/mycomponents/scan/winScanPackAndLocation.vue
index 48b1f0e3..bd7be5f4 100644
--- a/src/mycomponents/scan/winScanPackAndLocation.vue
+++ b/src/mycomponents/scan/winScanPackAndLocation.vue
@@ -16,7 +16,12 @@
 							placeholder-style="font-size:12px" style="padding: 5px;" @confirm="scanLocation" /> -->
 
             <view v-if="allowModifyLocation">
-              <uni-combox :candidates="fromLocationList" v-model="fromLocationCode" placeholder="请扫描来源库位" @confirm="handleConfirm" style="height: 30rpx; border: 1px solid #fff"></uni-combox>
+              <uni-combox :candidates="fromLocationList" disabled
+                          v-model="fromLocationCode"
+                          placeholder="请扫描来源库位"
+                          @confirm="handleConfirm"
+                          style="height: 30rpx; border: 1px solid #fff">
+              </uni-combox>
             </view>
             <view v-else>
               <text style="padding: 5px; font-size: 40rpx">
@@ -94,6 +99,11 @@ const props = defineProps({
     type: String,
     default: ""
   },
+  // 不走库存余额接口，只用于回显
+  isJustReplay: {
+    type: Boolean,
+    default: false
+  },
 })
 const scanResult = ref({})
 const show = ref(false)
@@ -225,8 +235,14 @@ const scanLocation = (scanResult) => {
         if (available == 'TRUE') {
           if (checkDirectoryItemExist(fromLocationAreaTypeList.value, type)) {
             location.value = result
+            // 如果只回显
+            if(props.isJustReplay){
+              emit("getResult",scanResult);
+              uni.hideLoading()
+            }else{
+              checkPackage(scanResult)
+            }
             // this.packGetFocus();
-            checkPackage(scanResult)
           } else {
             uni.hideLoading()
             const hint = getListLocationAreaTypeDesc(fromLocationAreaTypeList.value)
@@ -253,13 +269,23 @@ const scanLocation = (scanResult) => {
       })
     })
 }
-const getScanResult = (result) => {
+const getScanResult = (result,businessType) => {
   // if (this.fromLocationCode == '' || this.fromLocationCode == null) {
   // 	this.showMessage('请先扫描来源库位', callback => {
   // 		this.locationGetFocus();
   // 	})
   // 	return;
   // } else
+  // 直接合格转隔离直接调用的时候需要
+  console.log(88,businessType)
+  if(businessType){
+    businessType.value = businessType;
+    fromInventoryStatuses.value = getDirectoryItemArray(businessType.value.outInventoryStatuses)
+    inventoryStatus.value = getDirectoryItemArray(businessType.value.outInventoryStatuses); //出库库存状态
+    fromLocationAreaTypeList.value = getDirectoryItemArray(businessType.value.outAreaTypes); //出库库区
+    console.log(99,this.fromInventoryStatuses)
+    console.log(99,this.balanceFromInventoryStatuses)
+  }
   scanLocation(result)
   // debugger
   // if(this.isCheck){
@@ -286,7 +312,6 @@ const checkPackage = async (result) => {
           chooseWhich.value = '2'
           if(!result.label.itemCode){
             showErrorMessage('扫描标签不对，请重新扫描')
-            emit('clearItemCode',result.label)
             return
           }
           if (res.data && res.data.list && res.data.list.length > 1) {