From 39849edb6d1902db7f5734dd312b12018853db8f Mon Sep 17 00:00:00 2001
From: wuwx <1960@qq.com>
Date: Thu, 13 Jun 2024 14:48:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/instruct.vue    | 21 ++++++++++++++-------
 pages/receipt/details.vue   | 13 +++++++------
 pages/shipWork/shiftAdd.vue |  4 +++-
 3 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/pages/index/instruct.vue b/pages/index/instruct.vue
index 89a0a6d..e6b7edf 100644
--- a/pages/index/instruct.vue
+++ b/pages/index/instruct.vue
@@ -1029,8 +1029,10 @@
 					<view class="popupTitle">
 						装船要求
 					</view>
-					<uni-easyinput type="textarea" v-model="askValue" placeholder="请输入内容..."
-						:disabled="askDisabled"></uni-easyinput>
+					<scroll-view scroll-y="true" style="height: 100%;">
+					 <uni-easyinput type="textarea" v-model="askValue" placeholder="请输入内容..."
+					 	:disabled="askDisabled"></uni-easyinput>
+					</scroll-view>
 					<view class="popupBtn">
 						<view class="btnList" v-if="tabsName == '总指令'">
 							<button class="button" type="default" @click="zcCancel">取 消</button>
@@ -1382,7 +1384,9 @@
 				} else if (this.tabsName == '总指令') {
 					this.loadSumOrder()
 				}
+				this.getStatistics()
 				this.getCheckReaDots()
+				this.getTotalProgress()
 			},
 			// 点击搜索
 			search() {
@@ -1734,6 +1738,7 @@
 									this.loadSumOrder()
 									this.getStatistics()
 									this.getCheckReaDots()
+									this.getTotalProgress()
 									this.checkList = []
 									uni.showToast({
 										title: `总指令下发成功`,
@@ -1766,6 +1771,7 @@
 									this.loadSumOrder()
 									this.getStatistics()
 									this.getCheckReaDots()
+									this.getTotalProgress()
 									this.checkList = []
 									uni.showToast({
 										title: `分指令下发成功`,
@@ -1809,6 +1815,7 @@
 									this.getStatistics()
 									this.checkList = []
 									this.getCheckReaDots()
+									this.getTotalProgress()
 									uni.showToast({
 										title: `重新发送指令成功`,
 										icon: 'success',
@@ -2319,6 +2326,7 @@
 			//点击装船计划
 			jobProgress(item,index,type) {
                this.jobActive = index
+			   this.current = 1
 			   if(this.filterType == 'BRD_TYPE') {
 				this.brdId = item.id
 			    this.brdName = item.label
@@ -2337,7 +2345,7 @@
                  this.loadOtherOrder()
 			   }
 			},
-			// 点击品牌，提单，港口
+			// 点击品牌，提单，港口，舱层
 			clickTab(type) {
 				this.jobActive = null
 				this.brdId = ''
@@ -3576,14 +3584,14 @@
 			}
 			/deep/.is-textarea {
 				width: 77vw;
-				height: 10vh;
+				height: 25vh;
 			}
 			/deep/.uni-easyinput__content-textarea {
-				height: 10vh;
+				height: 25vh;
 			}
 
 			.popupBtn {
-				margin-top: 20px;
+				// margin-top: 20px;
 				padding: 14px 0;
 				display: flex;
 				justify-content: center;
@@ -3611,7 +3619,6 @@
 
 		.popupBox2 {
 			width: 80vw;
-			height: 17vh;
 		}
 
 		// 右侧抽屉筛选
diff --git a/pages/receipt/details.vue b/pages/receipt/details.vue
index 12cd93d..7a63ed0 100644
--- a/pages/receipt/details.vue
+++ b/pages/receipt/details.vue
@@ -165,8 +165,10 @@
 					<view class="popupTitle">
 						备注
 					</view>
-					<uni-easyinput type="textarea" v-model="askValue" placeholder="请输入内容..."
-					></uni-easyinput>
+					<scroll-view scroll-y="true" style="height: 100%;">
+					 <uni-easyinput type="textarea" v-model="askValue" placeholder="请输入内容..."
+					 ></uni-easyinput>
+				    </scroll-view>
 					<view class="popupBtn">
 						<view class="btnList">
 							<button class="button" type="default" @click="zcCancel">取 消</button>
@@ -666,14 +668,14 @@
 			}
 			/deep/.is-textarea {
 				width: 57vw;
-				height: 10vh;
+				height: 25vh;
 			}
 			/deep/.uni-easyinput__content-textarea {
-				height: 10vh;
+				height: 25vh;
 			}
 
 			.popupBtn {
-				margin-top: 20px;
+				// margin-top: 20px;
 				padding: 14px 0;
 				display: flex;
 				justify-content: center;
@@ -700,7 +702,6 @@
 		}
 			.popupBox2 {
 			  width: 60vw;
-			  height: 17vh;
 		    }
 		}
 	}
diff --git a/pages/shipWork/shiftAdd.vue b/pages/shipWork/shiftAdd.vue
index fc1ecf2..ce4ad9f 100644
--- a/pages/shipWork/shiftAdd.vue
+++ b/pages/shipWork/shiftAdd.vue
@@ -998,8 +998,8 @@
 					// if (item.gbValue != "") {
 						let sresDate = api.HMS_daxiao(this.sShiftDate, sTime)
 						let eresDate = api.HMS_daxiao(this.eShiftDate, eTime)
-						console.log(sYM,eYM);
 						if (sYMD != eYMD) {
+						    console.log(sresDate,eresDate);
 							if (sresDate <= 0 && eresDate >= 0 && eT - sT <= 28800000) {
 								that.flag = true
 								item.startTime = item.datetime[0]
@@ -1389,6 +1389,7 @@
 						this.shiftInfoDelList.push(v.webId)
 					})
 					this.shiftInfoDelList = Array.from(new Set(this.shiftInfoDelList))
+					uni.setStorageSync("delSwmIds",this.shiftDelList)
 				}
 				uni.showToast({
 					icon: 'none',
@@ -1415,6 +1416,7 @@
 						this.shiftInfoDelList.push(v.webId)
 					})
 					this.shiftInfoDelList = Array.from(new Set(this.shiftInfoDelList))
+					uni.setStorageSync("delSwmIds",this.shiftDelList)
 				}
 				uni.showToast({
 					icon: 'none',