From e5872f3c05e1e3e88c1ad7eebcc94b61e653e7c5 Mon Sep 17 00:00:00 2001
From: wuwx <1960@qq.com>
Date: Fri, 31 May 2024 16:53:04 +0800
Subject: [PATCH] =?UTF-8?q?uat=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json                     |   2 +-
 pages/index/instruct.vue          |  81 +++++++-------
 pages/quality/edit.vue            |  61 +++++++---
 pages/receipt/details.vue         |   6 +-
 pages/shipWork/abnormalSign.vue   |   4 +-
 pages/shipWork/index.vue          |  13 ++-
 pages/shipWork/mafiSign.vue       |   4 +-
 pages/shipWork/mixSign.vue        | 178 +++++++++++++++++++-----------
 pages/shipWork/mixWork.vue        |  25 +++--
 pages/shipWork/noticeSign.vue     |   4 +-
 pages/shipWork/opinionAdd.vue     |   8 ++
 pages/shipWork/opinionSign.vue    |   6 +-
 pages/shipWork/peopleAdd.vue      | 117 ++++++++++----------
 pages/shipWork/shiftAdd.vue       |  99 +++++++++++------
 pages/shipWork/supplySign.vue     |   2 +-
 pages/shipWork/untieSign.vue      |   2 +-
 pages/shipWork/workAssignAdd.vue  |   6 +
 pages/shipWork/workAssignSign.vue |   2 +-
 18 files changed, 382 insertions(+), 238 deletions(-)

diff --git a/manifest.json b/manifest.json
index e45aeb0..56e7349 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
     "name" : "海通Pad",
     "appid" : "__UNI__F864E80",
     "description" : "",
-    "versionName" : "1.0.5",
+    "versionName" : "1.0.7",
     "versionCode" : "100",
     "transformPx" : false,
     /* 5+App特有相关 */
diff --git a/pages/index/instruct.vue b/pages/index/instruct.vue
index 9ff2411..04a8a40 100644
--- a/pages/index/instruct.vue
+++ b/pages/index/instruct.vue
@@ -64,7 +64,7 @@
 									contentColor2="#FC4F00" />
 								<view class="bottomInfo">
 									<p>已发送<text>{{zTjList.totalSentCount}}</text></p>
-									<p>(暂停<text>{{zTjList.totalPausedSentCount}}</text>)</p>
+									<!-- <p>(暂停<text>{{zTjList.totalPausedSentCount}}</text>)</p> -->
 									<p>未发<text>{{zTjList.totalNotSentCount}}</text></p>
 								</view>
 								<view class="imgBox" v-if="zTjType">
@@ -82,7 +82,7 @@
 							 		contentColor2="#FC4F00" backColor="#f2f2f2" />
 							 	<view class="bottomInfo">
 							 		<p>已发送<text>{{item.totalSentCount}}</text></p>
-							 		<p>(暂停<text>{{item.totalPausedSentCount}}</text>)</p>
+							 		<!-- <p>(暂停<text>{{item.totalPausedSentCount}}</text>)</p> -->
 							 		<p>未发<text>{{item.totalNotSentCount}}</text></p>
 							 	</view>
 							 	<view class="imgBox" v-if="zTjActive == index">
@@ -324,7 +324,7 @@
 									contentColor="#0067CF" contentColor2="#FC4F00" />
 								<view class="bottomInfo">
 									<p>已发送<text>{{zTjList.branchSentCount}}</text></p>
-									<p>(暂停<text>{{zTjList.branchPausedSentCount}}</text>)</p>
+									<!-- <p>(暂停<text>{{zTjList.branchPausedSentCount}}</text>)</p> -->
 									<p>未发<text>{{zTjList.branchNotSentCount}}</text></p>
 								</view>
 								<view class="imgBox" v-if="zTjType">
@@ -342,7 +342,7 @@
 							 		contentColor2="#FC4F00" backColor="#f2f2f2" />
 							 	<view class="bottomInfo">
 							 		<p>已发送<text>{{item.branchSentCount}}</text></p>
-							 		<p>(暂停<text>{{item.branchPausedSentCount}}</text>)</p>
+							 		<!-- <p>(暂停<text>{{item.branchPausedSentCount}}</text>)</p> -->
 							 		<p>未发<text>{{item.branchNotSentCount}}</text></p>
 							 	</view>
 							 	<view class="imgBox" v-if="zTjActive == index">
@@ -739,18 +739,19 @@
 											<view class="testLine" v-for="item2 in item.shipSpace" :key="item2"
 												:style="{height:item.maxHeight+'px'}">
 											</view>
-											<view class="myArrList">
-												<view class="arrItem" @click="showItemDialog(item3)"
-													v-for="(item3, index3) in goodsInfo[index].stowageList"
-													:key="index3" :style="getDynamicStyle(item3, item.shipSpace)">
-													<zb-tooltip placement="bottom-start" color="white"
-														:visible.sync="item3.isShow">
-														<text style="margin-left: 5px;">{{item3.stowageNo}}</text>
-														<text style="margin-left: 5px;">{{item3.potName}}</text>
-														<text
-															v-if="item3.transitPortName != null && item3.transitPortName != ''">({{item3.transitPortName}})</text>
-														<text style="margin-left: 5px;">{{item3.amount}}</text>
-														<view slot="content">
+											<template v-if="goodsInfo.length && goodsInfo.length > 0">
+											 <view class="myArrList">
+											 	<view class="arrItem" @click="showItemDialog(item3)"
+											 		v-for="(item3, index3) in goodsInfo[index].stowageList"
+											 		:key="index3" :style="getDynamicStyle(item3, item.shipSpace)">
+											 		<zb-tooltip placement="bottom-start" color="white"
+											 			:visible.sync="item3.isShow">
+											 			<text style="margin-left: 5px;">{{item3.stowageNo}}</text>
+											 			<text style="margin-left: 5px;">{{item3.potName}}</text>
+											 			<text
+											 				v-if="item3.transitPortName != null && item3.transitPortName != ''">({{item3.transitPortName}})</text>
+											 			<text style="margin-left: 5px;">{{item3.amount}}</text>
+											 			<view slot="content">
 															<view class="tipBox">
 																<p style="color: #000;">
 																	<text
@@ -763,10 +764,11 @@
 																		{{item3.amount}}</text>
 																</p>
 															</view>
-														</view>
-													</zb-tooltip>
-												</view>
-											</view>
+											 			</view>
+											 		</zb-tooltip>
+											 	</view>
+											 </view>
+											</template>
 											<!-- <canvas class="mycanvas" :canvas-id="'mycanvas' + index" @:data-id="index"
 												@click="handleClick" :style="{height:item.maxHeight+'px'}"></canvas> -->
 										</view>
