From ac0c8330aacb80b1becebcbe2e98da57ed275f4e Mon Sep 17 00:00:00 2001
From: Panzihang <819652404@qq.com>
Date: Wed, 12 Jul 2023 17:46:47 +0800
Subject: [PATCH] 7.12 pan

---
 pages.json                       |  96 ++++++++++++
 pages/shipWork/abnormal.vue      | 109 +++++++++++++
 pages/shipWork/abnormalAdd.vue   | 180 +++++++++++++++++++++
 pages/shipWork/documentList.vue  |  34 ++--
 pages/shipWork/mafi.vue          | 113 ++++++++++++++
 pages/shipWork/mafiAdd.vue       | 225 ++++++++++++++++++++++++++
 pages/shipWork/notice.vue        | 109 +++++++++++++
 pages/shipWork/noticeAdd.vue     | 162 +++++++++++++++++++
 pages/shipWork/opinion.vue       | 109 +++++++++++++
 pages/shipWork/opinionAdd.vue    | 226 +++++++++++++++++++++++++++
 pages/shipWork/patrol.vue        |  97 ++++++++++++
 pages/shipWork/patrolAdd.vue     | 212 +++++++++++++++++++++++++
 pages/shipWork/peopleAdd.vue     |  23 +--
 pages/shipWork/shipInfo.vue      |  45 ++++++
 pages/shipWork/shipPlan.vue      |  74 +++++++++
 pages/shipWork/supply.vue        | 109 +++++++++++++
 pages/shipWork/supplyAdd.vue     | 219 ++++++++++++++++++++++++++
 pages/shipWork/untieAdd.vue      | 217 ++++++++++++++++++++++++++
 pages/shipWork/untieCord.vue     | 113 ++++++++++++++
 pages/shipWork/workAssign.vue    | 109 +++++++++++++
 pages/shipWork/workAssignAdd.vue | 260 +++++++++++++++++++++++++++++++
 21 files changed, 2815 insertions(+), 26 deletions(-)
 create mode 100644 pages/shipWork/abnormal.vue
 create mode 100644 pages/shipWork/abnormalAdd.vue
 create mode 100644 pages/shipWork/mafi.vue
 create mode 100644 pages/shipWork/mafiAdd.vue
 create mode 100644 pages/shipWork/notice.vue
 create mode 100644 pages/shipWork/noticeAdd.vue
 create mode 100644 pages/shipWork/opinion.vue
 create mode 100644 pages/shipWork/opinionAdd.vue
 create mode 100644 pages/shipWork/patrol.vue
 create mode 100644 pages/shipWork/patrolAdd.vue
 create mode 100644 pages/shipWork/shipInfo.vue
 create mode 100644 pages/shipWork/shipPlan.vue
 create mode 100644 pages/shipWork/supply.vue
 create mode 100644 pages/shipWork/supplyAdd.vue
 create mode 100644 pages/shipWork/untieAdd.vue
 create mode 100644 pages/shipWork/untieCord.vue
 create mode 100644 pages/shipWork/workAssign.vue
 create mode 100644 pages/shipWork/workAssignAdd.vue

diff --git a/pages.json b/pages.json
index 04b1cd0..ccc7684 100644
--- a/pages.json
+++ b/pages.json
@@ -52,6 +52,102 @@
 			"style": {
 				"navigationBarTitleText": "工班信息详情"
 			}
