优化

pages.json

@@ -1478,6 +1478,14 @@
 				"navigationStyle" : "custom",
 				"navigationBarTextStyle" : "white"
 			}
+		},
+		{
+			"path" : "pages/pda/sample/inspection/index",
+			"style" : 
+			{
+				"navigationStyle" : "custom",
+				"navigationBarTextStyle" : "white"
+			}
 		}
 
 

pages/pda/components/bottomOperate.vue

@@ -89,6 +89,13 @@
 							name: '报工',
 							type: 'sampleJob'
 						},
+					],
+					
+					3: [
+						{
+							name: '报工',
+							type: 'inspection'
+						},
 					]
 				}
 			}

pages/pda/jobBooking/components/jobBom.vue

@@ -13,16 +13,16 @@
 			<view class="content_table">
 
 
-		<view class="item rx-sc">
+				<view class="item rx-sc">
 					<view class="rx  ">
 						<view class="lable lable220 rx-cc ">上道工序生产数量</view>
 						<view class="content ">
-						  {{ item.formedNumLast}}
+							{{ item.formedNumLast}}
 						</view>
 					</view>
 				</view>
-				
-				
+
+
 				<view class="item rx-sc">
 					<view class="rx ww55 ">
 						<view class="lable lable150 rx-cc ">要求生产数量</view>
@@ -42,15 +42,16 @@
 					</view>
 
 				</view>
-				
-		
+
+
 
 
 				<view class="item rx-sc">
 					<view class="rx ww55 ">
 						<view class="lable lable150 rx-cc ">合格品数量</view>
 						<view class="content content_num">
-							<input class="uni-input" v-model="item.workReportInfo.formedNum" @blur="blurNum" type="digit"></input>
+							<input class="uni-input" v-model="item.workReportInfo.formedNum" @blur="blurNum"
+								type="digit"></input>
 							<view class="unit">{{item.unit}}</view>
 						</view>
 					</view>
@@ -64,36 +65,39 @@
 					</view>
 
 				</view>
-				
-	
-				
-				
+
+
+
+
 
 
 
 
 				<view class="item rx-sc" v-for="(not,notIndex) in notFormedList" :key='notIndex'>
-					
+
 					<view class="rx ww55 ">
-					
+
 						<view class="lable lable150 rx-cc ">不合格数量</view>
 						<view class="content content_num">
 							<input class="uni-input" v-model="not.notFormedNum" type="digit" @blur="blurNum"></input>
 							<view class="unit">{{item.unit}}</view>
 						</view>
 					</view>
-                    
+
 					<view class="rx ww45">
 						<view class="lable rx-cc ww80">重量</view>
 						<view class="content content_num">
 							<input class="uni-input" v-model="not.notFormedWeight" type="digit"></input>
 							<view class="unit">{{item.weightUnit}}</view>
-							
-							<view class="penalize" v-if='!isDetails'  :style="{ color: not.warehouseId ? 'rgb(255 170 42)' : ''}"  @click="penalize">处置</view>
-							<view class="penalize" v-if='isDetails'  :style="{ color: not.warehouseId ? 'rgb(255 170 42)' : ''}"  @click="handleView(item.warehouseName)">查看</view>
+
+							<view class="penalize" v-if='!isDetails'
+								:style="{ color: not.warehouseId ? 'rgb(255 170 42)' : ''}" @click="penalize">处置</view>
+							<view class="penalize" v-if='isDetails'
+								:style="{ color: not.warehouseId ? 'rgb(255 170 42)' : ''}"
+								@click="handleView(item.warehouseName)">查看</view>
 						</view>
 					</view>
-
+s
 				</view>
 
 
@@ -120,7 +124,8 @@
 					<view class="lable rx-cc">舟皿名称</view>
 					<view class="content ">
 						<zxz-uni-data-select :localdata="boatList" v-model="item.categoryId" dataValue='id'
-							format='{name}-{code}'  dataKey="code" filterable :clear='false' @change='inputChange'></zxz-uni-data-select>
+							format='{name}-{code}' dataKey="code" filterable :clear='false'
+							@change='inputChange'></zxz-uni-data-select>
 					</view>
 				</view>
 
@@ -154,9 +159,11 @@
 		treeByPid,
 		pageeLedgerMain,
 		assetPage,
-		
+
 	} from '@/api/pda/workOrder.js'
-import { number } from 'echarts'
+	import {
+		number
+	} from 'echarts'
 	export default {
 		props: {
 			item: {
@@ -178,26 +185,26 @@ import { number } from 'echarts'
 			}
 
 		},
-		
+
 		watch: {
-		
+
 			notFormed: {
 				immediate: true,
 				deep: true,
 				handler(newVal) {
 					console.log(newVal)
 					this.notFormedList = newVal
-				
+
 				}
 			}
 		},
-		
-		
+
+
 		data() {
 			return {
 				classificationList: [],
 				boatList: [],
-				
+
 				notFormedList: []
 
 			}
@@ -206,7 +213,7 @@ import { number } from 'echarts'
 
 
 			this.getTreeList()
-				
+
 		},
 		methods: {
 
@@ -257,18 +264,18 @@ import { number } from 'echarts'
 			handleType() {
 				this.$refs.treePicker._show()
 			},
-			
+
 			penalize() {
 				this.$emit('penalize', null)
 			},
-			
+
 			handleView(name) {
 				uni.showToast({
 					icon: 'none',
 					title: name || '未设置'
 				})
 			},
-			
+
 			blurNum() {
 				let total = Number(this.item.workReportInfo.formedNum) + Number(this.notFormedList[0].notFormedNum)
 				this.$emit('modeNum', total)
@@ -332,7 +339,8 @@ import { number } from 'echarts'
 					border-right: 2rpx solid $border-color;
 					flex-shrink: 0;
 				}
-				.lable220{
+
+				.lable220 {
 					width: 220rpx !important;
 					font-size: 24rpx;
 				}

pages/pda/jobBooking/index/index.vue

@@ -517,9 +517,7 @@
 
 
 				jobSave(this.objData).then(res => {
-					if (res) {
-						uni.navigateBack()
-					}
+					uni.navigateBack()
 				})
 
 

pages/pda/sample/inspection/index.vue

@@ -0,0 +1,22 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>

pages/pda/workOrder/extrusionMolding/index.vue

@@ -250,13 +250,13 @@
 				})
 			},
 			setTypeFn() {
-				
-					this.stepsList.length && this.stepsList.find(f => {
-						if (f.taskId == this.taskId) {
-							this.currentType = f.type
-						}
-					})
-			
+				this.stepsList.length && this.stepsList.find(f => {
+					let id = this.currentTaskId || this.taskId
+					if (f.taskId == id) {
+						this.currentType = f.type
+					}
+				})
+
 			},
 
 			feedStatus() {
@@ -333,10 +333,16 @@
 					uni.navigateTo({
 						url
 					})
+				} else if (type == 'inspection') {
+					url = '/pages/pda/sample/inspection/index'
+					url += `?workOrderId=${this.info.id}&taskId=${taskId }&taskName=${taskName}`
+					uni.navigateTo({
+						url
+					})
 				}
-				
-				
-				
+
+
+
 
 			},