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

mycomponents/detail/comRequestDetailCard.vue

@@ -1,28 +1,19 @@
 <template>
 	<view class="" style="background-color: #fff;">
-		<uni-collapse ref="collapse1" @change="">
+		<view class="uni-flex uni-column">
-			<uni-collapse-item :open="true">
+			<com-issue-request-info :workShopCode="dataContent.workshopCode" :dataContent="requestItem">
-				<template v-slot:title>
+			</com-issue-request-info>
-					<item-compare-qty 
-					:dataContent="dataContent" 
-					:handleQty="Number(dataContent.handleQty)"
-					:isShowStdPack="false">
-					</item-compare-qty>
-				</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)"
+				<view v-for="(item, index) in dataContent.subList" :key="index">
-							:right-options="item.scaned?scanOptions:detailOptions">
+					<uni-swipe-action-item @click="swipeClick($event,item)" :right-options="detailOptions">
-							<recommend :detail="item" :record="item.record" :isShowPack="isShowPack"
+						<item-qty :dataContent="item" :isShowStdPack="false">
-								:isShowBatch="isShowBatch" :isShowFromLocation="isShowLocation"></recommend>
+						</item-qty>
+						<u-line />
 					</uni-swipe-action-item>
+				</view>
 			</uni-swipe-action>
-					<u-line />
 		</view>
-			</uni-collapse-item>
+		<request-detail-info-popup ref="jobDetailPopup"></request-detail-info-popup>
-		</uni-collapse>
-		<balance-qty-edit ref="qtyEdit" :settingParam="settingParam" @confirm="confirm"></balance-qty-edit>
 		<com-message ref="message"></com-message>
 	</view>
 </template>
@@ -32,6 +23,10 @@
 	import recommend from '@/mycomponents/recommend/recommend.vue'
 	import balanceQtyEdit from '@/mycomponents/qty/balanceQtyEdit.vue'
 	import comMessage from '@/mycomponents/common/comMessage.vue'
+	import itemQty from '@/mycomponents/item/itemQty.vue'
+	import comIssueRequestInfo from '@/pages/issue/coms/comIssueRequestInfo.vue'
+	import requestDetailInfoPopup from '@/pages/issue/coms/requestDetailInfoPopup.vue'
+
 	import {
 		getDetailOption,
 		getDetailEditRemoveOption,
@@ -45,6 +40,9 @@
 			recommend,
 			balanceQtyEdit,
 			comMessage,
+			itemQty,
+			comIssueRequestInfo,
+			requestDetailInfoPopup
 		},
 		props: {
 			dataContent: {
@@ -69,7 +67,9 @@
 			},
 		},
 		watch: {
-
+			dataContent(newVal) {
+				this.requestItem = newVal.subList[0];
+			},
 		},
 
 		data() {
@@ -81,6 +81,7 @@
 
 					}
 				},
+				requestItem: {},
 				detailOptions: [],
 				scanOptions: []
 			}
