diff --git a/pages/checkList/checkList.vue b/pages/checkList/checkList.vue
index aad337e..fae5f8e 100644
--- a/pages/checkList/checkList.vue
+++ b/pages/checkList/checkList.vue
@@ -64,7 +64,7 @@
不良品数量:{{i.rejects_num}}
-
+
检测
@@ -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(){
diff --git a/pages/processList/processList.vue b/pages/processList/processList.vue
index 13712f2..c95e016 100644
--- a/pages/processList/processList.vue
+++ b/pages/processList/processList.vue
@@ -38,7 +38,7 @@
-
+
状态:{{ item.status == 1 ? '未完成' : (item.status == 2 ? '进行中' : '已完成')}}
@@ -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{
diff --git a/pages/taskDetail/taskDetail.vue b/pages/taskDetail/taskDetail.vue
index 846bb5b..9443f1c 100644
--- a/pages/taskDetail/taskDetail.vue
+++ b/pages/taskDetail/taskDetail.vue
@@ -3,7 +3,7 @@
@@ -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) {
diff --git a/pages/taskList/taskList.vue b/pages/taskList/taskList.vue
index b45c40b..3333ca6 100644
--- a/pages/taskList/taskList.vue
+++ b/pages/taskList/taskList.vue
@@ -29,6 +29,9 @@
编号:{{i.art_number}}
+
+ 当前工序:{{i.procedure}}
+
数量:{{i.total}}
@@ -170,6 +173,9 @@
}
.finish{
color:#0DC0F4 !important;
+ text{
+ color:green !important;
+ }
}
.planTime{