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

api/request2.js

@@ -1,8 +1,8 @@
 import request from '@/api/httpRequest2.js'
-// const baseApi = "/api/admin-api" 
+const baseApi = "/api/admin-api" 
 //公司地址
  // 本地地址
-const baseApi = "/admin-api"
+// const baseApi = "/admin-api"
 /**
  * 获取验证码
  * @param {*}  

common/style/new_style.css

@@ -2025,6 +2025,28 @@ button::after {
 
 }
 
+.card_itemCode {
+	font-size: 36rpx;
+	/* font-weight: 500; */
+	padding: 10rpx;
+}
+
+.card_itemName {
+	color: #909399;
+	font-size: 30rpx;
+ 	padding: 0rpx 20rpx;
+}
+
+/* .std_pack {
+	display: flex;
+	flex-direction: row;
+	justify-content: center;
+	align-items: center;
+	padding: 0px;
+	color: #909399;
+	font-size: 30rpx;
+}
+ */
 .card_icon_normal {
 	width: 45rpx;
 	height: 45rpx;
@@ -2113,8 +2135,13 @@ button::after {
 	overflow: hidden;
 }
 
+.task_top {
+	margin: 0rpx 10rpx;
+	background-color: #fff;
+}
+
 .task_item {
-	margin: 10rpx;
+	margin: 0rpx 10rpx;
 	background-color: #fff;
 }
 
@@ -2123,7 +2150,6 @@ button::after {
 	background-color: #fff;
 	border-radius: 10rpx;
 	margin: 12rpx;
-
 }
 
 .task_number {
@@ -2134,6 +2160,7 @@ button::after {
 
 .task_text {
 	font-size: 30rpx;
+	margin: 5rpx 0rpx;
 	white-space: nowrap;
 	overflow: hidden;
 	text-overflow: ellipsis;

mycomponents/item/item.vue

@@ -3,11 +3,11 @@
 		<view class="uni-flex u-col-center space-between" style="
 	background-color:#fff;
 	margin-left: 10rpx;">
-			<view class="card_partCode">
-				<view class="" :class="openPopup(dataContent)">
+			<view >
+				<view class="card_itemCode" :class="openPopup(dataContent)">
 					{{dataContent.itemCode}}
 				</view>
-				<view class="">
+				<view class="card_itemName">
 					{{dataContent.itemName}}
 				</view>
 			</view>

mycomponents/job/jobStatus.vue

@@ -1,5 +1,5 @@
 <template>
-	<view style="margin: 10rpx;">
+	<view >
 		<text :class="statusStyle(jobStatus)">
 			{{ jobStatusInfo.label}}
 		</text>

mycomponents/job/jobTop.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="task_item">
+	<view class="task_top">
 		<view class="uni-flex space-between u-col-center">
 			<job-number :number="dataContent.number"></job-number>
 			<job-status :jobStatus="dataContent.status"></job-status>

mycomponents/location/requiredLocation.vue

@@ -3,7 +3,7 @@
 	padding-bottom: 15rpx;
 	 padding-left: 10rpx;
 	 padding-right: 10rpx;
-	 font-size:32rpx;background-color: #fff;">
+	 font-size:32rpx;">
 		<text style="font-size: 35rpx;">{{title}} </text>
 		<view class="uni-flex u-col-center" @click="showLocation">
 			<text style="color:#3FBAFF;font-size: 35rpx;" v-if="locationCode==''&&isShowEdit==true">&nbsp 请扫描</text>

mycomponents/recommend/recommend.vue

@@ -14,7 +14,7 @@
 						:locationCode="detail.toLocationCode">
 					</location>
 				</view>
-				
+
 			</view>
 			<view>
 				<recommend-qty v-if="detail.handleQty==null || detail.handleQty==undefined" :dataContent="detail"
@@ -23,10 +23,12 @@
 					:handleQty="Number(detail.handleQty)" :isShowStdPack="false">
 				</compare-qty>
 				<view class="" style="font-size: 40rpx;">
-					<u-button @click="copy" size="mini" type="primary">复制箱码</u-button>
+					<!-- <u-button @click="copy" size="mini" >复制采购标签</u-button> -->
+					<text style="font-size: 10rpx;color: #2979ff;" @click="copy">复制采购标签</text>
 				</view>
 				<view class="" style="font-size: 40rpx;">
-					<u-button @click="copyPro" size="mini" type="primary">复制制品</u-button>
+					<!-- <u-button @click="copyPro" size="mini" type="primary" >复制制造标签</u-button> -->
+					<text style="font-size: 10rpx;color: #2979ff;" @click="copyPro">复制制品标签</text>
 				</view>
 			</view>
 		</view>
@@ -75,7 +77,7 @@
 				type: Boolean,
 				default: false
 			},
-			
+
 			locationTitle: {
 				type: String,
 				default: '库位'
@@ -104,13 +106,13 @@
 				var content = "HMQ;V1.0;I" + this.detail.itemCode + ";P" + this.detail.packingNumber + ";B" + this.detail
 					.batch + ";Q" + this.detail.qty
 				this.$copyText(content).then(
-							res => {
-								uni.showToast({
-									title: '复制成功',
-									icon: 'none'
-								})
-							}
-						)
+					res => {
+						uni.showToast({
+							title: '复制成功',
+							icon: 'none'
+						})
+					}
+				)
 			}
 		}
 	}

