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

pages/issue/coms/comIssueDetailCard.vue

@@ -8,8 +8,9 @@
 				<uni-collapse-item :open="true">
 					<template v-slot:title>
 						<!-- 物品 -->
+						<u-line />
 						<item-qty :dataContent="item" :handleQty="item.handleQty"></item-qty>
-			<!-- 			<com-issue-request-info :workShopCode="dataContent.workShopCode" :dataContent="dataContent">
+						<!-- 			<com-issue-request-info :workShopCode="dataContent.workShopCode" :dataContent="dataContent">
 						</com-issue-request-info> -->
 					</template>
 					<u-line />
@@ -21,8 +22,8 @@
 								</location>
 							</view>
 							<view v-for="(batch,index) in loacation.Batchs">
-								<recommend-balance style='margin-left: 20px;' :detail="batch"
+								<recommend-balance style='margin-left: 20px;' :detail="batch" :isShowLocation="false"
-									:isShowLocation="false" :isShowPack="batch.packingNumber!=null && batch.packingNumber!=''">
+									:isShowPack="batch.packingNumber!=null && batch.packingNumber!=''">
 								</recommend-balance>
 								<view class="uni-flex uni-row" v-if='batch.Records.length>0'>
 									<view class="center " style=" width: 20px; color: #0CC2B6; margin-left: 40px;">
@@ -140,7 +141,7 @@
 				let that = this;
 				that.editItem = item;
 				that.batchItem = batch;
-				item.balance.balanceQty=item.balance.qty;
+				item.balance.balanceQty = item.balance.qty;
 				that.$refs.balanceQtyEdit.openEditPopup(item.balance, item.qty);
 			},
 

pages/issue/job/issueDetail.vue

@@ -13,7 +13,7 @@
 				<view v-for="(toLocation, index) in detailSource">
 					<com-issue-request-info :workShopCode="jobContent.workShopCode" :dataContent="toLocation">
 					</com-issue-request-info>
-					<u-line />
+					<!-- <u-line /> -->
 					<com-issue-detail-card ref='comIssueDetailCard' :dataContent="toLocation" @updateData='updateData'>
 					</com-issue-detail-card>
 				</view>

pages/productionReceipt/job/productionReceiptDetail.vue

@@ -10,7 +10,7 @@
 				</view>
 				<u-line color="#D8D8D8" style="margin-bottom: 15rpx;margin-top: 10rpx;"></u-line>
 			</view>
-			<scroll-view scroll-y="true" class="page-main-scroll">
+			<scroll-view scroll-y="true">
 				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
 					<view class="">
 						<com-detail-card :dataContent="item" :index="index" :settingParam="jobContent"