From 5303d552ecce3c4cfc70dac160e2867539e90fc2 Mon Sep 17 00:00:00 2001
From: Panzihang <819652404@qq.com>
Date: Mon, 24 Jul 2023 16:56:46 +0800
Subject: [PATCH] =?UTF-8?q?pad=E6=96=B0=E5=A2=9E=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E6=96=B0=E5=A2=9E=E9=80=BB=E8=BE=91=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/head-info/head-info.vue | 191 +++++++++++++++++++++++-
 pages.json                         |  20 ++-
 pages/login/index.vue              | 180 +++++++++++++++++++++++
 pages/shipWork/abnormal.vue        |  42 +++++-
 pages/shipWork/abnormalAdd.vue     |  12 +-
 pages/shipWork/brandDetails.vue    |  33 +++--
 pages/shipWork/documentList.vue    |   4 -
 pages/shipWork/index.vue           |  53 ++++---
 pages/shipWork/mafi.vue            |  44 ++++--
 pages/shipWork/mafiAdd.vue         |  12 +-
 pages/shipWork/mixWork.vue         |  61 +++++---
 pages/shipWork/notice.vue          |  42 +++++-
 pages/shipWork/noticeAdd.vue       |  12 +-
 pages/shipWork/opinion.vue         |  42 +++++-
 pages/shipWork/opinionAdd.vue      |  12 +-
 pages/shipWork/patrol.vue          |  19 ++-
 pages/shipWork/patrolAdd.vue       |  12 +-
 pages/shipWork/peopleAdd.vue       |  12 +-
 pages/shipWork/shiftAdd.vue        | 156 +++++++++++---------
 pages/shipWork/shiftDetails.vue    |  62 ++++----
 pages/shipWork/sign.vue            | 225 +++++++++++++++++++++++++++++
 pages/shipWork/supply.vue          |  42 +++++-
 pages/shipWork/supplyAdd.vue       |  12 +-
 pages/shipWork/untieAdd.vue        |  12 +-
 pages/shipWork/untieCord.vue       |  44 ++++--
 pages/shipWork/workAssign.vue      |  42 +++++-
 pages/shipWork/workAssignAdd.vue   |  12 +-
 27 files changed, 1151 insertions(+), 259 deletions(-)
 create mode 100644 pages/login/index.vue
 create mode 100644 pages/shipWork/sign.vue

diff --git a/components/head-info/head-info.vue b/components/head-info/head-info.vue
index 968a907..f24ccb4 100644
--- a/components/head-info/head-info.vue
+++ b/components/head-info/head-info.vue
@@ -1,18 +1,130 @@
 <template>
 	<view class="headInfo">
-		<view class="info">
+		<view class="info" @click="showInfo">
 			<image class="toux" src="@/static/images/theme/toux.png" mode="widthFix"></image>
 			<text>wchenp</text>
 			<uni-icons type="gear" size="21" />
 		</view>
-
+		<view class="infoList" v-if="infoType">
+			<view class="userInfo">
+				<p>张星星 - 堆场计划员</p>
+				<p>12341234567</p>
+			</view>
+			<view class="borTop" @click="tabsPort('center')">
+				<uni-icons type="loop" size="16" />
+				<text>切换港口</text>
+			</view>
+			<view class="borTop" @click="outLogin">
+				<uni-icons type="undo" size="16" />
+				<text>退出登录</text>
+			</view>
+		</view>
+		<uni-popup ref="popup" background-color="#fff" @change="change">
+			<view class="popupBox">
+				<view class="ul">
+					<view class="li" v-for="(item,index) in portList" :key="index"
+						:class="{active:activeIndex == index}" @click="selectPort(item,index)">
+						<text>{{item.title}}</text>
+					</view>
+				</view>
+				<view class="btnBox">
+					<button class="btn" type="default" @click="close">取 消</button>
+					<button class="btn" type="primary" @click="toGo">确 定</button>
+				</view>
+			</view>
+		</uni-popup>
+		<uni-popup ref="popup2" type="dialog">
+			<uni-popup-dialog confirmText="确定" content="是否退出登录？" @close="close2"
+				@confirm="outConfirm"></uni-popup-dialog>
+		</uni-popup>
 	</view>
 </template>
 
 <script>
+	export default {
+		data() {
+			return {
+				infoType: false,
+				// 弹框状态
+				type: "",
+				portList: [{
+						value: "1",
+						title: "港口1"
+					},
+					{
+						value: "2",
+						title: "港口2"
+					},
+					{
+						value: "3",
+						title: "港口3"
+					},
+				],
+				portId: "",
+				portName: "",
+				activeIndex: 0,
+			}
+		},
+		mounted() {
+			this.activeIndex = uni.getStorageSync("selectPortIndex")
+			this.portId = this.portList[this.activeIndex].value
+			this.portName = this.portList[this.activeIndex].title
+		},
+		methods: {
+			showInfo() {
+				this.infoType = !this.infoType
+			},
+			// 点击切换港口
+			tabsPort(type) {
+				this.type = type
+				this.$refs.popup.open(type)
+			},
+			// 弹框
+			change(e) {},
+			// 选择弹框内容
+			selectPort(item, index) {
+				this.portName = item.title
+				this.portId = item.value
+				this.activeIndex = index
+			},
+			// 确认弹框
+			toGo() {
+				let portObj = {
+					portName: this.portName,
+					portId: this.portId
+				}
+				uni.setStorageSync('portObj', portObj);
+				uni.setStorageSync('selectPortIndex', this.activeIndex)
+				this.$refs.popup.close()
+				this.infoType = false
+				uni.navigateTo({
+					url: '/pages/index/index'
+				})
+			},
+			// 关闭弹框
+			close() {
+				this.infoType = false
+				this.$refs.popup.close()
+			},
+			// 点击退出登录
+			outLogin() {
+				this.$refs.popup2.open()
+			},
+			// 确认退出登录
+			outConfirm() {
+				uni.navigateTo({
+					url: '/pages/login/index'
+				})
+			},
+			// 取消退出登录
+			close2() {
+				this.infoType = false
+			}
+		}
+	}
 </script>
 
-<style>
+<style lang="less" scoped>
 	.headInfo {
 		width: 100%;
 		height: 40px;
@@ -21,6 +133,7 @@
 		border-bottom: 1px solid #999999;
 		display: flex;
 		justify-content: flex-end;
+		position: relative;
 
 		.info {
 			width: 120px;
@@ -33,11 +146,73 @@
 				height: 26px;
 				border-radius: 30px;
 				overflow: hidden;
-			}
-
-			text {
-				display: in;
+				display: flex;
+				flex-direction: column;
+				justify-content: center;
 			}
 		}