@@ -798,12 +800,13 @@
 		                            {{ item.shipSpace - index + 1 }}
 								 </view>
 							    </view>
-
+							   <template v-if="goodsInfo.length && goodsInfo.length > 0">
 								<view class="tableHead" @click="clickShow(item)">
 									<text>{{item.shipDecks}}层明细({{goodsInfo[index].stowageList.length}})</text>
 									<p v-if="item.isShow">折叠</p>
 									<p v-if="!item.isShow">展开</p>
 								</view>
+							   </template>
 								<view class="tableBox">
 									<uni-table stripe emptyText="暂无更多数据" v-if="item.isShow">
 										<!-- 表头行 -->
@@ -1294,7 +1297,7 @@
 					})
 				}
 			})
-			this.getQueryCheckRecord(0) // 获取勾选
+			// this.getQueryCheckRecord(0) // 获取勾选
 			// if (this.tabsValue == 0) {
 			// 	this.loadSumOrder() // 总指令：分页查询
 			// 	this.askDisabled = false
@@ -1308,16 +1311,20 @@
 			this.getPotList()
 			this.getImgInfo()
 			this.getGoodsInfo()
-			this.getJobProgress() //获取卸船进度数据
-			this.getCheckReaDots() //获取红点
-			this.getTotalProgress() //获取装船总进度
+			// this.getJobProgress() //获取卸船进度数据
+			// this.getCheckReaDots() //获取红点
+			// this.getTotalProgress() //获取装船总进度
 		},
 		mounted () {
+			this.getQueryCheckRecord(0) // 获取勾选
 			if (this.tabsValue == 0) {
 				this.loadSumOrder() // 总指令：分页查询
 				this.askDisabled = false
 			}
 			this.getStatistics() // 获取统计数据
+			this.getJobProgress() //获取卸船进度数据
+			this.getCheckReaDots() //获取红点
+			this.getTotalProgress() //获取装船总进度
 		},
 		components: {
 			HeadView,
@@ -1502,7 +1509,7 @@
 							let fsum = v.branchSentCount + v.branchNotSentCount
 							this.$set(v, "fsum", fsum)
 						})
-						console.log(this.zTjList)
+						// console.log(this.zTjList)
 					}
 				})
 			},
@@ -1562,7 +1569,7 @@
 							v.flag = false
 							// this.getBottomInfo(v.lwpId, index)
 						})
-						console.log(this.itemList)
+						// console.log(this.itemList)
 					}
 				})
 			},
@@ -1588,7 +1595,7 @@
 							})
 						})
 						this.$set(this.itemList[index], 'infoList', arr)
-						console.log('res.data.data',res.data.data);
+						// console.log('res.data.data',res.data.data);
 					}
 				})
 			},
@@ -1684,7 +1691,7 @@
 			},
 			// 指令下发确认
 			zlConfirm() {
-				console.log(this.directorTrue)
+				// console.log(this.directorTrue)
 				if (this.directorTrue.length > 0) {
 					let lwpIdList = []
 					if (this.tabsValue == 0) {
@@ -1710,7 +1717,7 @@
 							method: 'POST', //请求方式，必须为大写
 							success: (res) => {
 								this.$refs.popup.close()
-								console.log('res',res);
+								// console.log('res',res);
 								if (res.data.status == 200 || res.data.data) {
 									this.itemList = []
 									this.current = 1
@@ -1784,7 +1791,7 @@
 							},
 							method: 'PUT', //请求方式，必须为大写
 							success: (res) => {
-								console.log(res)
+								// console.log(res)
 								if (res.data.status == 200) {
 									this.itemList = []
 									this.current = 1
@@ -1888,7 +1895,7 @@
 					},
 					method: 'PUT', //请求方式，必须为大写
 					success: (res) => {
-						console.log(res)
+						// console.log(res)
 						if (res.data.status == 200) {
 							this.initAsk()
 							uni.showToast({
@@ -2111,7 +2118,7 @@
 					success: (res) => {
 						if (res.data.status == "200") {
 							this.goodsInfo = res.data.data
-							console.log(this.goodsInfo)
+							// console.log(this.goodsInfo)
 							if (this.imgInfo.whetherNormal == "0") {
 								this.goodsInfo.reverse()
 							}
@@ -2169,7 +2176,7 @@
 			// 	ctx.draw();
 			// },
 			showItemDialog(item) {
-				console.log(item);
+				// console.log(item);
 			},
 			getDynamicStyle(item, sum) {
 				// 计算宽高\\
@@ -2232,7 +2239,7 @@
 					method: 'GET', //请求方式，必须为大写
 					success: (res) => {
 						if (res.statusCode == 200) {
-							console.log(res)
+							// console.log(res)
 							// this.qyList = res.data.data.records
 							// this.qyList.forEach(v => {
 							// 	if (v.remainSeatAmout == null) {
@@ -2261,7 +2268,7 @@
 							// })
 							this.qyList = res.data.data
 
-							console.log(this.qyList)
+							// console.log(this.qyList)
 						}
 					}
 				})
@@ -2444,7 +2451,7 @@
 			},
 			// 班组长打开弹框
 			openPOP(item) {
-				console.log(item);
+				// console.log(item);
 				this.bzzPOPList = []
 				this.bzzPOPList.push(item)
 				this.$refs.bzzPOP.open()
diff --git a/pages/quality/edit.vue b/pages/quality/edit.vue
index 929f045..cb2d642 100644
--- a/pages/quality/edit.vue
+++ b/pages/quality/edit.vue
@@ -65,7 +65,8 @@
 							<image src="../../static/images/sys.png" mode="" @click="getInfo"></image>
 						</view>
 						<view class="li textRight">
-							<p class="liTitle">船名/航次:<text class="required">*</text></p>
+							<!-- <p class="liTitle">船名/航次:<text class="required">*</text></p> -->
+							<p class="liTitle">船名/航次:</p>
 							<superwei-combox class="select" :candidates="shipList" :isJSON="true" keyName="vvyShip"
 								placeholder="请选择船名/航次" v-model="vvyShip" @select="shipChange"></superwei-combox>
 						</view>
@@ -182,7 +183,10 @@
 				<template v-if="active == 3">
 					<view class="blockBox signBox">
 						<view class="flexLi">
-							<p class="title">质损负责人:</p>
+							<p class="title">质损责任方:</p>
+							<uni-data-select v-model="qdResponsibleParty" :localdata="qdResponsiblePartyList" @change="qdChange"
+								placeholder="请选择质损责任方"></uni-data-select>
+							<p class="title">责任人:</p>
 							<uni-easyinput class="inputBox" v-model="director" placeholder="请输入" @focus="inputFocus"
 								@blur="inputBlur"></uni-easyinput>
 						</view>
@@ -359,7 +363,10 @@
 
 				lotusLoadingData: {
 					isShow: false //设置显示加载中组件true显示false隐藏
-				}
+				},
+				//质损责任方
+				qdResponsiblePartyList:[],
+				qdResponsibleParty:'1'
 			}
 		},
 		components: {
@@ -409,7 +416,7 @@
 			this.getCheck()
 			this.getCheck2()
 			this.getCheck3()
-			let that = this
+			this.getCheck4()
 			if (this.type == 'edit') {
 				this.getRowInfo()
 			}
@@ -548,6 +555,7 @@
 							})
 							this.other3 = this.infoData.dpsOther // 处置情况其他
 							this.director = this.infoData.qdLiablePerson // 质损负责人
+							this.qdResponsibleParty = this.infoData.qdResponsibleParty //质损责任方
 							this.ygqId = this.infoData.ygqId // 质量id
 							this.vinDisabled = true // 车架号输入禁用
 						}
@@ -1093,6 +1101,9 @@
 					}
 				})
 			},
+			qdChange(e) {
+			   this.qdResponsibleParty = e
+			},
 			// 质损日期
 			dateChange(e) {
 				this.zsDate = e
@@ -1218,6 +1229,27 @@
 					}
 				})
 			},