pages/purchaseReceipt/coms/comReceiptDetailCard.vue

@@ -11,7 +11,6 @@
 						<uni-swipe-action-item @click="swipeClick($event,item)"
 							:right-options="item.scaned?scanOptions:detailOptions">
 							<recommend :detail="item"  :isShowToLocation="settingParam.allowModifyLocation=='TRUE'"></recommend>
-						
 						</uni-swipe-action-item>
 					</uni-swipe-action>
 					<u-line color="#D8D8D8"></u-line>

pages/purchaseReceipt/coms/comReceiptJobCard.vue

@@ -3,17 +3,18 @@
 		<view class="task_item">
 			<view class="task_text">
 				<view class="">
-					发货单号 : {{dataContent.asnNumber}}
+					申请单号 : {{dataContent.requestNumber}}
 				</view>
 			</view>
 			<view class="task_text">
 				<view class="">
-					要货计划单号 : {{dataContent.ppNumber}}
+					发货单号 : {{dataContent.asnNumber}}
 				</view>
 			</view>
 			<view class="task_text">
 				<view class="">
-					供应商名称 : {{dataContent.supplierName}}
+					供应商代码 : {{dataContent.supplierCode}}
+					<!-- 供应商名称 : {{dataContent.supplierName}} -->
 				</view>
 			</view>
 		</view>

pages/purchaseReceipt/job/receiptDetail.vue

@@ -5,7 +5,7 @@
 				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
 					<view class="">
 						<com-receipt-detail-card :dataContent="item" :index="index" :settingParam="jobContent"
-							@remove="updateData" @updateData="updateData" :locationTypeList ='locationTypeList'>
+							@remove="updateData" @updateData="updateData" :locationTypeList='locationTypeList'>
 						</com-receipt-detail-card>
 					</view>
 					<u-line />
@@ -13,14 +13,15 @@
 			</scroll-view>
 		</view>
 
-		<required-location ref="requiredLocation" title="默认收货库位" :locationCode="toLocationCode"
-			:isShowEdit="jobContent.allowModifyLocation=='TRUE'" @getLocation='scanLocationCode'
-			:locationTypeList="locationTypeList"></required-location>
-
+	
 		<view class="page-footer">
 			<view class="uni-flex u-col-center space-between padding_10"
 				style="background-color:ghostwhite; width: 100%; ">
 				<view class="">
+					<required-location ref="requiredLocation" title="默认收货库位" :locationCode="toLocationCode"
+						:isShowEdit="jobContent.allowModifyLocation=='TRUE'" @getLocation='scanLocationCode'
+						:locationTypeList="locationTypeList"></required-location>
+					
 				</view>
 				<view class=" uni-flex uni-row">
 					<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@@ -35,7 +36,6 @@
 </template>
 
 <script>
-
 	import {
 		purchaseReceiptJobSubmit,
 		getPurchaseReceiptJobDetail,
@@ -47,8 +47,9 @@
 		goHome,
 		getCurrDateTime,
 		getPackingNumberAndBatch,
+		updateTitle
 	} from '@/common/basic.js';
-	
+
 	import {
 		getDirectoryItemArray,
 	} from '@/common/directory.js';
@@ -108,6 +109,7 @@
 				} else {
 					this.getDetail();
 				}
+				
 			}
 		},
 		//返回首页
@@ -181,6 +183,7 @@
 						} else {
 							that.showMessage('列表数据为0');
 						}
+						updateTitle(that.jobContent.number);
 					}
 				}).catch(error => {
 					uni.hideLoading()
@@ -237,7 +240,7 @@
 			},
 
 			scanLocationCode(location, code) {
-				this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位["+code+"]", res => {
+				this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
 					this.toLocationCode = code
 					this.detailSource.forEach(item => {
 						item.subList.forEach(detail => {
@@ -282,7 +285,7 @@
 
 			},
 
-			 submitJob() {
+			submitJob() {
 				uni.showLoading({
 					title: "提交中....",
 					mask: true
@@ -304,7 +307,7 @@
 							if (res.data) {
 								this.showCommitSuccessMessage("提交成功<br>生成采购收货记录" + res.data)
 							} else {
-								this.showErrorMessage("提交失败"+res.msg)
+								this.showErrorMessage("提交失败" + res.msg)
 							}
 						}).catch(error => {
 							uni.hideLoading()

static/config.json

@@ -18,7 +18,7 @@
 		
 		"request_url": {
 			"name": "request_url",
-			"value": "http://localhost:12080",
+			"value": "http://dev.ccwin-in.com:25100",
 			"dev":"http://dev.ccwin-in.com:25100/api",
 			"local":"http://localhost:12080",
 			"desc": "api请求地址"