+
+		.infoList {
+			width: 200px;
+			height: 190px;
+			padding: 10px 20px;
+			border-radius: 8px;
+			background-color: #fff;
+			z-index: 999;
+			display: flex;
+			flex-direction: column;
+			justify-content: space-between;
+			position: absolute;
+			right: 0;
+			top: 40px;
+
+			.borTop {
+				border-top: 1px #ccc solid;
+
+				/deep/.uni-icons {
+					margin-right: 10px;
+				}
+			}
+		}
+
+		.popupBox {
+			width: 500px;
+			height: 400px;
+			overflow: scroll;
+			padding: 30px;
+
+			.ul {
+				display: felx;
+				flex-direction: column;
+				justify-content: space-between;
+
+				.li {
+					padding: 15px 0px;
+					border: 1px solid #ccc;
+					border-radius: 4px;
+					margin-bottom: 10px;
+				}
+
+				.active {
+					color: #0079fe;
+					border-color: #0079fe;
+				}
+			}
+
+			.btnBox {
+				display: flex;
+				justify-content: space-between;
+
+				.btn {
+					flex: 1;
+					padding: 10px 0;
+					margin: 10px 20px;
+				}
+			}
+		}
+
+		/deep/.uni-dialog-title {
+			display: none;
+		}
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 5fa9cd2..305e5b5 100644
--- a/pages.json
+++ b/pages.json
@@ -1,5 +1,11 @@
 {
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
+		{
+			"path": "pages/login/index",
+			"style": {
+				"navigationBarTitleText": "登录"
+			}
+		},
 		{
 			"path": "pages/index/index",
 			"style": {
@@ -36,6 +42,12 @@
 				"navigationBarTitleText": "单证列表"
 			}
 		},
+		{
+			"path": "pages/shipWork/sign",
+			"style": {
+				"navigationBarTitleText": "单证签名"
+			}
+		},
 		{
 			"path": "pages/shipWork/mixWork",
 			"style": {
@@ -45,18 +57,18 @@
 		{
 			"path": "pages/shipWork/peopleAdd",
 			"style": {
-				"navigationBarTitleText": "杂项作业查看(人员信息)"
+				"navigationBarTitleText": "杂项作业(人员信息)"
 			}
 		},
 		{
 			"path": "pages/shipWork/shiftAdd",
 			"style": {
-				"navigationBarTitleText": "杂项作业查看(工班信息)"
+				"navigationBarTitleText": "杂项作业(工班信息)"
 			}
 		}, {
 			"path": "pages/shipWork/shiftDetails",
 			"style": {
-				"navigationBarTitleText": "工班信息详情"
+				"navigationBarTitleText": "杂项作业(工班信息)"
 			}
 		}, {
 			"path": "pages/shipWork/untieCord",
@@ -159,7 +171,7 @@
 			"style": {
 				"navigationBarTitleText": "品牌明细"
 			}
-		},{
+		}, {
 			"path": "pages/shipWork/carDetails",
 			"style": {
 				"navigationBarTitleText": "车型明细"
diff --git a/pages/login/index.vue b/pages/login/index.vue
new file mode 100644
index 0000000..fa210db
--- /dev/null
+++ b/pages/login/index.vue
@@ -0,0 +1,180 @@
+<template>
+	<view class="login">
+		<view class="loginBox">
+			<van-field v-model="account" left-icon="manager" placeholder="请输入账号"
+				:rules="[{ required: true, message: '请输入账号' }]" />
+			<van-field v-model="password" type="password" left-icon="lock" right-icon="eye" placeholder="请输入密码"
+				:rules="[{ required: true, message: '请输入密码' }]" @click-right-icon="rightIcon" v-if="!pwdType" />
+			<van-field v-model="password" left-icon="lock" right-icon="closed-eye" placeholder="请输入密码"
+				:rules="[{ required: true, message: '请输入密码' }]" @click-right-icon="rightIcon" v-else />
+			<view class="button" @click="loginGo('center')">登录</view>
+			<uni-popup ref="popup" background-color="#fff" @change="change">
+				<view class="popupBox">
+					<view class="ul">
+						<view class="li" v-for="(item,index) in portList" :key="index"
+							:class="{active:activeIndex == index}" @click="selectPort(item,index)">
+							<text>{{item.title}}</text>
+						</view>
+					</view>
+					<view class="btnBox">
+						<button class="btn" type="default" @click="close">取 消</button>
+						<button class="btn" type="primary" @click="toGo">确 定</button>
+					</view>
+				</view>
+			</uni-popup>
+			<uni-popup ref="popup2" type="dialog">
+				<uni-popup-dialog type="error" confirmText="确定" title="通知" content="未开通权限，请联系管理员"></uni-popup-dialog>
+			</uni-popup>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				// rtoswuhan1
+				account: 'rtoswuhan1',
+				// 123456
+				password: '123456',
+				// 密码状态
+				pwdType: false,
+				// 弹框状态
+				type: "",
+				portList: [],
+				portId: "",
+				portName: "",
+				activeIndex: 0,
+			}
+		},
+		mounted() {
+			this.portList = [{
+					value: "1",
+					title: "港口1"
+				},
+				{
+					value: "2",
+					title: "港口2"
+				},
+				{
+					value: "3",
+					title: "港口3"
+				},
+			]
+		},
+		methods: {
+			// 点击密码框右侧按钮
+			rightIcon() {
+				this.pwdType = !this.pwdType
+			},
+			// 登录
+			loginGo(type) {
+				if (this.account == "rtoswuhan1" && this.password == "123456") {
+					if (this.portList.length > 0) {
+						this.type = type
+						this.$refs.popup.open(type)
+						this.portId = this.portList[0].value
+						this.portName = this.portList[0].title
+					} else {
+						this.$refs.popup2.open()
+					}
+				}
+			},
+			// 弹框
+			change(e) {},
+			// 选择弹框内容
+			selectPort(item, index) {
+				this.portName = item.title
+				this.portId = item.value
+				this.activeIndex = index
+			},
+			// 确认弹框
+			toGo() {
+				let portObj = {
+					portName: this.portName,
+					portId: this.portId
+				}
+				uni.setStorageSync('portObj', portObj)
+				uni.setStorageSync('selectPortIndex', this.activeIndex)
+				this.$refs.popup.close()
+				uni.navigateTo({
+					url: '/pages/index/index'
+				})
+			},
+			// 关闭弹框
+			close() {
+				this.$refs.popup.close()
+			},
+		}
+	}
+</script>
+
+<style lang="less" scoped>
+	.login {
+		height: calc(100vh - 44px);
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+
+		.loginBox {
+			width: 500px;
+			height: 300px;
+			border: 1px solid #999;
+			margin: 0 auto;
+			padding: 30px;
+
+			/deep/.van-cell {
+				margin-top: 20px;
+			}
+
+			.popupBox {
+				width: 500px;
+				height: 400px;
+				overflow: scroll;
+				padding: 30px;
+				line-height: 40px;
+
+				.ul {
+					display: felx;
+					flex-direction: column;
+					justify-content: space-between;
+
+					.li {
+						padding: 15px 0px;
+						border: 1px solid #ccc;
+						border-radius: 4px;
+						margin-bottom: 10px;
+					}
+
+					.active {
+						color: #0079fe;
+						border-color: #0079fe;
+					}
+				}
+
+				.btnBox {
+					display: flex;
+					justify-content: space-between;
+
+					.btn {
+						flex: 1;
+						padding: 10px 0;
+						margin: 10px 20px;
+					}
+				}
+			}
+		}
+
+		.button {
+			color: #fff;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			letter-spacing: 4rpx;
+			border-radius: 12rpx;
+			height: 80rpx;
+			background-color: #0079fe;
+			margin-top: 50px;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/shipWork/abnormal.vue b/pages/shipWork/abnormal.vue
index fb74c3c..f850840 100644
--- a/pages/shipWork/abnormal.vue
+++ b/pages/shipWork/abnormal.vue
@@ -1,15 +1,21 @@
 <template>
 	<view class="abnormal">
 		<view class="container">
-			<view class="ul">
-				<view class="li" v-for="(item,index) in infoList" :key="index" @click="add('look',item,index)">
-					<view class="title">类型：{{item.type}}</view>
-					<p>上传状态：未上传</p>
-					<p>航次：{{item.vvyName}}</p>
-					<p>贸易类型：{{item.importExportFlagName}}</p>
-					<p>进出口：{{item.tradeTypeName}}</p>
-				</view>
+			<view class="signBox">
+				<p class="sign" @click="sign">点击签名</p>
 			</view>
+			<template v-if="infoList.length > 0">
+				<view class="ul">
+					<view class="li" v-for="(item,index) in infoList" :key="index" @click="add('look',item,index)">
+						<view class="title">类型：{{item.type}}</view>
+						<p>上传状态：未上传</p>
+						<p>航次：{{item.vvyName}}</p>
+						<p>贸易类型：{{item.importExportFlagName}}</p>
+						<p>进出口：{{item.tradeTypeName}}</p>
+					</view>
+				</view>
+			</template>
+			<o-empty v-else height="70vh" bg="#f5f6fa" />
 			<view class="addBtn" @click="add('add')">+ 新增</view>
 		</view>
 	</view>
@@ -28,6 +34,13 @@
 			this.infoList = uni.getStorageSync('addAbnormalArr')
 		},
 		methods: {
+			// 点击签名
+			sign() {
+				uni.navigateTo({
+					url: '/pages/shipWork/sign'
+				})
+			},
+			// 点击新增
 			add(state, item, index) {
 				if (state != 'add') {
 					uni.setStorageSync('abnormalRow', item);
@@ -50,6 +63,19 @@
 		.container {
 			padding: 30px 20px;
 
+			.signBox {
+				display: flex;
+				justify-content: flex-end;
+
+				.sign {
+					text-align: right;
+					color: #2979ff;
+					padding: 10px;
+					background: #fff;
+					border: 1px solid #ccc;
+				}
+			}
+
 			.ul {
 				padding: 20px 0;
 
diff --git a/pages/shipWork/abnormalAdd.vue b/pages/shipWork/abnormalAdd.vue
index e7e6698..cc2b8eb 100644
--- a/pages/shipWork/abnormalAdd.vue
+++ b/pages/shipWork/abnormalAdd.vue
@@ -38,6 +38,10 @@
 					<text v-else>{{remark}}</text>
 				</view>
 			</view>
+			<uni-popup ref="popup" type="dialog">
+				<uni-popup-dialog type="error" confirmText="确定" title="通知" content="是否删除此条数据"
+					@confirm="delConfirm"></uni-popup-dialog>
+			</uni-popup>
 			<view class="btnList">
 				<van-button type="default" @click="cancel">取消</van-button>
 				<van-button type="danger" v-if="obj.state == 'look'" @click="del">删除</van-button>
@@ -127,8 +131,8 @@
 					url: '/pages/shipWork/abnormal'
 				})
 			},
-			// 删除
-			del() {
+			// 弹框删除
+			delConfirm() {
 				let addAbnormalArr = uni.getStorageSync('addAbnormalArr')
 				addAbnormalArr.splice(this.abnormalRowIndex, 1)
 				uni.setStorageSync('addAbnormalArr', addAbnormalArr);
@@ -136,6 +140,10 @@
 					url: '/pages/shipWork/abnormal'
 				})
 			},
+			// 删除
+			del() {
+				this.$refs.popup.open()
+			},
 			// 保存
 			save() {
 				let addAbnormalArr = uni.getStorageSync('addAbnormalArr')
diff --git a/pages/shipWork/brandDetails.vue b/pages/shipWork/brandDetails.vue
index b3d6f0f..6f910e6 100644
--- a/pages/shipWork/brandDetails.vue
+++ b/pages/shipWork/brandDetails.vue
@@ -10,22 +10,25 @@
 						:defaultValue="defaultValue" @result="resultConditon" />
 				</view>
 			</view>
-			<view class="ul">
-				<view class="li" v-for="(item,index) in listInfo" :key="index" @click="togoCar(item)">
-					<p class="title">品牌：{{item.brdName}}</p>
-					<p>提单号：{{item.mnfBl}}</p>
-					<p>源类型：{{item.sourceType}}</p>
-					<p>场位：{{item.yardPos}}</p>
-					<p>航次：{{item.vvyName}}</p>
-					<p>报关状态：{{item.customsDeclareStatus}}</p>
-					<p>车型：{{item.bvmName}}</p>
-					<p>数量：{{item.amount}}</p>
-					<p>港口：{{item.potName}}</p>
-					<p>报关单号：{{item.customsDeclareNo}}</p>
-					<p>车型明细：{{item.bvdName}}</p>
-					<p>货代：{{item.agentName}}</p>
+			<template v-if="listInfo.length > 0">
+				<view class="ul">
+					<view class="li" v-for="(item,index) in listInfo" :key="index" @click="togoCar(item)">
+						<p class="title">品牌：{{item.brdName}}</p>
+						<p>提单号：{{item.mnfBl}}</p>
+						<p>源类型：{{item.sourceType}}</p>
+						<p>场位：{{item.yardPos}}</p>
+						<p>航次：{{item.vvyName}}</p>
+						<p>报关状态：{{item.customsDeclareStatus}}</p>
+						<p>车型：{{item.bvmName}}</p>
+						<p>数量：{{item.amount}}</p>
+						<p>港口：{{item.potName}}</p>
+						<p>报关单号：{{item.customsDeclareNo}}</p>
+						<p>车型明细：{{item.bvdName}}</p>
+						<p>货代：{{item.agentName}}</p>
+					</view>
 				</view>
-			</view>
+			</template>
+			<o-empty v-else height="70vh" bg="#fff" />
 		</view>
 	</view>
 </template>
diff --git a/pages/shipWork/documentList.vue b/pages/shipWork/documentList.vue
index 00a8e2e..00c4a0f 100644
--- a/pages/shipWork/documentList.vue
+++ b/pages/shipWork/documentList.vue
@@ -60,10 +60,6 @@
 						name: "安全巡检",
 						url: "patrol"
 					},
-					// {
-					// 	name: "船舶载货量",
-					// 	url: "mixWork"
-					// },
 					{
 						name: "船舶资料",
 						url: "shipInfo"
diff --git a/pages/shipWork/index.vue b/pages/shipWork/index.vue
index 81201c2..c9cc422 100644
--- a/pages/shipWork/index.vue
+++ b/pages/shipWork/index.vue
@@ -5,11 +5,11 @@
 			<side-bar path='3'></side-bar>
 			<view class="content">
 				<view class="form">
-					<view class="select">
+					<!-- <view class="select">
 						<uni-data-select v-model="pamValue" :localdata="pamList" @change="pamChange"
 							placeholder="请选择港口">
 						</uni-data-select>
-					</view>
+					</view> -->
 					<view class="select">
 						<superwei-combox :candidates="shipList" :isJSON="true" keyName="spmName" placeholder="请选择船名航次"
 							v-model="shipName" @input="input_json" @select="select_json"></superwei-combox>
@@ -100,7 +100,7 @@
 			return {
 				// 港口
 				pamValue: "",
-				pamList: [],
+				// pamList: [],
 				// 船名航次
 				shipName: "",
 				shipValue: '',
@@ -121,7 +121,8 @@
 			HeadInfo,
 		},
 		mounted() {
-			this.getPam();
+			this.pamValue = uni.getStorageSync('portObj').portId
+			// this.getPam();
 		},
 		methods: {
 			// 获取船的数据
@@ -161,27 +162,27 @@
 				this.initData()
 			},
 			// 获取港区下拉数据
-			getPam() {
-				uni.request({
-					url: this.$local + '/api/shipOperate/queryPortArea',
-					header: {
-						'Content-Type': 'application/json' //自定义请求头信息
-					},
-					method: 'GET', //请求方式，必须为大写
-					success: (res) => {
-						console.log('接口返回------', res);
-						if (res.statusCode === 200) {
-							let arr = res.data.data;
-							arr.forEach((v, index) => {
-								this.pamList.push({
-									text: v.pamName,
-									value: v.pamId
-								})
-							})
-						}
-					}
-				})
-			},
+			// getPam() {
+			// 	uni.request({
+			// 		url: this.$local + '/api/shipOperate/queryPortArea',
+			// 		header: {
+			// 			'Content-Type': 'application/json' //自定义请求头信息
+			// 		},
+			// 		method: 'GET', //请求方式，必须为大写
+			// 		success: (res) => {
+			// 			console.log('接口返回------', res);
+			// 			if (res.statusCode === 200) {
+			// 				let arr = res.data.data;
+			// 				arr.forEach((v, index) => {
+			// 					this.pamList.push({
+			// 						text: v.pamName,
+			// 						value: v.pamId
+			// 					})
+			// 				})
+			// 			}
+			// 		}
+			// 	})
+			// },
 			// 获取船名航次下拉数据
 			getShip() {
 				uni.request({
@@ -198,8 +199,6 @@
 					}
 				})
 			},
-			// 港区下拉
-			pamChange(event) {},
 			// 船名航次下拉模糊查询
 			input_json(e) {
 				this.shipInput = e;
diff --git a/pages/shipWork/mafi.vue b/pages/shipWork/mafi.vue
index 9320c76..f5c3919 100644
--- a/pages/shipWork/mafi.vue
+++ b/pages/shipWork/mafi.vue
@@ -1,16 +1,22 @@
 <template>
 	<view class="mafi">
 		<view class="container">
-			<view class="ul">
-				<view class="li" v-for="(item,index) in infoList" :key="index" @click="add('look',item,index)">
-					<view class="title">马菲板号：{{item.mafiBarcode}}</view>
-					<p>上传状态：未上传</p>
-					<p>尺码：{{item.size}}</p>
-					<p>类型：{{item.lxTextValue}}</p>
-					<p>装卸方式：{{item.loaderType}}</p>
-					<p>航次：{{item.vvyName}}</p>
-				</view>
+			<view class="signBox">
+				<p class="sign" @click="sign">点击签名</p>
 			</view>
+			<template v-if="infoList.length > 0">
+				<view class="ul">
+					<view class="li" v-for="(item,index) in infoList" :key="index" @click="add('look',item,index)">
+						<view class="title">马菲板号：{{item.mafiBarcode}}</view>
+						<p>上传状态：未上传</p>
+						<p>尺码：{{item.size}}</p>
+						<p>类型：{{item.lxTextValue}}</p>
+						<p>装卸方式：{{item.loaderType}}</p>
+						<p>航次：{{item.vvyName}}</p>
+					</view>
+				</view>
+			</template>
+			<o-empty v-else height="70vh" bg="#f5f6fa" />
 			<view class="addBtn" @click="add('add')">+ 新增</view>
 		</view>
 	</view>
@@ -29,6 +35,13 @@
 			this.infoList = uni.getStorageSync('addMafiArr')
 		},
 		methods: {
+			// 点击签名
+			sign() {
+				uni.navigateTo({
+					url: '/pages/shipWork/sign'
+				})
+			},
+			// 点击新增
 			add(state, item, index) {
 				if (state != 'add') {
 					uni.setStorageSync('mafiRow', item);
@@ -51,6 +64,19 @@
 		.container {
 			padding: 30px 20px;
 
+			.signBox {
+				display: flex;
+				justify-content: flex-end;
+
+				.sign {
+					text-align: right;
+					color: #2979ff;
+					padding: 10px;
+					background: #fff;
+					border: 1px solid #ccc;
+				}
+			}
+
 			.ul {
 				padding: 20px 0;
 
diff --git a/pages/shipWork/mafiAdd.vue b/pages/shipWork/mafiAdd.vue
index a2ddfe9..aa990db 100644
--- a/pages/shipWork/mafiAdd.vue
+++ b/pages/shipWork/mafiAdd.vue
@@ -49,6 +49,10 @@
 					<text v-else>{{loaderType}}</text>
 				</view>
 			</view>
+			<uni-popup ref="popup" type="dialog">
+				<uni-popup-dialog type="error" confirmText="确定" title="通知" content="是否删除此条数据"
+					@confirm="delConfirm"></uni-popup-dialog>
+			</uni-popup>
 			<view class="btnList">
 				<van-button type="default" @click="cancel">取消</van-button>
 				<van-button type="danger" v-if="obj.state == 'look'" @click="del">删除</van-button>
@@ -183,8 +187,8 @@
 					url: '/pages/shipWork/mafi'
 				})
 			},
-			// 删除
-			del() {
+			// 弹框删除
+			delConfirm() {
 				let addMafiArr = uni.getStorageSync('addMafiArr')
 				addMafiArr.splice(this.mafiRowIndex, 1)
 				uni.setStorageSync('addMafiArr', addMafiArr);
@@ -192,6 +196,10 @@
 					url: '/pages/shipWork/mafi'
 				})
 			},
+			// 删除
+			del() {
+				this.$refs.popup.open()
+			},
 			// 保存
 			save() {
 				let addMafiArr = uni.getStorageSync('addMafiArr')
diff --git a/pages/shipWork/mixWork.vue b/pages/shipWork/mixWork.vue
index e068a43..a15aac3 100644
--- a/pages/shipWork/mixWork.vue
+++ b/pages/shipWork/mixWork.vue
@@ -1,31 +1,40 @@
 <template>
 	<view class="mixWork">
 		<view class="container">
+			<view class="signBox">
+				<p class="sign" @click="sign">点击签名</p>
+			</view>
 			<view class="tabsList">
 				<view class="tabsBox" v-for="(item,index) in tabsList" :key="index" :class="{active:tabsIndex == index}"
 					@click="tabsClick(item,index)">{{item}}</view>
 			</view>
 			<!-- 人员信息列表 -->
 			<view class="ul" v-if="tabsType == 0">
-				<view class="li" v-for="(item,index) in peopleInfo" :key="index" @click="add('look',item,index)">
-					<view class="title">航次：{{item.vvyName}}</view>
-					<p>贸易类型：{{item.tradeTypeName}}</p>
-					<p>进出口：{{item.importExportFlagName}}</p>
-					<p>作业组数：{{item.workSuite}}</p>
-					<p>单船人数：{{item.shipPerson}}</p>
-					<p>状态：未上传</p>
-				</view>
+				<template v-if="peopleInfo.length > 0">
+					<view class="li" v-for="(item,index) in peopleInfo" :key="index" @click="add('look',item,index)">
+						<view class="title">航次：{{item.vvyName}}</view>
+						<p>贸易类型：{{item.tradeTypeName}}</p>
+						<p>进出口：{{item.importExportFlagName}}</p>
+						<p>作业组数：{{item.workSuite}}</p>
+						<p>单船人数：{{item.shipPerson}}</p>
+						<p>状态：未上传</p>
+					</view>
+				</template>
+				<o-empty v-else height="70vh" bg="#f5f6fa" />
 			</view>
 			<!-- 工班信息列表 -->
 			<view class="ul" v-if="tabsType == 1">
-				<view class="li" v-for="(item,index) in shiftInfo" :key="index" @click="lookShift(item,index)">
-					<view class="title">航次：{{item.vvyName}}</view>
-					<view class="shift" v-for="(item2,index2) in item.shiftList" :key="index2">
-						<p>{{item2.gbTextValue}}</p>
-						<span>作业开始时间：{{item2.startTime}}</span>
+				<template v-if="shiftInfo.length > 0">
+					<view class="li" v-for="(item,index) in shiftInfo" :key="index" @click="lookShift(item,index)">
+						<view class="title">航次：{{item.vvyName}}</view>
+						<view class="shift" v-for="(item2,index2) in item.shiftList" :key="index2">
+							<p>{{item2.gbTextValue}}</p>
+							<span>作业开始时间：{{item2.startTime}}</span>
+						</view>
+						<view class="state">状态：未上传</view>
 					</view>
-					<view class="state">状态：未上传</view>
-				</view>
+				</template>
+				<o-empty v-else height="70vh" bg="#f5f6fa" />
 			</view>
 			<view class="addBtn" @click="add('add')">+ 新增</view>
 		</view>
@@ -50,7 +59,6 @@
 		},
 		mounted() {
 			this.tabsType = this.$route.query.infoType
-			console.log(this.tabsType)
 			if (this.tabsType != 0 && this.tabsType != 1) {
 				this.tabsType = 0
 				this.tabsIndex = 0
@@ -59,10 +67,15 @@
 			}
 			this.peopleInfo = uni.getStorageSync('addPeopleArr')
 			this.shiftInfo = uni.getStorageSync('addShiftArr')
-			console.log(this.shiftInfo)
 			this.shipInfo = uni.getStorageSync('shipInfo')
 		},
 		methods: {
+			// 点击签名
+			sign() {
+				uni.navigateTo({
+					url: '/pages/shipWork/sign'
+				})
+			},
 			tabsClick(item, index) {
 				this.tabsIndex = index;
 				if (item == "人员信息") {
@@ -71,6 +84,7 @@
 					this.tabsType = 1;
 				}
 			},
+			// 点击新增
 			add(state, item, index) {
 				if (state != 'add') {
 					uni.setStorageSync('peopleRow', item);
@@ -106,6 +120,19 @@
 		.container {
 			padding: 30px 20px;
 
+			.signBox {
+				display: flex;
+				justify-content: flex-end;
+
+				.sign {
+					text-align: right;
+					color: #2979ff;
+					padding: 10px;
+					background: #fff;
+					border: 1px solid #ccc;
+				}
+			}
+
 			.tabsList {
 				display: flex;
 				justify-content: center;
diff --git a/pages/shipWork/notice.vue b/pages/shipWork/notice.vue
index 3255e27..05d5cb6 100644
--- a/pages/shipWork/notice.vue
+++ b/pages/shipWork/notice.vue
@@ -1,15 +1,21 @@
 <template>
 	<view class="notice">
 		<view class="container">
-			<view class="ul">
-				<view class="li" v-for="(item,index) in infoList" :key="index" @click="add('look',item,index)">
-					<view class="title">航次：{{item.vvyName}}</view>
-					<p>状态：未上传</p>
-					<p>进出口：{{item.importExportFlagName}}</p>
-					<p>贸易类型：{{item.tradeTypeName}}</p>
-					<p>作业日期：{{item.workDate}}</p>
-				</view>
+			<view class="signBox">
+				<p class="sign" @click="sign">点击签名</p>
 			</view>
+			<template v-if="infoList.length > 0">
+				<view class="ul">
+					<view class="li" v-for="(item,index) in infoList" :key="index" @click="add('look',item,index)">
+						<view class="title">航次：{{item.vvyName}}</view>
+						<p>状态：未上传</p>
+						<p>进出口：{{item.importExportFlagName}}</p>
+						<p>贸易类型：{{item.tradeTypeName}}</p>
+						<p>作业日期：{{item.workDate}}</p>
+					</view>
+				</view>
+			</template>
+			<o-empty v-else height="70vh" bg="#f5f6fa" />
 			<view class="addBtn" @click="add('add')">+ 新增</view>
 		</view>
 	</view>
@@ -28,6 +34,13 @@
 			this.infoList = uni.getStorageSync('addNoticeArr')
 		},
 		methods: {
+			// 点击签名
+			sign() {
+				uni.navigateTo({
+					url: '/pages/shipWork/sign'
+				})
+			},
+			// 点击新增
 			add(state, item, index) {
 				if (state != 'add') {
 					uni.setStorageSync('noticeRow', item);
@@ -50,6 +63,19 @@
 		.container {
 			padding: 30px 20px;
 
+			.signBox {
+				display: flex;
+				justify-content: flex-end;
+
+				.sign {
+					text-align: right;
+					color: #2979ff;
+					padding: 10px;
+					background: #fff;
+					border: 1px solid #ccc;
+				}
+			}
+
 			.ul {
 				padding: 20px 0;
 
diff --git a/pages/shipWork/noticeAdd.vue b/pages/shipWork/noticeAdd.vue
index 5f939bc..a98e605 100644
--- a/pages/shipWork/noticeAdd.vue
+++ b/pages/shipWork/noticeAdd.vue
@@ -27,6 +27,10 @@
 					<text v-else>{{workDate}}</text>
 				</view>
 			</view>
+			<uni-popup ref="popup" type="dialog">
+				<uni-popup-dialog type="error" confirmText="确定" title="通知" content="是否删除此条数据"
+					@confirm="delConfirm"></uni-popup-dialog>
+			</uni-popup>
 			<view class="btnList">
 				<van-button type="default" @click="cancel">取消</van-button>
 				<van-button type="danger" v-if="obj.state == 'look'" @click="del">删除</van-button>
@@ -110,8 +114,8 @@
 					url: '/pages/shipWork/notice'
 				})
 			},
-			// 删除
-			del() {
+			// 弹框删除
+			delConfirm() {
 				let addNoticeArr = uni.getStorageSync('addNoticeArr')
 				addNoticeArr.splice(this.noticeRowIndex, 1)
 				uni.setStorageSync('addNoticeArr', addNoticeArr);
@@ -119,6 +123,10 @@
 					url: '/pages/shipWork/notice'
 				})
 			},
+			// 删除
+			del() {
+				this.$refs.popup.open()
+			},
 			// 保存
 			save() {
 				let addNoticeArr = uni.getStorageSync('addNoticeArr')
diff --git a/pages/shipWork/opinion.vue b/pages/shipWork/opinion.vue
index 6914c1c..18a5afe 100644
--- a/pages/shipWork/opinion.vue
+++ b/pages/shipWork/opinion.vue
@@ -1,15 +1,21 @@
 <template>
 	<view class="opinion">
 		<view class="container">
-			<view class="ul">
-				<view class="li" v-for="(item,index) in infoList" :key="index" @click="add('look',item,index)">
-					<view class="title">航次：{{item.vvyName}}</view>
-					<p>状态：未上传</p>
-					<p>进出口：{{item.importExportFlagName}}</p>
-					<p>贸易类型：{{item.tradeTypeName}}</p>
-					<p>作业日期：{{item.workTime}}</p>
-				</view>
+			<view class="signBox">
+				<p class="sign" @click="sign">点击签名</p>
 			</view>
+			<template v-if="infoList.length > 0">
+				<view class="ul">
+					<view class="li" v-for="(item,index) in infoList" :key="index" @click="add('look',item,index)">
+						<view class="title">航次：{{item.vvyName}}</view>
+						<p>状态：未上传</p>
+						<p>进出口：{{item.importExportFlagName}}</p>
+						<p>贸易类型：{{item.tradeTypeName}}</p>
+						<p>作业日期：{{item.workTime}}</p>
+					</view>
+				</view>
+			</template>
+			<o-empty v-else height="70vh" bg="#f5f6fa" />
 			<view>
 				<view class="addBtn" @click="add('add')">+ 新增</view>
 			</view>
@@ -30,6 +36,13 @@
 			this.infoList = uni.getStorageSync('addOpinionArr')
 		},
 		methods: {
+			// 点击签名
+			sign() {
+				uni.navigateTo({
+					url: '/pages/shipWork/sign'
+				})
+			},
+			// 点击新增
 			add(state, item, index) {
 				if (state != 'add') {
 					uni.setStorageSync('opinionRow', item);
@@ -52,6 +65,19 @@
 		.container {
 			padding: 30px 20px;
 
+			.signBox {
+				display: flex;
+				justify-content: flex-end;
+
+				.sign {
+					text-align: right;
+					color: #2979ff;
+					padding: 10px;
+					background: #fff;
+					border: 1px solid #ccc;
+				}
+			}
+
 			.ul {
 				padding: 20px 0;
 
diff --git a/pages/shipWork/opinionAdd.vue b/pages/shipWork/opinionAdd.vue
index 99461d4..f9c894a 100644
--- a/pages/shipWork/opinionAdd.vue
+++ b/pages/shipWork/opinionAdd.vue
@@ -49,6 +49,10 @@
 					<text v-else>{{workTime}}</text>
 				</view>
 			</view>
+			<uni-popup ref="popup" type="dialog">
+				<uni-popup-dialog type="error" confirmText="确定" title="通知" content="是否删除此条数据"
+					@confirm="delConfirm"></uni-popup-dialog>
+			</uni-popup>
 			<view class="btnList">
 				<van-button type="default" @click="cancel">取消</van-button>
 				<van-button type="danger" v-if="obj.state == 'look'" @click="del">删除</van-button>
@@ -182,8 +186,8 @@
 					url: '/pages/shipWork/opinion'
 				})
 			},
-			// 删除
-			del() {
+			// 弹框删除
+			delConfirm() {
 				let addOpinionArr = uni.getStorageSync('addOpinionArr')
 				addOpinionArr.splice(this.opinionRowIndex, 1)
 				uni.setStorageSync('addOpinionArr', addOpinionArr);
@@ -191,6 +195,10 @@
 					url: '/pages/shipWork/opinion'
 				})
 			},
+			// 删除
+			del() {
+				this.$refs.popup.open()
+			},
 			// 保存
 			save() {
 				let addOpinionArr = uni.getStorageSync('addOpinionArr')
diff --git a/pages/shipWork/patrol.vue b/pages/shipWork/patrol.vue
index ccbd3c3..cdaf530 100644
--- a/pages/shipWork/patrol.vue
+++ b/pages/shipWork/patrol.vue
@@ -1,15 +1,18 @@
 <template>
 	<view class="patrol">
 		<view class="container">
-			<view class="ul">
-				<view class="li" v-for="(item,index) in infoList" :key="index" @click="add('look',item,index)">
-					<view class="title">类型：{{item.type}}</view>
-					<p>上传状态：未上传</p>
-					<p>航次：{{item.vvyName}}</p>
-					<p>贸易类型：{{item.tradeTypeName}}</p>
-					<p>进出口：{{item.importExportFlagName}}</p>
+			<template v-if="infoList.length > 0">
+				<view class="ul">
+					<view class="li" v-for="(item,index) in infoList" :key="index" @click="add('look',item,index)">
+						<view class="title">类型：{{item.type}}</view>
+						<p>上传状态：未上传</p>
+						<p>航次：{{item.vvyName}}</p>
+						<p>贸易类型：{{item.tradeTypeName}}</p>
+						<p>进出口：{{item.importExportFlagName}}</p>
+					</view>
 				</view>
-			</view>
+			</template>
+			<o-empty v-else height="70vh" bg="#f5f6fa" />
 			<view class="addBtn" @click="add('add')">+ 新增</view>
 		</view>
 	</view>
diff --git a/pages/shipWork/patrolAdd.vue b/pages/shipWork/patrolAdd.vue
index 0f86c31..6fa31fa 100644
--- a/pages/shipWork/patrolAdd.vue
+++ b/pages/shipWork/patrolAdd.vue
@@ -46,6 +46,10 @@
 					<text v-else>{{remark}}</text>
 				</view>
 			</view>
+			<uni-popup ref="popup" type="dialog">
+				<uni-popup-dialog type="error" confirmText="确定" title="通知" content="是否删除此条数据"
+					@confirm="delConfirm"></uni-popup-dialog>
+			</uni-popup>
 			<view class="btnList">
 				<van-button type="default" @click="cancel">取消</van-button>
 				<van-button type="danger" v-if="obj.state == 'look'" @click="del">删除</van-button>
@@ -135,8 +139,8 @@
 					url: '/pages/shipWork/patrol'
 				})
 			},
-			// 删除
-			del() {
+			// 弹框删除
+			delConfirm() {
 				let addPatrolArr = uni.getStorageSync('addPatrolArr')
 				addPatrolArr.splice(this.patrolRowIndex, 1)
 				uni.setStorageSync('addPatrolArr', addPatrolArr);
@@ -144,6 +148,10 @@
 					url: '/pages/shipWork/patrol'
 				})
 			},
+			// 删除
+			del() {
+				this.$refs.popup.open()
+			},
 			// 保存
 			save() {
 				let addPatrolArr = uni.getStorageSync('addPatrolArr')
diff --git a/pages/shipWork/peopleAdd.vue b/pages/shipWork/peopleAdd.vue
index c428755..bf47301 100644
--- a/pages/shipWork/peopleAdd.vue
+++ b/pages/shipWork/peopleAdd.vue
@@ -49,6 +49,10 @@
 					<text v-else>{{peopleRow.jobStartTime}} - {{peopleRow.jobEndTime}}</text>
 				</view>
 			</view>
+			<uni-popup ref="popup" type="dialog">
+				<uni-popup-dialog type="error" confirmText="确定" title="通知" content="是否删除此条数据"
+					@confirm="delConfirm"></uni-popup-dialog>
+			</uni-popup>
 			<view class="btnList">
 				<van-button type="default" @click="cancel">取消</van-button>
 				<van-button type="danger" v-if="obj.state == 'look'" @click="del">删除</van-button>
@@ -197,8 +201,8 @@
 					url: '/pages/shipWork/mixWork?infoType=0'
 				})
 			},
-			// 删除
-			del() {
+			// 弹框删除
+			delConfirm() {
 				let addPeopleArr = uni.getStorageSync('addPeopleArr')
 				addPeopleArr.splice(this.peopleRowIndex, 1)
 				uni.setStorageSync('addPeopleArr', addPeopleArr);
@@ -206,6 +210,10 @@
 					url: '/pages/shipWork/mixWork?infoType=0'
 				})
 			},
+			// 删除
+			del() {
+				this.$refs.popup.open()
+			},
 			// 保存
 			save() {
 				let addPeopleArr = uni.getStorageSync('addPeopleArr')
diff --git a/pages/shipWork/shiftAdd.vue b/pages/shipWork/shiftAdd.vue
index 933e5f2..f729553 100644
--- a/pages/shipWork/shiftAdd.vue
+++ b/pages/shipWork/shiftAdd.vue
@@ -27,40 +27,45 @@
 						<uni-data-select v-model="zxValue" :localdata="zxList" @change="zxChange"></uni-data-select>
 					</view>
 				</view>
-				<view class="ulTop"><text @click="ulAdd1">添加</text><van-icon name="arrow-down" /></view>
-				<view class="ul ul2" v-for="(item,index) in ulList1" :key="index+'ul'">
-					<view class="li">
-						<p class="liTitle"><text class="required">*</text>工班：</p>
-						<uni-data-select v-model="item.gbValue" :localdata="gbList"
-							@change="gbChange(item,index)"></uni-data-select>
-					</view>
-					<view class="li">
-						<p class="liTitle"><text class="required">*</text>作业时间 ：</p>
-						<uni-datetime-picker v-model="item.datetime" type="datetimerange" rangeSeparator="-"
-							@change="changeLog(item)" />
-					</view>
-				</view>
-				<view class="ulTop"><text @click="ulAdd2">添加</text><text @click="del">删除</text><van-icon
-						name="arrow-down" /></view>
-				<view class="ul ul2" v-for="(item,index) in ulList2" :key="index+'ul2'">
-					<view class="li">
-						<p class="liTitle"><text class="required">*</text>车型：</p>
-						<uni-data-select v-model="item.cxValue" :localdata="cxList"
-							@change="cxChange(item,index)"></uni-data-select>
-					</view>
-					<view class="li">
-						<p><text class="required">*</text>数量：</p>
-						<uni-number-box @change="numChange" v-model="item.numValue" />
-					</view>
-					<view class="li">
-						<p class="liTitle"><text class="required">*</text>装卸方式：</p>
-						<uni-data-select v-model="item.fsValue" :localdata="fsList"
-							@change="fsChange(item,index)"></uni-data-select>
-					</view>
-					<view class="li widthLi">
-						<p class="liTitle">备注：</p>
-						<uni-easyinput type="textarea" autoHeight v-model="item.notes" placeholder="请输入任务描述(200字以内)"
-							maxlength="200"></uni-easyinput>
+				<view class="widthLi" v-for="(item,index) in ulList1" :key="index+'ul'">
+					<view class="ulTop"><text @click="ulAdd1">添加工班</text><text v-if="index > 0"
+							@click="delGb(index)">删除</text><van-icon name="arrow-down" /></view>
+					<view class="ul">
+						<view class="li">
+							<p class="liTitle"><text class="required">*</text>工班：</p>
+							<uni-data-select v-model="item.gbValue" :localdata="gbList"
+								@change="gbChange(item,index)"></uni-data-select>
+						</view>
+						<view class="li">
+							<p class="liTitle"><text class="required">*</text>作业时间 ：</p>
+							<uni-datetime-picker v-model="item.datetime" type="datetimerange" rangeSeparator="-"
+								@change="changeLog(item)" />
+						</view>
+						<view class="widthLi" v-for="(item2,index2) in item.ulList2" :key="index2+'ul2'">
+							<view class="ulTop"><text @click="ulAdd2(index)">添加工班信息</text></text><text v-if="index2 > 0"
+									@click="delGb2(index,index2)">删除</text><van-icon name="arrow-down" /></view>
+							<view class="ul">
+								<view class="li">
+									<p class="liTitle"><text class="required">*</text>车型：</p>
+									<uni-data-select v-model="item2.cxValue" :localdata="cxList"
+										@change="cxChange(item,index,item2,index2)"></uni-data-select>
+								</view>
+								<view class="li">
+									<p><text class="required">*</text>数量：</p>
+									<uni-number-box @change="numChange" v-model="item2.numValue" />
+								</view>
+								<view class="li">
+									<p class="liTitle"><text class="required">*</text>装卸方式：</p>
+									<uni-data-select v-model="item2.fsValue" :localdata="fsList"
+										@change="fsChange(item,index,item2,index2)"></uni-data-select>
+								</view>
+								<view class="li widthLi">
+									<p class="liTitle">备注：</p>
+									<uni-easyinput type="textarea" autoHeight v-model="item2.notes"
+										placeholder="请输入任务描述(200字以内)" maxlength="200"></uni-easyinput>
+								</view>
+							</view>
+						</view>
 					</view>
 				</view>
 			</template>
@@ -68,7 +73,8 @@
 			<!-- 翻仓信息 -->
 			<template v-if="active == 1">
 				<view v-for="(item,index) in fcUlList" :key="index + 'fc'">
-					<view class="ulTop"><text @click="fcAdd">添加</text><van-icon name="arrow-down" /></view>
+					<view class="ulTop"><text @click="fcAdd">添加翻仓类型</text><text v-if="index > 0"
+							@click="delFc(index)">删除</text><van-icon name="arrow-down" /></view>
 					<view class="ul fcUl">
 						<view class="li">
 							<p class="liTitle"><text class="required">*</text>翻仓类型：</p>
@@ -77,8 +83,8 @@
 						</view>
 					</view>
 					<view v-for="(item2,index2) in item.fcUlList2" :key="index2 + 'fc2'">
-						<view class="ulTop"><text @click="fcAdd2(index)">添加</text></text><text v-if="index2 > 0"
-								@click="delFc(index,index2)">删除</text><van-icon name="arrow-down" /></view>
+						<view class="ulTop"><text @click="fcAdd2(index)">添加翻仓信息</text></text><text v-if="index2 > 0"
+								@click="delFc2(index,index2)">删除</text><van-icon name="arrow-down" /></view>
 						<view class="ul ul2 fcUl2">
 							<view class="li">
 								<p class="liTitle"><text class="required">*</text>翻舱起点位置：</p>
@@ -216,17 +222,17 @@
 					datetime: ['', ''],
 					startTime: "",
 					endTime: "",
+					ulList2: [{
+						cxValue: "",
+						cxTextValue: "",
+						numValue: 0,
+						fsValue: "",
+						fsTextValue: "",
+						notes: "",
+					}],
 				}],
 				// 工班下拉框
 				gbList: [],
-				ulList2: [{
-					cxValue: "",
-					cxTextValue: "",
-					numValue: 0,
-					fsValue: "",
-					fsTextValue: "",
-					notes: "",
-				}],
 				// 车型下拉
 				cxList: [],
 				// 装卸方式下拉
@@ -336,7 +342,6 @@
 				this.zxValue = this.dataInfo.zxId
 				this.zxTextValue = this.dataInfo.zxTextValue
 				this.ulList1 = this.dataInfo.shiftList
-				this.ulList2 = this.dataInfo.shiftList2
 				this.fcUlList = this.dataInfo.fcList
 				this.otherObj = this.dataInfo.otherList
 			},
@@ -359,13 +364,28 @@
 					}
 				})
 			},