+			// 获取枚举(质损责任方)
+			getCheck4 () {
+				uni.request({
+					url: this.$local + '/api/miniapp/typeRef/domain/QD_RESPONSIBLE_PARTY',
+					header: {
+						'Content-Type': 'application/json', //自定义请求头信息
+						'Authorization': `Bearer ${this.loginObj.access_token}`
+					},
+					method: 'GET', //请求方式，必须为大写
+					success: (res) => {
+						if (res.data.status == 200) {
+							res.data.data.forEach(v => {
+								this.qdResponsiblePartyList.push({
+									value: v.ptrCode,
+									text: v.ptrDesc
+								})
+							})
+						}
+					}
+				})
+			},
 			// 上传板车照片
 			select(e) {
 				this.lotusLoadingData.isShow = true
@@ -1375,14 +1407,14 @@
 					})
 					return
 				}
-				if(!this.vvyShip) {
-					uni.showModal({
-						title: '提示',
-						showCancel: false,
-						content: '请输入船名/航次！'
-					})
-					return
-				}
+				// if(!this.vvyShip) {
+				// 	uni.showModal({
+				// 		title: '提示',
+				// 		showCancel: false,
+				// 		content: '请输入船名/航次！'
+				// 	})
+				// 	return
+				// }
                 if(!this.carId) {
 					uni.showModal({
 						title: '提示',
@@ -1548,6 +1580,7 @@
 					"yardName": this.yardName, // 堆场
 					"ygqId": this.ygqId, // 质量id
 					"vinCode": this.carValue, // 车架号
+					"qdResponsibleParty":this.qdResponsibleParty,//质损责任方
 				}
 				console.log(editReqDTO)
 				uni.request({
@@ -1732,7 +1765,9 @@
 				margin-bottom: 16px;
 				padding-bottom: 12px;
 				border-bottom: 1px solid #EEEEEE;
-
+            /deep/ .uni-select {
+				width: 340px;
+			}
 				p {
 					line-height: 36px;
 					margin-right: 5px;
diff --git a/pages/receipt/details.vue b/pages/receipt/details.vue
index 15c17cb..6bdfa32 100644
--- a/pages/receipt/details.vue
+++ b/pages/receipt/details.vue
@@ -84,7 +84,7 @@
 						<p>Yard staff:</p>
 					</view>
 					<view class="signInfo" v-if="shipInfo.yardSignUrl == null" @click="toSign('0')">
-						去签名
+						去签名/Signature
 					</view>
 					<view class="signImg" v-else>
 						<image :src="yardSignUrl" mode=""></image>
@@ -97,7 +97,7 @@
 						<p>tally clerk:</p>
 					</view>
 					<view class="signInfo" v-if="shipInfo.tallySignUrl == null" @click="toSign('1')">
-						去签名
+						去签名/Signature
 					</view>
 					<view class="signImg" v-else>
 						<image :src="tallySignUrl" mode=""></image>
@@ -109,7 +109,7 @@
 						<p>the ship:</p>
 					</view>
 					<view class="signInfo" v-if="shipInfo.shipSignUrl == null" @click="toSign('2')">
-						去签名
+						去签名/Signature
 					</view>
 					<view class="signImg" v-else>
 						<image :src="shipSignUrl" mode=""></image>
diff --git a/pages/shipWork/abnormalSign.vue b/pages/shipWork/abnormalSign.vue
index 7388918..451cf68 100644
--- a/pages/shipWork/abnormalSign.vue
+++ b/pages/shipWork/abnormalSign.vue
@@ -91,7 +91,7 @@
 								<p>Foreman:</p>
 							</view>
 							<view class="signInfo" v-if="zdySign.url == ''" @click="togoSign('0')">
-								去签名
+								去签名/Signature
 							</view>
 							<view class="signImg" v-else @click="togoSign('0')">
 								<image :src="zdySign.url"></image>
@@ -104,7 +104,7 @@
 								<p>Capt/Chief Mate:</p>
 							</view>
 							<view class="signInfo" v-if="czSign.url == ''" @click="togoSign('1')">
-								去签名
+								去签名/Signature
 							</view>
 							<view class="signImg" v-else @click="togoSign('1')">
 								<image :src="czSign.url"></image>
diff --git a/pages/shipWork/index.vue b/pages/shipWork/index.vue
index a81247c..6dbcfad 100644
--- a/pages/shipWork/index.vue
+++ b/pages/shipWork/index.vue
@@ -579,6 +579,15 @@
 										})
 									 })
 									})
+									// 计划车辆数，计划备件数
+									this.downloadData.vvyIdPlanNumber.forEach(v => {
+										this.optionData.push({
+											dictionariesName: "vvyIdPlanNumber",
+											ptrCode: '',
+											ptrDesc: v.planAmount,  //计划车辆数
+											ptrEnDesc:v.planParts  //计划备件数
+										})
+									})
 
 									// 存下拉到数据库
 									this.xlData(item.vtpId)
