提交

pages/checkList/checkList.vue

@@ -64,7 +64,7 @@
 						<view>
 							不良品数量：{{i.rejects_num}}
 						</view>
-						<view class="lookdetails" v-if="isCheck==2"  @click="checkHandle(i)">
+						<view class="lookdetails" v-if="i.is_check==1"  @click="checkHandle(i)">
 							检测
 						</view>
 					</view>
@@ -105,7 +105,6 @@
 			return {
 				taskList:[],
 				show:false,
-				isCheck:0,
 				checkDialog:false,
 				qualified_num:'',
 				selectedId:null
@@ -147,7 +146,6 @@
 				checkList().then(res=>{
 					console.log(res)
 					this.taskList = res.data.list
-					this.isCheck = res.data.is_check
 				})
 			},
 			changeUser(){

pages/processList/processList.vue

@@ -38,7 +38,7 @@
 						</view>
 					</view>
 					<view class="rowItem">
-						<view :class="item.status == 1?'status right':'status right finish'">
+						<view :class="item.status == 1?'status unfinish right':item.status == 2?'status right':'status right finish'">
 							状态：<text>{{ item.status == 1 ? '未完成' : (item.status == 2 ? '进行中' : '已完成')}}</text>
 						</view>
 						<view class="lookdetails right" @click="goProgress(item)" v-if="item.is_info == 1&&item.is_start == 1">
@@ -104,7 +104,7 @@
 			},
 			goProgress(item){
 				uni.navigateTo({
-					url:'/pages/taskDetail/taskDetail?id='+item.id + '&status='+item.status + '&is_start='+ item.is_start +'&heat_num=' +this.info.heat_num +'&taskId='+this.info.id
+					url:'/pages/taskDetail/taskDetail?id='+item.id + '&status='+item.status + '&is_start='+ item.is_start +'&heat_num=' +this.info.heat_num +'&taskId='+this.info.id+'&code='+this.info.code
 				})
 				
 			}
@@ -190,8 +190,16 @@
 					color:#FFAD0F;
 				}
 			}
+			.unfinish{
+				text{
+					color:red !important;
+				}
+			}
 			.finish{
 				color:#0DC0F4 !important;
+				text{
+					color:green !important;
+				}
 			}
 			.planTime{
 				

pages/taskDetail/taskDetail.vue

@@ -3,7 +3,7 @@
 		<!-- -->
 		<u-navbar
 			title="操作详情"
-			:autoBack="true"
+			@leftClick="leftClick"
 			:safeAreaInsetTop="false"
 		>
 			<view class="u-nav-slot" slot="right" @click="show = true">
@@ -287,6 +287,7 @@
 					this.$store.commit('logout')
 				})
 			},
+			
 			confirmProcedureHandle(id){
 				confirmProcedureHandle({id:id}).then(res=>{
 					
@@ -354,7 +355,12 @@
 					}
 					console.log(this.contentInfo)
 				})
-			}
+			},
+			leftClick(){
+				uni.navigateTo({
+					url:'/pages/processList/processList?code='+this.info.code+'&id='+this.info.taskId+'&heat_num=' +this.info.heat_num 
+				})
+			},
 		},
 		
 		onLoad(option) {

pages/taskList/taskList.vue

@@ -29,6 +29,9 @@
 					<view class="code rowItem">
 						编号：{{i.art_number}}
 					</view>
+					<view class="code rowItem">
+						当前工序：{{i.procedure}}
+					</view>
 					<view class="code rowItem">
 						<view>
 							数量：{{i.total}}
@@ -170,6 +173,9 @@
 			}
 			.finish{
 				color:#0DC0F4 !important;
+				text{
+					color:green !important;
+				}
 			}
 			.planTime{