@@ -116,9 +117,10 @@
 			},
 
 			detail(item) {
-				this.$emit('openDetail', item);
+				this.$refs.jobDetailPopup.openPopup(item)
-				// this.showItem = item;
+				// this.$emit('openDetail', item);
-				// this.$refs.jobDetailPopup.openPopup(item)
+				// // this.showItem = item;
+				// // this.$refs.jobDetailPopup.openPopup(item)
 			},
 			remove(item) {
 				this.$refs.message.showQuestionMessage("确定移除扫描信息?",

mycomponents/qty/balanceQty.vue

@@ -6,7 +6,7 @@
 					{{Number(dataContent.qty)}}
 				</text>
 			</view>
-			<!-- <uom :uom="dataContent.uom"></uom> -->
+			<uom v-if="dataContent.stdPackQty==undefined" :uom="dataContent.uom"></uom>
 		</view>
 		<view class="uni-flex uni-row center">
 			<std-pack-qty :dataContent="dataContent"></std-pack-qty>

pages/issue/coms/comIssueRequestCard.vue

@@ -2,10 +2,7 @@
  	<request-com-main-card :dataContent="dataContent">
  		<view class="task_item">
  			<view class="task_text">
- 				部门 : {{dataContent.departmentCode}}
+ 				车间代码 {{dataContent.workshopCode}}
- 			</view>
- 			<view class="task_text">
- 				车间代码 : {{dataContent.WorkshopCode}}
  			</view>
  		</view>
  	</request-com-main-card>

pages/issue/coms/comIssueRequestInfo.vue

@@ -0,0 +1,57 @@
+<template>
+	<view class="cen_card" style="padding: 20rpx;">
+		<view class="cell_box uni-flex uni-row">
+			<view class="cell_info">
+				<view class="text_lightblue">车间</view>
+				<view>{{workShopCode}}</view>
+			</view>
+			<view class="cell_info">
+				<view class="text_lightblue">生产线</view>
+				<view>{{dataContent.productionLineCode}}</view>
+			</view>
+			<view class="cell_info">
+				<view class="text_lightblue">工位</view>
+				<view>{{ dataContent.workStationCode }}</view>
+			</view>
+			<view class="cell_info">
+				<view class="text_lightblue">原材料库</view>
+				<view>{{ dataContent.toLocationCode}}</view>
+			</view>
+		</view>
+		<u-line />
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {
+
+		},
+		data() {
+			return {};
+		},
+
+		props: {
+			workShopCode: {
+				type: String,
+				default: ''
+			},
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+		},
+
+		methods: {
+
+		}
+	}
+</script>
+
+<style lang="scss">
+
+</style>
+
+
+<style>
+</style>

pages/issue/coms/comScanIssuePack.vue

@@ -7,7 +7,7 @@
 						扫描箱码
 						<text class="fr" @click="closeScanPopup()">关闭</text>
 					</view>
-					<view class="uni-flex uni-row" style="align-items: center;
+				<!-- 	<view class="uni-flex uni-row" style="align-items: center;
 						background-color: #fff; 
 						margin-left: 20rpx;
 						margin-right: 20rpx;
@@ -21,12 +21,12 @@
 								<view class="" style="margin-left: 15rpx;font-size: 30rpx;">
 									{{positionInfo}}
 								</view>
-								<!-- <u-select v-model="show" mode="mutil-column-auto" :list="positionList" :defaultValue="defaultValueList"
+								<u-select v-model="show" mode="mutil-column-auto" :list="positionList" :defaultValue="defaultValueList"
-									@confirm="confirmSelect"></u-select> -->
+									@confirm="confirmSelect"></u-select>
-							</view>
 							</view>
 						</view>
-					<u-line class='line_color'></u-line>
+					</view> -->
+					<!-- <u-line class='line_color'></u-line> -->
 
 					<view class="uni-flex uni-row" style="align-items: center;
 						background-color: #fff; 

pages/issue/job/issueDetail.vue

@@ -7,27 +7,8 @@
 
 			<scroll-view scroll-y="true" class="">
 				<view v-for="(toLocation, index) in detailSource">
-					<view class="cen_card" style="padding: 20rpx;">
+					<com-issue-request-info :workShopCode="jobContent.workShopCode" :dataContent="toLocation">
-						<view class="cell_box uni-flex uni-row">
+					</com-issue-request-info>
-							<view class="cell_info">
-								<view class="text_lightblue">车间</view>
-								<view>{{jobContent.workShopCode}}</view>
-							</view>
-							<view class="cell_info">
-								<view class="text_lightblue">生产线</view>
-								<view>{{toLocation.productionLineCode}}</view>
-							</view>
-							<view class="cell_info">
-								<view class="text_lightblue">工位</view>
-								<view>{{ toLocation.workStationCode }}</view>
-							</view>
-							<view class="cell_info">
-								<view class="text_lightblue">原材料库</view>
-								<view>{{ toLocation.toLocationCode}}</view>
-							</view>
-						</view>
-						<u-line />
-					</view>
 					<com-issue-detail-card ref='comIssueDetailCard' :dataContent="toLocation" @updateData='updateData'>
 					</com-issue-detail-card>
 				</view>
@@ -80,6 +61,7 @@
 	import comIssueDetailCard from '@/pages/issue/coms/comIssueDetailCard.vue'
 	import comScanIssuePack from '@/pages/issue/coms/comScanIssuePack.vue'
 	import comMessage from '@/mycomponents/common/comMessage.vue'
+	import comIssueRequestInfo from '@/pages/issue/coms/comIssueRequestInfo.vue'
 
 	export default {
 		name: 'issueDetail',
@@ -87,6 +69,7 @@
 			jobDetailPopup,
 			winScanButton,
 			comIssueDetailCard,
+			comIssueRequestInfo,
 			comScanIssuePack,
 			comMessage
 		},
@@ -235,9 +218,11 @@
 				//目前任务只到一个库位
 				var itemCodes = []
 				let locationCode = this.detailSource[0].toLocationCode
-				this.detailSource.forEach(item => {
+				this.detailSource.forEach(toLocation => {
+					toLocation.Items.forEach(item => {
 						itemCodes.push(item.itemCode)
 					})
+				})
 
 				//使用在途库，不查询管理模式
 				if (this.jobContent.useOnTheWayLocation == 'TRUE') {

pages/issue/request/issueRequestDetail.vue

@@ -1,19 +1,15 @@
 <template>
 	<view class="page-wraper">
-
 		<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="detail-list">
 					<view class="">
-						<comRequestDetailCard :dataContent="item" 
+						<com-request-detail-card :dataContent="requestContent">
-							 @openDetail="openDetail">
+						</com-request-detail-card>
-						</comRequestDetailCard>
 					</view>
 				</view>
 			</scroll-view>
 		</view>
-
-		<requestDetailInfoPopup ref="jobDetailPopup"></requestDetailInfoPopup>
 		<com-message ref="comMessage"></com-message>
 	</view>
 </template>
@@ -34,13 +30,12 @@
 
 
 	import comRequestDetailCard from "@/mycomponents/detail/comRequestDetailCard.vue"
-	import requestDetailInfoPopup from '@/pages/issue/coms/requestDetailInfoPopup.vue'
+
 	import comMessage from '@/mycomponents/common/comMessage.vue'
 	
 	export default {
 		components: {
 			comRequestDetailCard,
-			requestDetailInfoPopup,
 			comMessage,
 		},
 		data() {
@@ -48,7 +43,6 @@
 				id: '',
 				requestContent: {}, //任务内容
 				subList: [], //接口返回的任务
-				detailSource: [], //绑定在页面上的数据源
 			};
 		},
 		onLoad(option) {
@@ -85,11 +79,12 @@
 					} else {
 						if (res.data.subList.length > 0) {
 							that.requestContent = res.data;
+							that.requestContent.subList=res.data.subList;
 							that.subList = res.data.subList;
-						that.subList.forEach(res=>{
+							// that.subList.forEach(res => {
-							res.fromLocationCode = res.toLocationCode
+							// 	res.fromLocationCode = res.toLocationCode
-						})
+							// })
-						that.detailSource = getDataSource(that.subList);
+							// that.detailSource = getDataSource(that.subList);
 							updateTitle(this.requestContent.number);
 						} else {
 							that.showMessage('列表数据为0');
@@ -103,16 +98,10 @@
 
 			showMessage(message) {
 				this.$refs.comMessage.showMessage(message, res => {
-					if (res) {
+					if (res) {}
-					}
 				});
 			},
 
-			openDetail(item) {
-				this.$refs.jobDetailPopup.openPopup(item)
-			},
-
-
 		}
 	}
 </script>

static/config.json

@@ -18,7 +18,7 @@
 		
 		"request_url": {
 			"name": "request_url",
-			"value": "http://192.168.0.178:12080/admin-api",
+			"value": "http://dev.ccwin-in.com:25100/api/admin-api",
 			"dev2":"http://192.168.0.157:12080/admin-api",
 			"chefang":"http://192.168.0.178:12080/admin-api",
 			"dev":"http://dev.ccwin-in.com:25100/api/admin-api",