@@ -1248,11 +1257,12 @@
 		.itemList {
 			width: 100%;
 			display: flex;
-			justify-content: space-between;
+			// justify-content: space-between;
 			flex-wrap: wrap;
 			padding: 16px;
 			margin-top: 40px;
 			padding-bottom: 50px;
+			padding-right: 0px;
 
 			/deep/.o-empty {
 				width: 100%;
@@ -1266,6 +1276,7 @@
 				border-radius: 8px;
 				padding: 16px;
 				position: relative;
+				margin-right: 8px;
 
 				.title {
 					display: flex;
diff --git a/pages/shipWork/mafiSign.vue b/pages/shipWork/mafiSign.vue
index 93312fe..a77f407 100644
--- a/pages/shipWork/mafiSign.vue
+++ b/pages/shipWork/mafiSign.vue
@@ -72,7 +72,7 @@
 							<p>Signature of Foreman:</p>
 						</view>
 						<view class="signInfo" v-if="zdySign.url == ''" @click="togoSign('0')">
-							去签名
+							去签名/Signature
 						</view>
 						<view class="signImg" v-else @click="togoSign('0')">
 							<image :src="zdySign.url"></image>
@@ -85,7 +85,7 @@
 							<p>Capt/Chief Mate:</p>
 						</view>
 						<view class="signInfo" v-if="czSign.url == ''" @click="togoSign('1')">
-							去签名
+							去签名/Signature
 						</view>
 						<view class="signImg" v-else @click="togoSign('1')">
 							<image :src="czSign.url"></image>
diff --git a/pages/shipWork/mixSign.vue b/pages/shipWork/mixSign.vue
index 96883f6..ed8a2fe 100644
--- a/pages/shipWork/mixSign.vue
+++ b/pages/shipWork/mixSign.vue
@@ -31,30 +31,57 @@
 							</view>
 							<view class="ul">
 								<view class="li">
-									<text>Name of ship:</text><text>{{ shipInfo.vslEnname }}</text>
+									<text>Name of ship:</text>
+									<view class="lineBox">
+										<text>{{ shipInfo.vslEnname }}</text>
+										<view class="line"></view>
+									</view>
 								</view>
 								<view class="li">
-									<text>Voy No:</text><text>{{ vvyName }}</text>
+									<text>Voy No:</text>
+									<view class="lineBox">
+										<text>{{ vvyName }}</text>
+										<view class="line"></view>
+									</view>
 								</view>
 								<view class="li">
-									<text>Weather:</text><text>{{ tqInfo }}</text>
+									<text>Weather:</text>
+									<view class="lineBox">
+										<text>{{ tqInfo }}</text>
+										<view class="line"></view>
+									</view>
 								</view>
 								<view class="li">
-									<text>Date:</text><text>{{ dateId }}</text>
+									<text>Date:</text>
+									<view class="lineBox">
+										<text>{{ dateId }}</text>
+										<view class="line"></view>
+									</view>
 								</view>
 								<view class="li">
-									<text>Gangs:</text><text>{{ zyzsInfo }}</text>
+									<text>Gangs:</text>
+									<view class="lineBox">
+										<text>{{ zyzsInfo }}</text>
+										<view class="line"></view>
+									</view>
 								</view>
 								<view class="li">
-									<text>Foreman:</text><text>{{ dcrsInfo }}</text>
+									<text>Foreman:</text>
+									<view class="lineBox">
+										<text>{{ dcrsInfo }}</text>
+										<view class="line"></view>
+									</view>
 								</view>
 								<!-- <view class="li">
 									<p>Berthed at Haitong:</p><text>{{bwInfo}}</text>
 								</view> -->
 								<view class="li">
 									<text>Foreman Working time:</text>
-									<text v-if="RYSJ.length > 0">{{ RYSJ[0].minStartTime |
-			textFilter }}-{{ RYSJ[0].maxEndTime | textFilter }}</text>
+									<view class="lineBox">
+										<text v-if="peopleList.length > 0">{{ peopleList[0].jobStartTime |
+			textFilter }}-{{ peopleList[0].jobEndTime | textFilter }}</text>
+										<view class="line"></view>
+									</view>
 								</view>
 								<view class="li">
 									<text>Berthed at {{ portInfo }}:</text><text>
@@ -663,7 +690,7 @@
 									<p>Foreman:</p>
 								</view>
 								<view class="signInfo" v-if="zdySign.url == ''" @click="togoSign('0')">
-									去签名
+									去签名/Signature
 								</view>
 								<view class="signImg" v-else @click="togoSign('0')">
 									<image :src="zdySign.url"></image>
@@ -677,7 +704,7 @@
 									<p>Capt/Chief Mate:</p>
 								</view>
 								<view class="signInfo" v-if="czSign.url == ''" @click="togoSign('1')">
-									去签名
+									去签名/Signature
 								</view>
 								<view class="signImg" v-else @click="togoSign('1')">
 									<image :src="czSign.url"></image>
@@ -719,7 +746,7 @@ export default {
 			endTime: "",
 			// 人员信息
 			peopleList: [],
-			peopleArr: [],
+			// peopleArr: [],
 			tqInfo: "",
 			bwArr: [],
 			bwInfo: "",
@@ -755,7 +782,7 @@ export default {
 			delId: "",
 			PTGR: [],
 			JSGR: [],
-			RYSJ: [],
+			// RYSJ: [],
 			carList:[],
 			weatherList:[],
 			portInfo:'',
@@ -827,24 +854,27 @@ export default {
 					that.shiftInfo3.push(v)
 				}
 			})
-
+               console.log('that.peopleList',that.peopleList);
 			that.peopleList.forEach(v => {
-				let endT = v.jobEndTime.slice(0, 10)
-				if (endT == that.dateId) {
-					that.peopleArr.push(v)
-				}
-			})
-			// that.tqInfo = that.peopleArr[0].weatherType
-			that.weatherList.forEach(item => {
-				if(that.peopleArr[0].weatherType == item.ptrDesc) {
-					that.tqInfo = item.ptrEnDesc
-				}
-			})
-			that.peopleArr.forEach(v => {
+				// let endT = v.jobEndTime.slice(0, 10)
+				// if (endT == that.dateId) {
+				// 	that.peopleArr.push(v)
+				// }
 				that.zyzsInfo += Number(v.workSuite)
 				that.dcrsInfo += Number(v.shipPerson)
 				that.bwArr.push(v.bthIdName)
 			})
+			// that.tqInfo = that.peopleArr[0].weatherType
+			that.weatherList.forEach(item => {
+				if(that.peopleList[0]?.weatherType == item.ptrDesc) {
+					that.tqInfo = item.ptrEnDesc
+				}
+			})
+			// that.peopleArr.forEach(v => {
+			// 	that.zyzsInfo += Number(v.workSuite)
+			// 	that.dcrsInfo += Number(v.shipPerson)
+			// 	that.bwArr.push(v.bthIdName)
+			// })
 			that.bwInfo = that.bwArr.join(",")
 		}, 300)
 	},
