优化

pages/pda/components/uni-steps.vue

@@ -10,10 +10,13 @@
 					</view>
 					<view :class="[direction==='column'?'uni-steps__column-check':'uni-steps__row-check']"
 						v-if="index === active">
-						<view class="uni-steps__row-circle activeRound" :class="[ taskId == item.taskId ?'circleActive': 'activeRound']">{{index + 1}}</view>
+						<view class="uni-steps__row-circle activeRound"
+							:class="[ taskId == item.taskId ?'circleActive': 'activeRound']">{{index + 1}}</view>
 					</view>
-					<view :class="[direction=='column'?'uni-steps__column-circle': taskId == item.taskId ?'circleActive' :'uni-steps__row-circle']" v-else>
-						{{index + 1}} 
+					<view
+						:class="[direction=='column'?'uni-steps__column-circle': taskId == item.taskId ?'circleActive' :'uni-steps__row-circle']"
+						v-else>
+						{{index + 1}}
 					</view>
 					<view
 						:class="[direction==='column'?'uni-steps__column-line':'uni-steps__row-line',direction==='column'?'uni-steps__column-line--after':'uni-steps__row-line--after']"
@@ -72,12 +75,13 @@
 		data() {
 			return {
 				taskId: null,
+				clientEnvironmentId: uni.getStorageSync("userInfo") && uni.getStorageSync("userInfo").clientEnvironmentId,
 			}
 		},
 		methods: {
 			toStep(item, index) {
-				
-				if(item.taskId == -2) {
+
+				if (item.taskId == -2) {
 					uni.showToast({
 						title: "工序已到完结状态",
 						icon: "none",
@@ -85,16 +89,25 @@
 					return false
 				}
 				
-				if(item.count > 0 || index == this.active) {
+				if(this.clientEnvironmentId == 3) { // 碳谷
 					this.taskId = item.taskId
-						this.$emit('selectStep', item);
+					this.$emit('selectStep', item);
 				} else {
-					uni.showToast({
-						title: "还未执行到次工序",
-						icon: "none",
-					})
+					if(item.count > 0 || index == this.active) {
+						this.taskId = item.taskId
+							this.$emit('selectStep', item);
+					} else {
+						uni.showToast({
+							title: "还未执行到次工序",
+							icon: "none",
+						})
+					}
 				}
+
+		
+
 			
+
 			}
 		}
 	}
@@ -288,7 +301,7 @@
 		background: $theme-color;
 		color: #fff;
 	}
-	
+
 	.circleActive {
 		border: 1px solid #FFA929;
 		background: #FFA929;

pages/pda/jobBooking/components/packingTgBom.vue

@@ -1,11 +1,11 @@
 <template>
 	<view>
 		<view class="title_box rx-bc">
-			<view class="name">打包信息： ({{ isWarehousing ? list.length : item.packInfo.pickOutInList.length || 0}})个</view>
+			<view class="name">打包信息： ({{ isWarehousing ? list.length : item.pickOutInList.length || 0}})个</view>
 		</view>
 
 
-		<view class="material " v-for="(it, idx) in isWarehousing ? list :  item.packInfo.pickOutInList" :key="idx">
+		<view class="material " v-for="(it, idx) in isWarehousing ? list :  item.pickOutInList" :key="idx">
 
 
 			<view class="content_table">
@@ -183,8 +183,7 @@
 				deep: true,
 				handler(newVal) {
 					if (this.isWarehousing == false) {
-						this.item['packInfo'] = {}
-						this.item['packInfo'].pickOutInList = newVal
+						
 					} 
 
 

pages/pda/jobBooking/index/index.vue

@@ -62,7 +62,7 @@
 
 					<packingTgBom
 						v-if='objData.pickOutInList &&  objData.pickOutInList.length != 0 && taskType == 4  &&  clientEnvironmentId == 3'
-						:list='objData.pickOutInList'></packingTgBom>
+						:list='objData.pickOutInList' :item='objData'></packingTgBom>
 
 
 
@@ -383,6 +383,8 @@
 			getList() {
 				this.isLoad = false
 				getByIdReport(this.id, this.taskId).then(res => {
+					
+					console.log(22,res)
 
 					this.objData = res
 					if (!this.objData.hasOwnProperty('turnover')) {
@@ -441,6 +443,7 @@
 					if (this.taskType == 6 && this.clientEnvironmentId == 3) {
 						this.objData.instanceList = this.objData.pickOutInList
 					}
+				
 
 
 
@@ -673,6 +676,7 @@
 								} else {
 									uni.navigateBack()
 								}
+								
 							}
 						})
 					} else {