-			// 点击第一个添加
+			// 工班信息添加
 			ulAdd1() {
 				this.ulList1.push({
 					datetime: ['', ''],
 					gbValue: "",
-					gbTextValue: ""
-
+					gbTextValue: "",
+					ulList2: [{
+						cxValue: "",
+						cxTextValue: "",
+						numValue: 0,
+						fsValue: "",
+						fsTextValue: "",
+						notes: "",
+					}],
+				})
+			},
+			ulAdd2(index) {
+				this.ulList1[index].ulList2.push({
+					cxValue: "",
+					numValue: 0,
+					fsValue: "",
+					notes: "",
 				})
 			},
 			// 工班下拉
@@ -382,35 +402,30 @@
 				item.startTime = item.datetime[0].slice(0, item.datetime[0].length - 3)
 				item.endTime = item.datetime[1].slice(0, item.datetime[1].length - 3)
 			},
-			// 点击第二个添加
-			ulAdd2() {
-				this.ulList2.push({
-					cxValue: "",
-					numValue: 0,
-					fsValue: "",
-					notes: "",
-				})
+			// 工班信息删除
+			delGb(index) {
+				this.ulList1.splice(index, 1)
 			},
-			del() {
-				this.ulList2.splice(0, 1)
+			delGb2(index, index2) {
+				this.ulList1[index].ulList2.splice(index2, 1)
 			},
 			// 车型下拉
-			cxChange(item, index) {
-				this.ulList2[index].cxValue = item.cxValue
+			cxChange(item, index, item2, index2) {
+				this.ulList1[index].ulList2[index2].cxValue = item2.cxValue
 				this.cxList.forEach(v => {
-					if (v.value == item.cxValue) {
-						item.cxTextValue = v.text
+					if (v.value == item2.cxValue) {
+						item2.cxTextValue = v.text
 					}
 				})
 			},
 			// 数量
 			numChange(val) {},
 			// 装卸方式下拉
-			fsChange(item, index) {
-				this.ulList2[index].fsValue = item.fsValue
+			fsChange(item, index, item2, index2) {
+				this.ulList1[index].ulList2[index2].fsValue = item2.fsValue
 				this.fsList.forEach(v => {
-					if (v.value == item.fsValue) {
-						item.fsTextValue = v.text
+					if (v.value == item2.fsValue) {
+						item2.fsTextValue = v.text
 					}
 				})
 			},
@@ -468,7 +483,10 @@
 				})
 			},
 			// 翻仓删除
-			delFc(index, index2) {
+			delFc(index) {
+				this.fcUlList.splice(index, 1)
+			},
+			delFc2(index, index2) {
 				this.fcUlList[index].fcUlList2.splice(index2, 1)
 			},
 
@@ -495,7 +513,6 @@
 					zxName: this.zxTextValue,
 					zxId: this.zxValue,
 					shiftList: this.ulList1,
-					shiftList2: this.ulList2,
 					fcList: this.fcUlList,
 					otherList: this.otherObj
 				}
@@ -627,7 +644,6 @@
 				.widthLi {
 					width: 100%;
 				}
-
 			}
 
 			.ul2 {
diff --git a/pages/shipWork/shiftDetails.vue b/pages/shipWork/shiftDetails.vue
index 7019767..f1e7b57 100644
--- a/pages/shipWork/shiftDetails.vue
+++ b/pages/shipWork/shiftDetails.vue
@@ -26,7 +26,7 @@
 							<text> {{dataInfo.zxName}}</text>
 						</view>
 					</view>
-					<view class="ul bUl" v-for="(item,index) in dataInfo.shiftList" :key="index + 'a'">
+					<view class="ul bUl borTop" v-for="(item,index) in dataInfo.shiftList" :key="index + 'a'">
 						<view class="li">
 							<p>工班：</p>
 							<text> {{item.gbTextValue}}</text>
@@ -35,19 +35,19 @@
 							<p>作业时间：</p>
 							<text> {{item.startTime}} - {{item.endTime}}</text>
 						</view>
-					</view>
-					<view class="ul bUl" v-for="(item,index) in dataInfo.shiftList2" :key="index + 'b'">
-						<view class="li">
-							<p>车型：</p>
-							<text>{{item.cxTextValue}}</text>
-						</view>
-						<view class="li">
-							<p>数量：</p>
-							<text>{{item.numValue}}</text>
-						</view>
-						<view class="li wLi">
-							<p>备注：</p>
-							<text>{{item.notes}}</text>
+						<view class="ul bUl" v-for="(item2,index2) in item.ulList2" :key="index2 + 'b'">
+							<view class="li">
+								<p>车型：</p>
+								<text>{{item2.cxTextValue}}</text>
+							</view>
+							<view class="li">
+								<p>数量：</p>
+								<text>{{item2.numValue}}</text>
+							</view>
+							<view class="li wLi">
+								<p>备注：</p>
+								<text>{{item2.notes}}</text>
+							</view>
 						</view>
 					</view>
 				</custom-tab-pane>
@@ -135,6 +135,10 @@
 					</view>
 				</custom-tab-pane>
 			</custom-tabs>
+			<uni-popup ref="popup" type="dialog">
+				<uni-popup-dialog type="error" confirmText="确定" title="通知" content="是否删除此条数据"
+					@confirm="delConfirm"></uni-popup-dialog>
+			</uni-popup>
 			<view class="btnList">
 				<van-button type="default" @click="cancel">取消</van-button>
 				<van-button type="danger" @click="del">删除</van-button>
@@ -177,8 +181,8 @@
 					url: '/pages/shipWork/mixWork?infoType=1'
 				})
 			},