@@ -913,6 +943,7 @@ export default {
                        ORDER BY start_time ASC;`
 			sqlite.executeSqlCeshi(sql).then((value) => {
 				this.timeArr = value
+				console.log('this.timeArr',this.timeArr);
 				value.forEach((v, index) => {
 					// console.log('v', v);
 					// this.startTime = v.work_shift.split(",")[0]
@@ -934,21 +965,25 @@ export default {
 					let sql4 = `SELECT MIN(startTmPt) AS minStartTimePt,MAX(endTmPt) AS maxEndTimePt,SUM(genNum) AS totalGenNum,SUM(weightPt) AS totalWeightPt,SUM(volumePt) AS totalvolumePt,GROUP_CONCAT(waitRemark, ', ') AS allWaitRemark,GROUP_CONCAT(auxRemark, ', ') AS allAuxRemark
 						 FROM infoRespList WHERE vtpId = '${this.vtpId}' AND startTmPt>='${this.startTime}' AND endTmPt<='${this.endTime}'`
 					this.executeSql4(sql4)
-					let sql5 = `SELECT * FROM messageRespList WHERE messageRespList.jobStartTime>='${this.startTime}' and
-								messageRespList.jobEndTime<'${this.endTime}' and vtpId = '${this.vtpId}'`
-					this.executeSql6(sql5)
+					// let sql5 = `SELECT * FROM messageRespList WHERE messageRespList.jobStartTime>='${this.startTime}' and
+					// 			messageRespList.jobEndTime<'${this.endTime}' and vtpId = '${this.vtpId}'`
+					// this.executeSql6(sql5)
 					// 技术工人查询
 					let sql6 = `SELECT MIN(startTm) AS minStartTime,MAX(endTm) AS maxEndTime,SUM(tecNum) AS totalTecNum,SUM(weight) AS totalWeight,SUM(volume) AS totalvolume,GROUP_CONCAT(waitRemark, ', ') AS allWaitRemark,GROUP_CONCAT(auxRemark, ', ') AS allAuxRemark
 						FROM infoRespList WHERE vtpId = '${this.vtpId}' AND startTm>='${this.startTime}'AND endTm<='${this.endTime}'`
 					this.executeSql7(sql6)
 					// 人员信息作业时间
-					let sql7 = `SELECT MIN(jobStartTime) AS minStartTime,MAX(jobEndTime) AS maxEndTime
-						            FROM messageRespList
-                                    WHERE vtpId = '${this.vtpId}'
-                                    AND jobStartTime>='${this.startTime}'
-                                    AND jobEndTime<='${this.endTime}'`
-					this.executeSql8(sql7)
+					// let sql7 = `SELECT MIN(jobStartTime) AS minStartTime,MAX(jobEndTime) AS maxEndTime
+					// 	            FROM messageRespList
+                    //                 WHERE vtpId = '${this.vtpId}'
+                    //                 AND jobStartTime>='${this.startTime}'
+                    //                 AND jobEndTime<='${this.endTime}'`
+					// this.executeSql8(sql7)
 				})
