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

common/style/new_style.css

@@ -224,7 +224,7 @@ uni-page-head .uni-page-head__title {
 	position: relative;
 	/* width: 25%; */
 	padding: 0 20rpx;
-	margin: 0 0 20rpx;
+	/* margin: 0 0 20rpx; */
 	text-align: center;
 }
 

mycomponents/detail/comDetailCard.vue

@@ -1,5 +1,23 @@
 <template>
 	<view class="" style="background-color: #fff;">
+		<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>
 		<uni-collapse ref="collapse1" @change="">
 			<uni-collapse-item :open="true">
 				<template v-slot:title>

pages/inspect/coms/inspectComDetailCard.vue

@@ -44,8 +44,7 @@
 							:right-options="item.scaned?scanOptions:detailOptions">
 							<recommend :detail="item" :isShowPack="isShowPack" :isShowBatch="isShowBatch"
 								:isShowFromLocation="isShowLocation"></recommend>
-								 <!--  -->
+							<view v-if="item.failedQty>0||item.crackQty>0" :class="item.scaned?'scan_view':''" style="font-size: 32rpx;padding-left: 2px;">
-							<view v-if="item.failedQty>0||item.crackQty>0" :class="item.scaned?'scan_view':''" style="font-size: 32rpx;margin-top: 5px;">
 								<view class="cell_box uni-flex uni-row">
 									<view class="cell_info uni-flex uni-row">
 										<view class="text_lightblue">

pages/issue/request/issueRequest.vue

@@ -14,10 +14,11 @@
 				</view>
 			</uni-swipe-action>
 			<uni-load-more :status="loadingType" />
-			
+			<!-- <request-info-popup ref='requestInfoPopup'></request-info-popup> -->
-			<request-info-popup ref='requestInfoPopup'></request-info-popup>
 		</view>
 		<requestButton @goScan='openScanDetailPopup'></requestButton>
+		<!-- <com-issue-request-popup ref="comIssueRequestPopup" @confirm='requestConfirm'></com-issue-request-popup> -->
+		<com-issue-request-popup ref="comIssueRequestPopup" @confirm='requestConfirmsss'></com-issue-request-popup>
 		<comMessage ref="comMessage"></comMessage>
 	</view>
 </template>
@@ -30,6 +31,8 @@
 	import comIssueRequestCard from '@/pages/issue/coms/comIssueRequestCard.vue'
 	import requestInfoPopup from '@/pages/issue/coms/requestInfoPopup.vue'
 	import requestButton from '@/mycomponents/button/requestButton.vue'