+		}, {
+			"path": "pages/shipWork/untieCord",
+			"style": {
+				"navigationBarTitleText": "系解缆"
+			}
+		},
+		{
+			"path": "pages/shipWork/untieAdd",
+			"style": {
+				"navigationBarTitleText": "系解缆信息"
+			}
+		},
+		{
+			"path": "pages/shipWork/supply",
+			"style": {
+				"navigationBarTitleText": "供给"
+			}
+		},
+		{
+			"path": "pages/shipWork/supplyAdd",
+			"style": {
+				"navigationBarTitleText": "供给信息"
+			}
+		},
+		{
+			"path": "pages/shipWork/workAssign",
+			"style": {
+				"navigationBarTitleText": "指导员作业布置"
+			}
+		},
+		{
+			"path": "pages/shipWork/workAssignAdd",
+			"style": {
+				"navigationBarTitleText": "指导员作业布置信息"
+			}
+		}, {
+			"path": "pages/shipWork/notice",
+			"style": {
+				"navigationBarTitleText": "船舶装卸通知书"
+			}
+		},
+		{
+			"path": "pages/shipWork/noticeAdd",
+			"style": {
+				"navigationBarTitleText": "船舶装卸通知书信息"
+			}
+		}, {
+			"path": "pages/shipWork/opinion",
+			"style": {
+				"navigationBarTitleText": "质量意见征询"
+			}
+		}, {
+			"path": "pages/shipWork/opinionAdd",
+			"style": {
+				"navigationBarTitleText": "质量意见征询信息"
+			}
+		}, {
+			"path": "pages/shipWork/abnormal",
+			"style": {
+				"navigationBarTitleText": "异常情况"
+			}
+		}, {
+			"path": "pages/shipWork/abnormalAdd",
+			"style": {
+				"navigationBarTitleText": "异常情况信息"
+			}
+		}, {
+			"path": "pages/shipWork/mafi",
+			"style": {
+				"navigationBarTitleText": "MAFI清单"
+			}
+		}, {
+			"path": "pages/shipWork/mafiAdd",
+			"style": {
+				"navigationBarTitleText": "MAFI清单信息"
+			}
+		}, {
+			"path": "pages/shipWork/patrol",
+			"style": {
+				"navigationBarTitleText": "安全巡检"
+			}
+		}, {
+			"path": "pages/shipWork/patrolAdd",
+			"style": {
+				"navigationBarTitleText": "安全巡检信息"
+			}
+		}, {
+			"path": "pages/shipWork/shipInfo",
+			"style": {
+				"navigationBarTitleText": "船舶资料"
+			}
+		}, {
+			"path": "pages/shipWork/shipPlan",
+			"style": {
+				"navigationBarTitleText": "船舶计划"
+			}
 		},
 		{
 			"path": "pages/monitor/index",
diff --git a/pages/shipWork/abnormal.vue b/pages/shipWork/abnormal.vue
new file mode 100644
index 0000000..fdbda21
--- /dev/null
+++ b/pages/shipWork/abnormal.vue
@@ -0,0 +1,109 @@
+<template>
+	<view class="abnormal">
+		<view class="container">
+			<ul>
+				<li v-for="(item,index) in infoList" :key="index" @click="add('look')">
+					<view class="title">类型：{{item.val1}}</view>
+					<p>上传状态：{{item.val2}}</p>
+					<p>航次：{{item.val3}}</p>
+					<p>贸易类型：{{item.val4}}</p>
+					<p>进出口：{{item.val5}}</p>
+				</li>
+			</ul>
+			<view class="addBtn" @click="add('add')">+ 新增</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				infoList: [{
+					val1: "大风预警",
+					val2: "待上传",
+					val3: "JK097085964",
+					val4: "内贸",
+					val5: "进口",
+				}, {
+					val1: "大风预警",
+					val2: "待上传",
+					val3: "JK097085964",
+					val4: "内贸",
+					val5: "进口",
+				}, {
+					val1: "大风预警",
+					val2: "待上传",
+					val3: "JK097085964",
+					val4: "内贸",
+					val5: "进口",
+				}, ]
+			}
+		},
+		methods: {
+			add(state) {
+				const obj = {
+					state: state,
+				}
+				const params = encodeURIComponent(JSON.stringify(obj));
+				uni.navigateTo({
+					url: `/pages/shipWork/abnormalAdd?params=${params}`
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="less" scoped>
+	.abnormal {
+		.container {
+			padding: 30px 20px;
+
+			ul {
+				padding: 20px 0;
+
+				li {
+					display: flex;
+					justify-content: space-between;
+					border-bottom: 1px solid #ccc;
+					padding: 20px;
+
+					.title {
+						font-size: 16px;
+						font-weight: bold;
+						display: flex;
+						flex-direction: column;
+						justify-content: center;
+					}
+
+					.shift {
+						p {
+							font-size: 16px;
+						}
+					}
+
+					.state {
+						display: flex;
+						flex-direction: column;
+						justify-content: center;
+					}
+				}
+			}
+
+			.addBtn {
+				position: fixed;
+				right: 50px;
+				bottom: 50px;
+				width: 100px;
+				height: 100px;
+				border-radius: 50%;
+				background-color: #2979ff;
+				color: #fff;
+				font-size: 24px;
+				text-align: center;
+				line-height: 100px;
+				font-weight: bold;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/shipWork/abnormalAdd.vue b/pages/shipWork/abnormalAdd.vue
new file mode 100644
index 0000000..f97a4da
--- /dev/null
+++ b/pages/shipWork/abnormalAdd.vue
@@ -0,0 +1,180 @@
+<template>
+	<view class="abnormalAdd">
+		<view class="container">
+			<ul>
+				<li>
+					<p>船名：</p>
+					<span>快乐号</span>
+				</li>
+				<li>
+					<p><span class="required" v-if="obj.state != 'look'">*</span>航次：</p>
+					<uni-data-select v-model="hcValue" :localdata="hcList" @change="hcChange"
+						v-if="obj.state != 'look'"></uni-data-select>
+					<span v-else>CK98796</span>
+				</li>
+				<li>
+					<p>进出口：</p>
+					<span>进口</span>
+				</li>
+				<li>
+					<p>贸易类型：</p>
+					<span>内贸</span>
+				</li>
+				<li>
+					<p><span class="required" v-if="obj.state != 'look'">*</span>作业日期：</p>
+					<uni-datetime-picker v-model="dateTime" type="date" :clear-icon="false"
+						v-if="obj.state != 'look'" />
+					<span v-else>2020-04-21</span>
+				</li>
+				<li>
+					<p><span class="required" v-if="obj.state != 'look'">*</span>类型：</p>
+					<uni-easyinput v-if="obj.state != 'look'" v-model="typeValue" placeholder="请输入"></uni-easyinput>
+					<span v-else>类型类型</span>
+				</li>
+				<li class="wLi">
+					<p><span class="required" v-if="obj.state != 'look'">*</span>描述：</p>
+					<uni-easyinput type="textarea" autoHeight v-model="describe" placeholder="请输入任务描述(200字以内)"
+						maxlength="200" v-if="obj.state != 'look'"></uni-easyinput>
+					<span v-else>描述描述描述</span>
+				</li>
+			</ul>
+			<view class="btnList">
+				<van-button type="default" @click="cancel">取消</van-button>
+				<van-button type="default" v-if="obj.state == 'look'">删除</van-button>
+				<van-button type="info" v-if="obj.state == 'add' || obj.state == 'edit'" @click="save">保存</van-button>
+				<van-button type="info" v-if="obj.state == 'look'" @click="toGo('edit')">编辑</van-button>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				obj: {},
+				// 航次下拉框
+				hcValue: "",
+				hcList: [{
+						value: 0,
+						text: "航次0"
+					},
+					{
+						value: 1,
+						text: "航次1"
+					},
+					{
+						value: 2,
+						text: "航次2"
+					},
+				],
+				// 日期
+				dateTime: "",
+				// 类型
+				typeValue: "",
+				// 描述
+				describe: "",
+			}
+		},
+		onLoad(options) {
+			if ('params' in options) {
+				// 获取传递的对象参数，使用decodeURIComponent解码，并转为对象
+				this.obj = JSON.parse(decodeURIComponent(options.params))
+			}
+		},
+		methods: {
+			// 航次下拉
+			hcChange(e) {
+				this.hcValue = e;
+			},
+			// 取消
+			cancel() {
+				uni.navigateTo({
+					url: '/pages/shipWork/abnormal'
+				})
+			},
+			// 保存
+			save() {
+				uni.navigateTo({
+					url: '/pages/shipWork/abnormal'
+				})
+			},
+			// 编辑
+			toGo(state) {
+				this.obj.state = state;
+				const params = encodeURIComponent(JSON.stringify(this.obj));
+				uni.navigateTo({
+					url: `/pages/shipWork/abnormalAdd?params=${params}`
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="less" scoped>
+	.abnormalAdd {
+		.container {
+			padding: 30px 20px;
+
+			ul {
+				display: flex;
+				flex-wrap: wrap;
+				justify-content: space-between;
+
+				.wLi {
+					width: 100%;
+				}
+
+				li {
+					width: 44%;
+					border-top: 1px solid #ccc;
+					border-bottom: 1px solid #ccc;
+					display: flex;
+					padding: 10px 20px;
+					line-height: 35px;
+					margin-bottom: 20px;
+
+					.required {
+						color: red;
+						margin-right: 5px;
+					}
+
+					p {
+						min-width: 85px;
+						text-align: right;
+					}
+
+					/deep/.uni-numbox {
+						border: 1px solid #ccc;
+						box-sizing: border-box;
+					}
+
+					/deep/.uni-numbox-btns {
+						border-right: 1px solid #ccc;
+						border-left: 1px solid #ccc;
+						padding: 0 14px;
+						box-sizing: border-box;
+					}
+
+					/deep/.uni-numbox__value {
+						width: 100px;
+						height: 35px;
+						line-height: 35px;
+						background-color: #fff !important;
+					}
+				}
+			}
+
+			.btnList {
+				display: flex;
+				justify-content: center;
+
+				/deep/ .van-button {
+					margin: 30px 20px;
+					width: 120px;
+					height: 50px;
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/shipWork/documentList.vue b/pages/shipWork/documentList.vue
index 8de6605..c8ed5a5 100644
--- a/pages/shipWork/documentList.vue
+++ b/pages/shipWork/documentList.vue
@@ -5,14 +5,14 @@
 			<ul>
 				<li v-for="(item,index) in infoList" :key="index" @click="toGo(item.url)">
 					<view class="round"></view>
-					<span>{{item.name}}</span>
+					<p>{{item.name}}</p]>
 				</li>
 			</ul>
 			<p class="title">其他作业</p>
 			<ul>
 				<li v-for="(item,index) in otherListh" :key="index" @click="toGo(item.url)">
 					<view class="round"></view>
-					<span>{{item.name}}</span>
+					<p>{{item.name}}</p>
 				</li>
 			</ul>
 		</view>
@@ -28,41 +28,41 @@
 					url: "mixWork"
 				}, {
 					name: "系解缆",
-					url: "mixWork"
+					url: "untieCord"
 				}, {
 					name: "供给",
-					url: "mixWork"
+					url: "supply"
 				}, {
 					name: "指导员作业布置",
-					url: "mixWork"
+					url: "workAssign"
 				}, {
 					name: "船舶装卸通知单",
-					url: "mixWork"
+					url: "notice"
 				}, {
 					name: "质量意见征询",
-					url: "mixWork"
+					url: "opinion"
 				}, {
 					name: "异常情况",
-					url: "mixWork"
+					url: "abnormal"
 				}, {
 					name: "MAFI清单",
-					url: "mixWork"
+					url: "mafi"
 				}],
 				otherListh: [{
 						name: "安全巡检",
-						url: "mixWork"
-					},
-					{
-						name: "船舶载货量",
-						url: "mixWork"
+						url: "patrol"
 					},
+					// {
+					// 	name: "船舶载货量",
+					// 	url: "mixWork"
+					// },
 					{
 						name: "船舶资料",
-						url: "mixWork"
+						url: "shipInfo"
 					},
 					{
 						name: "船舶计划",
-						url: "mixWork"
+						url: "shipPlan"
 					},
 					{
 						name: "作业查询",
@@ -108,7 +108,7 @@
 						margin: 10px auto;
 					}
 
-					span {
+					p {
 						text-align: center;
 						font-size: 16px;
 						margin-top: 10px;
diff --git a/pages/shipWork/mafi.vue b/pages/shipWork/mafi.vue
new file mode 100644
index 0000000..3dfb89c
--- /dev/null
+++ b/pages/shipWork/mafi.vue
@@ -0,0 +1,113 @@
+<template>
+	<view class="mafi">
+		<view class="container">
+			<ul>
+				<li v-for="(item,index) in infoList" :key="index" @click="add('look')">
+					<view class="title">{{item.val1}}</view>
+					<p>上传状态：{{item.val2}}</p>
+					<p>尺码：{{item.val3}}</p>
+					<p>类型：{{item.val4}}</p>
+					<p>装卸方式：{{item.val5}}</p>
+					<p>航次：{{item.val6}}</p>
+				</li>
+			</ul>
+			<view class="addBtn" @click="add('add')">+ 新增</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				infoList: [{
+					val1: "马菲板号",
+					val2: "待上传",
+					val3: "尺码",
+					val4: "类型",
+					val5: "装卸方式",
+					val6: "JK9796966",
+				}, {
+					val1: "马菲板号",
+					val2: "待上传",
+					val3: "尺码",
+					val4: "类型",
+					val5: "装卸方式",
+					val6: "JK9796966",
+				}, {
+					val1: "马菲板号",
+					val2: "待上传",
+					val3: "尺码",
+					val4: "类型",
+					val5: "装卸方式",
+					val6: "JK9796966",
+				}]
+			}
+		},
+		methods: {
+			add(state) {
+				const obj = {
+					state: state,
+				}
+				const params = encodeURIComponent(JSON.stringify(obj));
+				uni.navigateTo({
+					url: `/pages/shipWork/mafiAdd?params=${params}`
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="less" scoped>
+	.mafi {
+		.container {
+			padding: 30px 20px;
+
+			ul {
+				padding: 20px 0;
+
+				li {
+					display: flex;
+					justify-content: space-between;
+					border-bottom: 1px solid #ccc;
+					padding: 20px;
+
+					.title {
+						font-size: 16px;
+						font-weight: bold;
+						display: flex;
+						flex-direction: column;
+						justify-content: center;
+					}
+
+					.shift {
+						p {
+							font-size: 16px;
+						}
+					}
+
+					.state {
+						display: flex;
+						flex-direction: column;
+						justify-content: center;
+					}
+				}
+			}
+
+			.addBtn {
+				position: fixed;
+				right: 50px;
+				bottom: 50px;
+				width: 100px;
+				height: 100px;
+				border-radius: 50%;
+				background-color: #2979ff;
+				color: #fff;
+				font-size: 24px;
+				text-align: center;
+				line-height: 100px;
+				font-weight: bold;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/shipWork/mafiAdd.vue b/pages/shipWork/mafiAdd.vue
new file mode 100644
index 0000000..cf23fda
--- /dev/null
+++ b/pages/shipWork/mafiAdd.vue
@@ -0,0 +1,225 @@
+<template>
+	<view class="mafiAdd">
+		<view class="container">
+			<ul>
+				<li>
+					<p>船名：</p>
+					<span>快乐号</span>
+				</li>
+				<li>
+					<p><span class="required" v-if="obj.state != 'look'">*</span>航次：</p>
+					<uni-data-select v-model="hcValue" :localdata="hcList" @change="hcChange"
+						v-if="obj.state != 'look'"></uni-data-select>
+					<span v-else>CK98796</span>
+				</li>
+				<li>
+					<p>进出口：</p>
+					<span>进口</span>
+				</li>
+				<li>
+					<p>贸易类型：</p>
+					<span>内贸</span>
+				</li>
+				<li>
+					<p><span class="required" v-if="obj.state != 'look'">*</span>作业日期：</p>
+					<uni-datetime-picker v-model="workTime" type="date" :clear-icon="false"
+						v-if="obj.state != 'look'" />
+					<span v-else>2020-04-21</span>
+				</li>
+				<li>
+					<p><span class="required" v-if="obj.state != 'look'">*</span>马菲板号：</p>
+					<uni-easyinput v-if="obj.state != 'look'" v-model="vinCode" placeholder="请输入"></uni-easyinput>
+					<span v-else>马菲板号123123</span>
+				</li>
+				<li>
+					<p><span class="required" v-if="obj.state != 'look'">*</span>尺码：</p>
+					<uni-number-box v-model="sizeNum" v-if="obj.state != 'look'" />
+					<span v-else>10</span>
+				</li>
+				<li>
+					<p><span class="required" v-if="obj.state != 'look'">*</span>类型：</p>
+					<uni-data-select v-model="lxValue" :localdata="lxList" @change="lxChange"
+						v-if="obj.state != 'look'"></uni-data-select>
+					<span v-else>类型1</span>
+				</li>
+				<li>
+					<p><span class="required" v-if="obj.state != 'look'">*</span>装卸类型：</p>
+					<uni-data-select v-model="zxValue" :localdata="zxList" @change="zxChange"
+						v-if="obj.state != 'look'"></uni-data-select>
+					<span v-else>装卸类型1</span>
+				</li>
+			</ul>
+			<view class="btnList">
+				<van-button type="default" @click="cancel">取消</van-button>
+				<van-button type="default" v-if="obj.state == 'look'">删除</van-button>
+				<van-button type="info" v-if="obj.state == 'add' || obj.state == 'edit'" @click="save">保存</van-button>
+				<van-button type="info" v-if="obj.state == 'look'" @click="toGo('edit')">编辑</van-button>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				obj: {},
+				// 航次下拉框
+				hcValue: "",
+				hcList: [{
+						value: 0,
+						text: "航次0"
+					},
+					{
+						value: 1,
+						text: "航次1"
+					},
+					{
+						value: 2,
+						text: "航次2"
+					},
+				],
+				// 作业时间
+				workTime: "",
+				// 马菲板号
+				vinCode: "",
+				// 尺码
+				sizeNum: 0,
+				// 类型下拉框
+				lxValue: "",
+				lxList: [{
+						value: 0,
+						text: "类型0"
+					},
+					{
+						value: 1,
+						text: "类型1"
+					},
+					{
+						value: 2,
+						text: "类型2"
+					},
+				],
+				// 装卸类型下拉框
+				zxValue: "",
+				zxList: [{
+						value: 0,
+						text: "装卸类型0"
+					},
+					{
+						value: 1,
+						text: "装卸类型1"
+					},
+					{
+						value: 2,
+						text: "装卸类型2"
+					},
+				],
+			}
+		},
+		onLoad(options) {
+			if ('params' in options) {
+				// 获取传递的对象参数，使用decodeURIComponent解码，并转为对象
+				this.obj = JSON.parse(decodeURIComponent(options.params))
+			}
+		},
+		methods: {
+			// 航次下拉
+			hcChange(e) {
+				this.hcValue = e;
+			},
+			// 类型下拉
+			lxChange(e) {
+				this.lxValue = e;
+			},
+			// 装卸类型下拉
+			zxChange(e) {
+				this.zxValue = e;
+			},
+			// 取消
+			cancel() {
+				uni.navigateTo({
+					url: '/pages/shipWork/mafi'
+				})
+			},
+			// 保存
+			save() {
+				uni.navigateTo({
+					url: '/pages/shipWork/mafi'
+				})
+			},
+			// 编辑
+			toGo(state) {
+				this.obj.state = state;
+				const params = encodeURIComponent(JSON.stringify(this.obj));
+				uni.navigateTo({
+					url: `/pages/shipWork/mafiAdd?params=${params}`
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="less" scoped>
+	.mafiAdd {
+		.container {
+			padding: 30px 20px;
+
+			ul {
+				display: flex;
+				flex-wrap: wrap;
+				justify-content: space-between;
+
+				li {
+					width: 44%;
+					border-top: 1px solid #ccc;
+					border-bottom: 1px solid #ccc;
+					display: flex;
+					padding: 10px 20px;
+					line-height: 35px;
+					margin-bottom: 20px;
+
+					.required {
+						color: red;
+						margin-right: 5px;
+					}
+
+					p {
+						min-width: 85px;
+						text-align: right;
+					}
+
+					/deep/.uni-numbox {
+						border: 1px solid #ccc;
+						box-sizing: border-box;
+					}
+
+					/deep/.uni-numbox-btns {
+						border-right: 1px solid #ccc;
+						border-left: 1px solid #ccc;
+						padding: 0 14px;
+						box-sizing: border-box;
+					}
+
+					/deep/.uni-numbox__value {
+						width: 100px;
+						height: 35px;
+						line-height: 35px;
+						background-color: #fff !important;
+					}
+				}
+			}
+
+			.btnList {
+				display: flex;
+				justify-content: center;
+
+				/deep/ .van-button {
+					margin: 30px 20px;
+					width: 120px;
+					height: 50px;
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/shipWork/notice.vue b/pages/shipWork/notice.vue
new file mode 100644
index 0000000..048bdcd
--- /dev/null
+++ b/pages/shipWork/notice.vue
@@ -0,0 +1,109 @@
+<template>
+	<view class="notice">
+		<view class="container">
+			<ul>
+				<li v-for="(item,index) in infoList" :key="index" @click="add('look')">
+					<view class="title">航次：{{item.val1}}</view>
+					<p>状态：{{item.val2}}</p>
+					<p>进出口：{{item.val3}}</p>
+					<p>贸易类型：{{item.val4}}</p>
+					<p>作业日期：{{item.val5}}</p>
+				</li>
+			</ul>
+			<view class="addBtn" @click="add('add')">+ 新增</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				infoList: [{
+					val1: "CK124324",
+					val2: "待上传",
+					val3: "进口",
+					val4: "内贸",
+					val5: "05/30",
+				}, {
+					val1: "CK124324",
+					val2: "待上传",
+					val3: "进口",
+					val4: "内贸",
+					val5: "05/30",
+				}, {
+					val1: "CK124324",
+					val2: "待上传",
+					val3: "进口",
+					val4: "内贸",
+					val5: "05/30",
+				}]
+			}
+		},
+		methods: {
+			add(state) {
+				const obj = {
+					state: state,
+				}
+				const params = encodeURIComponent(JSON.stringify(obj));
+				uni.navigateTo({
+					url: `/pages/shipWork/noticeAdd?params=${params}`
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="less" scoped>
+	.notice {
+		.container {
+			padding: 30px 20px;
+
+			ul {
+				padding: 20px 0;
+
+				li {
+					display: flex;
+					justify-content: space-between;
+					border-bottom: 1px solid #ccc;
+					padding: 20px;
+
+					.title {
+						font-size: 16px;
+						font-weight: bold;
+						display: flex;
+						flex-direction: column;
+						justify-content: center;
+					}
+
+					.shift {
+						p {
+							font-size: 16px;
+						}
+					}
+
+					.state {
+						display: flex;
+						flex-direction: column;
+						justify-content: center;
+					}
+				}
+			}
+
+			.addBtn {
+				position: fixed;
+				right: 50px;
+				bottom: 50px;
+				width: 100px;
+				height: 100px;
+				border-radius: 50%;
+				background-color: #2979ff;
+				color: #fff;
+				font-size: 24px;
+				text-align: center;
+				line-height: 100px;
+				font-weight: bold;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/shipWork/noticeAdd.vue b/pages/shipWork/noticeAdd.vue
new file mode 100644
index 0000000..cb71c8c
--- /dev/null
+++ b/pages/shipWork/noticeAdd.vue
@@ -0,0 +1,162 @@
+<template>
+	<view class="noticeAdd">
+		<view class="container">
+			<ul>
+				<li>
+					<p>船名：</p>
+					<span>快乐号</span>
+				</li>
+				<li>
+					<p><span class="required" v-if="obj.state != 'look'">*</span>航次：</p>
+					<uni-data-select v-model="hcValue" :localdata="hcList" @change="hcChange"
+						v-if="obj.state != 'look'"></uni-data-select>
+					<span v-else>CK98796</span>
+				</li>
+				<li>
+					<p>进出口：</p>
+					<span>进口</span>
+				</li>
+				<li>
+					<p>贸易类型：</p>
+					<span>内贸</span>
+				</li>
+				<li>
+					<p><span class="required" v-if="obj.state != 'look'">*</span>作业日期：</p>
+					<uni-datetime-picker v-model="workTime" type="date" :clear-icon="false"
+						v-if="obj.state != 'look'" />
+					<span v-else>2020-04-21</span>
+				</li>
+
+			</ul>
+			<view class="btnList">
+				<van-button type="default" @click="cancel">取消</van-button>
+				<van-button type="default" v-if="obj.state == 'look'">删除</van-button>
+				<van-button type="info" v-if="obj.state == 'add' || obj.state == 'edit'" @click="save">保存</van-button>
+				<van-button type="info" v-if="obj.state == 'look'" @click="toGo('edit')">编辑</van-button>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				obj: {},
+				// 航次下拉框
+				hcValue: "",
+				hcList: [{
+						value: 0,
+						text: "航次0"
+					},
+					{
+						value: 1,
+						text: "航次1"
+					},
+					{
+						value: 2,
+						text: "航次2"
+					},
+				],
+				// 作业时间
+				workTime: "",
+			}
+		},
+		onLoad(options) {
+			if ('params' in options) {
+				// 获取传递的对象参数，使用decodeURIComponent解码，并转为对象
+				this.obj = JSON.parse(decodeURIComponent(options.params))
+			}
+		},
+		methods: {
+			// 航次下拉
+			hcChange(e) {
+				this.hcValue = e;
+			},
+			// 取消
+			cancel() {
+				uni.navigateTo({
+					url: '/pages/shipWork/notice'
+				})
+			},
+			// 保存
+			save() {
+				uni.navigateTo({
+					url: '/pages/shipWork/notice'
+				})
+			},
+			// 编辑
+			toGo(state) {
+				this.obj.state = state;
+				const params = encodeURIComponent(JSON.stringify(this.obj));
+				uni.navigateTo({
+					url: `/pages/shipWork/noticeAdd?params=${params}`
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="less" scoped>
+	.noticeAdd {
+		.container {
+			padding: 30px 20px;
+
+			ul {
+				display: flex;
+				flex-wrap: wrap;
+				justify-content: space-between;
+
+				li {
+					width: 44%;
+					border-top: 1px solid #ccc;
+					border-bottom: 1px solid #ccc;
+					display: flex;
+					padding: 10px 20px;
+					line-height: 35px;
+					margin-bottom: 20px;
+
+					.required {
+						color: red;
+						margin-right: 5px;
+					}
+
+					p {
+						min-width: 85px;
+						text-align: right;
+					}
+
+					/deep/.uni-numbox {
+						border: 1px solid #ccc;
+						box-sizing: border-box;
+					}
+
+					/deep/.uni-numbox-btns {
+						border-right: 1px solid #ccc;
+						border-left: 1px solid #ccc;
+						padding: 0 14px;
+						box-sizing: border-box;
+					}
+
+					/deep/.uni-numbox__value {
+						width: 100px;
+						height: 35px;
+						line-height: 35px;
+						background-color: #fff !important;
+					}
+				}
+			}
+
+			.btnList {
+				display: flex;
+				justify-content: center;
+
+				/deep/ .van-button {
+					margin: 30px 20px;
+					width: 120px;
+					height: 50px;
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/shipWork/opinion.vue b/pages/shipWork/opinion.vue
new file mode 100644
index 0000000..42bd701
--- /dev/null
+++ b/pages/shipWork/opinion.vue
@@ -0,0 +1,109 @@
+<template>
+	<view class="opinion">
+		<view class="container">
+			<ul>
+				<li v-for="(item,index) in infoList" :key="index" @click="add('look')">
+					<view class="title">航次：{{item.val1}}</view>
+					<p>状态：{{item.val2}}</p>
+					<p>进出口：{{item.val3}}</p>
+					<p>贸易类型：{{item.val4}}</p>
+					<p>作业日期：{{item.val5}}</p>
+				</li>
+			</ul>
+			<view class="addBtn" @click="add('add')">+ 新增</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				infoList: [{
+					val1: "CK124324",
+					val2: "待上传",
+					val3: "进口",
+					val4: "内贸",
+					val5: "05/30",
+				}, {
+					val1: "CK124324",
+					val2: "待上传",
+					val3: "进口",
+					val4: "内贸",
+					val5: "05/30",
+				}, {
+					val1: "CK124324",
+					val2: "待上传",
+					val3: "进口",
+					val4: "内贸",
+					val5: "05/30",
+				}]
+			}
+		},
+		methods: {
+			add(state) {
+				const obj = {
+					state: state,
+				}
+				const params = encodeURIComponent(JSON.stringify(obj));
+				uni.navigateTo({
+					url: `/pages/shipWork/opinionAdd?params=${params}`
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="less" scoped>
+	.opinion {
+		.container {
+			padding: 30px 20px;
+
+			ul {
+				padding: 20px 0;
+
+				li {
+					display: flex;
+					justify-content: space-between;
+					border-bottom: 1px solid #ccc;
+					padding: 20px;
+
+					.title {
+						font-size: 16px;
+						font-weight: bold;
+						display: flex;
+						flex-direction: column;
+						justify-content: center;
+					}
+
+					.shift {
+						p {
+							font-size: 16px;
+						}
+					}
+
+					.state {
+						display: flex;
+						flex-direction: column;
+						justify-content: center;
+					}
+				}
+			}
+
+			.addBtn {
+				position: fixed;
+				right: 50px;
+				bottom: 50px;
+				width: 100px;
+				height: 100px;
+				border-radius: 50%;
+				background-color: #2979ff;
+				color: #fff;
+				font-size: 24px;
+				text-align: center;
+				line-height: 100px;
+				font-weight: bold;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/shipWork/opinionAdd.vue b/pages/shipWork/opinionAdd.vue
new file mode 100644
index 0000000..e9b63d8
--- /dev/null
+++ b/pages/shipWork/opinionAdd.vue
@@ -0,0 +1,226 @@
+<template>
+	<view class="opinionAdd">
+		<view class="container">
+			<ul>
+				<li>
+					<p>船名：</p>
+					<span>快乐号</span>
+				</li>
+				<li>
+					<p><span class="required" v-if="obj.state != 'look'">*</span>航次：</p>
+					<uni-data-select v-model="hcValue" :localdata="hcList" @change="hcChange"
+						v-if="obj.state != 'look'"></uni-data-select>
+					<span v-else>CK98796</span>
+				</li>
+				<li>
+					<p>进出口：</p>
+					<span>进口</span>
+				</li>
+				<li>
+					<p>贸易类型：</p>
+					<span>内贸</span>
+				</li>
+				<li>
+					<p><span class="required" v-if="obj.state != 'look'">*</span>泊位：</p>
+					<uni-data-select v-model="bwValue" :localdata="bwList" @change="bwChange"
+						v-if="obj.state != 'look'"></uni-data-select>
+					<span v-else>1泊位</span>
+				</li>
+				<li>
+					<p><span class="required" v-if="obj.state != 'look'">*</span>装卸类型：</p>
+					<uni-data-select v-model="zxValue" :localdata="zxList" @change="zxChange"
+						v-if="obj.state != 'look'"></uni-data-select>
+					<span v-else>装卸类型1</span>
+				</li>
+				<li>
+					<p><span class="required" v-if="obj.state != 'look'">*</span>车辆数量：</p>
+					<uni-number-box v-model="carNum" v-if="obj.state != 'look'" />
+					<span v-else>100</span>
+				</li>
+				<li>
+					<p><span class="required" v-if="obj.state != 'look'">*</span>备件数量：</p>
+					<uni-number-box v-model="partsNum" v-if="obj.state != 'look'" />
+					<span v-else>100</span>
+				</li>
+				<li>
+					<p><span class="required" v-if="obj.state != 'look'">*</span>作业日期：</p>
+					<uni-datetime-picker v-model="workTime" type="date" :clear-icon="false"
+						v-if="obj.state != 'look'" />
+					<span v-else>2020-04-21</span>
+				</li>
+
+			</ul>
+			<view class="btnList">
+				<van-button type="default" @click="cancel">取消</van-button>
+				<van-button type="default" v-if="obj.state == 'look'">删除</van-button>
+				<van-button type="info" v-if="obj.state == 'add' || obj.state == 'edit'" @click="save">保存</van-button>
+				<van-button type="info" v-if="obj.state == 'look'" @click="toGo('edit')">编辑</van-button>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				obj: {},
+				// 航次下拉框
+				hcValue: "",
+				hcList: [{
+						value: 0,
+						text: "航次0"
+					},
+					{
+						value: 1,
+						text: "航次1"
+					},
+					{
+						value: 2,
+						text: "航次2"
+					},
+				],
+				// 泊位下拉框
+				bwValue: "",
+				bwList: [{
+						value: 0,
+						text: "泊位0"
+					},
+					{
+						value: 1,
+						text: "泊位1"
+					},
+					{
+						value: 2,
+						text: "泊位2"
+					},
+				],
+				// 装卸类型下拉框
+				zxValue: "",
+				zxList: [{
+						value: 0,
+						text: "装卸类型0"
+					},
+					{
+						value: 1,
+						text: "装卸类型1"
+					},
+					{
+						value: 2,
+						text: "装卸类型2"
+					},
+				],
+				// 车辆数量
+				carNum: 0,
+				// 备件数量
+				partsNum: 0,
+				// 作业时间
+				workTime: "",
+			}
+		},
+		onLoad(options) {
+			if ('params' in options) {
+				// 获取传递的对象参数，使用decodeURIComponent解码，并转为对象
+				this.obj = JSON.parse(decodeURIComponent(options.params))
+			}
+		},
+		methods: {
+			// 航次下拉
+			hcChange(e) {
+				this.hcValue = e;
+			},
+			// 泊位下拉
+			bwChange(e) {
+				this.bwValue = e;
+			},
+			// 装卸类型下拉
+			zxChange(e) {
+				this.zxValue = e;
+			},
+			// 取消
+			cancel() {
+				uni.navigateTo({
+					url: '/pages/shipWork/opinion'
+				})
+			},
+			// 保存
+			save() {
+				uni.navigateTo({
+					url: '/pages/shipWork/opinion'
+				})
+			},
+			// 编辑
+			toGo(state) {
+				this.obj.state = state;
+				const params = encodeURIComponent(JSON.stringify(this.obj));
+				uni.navigateTo({
+					url: `/pages/shipWork/opinionAdd?params=${params}`
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="less" scoped>
+	.opinionAdd {
+		.container {
+			padding: 30px 20px;
+
+			ul {
+				display: flex;
+				flex-wrap: wrap;
+				justify-content: space-between;
+
+				li {
+					width: 44%;
+					border-top: 1px solid #ccc;
+					border-bottom: 1px solid #ccc;
+					display: flex;
+					padding: 10px 20px;
+					line-height: 35px;
+					margin-bottom: 20px;
+
+					.required {
+						color: red;
+						margin-right: 5px;
+					}
+
+					p {
+						min-width: 85px;
+						text-align: right;
+					}
+
+					/deep/.uni-numbox {
+						border: 1px solid #ccc;
+						box-sizing: border-box;
+					}
+
+					/deep/.uni-numbox-btns {
+						border-right: 1px solid #ccc;
+						border-left: 1px solid #ccc;
+						padding: 0 14px;
+						box-sizing: border-box;
+					}
+
+					/deep/.uni-numbox__value {
+						width: 100px;
+						height: 35px;
+						line-height: 35px;
+						background-color: #fff !important;
+					}
+				}
+			}
+
+			.btnList {
+				display: flex;
+				justify-content: center;
+
+				/deep/ .van-button {
+					margin: 30px 20px;
+					width: 120px;
+					height: 50px;
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/shipWork/patrol.vue b/pages/shipWork/patrol.vue
new file mode 100644
index 0000000..29c6c86
--- /dev/null
+++ b/pages/shipWork/patrol.vue
@@ -0,0 +1,97 @@
+<template>
+	<view class="patrol">
+		<view class="container">
+			<ul>
+				<li v-for="(item,index) in infoList" :key="index" @click="add('look')">
+					<view class="title">类型：{{item.val1}}</view>
+					<p>上传状态：{{item.val2}}</p>
+					<p>航次：{{item.val3}}</p>
+					<p>贸易类型：{{item.val4}}</p>
+					<p>进出口：{{item.val5}}</p>
+				</li>
+			</ul>
+			<view class="addBtn" @click="add('add')">+ 新增</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				infoList: [{
+					val1: "大风预警",
+					val2: "上传成功",
+					val3: "JK097085964",
+					val4: "内贸",
+					val5: "进口",
+				}, {
+					val1: "大风预警",
+					val2: "待上传",
+					val3: "JK097085964",
+					val4: "内贸",
+					val5: "进口",
+				}, {
+					val1: "大风预警",
+					val2: "待上传",
+					val3: "JK097085964",
+					val4: "内贸",
+					val5: "进口",
+				}, ]
+			}
+		},
+		methods: {
+			add(state) {
+				const obj = {
+					state: state,
+				}
+				const params = encodeURIComponent(JSON.stringify(obj));
+				uni.navigateTo({
+					url: `/pages/shipWork/patrolAdd?params=${params}`
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="less" scoped>
+	.patrol {
+		.container {
+			padding: 30px 20px;
+
+			ul {
+				padding: 20px 0;
+
+				li {
+					display: flex;
+					justify-content: space-between;
+					border-bottom: 1px solid #ccc;
+					padding: 20px;
+
+					.title {
+						font-size: 16px;
+						font-weight: bold;
+						display: flex;
+						flex-direction: column;
+						justify-content: center;
+					}
+				}
+			}
+
+			.addBtn {
+				position: fixed;
+				right: 50px;
+				bottom: 50px;
+				width: 100px;
+				height: 100px;
+				border-radius: 50%;
+				background-color: #2979ff;
+				color: #fff;
+				font-size: 24px;
+				text-align: center;
+				line-height: 100px;
+				font-weight: bold;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/shipWork/patrolAdd.vue b/pages/shipWork/patrolAdd.vue
new file mode 100644
index 0000000..61b6d93
--- /dev/null
+++ b/pages/shipWork/patrolAdd.vue
@@ -0,0 +1,212 @@
+<template>
+	<view class="patrolAdd">
+		<view class="container">
+			<ul>
+				<li>
+					<p>船名：</p>
+					<span>快乐号</span>
+				</li>
+				<li>
+					<p><span class="required" v-if="obj.state != 'look'">*</span>航次：</p>
+					<uni-data-select v-model="hcValue" :localdata="hcList" @change="hcChange"
+						v-if="obj.state != 'look'"></uni-data-select>
+					<span v-else>CK98796</span>
+				</li>
+				<li>
+					<p>进出口：</p>
+					<span>进口</span>
+				</li>
+				<li>
+					<p>贸易类型：</p>
+					<span>内贸</span>
+				</li>
+				<li>
+					<p><span class="required" v-if="obj.state != 'look'">*</span>类型：</p>
+					<uni-easyinput v-if="obj.state != 'look'" v-model="typeValue" placeholder="请输入"></uni-easyinput>
+					<span v-else>类型类型</span>
+				</li>
+				<li class="tpLi">
+					<p><span class="required" v-if="obj.state != 'look'">*</span>图片上传：</p>
+					<template v-if="obj.state != 'look'">
+						<view class="picture">
+							<uni-file-picker limit="9" title="最多选择9张图片"></uni-file-picker>
+						</view>
+					</template>
+					<view class="pictureLook" v-else>
+						<img src="../../static/images/testImg.jpg">
+					</view>
+				</li>
+				<li class="wLi">
+					<p><span class="required" v-if="obj.state != 'look'">*</span>描述：</p>
+					<uni-easyinput type="textarea" autoHeight v-model="describe" placeholder="请输入任务描述(200字以内)"
+						maxlength="200" v-if="obj.state != 'look'"></uni-easyinput>
+					<span v-else>描述描述描述</span>
+				</li>
+			</ul>
+			<view class="btnList">
+				<van-button type="default" @click="cancel">取消</van-button>
+				<van-button type="default" v-if="obj.state == 'look'">删除</van-button>
+				<van-button type="info" v-if="obj.state == 'add' || obj.state == 'edit'" @click="save">保存</van-button>
+				<van-button type="info" v-if="obj.state == 'look'" @click="toGo('edit')">编辑</van-button>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				obj: {},
+				// 航次下拉框
+				hcValue: "",
+				hcList: [{
+						value: 0,
+						text: "航次0"
+					},
+					{
+						value: 1,
+						text: "航次1"
+					},
+					{
+						value: 2,
+						text: "航次2"
+					},
+				],
+				// 类型
+				typeValue: "",
+				// 描述
+				describe: "",
+			}
+		},
+		onLoad(options) {
+			if ('params' in options) {
+				// 获取传递的对象参数，使用decodeURIComponent解码，并转为对象
+				this.obj = JSON.parse(decodeURIComponent(options.params))
+			}
+			console.log(this.obj)
+		},
+		methods: {
+			// 航次下拉
+			hcChange(e) {
+				this.hcValue = e;
+			},
+			// 取消
+			cancel() {
+				uni.navigateTo({
+					url: '/pages/shipWork/patrol'
+				})
+			},
+			// 保存
+			save() {
+				uni.navigateTo({
+					url: '/pages/shipWork/patrol'
+				})
+			},
+			// 编辑
+			toGo(state) {
+				this.obj.state = state;
+				const params = encodeURIComponent(JSON.stringify(this.obj));
+				uni.navigateTo({
+					url: `/pages/shipWork/patrolAdd?params=${params}`
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="less" scoped>
+	.patrolAdd {
+		.container {
+			padding: 30px 20px;
+
+			ul {
+				display: flex;
+				flex-wrap: wrap;
+				justify-content: space-between;
+
+				.wLi {
+					width: 100%;
+				}
+
+				.tpLi {
+					width: 100%;
+					display: block;
+
+					p {
+						text-align: left;
+					}
+				}
+
+				li {
+					width: 44%;
+					border-top: 1px solid #ccc;
+					border-bottom: 1px solid #ccc;
+					display: flex;
+					padding: 10px 20px;
+					line-height: 35px;
+					margin-bottom: 20px;
+
+					.required {
+						color: red;
+						margin-right: 5px;
+					}
+
+					p {
+						min-width: 85px;
+						text-align: right;
+					}
+
+					/deep/.uni-numbox {
+						border: 1px solid #ccc;
+						box-sizing: border-box;
+					}
+
+					/deep/.uni-numbox-btns {
+						border-right: 1px solid #ccc;
+						border-left: 1px solid #ccc;
+						padding: 0 14px;
+						box-sizing: border-box;
+					}
+
+					/deep/.uni-numbox__value {
+						width: 100px;
+						height: 35px;
+						line-height: 35px;
+						background-color: #fff !important;
+					}
+
+					.picture {
+						/deep/.file-picker__box {
+							width: 120px !important;
+							height: 120px !important;
+							padding-top: 0;
+						}
+					}
+
+					.pictureLook {
+						display: flex;
+						flex-wrap: wrap;
+
+						img {
+							width: 120px;
+							height: 120px;
+							margin: 10px;
+						}
+					}
+				}
+			}
+
+			.btnList {
+				display: flex;
+				justify-content: center;
+
+				/deep/ .van-button {
+					margin: 30px 20px;
+					width: 120px;
+					height: 50px;
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/shipWork/peopleAdd.vue b/pages/shipWork/peopleAdd.vue
index dc63a56..e4242ce 100644
--- a/pages/shipWork/peopleAdd.vue
+++ b/pages/shipWork/peopleAdd.vue
@@ -10,7 +10,7 @@
 					<p><span class="required" v-if="obj.state != 'look'">*</span>航次：</p>
 					<uni-data-select v-model="hcValue" :localdata="hcList" @change="hcChange"
 						v-if="obj.state != 'look'"></uni-data-select>
-					<p v-else>CK98796</p>
+					<span v-else>CK98796</span>
 				</li>
 				<li>
 					<p>进出口：</p>
@@ -28,23 +28,23 @@
 					<p><span class="required" v-if="obj.state != 'look'">*</span>泊位：</p>
 					<uni-data-select v-model="bwValue" :localdata="bwList" @change="bwChange"
 						v-if="obj.state != 'look'"></uni-data-select>
-					<p v-else>1泊位</p>
+					<span v-else>1泊位</span>
 				</li>
 				<li>
 					<p><span class="required" v-if="obj.state != 'look'">*</span>作业组数：</p>
-					<uni-number-box @change="workChange" v-if="obj.state != 'look'" />
-					<p v-else>5</p>
+					<uni-number-box @change="workChange" v-model="workValue" v-if="obj.state != 'look'" />
+					<span v-else>5</span>
 				</li>
 				<li>
 					<p><span class="required" v-if="obj.state != 'look'">*</span>单船人数：</p>
-					<uni-number-box @change="shipChange" v-if="obj.state != 'look'" />
-					<p v-else>12</p>
+					<uni-number-box @change="shipChange" v-model="shipValue" v-if="obj.state != 'look'" />
+					<span v-else>12</span>
 				</li>
 				<li>
 					<p>作业时间：</p>
 					<uni-datetime-picker v-model="datetime" type="datetimerange" rangeSeparator="-" @change="changeLog"
 						v-if="obj.state != 'look'" />
-					<p v-else>2020-04-21 00:00 - 2020-04-21 00:00</p>
+					<span v-else>2020-04-21 00:00 - 2020-04-21 00:00</span>
 				</li>
 			</ul>
 			<view class="btnList">
@@ -91,7 +91,7 @@
 						text: "泊位2"
 					},
 				],
-				// 作业单数
+				// 作业组数
 				workValue: 0,
 				// 单船人数
 				shipValue: 0,
@@ -134,7 +134,7 @@
 				})
 			},
 			// 保存
-			save() {	
+			save() {
 				uni.navigateTo({
 					url: '/pages/shipWork/mixWork'
 				})
@@ -171,6 +171,11 @@
 					line-height: 35px;
 					margin-bottom: 20px;
 
+					p {
+						min-width: 85px;
+						text-align: right;
+					}
+
 					.required {
 						color: red;
 						margin-right: 5px;
diff --git a/pages/shipWork/shipInfo.vue b/pages/shipWork/shipInfo.vue
new file mode 100644
index 0000000..1515067
--- /dev/null
+++ b/pages/shipWork/shipInfo.vue
@@ -0,0 +1,45 @@
+<template>
+	<view class="shipInfo">
+		<view class="container">
+			<view class="ul">
+				<view class="li">船名：安吉11</view>
+				<view class="li">总重：100</view>
+				<view class="li">净重：50</view>
+				<view class="li">长度：30</view>
+				<view class="li">宽度：20</view>
+				<view class="li">空载吃水：空载吃水</view>
+				<view class="li">重载吃水：重载吃水</view>
+				<view class="li">舱口高度：舱口高度</view>
+				<view class="li">最低作业潮水：最低作业潮水</view>
+				<view class="li">驾驶台位置：驾驶台位置</view>
+				<view class="li">跳板左：跳板左</view>
+				<view class="li">跳板后左：跳板后左</view>
+				<view class="li">跳板中右：跳板中右</view>
+				<view class="li">跳板前右：跳板前右</view>
+				<view class="li">跳板后右 ：跳板后右</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+</script>
+
+<style lang="less" scoped>
+	.shipInfo {
+		.container {
+			padding: 30px 20px;
+
+			.ul {
+				display: flex;
+				flex-wrap: wrap;
+				padding: 0 20px;
+
+				.li {
+					min-width: 45%;
+					margin: 10px 20px;
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/shipWork/shipPlan.vue b/pages/shipWork/shipPlan.vue
new file mode 100644
index 0000000..2e2c6f6
--- /dev/null
+++ b/pages/shipWork/shipPlan.vue
@@ -0,0 +1,74 @@
+<template>
+	<view class="shipPlan">
+		<view class="container">
+			<p class="title">基本信息</p>
+			<view class="ul">
+				<view class="li wLi">船名：安吉11</view>
+				<view class="li">进口航次：进口航次11</view>
+				<view class="li">贸易类型：贸易类型11</view>
+				<view class="li">航线：航线11</view>
+				<view class="li">船公司：船公司11</view>
+				<view class="li wLi">船代：船代11</view>
+				<view class="li">出口航次：出口航次11</view>
+				<view class="li">贸易类型：贸易类型11</view>
+				<view class="li">航线：航线11</view>
+				<view class="li">船公司：船公司11</view>
+				<view class="li wLi">船代：船代11</view>
+			</view>
+			<p class="title">船期信息</p>
+			<view class="ul">
+				<view class="li">计划到港时间：2023/11/11 08:00:00</view>
+				<view class="li">计划离港时间：2023/11/11 08:00:00</view>
+				<view class="li">计划靠泊时间：2023/11/11 08:00:00</view>
+				<view class="li">计划离泊时间：2023/11/11 08:00:00</view>
+				<view class="li">确报时间：2023/11/11 08:00:00</view>
+				<view class="li">船期状态：船期状态</view>
+				<view class="li">靠泊状态：靠泊状态</view>
+				<view class="li">计划泊位：计划泊位</view>
+			</view>
+			<p class="title">计划信息</p>
+			<view class="ul">
+				<view class="li">计划开工时间：2023/11/11 08:00:00</view>
+				<view class="li">计划完工时间：2023/11/11 08:00:00</view>
+				<view class="li">品牌：品牌</view>
+				<view class="li">计划数量：100</view>
+				<view class="li">工班人数：50</view>
+				<view class="li">计划组数：100</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+</script>
+
+<style lang="less" scoped>
+	.shipPlan {
+		.container {
+			padding: 30px 20px;
+
+			.title {
+				padding-left: 10px;
+				border-left: 5px solid #2979ff;
+				font-size: 20px;
+				font-weight: bold;
+			}
+
+			.ul {
+				display: flex;
+				flex-wrap: wrap;
+				padding: 0 20px;
+				margin-bottom: 20px;
+
+				.li {
+					min-width: 45%;
+					margin: 10px 20px;
+				}
+
+				.wLi {
+					width: 100%;
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/shipWork/supply.vue b/pages/shipWork/supply.vue
new file mode 100644
index 0000000..77b7779
--- /dev/null
+++ b/pages/shipWork/supply.vue
@@ -0,0 +1,109 @@
+<template>
+	<view class="supply">
+		<view class="container">
+			<ul>
+				<li v-for="(item,index) in infoList" :key="index" @click="add('look')">
+					<view class="title">类型：{{item.val1}}</view>
+					<p>状态：{{item.val2}}</p>
+					<p>航次：{{item.val3}}</p>
+					<p>进出口：{{item.val4}}</p>
+					<p>贸易类型：{{item.val5}}</p>
+				</li>
+			</ul>
+			<view class="addBtn" @click="add('add')">+ 新增</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				infoList: [{
+					val1: "供水",
+					val2: "待上传",
+					val3: "JK9868548",
+					val4: "进口",
+					val5: "外贸",
+				}, {
+					val1: "供水",
+					val2: "待上传",
+					val3: "JK9868548",
+					val4: "进口",
+					val5: "外贸",
+				}, {
+					val1: "供水",
+					val2: "待上传",
+					val3: "JK9868548",
+					val4: "进口",
+					val5: "外贸",
+				}, ]
+			}
+		},
+		methods: {
+			add(state) {
+				const obj = {
+					state: state,
+				}
+				const params = encodeURIComponent(JSON.stringify(obj));
+				uni.navigateTo({
+					url: `/pages/shipWork/supplyAdd?params=${params}`
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="less" scoped>
+	.supply {
+		.container {
+			padding: 30px 20px;
+
+			ul {
+				padding: 20px 0;
+
+				li {
+					display: flex;
+					justify-content: space-between;
+					border-bottom: 1px solid #ccc;
+					padding: 20px;
+
+					.title {
+						font-size: 16px;
+						font-weight: bold;
+						display: flex;
+						flex-direction: column;
+						justify-content: center;
+					}
+
+					.shift {
+						p {
+							font-size: 16px;
+						}
+					}
+
+					.state {
+						display: flex;
+						flex-direction: column;
+						justify-content: center;
+					}
+				}
+			}
+
+			.addBtn {
+				position: fixed;
+				right: 50px;
+				bottom: 50px;
+				width: 100px;
+				height: 100px;
+				border-radius: 50%;
+				background-color: #2979ff;
+				color: #fff;
+				font-size: 24px;
+				text-align: center;
+				line-height: 100px;
+				font-weight: bold;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/shipWork/supplyAdd.vue b/pages/shipWork/supplyAdd.vue
new file mode 100644
index 0000000..3dff2c3
--- /dev/null
+++ b/pages/shipWork/supplyAdd.vue
@@ -0,0 +1,219 @@
+<template>
+	<view class="supplyAdd">
+		<view class="container">
+			<ul>
+				<li>
+					<p>船名：</p>
+					<span>快乐号</span>
+				</li>
+				<li>
+					<p><span class="required" v-if="obj.state != 'look'">*</span>航次：</p>
+					<uni-data-select v-model="hcValue" :localdata="hcList" @change="hcChange"
+						v-if="obj.state != 'look'"></uni-data-select>
+					<span v-else>CK98796</span>
+				</li>
+				<li>
+					<p>进出口：</p>
+					<span>进口</span>
+				</li>
+				<li>
+					<p>贸易类型：</p>
+					<span>内贸</span>
+				</li>
+				<li>
+					<p><span class="required" v-if="obj.state != 'look'">*</span>泊位：</p>
+					<uni-data-select v-model="bwValue" :localdata="bwList" @change="bwChange"
+						v-if="obj.state != 'look'"></uni-data-select>
+					<span v-else>1泊位</span>
+				</li>
+				<li>
+					<p><span class="required" v-if="obj.state != 'look'">*</span>供给类型：</p>
+					<uni-data-select v-model="gjValue" :localdata="gjList" @change="gjChange"
+						v-if="obj.state != 'look'"></uni-data-select>
+					<span v-else>供给类型1</span>
+				</li>
+				<li>
+					<p><span class="required" v-if="obj.state != 'look'">*</span>供给量：</p>
+					<uni-number-box v-model="gjNum" v-if="obj.state != 'look'" />
+					<span v-else>10</span>
+				</li>
+				<li>
+					<p><span class="required" v-if="obj.state != 'look'">*</span>日期：</p>
+					<uni-datetime-picker v-model="dateTime" type="date" :clear-icon="false"
+						v-if="obj.state != 'look'" />
+					<span v-else>2020-04-21</span>
+				</li>
+			</ul>
+			<view class="btnList">
+				<van-button type="default" @click="cancel">取消</van-button>
+				<van-button type="default" v-if="obj.state == 'look'">删除</van-button>
+				<van-button type="info" v-if="obj.state == 'add' || obj.state == 'edit'" @click="save">保存</van-button>
+				<van-button type="info" v-if="obj.state == 'look'" @click="toGo('edit')">编辑</van-button>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				obj: {},
+				// 航次下拉框
+				hcValue: "",
+				hcList: [{
+						value: 0,
+						text: "航次0"
+					},
+					{
+						value: 1,
+						text: "航次1"
+					},
+					{
+						value: 2,
+						text: "航次2"
+					},
+				],
+				// 船舶净吨
+				zlShip: 100,
+				// 泊位下拉框
+				bwValue: "",
+				bwList: [{
+						value: 0,
+						text: "泊位0"
+					},
+					{
+						value: 1,
+						text: "泊位1"
+					},
+					{
+						value: 2,
+						text: "泊位2"
+					},
+				],
+				// 供给类型
+				gjValue: "",
+				gjList: [{
+						value: 0,
+						text: "供给类型0"
+					},
+					{
+						value: 1,
+						text: "供给类型1"
+					},
+					{
+						value: 2,
+						text: "供给类型2"
+					},
+				],
+				gjNum: 10,
+				// 日期
+				dateTime: "",
+			}
+		},
+		onLoad(options) {
+			if ('params' in options) {
+				// 获取传递的对象参数，使用decodeURIComponent解码，并转为对象
+				this.obj = JSON.parse(decodeURIComponent(options.params))
+			}
+		},
+		methods: {
+			// 航次下拉
+			hcChange(e) {
+				this.hcValue = e;
+			},
+			// 泊位下拉
+			bwChange(e) {
+				this.bwValue = e;
+			},
+			// 攻击类型下拉
+			gjChange(e) {
+				this.bwValue = e;
+			},
+			// 取消
+			cancel() {
+				uni.navigateTo({
+					url: '/pages/shipWork/supply'
+				})
+			},
+			// 保存
+			save() {
+				uni.navigateTo({
+					url: '/pages/shipWork/supply'
+				})
+			},
+			// 编辑
+			toGo(state) {
+				this.obj.state = state;
+				const params = encodeURIComponent(JSON.stringify(this.obj));
+				uni.navigateTo({
+					url: `/pages/shipWork/supplyAdd?params=${params}`
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="less" scoped>
+	.supplyAdd {
+		.container {
+			padding: 30px 20px;
+
+			ul {
+				display: flex;
+				flex-wrap: wrap;
+				justify-content: space-between;
+
+				li {
+					width: 44%;
+					border-top: 1px solid #ccc;
+					border-bottom: 1px solid #ccc;
+					display: flex;
+					padding: 10px 20px;
+					line-height: 35px;
+					margin-bottom: 20px;
+
+					.required {
+						color: red;
+						margin-right: 5px;
+					}
+
+					p {
+						min-width: 85px;
+						text-align: right;
+					}
+
+					/deep/.uni-numbox {
+						border: 1px solid #ccc;
+						box-sizing: border-box;
+					}
+
+					/deep/.uni-numbox-btns {
+						border-right: 1px solid #ccc;
+						border-left: 1px solid #ccc;
+						padding: 0 14px;
+						box-sizing: border-box;
+					}
+
+					/deep/.uni-numbox__value {
+						width: 100px;
+						height: 35px;
+						line-height: 35px;
+						background-color: #fff !important;
+					}
+				}
+			}
+
+			.btnList {
+				display: flex;
+				justify-content: center;
+
+				/deep/ .van-button {
+					margin: 30px 20px;
+					width: 120px;
+					height: 50px;
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/shipWork/untieAdd.vue b/pages/shipWork/untieAdd.vue
new file mode 100644
index 0000000..754db5b
--- /dev/null
+++ b/pages/shipWork/untieAdd.vue
@@ -0,0 +1,217 @@
+<template>
+	<view class="untieAdd">
+		<view class="container">
+			<ul>
+				<li>
+					<p>船名：</p>
+					<span>快乐号</span>
+				</li>
+				<li>
+					<p><span class="required" v-if="obj.state != 'look'">*</span>船舶净吨：</p>
+					<uni-number-box v-model="zlShip" v-if="obj.state != 'look'" />
+					<span v-else>100</span>
+				</li>
+				<li>
+					<p><span class="required" v-if="obj.state != 'look'">*</span>航次：</p>
+					<uni-data-select v-model="hcValue" :localdata="hcList" @change="hcChange"
+						v-if="obj.state != 'look'"></uni-data-select>
+					<span v-else>CK98796</span>
+				</li>
+				<li>
+					<p>进出口：</p>
+					<span>进口</span>
+				</li>
+				<li>
+					<p>贸易类型：</p>
+					<span>内贸</span>
+				</li>
+				<li>
+					<p><span class="required" v-if="obj.state != 'look'">*</span>泊位：</p>
+					<uni-data-select v-model="bwValue" :localdata="bwList" @change="bwChange"
+						v-if="obj.state != 'look'"></uni-data-select>
+					<span v-else>1泊位</span>
+				</li>
+				<li>
+					<p><span class="required" v-if="obj.state != 'look'">*</span>系缆时间：</p>
+					<uni-datetime-picker v-model="xlTime" type="datetimerange" rangeSeparator="-" @change="changeLog"
+						v-if="obj.state != 'look'" />
+					<span v-else>2020-04-21 00:00 - 2020-04-21 00:00</span>
+				</li>
+				<li>
+					<p>解缆时间：</p>
+					<uni-datetime-picker v-model="jlTime" type="datetimerange" rangeSeparator="-" @change="changeLog"
+						v-if="obj.state != 'look'" />
+					<span v-else>2020-04-21 00:00 - 2020-04-21 00:00</span>
+				</li>
+				<li>
+					<p>移泊时间：</p>
+					<uni-datetime-picker v-model="ybTime" type="datetimerange" rangeSeparator="-" @change="changeLog"
+						v-if="obj.state != 'look'" />
+					<span v-else>2020-04-21 00:00 - 2020-04-21 00:00</span>
+				</li>
+				<li>
+					<p>停泊时间：</p>
+					<uni-datetime-picker v-model="tbTime" type="datetimerange" rangeSeparator="-" @change="changeLog"
+						v-if="obj.state != 'look'" />
+					<span v-else>2020-04-21 00:00 - 2020-04-21 00:00</span>
+				</li>
+			</ul>
+			<view class="btnList">
+				<van-button type="default" @click="cancel">取消</van-button>
+				<van-button type="default" v-if="obj.state == 'look'">删除</van-button>
+				<van-button type="info" v-if="obj.state == 'add' || obj.state == 'edit'" @click="save">保存</van-button>
+				<van-button type="info" v-if="obj.state == 'look'" @click="toGo('edit')">编辑</van-button>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				obj: {},
+				// 航次下拉框
+				hcValue: "",
+				hcList: [{
+						value: 0,
+						text: "航次0"
+					},
+					{
+						value: 1,
+						text: "航次1"
+					},
+					{
+						value: 2,
+						text: "航次2"
+					},
+				],
+				// 船舶净吨
+				zlShip: 100,
+				// 泊位下拉框
+				bwValue: "",
+				bwList: [{
+						value: 0,
+						text: "泊位0"
+					},
+					{
+						value: 1,
+						text: "泊位1"
+					},
+					{
+						value: 2,
+						text: "泊位2"
+					},
+				],
+				// 系缆时间
+				xlTime: "",
+				// 解缆时间
+				jlTime: "",
+				// 移泊时间
+				ybTime: "",
+				// 停泊时间
+				tbTime: "",
+			}
+		},
+		onLoad(options) {
+			if ('params' in options) {
+				// 获取传递的对象参数，使用decodeURIComponent解码，并转为对象
+				this.obj = JSON.parse(decodeURIComponent(options.params))
+			}
+		},
+		methods: {
+			// 航次下拉
+			hcChange(e) {
+				this.hcValue = e;
+			},
+			// 泊位下拉
+			bwChange(e) {
+				this.bwValue = e;
+			},
+			// 取消
+			cancel() {
+				uni.navigateTo({
+					url: '/pages/shipWork/untieCord'
+				})
+			},
+			// 保存
+			save() {
+				uni.navigateTo({
+					url: '/pages/shipWork/untieCord'
+				})
+			},
+			// 编辑
+			toGo(state) {
+				this.obj.state = state;
+				const params = encodeURIComponent(JSON.stringify(this.obj));
+				uni.navigateTo({
+					url: `/pages/shipWork/untieAdd?params=${params}`
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="less" scoped>
+	.untieAdd {
+		.container {
+			padding: 30px 20px;
+
+			ul {
+				display: flex;
+				flex-wrap: wrap;
+				justify-content: space-between;
+
+				li {
+					width: 44%;
+					border-top: 1px solid #ccc;
+					border-bottom: 1px solid #ccc;
+					display: flex;
+					padding: 10px 20px;
+					line-height: 35px;
+					margin-bottom: 20px;
+
+					.required {
+						color: red;
+						margin-right: 5px;
+					}
+
+					p {
+						min-width: 85px;
+						text-align: right;
+					}
+
+					/deep/.uni-numbox {
+						border: 1px solid #ccc;
+						box-sizing: border-box;
+					}
+
+					/deep/.uni-numbox-btns {
+						border-right: 1px solid #ccc;
+						border-left: 1px solid #ccc;
+						padding: 0 14px;
+						box-sizing: border-box;
+					}
+
+					/deep/.uni-numbox__value {
+						width: 100px;
+						height: 35px;
+						line-height: 35px;
+						background-color: #fff !important;
+					}
+				}
+			}
+
+			.btnList {
+				display: flex;
+				justify-content: center;
+
+				/deep/ .van-button {
+					margin: 30px 20px;
+					width: 120px;
+					height: 50px;
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/shipWork/untieCord.vue b/pages/shipWork/untieCord.vue
new file mode 100644
index 0000000..9c19fb5
--- /dev/null
+++ b/pages/shipWork/untieCord.vue
@@ -0,0 +1,113 @@
+<template>
+	<view class="untieCord">
+		<view class="container">
+			<ul>
+				<li v-for="(item,index) in infoList" :key="index" @click="add('look')">
+					<view class="title">航次：{{item.val1}}</view>
+					<p>状态：{{item.val2}}</p>
+					<p>进出口：{{item.val3}}</p>
+					<p>贸易类型：{{item.val4}}</p>
+					<p>泊位：{{item.val5}}</p>
+					<p>系缆时间：{{item.val6}}</p>
+				</li>
+			</ul>
+			<view class="addBtn" @click="add('add')">+ 新增</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				infoList: [{
+					val1: "JK9795799",
+					val2: "待上传",
+					val3: "进口",
+					val4: "外贸",
+					val5: "一泊位",
+					val6: "05/30  8:00",
+				}, {
+					val1: "JK9795799",
+					val2: "待上传",
+					val3: "进口",
+					val4: "外贸",
+					val5: "一泊位",
+					val6: "05/30  8:00",
+				}, {
+					val1: "JK9795799",
+					val2: "待上传",
+					val3: "进口",
+					val4: "外贸",
+					val5: "一泊位",
+					val6: "05/30  8:00",
+				}]
+			}
+		},
+		methods: {
+			add(state) {
+				const obj = {
+					state: state,
+				}
+				const params = encodeURIComponent(JSON.stringify(obj));
+				uni.navigateTo({
+					url: `/pages/shipWork/untieAdd?params=${params}`
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="less" scoped>
+	.untieCord {
+		.container {
+			padding: 30px 20px;
+
+			ul {
+				padding: 20px 0;
+
+				li {
+					display: flex;
+					justify-content: space-between;
+					border-bottom: 1px solid #ccc;
+					padding: 20px;
+
+					.title {
+						font-size: 16px;
+						font-weight: bold;
+						display: flex;
+						flex-direction: column;
+						justify-content: center;
+					}
+
+					.shift {
+						p {
+							font-size: 16px;
+						}
+					}
+
+					.state {
+						display: flex;
+						flex-direction: column;
+						justify-content: center;
+					}
+				}
+			}
+
+			.addBtn {
+				position: fixed;
+				right: 50px;
+				bottom: 50px;
+				width: 100px;
+				height: 100px;
+				border-radius: 50%;
+				background-color: #2979ff;
+				color: #fff;
+				font-size: 24px;
+				text-align: center;
+				line-height: 100px;
+				font-weight: bold;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/shipWork/workAssign.vue b/pages/shipWork/workAssign.vue
new file mode 100644
index 0000000..ffae9e1
--- /dev/null
+++ b/pages/shipWork/workAssign.vue
@@ -0,0 +1,109 @@
+<template>
+	<view class="workAssign">
+		<view class="container">
+			<ul>
+				<li v-for="(item,index) in infoList" :key="index" @click="add('look')">
+					<view class="title">航次：{{item.val1}}</view>
+					<p>状态：{{item.val2}}</p>
+					<p>进出口：{{item.val3}}</p>
+					<p>贸易类型：{{item.val4}}</p>
+					<p>作业时间：{{item.val5}}</p>
+				</li>
+			</ul>
+			<view class="addBtn" @click="add('add')">+ 新增</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				infoList: [{
+					val1: "CK124324",
+					val2: "待上传",
+					val3: "进口",
+					val4: "内贸",
+					val5: "05/30  8:00",
+				}, {
+					val1: "CK124324",
+					val2: "待上传",
+					val3: "进口",
+					val4: "内贸",
+					val5: "05/30  8:00",
+				}, {
+					val1: "CK124324",
+					val2: "待上传",
+					val3: "进口",
+					val4: "内贸",
+					val5: "05/30  8:00",
+				}]
+			}
+		},
+		methods: {
+			add(state) {
+				const obj = {
+					state: state,
+				}
+				const params = encodeURIComponent(JSON.stringify(obj));
+				uni.navigateTo({
+					url: `/pages/shipWork/workAssignAdd?params=${params}`
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="less" scoped>
+	.workAssign {
+		.container {
+			padding: 30px 20px;
+
+			ul {
+				padding: 20px 0;
+
+				li {
+					display: flex;
+					justify-content: space-between;
+					border-bottom: 1px solid #ccc;
+					padding: 20px;
+
+					.title {
+						font-size: 16px;
+						font-weight: bold;
+						display: flex;
+						flex-direction: column;
+						justify-content: center;
+					}
+
+					.shift {
+						p {
+							font-size: 16px;
+						}
+					}
+
+					.state {
+						display: flex;
+						flex-direction: column;
+						justify-content: center;
+					}
+				}
+			}
+
+			.addBtn {
+				position: fixed;
+				right: 50px;
+				bottom: 50px;
+				width: 100px;
+				height: 100px;
+				border-radius: 50%;
+				background-color: #2979ff;
+				color: #fff;
+				font-size: 24px;
+				text-align: center;
+				line-height: 100px;
+				font-weight: bold;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/shipWork/workAssignAdd.vue b/pages/shipWork/workAssignAdd.vue
new file mode 100644
index 0000000..3d941ad
--- /dev/null
+++ b/pages/shipWork/workAssignAdd.vue
@@ -0,0 +1,260 @@
+<template>
+	<view class="workAssignAdd">
+		<view class="container">
+			<ul>
+				<li>
+					<p>船名：</p>
+					<span>快乐号</span>
+				</li>
+				<li>
+					<p><span class="required" v-if="obj.state != 'look'">*</span>航次：</p>
+					<uni-data-select v-model="hcValue" :localdata="hcList" @change="hcChange"
+						v-if="obj.state != 'look'"></uni-data-select>
+					<span v-else>CK98796</span>
+				</li>
+				<li>
+					<p>进出口：</p>
+					<span>进口</span>
+				</li>
+				<li>
+					<p>贸易类型：</p>
+					<span>内贸</span>
+				</li>
+				<li>
+					<p><span class="required" v-if="obj.state != 'look'">*</span>泊位：</p>
+					<uni-data-select v-model="bwValue" :localdata="bwList" @change="bwChange"
+						v-if="obj.state != 'look'"></uni-data-select>
+					<span v-else>1泊位</span>
+				</li>
+				<li>
+					<p><span class="required" v-if="obj.state != 'look'">*</span>工班：</p>
+					<uni-data-select v-model="gbValue" :localdata="gbList" @change="gbChange"
+						v-if="obj.state != 'look'"></uni-data-select>
+					<span v-else>工班1</span>
+				</li>
+				<li>
+					<p><span class="required" v-if="obj.state != 'look'">*</span>人数：</p>
+					<uni-number-box v-model="peopleNum" v-if="obj.state != 'look'" />
+					<span v-else>100</span>
+				</li>
+				<li>
+					<p><span class="required" v-if="obj.state != 'look'">*</span>装卸类型：</p>
+					<uni-data-select v-model="zxValue" :localdata="zxList" @change="zxChange"
+						v-if="obj.state != 'look'"></uni-data-select>
+					<span v-else>装卸类型1</span>
+				</li>
+				<li>
+					<p><span class="required" v-if="obj.state != 'look'">*</span>车辆数量：</p>
+					<uni-number-box v-model="carNum" v-if="obj.state != 'look'" />
+					<span v-else>100</span>
+				</li>
+				<li>
+					<p><span class="required" v-if="obj.state != 'look'">*</span>备件数量：</p>
+					<uni-number-box v-model="partsNum" v-if="obj.state != 'look'" />
+					<span v-else>100</span>
+				</li>
+				<li>
+					<p><span class="required" v-if="obj.state != 'look'">*</span>作业时间：</p>
+					<uni-datetime-picker v-model="workTime" type="datetimerange" rangeSeparator="-" @change="changeLog"
+						v-if="obj.state != 'look'" />
+					<span v-else>2020-04-21 00:00 - 2020-04-21 00:00</span>
+				</li>
+
+			</ul>
+			<view class="btnList">
+				<van-button type="default" @click="cancel">取消</van-button>
+				<van-button type="default" v-if="obj.state == 'look'">删除</van-button>
+				<van-button type="info" v-if="obj.state == 'add' || obj.state == 'edit'" @click="save">保存</van-button>
+				<van-button type="info" v-if="obj.state == 'look'" @click="toGo('edit')">编辑</van-button>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				obj: {},
+				// 航次下拉框
+				hcValue: "",
+				hcList: [{
+						value: 0,
+						text: "航次0"
+					},
+					{
+						value: 1,
+						text: "航次1"
+					},
+					{
+						value: 2,
+						text: "航次2"
+					},
+				],
+				// 船舶净吨
+				zlShip: 100,
+				// 泊位下拉框
+				bwValue: "",
+				bwList: [{
+						value: 0,
+						text: "泊位0"
+					},
+					{
+						value: 1,
+						text: "泊位1"
+					},
+					{
+						value: 2,
+						text: "泊位2"
+					},
+				],
+				// 工班下拉框
+				gbValue: "",
+				gbList: [{
+						value: 0,
+						text: "工班0"
+					},
+					{
+						value: 1,
+						text: "工班1"
+					},
+					{
+						value: 2,
+						text: "工班2"
+					},
+				],
+				// 人数
+				peopleNum: 0,
+				// 装卸类型下拉框
+				zxValue: "",
+				zxList: [{
+						value: 0,
+						text: "装卸类型0"
+					},
+					{
+						value: 1,
+						text: "装卸类型1"
+					},
+					{
+						value: 2,
+						text: "装卸类型2"
+					},
+				],
+				// 车辆数量
+				carNum: 0,
+				// 备件数量
+				partsNum: 0,
+				// 作业时间
+				workTime: "",
+			}
+		},
+		onLoad(options) {
+			if ('params' in options) {
+				// 获取传递的对象参数，使用decodeURIComponent解码，并转为对象
+				this.obj = JSON.parse(decodeURIComponent(options.params))
+			}
+		},
+		methods: {
+			// 航次下拉
+			hcChange(e) {
+				this.hcValue = e;
+			},
+			// 泊位下拉
+			bwChange(e) {
+				this.bwValue = e;
+			},
+			// 工班下拉
+			gbChange(e) {
+				this.gbValue = e;
+			},
+			// 装卸类型下拉
+			zxChange(e) {
+				this.zxValue = e;
+			},
+			// 取消
+			cancel() {
+				uni.navigateTo({
+					url: '/pages/shipWork/workAssign'
+				})
+			},
+			// 保存
+			save() {
+				uni.navigateTo({
+					url: '/pages/shipWork/workAssign'
+				})
+			},
+			// 编辑
+			toGo(state) {
+				this.obj.state = state;
+				const params = encodeURIComponent(JSON.stringify(this.obj));
+				uni.navigateTo({
+					url: `/pages/shipWork/workAssignAdd?params=${params}`
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="less" scoped>
+	.workAssignAdd {
+		.container {
+			padding: 30px 20px;
+
+			ul {
+				display: flex;
+				flex-wrap: wrap;
+				justify-content: space-between;
+
+				li {
+					width: 44%;
+					border-top: 1px solid #ccc;
+					border-bottom: 1px solid #ccc;
+					display: flex;
+					padding: 10px 20px;
+					line-height: 35px;
+					margin-bottom: 20px;
+
+					.required {
+						color: red;
+						margin-right: 5px;
+					}
+
+					p {
+						min-width: 85px;
+						text-align: right;
+					}
+
+					/deep/.uni-numbox {
+						border: 1px solid #ccc;
+						box-sizing: border-box;
+					}
+
+					/deep/.uni-numbox-btns {
+						border-right: 1px solid #ccc;
+						border-left: 1px solid #ccc;
+						padding: 0 14px;
+						box-sizing: border-box;
+					}
+
+					/deep/.uni-numbox__value {
+						width: 100px;
+						height: 35px;
+						line-height: 35px;
+						background-color: #fff !important;
+					}
+				}
+			}
+
+			.btnList {
+				display: flex;
+				justify-content: center;
+
+				/deep/ .van-button {
+					margin: 30px 20px;
+					width: 120px;
+					height: 50px;
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file