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

mycomponents/qty/compareQty.vue

@@ -3,25 +3,29 @@
 		<view class="uni-flex uni-row ">
 			<status v-show="isShowStatus" :status='dataContent.inventoryStatus'></status>
 			<view class="uni-flex uni-row center">
-				<view v-if ="Number(handleQty)!=0">
+				<view v-if="Number(handleQty)!=0">
 					<view v-if="Number(recommendQty)>Number(handleQty)" class="text_greater">
-							{{Number(handleQty)}}
+						{{Number(handleQty)}}
 					</view>
 					<view v-else-if="Number(recommendQty)<Number(handleQty)" class="text_less">
-							{{Number(handleQty)}}
+						{{Number(handleQty)}}
 					</view>
 					<view v-else-if="Number(recommendQty) ==Number( handleQty)" class="text_equal">
-							{{Number(handleQty)}}
+						{{Number(handleQty)}}
 					</view>
-					
+
 				</view>
+				<view class="center" v-if="isShowRecommendQty">
 					<view v-if="Number(handleQty)!=0" class="std_split">/</view>
-					<view v-if="isShowRecommendQty" class="text_recommend center">
+					<view class="text_recommend ">
-							{{Number(recommendQty)}}
+						{{Number(recommendQty)}}
 					</view>
-				
+				</view>
 			</view>
-			<uom v-show="Number(handleQty)!=0||(isShowRecommendQty&&Number(recommendQty)>0)" :uom="dataContent.uom"></uom>
+			<uom v-show="!isShowStdPack" :uom="dataContent.uom">
+			</uom>
+			<!-- <uom v-show="Number(handleQty)!=0||(isShowRecommendQty&&Number(recommendQty)>0)" :uom="dataContent.uom">
+			</uom> -->
 		</view>
 		<view>
 			<std-pack-qty v-show="isShowStdPack" :dataContent="dataContent"></std-pack-qty>
@@ -81,8 +85,7 @@
 		},
 		watch: {
 			handleQty: {
-				handler(newName, oldName) {
+				handler(newName, oldName) {},
-				},
 				immediate: true,
 				deep: true
 			}

mycomponents/recommend/recommendCount.vue

@@ -10,15 +10,15 @@
 				<location v-if="isShowToLocation" title="目标库位" :locationCode="detail.toLocationCode">
 				</location>
 			</view>
-			<view>
+			<view class="uni-flex uni-row center">
 				<!-- <recommend-qty v-if="detail.handleQty==null || detail.handleQty==undefined" :dataContent="detail"
 					:isShowStdPack="false"></recommend-qty> -->
-				<compare-qty :dataContent="detail" :recommendQty="Number(detail.qty)" :isShowRecommendQty="isShowRecommendQty"
+				<compare-qty :dataContent="detail" :recommendQty="Number(detail.qty)"
-					:handleQty="Number(detail.handleQty)" :isShowStdPack="false">
+					:isShowRecommendQty="isShowRecommendQty" :isShowStatus="isShowRecommendQty"
+					:handleQty="Number(detail.handleQty)" :isShowStdPack="true">
 				</compare-qty>
 				<view class="uni-flex uni-row" style="vertical-align:center" v-if="isDevlement()">
-					<text style="font-size: 30rpx;color: #2979ff; " 
+					<text style="font-size: 30rpx;color: #2979ff; " @click="copy">复制采购</text>
-						@click="copy">复制采购</text>
 					<text style="font-size: 30rpx;color: #2979ff;" @click="copyPro">|制品</text>
 				</view>
 			</view>
@@ -73,7 +73,7 @@
 				type: String,
 				default: '库位'
 			},
-			isShowRecommendQty:{
+			isShowRecommendQty: {
 				type: Boolean,
 				default: true
 			}
@@ -109,7 +109,7 @@
 					}
 				)
 			},
-			isDevlement(){
+			isDevlement() {
 				return getApp().globalData.isDevelopment;
 			}
 		}

pages/count/coms/comCountDetailCard.vue

@@ -5,19 +5,25 @@
 				<template v-slot:title>
 					<uni-swipe-action ref="swipeAction">
 						<uni-swipe-action-item @click="removeData($event,dataContent)" :right-options="removeOptions">
-							<item-qty :dataContent="dataContent" :handleQty="dataContent.handleQty"></item-qty>
+							<!-- 明盘 -->
+							<item-qty v-if="settingParam.isOpenCount=='TRUE'" :dataContent="dataContent"
+								:handleQty="dataContent.handleQty">
+							</item-qty>
+							<!-- 盲盘 -->
+							<item v-else :dataContent="dataContent"></item>
 						</uni-swipe-action-item>
 					</uni-swipe-action>
 				</template>
-				<u-line />
 				<view class="" v-for="(item,index) in dataContent.subList">
 					<uni-swipe-action ref="swipeAction">
 						<uni-swipe-action-item @click="swipeClick($event,item)"
 							:right-options="item.scaned?scanOptions:detailOptions">
-							<recommendCount :detail="item"  :isShowFromLocation="false" :isShowRecommendQty="settingParam.isOpenCount=='TRUE'"></recommendCount>
+							<recommend-count :detail="item" :isShowFromLocation="false" style='margin:1px 0px;'
+								:isShowRecommendQty="settingParam.isOpenCount=='TRUE'">
+							</recommend-count>
+							<u-line />
 						</uni-swipe-action-item>
 					</uni-swipe-action>
-					<u-line color="#D8D8D8"></u-line>
 				</view>
 			</uni-collapse-item>
 		</uni-collapse>
@@ -28,6 +34,7 @@
 
 <script>
 	import itemQty from '@/mycomponents/item/itemQty.vue'
+	import item from '@/mycomponents/item/item.vue'
 	import recommendCount from '@/mycomponents/recommend/recommendCount.vue'
 	import detailInfoPopup from '@/pages/count/coms/detailInfoPopup.vue'
 	import comMessage from '@/mycomponents/common/comMessage.vue'
@@ -40,6 +47,7 @@
 
 	export default {
 		components: {
+			item,
 			itemQty,
 			recommendCount,
 			detailInfoPopup,

pages/count/job/countDetail.vue

@@ -25,7 +25,7 @@
 		<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">
-					<view class="">
+					<view class="" style="margin: 2px;">
 						<com-count-detail-card :ref="'countDetail_'+index" :dataContent="item" :index="index"
 							@editItem="editItem" :settingParam="jobContent" @remove="updateData"
 							@updateData="updateData">