+	import comIssueRequestPopup from '@/pages/issue/coms/comIssueRequestPopup.vue'
+
 	import {
 		goHome,
 		updateTitle,
@@ -64,6 +67,7 @@
 			comIssueRequestCard,
 			requestInfoPopup,
 			requestButton,
+			comIssueRequestPopup
 		},
 		data() {
 			return {
@@ -119,16 +123,16 @@
 
 		},
 		methods: {
-			requestConfirm(action, item) {},
 			openRequestDetail(item) {
 				uni.navigateTo({
-					url: './issueRequestDetail?id=' + item.id
+					url: './issueRequestDetail?type=query&id=' + item.id
 				});
 			},
 
 			openRequestInfoPopup(item) {
 				this.$refs.requestInfoPopup.openPopup(item)
 			},
+
 			getList(type) {
 				let that = this;
 				uni.showLoading({
@@ -183,6 +187,7 @@
 					that.showMessage(error.errMsg)
 				})
 			},
+
 			updateOptions(status) {
 				if (status == "1") {
 					this.showOptions = this.detailAndApproveOptions;
@@ -199,12 +204,7 @@
 			},
 
 			openScanDetailPopup() {
-				// uni.navigateTo({
+				this.$refs.comIssueRequestPopup.openRequestPopup(true);
-				// 	url: "../request/issueRequestSubmit?fromType=" + this.fromType
-				// })
-				uni.navigateTo({
-					url: "../record/issueRecord?fromType=" + this.fromType
-				})
 			},
 
 			swipeClick(e, dataContent) {
@@ -212,29 +212,29 @@
 				if (text == "详情") {
 					this.openRequestInfoPopup(dataContent);
 				} else if (text == "处理") {
-					this.showQuestionMessage("确定要处理当前申请吗?",res=>{
+					this.showQuestionMessage("确定要处理当前申请吗?", res => {
 						this.issueRequestHandle(dataContent.id)
 					})
 				} else if (text == "提交审批") {
-					this.showQuestionMessage("确定要审批当前申请吗?",res=>{
+					this.showQuestionMessage("确定要审批当前申请吗?", res => {
 						this.issueRequestSubmitApprove(dataContent.id)
 					})
 				} else if (text.includes("审批通过")) {
-					this.showQuestionMessage("确定要审批通过当前申请吗?",res=>{
+					this.showQuestionMessage("确定要审批通过当前申请吗?", res => {
 						this.issueRequestSubmitApproveAgree(dataContent.id)
 					})
 				} else if (text == "审批驳回") {
-					this.showQuestionMessage("确定要审批驳回当前申请吗?",res=>{
+					this.showQuestionMessage("确定要审批驳回当前申请吗?", res => {
 						this.issueRequestSubmitApproveRefused(dataContent.id)
 					})
 				} else if (text == "关闭") {
-					this.showQuestionMessage("确定要关闭当前申请吗?",res=>{
+					this.showQuestionMessage("确定要关闭当前申请吗?", res => {
 						this.issueRequestClose(dataContent.id)
 					})
 				}
 			},
 
-			showQuestionMessage(hint,callBack){
+			showQuestionMessage(hint, callBack) {
 				this.$refs.comMessage.showQuestionMessage(hint,
 					res => {
 						if (res) {
@@ -242,6 +242,7 @@
 						}
 					});
 			},
+
 			switchChangeWait(state, jobStatus) {
 				this.checkedWaitTask = state;
 				this.status = jobStatus;
@@ -355,6 +356,7 @@
 					this.showMessage(error)
 				})
 			},
+
 			issueRequestHandle(id) {
 				issueRequestHandle(id).then(res => {
 					if (res.data) {
@@ -370,8 +372,21 @@
 					this.showMessage(error)
 				})
 			},
+		},
 		
+		requestConfirmsss(action, item) {
+			debugger;
+			uni.navigateTo({
+				url: './issueRequestDetail?type=add&item=' + item.id
+			});
 		}
+
+		// requestConfirm(action, item) {
+		// 	debugger;
+		// 	uni.navigateTo({
+		// 		url: './issueRequestDetail?type=add&item=' + item.id
+		// 	});
+		// }
 	}
 </script>
 

pages/issue/request/issueRequestDetail.vue

@@ -9,6 +9,14 @@
 					</view>
 				</view>
 			</scroll-view>
+			<!-- v-if="type=='add'" -->
+			<div class="btn_bottom" >
+				<view class="" style="display: flex;flex-direction: row;">
+					<view class="">
+						<button class="btn_commit" hover-class="btn_commit_after" @click="submit()">提交</button>
+					</view>
+				</view>
+			</div>
 		</view>
 		<com-message ref="comMessage"></com-message>
 	</view>
@@ -43,12 +51,20 @@
 				id: '',
 				requestContent: {}, //任务内容
 				subList: [], //接口返回的任务
+				type: 'query' //来源新增add,  query查询
 			};
 		},
 		onLoad(option) {
-			this.id = option.id;
+			debugger;
-			this.getDetail();
+			this.type = option.type;
+			if (this.type == 'add') {
+
+			} else {
+				this.id = option.id;
+				this.getDetail();
+			}
 		},
+		
 		//返回首页
 		onNavigationBarButtonTap(e) {
 			if (e.index === 0) {
@@ -79,7 +95,7 @@
 					} else {
 						if (res.data.subList.length > 0) {
 							that.requestContent = res.data;
-							that.requestContent.subList=res.data.subList;
+							that.requestContent.subList = res.data.subList;
 							that.subList = res.data.subList;
 							// that.subList.forEach(res => {
 							// 	res.fromLocationCode = res.toLocationCode

pages/productionReceipt/coms/comProductionJobCard.vue

@@ -3,17 +3,12 @@
  		<view class="task_item">
  			<view class="task_text">
  				<view class="">
- 					申请单号 : {{dataContent.requestNumber}}
+ 					发料任务单号:{{dataContent.issueJobNumber}}
  				</view>
  			</view>
  			<view class="task_text">
  				<view class="">
- 					零件号 : {{dataContent.itemCode}}
+ 					车间:{{dataContent.workshopCode}}
- 				</view>
- 			</view>
- 			<view class="task_text">
- 				<view class="">
- 					目标库位 : {{dataContent.toLocationCode}}
  				</view>
  			</view>
  		</view>

pages/productionReceipt/job/productionReceiptDetail.vue

@@ -172,7 +172,7 @@
 							that.toLocationCode = that.subList[0].toLocationCode
 							that.tolocationTypeList = getLocationTypeArray(that.jobContent.toLocationTypes)
 							that.detailSource = getDataSource(that.subList)
-							updateTitle(this.jobContent.number);
+							// updateTitle(this.jobContent.number);
 						} else {
 							that.showMessage('列表数据为0');
 						}