From 35246b601050e03dbb0e16826646dffab0019a0e Mon Sep 17 00:00:00 2001
From: wuwx <1960@qq.com>
Date: Tue, 2 Apr 2024 18:05:56 +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/quality/edit.vue            |  172 ++-
 pages/shipWork/abnormalSign.vue   |    8 +-
 pages/shipWork/index.vue          |    7 +-
 pages/shipWork/mafi.vue           |    8 +-
 pages/shipWork/mafiAdd.vue        |    2 +-
 pages/shipWork/mafiSign.vue       |    8 +-
 pages/shipWork/mixSign.vue        | 2365 ++++++++++++++++-------------
 pages/shipWork/noticeSign.vue     |    6 +-
 pages/shipWork/opinionSign.vue    |    8 +-
 pages/shipWork/peopleAdd.vue      |   82 +-
 pages/shipWork/shiftAdd.vue       |    2 +-
 pages/shipWork/shiftDetails.vue   |   22 +-
 pages/shipWork/supplyAdd.vue      |   12 +-
 pages/shipWork/supplySign.vue     |    6 +-
 pages/shipWork/untieSign.vue      |    6 +-
 pages/shipWork/workAssignAdd.vue  |    2 +-
 pages/shipWork/workAssignSign.vue |   14 +-
 18 files changed, 1615 insertions(+), 1136 deletions(-)

diff --git a/pages/index/instruct.vue b/pages/index/instruct.vue
index 3c0a6bc..f2c3854 100644
--- a/pages/index/instruct.vue
+++ b/pages/index/instruct.vue
@@ -2697,9 +2697,9 @@
 					.line {
 						position: absolute;
 						width: 850px;
-						height: 95%;
-						top: 5px;
-						left: 168px;
+						height: 90%;
+						top: 10px;
+						left: 58px;
 						display: flex;
 						overflow-y: auto;
 
@@ -2747,9 +2747,9 @@
 				}
 
 				.leftTopImg {
-					transform: rotate(180deg);
-					top: -15px;
-					right: -10px;
+					transform: rotate(90deg);
+					top: -8px;
+					left: -8px;
 				}
 
 				.imgSize2 {
@@ -2758,20 +2758,19 @@
 				}
 
 				.leftBotImg {
-					transform: rotate(-90deg);
-					bottom: -10px;
-					right: -15px;
+					bottom: -8px;
+					left: -3px;
 				}
 
 				.topImg {
 					top: -10px;
-					left: 50%;
+					left: 40%;
 				}
 
 				.botImg {
 					transform: rotate(180deg);
 					bottom: -10px;
-					left: 50%;
+					left: 40%;
 				}
 			}
 
diff --git a/pages/quality/edit.vue b/pages/quality/edit.vue
index a3b1e79..929f045 100644
--- a/pages/quality/edit.vue
+++ b/pages/quality/edit.vue
@@ -10,7 +10,7 @@
 					<view class="blockBox">
 						<view class="formTitle">
 							<image src="../../static/images/goodsImg2.png"></image>
-							<p>质损发生环节</p>
+							<p>质损发生环节<text class="required">*</text></p>
 						</view>
 						<radio-group class="radioList" @change="radioChange">
 							<template v-for="(item, index) in radioList">
@@ -59,32 +59,32 @@
 				<template v-if="active == 1">
 					<view class="blockBox zsInfo">
 						<view class="li">
-							<p class="liTitle">车架号/条形码:</p>
+							<p class="liTitle">车架号/条形码:<text class="required">*</text></p>
 							<uni-easyinput class="inputBox wInput" v-model="carValue" placeholder="请输入车架号/条形码"
 								@blur="carBlur" :disabled="vinDisabled"></uni-easyinput>
 							<image src="../../static/images/sys.png" mode="" @click="getInfo"></image>
 						</view>
 						<view class="li textRight">
-							<p class="liTitle">船名/航次:</p>
+							<p class="liTitle">船名/航次:<text class="required">*</text></p>
 							<superwei-combox class="select" :candidates="shipList" :isJSON="true" keyName="vvyShip"
 								placeholder="请选择船名/航次" v-model="vvyShip" @select="shipChange"></superwei-combox>
 						</view>
 						<view class="li">
-							<p class="liTitle">车型:</p>
+							<p class="liTitle">车型:<text class="required">*</text></p>
 							<uni-data-select v-model="carId" :localdata="carList" @change="carChange"
 								:disabled="carDisabled" placeholder="请选择车型"></uni-data-select>
 						</view>
 						<view class="li">
-							<p class="liTitle">品牌:</p>
+							<p class="liTitle">品牌:<text class="required">*</text></p>
 							<uni-data-select v-model="brandId" :localdata="brandList" @change="brandChange"
 								:disabled="brandDisabled" placeholder="请选择品牌"></uni-data-select>
 						</view>
 						<view class="li">
-							<p class="liTitle">质损时间:</p>
+							<p class="liTitle">质损时间:<text class="required">*</text></p>
 							<uni-datetime-picker type="datetime" v-model="zsDate" @change="dateChange" />
 						</view>
 						<view class="li cwLi">
-							<p class="liTitle">场位:</p>
+							<p class="liTitle">场位:<text class="required">*</text></p>
 							<uni-data-select v-model="yardId" :localdata="yardColumns" @change="yardChange"
 								:disabled="yardDisabled" placeholder="堆场"></uni-data-select>
 							<uni-data-select v-model="storeAreaId" :localdata="storeAreaColumns"
@@ -100,7 +100,7 @@
 					</view>
 					<view class="blockBox">
 						<view class="zsLi">
-							<p class="zsTitle">质损货物品类:</p>
+							<p class="zsTitle">质损货物品类:<text class="required">*</text></p>
 							<radio-group @change="radioChange2" class="radioList2">
 								<label class="radioBox" v-for="(item, index) in radioList2" :key="item.value">
 									<view>
@@ -113,7 +113,7 @@
 								@focus="inputFocus" @blur="inputBlur"></uni-easyinput>
 						</view>
 						<view class="zsLi">
-							<p class="zsTitle">质损概况:</p>
+							<p class="zsTitle">质损概况:<text class="required">*</text></p>
 							<checkbox-group class="radioList2" @change="checkboxChange">
 								<label class="radioBox" v-for="item in checklist" :key="item.value">
 									<view>
@@ -126,7 +126,7 @@
 								@focus="inputFocus" @blur="inputBlur"></uni-easyinput>
 						</view>
 						<view class="zsLi">
-							<p class="zsTitle">损伤情况:</p>
+							<p class="zsTitle">损伤情况:<text class="required">*</text></p>
 							<checkbox-group class="radioList2" @change="checkboxChange2">
 								<label class="radioBox" v-for="item in checklist2" :key="item.value">
 									<view>
@@ -139,7 +139,7 @@
 								@focus="inputFocus" @blur="inputBlur"></uni-easyinput>
 						</view>
 						<view class="zsLi">
-							<p class="zsTitle">处置情况:</p>
+							<p class="zsTitle">处置情况:<text class="required">*</text></p>
 							<checkbox-group class="radioList2" @change="checkboxChange3">
 								<label class="radioBox" v-for="item in checklist3" :key="item.value">
 									<view>
@@ -161,7 +161,7 @@
 					<view class="blockBox">
 						<view class="formTitle tpTitle">
 							<image src="../../static/images/zsIcon.png"></image>
-							<p>质损照片<text>最多9张</text></p>
+							<p>质损照片<text class="required">*</text><text>最多9张</text></p>
 						</view>
 						<view class="picture">
 							<uni-file-picker limit="9" v-model="zsPhoto2" @select="select3"
@@ -171,7 +171,7 @@
 					<view class="blockBox">
 						<view class="formTitle tpTitle">
 							<image src="../../static/images/cjhIcon.png"></image>
-							<p>车架号图片上传<text>最多9张</text></p>
+							<p>车架号图片上传<text class="required">*</text><text>最多9张</text></p>
 						</view>
 						<view class="picture">
 							<uni-file-picker limit="9" v-model="carPhoto2" @select="select4"
@@ -469,7 +469,6 @@
 							} else if (this.current == '其他') {
 								this.isOther = true
 							}
-							console.log('this.radioList',this.radioList,this.infoData.qdLink);
 							this.radioList.forEach(v => {
 								if (v.value == this.infoData.qdLink) {
 									this.currentValue = v.value
@@ -626,8 +625,12 @@
 				this.radioData2 = evt.detail.value
 				let currentIndex = 0
 				for (let i = 0; i < this.radioList2.length; i++) {
+					const item = this.radioList2[i]
 					if (this.radioList2[i].value === evt.detail.value) {
 						currentIndex = i;
+						this.$set(item, 'checked', true)
+					} else {
+						this.$set(item, 'checked', false)
 					}
 				}
 				this.current2 = this.radioList2[currentIndex].name
@@ -1356,6 +1359,143 @@
 			},
 			// 提交
 			save() {
+				if(!this.current) {
+					uni.showModal({
+						title: '提示',
+						showCancel: false,
+						content: '请输入质损发生环节！'
+					})
+					return
+				}
+				if(!this.carValue) {
+					uni.showModal({
+						title: '提示',
+						showCancel: false,
+						content: '请输入车架号/条形码！'
+					})
+					return
+				}
+				if(!this.vvyShip) {
+					uni.showModal({
+						title: '提示',
+						showCancel: false,
+						content: '请输入船名/航次！'
+					})
+					return
+				}
+                if(!this.carId) {
+					uni.showModal({
+						title: '提示',
+						showCancel: false,
+						content: '请输入车型！'
+					})
+					return
+				}
+				if(!this.brandId) {
+					uni.showModal({
+						title: '提示',
+						showCancel: false,
+						content: '请输入品牌！'
+					})
+					return
+				}
+				if(!this.zsDate) {
+					uni.showModal({
+						title: '提示',
+						showCancel: false,
+						content: '请输入质损时间！'
+					})
+					return
+				}
+				if(!this.yardId) {
+					uni.showModal({
+						title: '提示',
+						showCancel: false,
+						content: '请输入堆场！'
+					})
+					return
+				}
+				if(!this.storeAreaId) {
+					uni.showModal({
+						title: '提示',
+						showCancel: false,
+						content: '请输入区域！'
+					})
+					return
+				}
+				if(!this.storeLineId) {
+					uni.showModal({
+						title: '提示',
+						showCancel: false,
+						content: '请输入车道！'
+					})
+					return
+				}
+				if(!this.storeSeatId) {
+					uni.showModal({
+						title: '提示',
+						showCancel: false,
+						content: '请输入车位！'
+					})
+					return
+				}
+				if(!this.current2) {
+					uni.showModal({
+						title: '提示',
+						showCancel: false,
+						content: '请输入质损货物品类！'
+					})
+					return
+				}
+				if(!this.checkData) {
+					uni.showModal({
+						title: '提示',
+						showCancel: false,
+						content: '请输入质损概况！'
+					})
+					return
+				}
+				if(!this.checkData2) {
+					uni.showModal({
+						title: '提示',
+						showCancel: false,
+						content: '请输入损伤情况！'
+					})
+					return
+				}
+				if(!this.checkData3) {
+					uni.showModal({
+						title: '提示',
+						showCancel: false,
+						content: '请输入处置情况！'
+					})
+					return
+				}
+				if(!this.zsPhoto2.length) {
+					uni.showModal({
+						title: '提示',
+						showCancel: false,
+						content: '请上传质损照片！'
+					})
+					return
+				}
+				if(!this.carPhoto2.length) {
+					uni.showModal({
+						title: '提示',
+						showCancel: false,
+						content: '请上传车架号图片！'
+					})
+					return
+				}
+				if(!this.signImg) {
+					uni.showModal({
+						title: '提示',
+						showCancel: false,
+						content: '请签名！'
+					})
+					return
+				}
+
 				if (this.current != '其他') {
 					this.remark = ""
 				} else if (this.current != '客户反馈') {
@@ -1822,5 +1962,9 @@
 				color: #fff;
 			}
 		}
+		.required {
+			color: red;
+			margin-left: 5px;
+		}
 	}
 </style>
\ No newline at end of file
diff --git a/pages/shipWork/abnormalSign.vue b/pages/shipWork/abnormalSign.vue
index 7600d25..7388918 100644
--- a/pages/shipWork/abnormalSign.vue
+++ b/pages/shipWork/abnormalSign.vue
@@ -9,7 +9,7 @@
 						<view class="container">
 							<view class="head">
 								<view class="leftHead">
-									<image id="HT-logo" src="../../static/images/theme/logo.png" mode="widthFix">
+									<image id="HT-logo" src="../../static/images/theme/logo.png" mode="widthFix" />
 								</view>
 								<view class="rightHead">
 									<p>上海海通国际汽车码头有限公司</p>
@@ -32,7 +32,7 @@
 							<view class="ul">
 								<view class="li">
 									<p>船名/Name of Ship:</p>
-									<p>{{shipInfo.vslCnname}}</p>
+									<p>{{shipInfo.vslEnname}}</p>
 								</view>
 								<view class="li">
 									<p>航次/voy No:</p>
@@ -93,7 +93,7 @@
 							<view class="signInfo" v-if="zdySign.url == ''" @click="togoSign('0')">
 								去签名
 							</view>
-							<view class="signImg" v-else>
+							<view class="signImg" v-else @click="togoSign('0')">
 								<image :src="zdySign.url"></image>
 							</view>
 						</view>
@@ -106,7 +106,7 @@
 							<view class="signInfo" v-if="czSign.url == ''" @click="togoSign('1')">
 								去签名
 							</view>
-							<view class="signImg" v-else>
+							<view class="signImg" v-else @click="togoSign('1')">
 								<image :src="czSign.url"></image>
 							</view>
 						</view>
diff --git a/pages/shipWork/index.vue b/pages/shipWork/index.vue
index 50b5a18..fc6f5c5 100644
--- a/pages/shipWork/index.vue
+++ b/pages/shipWork/index.vue
@@ -496,11 +496,12 @@
 										})
 									})
 									// 天气预报
