From 9250e3592da277c30e356d8dfef7b9519b89345b Mon Sep 17 00:00:00 2001
From: wuwx <1960@qq.com>
Date: Wed, 13 Mar 2024 17:31:55 +0800
Subject: [PATCH] =?UTF-8?q?0123=E9=9C=80=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/discharge/index.vue     |  3 +++
 pages/discharge/instruct.vue  |  4 ++--
 pages/index/domesticTrade.vue |  8 ++++----
 pages/index/index.vue         |  3 +++
 pages/index/instruct.vue      | 14 +++++++-------
 5 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/pages/discharge/index.vue b/pages/discharge/index.vue
index e20cd86..3099e08 100644
--- a/pages/discharge/index.vue
+++ b/pages/discharge/index.vue
@@ -305,6 +305,9 @@
                 this.operationDate = ''
 				this.startDate = ''
 				this.endDate = ''
+				this.oneFlag = false
+				this.twoFlag = false
+				this.threeFlag = false
 			},
 			// 筛选确认
 			confirm() {
diff --git a/pages/discharge/instruct.vue b/pages/discharge/instruct.vue
index cd2b499..b2971b4 100644
--- a/pages/discharge/instruct.vue
+++ b/pages/discharge/instruct.vue
@@ -449,7 +449,7 @@
                              <view class="bottom">卸船进度</view>
 						    </view>
 							<template>
-							<view class="tjInfo" v-for="(item,index) in jobProgressList" :key="item.id" @click="jobProgress(item,index)" :class="{active:jobActive == index || brdName == item.label}">
+							<view class="tjInfo" v-for="(item,index) in jobProgressList" :key="item.id" @click="jobProgress(item,index,'bzz')" :class="{active:jobActive == index || brdName == item.label}">
                               <view class="label">{{ item.label }}</view>
 							  <lx-progress-bar title="" :total="item.totalProgress" :firstValue="item.progress"
 							  contentColor="#0067CF"
@@ -1689,7 +1689,7 @@
 			   this.itemList = []
 			   if(type == 'zzl') {
 				this.loadSumOrder()
-			   } else if(type == 'fzl') {
+			   } else if(type == 'fzl' || type == 'bzz') {
                  this.loadOtherOrder()
 			   }
 			}
diff --git a/pages/index/domesticTrade.vue b/pages/index/domesticTrade.vue
index 62497a4..3b48c45 100644
--- a/pages/index/domesticTrade.vue
+++ b/pages/index/domesticTrade.vue
@@ -85,7 +85,7 @@
 							 </template>
 						    </template>
 							<template v-else>
-							<view class="tjInfo" v-for="(item,index) in jobProgressList" :key="item.id" @click="jobProgress(item,index,'zzl')" :class="{active:jobActive == index || brdName == item.label}">
+							<view class="tjInfo" v-for="(item,index) in jobProgressList" :key="item.id" @click="jobProgress(item,index,'zzl')" :class="{active:jobActive == index || brdName == item.label || potName == item.label || mnfBl == item.label}">
                               <view class="label">{{ item.label }}</view>
 							  <lx-progress-bar title="" :total="item.totalProgress" :firstValue="item.progress"
 							  contentColor="#0067CF"
@@ -94,7 +94,7 @@
 								<p>已装船:<text>{{ item.progress }}</text></p>
 								<p style="margin-left: 16px;">待卸船:<text>{{ item.totalProgress - item.progress }}</text></p>
 							  </view>
-							  <view class="imgBox" v-if="jobActive == index || brdName == item.label">
+							  <view class="imgBox" v-if="jobActive == index || brdName == item.label || potName == item.label || mnfBl == item.label">
 								<image src="../../static/images/tjxz2.png" mode=""></image>
 							  </view>
 							</view>
@@ -282,7 +282,7 @@
 							 </template>
 						    </template>
 							<template v-else>
-							<view class="tjInfo" v-for="(item,index) in jobProgressList" :key="item.id" @click="jobProgress(item,index,'fzl')" :class="{active:jobActive == index || brdName == item.label}">
+							<view class="tjInfo" v-for="(item,index) in jobProgressList" :key="item.id" @click="jobProgress(item,index,'zzl')" :class="{active:jobActive == index || brdName == item.label || potName == item.label || mnfBl == item.label}">
                               <view class="label">{{ item.label }}</view>
 							  <lx-progress-bar title="" :total="item.totalProgress" :firstValue="item.progress"
 							  contentColor="#0067CF"
@@ -291,7 +291,7 @@
 								<p>已装船:<text>{{ item.progress }}</text></p>
 								<p style="margin-left: 16px;">待卸船:<text>{{ item.totalProgress - item.progress }}</text></p>
 							  </view>
