修改采购收货、修改包装规格

src/api/request2.js

@@ -999,7 +999,7 @@ export function createPutAwayRequest(number) {
 	});
 }
 
- 
+
 /**
  * 采购上架 任务
  * status 任务状态 
@@ -3643,8 +3643,23 @@ export function getMainMessage() {
  */
 export function appCheckUpdate() {
 	return uni.request({
-		url:"http://192.168.0.119:9527/appUpdate.json",
+		url: "http://192.168.0.119:9527/appUpdate.json",
-		method:"GET",
+		method: "GET",
-		data:{}
+		data: {}
 	})
+}
+
+// var params = {
+// 				filters: filters,
+// 				pageNo: 1,
+// 				pageSize: 100,
+// 			}
+
+//获取包装规格
+export function getPackageUnitList(params) {
+	return request({
+		url: baseApi + "/wms/packageunit/senior",
+		method: "post",
+		data: params,
+	});
 }

src/common/basic.js

@@ -174,7 +174,7 @@ export function getLocationTypeName(value) {
 }
 
 //获取计量单位
-export function getUnitInfo(value) {
+export function getUomInfo(value) {
 	var resultInfo = "";
 	if (uomList.length == 0) {
 		uomList = getDirectoryInfo("uom")

src/common/directory.js

@@ -20,9 +20,6 @@ let transferModeList = [];
 let countStageList = [];
 
 
-
-
-
 // 获取业务类型字典项
 export function getBusinessTypeDesc(type) {
 	if (type == "SupplierDeliver") {
@@ -249,7 +246,7 @@ export function getLocationTypeNameList(lst) {
 }
 
 //获取计量单位
-export function getUnitInfo(value) {
+export function getUomInfo(value) {
 	var resultInfo = "";
 	if (uomList.length == 0) {
 		uomList = getDirectoryInfo("uom")
@@ -514,3 +511,20 @@ export function getCountStageName(value) {
 	}
 	return resultInfo
 }
+
+//获取包装规格
+export function getPackUnitName(value) {
+	var resultInfo = "";
+	if (packUnitList.length == 0) {
+		packUnitList = uni.getStorageSync('packunit');
+	}
+	if (packUnitList.length > 0) {
+		for (let item of packUnitList) {
+			if (item.code == value) {
+				resultInfo = item.name
+				break;
+			}
+		}
+	}
+	return resultInfo
+}

src/common/style/new_style.css

@@ -2214,7 +2214,7 @@ button::after {
 
 .request_state_un-doing {
 	font-size: 28rpx;
-	background: rgba(95, 203, 148, 0.2);
+	/* background: rgba(95, 203, 148, 0.2); */
 	color: #22AF68;
 	padding: 10rpx 20rpx 10rpx 20rpx;
 	border-radius: 10rpx;
@@ -2222,7 +2222,7 @@ button::after {
 
 .job_state_doing {
 	font-size: 28rpx;
-	background: rgba(236, 156, 0, 0.2);
+	/* background: rgba(236, 156, 0, 0.2); */
 	color: #EC9C00;
 	padding: 10rpx 20rpx 10rpx 20rpx;
 	border-radius: 10rpx;
@@ -2230,7 +2230,7 @@ button::after {
 
 .job_state_un-doing {
 	font-size: 28rpx;
-	background: rgba(95, 203, 148, 0.2);
+	/* background: rgba(95, 203, 148, 0.2); */
 	color: #22AF68;
 	padding: 10rpx 20rpx 10rpx 20rpx;
 	border-radius: 10rpx;
@@ -2238,7 +2238,7 @@ button::after {
 
 .job_state_completed {
 	font-size: 28rpx;
-	background: rgba(95, 203, 148, 0.2);
+	/* background: rgba(95, 203, 148, 0.2); */
 	color: #22AF68;
 	padding: 10rpx 20rpx 10rpx 20rpx;
 	border-radius: 10rpx;
@@ -2246,7 +2246,7 @@ button::after {
 
 .job_state_close {
 	font-size: 28rpx;
-	background: rgba(95, 203, 148, 0.2);
+	/* background: rgba(95, 203, 148, 0.2); */
 	color: #22AF68;
 	padding: 10rpx 20rpx 10rpx 20rpx;
 	border-radius: 10rpx;
@@ -2255,7 +2255,7 @@ button::after {
 
 .job_state_cancelled {
 	font-size: 28rpx;
-	background: rgba(95, 203, 148, 0.2);
+	/* background: rgba(95, 203, 148, 0.2); */
 	color: #ff0000;
 	padding: 10rpx 20rpx 10rpx 20rpx;
 	border-radius: 10rpx;

src/mycomponents/balance/pack.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="card_view">
-		<text class="card_packing_code card_content ">箱码</text>
+		<text class="card_packing_code card_content ">包装</text>
 		<text class="card_content ">{{packingCode}}</text>
 	</view>
 </template>

src/mycomponents/common/comListItem.vue

@@ -8,7 +8,7 @@
 				<text v-else-if="item.type=='boolean'" class="text_wrap">{{boolean(item.content)}} </text>
 				<text v-else-if="item.type=='transferMode'" class="text_wrap">{{getTransferModeName(item.content)}} </text>
 				<text v-else-if="item.type=='locationType'" class="text_wrap">{{getLocationTypeNameList(getDirectoryItemArray(item.content))}} </text>
-				<text v-else-if="item.type=='uom'" class="text_wrap">{{getUnitInfo(item.content)}} </text>
+				<text v-else-if="item.type=='uom'" class="text_wrap">{{getUomInfo(item.content)}} </text>
 				<text v-else-if="item.type=='inspectType'" class="text_wrap">{{getInspectType(item.content)}} </text>
 				<text v-else-if="item.type=='sampleMethod'" class="text_wrap">{{getSampleMethod(item.content)}} </text>
 				<text v-else-if="item.type=='requestState'" class="text_wrap">{{getRequestStateInfo(item.content)}} </text>
@@ -30,7 +30,7 @@
 		getTransferModeName,
 		getLocationTypeNameList,
 		getDirectoryItemArray,
-		getUnitInfo,
+		getUomInfo,
 		getInspectType,
 		getSampleMethod,
 		getRequestStateInfo,
@@ -81,8 +81,8 @@
 			getDirectoryItemArray(value){
 				return getDirectoryItemArray(value)
 			},
-			getUnitInfo(value){
+			getUomInfo(value){
-				return getUnitInfo(value).label
+				return getUomInfo(value).label
 			},
 			getInspectType(value){
 				return getInspectType(value)

src/mycomponents/detail/detailBalanceInfo.vue

@@ -15,7 +15,7 @@
 			<text class="item_title">数量 : </text>
 			<view class="text_wrap">
 				<text class="text_wrap">{{Number(dataContent.qty)}}</text>
-				<text class="text_wrap">{{getUnitInfo(dataContent.uom)}}</text>
+				<text class="text_wrap">{{getUomInfo(dataContent.uom)}}</text>
 			</view>
 		</view>
 		<view class="item">
@@ -33,7 +33,7 @@
 	import {
 		getInventoryStatusName,
 		getStdPackUnitInfo,
-		getUnitInfo
+		getUomInfo
 	} from '@/common/directory.js';
 	export default {
 		components: {},
@@ -55,8 +55,8 @@
 			getInventoryStatusInfo(value) {
 				return getInventoryStatusName(value)
 			},
-			getUnitInfo(value){
+			getUomInfo(value){
-				return getUnitInfo(value).label
+				return getUomInfo(value).label
 			}
 		}
 	}

src/mycomponents/detail/detailItemInfo.vue

@@ -10,13 +10,13 @@
 		</view>
 		<view class="item">
 			<text class="item_title">数量 : </text>
-			<text class="text_wrap">{{dataContent.qty}}{{getUnitInfo(dataContent.uom)}} </text>
+			<text class="text_wrap">{{dataContent.qty}}{{getUomInfo(dataContent.uom)}} </text>
 		</view>
 	</view>
 </template>
 
 <script>
-	import{getUnitInfo} from "@/common/directory.js"
+	import{getUomInfo} from "@/common/directory.js"
 	export default {
 		components: {},
 		data() {
@@ -34,8 +34,8 @@
 		},
 
 		methods: {
-			getUnitInfo(value){
+			getUomInfo(value){
-				return getUnitInfo(value).label
+				return getUomInfo(value).label
 			}
 		}
 	}

src/mycomponents/detail/detailPackageInfo.vue

@@ -31,7 +31,7 @@
 	import {
 		getInventoryStatusName,
 		getStdPackUnitInfo,
-		getUnitInfo
+		getUomInfo
 	} from '@/common/directory.js';
 	export default {
 		components: {},
@@ -53,8 +53,8 @@
 			getInventoryStatusInfo(value) {
 				return getInventoryStatusName(value)
 			},
-			getUnitInfo(value){
+			getUomInfo(value){
-				return getUnitInfo(value).label
+				return getUomInfo(value).label
 			}
 		}
 	}

src/mycomponents/detail/detailRecommendInfo.vue

@@ -15,7 +15,7 @@
 			<text class="item_title">明细数量 : </text>
 			<view class="text_wrap">
 				<text class="text_wrap">{{Number(dataContent.qty)}}</text>
-				<text class="text_wrap">{{getUnitInfo(dataContent.uom)}}</text>
+				<text class="text_wrap">{{getUomInfo(dataContent.uom)}}</text>
 			</view>
 		</view>
 		<view class="item">
@@ -37,7 +37,7 @@
 	import {
 		getInventoryStatusName,
 		getStdPackUnitInfo,
-		getUnitInfo
+		getUomInfo
 	} from '@/common/directory.js';
 	export default {
 		components: {},
@@ -59,8 +59,8 @@
 			getInventoryStatusInfo(value) {
 				return getInventoryStatusName(value)
 			},
-			getUnitInfo(value){
+			getUomInfo(value){
-				return getUnitInfo(value).label
+				return getUomInfo(value).label
 			}
 		}
 	}

src/mycomponents/detail/requestDetailBasicInfo.vue

@@ -31,8 +31,8 @@
 		},
 
 		methods: {
-			getUnitInfo(value){
+			getUomInfo(value){
-				return getUnitInfo(value).label
+				return getUomInfo(value).label
 			}
 		}
 	}

src/mycomponents/item/itemCompareQty.vue

@@ -5,10 +5,10 @@
 		</view>
 		<view style="word-break: break-all;width: 50%;display: flex;justify-content:flex-end;margin-right: 10rpx;">
 			<recommend-qty v-if="handleQty==0" :dataContent="dataContent" :isShowStatus="false" :isShowStdPack ="isShowStdPack"></recommend-qty>
-			<compare-qty v-else :dataContent="dataContent" :recommendQty="Number(dataContent.qty)"
+			<!-- <compare-qty v-else :dataContent="dataContent" :recommendQty="Number(dataContent.qty)"
 				:handleQty="Number(handleQty)" :isShowStatus="false"
 				:isShowStdPack ="isShowStdPack">
-			</compare-qty>
+			</compare-qty> -->
 		</view>
 	</view>
 </template>

src/mycomponents/job/jobTopAsn.vue

@@ -1,7 +1,8 @@
 <template>
 	<view class="task_top">
 		<view class="uni-flex space-between u-col-center align-center" >
-			<job-number :number="dataContent.asnNumber"></job-number>
+			<job-number v-if="dataContent.asnNumber==null || dataContent.asnNumber==''" :number="dataContent.requestNumber"></job-number>
+			<job-number v-else :number="dataContent.asnNumber"></job-number>
 			<job-status :jobStatus="dataContent.status"></job-status>
 		</view>
 	</view>

src/mycomponents/qty/RecommendQty.vue

@@ -5,22 +5,26 @@
 			<view class="text_recommend ">
 				{{Number(dataContent.qty)}}
 			</view>
-			<uom v-show="!isShowStdPack" :uom="dataContent.uom"></uom>
+			<!-- v-show="!isShowStdPack" -->
+			<uom :uom="dataContent.uom"></uom>
 		</view>
 		<view>
-			<std-pack-qty v-show="isShowStdPack" :dataContent="dataContent"></std-pack-qty>
+			<pack-unit :dataContent="dataContent"></pack-unit>
+		<!-- 	<std-pack-qty v-show="isShowStdPack" :dataContent="dataContent"></std-pack-qty> -->
 		</view>
 	</view>
 </template>
 
 <script>
-	import stdPackQty from '@/mycomponents/qty/stdPackQty.vue'
+	// import stdPackQty from '@/mycomponents/qty/stdPackQty.vue'			
+	import packUnit from '@/mycomponents/qty/packUnit.vue'
 	import uom from '@/mycomponents/qty/uom.vue'
 	import status from '@/mycomponents/status/status.vue'
 
 	export default {
 		components: {
-			stdPackQty,
+			// stdPackQty,
+			packUnit,
 			uom,
 			status
 		},

src/mycomponents/qty/compareQty.vue

@@ -34,19 +34,22 @@
 			</uom> -->
 		</view>
 		<view>
-			<std-pack-qty v-show="isShowStdPack" :dataContent="dataContent"></std-pack-qty>
+			<pack-unit :dataContent="dataContent"></pack-unit>
+			<!-- <std-pack-qty v-show="isShowStdPack" :dataContent="dataContent"></std-pack-qty> -->
 		</view>
 	</view>
 </template>
 
 <script>
-	import stdPackQty from '@/mycomponents/qty/stdPackQty.vue'
+	// import stdPackQty from '@/mycomponents/qty/stdPackQty.vue'
+	import packUnit from '@/mycomponents/qty/packUnit.vue'
 	import uom from '@/mycomponents/qty/uom.vue'
 	import status from '@/mycomponents/status/status.vue'
 
 	export default {
 		components: {
-			stdPackQty,
+			// stdPackQty,
+			packUnit,
 			uom,
 			status
 		},

src/mycomponents/qty/packUnit.vue

@@ -0,0 +1,47 @@
+<template>
+	<view class="std_pack" v-if="dataContent.packQty!=undefined">
+		<text>
+			{{Number(dataContent.packQty)}}{{getUomInfo(dataContent.uom)}}/{{getPackUnitName(dataContent.packUnit)}}
+		</text>
+	</view>
+</template>
+<script>
+	import {
+		getUomInfo,
+		getPackUnitName
+	} from '@/common/directory.js';
+
+	export default {
+		data() {
+			return {
+
+			};
+		},
+		// 此处定义传入的数据
+		props: {
+			dataContent: {
+				packQty: 1000,
+				uom: "EA",
+			},
+		},
+		methods: {
+			getUomInfo(uom) {
+				let item = getUomInfo(uom);
+				if (item == '') {
+					return uom;
+				} else {
+					return item.label
+				}
+			},
+
+			getPackUnitName(packUnit) {
+				let unit = getPackUnitName(packUnit);
+				return unit;
+			}
+		}
+	}
+</script>
+
+
+<style>
+</style>

src/mycomponents/qty/uom.vue

@@ -1,13 +1,13 @@
 <template>
 	<view class="uom">
-		{{getUnitInfo(uom)}}
+		{{getUomInfo(uom)}}
 	</view>
 </template>
 
 
 <script>
 	import {
-		getUnitInfo
+		getUomInfo
 	} from '@/common/directory.js';
 	export default {
 		data() {
@@ -23,8 +23,8 @@
 			},
 		},
 		methods: {
-			getUnitInfo(uom) {
+			getUomInfo(uom) {
-				let item = getUnitInfo(uom);
+				let item = getUomInfo(uom);
 				if (item == '') {
 					return uom;
 				} else {

src/mycomponents/recommend/recommend.vue

@@ -3,8 +3,8 @@
 		<view class="uni-flex uni-row space-between" style="align-items: center">
 			<!-- uni-inline-item 暂时拿掉-->
 			<view style="word-break: break-all;">
-				<container v-if="isShowContainer&&detail.containerNumber!=null" :container="detail.containerNumber">
+			<!-- 	<container v-if="isShowContainer&&detail.containerNumber!=null" :container="detail.containerNumber">
-				</container>
+				</container> -->
 				<pack v-if="isShowPack && detail.packingNumber!=null" :packingCode="detail.packingNumber"></pack>
 				<batch v-if="isShowBatch && detail.batch!=null" :batch="detail.batch"></batch>
 				<location v-if="isShowFromLocation" title="来源库位" :locationCode="detail.fromLocationCode">

src/pages/index/index.vue

@@ -25,7 +25,7 @@
 							<view class="thumb-box" v-for="(item1, index1) in item.children" :key="index1"
 								@click="openCheck(item1.path)">
 								<view class="" style="position: relative; ">
-								<!-- 	<u-badge  class="item-menu-badge" v-if="item1.count>0" type="error" :count="item1.count" :offset="position"
+									<!-- 	<u-badge  class="item-menu-badge" v-if="item1.count>0" type="error" :count="item1.count" :offset="position"
 										:showZero="false"></u-badge> -->
 									<text class="item-menu-badge"
 										v-if="item1.count>0">{{item1.count>9?'9+':item1.count}}</text>
@@ -51,12 +51,12 @@
 <script>
 	import {
 		getDictionaryItem,
+		getPackageUnitList,
 		getMainMessage
 	} from '@/api/request2.js';
 
 	export default {
-		components: {
+		components: {},
-		},
 		data() {
 			return {
 				title: 'WMS仓库管理系统',
@@ -123,7 +123,7 @@
 			if (uni.getStorageSync("hasLogin")) {
 				this.getMenuItemTop()
 			}
-			
+
 
 		},
 		onHide() {
@@ -188,8 +188,8 @@
 					})
 					this.$forceUpdate()
 
-				}).catch(res=>{
+				}).catch(res => {
-					console.log("获取消息失败",res)
+					console.log("获取消息失败", res)
 				});
 			},
 
@@ -312,21 +312,34 @@
 			},
 			getDictory() {
 				var params = {
-					types: ["job_status", "location_type", "item_status","item_type","uom",
+					types: ["job_status", "location_type", "item_status", "item_type", "uom",
 						"inventory_status", "container_type", "pack_unit", "unplanned_receipt_reason",
 						"unplanned_issue_reason", "scrap_reason", "inspect_failed_reason",
 						"request_status", "inspect_type", "next_action", "sample_method", "transfer_mode",
-						"count_stage","inspect_result"
+						"count_stage", "inspect_result"
 					]
 				}
 				getDictionaryItem(params).then(res => {
 					if (res.data.length > 0) {
 						uni.setStorageSync("dictionary", res.data)
 					}
-				}).catch(res=>{
+				}).catch(res => {
-					console.log("获取字典失败",res)
+					console.log("获取字典失败", res)
 				})
 
+
+				var unitparams = {
+					filters: [],
+					pageNo: 1,
+					pageSize: 100,
+				}
+				getPackageUnitList(unitparams).then(unitres => {
+					if (unitres.data.list.length > 0) {
+						uni.setStorageSync("packunit", unitres.data.list)
+					}
+				}).catch(res => {
+					console.log("包装规格获取失败", res)
+				})
 			},
 
 			openCheck(url) {
@@ -488,4 +501,4 @@
 		line-height: 36rpx;
 		border-radius: 50%;
 	}
-</style>
+</style>

src/pages/inspect/coms/inspectComDetailCard.vue

@@ -9,20 +9,20 @@
 					</view> -->
 					<view class="cell_info">
 						<view class="text_lightblue">收货数</view>
-						<view>{{jobContent.receiveQty}}{{getUnitInfo(jobContent.uom)}}</view>
+						<view>{{jobContent.receiveQty}}{{getUomInfo(jobContent.uom)}}</view>
 					</view>
 					<view class="cell_info">
 						<view class="text_lightblue">检验数</view>
-						<view>{{jobContent.sampleQty}}{{getUnitInfo(jobContent.uom)}}</view>
+						<view>{{jobContent.sampleQty}}{{getUomInfo(jobContent.uom)}}</view>
 					</view>
 					<view class="cell_info">
 						<view class="text_lightblue">不合格数</view>
-						<view style="color: #F56C6C;">{{jobContent.failedQty}}{{getUnitInfo(jobContent.uom)}}</view>
+						<view style="color: #F56C6C;">{{jobContent.failedQty}}{{getUomInfo(jobContent.uom)}}</view>
 					</view>
 
 					<view class="cell_info">
 						<view class="text_lightblue">报废数</view>
-						<view style="color: #EC9C00">{{jobContent.crackQty}}{{getUnitInfo(jobContent.uom)}}</view>
+						<view style="color: #EC9C00">{{jobContent.crackQty}}{{getUomInfo(jobContent.uom)}}</view>
 					</view>
 				</view>
 				<!-- <u-line /> -->
@@ -101,7 +101,7 @@
 		getDetailRemoveOption
 	} from '@/common/array.js';
 	import {
-		getUnitInfo,
+		getUomInfo,
 		getInspectType
 	} from '@/common/directory.js';
 
@@ -223,8 +223,8 @@
 				}
 				this.$emit('updateData', )
 			},
-			getUnitInfo(value) {
+			getUomInfo(value) {
-				return getUnitInfo(value).label
+				return getUomInfo(value).label
 			},
 
 		}

src/pages/inspect/coms/inspectInfoPopup.vue

@@ -50,7 +50,7 @@
 						</view>
 						<view class="item">
 							<text class="item_title">计量单位 : </text>
-							<text class="text_wrap">{{getUnitInfo(dataContent.uom)}} </text>
+							<text class="text_wrap">{{getUomInfo(dataContent.uom)}} </text>
 						</view>
 						<view class="item">
 							<text class="item_title">收货数量 : </text>
@@ -72,7 +72,7 @@
 	import jobCommonInfo from '@/mycomponents/job/jobCommonInfo.vue'
 	import{getInspectType,
 	getSampleMethod,
-	getUnitInfo
+	getUomInfo
 	} from "@/common/directory.js"
 	export default {
 		components: {
@@ -106,8 +106,8 @@
 			getSampleMethod(value){
 				return getSampleMethod(value);
 			},
-			getUnitInfo(value){
+			getUomInfo(value){
-				var info = getUnitInfo(value)
+				var info = getUomInfo(value)
 				return info.label;
 			},
 			

src/pages/inspect/job/inspectResult.vue

@@ -33,7 +33,7 @@
 					<view class="uni-label">收货数量</view>
 				</view>
 				<view class="pda-list-cell-db">
-					<text>{{jobContent.receiveQty}} {{getUnitInfo(jobContent.uom)}}</text>
+					<text>{{jobContent.receiveQty}} {{getUomInfo(jobContent.uom)}}</text>
 				</view>
 
 			</view>
@@ -42,7 +42,7 @@
 					<view class="uni-label">检验数量</view>
 				</view>
 				<view class="pda-list-cell-db">
-					<text>{{jobContent.sampleQty}} {{getUnitInfo(jobContent.uom)}}</text>
+					<text>{{jobContent.sampleQty}} {{getUomInfo(jobContent.uom)}}</text>
 				</view>
 			</view>
 
@@ -151,7 +151,7 @@
 		getInspectFailedReasonList,
 		getNextActionList,
 		getInspectType,
-		getUnitInfo
+		getUomInfo
 	} from '@/common/directory.js';
 
 	import {
@@ -294,8 +294,8 @@
 			getInspectName(value) {
 				return getInspectType(value)
 			},
-			getUnitInfo(value) {
+			getUomInfo(value) {
-				return getUnitInfo(value).label
+				return getUomInfo(value).label
 			},
 
 			nextStepChange(e) {

src/pages/purchaseReceipt/job/receiptDetail.vue

@@ -11,7 +11,6 @@
 				<view class="uni-flex" style="margin-left: 50rpx; align-items: center; text-align: center;">
 					<u-switch v-model="isAllReceived" active-color="#4DD865" inactive-color="#eee" size="42" @change="switchChange"></u-switch>	
 				</view>
-				
 			</view>
 			<u-line color="#D8D8D8" style="margin-top: 10rpx; margin-bottom: 10rpx;" />
 			<!-- <required-location ref="locationCompare" title="默认收货库位 :" :locationCode="jobToLocationCode"

src/static/config.js

@@ -1,4 +1,5 @@
-let request_url = "http://dev.ccwin-in.com:25100/api/admin-api"
+let request_url = "http://192.168.0.211:12080/admin-api"
+// let request_url = "http://dev.ccwin-in.com:25100/api/admin-api"
 
 let isDevelopment = true