-			// 删除
-			del() {
+			// 弹框删除
+			delConfirm() {
 				let addShiftArr = uni.getStorageSync('addShiftArr')
 				addShiftArr.splice(this.shiftRowIndex, 1)
 				uni.setStorageSync('addShiftArr', addShiftArr);
@@ -186,6 +190,10 @@
 					url: '/pages/shipWork/mixWork?infoType=1'
 				})
 			},
+			// 删除
+			del() {
+				this.$refs.popup.open()
+			},
 			// 编辑
 			edit(state) {
 				this.obj = {
@@ -216,14 +224,6 @@
 					line-height: 35px;
 					font-size: 16px;
 				}
-
-				.ul {
-					border-bottom: 1px dashed #ccc;
-				}
-
-				.ul:last-child {
-					border: none;
-				}
 			}
 
 			.otherInfo {
@@ -236,12 +236,6 @@
 				}
 			}
 
-			.ul[data-v-298cacec] {
-				display: flex;
-				justify-content: space-between;
-				flex-wrap: wrap;
-			}
-
 			.ul {
 				display: flex;
 				justify-content: space-between;
@@ -266,9 +260,17 @@
 			}
 
 			.bUl {
+				width: 100%;
+			}
+
+			.borTop {
 				border-top: 1px solid #999;
 			}
 