+				// 人员信息
+				let sql5 = `SELECT * FROM messageRespList WHERE vtpId = '${this.vtpId}'`
+				this.executeSql6(sql5)
+
 				let that = this
 				setTimeout(function () {
 					if (type != 0) {
@@ -1059,17 +1094,17 @@ export default {
 			});
 		},
 		// 人员信息作业时间
-		executeSql8(sql) {
-			sqlite.executeSqlCeshi(sql).then((value) => {
-				// 在resolve时执行的回调函数
-				if (value.length > 0) {
-					this.RYSJ.push(...value)
-				}
-			}).catch((error) => {
-				// 在reject时执行的回调函数
-				console.error(error);
-			});
-		},
+		// executeSql8(sql) {
+		// 	sqlite.executeSqlCeshi(sql).then((value) => {
+		// 		// 在resolve时执行的回调函数
+		// 		if (value.length > 0) {
+		// 			this.RYSJ.push(...value)
+		// 		}
+		// 	}).catch((error) => {
+		// 		// 在reject时执行的回调函数
+		// 		console.error(error);
+		// 	});
+		// },
 		// 查人员信息
 		executeSql6(sql) {
 			sqlite.executeSqlCeshi(sql).then((value) => {
@@ -1157,11 +1192,11 @@ export default {
 			this.fcArr2 = []
 			this.fcArr3 = []
 			this.qtArr = []
-			this.peopleArr = []
-			this.tqInfo = ""
-			this.zyzsInfo = 0
-			this.dcrsInfo = 0
-			this.bwArr = []
+			// this.peopleArr = []
+			// this.tqInfo = ""
+			// this.zyzsInfo = 0
+			// this.dcrsInfo = 0
+			// this.bwArr = []
 			this.shiftInfo1 = []
 			this.shiftInfo2 = []
 			this.shiftInfo3 = []
@@ -1221,23 +1256,23 @@ export default {
 			if (this.qtArr.length == 0) {
 				this.qtArr.push({})
 			}
-			this.peopleList.forEach(v => {
-				let endT = v.jobEndTime.slice(0, 10)
-				if (endT == this.dateId) {
-					this.peopleArr.push(v)
-				}
-			})
-			// this.tqInfo = this.peopleArr[0].weatherType
-			this.weatherList.forEach(item => {
-				if(this.peopleArr[0].weatherType == item.ptrDesc) {
-					this.tqInfo = item.ptrEnDesc
-				}
-			})
-			this.peopleArr.forEach(v => {
-				this.zyzsInfo += Number(v.workSuite)
-				this.dcrsInfo += Number(v.shipPerson)
-				this.bwArr.push(v.bthIdName)
-			})
+			// this.peopleList.forEach(v => {
+			// 	let endT = v.jobEndTime.slice(0, 10)
+			// 	if (endT == this.dateId) {
+			// 		this.peopleArr.push(v)
+			// 	}
+			// })
+			// // this.tqInfo = this.peopleArr[0].weatherType
+			// this.weatherList.forEach(item => {
+			// 	if(this.peopleArr[0].weatherType == item.ptrDesc) {
+			// 		this.tqInfo = item.ptrEnDesc
+			// 	}
+			// })
+			// this.peopleArr.forEach(v => {
+			// 	this.zyzsInfo += Number(v.workSuite)
+			// 	this.dcrsInfo += Number(v.shipPerson)
+			// 	this.bwArr.push(v.bthIdName)
+			// })
 			this.bwInfo = this.bwArr.join(",")
 		},
 		// 点击签名
@@ -1399,6 +1434,15 @@ export default {
 			text:first-child {
 				text-align: right;
 			}
+			.lineBox {
+				width: 150px;
+				text-align: center;
+				.line {
+				  height: 1px;
+				  width: 150px;
+				  background: black;
+			    }
+			}
 		}
 
 		.li:last-child {
diff --git a/pages/shipWork/mixWork.vue b/pages/shipWork/mixWork.vue
index dfe40e5..073e72b 100644
--- a/pages/shipWork/mixWork.vue
+++ b/pages/shipWork/mixWork.vue
@@ -6,7 +6,7 @@
 				<custom-tab-pane label="人员信息" name="c1_1">
 					<view></view>
 					<view class="signBox">
-						<view class="addBtn" @click="add('add')">新增人员</view>
+						<view class="addBtn" v-if="peopleInfo.length == 0" @click="add('add')">新增人员</view>
 						<p class="sign" @click="sign">点击签名</p>
 					</view>
 					<view class="ul">
@@ -56,35 +56,39 @@
 					</view>
 					<view class="ul shiftUl">
 						<template v-if="shiftInfo.length > 0">
-							<view class="li" v-for="(item,index) in shiftInfo[0]" :key="index"
+							<view class="li" v-for="(item,index) in shiftInfo" :key="index"
 								@click="lookShift(index)">
+							 <view v-for="(item1,index1) in item" :key="index1">
+								<template v-if="index1 == 0">
 								<view class="title">
 									<image src="../../static/images/shipWork/hc.png" mode="widthFix"></image>
-									<text>航次：{{item.vvyName}}</text>
+									<text>航次：{{item[index1].vvyName}}</text>
 								</view>
-								<view class="shift" v-for="(item2,index2) in item.shiftArr" :key="index2">
+								<view class="shift" v-for="(item2,index2) in item1.shiftArr" :key="index2">
 									<text>{{item2.pwcTypeName}}</text>
 									<text class="text">开始时间：</text><text class="time">{{item2.workStartTime}}</text>
 									<text class="text">结束时间：</text><text class="time">{{item2.workEndTime}}</text>
 								</view>
-								<view class="status didNot" v-if="item.status == 0 || item.status == 'null'">
+								<view class="status didNot" v-if="item1.status == 0 || item1.status == 'null'">
 									<p>待提交</p>
 								</view>
-								<view class="status didNot" v-if="item.status == 1">
+								<view class="status didNot" v-if="item1.status == 1">
 									<p>待审核</p>
 								</view>
-								<view class="status didNot" v-if="item.status == 2">
+								<view class="status didNot" v-if="item1.status == 2">
 									<p>审批中</p>
 								</view>
-								<view class="status success" v-if="item.status == 3">
+								<view class="status success" v-if="item1.status == 3">
 									<p>审核通过</p>
 								</view>
-								<view class="status fail" v-if="item.status == 4">
+								<view class="status fail" v-if="item1.status == 4">
 									<p>审核驳回</p>
 								</view>
-								<view class="status success" v-if="item.status == 5">
+								<view class="status success" v-if="item1.status == 5">
 									<p>审核通过</p>
 								</view>
+							    </template>
+							  </view>
 							</view>
 						</template>
 						<o-empty v-else height="70vh" bg="#f5f6fa" />
@@ -145,7 +149,6 @@
 								.aId] = [item];
 							return res;
 						}, {}));
-						console.log(this.shiftInfo)
 						this.shiftInfo.forEach(v => {
 							v.forEach(i => {
 								this.$set(i, "shiftArr", [])
diff --git a/pages/shipWork/noticeSign.vue b/pages/shipWork/noticeSign.vue
index 09861c3..210dbc2 100644
--- a/pages/shipWork/noticeSign.vue
+++ b/pages/shipWork/noticeSign.vue
@@ -211,7 +211,7 @@
 								<p>Signature of Foreman:</p>
 							</view>
 							<view class="signInfo" v-if="zdySign.url == ''" @click="togoSign('0')">
-								去签名
+								去签名/Signature
 							</view>
 							<view class="signImg" v-else @click="togoSign('0')">
 								<image :src="zdySign.url"></image>
@@ -224,7 +224,7 @@
 								<p>Captain/Chief officer:</p>
 							</view>
 							<view class="signInfo" v-if="czSign.url == ''" @click="togoSign('1')">
-								去签名
+								去签名/Signature
 							</view>
 							<view class="signImg" v-else @click="togoSign('1')">
 								<image :src="czSign.url"></image>
diff --git a/pages/shipWork/opinionAdd.vue b/pages/shipWork/opinionAdd.vue
index 658ea97..c6646fe 100644
--- a/pages/shipWork/opinionAdd.vue
+++ b/pages/shipWork/opinionAdd.vue
@@ -188,6 +188,14 @@
 					if (v.dictionariesName == 'handTypeList') {
 						zxOption.push(v)
 					}
+					if (v.dictionariesName == 'vvyIdPlanNumber') {
+						  if(this.obj.state == 'add') {
+							this.vehiclesNumber0 = v.ptrDesc
+							this.vehiclesNumber1 = v.ptrDesc
+							this.spareNumber0 = v.ptrEnDesc
+							this.spareNumber1 = v.ptrEnDesc
+						  }
+					}
 				})
 				zxOption.forEach((v, index) => {
 					this.zxList.push({
diff --git a/pages/shipWork/opinionSign.vue b/pages/shipWork/opinionSign.vue
index 02dc61e..1668754 100644
--- a/pages/shipWork/opinionSign.vue
+++ b/pages/shipWork/opinionSign.vue
@@ -169,7 +169,7 @@
 								<p>Captain/Chief Officer:</p>
 							</view>
 							<view class="signInfo" v-if="cfSign.url == ''" @click="togoSign('2')">
-								去签名
+								去签名/Signature
 							</view>
 							<view class="signImg" v-else @click="togoSign('2')">
 								<image :src="cfSign.url"></image>
@@ -182,7 +182,7 @@
 								<p>Signature of Foreman:</p>
 							</view>
 							<view class="signInfo" v-if="zdySign.url == ''" @click="togoSign('0')">
-								去签名
+								去签名/Signature
 							</view>
 							<view class="signImg" v-else @click="togoSign('0')">
 								<image :src="zdySign.url"></image>
@@ -195,7 +195,7 @@
 								<p>Signature of Duty manger:</p>
 							</view>
 							<view class="signInfo" v-if="czSign.url == ''" @click="togoSign('1')">
-								去签名
+								去签名/Signature
 							</view>
 							<view class="signImg" v-else @click="togoSign('1')">
 								<image :src="czSign.url"></image>
diff --git a/pages/shipWork/peopleAdd.vue b/pages/shipWork/peopleAdd.vue
index ce8157f..6867aea 100644
--- a/pages/shipWork/peopleAdd.vue
+++ b/pages/shipWork/peopleAdd.vue
@@ -305,65 +305,68 @@
 			},
 			// 作业时间
 			changeLog(e) {
-				this.lotusLoadingData.isShow = true
-				// 选择开始结束时间时分
-				let sTime = e[0].slice(e[0].length - 5)
-				let eTime = e[1].slice(e[1].length - 5)
-				// 获取开始结束时间年月日
-				let sYMD = e[0].split(' ')[0]
-				let eYMD = e[1].split(' ')[0]
-				// 获取开始结束时间时分转数字
-				let nsTime = Number((sTime.split(':')).join(''))
-				let neTime = Number((eTime.split(':')).join(''))
-				// 获取限定范围开始结束时间时分转数字
-				let xsTime = Number((this.beginDate.split(':')).join(''))
-				let xeTime = Number((this.endDate.split(':')).join(''))
+				this.datetime = e
+				this.startTime = e[0]
+				this.endTime = e[1]
+				// this.lotusLoadingData.isShow = true
+				// // 选择开始结束时间时分
+				// let sTime = e[0].slice(e[0].length - 5)
+				// let eTime = e[1].slice(e[1].length - 5)
+				// // 获取开始结束时间年月日
+				// let sYMD = e[0].split(' ')[0]
+				// let eYMD = e[1].split(' ')[0]
+				// // 获取开始结束时间时分转数字
+				// let nsTime = Number((sTime.split(':')).join(''))
+				// let neTime = Number((eTime.split(':')).join(''))
+				// // 获取限定范围开始结束时间时分转数字
+				// let xsTime = Number((this.beginDate.split(':')).join(''))
+				// let xeTime = Number((this.endDate.split(':')).join(''))
 
-				let that = this
+				// let that = this
 
-				if (sYMD != eYMD) {
-					if (nsTime >= xsTime && neTime <= xeTime) {
-						that.datetime = e
-						that.startTime = e[0]
-						that.endTime = e[1]
-					} else {
-						that.datetime = ["", ""]
-						that.startTime = ""
-						that.endTime = ""
-						that.flag = false
-						setTimeout(function() {
-							that.flag = true
-							that.lotusLoadingData.isShow = false
-						}, 200)
-						uni.showToast({
-							title: `请输入正确的作业时间范围`,
-							icon: 'none',
-							duration: 2000
-						})
-					}
-				} else {
-					if (neTime <= xeTime) {
-						that.flag = true
-						that.datetime = e
-						that.startTime = e[0]
-						that.endTime = e[1]
-						that.lotusLoadingData.isShow = false
-					} else {
-						that.datetime = ["", ""]
-						that.startTime = ""
-						that.endTime = ""
-						that.flag = false
-						setTimeout(function() {
-							that.flag = true
-							that.lotusLoadingData.isShow = false
-						}, 200)
-						uni.showToast({
-							title: `请输入正确的作业时间范围`,
-							icon: 'none',
-							duration: 2000
-						})
-					}
-				}
+				// if (sYMD != eYMD) {
+				// 	if (nsTime >= xsTime && neTime <= xeTime) {
+				// 		that.datetime = e
+				// 		that.startTime = e[0]
+				// 		that.endTime = e[1]
+				// 	} else {
+				// 		that.datetime = ["", ""]
+				// 		that.startTime = ""
+				// 		that.endTime = ""
+				// 		that.flag = false
+				// 		setTimeout(function() {
+				// 			that.flag = true
+				// 			that.lotusLoadingData.isShow = false
+				// 		}, 200)
+				// 		uni.showToast({
+				// 			title: `请输入正确的作业时间范围`,
+				// 			icon: 'none',
+				// 			duration: 2000
+				// 		})
+				// 	}
+				// } else {
+				// 	if (neTime <= xeTime) {
+				// 		that.flag = true
+				// 		that.datetime = e
+				// 		that.startTime = e[0]
+				// 		that.endTime = e[1]
+				// 		that.lotusLoadingData.isShow = false
+				// 	} else {
+				// 		that.datetime = ["", ""]
+				// 		that.startTime = ""
+				// 		that.endTime = ""
+				// 		that.flag = false
+				// 		setTimeout(function() {
+				// 			that.flag = true
+				// 			that.lotusLoadingData.isShow = false
+				// 		}, 200)
+				// 		uni.showToast({
+				// 			title: `请输入正确的作业时间范围`,
+				// 			icon: 'none',
+				// 			duration: 2000
+				// 		})
+				// 	}
+				// }
 			},
 			// 取消
 			cancel() {
diff --git a/pages/shipWork/shiftAdd.vue b/pages/shipWork/shiftAdd.vue
index 38b0d61..fc1ecf2 100644
--- a/pages/shipWork/shiftAdd.vue
+++ b/pages/shipWork/shiftAdd.vue
@@ -52,7 +52,7 @@
 									<view class="li widthLi">
 										<p class="liTitle"><text class="required">*</text>工班：</p>
 										<uni-data-select v-model="item.gbValue" :localdata="gbList"
-											@change="gbChange(item,index,'left')" placeholder="请选择工班"></uni-data-select>
+											@change="gbChange(item,index,'left')" placeholder="请选择工班" :disabled="true"></uni-data-select>
 									</view>
 									<view class="li widthLi">
 										<p class="liTitle"><text class="required">*</text>作业时间 ：</p>
@@ -135,7 +135,7 @@
 										<p class="liTitle"><text class="required">*</text>工班：</p>
 										<uni-data-select v-model="item.gbValue" :localdata="gbList"
 											@change="gbChange(item,index,'right')"
-											placeholder="请选择工班"></uni-data-select>
+											placeholder="请选择工班" :disabled="true"></uni-data-select>
 									</view>
 									<view class="li widthLi">
 										<p class="liTitle"><text class="required">*</text>作业时间 ：</p>
@@ -991,16 +991,25 @@
 				let sT = Date.parse(item.datetime[0])
 				let eT = Date.parse(item.datetime[1])
 
+                let sYM = item.datetime[0].split(' ')[1].split(':')[0]
+				let eYM = item.datetime[1].split(' ')[1].split(':')[0]
 				// 工班作业时间
 				if (this.active == 0) {
-					if (item.gbValue != "") {
+					// 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) {
 							if (sresDate <= 0 && eresDate >= 0 && eT - sT <= 28800000) {
 								that.flag = true
 								item.startTime = item.datetime[0]
 								item.endTime = item.datetime[1]
+								item.gbTextValue = '一工班'
+								this.gbList.forEach(v => {
+				                	if (v.text == item.gbTextValue) {
+				                		item.gbValue = v.value
+				                	}
+				                })
 								that.lotusLoadingData.isShow = false
 							} else {
 								item.datetime = ["", ""]
@@ -1018,13 +1027,30 @@
 								})
 							}
 						} else {
-							if (item.gbTextValue == "一工班") {
-								if (sresDate >= 0 && eresDate >= 0) {
+							// if (item.gbTextValue == "一工班") {
+								if (sYM <= 14 && sYM >= 6 && eYM <= 14 && eYM >= 6 && eT - sT <= 28800000) {
 									that.flag = true
 									item.startTime = item.datetime[0]
 									item.endTime = item.datetime[1]
+									item.gbTextValue = '二工班'
+								    this.gbList.forEach(v => {
+				                    	if (v.text == item.gbTextValue) {
+				                    		item.gbValue = v.value
+				                    	}
+				                    })
 									that.lotusLoadingData.isShow = false
-								} else {
+								} else if (sYM <= 22 && sYM >= 14 && eYM <= 22 && eYM >= 14 && eT - sT <= 28800000) {
+									that.flag = true
+									item.startTime = item.datetime[0]
+									item.endTime = item.datetime[1]
+									item.gbTextValue = '三工班'
+								    this.gbList.forEach(v => {
+				                    	if (v.text == item.gbTextValue) {
+				                    		item.gbValue = v.value
+				                    	}
+				                    })
+									that.lotusLoadingData.isShow = false
+								}  else {
 									item.datetime = ["", ""]
 									item.startTime = ""
 									item.endTime = ""
@@ -1039,37 +1065,38 @@
 										duration: 2000
 									})
 								}
-							} else {
-								if (sresDate <= 0 && eresDate >= 0) {
-									that.flag = true
-									item.startTime = item.datetime[0]
-									item.endTime = item.datetime[1]
-									that.lotusLoadingData.isShow = false
-								} else {
-									item.datetime = ["", ""]
-									item.startTime = ""
-									item.endTime = ""
-									that.flag = false
-									setTimeout(function() {
-										that.flag = true
-										that.lotusLoadingData.isShow = false
-									}, 200)
-									uni.showToast({
-										title: `请输入正确的工班作业时间范围`,
-										icon: 'none',
-										duration: 2000
-									})
-								}
-							}
+							// } else {
+								// if (sresDate <= 800 && eresDate >= -1600 && eT - sT <= 28800000) {
+								// 	that.flag = true
+								// 	console.log('222');
+								// 	item.startTime = item.datetime[0]
+								// 	item.endTime = item.datetime[1]
+								// 	that.lotusLoadingData.isShow = false
+								// } else {
+								// 	item.datetime = ["", ""]
+								// 	item.startTime = ""
+								// 	item.endTime = ""
+								// 	that.flag = false
+								// 	setTimeout(function() {
+								// 		that.flag = true
+								// 		that.lotusLoadingData.isShow = false
+								// 	}, 200)
+								// 	uni.showToast({
+								// 		title: `请输入正确的工班作业时间范围`,
+								// 		icon: 'none',
+								// 		duration: 2000
+								// 	})
+								// }
+							// }
 						}
-					} else {
-						this.lotusLoadingData.isShow = false
-						uni.showToast({
-							title: `请先选择工班`,
-							icon: 'none',
-							duration: 2000
-						})
-					}
+					// } else {
+						// this.lotusLoadingData.isShow = false
+					// 	uni.showToast({
+					// 		title: `请先选择工班`,
+					// 		icon: 'none',
+					// 		duration: 2000
+					// 	})
+					// }
 				}
 
 				// 获取开始结束时间时分转数字
diff --git a/pages/shipWork/supplySign.vue b/pages/shipWork/supplySign.vue
index 5d59ff5..f36eed3 100644
--- a/pages/shipWork/supplySign.vue
+++ b/pages/shipWork/supplySign.vue
@@ -61,7 +61,7 @@
 								<p>Captain/Chief Officer:</p>
 							</view>
 							<view class="signInfo" v-if="czSign.signFile == ''" @click="togoSign('1')">
-								去签名
+								去签名/Signature
 							</view>
 							<view class="signImg" v-else @click="togoSign('1')">
 								<image :src="czSign.signFile"></image>
diff --git a/pages/shipWork/untieSign.vue b/pages/shipWork/untieSign.vue
index f6eb0c4..210cba3 100644
--- a/pages/shipWork/untieSign.vue
+++ b/pages/shipWork/untieSign.vue
@@ -88,7 +88,7 @@
 								<p>Captain/Chief Officer:</p>
 							</view>
 							<view class="signInfo" v-if="czSign.signFile == ''" @click="togoSign('1')">
-								去签名
+								去签名/Signature
 							</view>
 							<view class="signImg" v-else @click="togoSign('1')">
 								<image :src="czSign.signFile"></image>
diff --git a/pages/shipWork/workAssignAdd.vue b/pages/shipWork/workAssignAdd.vue
index 7f3d968..008b0d9 100644
--- a/pages/shipWork/workAssignAdd.vue
+++ b/pages/shipWork/workAssignAdd.vue
@@ -189,6 +189,12 @@
 					if (v.dictionariesName == 'bthList') {
 						bwOption.push(v)
 					}
+					if (v.dictionariesName == 'vvyIdPlanNumber') {
+						  if(this.obj.state == 'add') {
+							this.vehicleSize = v.ptrDesc
+							this.sparePart = v.ptrEnDesc
+						  }
+					}
 				})
 				bwOption.forEach((v, index) => {
 					this.bwList.push({
diff --git a/pages/shipWork/workAssignSign.vue b/pages/shipWork/workAssignSign.vue
index b622e86..32425ba 100644
--- a/pages/shipWork/workAssignSign.vue
+++ b/pages/shipWork/workAssignSign.vue
@@ -91,7 +91,7 @@
 								<p>Signature of Foreman:</p>
 							</view>
 							<view class="signInfo" v-if="zdySign.signFile == ''" @click="togoSign('0')">
-								去签名
+								去签名/Signature
 							</view>
 							<view class="signImg" v-else @click="togoSign('0')">
 								<image :src="zdySign.signFile"></image>