-									this.downloadData.weatherForecastList.forEach(v => {
+									// this.downloadData.weatherForecastList.forEach(v => {
+									this.downloadData.pubTypeWeather.forEach(v => {
 										this.optionData.push({
 											dictionariesName: "weather",
-											ptrCode: v.weatherType,
-											ptrDesc: v.weatherTypeDesc,
+											ptrCode: v.ptrCode,
+											ptrDesc: v.ptrDesc,
 										})
 									})
 									// 工班类型
diff --git a/pages/shipWork/mafi.vue b/pages/shipWork/mafi.vue
index 198887e..c31694e 100644
--- a/pages/shipWork/mafi.vue
+++ b/pages/shipWork/mafi.vue
@@ -15,8 +15,12 @@
 						<view class="liInfo">
 							<p>马菲板号：<text>{{item.mafiBarcode}}</text></p>
 							<p>尺码：<text>{{item.size}}</text></p>
-							<p>类型：<text>{{item.type}}</text></p>
-							<p>装卸方式：<text>{{item.loadType}}</text></p>
+							<p>类型：
+								<text>{{item.type == 'FULL' ? '重板' : '空板'}}</text>
+							</p>
+							<p>装卸方式：
+								<text>{{item.loadType == 'LOAD' ? '装货' : '卸货'}}</text>
+							</p>
 						</view>
 						<view class="status didNot" v-if="item.status == 0 || item.status == 'null'">
 							<p>待提交</p>
diff --git a/pages/shipWork/mafiAdd.vue b/pages/shipWork/mafiAdd.vue
index 9b2d50b..dd506a7 100644
--- a/pages/shipWork/mafiAdd.vue
+++ b/pages/shipWork/mafiAdd.vue
@@ -228,7 +228,7 @@
 					if (v.vvyId == e) {
 						this.importExportFlagName = v.importExportFlagName
 						this.spmTradeName = v.tradeTypeName
-						if (this.importExportFlagName = "进口") {
+						if (this.importExportFlagName == "进口") {
 							this.loadType = "卸货"
 							this.loaderTypeId = "DISC"
 						} else {
diff --git a/pages/shipWork/mafiSign.vue b/pages/shipWork/mafiSign.vue
index 11863ba..93312fe 100644
--- a/pages/shipWork/mafiSign.vue
+++ b/pages/shipWork/mafiSign.vue
@@ -6,7 +6,7 @@
 				<view class="container">
 					<view class="head">
 						<view class="leftHead">
-							<image id="HT-logo" src="../../static/images/theme/logo.png" mode="widthFix">
+							<image id="HT-logo" src="../../static/images/theme/logo.png" mode="widthFix" />
 						</view>
 						<view class="rightHead">
 							<p>上海海通国际汽车码头有限公司</p>
@@ -29,7 +29,7 @@
 					<view class="ul">
 						<view class="li">
 							<p>船名/Name of Ship:</p>
-							<p>{{shipInfo.vslCnname}}</p>
+							<p>{{shipInfo.vslEnname}}</p>
 						</view>
 						<view class="li">
 							<p>航次/voy No:</p>
@@ -74,7 +74,7 @@
 						<view class="signInfo" v-if="zdySign.url == ''" @click="togoSign('0')">
 							去签名
 						</view>
-						<view class="signImg" v-else>
+						<view class="signImg" v-else @click="togoSign('0')">
 							<image :src="zdySign.url"></image>
 						</view>
 					</view>
@@ -87,7 +87,7 @@
 						<view class="signInfo" v-if="czSign.url == ''" @click="togoSign('1')">
 							去签名
 						</view>
-						<view class="signImg" v-else>
+						<view class="signImg" v-else @click="togoSign('1')">
 							<image :src="czSign.url"></image>
 						</view>
 					</view>
diff --git a/pages/shipWork/mixSign.vue b/pages/shipWork/mixSign.vue
index b9ca47b..8fade49 100644
--- a/pages/shipWork/mixSign.vue
+++ b/pages/shipWork/mixSign.vue
@@ -3,7 +3,7 @@
 		<head-view :title="title" url="/pages/shipWork/mixWork"></head-view>
 		<view class="contentFixedr">
 			<custom-tabs type="c1" :value="tabsValue" @change="tabsChange">
-				<custom-tab-pane :label="item.name" v-for="(item,index) in tabsList" :name="'c1_'+index" :key="index">
+				<custom-tab-pane :label="item.name" v-for="(item, index) in tabsList" :name="'c1_' + index" :key="index">
 					<view></view>
 					<view style="padding: 16px; padding-bottom: 0;">
 						<view class="container">
@@ -31,54 +31,60 @@
 							</view>
 							<view class="ul">
 								<view class="li">
-									<text>Name of ship:</text><text>{{shipInfo.vslCnname}}</text>
+									<text>Name of ship:</text><text>{{ shipInfo.vslEnname }}</text>
 								</view>
 								<view class="li">
-									<text>Voy No:</text><text>{{vvyName}}</text>
+									<text>Voy No:</text><text>{{ vvyName }}</text>
 								</view>
 								<view class="li">
-									<text>Weather:</text><text>{{tqInfo}}</text>
+									<text>Weather:</text><text>{{ tqInfo }}</text>
 								</view>
 								<view class="li">
-									<text>Date:</text><text>{{dateId}}</text>
+									<text>Date:</text><text>{{ dateId }}</text>
 								</view>
 								<view class="li">
-									<text>Gangs:</text><text>{{zyzsInfo}}</text>
+									<text>Gangs:</text><text>{{ zyzsInfo }}</text>
 								</view>
 								<view class="li">
-									<text>Foreman:</text><text>{{dcrsInfo}}</text>
+									<text>Foreman:</text><text>{{ dcrsInfo }}</text>
 								</view>
 								<!-- <view class="li">
 									<p>Berthed at Haitong:</p><text>{{bwInfo}}</text>
 								</view> -->
 								<view class="li">
-									<text>Foreman Working time:</text><text>{{RYSJ[0].minStartTime | textFilter}}-{{RYSJ[0].maxEndTime | textFilter}}</text>
+									<text>Foreman Working time:</text><text>{{ RYSJ[0].minStartTime |
+			textFilter }}-{{ RYSJ[0].maxEndTime | textFilter }}</text>
 								</view>
 								<view class="li">
 									<text>Berthed at Haitong:</text><text>
 										<checkbox-group>
 											<label>
 												1
-												<checkbox style="margin: 0 10px 0 5px" value="cb" :checked="bwInfo == '一泊位'" />
+												<checkbox style="margin: 0 10px 0 5px" value="cb"
+													:checked="bwInfo == '一泊位'" />
 											</label>
 											<label>
 												2
-												<checkbox style="margin: 0 10px 0 5px" value="cb" :checked="bwInfo == '二泊位'" />
+												<checkbox style="margin: 0 10px 0 5px" value="cb"
+													:checked="bwInfo == '二泊位'" />
 											</label>
 											<label>
 												3
-												<checkbox style="margin: 0 10px 0 5px" value="cb" :checked="bwInfo == '三泊位'" />
+												<checkbox style="margin: 0 10px 0 5px" value="cb"
+													:checked="bwInfo == '三泊位'" />
 											</label>
 											<label>
 												4
-												<checkbox style="margin: 0 10px 0 5px" value="cb" :checked="bwInfo == '四泊位'" />
+												<checkbox style="margin: 0 10px 0 5px" value="cb"
+													:checked="bwInfo == '四泊位'" />
 											</label>
 											<label>
 												5
-												<checkbox style="margin: 0 10px 0 5px" value="cb" :checked="bwInfo == '五泊位'" />
+												<checkbox style="margin: 0 10px 0 5px" value="cb"
+													:checked="bwInfo == '五泊位'" />
 											</label>
 										</checkbox-group>
-										</text>
+									</text>
 								</view>
 							</view>
 							<view class="rowOne">
@@ -124,22 +130,22 @@
 									</view>
 								</view>
 							</view>
-							<view class="rowTwo" v-for="(item2,index2) in shiftInfo" :key="index2 + 'shift'">
+							<view class="rowTwo" v-for="(item2, index2) in shiftInfo1" :key="index2 + 'shift'">
 								<view class="left bo_r">
 									<view class="cell bo_r">
-										{{item2.pwcTypeName == '一工班' ? 'First Shift' : item2.pwcTypeName == '二工班' ? 'Second Shift' : item2.pwcTypeName == '三工班' ? 'Third Shift' : ''}}
+										First Shift
 									</view>
 									<view class="cell cellX">
 										<view class="item bo_r">
-											{{item2.workStartTime | textFilter}}
+											{{ item2.workStartTime | textFilter }}
 										</view>
 										<view class="item bo_r">
-											{{item2.workEndTime | textFilter}}
+											{{ item2.workEndTime | textFilter }}
 										</view>
 									</view>
 									<view class="cellY">
-										<view class="item" v-for="(item3,index3) in item2.infoArr" :key="index3">
-											车型:{{item3.carTypeName}},数量:{{item3.goodsNumber}}
+										<view class="item" v-for="(item3, index3) in item2.infoArr" :key="index3">
+											车型:{{ item3.carTypeName }},数量:{{ item3.goodsNumber }}
 										</view>
 									</view>
 								</view>
@@ -154,7 +160,7 @@
 											<view></view>
 											<view></view>
 										</view>
-										<view class="itemList bo_b" v-for="(item3,index3) in item2.infoArr"
+										<view class="itemList bo_b" v-for="(item3, index3) in item2.infoArr"
 											:key="index3">
 											<view class="item">
 												<view class="text" v-show="item3.loadingType == 'RO'">√</view>
@@ -169,6 +175,229 @@
 									</view>
 								</view>
 							</view>
+							<view class="rowTwo" v-if="shiftInfo1.length == 0">
+								<view class="left bo_r">
+									<view class="cell bo_r">
+										First Shift
+									</view>
+									<view class="cell cellX">
+										<view class="item bo_r">
+
+										</view>
+										<view class="item bo_r">
+
+										</view>
+									</view>
+									<view class="cellY">
+										<view class="item">
+
+										</view>
+									</view>
+								</view>
+								<view class="right cellX">
+									<view class="itemLeft bo_r">
+
+									</view>
+									<view class="itemRight">
+										<!-- 没办法画个格子 -->
+										<view class="gezi">
+											<view></view>
+											<view></view>
+											<view></view>
+										</view>
+										<view class="itemList bo_b">
+											<view class="item">
+
+											</view>
+											<view class="item">
+	
+											</view>
+											<view class="item">
+
+											</view>
+										</view>
+									</view>
+								</view>
+							</view>
+							<view class="rowTwo" v-for="(item2, index2) in shiftInfo2" :key="index2 + 'shift'">
+								<view class="left bo_r">
+									<view class="cell bo_r">
+										Second Shift
+									</view>
+									<view class="cell cellX">
+										<view class="item bo_r">
+											{{ item2.workStartTime | textFilter }}
+										</view>
+										<view class="item bo_r">
+											{{ item2.workEndTime | textFilter }}
+										</view>
+									</view>
+									<view class="cellY">
+										<view class="item" v-for="(item3, index3) in item2.infoArr" :key="index3">
+											车型:{{ item3.carTypeName }},数量:{{ item3.goodsNumber }}
+										</view>
+									</view>
+								</view>
+								<view class="right cellX">
+									<view class="itemLeft bo_r">
+
+									</view>
+									<view class="itemRight">
+										<!-- 没办法画个格子 -->
+										<view class="gezi">
+											<view></view>
+											<view></view>
+											<view></view>
+										</view>
+										<view class="itemList bo_b" v-for="(item3, index3) in item2.infoArr"
+											:key="index3">
+											<view class="item">
+												<view class="text" v-show="item3.loadingType == 'RO'">√</view>
+											</view>
+											<view class="item">
+												<view class="text" v-show="item3.loadingType == 'PR'">√</view>
+											</view>
+											<view class="item">
+												<view class="text" v-show="item3.loadingType == 'OT'">√</view>
+											</view>
+										</view>
+									</view>
+								</view>
+							</view>
+							<view class="rowTwo" v-if="shiftInfo2.length == 0">
+								<view class="left bo_r">
+									<view class="cell bo_r">
+										Second Shift
+									</view>
+									<view class="cell cellX">
+										<view class="item bo_r">
+
+										</view>
+										<view class="item bo_r">
+
+										</view>
+									</view>
+									<view class="cellY">
+										<view class="item">
+
+										</view>
+									</view>
+								</view>
+								<view class="right cellX">
+									<view class="itemLeft bo_r">
+
+									</view>
+									<view class="itemRight">
+										<!-- 没办法画个格子 -->
+										<view class="gezi">
+											<view></view>
+											<view></view>
+											<view></view>
+										</view>
+										<view class="itemList bo_b">
+											<view class="item">
+
+											</view>
+											<view class="item">
+	
+											</view>
+											<view class="item">
+
+											</view>
+										</view>
+									</view>
+								</view>
+							</view>
+							<view class="rowTwo" v-for="(item2, index2) in shiftInfo3" :key="index2 + 'shift'">
+								<view class="left bo_r">
+									<view class="cell bo_r">
+										Third Shift
+									</view>
+									<view class="cell cellX">
+										<view class="item bo_r">
+											{{ item2.workStartTime | textFilter }}
+										</view>
+										<view class="item bo_r">
+											{{ item2.workEndTime | textFilter }}
+										</view>
+									</view>
+									<view class="cellY">
+										<view class="item" v-for="(item3, index3) in item2.infoArr" :key="index3">
+											车型:{{ item3.carTypeName }},数量:{{ item3.goodsNumber }}
+										</view>
+									</view>
+								</view>
+								<view class="right cellX">
+									<view class="itemLeft bo_r">
+
+									</view>
+									<view class="itemRight">
+										<!-- 没办法画个格子 -->
+										<view class="gezi">
+											<view></view>
+											<view></view>
+											<view></view>
+										</view>
+										<view class="itemList bo_b" v-for="(item3, index3) in item2.infoArr"
+											:key="index3">
+											<view class="item">
+												<view class="text" v-show="item3.loadingType == 'RO'">√</view>
+											</view>
+											<view class="item">
+												<view class="text" v-show="item3.loadingType == 'PR'">√</view>
+											</view>
+											<view class="item">
+												<view class="text" v-show="item3.loadingType == 'OT'">√</view>
+											</view>
+										</view>
+									</view>
+								</view>
+							</view>
+							<view class="rowTwo" v-if="shiftInfo3.length == 0">
+								<view class="left bo_r">
+									<view class="cell bo_r">
+										Third Shift
+									</view>
+									<view class="cell cellX">
+										<view class="item bo_r">
+
+										</view>
+										<view class="item bo_r">
+
+										</view>
+									</view>
+									<view class="cellY">
+										<view class="item">
+
+										</view>
+									</view>
+								</view>
+								<view class="right cellX">
+									<view class="itemLeft bo_r">
+
+									</view>
+									<view class="itemRight">
+										<!-- 没办法画个格子 -->
+										<view class="gezi">
+											<view></view>
+											<view></view>
+											<view></view>
+										</view>
+										<view class="itemList bo_b">
+											<view class="item">
+
+											</view>
+											<view class="item">
+	
+											</view>
+											<view class="item">
+
+											</view>
+										</view>
+									</view>
+								</view>
+							</view>
+							
 							<view class="rowThree">
 								<view class="title bo_r bo_b">
 									Rehangdling（翻舱）
@@ -212,23 +441,45 @@
 												Shift Of Pier
 											</view>
 											<view class="ceY">
-												<view class="concat" v-for="(item,index) in fcArr1" :key="index">
+												<view class="concat" v-if="fcArr1.length == 0">
 													<view class="date">
 														<view class="item bo_r">
-															<view class="sz bo_r">{{item.retallyOrigin}}</view>
-															<view class="sz">{{item.retallyOrigin}}</view>
+															<view class="sz bo_r"></view>
+															<view class="sz"></view>
 														</view>
 														<view class="item">
-															<view class="sz bo_r">{{item.retallyStartTime | textFilter}}</view>
-															<view class="sz bo_r">{{item.retallyEndTime | textFilter}}</view>
+															<view class="sz bo_r"></view>
+															<view class="sz bo_r"></view>
 														</view>
 													</view>
 													<view class="weight cellX">
 														<view class="text  bo_r">
-															车型:{{item.carTypeName}},数量:{{item.goodsNumber}}
+
 														</view>
 														<view class="text">
-															重量:{{item.goodsWeight}},体积:{{item.goodsVolume}}
+
+														</view>
+													</view>
+												</view>
+												<view class="concat" v-else v-for="(item, index) in fcArr1" :key="index">
+													<view class="date">
+														<view class="item bo_r">
+															<view class="sz bo_r">{{ item.retallyOrigin }}</view>
+															<view class="sz">{{ item.retallyOrigin }}</view>
+														</view>
+														<view class="item">
+															<view class="sz bo_r">{{ item.retallyStartTime | textFilter }}
+															</view>
+															<view class="sz bo_r">{{ item.retallyEndTime | textFilter }}
+															</view>
+														</view>
+													</view>
+													<view class="weight cellX">
+														<view class="text  bo_r">
+															车型:{{ item.carTypeName }},数量:{{ item.goodsNumber }}
+														</view>
+														<view class="text">
+															重量:{{ item.goodsWeight }},体积:{{ item.goodsVolume }}
 														</view>
 													</view>
 												</view>
@@ -241,23 +492,45 @@
 												Shift Of Dock
 											</view>
 											<view class="ceY">
-												<view class="concat" v-for="(item,index) in fcArr2" :key="index">
+												<view class="concat" v-if="fcArr2.length == 0">
 													<view class="date">
 														<view class="item bo_r">
-															<view class="sz bo_r">{{item.retallyOrigin}}</view>
-															<view class="sz">{{item.retallyOrigin}}</view>
+															<view class="sz bo_r"></view>
+															<view class="sz"></view>
 														</view>
 														<view class="item">
-															<view class="sz bo_r">{{item.retallyStartTime | textFilter}}</view>
-															<view class="sz bo_r">{{item.retallyEndTime | textFilter}}</view>
+															<view class="sz bo_r"></view>
+															<view class="sz bo_r"></view>
 														</view>
 													</view>
 													<view class="weight cellX">
 														<view class="text  bo_r">
-															车型:{{item.carTypeName}},数量:{{item.goodsNumber}}
+
 														</view>
 														<view class="text">
-															重量:{{item.goodsWeight}},体积:{{item.goodsVolume}}
+
+														</view>
+													</view>
+												</view>
+												<view class="concat" v-else v-for="(item, index) in fcArr2" :key="index">
+													<view class="date">
+														<view class="item bo_r">
+															<view class="sz bo_r">{{ item.retallyOrigin }}</view>
+															<view class="sz">{{ item.retallyOrigin }}</view>
+														</view>
+														<view class="item">
+															<view class="sz bo_r">{{ item.retallyStartTime | textFilter }}
+															</view>
+															<view class="sz bo_r">{{ item.retallyEndTime | textFilter }}
+															</view>
+														</view>
+													</view>
+													<view class="weight cellX">
+														<view class="text  bo_r">
+															车型:{{ item.carTypeName }},数量:{{ item.goodsNumber }}
+														</view>
+														<view class="text">
+															重量:{{ item.goodsWeight }},体积:{{ item.goodsVolume }}
 														</view>
 													</view>
 												</view>
@@ -270,23 +543,43 @@
 												Reloading
 											</view>
 											<view class="ceY">
-												<view class="concat" v-for="(item,index) in fcArr3" :key="index">
+												<view class="concat" v-if="fcArr3.length == 0">
 													<view class="date">
 														<view class="item bo_r">
-															<view class="sz bo_r">{{item.retallyOrigin}}</view>
-															<view class="sz">{{item.retallyOrigin}}</view>
+															<view class="sz bo_r"></view>
+															<view class="sz"></view>
 														</view>
 														<view class="item">
-															<view class="sz bo_r">{{item.retallyStartTime}}</view>
-															<view class="sz bo_r">{{item.retallyEndTime}}</view>
+															<view class="sz bo_r"></view>
+															<view class="sz bo_r"></view>
 														</view>
 													</view>
 													<view class="weight cellX">
 														<view class="text  bo_r">
-															车型:{{item.carTypeName}},数量:{{item.goodsNumber}}
+
 														</view>
 														<view class="text">
-															重量:{{item.goodsWeight}},体积:{{item.goodsVolume}}
+
+														</view>
+													</view>
+												</view>
+												<view class="concat" v-else v-for="(item, index) in fcArr3" :key="index">
+													<view class="date">
+														<view class="item bo_r">
+															<view class="sz bo_r">{{ item.retallyOrigin }}</view>
+															<view class="sz">{{ item.retallyOrigin }}</view>
+														</view>
+														<view class="item">
+															<view class="sz bo_r">{{ item.retallyStartTime }}</view>
+															<view class="sz bo_r">{{ item.retallyEndTime }}</view>
+														</view>
+													</view>
+													<view class="weight cellX">
+														<view class="text  bo_r">
+															车型:{{ item.carTypeName }},数量:{{ item.goodsNumber }}
+														</view>
+														<view class="text">
+															重量:{{ item.goodsWeight }},体积:{{ item.goodsVolume }}
 														</view>
 													</view>
 												</view>
@@ -329,12 +622,12 @@
 											<view class="sz">{{ PTGR[0].totalGenNum }}</view>
 										</view>
 										<view class="cellY">
-											<view class="sz bo_b">{{ JSGR[0].minStartTime | textFilter}}</view>
-											<view class="sz">{{ PTGR[0].minStartTimePt | textFilter}}</view>
+											<view class="sz bo_b">{{ JSGR[0].minStartTime | textFilter }}</view>
+											<view class="sz">{{ PTGR[0].minStartTimePt | textFilter }}</view>
 										</view>
 										<view class="cellY">
-											<view class="sz bo_b">{{ JSGR[0].maxEndTime | textFilter}}</view>
-											<view class="sz">{{ PTGR[0].maxEndTimePt | textFilter}}</view>
+											<view class="sz bo_b">{{ JSGR[0].maxEndTime | textFilter }}</view>
+											<view class="sz">{{ PTGR[0].maxEndTimePt | textFilter }}</view>
 										</view>
 									</view>
 									<view class="weight cellY bo_r">
@@ -371,7 +664,7 @@
 								<view class="signInfo" v-if="zdySign.url == ''" @click="togoSign('0')">
 									去签名
 								</view>
-								<view class="signImg" v-else>
+								<view class="signImg" v-else @click="togoSign('0')">
 									<image :src="zdySign.url"></image>
 									<!-- <text class="del" @click="delSign(zdySign.id)">删除</text> -->
 								</view>
@@ -385,7 +678,7 @@
 								<view class="signInfo" v-if="czSign.url == ''" @click="togoSign('1')">
 									去签名
 								</view>
-								<view class="signImg" v-else>
+								<view class="signImg" v-else @click="togoSign('1')">
 									<image :src="czSign.url"></image>
 									<!-- <text class="del" @click="delSign(czSign.id)">删除</text> -->
 								</view>
@@ -403,1118 +696,1142 @@
 </template>
 
 <script>
-	import sqlite from "../../common/sqlite.js"
-	import api from "../../common/api.js"
-	export default {
-		data() {
-			return {
-				title: "杂项单证签名",
-				tabsValue: 0,
-				tabsList: [],
-				vvyId: "",
-				vvyName: "",
-				webId: "",
-				aIdList: [],
-				aId: "",
-				vtpId: "",
-				// 时间段数组
-				timeArr: [],
-				// 一天开始时间
-				startTime: "",
-				// 一天结束时间
-				endTime: "",
-				// 人员信息
-				peopleInfo: {},
-				peopleList: [],
-				peopleArr: [],
-				tqInfo: "",
-				bwArr: [],
-				bwInfo: "",
-				zyzsInfo: 0,
-				dcrsInfo: 0,
-				// 单证数量
-				tabsArr: [],
-				gbArr: [],
-				// 船舶信息
-				shipInfo: {},
-				shiftInfo: [],
-				// 翻仓信息
-				fcList: [],
-				fcArr1: [],
-				fcArr2: [],
-				fcArr3: [],
-				// 其他信息
-				qtList: [],
-				qtArr: [],
-				// 签名信息
-				zdySign: {
-					url: "",
-					id: ""
-				},
-				dateId: "",
-				czSign: {
-					url: "",
-					id: ""
-				},
-				delId: "",
-				PTGR:[],
-				JSGR:[],
-				RYSJ:[]
-			}
-		},
-		onLoad(option) {
-			if ('params' in option) {
-				this.tabsValue = JSON.parse(decodeURIComponent(option.params)).tabsValue
-			}
-		},
-		mounted() {
-			this.vtpId = uni.getStorageSync('vtpId')
-			let that = this
-			that.executeSql2()
-			that.executeSql('shipInfoTable')
-			that.aaa()
-			setTimeout(function() {
-				that.fcList.forEach(v => {
-					let endT = v.retallyEndTime.slice(0, 10)
-					if (endT == that.dateId) {
-						if(v.retallyTypeName == '舱内翻') {
-							that.fcArr1.push(v)
-						} else if(v.retallyTypeName == '舱外翻'){
-							that.fcArr2.push(v)
-						} else if(v.retallyTypeName == '货物重装') {
-							that.fcArr3.push(v)
-						}
-					}
-				})
-				that.qtList.forEach(v => {
-					let endT = ""
-					if (v.endTm != "") {
-						endT = v.endTm.slice(0, 10)
-					} else if (v.endTmPt != "") {
-						endT = v.endTmPt.slice(0, 10)
-					}
-					if (endT == that.dateId) {
-						that.qtArr.push(v)
-					}
-				})
-				if (that.qtArr.length == 0) {
-					that.qtArr.push({})
-				}
-				that.shiftInfo.forEach(v => {
-					let arr = api.arrFrom(v.infoArr, "webId")
-					that.$set(v, "infoArr", arr)
-				})
-				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.peopleArr.forEach(v => {
-					that.zyzsInfo += Number(v.workSuite)
-					that.dcrsInfo += Number(v.shipPerson)
-					that.bwArr.push(v.bthIdName)
-				})
-				that.bwInfo = that.bwArr.join(",")
-			}, 300)
-		},
-		filters: {
-			textFilter(value) {
-				let split_s = value.split(" ")
-				let result = split_s[1].split(":")
-				let date = split_s[0].split("-")
-				let sum = result[0] + ":" + result[1] + "(" + date[2] + ")"
-				return sum
-			}
-		},
-		methods: {
-			// 查船舶信息/人员信息
-			executeSql(tableName) {
-				let sql = `select * from ${tableName}  WHERE vtpId = '${this.vtpId}'`
-				sqlite.executeSqlCeshi(sql).then((value) => {
-					// 在resolve时执行的回调函数
-					if (tableName == 'shipInfoTable') {
-						this.shipInfo = value[0]
-					} else {
-						this.peopleInfo = value[0]
-					}
-				}).catch((error) => {
-					// 在reject时执行的回调函数
-					console.error(error);
-				});
+import sqlite from "../../common/sqlite.js"
+import api from "../../common/api.js"
+export default {
+	data() {
+		return {
+			title: "杂项单证签名",
+			tabsValue: 0,
+			tabsList: [],
+			vvyId: "",
+			vvyName: "",
+			webId: "",
+			aIdList: [],
+			aId: "",
+			vtpId: "",
+			// 时间段数组
+			timeArr: [],
+			// 一天开始时间
+			startTime: "",
+			// 一天结束时间
+			endTime: "",
+			// 人员信息
+			peopleInfo: {},
+			peopleList: [],
+			peopleArr: [],
+			tqInfo: "",
+			bwArr: [],
+			bwInfo: "",
+			zyzsInfo: 0,
+			dcrsInfo: 0,
+			// 单证数量
+			tabsArr: [],
+			gbArr: [],
+			// 船舶信息
+			shipInfo: {},
+			shiftInfo: [],
+			shiftInfo1: [],
+			shiftInfo2: [],
+			shiftInfo3: [],
+			// 翻仓信息
+			fcList: [],
+			fcArr1: [],
+			fcArr2: [],
+			fcArr3: [],
+			// 其他信息
+			qtList: [],
+			qtArr: [],
+			// 签名信息
+			zdySign: {
+				url: "",
+				id: ""
 			},
-			// 查工班信息
-			executeSql2(type) {
-				let sql = `SELECT 
+			dateId: "",
+			czSign: {
+				url: "",
+				id: ""
+			},
+			delId: "",
+			PTGR: [],
+			JSGR: [],
+			RYSJ: []
+		}
+	},
+	onLoad(option) {
+		if ('params' in option) {
+			this.tabsValue = JSON.parse(decodeURIComponent(option.params)).tabsValue
+		}
+	},
+	mounted() {
+		this.vtpId = uni.getStorageSync('vtpId')
+		let that = this
+		that.executeSql2()
+		that.executeSql('shipInfoTable')
+		that.aaa()
+		setTimeout(function () {
+			that.fcList.forEach(v => {
+				let endT = v.retallyEndTime.slice(0, 10)
+				if (endT == that.dateId) {
+					if (v.retallyTypeName == '舱内翻') {
+						that.fcArr1.push(v)
+					} else if (v.retallyTypeName == '舱外翻') {
+						that.fcArr2.push(v)
+					} else if (v.retallyTypeName == '货物重装') {
+						that.fcArr3.push(v)
+					}
+				}
+			})
+			that.qtList.forEach(v => {
+				let endT = ""
+				if (v.endTm != "") {
+					endT = v.endTm.slice(0, 10)
+				} else if (v.endTmPt != "") {
+					endT = v.endTmPt.slice(0, 10)
+				}
+				if (endT == that.dateId) {
+					that.qtArr.push(v)
+				}
+			})
+			if (that.qtArr.length == 0) {
+				that.qtArr.push({})
+			}
+			that.shiftInfo.forEach(v => {
+				let arr = api.arrFrom(v.infoArr, "webId")
+				that.$set(v, "infoArr", arr)
+				if(v.pwcTypeName == '一工班') {
+					that.shiftInfo1.push(v)
+				} else if(v.pwcTypeName == '二工班'){
+					that.shiftInfo2.push(v)
+				} else if(v.pwcTypeName == '三工班') {
+					that.shiftInfo3.push(v)
+				}
+			})
+
+			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.peopleArr.forEach(v => {
+				that.zyzsInfo += Number(v.workSuite)
+				that.dcrsInfo += Number(v.shipPerson)
+				that.bwArr.push(v.bthIdName)
+			})
+			that.bwInfo = that.bwArr.join(",")
+		}, 300)
+	},
+	filters: {
+		textFilter(value) {
+			let split_s = value.split(" ")
+			let result = split_s[1].split(":")
+			let date = split_s[0].split("-")
+			let sum = result[0] + ":" + result[1] + "(" + date[2] + ")"
+			return sum
+		}
+	},
+	methods: {
+		// 查船舶信息/人员信息
+		executeSql(tableName) {
+			let sql = `select * from ${tableName}  WHERE vtpId = '${this.vtpId}'`
+			sqlite.executeSqlCeshi(sql).then((value) => {
+				// 在resolve时执行的回调函数
+				if (tableName == 'shipInfoTable') {
+					this.shipInfo = value[0]
+				} else {
+					this.peopleInfo = value[0]
+				}
+			}).catch((error) => {
+				// 在reject时执行的回调函数
+				console.error(error);
+			});
+		},
+		// 查工班信息
+		executeSql2(type) {
+			let sql = `SELECT 
 					strftime('%Y-%m-%d %H:00:00',  datetime(workEndTime, '0 day', 'start of day', '+22 hours')) || ',' || strftime('%Y-%m-%d %H:00:00',  datetime(workEndTime, '1 day', 'start of day', '+22 hours')) AS work_shift 
 					FROM workMessageRespList WHERE workMessageRespList.vtpId='${this.vtpId}'
 					GROUP BY work_shift
 					UNION SELECT strftime('%Y-%m-%d %H:00:00',  datetime(workEndTime, '-1 day', 'start of day', '+22 hours')) || ',' || strftime('%Y-%m-%d %H:00:00',  datetime(workEndTime, '0 day', 'start of day', '+22 hours')) AS work_shift 
 					FROM workMessageRespList WHERE workMessageRespList.vtpId='${this.vtpId}'
 					GROUP BY work_shift;`
-				sqlite.executeSqlCeshi(sql).then((value) => {
-					this.timeArr = value
-					value.forEach((v, index) => {
-						console.log('v',v);
-						this.startTime = v.work_shift.split(",")[0]
-						this.endTime = v.work_shift.split(",")[1]
-						let sql2 =
-							`Select COUNT(*),pwcTypeName,vvyId,vvyName,MIN(workStartTime) AS workStartTime, MAX(workEndTime) 
+			sqlite.executeSqlCeshi(sql).then((value) => {
+				this.timeArr = value
+				value.forEach((v, index) => {
+					console.log('v', v);
+					this.startTime = v.work_shift.split(",")[0]
+					this.endTime = v.work_shift.split(",")[1]
+					let sql2 =
+						`Select COUNT(*),pwcTypeName,vvyId,vvyName,MIN(workStartTime) AS workStartTime, MAX(workEndTime) 
 							AS workEndTime FROM (SELECT * FROM workMessageRespList WHERE workStartTime>='${this.startTime}' and 
 							workEndTime<'${this.endTime}' and workMessageRespList.vtpId='${this.vtpId}') 
 							GROUP BY pwcTypeName  ORDER BY workStartTime asc;`
-						this.executeSql22(sql2, index)
-						let sql3 = `SELECT * FROM retallyMessageRespList WHERE retallyMessageRespList.retallyStartTime>='${this.startTime}' and 
+					this.executeSql22(sql2, index)
+					let sql3 = `SELECT * FROM retallyMessageRespList WHERE retallyMessageRespList.retallyStartTime>='${this.startTime}' and 
 								retallyMessageRespList.retallyEndTime<'${this.endTime}' and vtpId = '${this.vtpId}'`
-						this.executeSql3(sql3)
-						// let sql4 = `SELECT * FROM infoRespList WHERE infoRespList.startTm>='${this.startTime}' and 
-						// 		infoRespList.endTm<'${this.endTime}' and vtpId = '${this.vtpId}'`
-						// 普通工人查询
-						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
+					this.executeSql3(sql3)
+					// let sql4 = `SELECT * FROM infoRespList WHERE infoRespList.startTm>='${this.startTime}' and 
+					// 		infoRespList.endTm<'${this.endTime}' and vtpId = '${this.vtpId}'`
+					// 普通工人查询
+					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
+					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 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
+					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
+					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 that = this
-					setTimeout(function() {
-						if (type != 0) {
-							that.tabsArr.forEach((v, index) => {
-								let _index = index + 1
-								that.$set(v, "name", `杂项单证${_index}`)
-							})
-						}
-						that.tabsList = that.tabsArr
-						that.shiftInfo = that.tabsList[that.tabsValue].shiftArr
-						that.shiftList = that.tabsList[that.tabsValue].shiftArr
-						that.vvyId = that.tabsList[0].shiftArr[0].vvyId
-						that.vvyName = that.tabsList[0].shiftArr[0].vvyName
-						let dateId = that.tabsList[that.tabsValue].shiftArr[0].workEndTime
-						that.dateId = dateId.slice(0, 10)
-						that.executeSql5()
-						that.shiftList.forEach(v => {
-							that.executeSql222(v.workStartTime, v.workEndTime, v.pwcTypeName)
-						})
-						setTimeout(function() {
-							that.shiftList = that.shiftList
-						}, 100)
-					}, 100)
-				}).catch((error) => {
-					// 在reject时执行的回调函数
-					console.error(error);
-				});
-			},
-			executeSql22(sql, index) {
-				sqlite.executeSqlCeshi(sql).then((value) => {
-					if (value.length > 0) {
-						this.tabsArr.push({
-							shiftArr: value
+					this.executeSql8(sql7)
+				})
+				let that = this
+				setTimeout(function () {
+					if (type != 0) {
+						that.tabsArr.forEach((v, index) => {
+							let _index = index + 1
+							that.$set(v, "name", `杂项单证${_index}`)
 						})
 					}
-				}).catch((error) => {
-					// 在reject时执行的回调函数
-					console.error(error);
-				});
-			},
-			executeSql222(sTime, eTime, pwcTypeName) {
-				let sql = `SELECT * FROM workMessageRespList 
+					that.tabsList = that.tabsArr
+					that.shiftInfo = that.tabsList[that.tabsValue].shiftArr
+					that.shiftList = that.tabsList[that.tabsValue].shiftArr
+					that.vvyId = that.tabsList[0].shiftArr[0].vvyId
+					that.vvyName = that.tabsList[0].shiftArr[0].vvyName
+					let dateId = that.tabsList[that.tabsValue].shiftArr[0].workEndTime
+					that.dateId = dateId.slice(0, 10)
+					that.executeSql5()
+					that.shiftList.forEach(v => {
+						that.executeSql222(v.workStartTime, v.workEndTime, v.pwcTypeName)
+					})
+					setTimeout(function () {
+						that.shiftList = that.shiftList
+					}, 100)
+				}, 100)
+			}).catch((error) => {
+				// 在reject时执行的回调函数
+				console.error(error);
+			});
+		},
+		executeSql22(sql, index) {
+			sqlite.executeSqlCeshi(sql).then((value) => {
+				if (value.length > 0) {
+					this.tabsArr.push({
+						shiftArr: value
+					})
+				}
+			}).catch((error) => {
+				// 在reject时执行的回调函数
+				console.error(error);
+			});
+		},
+		executeSql222(sTime, eTime, pwcTypeName) {
+			let sql = `SELECT * FROM workMessageRespList 
 						WHERE workStartTime>='${sTime}' 
 						and workEndTime<='${eTime}' 
 						and workMessageRespList.vtpId='${this.vtpId}' 
 						and workMessageRespList.pwcTypeName='${pwcTypeName}';`
-				sqlite.executeSqlCeshi(sql).then((value) => {
-					this.gbArr.push(...value)
-					this.shiftInfo.forEach((i, index) => {
-						this.$set(i, "infoArr", [])
-						this.gbArr.forEach((v, index2) => {
-							if (i.pwcTypeName == v.pwcTypeName) {
-								this.aaa(v.webId, index)
-							}
-						})
+			sqlite.executeSqlCeshi(sql).then((value) => {
+				this.gbArr.push(...value)
+				this.shiftInfo.forEach((i, index) => {
+					this.$set(i, "infoArr", [])
+					this.gbArr.forEach((v, index2) => {
+						if (i.pwcTypeName == v.pwcTypeName) {
+							this.aaa(v.webId, index)
+						}
 					})
-				}).catch((error) => {
-					// 在reject时执行的回调函数
-					console.error(error);
-				});
-			},
-			aaa(id, index) {
-				let sql =
-					`SELECT * FROM workMessageRespInfoList WHERE workMessageRespInfoList.contactId = '${id}'`
-				sqlite.executeSqlCeshi(sql).then((value) => {
-					// this.$set(this.gbArr[index], "infoArr", value)
-					this.shiftInfo[index].infoArr.push(...value)
-				}).catch((error) => {
-					// 在reject时执行的回调函数
-					console.error(error);
-				});
-			},
-			// 查翻仓信息
-			executeSql3(sql) {
-				sqlite.executeSqlCeshi(sql).then((value) => {
-					if (value.length > 0) {
-						this.fcList.push(...value)
-					}
-					this.fcList = api.arrFrom(this.fcList, "webId")
-				}).catch((error) => {
-					// 在reject时执行的回调函数
-					console.error(error);
-				});
-			},
-			// 查普通工人信息
-			executeSql4(sql) {
-				sqlite.executeSqlCeshi(sql).then((value) => {
-					// 在resolve时执行的回调函数
-					if (value.length > 0) {
-						this.PTGR.push(...value)
-					}
-				}).catch((error) => {
-					// 在reject时执行的回调函数
-					console.error(error);
-				});
-			},
-			// 查技术工人信息
-			executeSql7(sql) {
-				sqlite.executeSqlCeshi(sql).then((value) => {
-					// 在resolve时执行的回调函数
-					if (value.length > 0) {
-						this.JSGR.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) => {
-					// 在resolve时执行的回调函数
-					console.log('value',value);
-					if (value.length > 0) {
-						this.peopleList.push(...value)
-					}
-					this.peopleList = api.arrFrom(this.peopleList, "pmeId")
-				}).catch((error) => {
-					// 在reject时执行的回调函数
-					console.error(error);
-				});
-			},
-			// 查单证签字表
-			executeSql5() {
-				let sql = `select * from workSignTable WHERE bizId = '${this.dateId}';`
-				sqlite.executeSqlCeshi(sql).then((value) => {
-					// 在resolve时执行的回调函数
-					let zdyList = []
-					let czList = []
-					if (value.length > 0) {
-						value.forEach(v => {
-							if (v.sort == 0) {
-								this.zdySign = {
-									url: v.signFile,
-									id: v.webId
-								}
-								zdyList.push(v)
-							} else {
-								this.czSign = {
-									url: v.signFile,
-									id: v.webId
-								}
-								czList.push(v)
+				})
+			}).catch((error) => {
+				// 在reject时执行的回调函数
+				console.error(error);
+			});
+		},
+		aaa(id, index) {
+			let sql =
+				`SELECT * FROM workMessageRespInfoList WHERE workMessageRespInfoList.contactId = '${id}'`
+			sqlite.executeSqlCeshi(sql).then((value) => {
+				// this.$set(this.gbArr[index], "infoArr", value)
+				this.shiftInfo[index].infoArr.push(...value)
+			}).catch((error) => {
+				// 在reject时执行的回调函数
+				console.error(error);
+			});
+		},
+		// 查翻仓信息
+		executeSql3(sql) {
+			sqlite.executeSqlCeshi(sql).then((value) => {
+				if (value.length > 0) {
+					this.fcList.push(...value)
+				}
+				this.fcList = api.arrFrom(this.fcList, "webId")
+			}).catch((error) => {
+				// 在reject时执行的回调函数
+				console.error(error);
+			});
+		},
+		// 查普通工人信息
+		executeSql4(sql) {
+			sqlite.executeSqlCeshi(sql).then((value) => {
+				// 在resolve时执行的回调函数
+				if (value.length > 0) {
+					this.PTGR.push(...value)
+				}
+			}).catch((error) => {
+				// 在reject时执行的回调函数
+				console.error(error);
+			});
+		},
+		// 查技术工人信息
+		executeSql7(sql) {
+			sqlite.executeSqlCeshi(sql).then((value) => {
+				// 在resolve时执行的回调函数
+				if (value.length > 0) {
+					this.JSGR.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) => {
+				// 在resolve时执行的回调函数
+				console.log('value', value);
+				if (value.length > 0) {
+					this.peopleList.push(...value)
+				}
+				this.peopleList = api.arrFrom(this.peopleList, "pmeId")
+			}).catch((error) => {
+				// 在reject时执行的回调函数
+				console.error(error);
+			});
+		},
+		// 查单证签字表
+		executeSql5() {
+			let sql = `select * from workSignTable WHERE bizId = '${this.dateId}';`
+			sqlite.executeSqlCeshi(sql).then((value) => {
+				// 在resolve时执行的回调函数
+				let zdyList = []
+				let czList = []
+				if (value.length > 0) {
+					value.forEach(v => {
+						if (v.sort == 0) {
+							this.zdySign = {
+								url: v.signFile,
+								id: v.webId
 							}
-						})
-					}
-					if (zdyList.length == 0) {
-						this.zdySign = {
-							url: "",
-							id: ""
+							zdyList.push(v)
+						} else {
+							this.czSign = {
+								url: v.signFile,
+								id: v.webId
+							}
+							czList.push(v)
 						}
+					})
+				}
+				if (zdyList.length == 0) {
+					this.zdySign = {
+						url: "",
+						id: ""
 					}
-					if (czList.length == 0) {
-						this.czSign = {
-							url: "",
-							id: ""
-						}
+				}
+				if (czList.length == 0) {
+					this.czSign = {
+						url: "",
+						id: ""
 					}
-				}).catch((error) => {
-					// 在reject时执行的回调函数
-					console.error(error);
-				});
-			},
-			// 删除当前签名
-			delSign(id) {
-				this.$refs.delPopup.open()
-				this.delId = id
-			},
-			// 弹框删除
-			delConfirm() {
-				let sql = `DELETE FROM workSignTable WHERE webId = '${this.delId}';`
-				sqlite.executeSqlCeshi(sql).then((value) => {
-					// 在resolve时执行的回调函数
-					this.executeSql5()
-				}).catch((error) => {
-					// 在reject时执行的回调函数
-					console.error(error);
-				});
-			},
-			// 点击标签
-			tabsChange(e) {
-				this.tabsValue = e.value
-				this.shiftList = this.tabsList[e.value].shiftArr
-				this.dateId = this.tabsList[e.value].shiftArr[0].workEndTime.slice(0, 10)
-				this.vvyName = this.tabsList[e.value].shiftArr[0].vvyName
-				this.gbArr = []
-				this.tabsArr = []
-				this.tabsList = []
-				this.shiftList = []
-				this.shiftInf = []
-				this.fcArr1 = []
-				this.fcArr2 = []
-				this.fcArr3 = []
-				this.qtArr = []
-				this.peopleArr = []
-				this.tqInfo = ""
-				this.zyzsInfo = 0
-				this.dcrsInfo = 0
-				this.bwArr = []
-				this.bwInfo = ""
-				this.executeSql2(0)
+				}
+			}).catch((error) => {
+				// 在reject时执行的回调函数
+				console.error(error);
+			});
+		},
+		// 删除当前签名
+		delSign(id) {
+			this.$refs.delPopup.open()
+			this.delId = id
+		},
+		// 弹框删除
+		delConfirm() {
+			let sql = `DELETE FROM workSignTable WHERE webId = '${this.delId}';`
+			sqlite.executeSqlCeshi(sql).then((value) => {
+				// 在resolve时执行的回调函数
 				this.executeSql5()
-				this.shiftInfo.forEach(v => {
-					let arr = api.arrFrom(v.infoArr, "webId")
-					this.$set(v, "infoArr", arr)
-				})
-				this.fcList.forEach(v => {
-					let endT = v.retallyEndTime.slice(0, 10)
-					if (endT == this.dateId) {
-						if(v.retallyTypeName == '舱内翻') {
-							this.fcArr1.push(v)
-						} else if(v.retallyTypeName == '舱外翻'){
-							this.fcArr2.push(v)
-						} else if(v.retallyTypeName == '货物重装') {
-							this.fcArr3.push(v)
-						}
-					}
-				})
-				this.qtList.forEach(v => {
-					let endT = ""
-					if (v.endTm != "") {
-						endT = v.endTm.slice(0, 10)
-					} else if (v.endTmPt != "") {
-						endT = v.endTmPt.slice(0, 10)
-					}
-					if (endT == this.dateId) {
-						this.qtArr.push(v)
-					}
-				})
-				if (this.qtArr.length == 0) {
-					this.qtArr.push({})
+			}).catch((error) => {
+				// 在reject时执行的回调函数
+				console.error(error);
+			});
+		},
+		// 点击标签
+		tabsChange(e) {
+			this.tabsValue = e.value
+			this.shiftList = this.tabsList[e.value].shiftArr
+			this.dateId = this.tabsList[e.value].shiftArr[0].workEndTime.slice(0, 10)
+			this.vvyName = this.tabsList[e.value].shiftArr[0].vvyName
+			this.gbArr = []
+			this.tabsArr = []
+			this.tabsList = []
+			this.shiftList = []
+			this.shiftInf = []
+			this.fcArr1 = []
+			this.fcArr2 = []
+			this.fcArr3 = []
+			this.qtArr = []
+			this.peopleArr = []
+			this.tqInfo = ""
+			this.zyzsInfo = 0
+			this.dcrsInfo = 0
+			this.bwArr = []
+			this.shiftInfo1 = []
+			this.shiftInfo2 = []
+			this.shiftInfo3 = []
+			this.bwInfo = ""
+			this.executeSql2(0)
+			this.executeSql5()
+			setTimeout(() => {
+			this.shiftInfo.forEach(v => {
+				let arr = api.arrFrom(v.infoArr, "webId")
+				this.$set(v, "infoArr", arr)
+				if(v.pwcTypeName == '一工班') {
+					this.shiftInfo1.push(v)
+				} else if(v.pwcTypeName == '二工班'){
+					this.shiftInfo2.push(v)
+				} else if(v.pwcTypeName == '三工班') {
+					this.shiftInfo3.push(v)
 				}
-				this.peopleList.forEach(v => {
-					let endT = v.jobEndTime.slice(0, 10)
-					if (endT == this.dateId) {
-						this.peopleArr.push(v)
+			})
+		    },300)
+			this.fcList.forEach(v => {
+				let endT = v.retallyEndTime.slice(0, 10)
+				if (endT == this.dateId) {
+					if (v.retallyTypeName == '舱内翻') {
+						this.fcArr1.push(v)
+					} else if (v.retallyTypeName == '舱外翻') {
+						this.fcArr2.push(v)
+					} else if (v.retallyTypeName == '货物重装') {
+						this.fcArr3.push(v)
 					}
-				})
-				this.tqInfo = this.peopleArr[0].weatherType
-				this.peopleArr.forEach(v => {
-					this.zyzsInfo += Number(v.workSuite)
-					this.dcrsInfo += Number(v.shipPerson)
-					this.bwArr.push(v.bthIdName)
-				})
-				this.bwInfo = this.bwArr.join(",")
-			},
-			// 点击签名
-			togoSign(signType) {
-				let obj = {
-					id: this.dateId,
-					url: "mixSign",
-					signType: Number(signType), // 0 指导员  1 船长/大副
-					signTable: "2",
-					tabsValue: this.tabsValue,
-					vvyId: this.vvyId,
 				}
-				const params = encodeURIComponent(JSON.stringify(obj));
-				uni.navigateTo({
-					url: `/pages/shipWork/sign?params=${params}`
-				})
-			},
-		}
+			})
+			this.qtList.forEach(v => {
+				let endT = ""
+				if (v.endTm != "") {
+					endT = v.endTm.slice(0, 10)
+				} else if (v.endTmPt != "") {
+					endT = v.endTmPt.slice(0, 10)
+				}
+				if (endT == this.dateId) {
+					this.qtArr.push(v)
+				}
+			})
+			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.peopleArr.forEach(v => {
+				this.zyzsInfo += Number(v.workSuite)
+				this.dcrsInfo += Number(v.shipPerson)
+				this.bwArr.push(v.bthIdName)
+			})
+			this.bwInfo = this.bwArr.join(",")
+		},
+		// 点击签名
+		togoSign(signType) {
+			let obj = {
+				id: this.dateId,
+				url: "mixSign",
+				signType: Number(signType), // 0 指导员  1 船长/大副
+				signTable: "2",
+				tabsValue: this.tabsValue,
+				vvyId: this.vvyId,
+			}
+			const params = encodeURIComponent(JSON.stringify(obj));
+			uni.navigateTo({
+				url: `/pages/shipWork/sign?params=${params}`
+			})
+		},
 	}
+}
 </script>
 
 <style lang="less" scoped>
-	@import "../../style/css/main-dz.css";
+@import "../../style/css/main-dz.css";
 
-	.contentFixedr {
-		margin-top: 68px !important;
+.contentFixedr {
+	margin-top: 68px !important;
 
-		/deep/.tab .tab-bar {
-			height: 66px;
-			line-height: 66px;
-			position: relative;
-		}
-
-		/deep/.tab .tab-bar-item {
-			height: 66px;
-			line-height: 66px;
-			font-size: 18px;
-			color: #23262E;
-			font-weight: bold;
-			font-family: PingFangSC-Semibold;
-			padding: 0 24px !important;
-		}
-
-		/deep/.tab .tab-bar-item.active {
-			color: #0067CF
-		}
-
-		/deep/.tab .tab-bar-item .active-line {
-			color: #0067CF;
-			width: 54px;
-			height: 4px;
-		}
-
-		/deep/.tab-pane {
-			width: 100%;
-		}
-
-		/deep/.tab .tab-cont {
-			padding-bottom: 0;
-		}
+	/deep/.tab .tab-bar {
+		height: 66px;
+		line-height: 66px;
+		position: relative;
 	}
 
-	.container {
-		padding: 0px 16px;
-		background: #FFFFFF;
-		border-radius: 8px;
-
-		.head {
-			height: 85px;
-			padding: 16px 0;
-			margin: 0 8px;
-			border-bottom: 1px solid #999;
-			display: flex;
-			justify-content: space-between;
-
-			.rightHead {
-				display: flex;
-				flex-direction: column;
-				justify-content: center;
-				text-align: right;
-
-				.p {
-					font-size: 22px;
-					color: #0052A4;
-					font-weight: bold;
-				}
-
-				text {
-					font-size: 14px;
-					color: #666666;
-				}
-			}
-		}
-
-		.headTItle {
-			display: flex;
-			justify-content: space-around;
-			padding: 24px 0;
-			margin: 0 8px;
-			border-bottom: 1px solid #EEEEEE;
-
-			.title {
-				flex: 3;
-				text-align: center;
-
-				.p {
-					font-size: 24px;
-					color: #23262E;
-					font-weight: bold;
-				}
-
-				text {
-					font-size: 18px;
-					color: #23262E;
-				}
-			}
-
-			.titleLeft {
-				flex: 1;
-			}
-
-			.titleRight {
-				flex: 1;
-				display: flex;
-				flex-direction: column;
-				justify-content: flex-end;
-
-				text:first-child {
-					font-size: 14px;
-					color: #666666;
-				}
-
-				text:last-child {
-					font-size: 18px;
-					color: #0052A4;
-					font-weight: bold;
-				}
-			}
-		}
-
-		.ul {
-			display: flex;
-			justify-content: flex-start;
-			flex-wrap: wrap;
-			padding: 15px 0;
-
-			.li {
-				width: 33.33%;
-				display: flex;
-				justify-content: center;
-
-				text {
-					color: #23262E;
-					font-weight: bold;
-					font-size: 14px;
-					width: 50%;
-				}
-
-				text:first-child {
-					text-align: right;
-				}
-			}
-
-			.li:last-child {
-				width: 66.67%;
-
-				text {
-
-					width: 75%;
-				}
-
-				text:first-child {
-					width: 25%;
-				}
-			}
-		}
-
-		table {
-			margin-bottom: 0 !important;
-		}
+	/deep/.tab .tab-bar-item {
+		height: 66px;
+		line-height: 66px;
+		font-size: 18px;
+		color: #23262E;
+		font-weight: bold;
+		font-family: PingFangSC-Semibold;
+		padding: 0 24px !important;
 	}
 
-	.bo_r {
-		border-right: 1px solid #000;
+	/deep/.tab .tab-bar-item.active {
+		color: #0067CF
 	}
 
-	.bo_b {
-		border-bottom: 1px solid #000;
+	/deep/.tab .tab-bar-item .active-line {
+		color: #0067CF;
+		width: 54px;
+		height: 4px;
 	}
 
-	.bo_l {
-		border-left: 1px solid #000;
-	}
-
-	.cellX {
-		display: flex;
-	}
-
-	.rowOne {
+	/deep/.tab-pane {
 		width: 100%;
-		height: 60px;
+	}
+
+	/deep/.tab .tab-cont {
+		padding-bottom: 0;
+	}
+}
+
+.container {
+	padding: 0px 16px;
+	background: #FFFFFF;
+	border-radius: 8px;
+
+	.head {
+		height: 85px;
+		padding: 16px 0;
+		margin: 0 8px;
+		border-bottom: 1px solid #999;
 		display: flex;
 		justify-content: space-between;
-		border: 1px solid #000;
-		border-bottom: 0;
-		text-align: center;
-		background-color: #e9e9e9;
 
-		.left {
-			width: 55%;
+		.rightHead {
 			display: flex;
+			flex-direction: column;
+			justify-content: center;
+			text-align: right;
 
-			.cell {
-				width: 25%;
-				border-right: 1px solid #000;
+			.p {
+				font-size: 22px;
+				color: #0052A4;
+				font-weight: bold;
 			}
 
-			.cellY {
-				display: flex;
-				flex-direction: column;
-
-				.item {
-					height: 30px;
-					line-height: 30px;
-				}
-
-				.cellX {
-					height: 30px;
-					line-height: 30px;
-					display: flex;
-					justify-content: space-around;
-
-					view {
-						width: 50%;
-					}
-				}
-
-			}
-
-			.cellB {
-				width: 50%;
-
-				view {
-					height: 30px;
-					line-height: 30px;
-				}
+			text {
+				font-size: 14px;
+				color: #666666;
 			}
 		}
+	}
 
-		.right {
-			width: 45%;
+	.headTItle {
+		display: flex;
+		justify-content: space-around;
+		padding: 24px 0;
+		margin: 0 8px;
+		border-bottom: 1px solid #EEEEEE;
+
+		.title {
+			flex: 3;
 			text-align: center;
 
-			.itemLeft {
-				width: 30%;
-				line-height: 60px;
+			.p {
+				font-size: 24px;
+				color: #23262E;
+				font-weight: bold;
 			}
 
-			.cellY {
-				height: 30px;
-				line-height: 30px;
-				display: flex;
-				flex-direction: column;
+			text {
+				font-size: 18px;
+				color: #23262E;
+			}
+		}
+
+		.titleLeft {
+			flex: 1;
+		}
+
+		.titleRight {
+			flex: 1;
+			display: flex;
+			flex-direction: column;
+			justify-content: flex-end;
+
+			text:first-child {
+				font-size: 14px;
+				color: #666666;
 			}
 
-			.itemRight {
-				width: 70%;
-
-				text {
-					width: 33.3333%;
-				}
+			text:last-child {
+				font-size: 18px;
+				color: #0052A4;
+				font-weight: bold;
 			}
 		}
 	}
 
-	.rowTwo {
-		width: 100%;
+	.ul {
 		display: flex;
-		justify-content: space-between;
-		border: 1px solid #000;
-		border-bottom: 0;
-		text-align: center;
+		justify-content: flex-start;
+		flex-wrap: wrap;
+		padding: 15px 0;
 
-		.left {
-			width: 55%;
+		.li {
+			width: 33.33%;
 			display: flex;
-			min-height: 30px;
-			line-height: 30px;
+			justify-content: center;
 
-			.cell {
+			text {
+				color: #23262E;
+				font-weight: bold;
+				font-size: 14px;
+				width: 50%;
+			}
+
+			text:first-child {
+				text-align: right;
+			}
+		}
+
+		.li:last-child {
+			width: 66.67%;
+
+			text {
+
+				width: 75%;
+			}
+
+			text:first-child {
 				width: 25%;
-				vertical-align: middle;
+			}
+		}
+	}
+
+	table {
+		margin-bottom: 0 !important;
+	}
+}
+
+.bo_r {
+	border-right: 1px solid #000;
+}
+
+.bo_b {
+	border-bottom: 1px solid #000;
+}
+
+.bo_l {
+	border-left: 1px solid #000;
+}
+
+.cellX {
+	display: flex;
+}
+
+.rowOne {
+	width: 100%;
+	height: 60px;
+	display: flex;
+	justify-content: space-between;
+	border: 1px solid #000;
+	border-bottom: 0;
+	text-align: center;
+	background-color: #e9e9e9;
+
+	.left {
+		width: 55%;
+		display: flex;
+
+		.cell {
+			width: 25%;
+			border-right: 1px solid #000;
+		}
+
+		.cellY {
+			display: flex;
+			flex-direction: column;
+
+			.item {
+				height: 30px;
+				line-height: 30px;
 			}
 
 			.cellX {
+				height: 30px;
+				line-height: 30px;
 				display: flex;
-				justify-content: space-between;
+				justify-content: space-around;
 
-				.item {
+				view {
 					width: 50%;
 				}
 			}
 
-			.cellY {
-				width: 50%;
-				text-align: center;
-
-				.item {
-					width: 100%;
-					line-height: 30px;
-					border-bottom: 1px solid #000;
-				}
-
-				.item:last-child {
-					border-bottom: 0;
-				}
-			}
 		}
 
-		.right {
-			width: 45%;
-			line-height: 30px;
-
-			.itemLeft {
-				width: 30%;
-			}
-
-			.itemRight {
-				width: 70%;
-				position: relative;
-
-				.gezi {
-					position: absolute;
-					top: 0;
-					left: 0;
-					width: 100%;
-					height: 100%;
-					display: flex;
-
-					view {
-						width: 33.33%;
-						border-right: 1px solid #000;
-					}
-
-					view:last-child {
-						width: 33.34%;
-						border-right: 0;
-					}
-				}
-
-				.itemList {
-					width: 100%;
-					height: auto;
-					display: flex;
-
-					.item {
-						width: 33.3333%;
-					}
-				}
-
-				.itemList:last-child {
-					border: 0;
-				}
+		.cellB {
+			width: 50%;
 
+			view {
+				height: 30px;
+				line-height: 30px;
 			}
 		}
 	}
 
-	.rowThree {
-		display: flex;
-		border: 1px solid #000;
-		border-bottom: 0;
+	.right {
+		width: 45%;
 		text-align: center;
 
-		.title {
-			// 0.55*0.25
-			width: 13.75%;
-			line-height: 30px;
+		.itemLeft {
+			width: 30%;
+			line-height: 60px;
 		}
 
-		.fclist {
+		.cellY {
+			height: 30px;
+			line-height: 30px;
 			display: flex;
-			width: 86.25%;
 			flex-direction: column;
+		}
 
-			.fcbt {
+		.itemRight {
+			width: 70%;
+
+			text {
+				width: 33.3333%;
+			}
+		}
+	}
+}
+
+.rowTwo {
+	width: 100%;
+	display: flex;
+	justify-content: space-between;
+	border: 1px solid #000;
+	border-bottom: 0;
+	text-align: center;
+
+	.left {
+		width: 55%;
+		display: flex;
+		min-height: 30px;
+		line-height: 30px;
+
+		.cell {
+			width: 25%;
+			vertical-align: middle;
+		}
+
+		.cellX {
+			display: flex;
+			justify-content: space-between;
+
+			.item {
+				width: 50%;
+			}
+		}
+
+		.cellY {
+			width: 50%;
+			text-align: center;
+
+			.item {
+				width: 100%;
 				line-height: 30px;
-				text-align: center;
 				border-bottom: 1px solid #000;
+			}
 
-				.bt {
+			.item:last-child {
+				border-bottom: 0;
+			}
+		}
+	}
+
+	.right {
+		width: 45%;
+		line-height: 30px;
+
+		.itemLeft {
+			width: 30%;
+		}
+
+		.itemRight {
+			width: 70%;
+			position: relative;
+
+			.gezi {
+				position: absolute;
+				top: 0;
+				left: 0;
+				width: 100%;
+				height: 100%;
+				display: flex;
+
+				view {
+					width: 33.33%;
+					border-right: 1px solid #000;
+				}
+
+				view:last-child {
+					width: 33.34%;
+					border-right: 0;
+				}
+			}
+
+			.itemList {
+				width: 100%;
+				height: auto;
+				display: flex;
+
+				.item {
+					width: 33.3333%;
+				}
+			}
+
+			.itemList:last-child {
+				border: 0;
+			}
+
+		}
+	}
+}
+
+.rowThree {
+	display: flex;
+	border: 1px solid #000;
+	border-bottom: 0;
+	text-align: center;
+
+	.title {
+		// 0.55*0.25
+		width: 13.75%;
+		line-height: 30px;
+	}
+
+	.fclist {
+		display: flex;
+		width: 86.25%;
+		flex-direction: column;
+
+		.fcbt {
+			line-height: 30px;
+			text-align: center;
+			border-bottom: 1px solid #000;
+
+			.bt {
+				display: flex;
+
+				.kind {
+					width: 15.96%;
+				}
+
+				.ceY {
+					width: 84.04%;
+
+					.concat {
+						width: 100%;
+						min-height: 30px;
+						display: flex;
+						border-bottom: 1px solid #000;
+
+						.date {
+							width: 37.84%;
+						}
+
+						.weight {
+							width: 62.16%;
+						}
+					}
+
+					.concat:last-child {
+						border-bottom: 0;
+					}
+				}
+
+
+				.date {
+					width: 31.8%;
 					display: flex;
 
-					.kind {
-						width: 15.96%;
-					}
-
-					.ceY {
-						width: 84.04%;
-
-						.concat {
-							width: 100%;
-							display: flex;
-							border-bottom: 1px solid #000;
-
-							.date {
-								width: 37.84%;
-							}
-
-							.weight {
-								width: 62.16%;
-							}
-						}
-
-						.concat:last-child {
-							border-bottom: 0;
-						}
-					}
-
-
-					.date {
-						width: 31.8%;
+					.item {
+						width: 50%;
 						display: flex;
 
-						.item {
+						.sz {
 							width: 50%;
-							display: flex;
-
-							.sz {
-								width: 50%;
-							}
-						}
-
-						.cellY {
-							width: 100%;
-
-							.cellX view {
-								width: 50%;
-							}
 						}
 					}
 
-					.weight {
-						width: 52.24%;
-
-						.text {
-							width: 50%;
-						}
+					.cellY {
+						width: 100%;
 
 						.cellX view {
 							width: 50%;
 						}
 					}
-
 				}
-			}
 
+				.weight {
+					width: 52.24%;
+
+					.text {
+						width: 50%;
+					}
+
+					.cellX view {
+						width: 50%;
+					}
+				}
+
+			}
 		}
+
+	}
+}
+
+.rowFour {
+	text-align: center;
+	line-height: 30px;
+
+	.row {
+		display: flex;
+		height: 30px;
+		width: 100%;
+		border-bottom: 1px solid #000;
 	}
 
-	.rowFour {
-		text-align: center;
-		line-height: 30px;
-
-		.row {
-			display: flex;
-			height: 30px;
-			width: 100%;
-			border-bottom: 1px solid #000;
-		}
-
-		.rowC {
-			display: flex;
-			height: 60px;
-			width: 100%;
-			border-bottom: 1px solid #000;
-
-			.date {
-				.sz {
-					height: 30px;
-					width: 100%;
-					border-right: 1px solid #000;
-				}
-			}
-		}
-
-		.title {
-			// 0.55*0.25
-			width: 13.75%;
-		}
-
-		.kind {
-			width: 13.78%;
-		}
-
-		.rownr {
-			// 0.55*0.25
-			width: 86.25%;
-		}
+	.rowC {
+		display: flex;
+		height: 60px;
+		width: 100%;
+		border-bottom: 1px solid #000;
 
 		.date {
-			width: 27.45%;
-			display: flex;
-			justify-content: space-around;
-
-			view {
-				width: 25%;
-			}
-		}
-
-		.weight {
-			width: 45%;
-			text-align: center;
-
 			.sz {
 				height: 30px;
+				width: 100%;
+				border-right: 1px solid #000;
 			}
 		}
-
 	}
 
-
-
-	.headZx {
-		background: #E9E9E9;
+	.title {
+		// 0.55*0.25
+		width: 13.75%;
 	}
 
-	.t-zx td {
-		height: 36px;
+	.kind {
+		width: 13.78%;
 	}
 
-	/deep/.uni-scroll-view-content {
+	.rownr {
+		// 0.55*0.25
+		width: 86.25%;
+	}
+
+	.date {
+		width: 27.45%;
 		display: flex;
-	}
+		justify-content: space-around;
 
-	.rowBox {
-		width: calc(100% - 1px);
-		display: flex;
-		border: 1px solid #000;
-		box-sizing: border-box;
-
-		.name {
-			border-right: 1px solid #000;
-			width: 200px;
-			text-align: center;
-			display: flex;
-			flex-direction: column;
-			justify-content: center;
-			padding: 10px;
-		}
-
-		.time {
-			border-right: 1px solid #000;
-			width: 203px;
-			text-align: center;
-			display: flex;
-			flex-direction: column;
-			justify-content: center;
-		}
-
-		.infoBox {
-			width: calc(100% - 476px);
-			display: flex;
-			flex-direction: column;
-			justify-items: center;
-
-			.iBox {
-				flex: 1;
-				display: flex;
-				border-top: 1px solid #000;
-				border-bottom: 1px solid #000;
-
-				.carCss {
-					border-right: 1px solid #000;
-					width: 209px;
-					text-align: center;
-					display: flex;
-					flex-direction: column;
-					justify-content: center;
-				}
-
-				.remark {
-					border-right: 1px solid #000;
-					width: 63px;
-					text-align: center;
-					display: flex;
-					flex-direction: column;
-					justify-content: center;
-				}
-
-				.gx {
-					border-right: 1px solid #000;
-					width: 61px;
-					text-align: center;
-					display: flex;
-					flex-direction: column;
-					justify-content: center;
-				}
-
-				.ro {
-					width: 87.5px;
-				}
-
-				.pr {
-					width: 139px;
-				}
-
-				.ot {
-					width: 90px;
-					border: none;
-				}
-			}
-
-			.iBox:first-child {
-				border-top: none;
-			}
-
-			.iBox:last-child {
-				border-bottom: none;
-			}
+		view {
+			width: 25%;
 		}
 	}
 
-	.signBox {
-		width: 100%;
-		height: 66px;
-		background: #FFFFFF;
-		border: 1px solid #E1E5ED;
-		box-shadow: 0 -1px 4px 0 rgba(0, 0, 0, 0.05);
-		display: flex;
-		justify-content: flex-end;
-		padding: 0 70px;
+	.weight {
+		width: 45%;
+		text-align: center;
 
-		.row {
-			width: 1px;
+		.sz {
 			height: 30px;
-			background-color: #ccc;
-			margin-top: 18px;
-		}
-
-		.signContent {
-			display: flex;
-			margin: 0 54px;
-
-			.signTitle {
-				display: flex;
-				flex-direction: column;
-				justify-content: center;
-				text-align: right;
-			}
-
-			.signInfo {
-				display: flex;
-				flex-direction: column;
-				justify-content: center;
-				font-size: 18px;
-				color: #0052A4;
-				margin-left: 16px;
-			}
-
-			.signImg {
-				width: 100px;
-				height: 54px;
-				margin-top: 5px;
-				margin-left: 10px;
-			}
-		}
-
-		.signContent:last-child {
-			margin-right: 0;
 		}
 	}
+
+}
+
+
+
+.headZx {
+	background: #E9E9E9;
+}
+
+.t-zx td {
+	height: 36px;
+}
+
+/deep/.uni-scroll-view-content {
+	display: flex;
+}
+
+.rowBox {
+	width: calc(100% - 1px);
+	display: flex;
+	border: 1px solid #000;
+	box-sizing: border-box;
+
+	.name {
+		border-right: 1px solid #000;
+		width: 200px;
+		text-align: center;
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		padding: 10px;
+	}
+
+	.time {
+		border-right: 1px solid #000;
+		width: 203px;
+		text-align: center;
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+	}
+
+	.infoBox {
+		width: calc(100% - 476px);
+		display: flex;
+		flex-direction: column;
+		justify-items: center;
+
+		.iBox {
+			flex: 1;
+			display: flex;
+			border-top: 1px solid #000;
+			border-bottom: 1px solid #000;
+
+			.carCss {
+				border-right: 1px solid #000;
+				width: 209px;
+				text-align: center;
+				display: flex;
+				flex-direction: column;
+				justify-content: center;
+			}
+
+			.remark {
+				border-right: 1px solid #000;
+				width: 63px;
+				text-align: center;
+				display: flex;
+				flex-direction: column;
+				justify-content: center;
+			}
+
+			.gx {
+				border-right: 1px solid #000;
+				width: 61px;
+				text-align: center;
+				display: flex;
+				flex-direction: column;
+				justify-content: center;
+			}
+
+			.ro {
+				width: 87.5px;
+			}
+
+			.pr {
+				width: 139px;
+			}
+
+			.ot {
+				width: 90px;
+				border: none;
+			}
+		}
+
+		.iBox:first-child {
+			border-top: none;
+		}
+
+		.iBox:last-child {
+			border-bottom: none;
+		}
+	}
+}
+
+.signBox {
+	width: 100%;
+	height: 66px;
+	background: #FFFFFF;
+	border: 1px solid #E1E5ED;
+	box-shadow: 0 -1px 4px 0 rgba(0, 0, 0, 0.05);
+	display: flex;
+	justify-content: flex-end;
+	padding: 0 70px;
+
+	.row {
+		width: 1px;
+		height: 30px;
+		background-color: #ccc;
+		margin-top: 18px;
+	}
+
+	.signContent {
+		display: flex;
+		margin: 0 54px;
+
+		.signTitle {
+			display: flex;
+			flex-direction: column;
+			justify-content: center;
+			text-align: right;
+		}
+
+		.signInfo {
+			display: flex;
+			flex-direction: column;
+			justify-content: center;
+			font-size: 18px;
+			color: #0052A4;
+			margin-left: 16px;
+		}
+
+		.signImg {
+			width: 100px;
+			height: 54px;
+			margin-top: 5px;
+			margin-left: 10px;
+		}
+	}
+
+	.signContent:last-child {
+		margin-right: 0;
+	}
+}
 </style>
\ No newline at end of file
diff --git a/pages/shipWork/noticeSign.vue b/pages/shipWork/noticeSign.vue
index 1652a28..09861c3 100644
--- a/pages/shipWork/noticeSign.vue
+++ b/pages/shipWork/noticeSign.vue
@@ -31,7 +31,7 @@
 							</view>
 							<view class="ul">
 								<view class="li">
-									<p>船名(M/V):</p><text>{{shipInfo.vslCnname}}</text>
+									<p>船名(M/V):</p><text>{{shipInfo.vslEnname}}</text>
 								</view>
 								<view class="li">
 									<p>航次(Voy):</p><text>{{tableInfo.vvyName}}</text>
@@ -213,7 +213,7 @@
 							<view class="signInfo" v-if="zdySign.url == ''" @click="togoSign('0')">
 								去签名
 							</view>
-							<view class="signImg" v-else>
+							<view class="signImg" v-else @click="togoSign('0')">
 								<image :src="zdySign.url"></image>
 							</view>
 						</view>
@@ -226,7 +226,7 @@
 							<view class="signInfo" v-if="czSign.url == ''" @click="togoSign('1')">
 								去签名
 							</view>
-							<view class="signImg" v-else>
+							<view class="signImg" v-else @click="togoSign('1')">
 								<image :src="czSign.url"></image>
 							</view>
 						</view>
diff --git a/pages/shipWork/opinionSign.vue b/pages/shipWork/opinionSign.vue
index 4da501d..d04b878 100644
--- a/pages/shipWork/opinionSign.vue
+++ b/pages/shipWork/opinionSign.vue
@@ -33,7 +33,7 @@
 							<view class="ul">
 								<view class="li">
 									<p>船名/Name of Ship:</p>
-									<p>{{shipInfo.vslCnname}}</p>
+									<p>{{shipInfo.vslEnname}}</p>
 								</view>
 								<view class="li">
 									<p>航次/Voyage No.:</p>
@@ -171,7 +171,7 @@
 							<view class="signInfo" v-if="cfSign.url == ''" @click="togoSign('2')">
 								去签名
 							</view>
-							<view class="signImg" v-else>
+							<view class="signImg" v-else @click="togoSign('2')">
 								<image :src="cfSign.url"></image>
 							</view>
 						</view>
@@ -184,7 +184,7 @@
 							<view class="signInfo" v-if="zdySign.url == ''" @click="togoSign('0')">
 								去签名
 							</view>
-							<view class="signImg" v-else>
+							<view class="signImg" v-else @click="togoSign('0')">
 								<image :src="zdySign.url"></image>
 							</view>
 						</view>
@@ -197,7 +197,7 @@
 							<view class="signInfo" v-if="czSign.url == ''" @click="togoSign('1')">
 								去签名
 							</view>
-							<view class="signImg" v-else>
+							<view class="signImg" v-else @click="togoSign('1')">
 								<image :src="czSign.url"></image>
 							</view>
 						</view>
diff --git a/pages/shipWork/peopleAdd.vue b/pages/shipWork/peopleAdd.vue
index 0894e9f..14aa262 100644
--- a/pages/shipWork/peopleAdd.vue
+++ b/pages/shipWork/peopleAdd.vue
@@ -24,12 +24,12 @@
 					</view>
 					<view class="li">
 						<p><text class="required" v-if="obj.state != 'look'">*</text>天气：</p>
-						<!-- <uni-data-select v-model="tqValue" :localdata="tqList" @change="tqChange"
-							v-if="obj.state != 'look'"></uni-data-select> -->
+						<uni-data-select v-model="tqValue" :localdata="tqList" @change="tqChange"
+							v-if="obj.state != 'look'"></uni-data-select>
 						<!-- <uni-easyinput v-if="obj.state != 'look'" v-model="tqTextValue"
 							placeholder="请输入"></uni-easyinput> -->
-						<!-- <text v-else>{{peopleRow.weatherType}}</text> -->
-						<text>{{ tqTextValue }}</text>
+						<text v-else>{{peopleRow.weatherType}}</text>
+						<!-- <text>{{ tqTextValue }}</text> -->
 					</view>
 					<view class="li">
 						<p><text class="required" v-if="obj.state != 'look'">*</text>泊位：</p>
@@ -187,8 +187,15 @@
 					} else if (tableName == "shipmentBasicShiftList") {
 						this.beginDate = value[0].beginTime
 						this.endDate = value[2].endTime
-					} else if(tableName == "messageRespList") {
-                       console.log('value',value);
+					} else if(tableName == 'messageRespList') {
+						 if(value[0].weatherType) {
+							this.tqTextValue = value[0].weatherType
+							this.tqList.forEach(v => {
+				            	if (v.text == this.tqTextValue) {
+				            		this.tqValue = v.value
+				            	}
+				            })
+						 }
 					}
 				}).catch((error) => {
 					// 在reject时执行的回调函数
@@ -210,31 +217,36 @@
 						value: v.ptrCode
 					})
 				})
-				// // 天气下拉数据
-				// let tqOption = []
-				// this.optionData.forEach((v, index) => {
-				// 	if (v.dictionariesName == 'weather') {
-				// 		tqOption.push(v)
-				// 	}
-				// })
-				// tqOption.forEach((v, index) => {
-				// 	this.tqList.push({
-				// 		text: v.weatherType,
-				// 		value: v.weatherTypeDesc
-				// 	})
-				// })
+				// 天气下拉数据
+				let tqOption = []
+				this.optionData.forEach((v, index) => {
+					if (v.dictionariesName == 'weather') {
+						tqOption.push(v)
+					}
+				})
+				tqOption.forEach((v, index) => {
+					this.tqList.push({
+						text: v.ptrDesc,
+						value: v.ptrCode
+					})
+				})
 			},
 			// 获取当前行信息
 			getRow() {
 				this.peopleRow = uni.getStorageSync('peopleRow');
 				this.hcValue = this.peopleRow.vvyId
 				this.hcTextValue = this.peopleRow.vvyName
-				if (this.peopleRow.weatherId != undefined) {
-					this.tqValue = this.peopleRow.weatherId
+				if (this.peopleRow.weatherType) {
+					this.tqTextValue = this.peopleRow.weatherType
+					this.tqList.forEach(v => {
+				     	if (v.text == this.tqTextValue) {
+							this.tqValue = v.value
+				     	}
+				     })
 				} else {
-					this.tqValue = ""
+					this.tqTextValue = ""
 				}
-				this.tqTextValue = this.peopleRow.weatherType
+				// this.tqTextValue = this.peopleRow.weatherType
 				this.bwValue = this.peopleRow.bthId
 				this.bwTextValue = this.peopleRow.bthIdName
 				this.workValue = this.peopleRow.workSuite
@@ -274,15 +286,15 @@
 					}
 				})
 			},
-			// // 天气下拉
-			// tqChange(e) {
-			// 	this.tqValue = e;
-			// 	this.tqList.forEach(v => {
-			// 		if (v.value == e) {
-			// 			this.tqTextValue = v.text
-			// 		}
-			// 	})
-			// },
+			// 天气下拉
+			tqChange(e) {
+				this.tqValue = e;
+				this.tqList.forEach(v => {
+					if (v.value == e) {
+						this.tqTextValue = v.text
+					}
+				})
+			},
 			// 作业组数
 			workChange(val) {
 				this.workValue = val;
@@ -419,14 +431,14 @@
 						`UPDATE messageRespList SET bthId = '${this.bwValue}',bthIdName = '${this.bwTextValue}',
 						jobStartTime = '${this.startTime}',jobEndTime = '${this.endTime}',shipPerson = '${this.shipValue}',
 						vvyId = '${this.hcValue}',vvyName = '${this.hcTextValue}',weatherType = '${this.tqTextValue}',
-						weatherTypeDesc = '${this.tqTextValue}',workSuite = '${this.workValue}',webStatus = '${webStatus}',
+						weatherTypeDesc = '${this.tqValue}',workSuite = '${this.workValue}',webStatus = '${webStatus}',
 						importExportFlagName = '${this.importExportFlagName}',webDate = '${webDate}' WHERE pmeId = '${this.peopleRow.pmeId}';`
 					this.executeSql(sql)
 				} else if (this.obj.state == "add") {
 					let sql =
 						`insert into messageRespList values('${pmeId}','${this.vtpId}','${this.bwValue}','${this.bwTextValue}',
-						'${this.startTime}','${this.endTime}','${this.shipValue}','${this.hcValue}','${this.hcTextValue}','${this.tqTextValue}',
-						'${this.tqTextValue}','${this.workValue}','${this.importExportFlagName}','${0}','${webStatus}','${webDate}')`
+						'${this.startTime}','${this.endTime}','${this.shipValue}','${this.hcValue}','${this.hcTextValue}','${this.tqTextValue}','${this.tqValue}',
+						 '${this.workValue}','${this.importExportFlagName}','${0}','${webStatus}','${webDate}')`
 					this.executeSql(sql)
 				}
 				uni.navigateTo({
diff --git a/pages/shipWork/shiftAdd.vue b/pages/shipWork/shiftAdd.vue
index 11ba8d9..3e1f0cf 100644
--- a/pages/shipWork/shiftAdd.vue
+++ b/pages/shipWork/shiftAdd.vue
@@ -746,7 +746,7 @@
 					if (v.vvyId == e) {
 						this.importExportFlagName = v.importExportFlagName
 						this.spmTradeName = v.tradeTypeName
-						if (this.importExportFlagName = "进口") {
+						if (this.importExportFlagName == "进口") {
 							this.zxTextValue = "卸货"
 							this.zxValue = "2"
 						} else {
diff --git a/pages/shipWork/shiftDetails.vue b/pages/shipWork/shiftDetails.vue
index 90b4963..5916acc 100644
--- a/pages/shipWork/shiftDetails.vue
+++ b/pages/shipWork/shiftDetails.vue
@@ -55,7 +55,7 @@
 									</view>
 									<view class="li wLi">
 										<p>备注：</p>
-										<text>{{item2.remark}}</text>
+										<text class="remark">{{item2.remark}}</text>
 									</view>
 								</view>
 							</view>
@@ -85,7 +85,7 @@
 									</view>
 									<view class="li wLi">
 										<p>备注：</p>
-										<text>{{item2.remark}}</text>
+										<text class="remark">{{item2.remark}}</text>
 									</view>
 								</view>
 							</view>
@@ -432,6 +432,7 @@
 				display: flex;
 
 				.smasonry {
+					width: 49%;
 					flex: 1;
 					display: flex;
 					flex-direction: column;
@@ -439,6 +440,9 @@
 					background-color: #F6F7F9;
 					padding: 16px 16px 100px;
 					align-items: baseline;
+					.remark{
+						word-break: break-all;
+					}
 				}
 			}
 
@@ -462,22 +466,18 @@
 				flex-wrap: wrap;
 				padding: 0 16px 16px;
 				margin-bottom: 16px;
-                width: 49%;
 				.li {
 					width: 100%;
 					display: flex;
 					justify-content: space-between;
-					height: 50px;
+					min-height: 50px;
 					line-height: 50px;
 					font-size: 16px;
 				}
-
-				.wLi {
-					min-height: 50px;
-					width: 49%;
-					display:flex;
-					flex-wrap: wrap;
-				}
+				// .wLi {
+				// 	width: 100%;
+				// 	min-height: 50px;
+				// }
 			}
 
 			.aUl {
diff --git a/pages/shipWork/supplyAdd.vue b/pages/shipWork/supplyAdd.vue
index c550e5f..8bc4606 100644
--- a/pages/shipWork/supplyAdd.vue
+++ b/pages/shipWork/supplyAdd.vue
@@ -197,8 +197,8 @@
 				this.importExportFlagName = this.supplyRow.importExportFlagName
 				this.stopBerthage = this.supplyRow.stopBerthage
 				this.stopBerthageName = this.supplyRow.stopBerthageName
-				this.supplyTypeId = this.supplyRow.supplyType
-				this.supplyType = this.supplyRow.supplyTypeNm
+				this.supplyTypeId = this.supplyRow.supplyTypeNm
+				this.supplyType = this.supplyRow.supplyType
 				this.supplyAmount = this.supplyRow.supplyAmount
 				this.supplyDate = (this.supplyRow.supplyDate[0] ? this.supplyRow.supplyDate : '')
 				this.status = this.supplyRow.status
@@ -277,15 +277,15 @@
 				if (this.obj.state == "edit") {
 					let sql =
 						`UPDATE shipmentShipSupplyRespList SET vvyId = '${this.vvyId}',vvyName = '${this.vvyName}',importExportFlagName = '${this.importExportFlagName}',
-						stopBerthage = '${this.stopBerthage}',stopBerthageName = '${this.stopBerthageName}',supplyType = '${this.supplyTypeId}',
-						supplyTypeNm = '${this.supplyType}',supplyAmount = '${this.supplyAmount}',supplyDate = '${this.supplyDate}',webStatus = '${webStatus}',
+						stopBerthage = '${this.stopBerthage}',stopBerthageName = '${this.stopBerthageName}',supplyType = '${this.supplyType}',
+						supplyTypeNm = '${this.supplyTypeId}',supplyAmount = '${this.supplyAmount}',supplyDate = '${this.supplyDate}',webStatus = '${webStatus}',
 						webDate = '${webDate}' WHERE sssId = '${this.supplyRow.sssId}';`
 					this.executeSql(sql)
 				} else if (this.obj.state == "add") {
 					let sql =
 						`insert into shipmentShipSupplyRespList values('${sssId}','${this.vtpId}','${this.vvyId}','${this.vvyName}',
-						'${this.importExportFlagName}','${this.stopBerthage}','${this.stopBerthageName}','${this.supplyTypeId}',
-						'${this.supplyType}','${this.supplyAmount}','${this.supplyDate}','${0}',
+						'${this.importExportFlagName}','${this.stopBerthage}','${this.stopBerthageName}','${this.supplyType}','${this.supplyTypeId}',
+						'${this.supplyAmount}','${this.supplyDate}','${0}',
 						'${webStatus}','${webDate}')`
 					this.executeSql(sql)
 				}
diff --git a/pages/shipWork/supplySign.vue b/pages/shipWork/supplySign.vue
index 51ae9dd..7481875 100644
--- a/pages/shipWork/supplySign.vue
+++ b/pages/shipWork/supplySign.vue
@@ -9,7 +9,7 @@
 						<view class="container">
 							<view class="head">
 								<view class="leftHead">
-									<image id="HT-logo" src="../../static/images/theme/logo.png" mode="widthFix">
+									<image id="HT-logo" src="../../static/images/theme/logo.png" mode="widthFix" />
 								</view>
 								<view class="rightHead">
 									<p>上海海通国际汽车码头有限公司</p>
@@ -32,7 +32,7 @@
 							<view class="ul">
 								<view class="li">
 									<p>船名/Name of Ship:</p>
-									<p>{{shipInfo.vslCnname}}</p>
+									<p>{{shipInfo.vslEnname}}</p>
 								</view>
 								<view class="li">
 									<p>{{tableInfo.supplyType}}/Fresh Supply:</p>
@@ -63,7 +63,7 @@
 							<view class="signInfo" v-if="czSign.signFile == ''" @click="togoSign('1')">
 								去签名
 							</view>
-							<view class="signImg" v-else>
+							<view class="signImg" v-else @click="togoSign('1')">
 								<image :src="czSign.signFile"></image>
 								<!-- <text class="del" @click="delSign(czSign.id)">删除</text> -->
 							</view>
diff --git a/pages/shipWork/untieSign.vue b/pages/shipWork/untieSign.vue
index bb18d24..ccd64e0 100644
--- a/pages/shipWork/untieSign.vue
+++ b/pages/shipWork/untieSign.vue
@@ -9,7 +9,7 @@
 						<view class="container">
 							<view class="head">
 								<view class="leftHead">
-									<image id="HT-logo" src="../../static/images/theme/logo.png" mode="widthFix">
+									<image id="HT-logo" src="../../static/images/theme/logo.png" mode="widthFix" />
 								</view>
 								<view class="rightHead">
 									<p>上海海通国际汽车码头有限公司</p>
@@ -32,7 +32,7 @@
 							<view class="ul">
 								<view class="li">
 									<p>船名/Name of Ship:</p>
-									<p>{{shipInfo.vslCnname}}</p>
+									<p>{{shipInfo.vslEnname}}</p>
 								</view>
 								<view class="li">
 									<p>船舶净吨/Net tonnage:</p>
@@ -90,7 +90,7 @@
 							<view class="signInfo" v-if="czSign.signFile == ''" @click="togoSign('1')">
 								去签名
 							</view>
-							<view class="signImg" v-else>
+							<view class="signImg" v-else @click="togoSign('1')">
 								<image :src="czSign.signFile"></image>
 								<!-- <text class="del" @click="delSign(czSign.id)">删除</text> -->
 							</view>
diff --git a/pages/shipWork/workAssignAdd.vue b/pages/shipWork/workAssignAdd.vue
index 5ae4d46..c5afee3 100644
--- a/pages/shipWork/workAssignAdd.vue
+++ b/pages/shipWork/workAssignAdd.vue
@@ -260,7 +260,7 @@
 					if (v.vvyId == e) {
 						this.importExportFlagName = v.importExportFlagName
 						this.spmTradeName = v.tradeTypeName
-						if (this.importExportFlagName = "进口") {
+						if (this.importExportFlagName == "进口") {
 							this.loaderTypeName = "卸货"
 							this.loaderType = "2"
 						} else {
diff --git a/pages/shipWork/workAssignSign.vue b/pages/shipWork/workAssignSign.vue
index 67eb2a0..5b81bb4 100644
--- a/pages/shipWork/workAssignSign.vue
+++ b/pages/shipWork/workAssignSign.vue
@@ -9,7 +9,7 @@
 						<view class="container">
 							<view class="head">
 								<view class="leftHead">
-									<image id="HT-logo" src="../../static/images/theme/logo.png" mode="widthFix">
+									<image id="HT-logo" src="../../static/images/theme/logo.png" mode="widthFix" />
 								</view>
 								<view class="rightHead">
 									<p>上海海通国际汽车码头有限公司</p>
@@ -30,7 +30,7 @@
 							</view>
 							<view class="ul">
 								<view class="li">
-									<p>船名:</p><text>{{shipInfo.vslCnname}}</text>
+									<p>船名:</p><text>{{shipInfo.vslEnname}}</text>
 								</view>
 								<view class="li">
 									<p>航次:</p><text>{{tableInfo.vvyName}}</text>
@@ -42,7 +42,9 @@
 									<p>人数:</p><text>{{tableInfo.personNumber}}</text>
 								</view>
 								<view class="li">
-									<p>装/卸货辆/件:</p><text>{{tableInfo.vehicleSize}}/{{tableInfo.sparePart}}</text>
+									<p>装/卸货辆/件:</p>
+									<text v-if="tableInfo.loaderTypeName == '卸货'">discharge{{tableInfo.vehicleSize}}+{{tableInfo.sparePart}}</text>
+									<text v-else>load{{tableInfo.vehicleSize}}+{{tableInfo.sparePart}}</text>
 								</view>
 								<view class="li">
 									<p>工班:</p><text>{{tableInfo.pwcTypeName}}</text>
@@ -64,8 +66,8 @@
 								<tbody v-for="(item,index) in items" :key="index">
 									<tr class="trTitle">
 										<td class="td1h">{{item.itemTitle}}</td>
-										<td class="center">YES</td>
-										<td class="td3">NO</td>
+										<td class="center" v-show="index == 0">YES</td>
+										<td class="td3" v-show="index == 0">NO</td>
 									</tr>
 									<tr class="content" v-for="(item2,index2) in item.list" :key="index2">
 										<td class="td1">
@@ -91,7 +93,7 @@
 							<view class="signInfo" v-if="zdySign.signFile == ''" @click="togoSign('0')">
 								去签名
 							</view>
-							<view class="signImg" v-else>
+							<view class="signImg" v-else @click="togoSign('0')">
 								<image :src="zdySign.signFile"></image>
 							</view>
 						</view>