+			.borBtm {
+				border-bottom: 1px solid #999;
+			}
+
 			.btnList {
 				display: flex;
 				justify-content: center;
diff --git a/pages/shipWork/sign.vue b/pages/shipWork/sign.vue
new file mode 100644
index 0000000..da7e573
--- /dev/null
+++ b/pages/shipWork/sign.vue
@@ -0,0 +1,225 @@
+<template>
+	<view class="container">
+		<view class="sigh-btns">
+			<van-button class="btn" type="default" @tap="handleCancel">取消</van-button>
+			<van-button class="btn" type="default" @tap="handleReset">重写</van-button>
+			<van-button class="btn" type="default" @tap="handleConfirm">确认</van-button>
+			<!-- <button class="btn" @tap="handleCancel">取消</button>
+			<button class="btn" @tap="handleReset">重写</button>
+			<button class="btn" @tap="handleConfirm">确认</button> -->
+		</view>
+		<view class="sign-box">
+			<canvas class="mycanvas" :style="{width:width +'px',height:height +'px'}" canvas-id="mycanvas"
+				@touchstart="touchstart" @touchmove="touchmove" @touchend="touchend"></canvas>
+
+			<canvas canvas-id="camCacnvs" :style="{width:height +'px',height:width +'px'}" class="canvsborder"></canvas>
+
+		</view>
+	</view>
+
+</template>
+<script>
+	var x = 20;
+	var y = 20;
+	var tempPoint = []; //用来存放当前画纸上的轨迹点
+	var id = 0;
+	var type = '';
+	let that;
+	let canvasw;
+	let canvash;
+	export default {
+		data() {
+			return {
+				ctx: '', //绘图图像
+				points: [], //路径点集合,
+				width: 0,
+				height: 0
+			};
+		},
+		mounted() {},
+
+		onLoad(option) {
+			that = this;
+			console.log(option);
+			id = option.id;
+			type = option.type;
+			this.ctx = uni.createCanvasContext('mycanvas', this); //创建绘图对象
+			//设置画笔样式
+			this.ctx.lineWidth = 4;
+			this.ctx.lineCap = 'round';
+			this.ctx.lineJoin = 'round';
+
+			uni.getSystemInfo({
+				success: function(res) {
+					console.log(res);
+					that.width = res.windowWidth * 0.8;
+					that.height = res.windowHeight * 0.85;
+				}
+			});
+		},
+
+		methods: {
+			//触摸开始，获取到起点
+			touchstart: function(e) {
+				let startX = e.changedTouches[0].x;
+				let startY = e.changedTouches[0].y;
+				let startPoint = {
+					X: startX,
+					Y: startY
+				};
+
+				/* **************************************************
+				    #由于uni对canvas的实现有所不同，这里需要把起点存起来
+				 * **************************************************/
+				this.points.push(startPoint);
+
+				//每次触摸开始，开启新的路径
+				this.ctx.beginPath();
+			},
+
+			//触摸移动，获取到路径点
+			touchmove: function(e) {
+				let moveX = e.changedTouches[0].x;
+				let moveY = e.changedTouches[0].y;
+				let movePoint = {
+					X: moveX,
+					Y: moveY
+				};
+				this.points.push(movePoint); //存点
+				let len = this.points.length;
+				if (len >= 2) {
+					this.draw(); //绘制路径
+				}
+				tempPoint.push(movePoint);
+			},
+
+			// 触摸结束，将未绘制的点清空防止对后续路径产生干扰
+			touchend: function() {
+				this.points = [];
+			},
+
+			/* ***********************************************	
+			#   绘制笔迹
+			#   1.为保证笔迹实时显示，必须在移动的同时绘制笔迹
+			#   2.为保证笔迹连续，每次从路径集合中区两个点作为起点（moveTo）和终点(lineTo)
+			#   3.将上一次的终点作为下一次绘制的起点（即清除第一个点）
+			************************************************ */
+			draw: function() {
+				let point1 = this.points[0];
+				let point2 = this.points[1];
+				this.points.shift();
+				this.ctx.moveTo(point1.X, point1.Y);
+				this.ctx.lineTo(point2.X, point2.Y);
+				this.ctx.stroke();
+				this.ctx.draw(true);
+			},
+
+			handleCancel() {
+				uni.navigateBack({
+					delta: 1
+				});
+			},
+
+			//清空画布
+			handleReset: function() {
+				console.log('handleReset');
+				that.ctx.clearRect(0, 0, that.width, that.height);
+				that.ctx.draw(true);
+				tempPoint = [];
+			},
+
+			//将签名笔迹上传到服务器，并将返回来的地址存到本地
+			handleConfirm: function() {
+				if (tempPoint.length == 0) {
+					uni.showToast({
+						title: '请先签名',
+						icon: 'none',
+						duration: 2000
+					});
+					return;
+				}
+				uni.canvasToTempFilePath({
+					canvasId: 'mycanvas',
+					success: function(res) {
+						let tempPath = res.tempFilePath;
+						console.log(tempPath)
+
+						const ctx = uni.createCanvasContext('camCacnvs', that);
+						ctx.translate(0, that.width);
+						ctx.rotate((-90 * Math.PI) / 180);
+						ctx.drawImage(tempPath, 0, 0, that.width, that.height);
+						ctx.draw();
+						setTimeout(() => {
+
+							//保存签名图片到本地
+							uni.canvasToTempFilePath({
+									canvasId: 'camCacnvs',
+									success: function(res) {
+										//这是签名图片文件的本地临时地址
+										let path = res.tempFilePath;
+
+									},
+									fail: err => {
+										console.log('fail', err);
+									}
+								},
+								this
+							);
+						}, 200);
+					}
+				});
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	.container {
+		display: flex;
+		flex-direction: row;
+		height: 100%;
+		padding: 50px 0;
+	}
+
+	.sign-box {
+		width: 80%;
+		height: 90%;
+		margin: auto;
+		display: flex;
+		flex-direction: column;
+		text-align: center;
+	}
+
+	.sign-view {
+		height: 100%;
+	}
+
+	.sigh-btns {
+		height: 100%;
+		margin: auto;
+		display: flex;
+		flex-direction: column;
+		justify-content: space-around;
+	}
+
+	.btn {
+		margin: 30px 0px;
+		padding: 8rpx;
+		transform: rotate(90deg);
+		border: grey 1rpx solid;
+		width: 100px;
+		height: 50px;
+	}
+
+	.mycanvas {
+		margin: auto 0rpx;
+		background-color: #ececec;
+	}
+
+	.canvsborder {
+		border: 1rpx solid #333;
+		position: fixed;
+		top: 0;
+		left: 10000rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/shipWork/supply.vue b/pages/shipWork/supply.vue
index dc1baa6..a72c2eb 100644
--- a/pages/shipWork/supply.vue
+++ b/pages/shipWork/supply.vue
@@ -1,15 +1,21 @@
 <template>
 	<view class="supply">
 		<view class="container">
-			<view class="ul">
-				<view class="li" v-for="(item,index) in infoList" :key="index" @click="add('look',item,index)">
-					<view class="title">类型：{{item.supplyType}}</view>
-					<p>状态：未上传</p>
-					<p>航次：{{item.vvyName}}</p>
-					<p>进出口：{{item.importExportFlagName}}</p>
-					<p>贸易类型：{{item.tradeTypeName}}</p>
-				</view>
+			<view class="signBox">
+				<p class="sign" @click="sign">点击签名</p>
 			</view>
+			<template v-if="infoList.length > 0">
+				<view class="ul">
+					<view class="li" v-for="(item,index) in infoList" :key="index" @click="add('look',item,index)">
+						<view class="title">类型：{{item.supplyType}}</view>
+						<p>状态：未上传</p>
+						<p>航次：{{item.vvyName}}</p>
+						<p>进出口：{{item.importExportFlagName}}</p>
+						<p>贸易类型：{{item.tradeTypeName}}</p>
+					</view>
+				</view>
+			</template>
+			<o-empty v-else height="70vh" bg="#f5f6fa" />
 			<view class="addBtn" @click="add('add')">+ 新增</view>
 		</view>
 	</view>
@@ -29,6 +35,13 @@
 			console.log(this.infoList)
 		},
 		methods: {
+			// 点击签名
+			sign() {
+				uni.navigateTo({
+					url: '/pages/shipWork/sign'
+				})
+			},
+			// 点击新增
 			add(state, item, index) {
 				if (state != 'add') {
 					uni.setStorageSync('supplyRow', item);
@@ -51,6 +64,19 @@
 		.container {
 			padding: 30px 20px;
 
+			.signBox {
+				display: flex;
+				justify-content: flex-end;
+
+				.sign {
+					text-align: right;
+					color: #2979ff;
+					padding: 10px;
+					background: #fff;
+					border: 1px solid #ccc;
+				}
+			}
+
 			.ul {
 				padding: 20px 0;
 
diff --git a/pages/shipWork/supplyAdd.vue b/pages/shipWork/supplyAdd.vue
index 7dde8be..9ce6275 100644
--- a/pages/shipWork/supplyAdd.vue
+++ b/pages/shipWork/supplyAdd.vue
@@ -44,6 +44,10 @@
 					<text v-else>{{supplyDate}}</text>
 				</view>
 			</view>
+			<uni-popup ref="popup" type="dialog">
+				<uni-popup-dialog type="error" confirmText="确定" title="通知" content="是否删除此条数据"
+					@confirm="delConfirm"></uni-popup-dialog>
+			</uni-popup>
 			<view class="btnList">
 				<van-button type="default" @click="cancel">取消</van-button>
 				<van-button type="danger" v-if="obj.state == 'look'" @click="del">删除</van-button>
@@ -170,8 +174,8 @@
 					url: '/pages/shipWork/supply'
 				})
 			},
-			// 删除
-			del() {
+			// 弹框删除
+			delConfirm() {
 				let addSupplyArr = uni.getStorageSync('addSupplyArr')
 				addSupplyArr.splice(this.supplyRowIndex, 1)
 				uni.setStorageSync('addSupplyArr', addSupplyArr);
@@ -179,6 +183,10 @@
 					url: '/pages/shipWork/supply'
 				})
 			},
+			// 删除
+			del() {
+				this.$refs.popup.open()
+			},
 			// 保存
 			save() {
 				let addSupplyArr = uni.getStorageSync('addSupplyArr')
diff --git a/pages/shipWork/untieAdd.vue b/pages/shipWork/untieAdd.vue
index f291d21..73431bd 100644
--- a/pages/shipWork/untieAdd.vue
+++ b/pages/shipWork/untieAdd.vue
@@ -52,6 +52,10 @@
 					<text v-else>{{noProductBerthTime}}</text>
 				</view>
 			</view>
+			<uni-popup ref="popup" type="dialog">
+				<uni-popup-dialog type="error" confirmText="确定" title="通知" content="是否删除此条数据"
+					@confirm="delConfirm"></uni-popup-dialog>
+			</uni-popup>
 			<view class="btnList">
 				<van-button type="default" @click="cancel">取消</van-button>
 				<van-button type="danger" v-if="obj.state == 'look'" @click="del">删除</van-button>
@@ -179,8 +183,8 @@
 					url: '/pages/shipWork/untieCord'
 				})
 			},
-			// 删除
-			del() {
+			// 弹框删除
+			delConfirm() {
 				let addUntieArr = uni.getStorageSync('addUntieArr')
 				addUntieArr.splice(this.untieRowIndex, 1)
 				uni.setStorageSync('addUntieArr', addUntieArr);
@@ -188,6 +192,10 @@
 					url: '/pages/shipWork/untieCord'
 				})
 			},
+			// 删除
+			del() {
+				this.$refs.popup.open()
+			},
 			// 保存
 			save() {
 				let addUntieArr = uni.getStorageSync('addUntieArr')
diff --git a/pages/shipWork/untieCord.vue b/pages/shipWork/untieCord.vue
index 386973e..1ab6a87 100644
--- a/pages/shipWork/untieCord.vue
+++ b/pages/shipWork/untieCord.vue
@@ -1,16 +1,22 @@
 <template>
 	<view class="untieCord">
 		<view class="container">
-			<view class="ul">
-				<view class="li" v-for="(item,index) in infoList" :key="index" @click="add('look',item,index)">
-					<view class="title">航次：{{item.vvyName}}</view>
-					<p>状态：未上传</p>
-					<p>进出口：{{item.importExportFlagName}}</p>
-					<p>贸易类型：{{item.tradeTypeName}}</p>
-					<p>泊位：{{item.bthIdName}}</p>
-					<p>系缆时间：{{item.attachTime}}</p>
-				</view>
+			<view class="signBox">
+				<p class="sign" @click="sign">点击签名</p>
 			</view>
+			<template v-if="infoList.length > 0">
+				<view class="ul">
+					<view class="li" v-for="(item,index) in infoList" :key="index" @click="add('look',item,index)">
+						<view class="title">航次：{{item.vvyName}}</view>
+						<p>状态：未上传</p>
+						<p>进出口：{{item.importExportFlagName}}</p>
+						<p>贸易类型：{{item.tradeTypeName}}</p>
+						<p>泊位：{{item.bthIdName}}</p>
+						<p>系缆时间：{{item.attachTime}}</p>
+					</view>
+				</view>
+			</template>
+			<o-empty v-else height="70vh" bg="#f5f6fa" />
 			<view class="addBtn" @click="add('add')">+ 新增</view>
 		</view>
 	</view>
@@ -29,6 +35,13 @@
 			this.infoList = uni.getStorageSync('addUntieArr')
 		},
 		methods: {
+			// 点击签名
+			sign() {
+				uni.navigateTo({
+					url: '/pages/shipWork/sign'
+				})
+			},
+			// 点击新增
 			add(state, item, index) {
 				if (state != 'add') {
 					uni.setStorageSync('untieRow', item);
@@ -51,6 +64,19 @@
 		.container {
 			padding: 30px 20px;
 
+			.signBox {
+				display: flex;
+				justify-content: flex-end;
+
+				.sign {
+					text-align: right;
+					color: #2979ff;
+					padding: 10px;
+					background: #fff;
+					border: 1px solid #ccc;
+				}
+			}
+
 			.ul {
 				padding: 20px 0;
 
diff --git a/pages/shipWork/workAssign.vue b/pages/shipWork/workAssign.vue
index d9ddf7b..71708f1 100644
--- a/pages/shipWork/workAssign.vue
+++ b/pages/shipWork/workAssign.vue
@@ -1,15 +1,21 @@
 <template>
 	<view class="workAssign">
 		<view class="container">
-			<view class="ul">
-				<view class="li" v-for="(item,index) in infoList" :key="index" @click="add('look',item,index)">
-					<view class="title">航次：{{item.vvyName}}</view>
-					<p>状态：未上传</p>
-					<p>进出口：{{item.importExportFlagName}}</p>
-					<p>贸易类型：{{item.tradeTypeName}}</p>
-					<p>作业时间：{{item.startTime}} - {{item.endTime}}</p>
-				</view>
+			<view class="signBox">
+				<p class="sign" @click="sign">点击签名</p>
 			</view>
+			<template v-if="infoList.length > 0">
+				<view class="ul">
+					<view class="li" v-for="(item,index) in infoList" :key="index" @click="add('look',item,index)">
+						<view class="title">航次：{{item.vvyName}}</view>
+						<p>状态：未上传</p>
+						<p>进出口：{{item.importExportFlagName}}</p>
+						<p>贸易类型：{{item.tradeTypeName}}</p>
+						<p>作业时间：{{item.startTime}} - {{item.endTime}}</p>
+					</view>
+				</view>
+			</template>
+			<o-empty v-else height="70vh" bg="#f5f6fa" />
 			<view class="addBtn" @click="add('add')">+ 新增</view>
 		</view>
 	</view>
@@ -28,6 +34,13 @@
 			this.infoList = uni.getStorageSync('addAssignArr')
 		},
 		methods: {
+			// 点击签名
+			sign() {
+				uni.navigateTo({
+					url: '/pages/shipWork/sign'
+				})
+			},
+			// 点击新增
 			add(state, item, index) {
 				if (state != 'add') {
 					uni.setStorageSync('assignRow', item);
@@ -50,6 +63,19 @@
 		.container {
 			padding: 30px 20px;
 
+			.signBox {
+				display: flex;
+				justify-content: flex-end;
+
+				.sign {
+					text-align: right;
+					color: #2979ff;
+					padding: 10px;
+					background: #fff;
+					border: 1px solid #ccc;
+				}
+			}
+
 			.ul {
 				padding: 20px 0;
 
diff --git a/pages/shipWork/workAssignAdd.vue b/pages/shipWork/workAssignAdd.vue
index 70a22d2..81ce67e 100644
--- a/pages/shipWork/workAssignAdd.vue
+++ b/pages/shipWork/workAssignAdd.vue
@@ -60,6 +60,10 @@
 					<text v-else>{{startTime}} - {{endTime}}</text>
 				</view>
 			</view>
+			<uni-popup ref="popup" type="dialog">
+				<uni-popup-dialog type="error" confirmText="确定" title="通知" content="是否删除此条数据"
+					@confirm="delConfirm"></uni-popup-dialog>
+			</uni-popup>
 			<view class="btnList">
 				<van-button type="default" @click="cancel">取消</van-button>
 				<van-button type="danger" v-if="obj.state == 'look'" @click="del">删除</van-button>
@@ -224,8 +228,8 @@
 					url: '/pages/shipWork/workAssign'
 				})
 			},
-			// 删除
-			del() {
+			// 弹框删除
+			delConfirm() {
 				let addAssignArr = uni.getStorageSync('addAssignArr')
 				addAssignArr.splice(this.assignRowIndex, 1)
 				uni.setStorageSync('addAssignArr', addAssignArr);
@@ -233,6 +237,10 @@
 					url: '/pages/shipWork/workAssign'
 				})
 			},
+			// 删除
+			del() {
+				this.$refs.popup.open()
+			},
 			// 保存
 			save() {
 				let addAssignArr = uni.getStorageSync('addAssignArr')