增加样式

4 months ago · e118fa142e
11 changed files with 205 additions and 182 deletions
--- a/src/common/style/new_style.css
+++ b/src/common/style/new_style.css
@ -2234,7 +2234,7 @@ button::after {

 .task_item {
 	margin: 0rpx 10rpx;
-	margin-top: 10rpx;
+	/* margin-top: 10rpx; */
 	background-color: #fff;
 }

--- a/src/common/style/pdabasic.css
+++ b/src/common/style/pdabasic.css
@ -725,18 +725,26 @@ page {
 }

 .page-header {
+	background-color: #3c9cff;
+	font-size: 35rpx;
+	padding: 10rpx 20rpx;
+}
+.page-header .header-view {
+	display: flex;
+	flex-direction: column;
 	background-color: #fff;
 	font-size: 35rpx;
 	padding: 10rpx 20rpx;
+	border-radius:4px;
 }

-.page-header .header_item {
+.page-header .header-view .header_item {
 	/* padding-left: 10rpx; */
 	padding: 5rpx 10rpx;
 	font-size:32rpx ;
 }

-.page-header .header_job_top {
+.page-header .header-view .header_job_top {
 	padding:5rpx 0rpx;
 }
 .page-main {
--- a/src/mycomponents/workStation/workStation.vue
+++ b/src/mycomponents/workStation/workStation.vue
@ -1,11 +1,10 @@
 <template>
-	<view class="header_job_top">
 	<view class="cen_card">
 		<view class="cell_box uni-flex uni-row">
-				<view class="cell_info" v-if="fromWarehouseCode!=''">
+			<!-- <view class="cell_info" v-if="fromWarehouseCode!=''">
 				<view class="text_lightblue">仓库</view>
 				<view>{{fromWarehouseCode}}</view>
-				</view>
+			</view> -->

 			<view class="cell_info">
 				<view class="text_lightblue">车间</view>
@ -20,7 +19,7 @@
 				<view>{{ workStationCode }}</view>
 			</view>
 			<view class="cell_info">
-					<view class="text_lightblue">原材料库位</view>
+				<view class="text_lightblue">原料库位</view>
 				<view>{{ rawLocationCode }}</view>
 			</view>
 			<!-- 	<view class="cell_info">
@ -29,7 +28,6 @@
 				</view> -->
 		</view>
 	</view>
-	</view>
 </template>

 <script>
--- a/src/pages/issue/coms/comIssueRequestCard.vue
+++ b/src/pages/issue/coms/comIssueRequestCard.vue
@ -1,6 +1,14 @@
 <template>
 	<request-com-main-card :dataContent="dataContent">
 		<jobComMainDetailCard :dataContent="dataContent"></jobComMainDetailCard>
+		<view class="task_item" style="margin-left: 15px;">
+			<view class="task_text">
+				<view class="card_view">
+					<text class="card_packing_code ">生产线</text>
+					<text class="card_content ">{{dataContent.productionLineCode}}</text>
+				</view>
+			</view>
+		</view>
 	</request-com-main-card>
 </template>

--- a/src/pages/issue/job/issueDetail.vue
+++ b/src/pages/issue/job/issueDetail.vue
@ -1,20 +1,23 @@
 <template>
 	<view class="page-wraper">
 		<view class="page-header">
+			<view class="header-view">
 				<view class="header_job_top">
 					<job-top :dataContent="jobContent"></job-top>
 				</view>
-			<!-- <view class="header_item">
-				申请单号 : {{jobContent.requestNumber}}
-			</view> -->
+				<work-station :workshopCode="jobContent.workShopCode"
+					:productionLineCode="jobContent.detailProductionLineCode" :workStationCode="jobContent.detailWorkStationCode"
+					:rawLocationCode="jobContent.detailToLocationCode">
+				</work-station>
+			</view>
 		</view>
 		<view class="page-main">
 			<scroll-view scroll-y="true" class="page-main-scroll">
 				<view v-for="(toLocation, index) in detailSource">
-					<work-station :workshopCode="jobContent.workShopCode"
+					<!-- <work-station :workshopCode="jobContent.workShopCode"
 						:productionLineCode="toLocation.productionLineCode"
 						:workStationCode="toLocation.workStationCode" :rawLocationCode="toLocation.toLocationCode">
-					</work-station>
+					</work-station> -->
 					<com-issue-detail-card ref='comIssueDetailCard' :dataContent="toLocation" @updateData='updateData'>
 					</com-issue-detail-card>
 					<view class="split_line"></view>
@ -455,7 +458,8 @@
 						item.Locations.forEach(lco => {
 							lco.Batchs.forEach(batch => {
 								if (batch.handleQty != 0) {
-									totalHandleQty = calc.add(totalHandleQty, batch.handleQty)
+									totalHandleQty = calc.add(totalHandleQty, batch
+										.handleQty)
 								} else {
 									isHandleEmpty = true;
 								}
--- a/src/pages/issue/request/issueRequestDetail.vue
+++ b/src/pages/issue/request/issueRequestDetail.vue
@ -1,17 +1,17 @@
 <template>
 	<view class="page-wraper">
 		<view class="page-header">
+			<view class="header-view">
 				<view class="header_job_top">
 					<request-top :dataContent="requestContent"></request-top>
 				</view>
 				<view class="header_item">
 					<work-station :workshopCode="requestContent.workshopCode"
-					:productionLineCode="titleInfo.productionLineCode" :workStationCode="titleInfo.workStationCode"
+						:productionLineCode="requestContent.productionLineCode" :workStationCode="requestContent.workStationCode"
 						:rawLocationCode="titleInfo.toLocationCode"></work-station>
 				</view>
-
 			</view>
-		<view class='split_line'></view>
+		</view>
 		<view class="page-main">
 			<scroll-view scroll-y="true" class="page-main-scroll">
 				<view class="detail-list">
--- a/src/pages/purchaseReceipt/job/receiptDetail.vue
+++ b/src/pages/purchaseReceipt/job/receiptDetail.vue
@ -1,6 +1,7 @@
 <template>
 	<view class="page-wraper">
 		<view class="page-header">
+			<view class="header-view">
 				<view class="header_job_top">
 					<jobTopAsn :dataContent="jobContent"></jobTopAsn>
 				</view>
@ -18,14 +19,13 @@
 					<uni-section title="拒收原因" type="line">
 						<uni-easyinput v-model="reasonText" placeholder="请输入拒收原因"></uni-easyinput>
 					</uni-section>
-
+				</view>
 			</view>

 			<!-- <required-location ref="locationCompare" title="默认收货库位 :" :locationCode="jobToLocationCode"
 				:isShowEdit="false"></required-location>
 			<view class='split_line'></view> -->
 		</view>
-		<view class="split_line"></view>
 		<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">
--- a/src/pages/purchaseReturn/job/returnDetail.vue
+++ b/src/pages/purchaseReturn/job/returnDetail.vue
@ -1,22 +1,22 @@
 <template>
 	<view class="page-wraper">
 		<view class="page-header">
+			<view class="header-view">
 				<view class="header_job_top">
 					<job-top :dataContent="jobContent"></job-top>
 				</view>
 				<view class="header_item">
 					申请单号：{{jobContent.requestNumber}}
 				</view>
-			<view class='split_line'></view>
+			</view>
 		</view>

 		<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="">
-						<com-detail-card :dataContent="item" :settingParam="jobContent" @remove="updateData" :queryBalance="false"
-					
-							@updateData='updateData' @openDetail="openDetail">
+						<com-detail-card :dataContent="item" :settingParam="jobContent" @remove="updateData"
+							:queryBalance="false" @updateData='updateData' @openDetail="openDetail">
 						</com-detail-card>
 					</view>
 				</view>
@ -35,7 +35,8 @@
 		</view>

 		<win-scan-button @goScan='openScanPopup'></win-scan-button>
-		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' :queryBalance='false'></win-scan-pack-and-location>
+		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'
+			:queryBalance='false'></win-scan-pack-and-location>
 		<return-detail-info-popup ref="jobDetailPopup"></return-detail-info-popup>
 		<comMessage ref="comMessage"></comMessage>
 	</view>
--- a/src/pages/purchaseReturn/request/returnRequestDetail.vue
+++ b/src/pages/purchaseReturn/request/returnRequestDetail.vue
@ -1,13 +1,14 @@
 <template>
 	<view class="page-wraper">
 		<view class="page-header">
+			<view class="header-view">
 				<view class="header_job_top">
 					<request-top :dataContent="requestContent"></request-top>
 				</view>
 				<view class="header_item">
 					供应商 : {{requestContent.supplierCode}}
 				</view>
-			<view class='split_line'></view>
+			</view>
 		</view>
 		<view class="page-main">
 			<scroll-view scroll-y="true" class="page-main-scroll">
--- a/src/pages/putaway/job/putawayDetail.vue
+++ b/src/pages/putaway/job/putawayDetail.vue
@ -1,21 +1,22 @@
 <template>
 	<view class="page-wraper">
 		<view class="page-header">
+			<veiw class="header-view">
 				<view class="header_job_top">
 					<job-top :dataContent="jobContent"></job-top>
 				</view>
 				<view class="header_item">
 					申请单号 : {{jobContent.requestNumber}}
 				</view>
-			<view class='split_line'></view>
+			</veiw>
 		</view>

 		<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="">
-						<comJobDetailCard :dataContent="item" :index="index" :settingParam="jobContent" :isShowStatus="false"
-							@remove="updateData" @updateData="updateData"
+						<comJobDetailCard :dataContent="item" :index="index" :settingParam="jobContent"
+							:isShowStatus="false" @remove="updateData" @updateData="updateData"
 							:locationAreaTypeList='toLocationAreaTypeList'>
 						</comJobDetailCard>
 					</view>
@ -41,7 +42,8 @@
 		<!-- 		<winScanPackAndLocationNoBalance ref="scanPopup" @getResult='getScanResult' :allowNullBalance="true">
 		</winScanPackAndLocationNoBalance> -->

-		<winScanPackAndLocation :balanceFromInventoryStatuses="false" ref="scanPopup" @getResult='getScanResult' :noShowBalanceMessage="true">
+		<winScanPackAndLocation :balanceFromInventoryStatuses="false" ref="scanPopup" @getResult='getScanResult'
+			:noShowBalanceMessage="true">
 		</winScanPackAndLocation>

 		<comMessage ref="comMessage"></comMessage>
@ -269,7 +271,8 @@
 						}
 					})
 				}
-				this.$refs.scanPopup.openScanPopupForJobSimulate(fromlocationCode, fromlocationList, this.jobContent,message);
+				this.$refs.scanPopup.openScanPopupForJobSimulate(fromlocationCode, fromlocationList, this.jobContent,
+					message);
 			},

 			openScanPopup() {
@ -373,7 +376,8 @@
 							//大哥让加的
 							itemDetail.fromInventoryStatus = result.balance.inventoryStatus;

-							if (!itemDetail.cancleScanedHiht&&itemDetail.scaned && scanedLength == itemDetail.packList.length) {
+							if (!itemDetail.cancleScanedHiht && itemDetail.scaned && scanedLength == itemDetail.packList
+								.length) {
 								this.showMessage("箱码【" + packingNumber + "】已经扫描")
 							} else {
 								itemDetail.scaned = true;
--- a/src/pages/putaway/request/putawayRequestDetail.vue
+++ b/src/pages/putaway/request/putawayRequestDetail.vue
@ -1,21 +1,21 @@
 <template>
 	<view class="page-wraper">
 		<view class="page-header">
+			<view class="header-view">
 				<view class="header_job_top">
 					<request-top :dataContent="requestContent"></request-top>
 				</view>
 				<view class="header_item">
 					供应商 : {{requestContent.supplierCode}}
 				</view>
-			<view class='split_line'></view>
+			</view>
 		</view>

 		<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="">
-						<comRequestDetailCard :dataContent="item" 
-							 @openDetail="openDetail">
+						<comRequestDetailCard :dataContent="item" @openDetail="openDetail">
 						</comRequestDetailCard>
 					</view>
 				</view>
@ -107,8 +107,7 @@

 			showMessage(message) {
 				this.$refs.comMessage.showMessage(message, res => {
-					if (res) {
-					}
+					if (res) {}
 				});
 			},