-							  <view class="imgBox" v-if="jobActive == index || brdName == item.label">
+							  <view class="imgBox" v-if="jobActive == index || brdName == item.label || potName == item.label || mnfBl == item.label">
 								<image src="../../static/images/tjxz2.png" mode=""></image>
 							  </view>
 							</view>
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 70ddceb..efb8c4c 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -317,6 +317,9 @@
                 this.operationDate = ''
 				this.startDate = ''
 				this.endDate = ''
+				this.oneFlag = false
+				this.twoFlag = false
+				this.threeFlag = false
 			},
 			// 筛选确认
 			confirm() {
diff --git a/pages/index/instruct.vue b/pages/index/instruct.vue
index 3283cc7..e48f166 100644
--- a/pages/index/instruct.vue
+++ b/pages/index/instruct.vue
@@ -88,7 +88,7 @@
 							 </template>
 							</template>
 							<template v-else>
-							<view class="tjInfo" v-for="(item,index) in jobProgressList" :key="item.id" @click="jobProgress(item,index,'zzl')" :class="{active:jobActive == index || brdName == item.label}">
+							<view class="tjInfo" v-for="(item,index) in jobProgressList" :key="item.id" @click="jobProgress(item,index,'zzl')" :class="{active:jobActive == index || brdName == item.label || potName == item.label || mnfBl == item.label}">
                               <view class="label">{{ item.label }}</view>
 							  <lx-progress-bar title="" :total="item.totalProgress" :firstValue="item.progress"
 							  contentColor="#0067CF"
@@ -97,7 +97,7 @@
 								<p>已装船:<text>{{ item.progress }}</text></p>
 								<p style="margin-left: 16px;">待卸船:<text>{{ item.totalProgress - item.progress }}</text></p>
 							  </view>
-							  <view class="imgBox" v-if="jobActive == index || brdName == item.label">
+							  <view class="imgBox" v-if="jobActive == index || brdName == item.label || potName == item.label || mnfBl == item.label">
 								<image src="../../static/images/tjxz2.png" mode=""></image>
 							  </view>
 							</view>
@@ -285,7 +285,7 @@
 							 </template>
 						    </template>
 							<template v-else>
-							<view class="tjInfo" v-for="(item,index) in jobProgressList" :key="item.id" @click="jobProgress(item,index,'fzl')" :class="{active:jobActive == index || brdName == item.label}">
+							<view class="tjInfo" v-for="(item,index) in jobProgressList" :key="item.id" @click="jobProgress(item,index,'zzl')" :class="{active:jobActive == index || brdName == item.label || potName == item.label || mnfBl == item.label}">
                               <view class="label">{{ item.label }}</view>
 							  <lx-progress-bar title="" :total="item.totalProgress" :firstValue="item.progress"
 							  contentColor="#0067CF"
@@ -294,7 +294,7 @@
 								<p>已装船:<text>{{ item.progress }}</text></p>
 								<p style="margin-left: 16px;">待卸船:<text>{{ item.totalProgress - item.progress }}</text></p>
 							  </view>
-							  <view class="imgBox" v-if="jobActive == index || brdName == item.label">
+							  <view class="imgBox" v-if="jobActive == index || brdName == item.label || potName == item.label || mnfBl == item.label">
 								<image src="../../static/images/tjxz2.png" mode=""></image>
 							  </view>
 							</view>
@@ -467,7 +467,7 @@
 							 </view>
 						    </view>
 							<template>
-							<view class="tjInfo" v-for="(item,index) in jobProgressList" :key="item.id" @click="jobProgress(item,index)" :class="{active:jobActive == index || brdName == item.label}">
+							<view class="tjInfo" v-for="(item,index) in jobProgressList" :key="item.id" @click="jobProgress(item,index,'zzl')" :class="{active:jobActive == index || brdName == item.label || potName == item.label || mnfBl == item.label}">
                               <view class="label">{{ item.label }}</view>
 							  <lx-progress-bar title="" :total="item.totalProgress" :firstValue="item.progress"
 							  contentColor="#0067CF"
@@ -476,7 +476,7 @@
 								<p>已装船:<text>{{ item.progress }}</text></p>
 								<p style="margin-left: 16px;">待卸船:<text>{{ item.totalProgress - item.progress }}</text></p>
 							  </view>
-							  <view class="imgBox" v-if="jobActive == index || brdName == item.label">
+							  <view class="imgBox" v-if="jobActive == index || brdName == item.label || potName == item.label || mnfBl == item.label">
 								<image src="../../static/images/tjxz2.png" mode=""></image>
 							  </view>
 							</view>
@@ -1977,7 +1977,7 @@
 			   this.itemList = []
 			   if(type == 'zzl') {
 				this.loadSumOrder()
-			   } else if(type == 'fzl') {
+			   } else if(type == 'fzl' || type =='bzz') {
                  this.loadOtherOrder()
 			   }
 			},