|
|
@@ -286,12 +286,12 @@
|
|
|
<uni-drawer ref="showRight" mode="right" :mask-click="true">
|
|
|
<view style="text-align: center; font-size: 48rpx; padding: 48rpx 0 24rpx 0;">工艺列表</view>
|
|
|
<view style="font-size: 24rpx;text-align: center;color: red; margin-bottom: 16rpx;">
|
|
|
- 仅显示当前工序及后面工艺
|
|
|
+ 蓝色工序为当前工序
|
|
|
</view>
|
|
|
<scroll-view scroll-y="true" style="height: 82%;" @touchmove.stop>
|
|
|
<view v-for="(item,index) in curProcessAfte" :key="index"
|
|
|
style="padding: 8rpx 5% 8rpx 14%; border-top: 1px solid #cccccc">
|
|
|
- <text>{{ index + 1 }}.{{item.processAlias}}</text>
|
|
|
+ <text :style="{ color: showStatusColor(item) }">{{ index + 1 }}.{{item.processAlias}}</text>
|
|
|
</view>
|
|
|
</scroll-view>
|
|
|
</uni-drawer>
|
|
|
@@ -432,7 +432,7 @@
|
|
|
} else {
|
|
|
// 测试时用
|
|
|
getDayworkCarrierByCarrierCode({
|
|
|
- carrierCode: '000022'
|
|
|
+ carrierCode: '000880'
|
|
|
}).then(res => {
|
|
|
if (res.code == 200) {
|
|
|
if (res.data.length > 0) {
|
|
|
@@ -517,23 +517,33 @@
|
|
|
console.log("工序列表", item)
|
|
|
|
|
|
let nextIndex = 0;
|
|
|
- for (let i = 0; i < item.processSequence.length; i++) {
|
|
|
- if (item.currentProcess.processStepNumber == item.processSequence[i].processStepNumber) {
|
|
|
- nextIndex = i;
|
|
|
- }
|
|
|
- }
|
|
|
- for (let i = 0; i < item.processSequence.length; i++) {
|
|
|
- if (i >= nextIndex) {
|
|
|
- curProcessAfterList.push(item.processSequence[i]);
|
|
|
- }
|
|
|
- }
|
|
|
- if (item.status == 3) {
|
|
|
- curProcessAfterList.splice(0, 1)
|
|
|
- }
|
|
|
- console.log(curProcessAfterList)
|
|
|
- curProcessAfte.value = curProcessAfterList;
|
|
|
+ // for (let i = 0; i < item.processSequence.length; i++) {
|
|
|
+ // if (item.currentProcess.processStepNumber == item.processSequence[i].processStepNumber) {
|
|
|
+ // nextIndex = i;
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ // for (let i = 0; i < item.processSequence.length; i++) {
|
|
|
+ // if (i >= nextIndex) {
|
|
|
+ // curProcessAfterList.push(item.processSequence[i]);
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ // if (item.status == 3) {
|
|
|
+ // curProcessAfterList.splice(0, 1)
|
|
|
+ // }
|
|
|
+ // console.log(curProcessAfterList)
|
|
|
+ // curProcessAfte.value = curProcessAfterList;
|
|
|
+ curProcessAfte.value = item.processSequence
|
|
|
showRight.value.open();
|
|
|
}
|
|
|
+ const showStatusColor = (item) => {
|
|
|
+ // console.log(status)
|
|
|
+ console.log(item,111)
|
|
|
+ console.log(lotData.value,222)
|
|
|
+ if(item.processStepNumber == lotData.value.currentProcess.processStepNumber){
|
|
|
+ return '#3482ff'
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
const handleClickTab = (val) => {
|
|
|
//scrollTop.value = top
|
|
|
scrollToId.value = 'item' + val
|
