diff --git a/pages/shipWork/abnormal.vue b/pages/shipWork/abnormal.vue
index fdbda21..fb74c3c 100644
--- a/pages/shipWork/abnormal.vue
+++ b/pages/shipWork/abnormal.vue
@@ -1,15 +1,15 @@
 <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="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>
 			<view class="addBtn" @click="add('add')">+ 新增</view>
 		</view>
 	</view>
@@ -19,29 +19,20 @@
 	export default {
 		data() {
 			return {
-				infoList: [{
-					val1: "大风预警",
-					val2: "待上传",
-					val3: "JK097085964",
-					val4: "内贸",
-					val5: "进口",
-				}, {
-					val1: "大风预警",
-					val2: "待上传",
-					val3: "JK097085964",
-					val4: "内贸",
-					val5: "进口",
-				}, {
-					val1: "大风预警",
-					val2: "待上传",
-					val3: "JK097085964",
-					val4: "内贸",
-					val5: "进口",
-				}, ]
+				shipInfo: {},
+				infoList: []
 			}
 		},
+		mounted() {
+			this.shipInfo = uni.getStorageSync('shipInfo')
+			this.infoList = uni.getStorageSync('addAbnormalArr')
+		},
 		methods: {
-			add(state) {
+			add(state, item, index) {
+				if (state != 'add') {
+					uni.setStorageSync('abnormalRow', item);
+					uni.setStorageSync('abnormalRowIndex', index);
+				}
 				const obj = {
 					state: state,
 				}
@@ -59,10 +50,10 @@
 		.container {
 			padding: 30px 20px;
 
-			ul {
+			.ul {
 				padding: 20px 0;
 
-				li {
+				.li {
 					display: flex;
 					justify-content: space-between;
 					border-bottom: 1px solid #ccc;
diff --git a/pages/shipWork/abnormalAdd.vue b/pages/shipWork/abnormalAdd.vue
index f97a4da..e7e6698 100644
--- a/pages/shipWork/abnormalAdd.vue
+++ b/pages/shipWork/abnormalAdd.vue
@@ -1,46 +1,46 @@
 <template>
 	<view class="abnormalAdd">
 		<view class="container">
-			<ul>
-				<li>
+			<view class="ul">
+				<view class="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"
+					<text>{{shipInfo.voyageScheduleDataList[0].spmName}}</text>
+				</view>
+				<view class="li">
+					<p><text class="required" v-if="obj.state != 'look'">*</text>航次：</p>
+					<uni-data-select v-model="vvyId" :localdata="hcList" @change="hcChange"
 						v-if="obj.state != 'look'"></uni-data-select>
-					<span v-else>CK98796</span>
-				</li>
-				<li>
+					<text v-else>{{vvyName}}</text>
+				</view>
+				<view class="li">
 					<p>进出口：</p>
-					<span>进口</span>
-				</li>
-				<li>
+					<text>{{shipInfo.voyageScheduleDataList[0].importExportFlagName}}</text>
+				</view>
+				<view class="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"
+					<text>{{shipInfo.voyageScheduleDataList[0].tradeTypeName}}</text>
+				</view>
+				<view class="li">
+					<p><text class="required" v-if="obj.state != 'look'">*</text>作业日期：</p>
+					<uni-datetime-picker v-model="workTime" type="date" :clear-icon="false" @change="changeLog"
 						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字以内)"
+					<text v-else>{{workTime}}</text>
+				</view>
+				<view class="li">
+					<p><text class="required" v-if="obj.state != 'look'">*</text>类型：</p>
+					<uni-easyinput v-if="obj.state != 'look'" v-model="type" placeholder="请输入"></uni-easyinput>
+					<text v-else>{{type}}</text>
+				</view>
+				<view class="li wLi">
+					<p><text class="required" v-if="obj.state != 'look'">*</text>描述：</p>
+					<uni-easyinput type="textarea" autoHeight v-model="remark" placeholder="请输入任务描述(200字以内)"
 						maxlength="200" v-if="obj.state != 'look'"></uni-easyinput>
-					<span v-else>描述描述描述</span>
-				</li>
-			</ul>
+					<text v-else>{{remark}}</text>
+				</view>
+			</view>
 			<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="danger" v-if="obj.state == 'look'" @click="del">删除</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>
@@ -52,28 +52,26 @@
 	export default {
 		data() {
 			return {
+				shipInfo: {
+					voyageScheduleDataList: [{
+						spmName: "",
+						importExportFlagName: "",
+						tradeTypeName: ""
+					}]
+				},
 				obj: {},
+				abnormalRow: {},
+				abnormalRowIndex: 0,
 				// 航次下拉框
-				hcValue: "",
-				hcList: [{
-						value: 0,
-						text: "航次0"
-					},
-					{
-						value: 1,
-						text: "航次1"
-					},
-					{
-						value: 2,
-						text: "航次2"
-					},
-				],
+				vvyId: "",
+				vvyName: "",
+				hcList: [],
 				// 日期
-				dateTime: "",
+				workTime: [''],
 				// 类型
-				typeValue: "",
+				type: "",
 				// 描述
-				describe: "",
+				remark: "",
 			}
 		},
 		onLoad(options) {
@@ -82,10 +80,46 @@
 				this.obj = JSON.parse(decodeURIComponent(options.params))
 			}
 		},
+		mounted() {
+			if (this.obj.state == 'edit' || this.obj.state == 'look') {
+				this.getRow();
+			}
+			this.getShip()
+		},
 		methods: {
+			// 获取船只信息
+			getShip() {
+				this.shipInfo = uni.getStorageSync('shipInfo')
+				// 航次数据
+				this.shipInfo.voyageScheduleDataList.forEach((v, index) => {
+					this.hcList.push({
+						text: v.vvyName,
+						value: v.vvyId
+					})
+				})
+			},
+			// 获取当前行信息
+			getRow() {
+				this.abnormalRow = uni.getStorageSync('abnormalRow');
+				this.abnormalRowIndex = uni.getStorageSync('abnormalRowIndex');
+				this.vvyId = this.abnormalRow.vvyId
+				this.vvyName = this.abnormalRow.vvyName
+				this.workTime = this.abnormalRow.workTime
+				this.type = this.abnormalRow.type
+				this.remark = this.abnormalRow.remark
+			},
 			// 航次下拉
 			hcChange(e) {
-				this.hcValue = e;
+				this.vvyId = e;
+				this.hcList.forEach(v => {
+					if (v.value == e) {
+						this.vvyName = v.text
+					}
+				})
+			},
+			// 作业时间
+			changeLog(e) {
+				this.workTime = e
 			},
 			// 取消
 			cancel() {
@@ -93,8 +127,41 @@
 					url: '/pages/shipWork/abnormal'
 				})
 			},
+			// 删除
+			del() {
+				let addAbnormalArr = uni.getStorageSync('addAbnormalArr')
+				addAbnormalArr.splice(this.abnormalRowIndex, 1)
+				uni.setStorageSync('addAbnormalArr', addAbnormalArr);
+				uni.navigateTo({
+					url: '/pages/shipWork/abnormal'
+				})
+			},
 			// 保存
 			save() {
+				let addAbnormalArr = uni.getStorageSync('addAbnormalArr')
+				let addAbnormalObj = {
+					vvyId: this.vvyId,
+					vvyName: this.vvyName,
+					type: this.type,
+					remark: this.remark,
+					workTime: this.workTime,
+					tradeTypeName: this.shipInfo.voyageScheduleDataList[0].tradeTypeName,
+					importExportFlagName: this.shipInfo.voyageScheduleDataList[0].importExportFlagName,
+					spmName: this.shipInfo.voyageScheduleDataList[0].spmName,
+				}
+				if (this.obj.state == "edit") {
+					addAbnormalArr[this.abnormalRowIndex] = addAbnormalObj;
+					uni.setStorageSync('addAbnormalArr', addAbnormalArr);
+				} else if (this.obj.state == "add") {
+					if (addAbnormalArr != "") {
+						addAbnormalArr.push(addAbnormalObj)
+						uni.setStorageSync('addAbnormalArr', addAbnormalArr);
+					} else {
+						addAbnormalArr = []
+						addAbnormalArr.push(addAbnormalObj)
+						uni.setStorageSync('addAbnormalArr', addAbnormalArr);
+					}
+				}
 				uni.navigateTo({
 					url: '/pages/shipWork/abnormal'
 				})
@@ -116,16 +183,16 @@
 		.container {
 			padding: 30px 20px;
 
-			ul {
+			.ul {
 				display: flex;
 				flex-wrap: wrap;
 				justify-content: space-between;
 
 				.wLi {
-					width: 100%;
+					width: 100% !important;
 				}
 
-				li {
+				.li {
 					width: 44%;
 					border-top: 1px solid #ccc;
 					border-bottom: 1px solid #ccc;
diff --git a/pages/shipWork/mafi.vue b/pages/shipWork/mafi.vue
index 3dfb89c..9320c76 100644
--- a/pages/shipWork/mafi.vue
+++ b/pages/shipWork/mafi.vue
@@ -1,16 +1,16 @@
 <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="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>
 			<view class="addBtn" @click="add('add')">+ 新增</view>
 		</view>
 	</view>
@@ -20,32 +20,20 @@
 	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",
-				}]
+				shipInfo: {},
+				infoList: []
 			}
 		},
+		mounted() {
+			this.shipInfo = uni.getStorageSync('shipInfo')
+			this.infoList = uni.getStorageSync('addMafiArr')
+		},
 		methods: {
-			add(state) {
+			add(state, item, index) {
+				if (state != 'add') {
+					uni.setStorageSync('mafiRow', item);
+					uni.setStorageSync('mafiRowIndex', index);
+				}
 				const obj = {
 					state: state,
 				}
@@ -63,10 +51,10 @@
 		.container {
 			padding: 30px 20px;
 
-			ul {
+			.ul {
 				padding: 20px 0;
 
-				li {
+				.li {
 					display: flex;
 					justify-content: space-between;
 					border-bottom: 1px solid #ccc;
diff --git a/pages/shipWork/mafiAdd.vue b/pages/shipWork/mafiAdd.vue
index cf23fda..a2ddfe9 100644
--- a/pages/shipWork/mafiAdd.vue
+++ b/pages/shipWork/mafiAdd.vue
@@ -1,57 +1,57 @@
 <template>
 	<view class="mafiAdd">
 		<view class="container">
-			<ul>
-				<li>
+			<view class="ul">
+				<view class="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"
+					<text>{{shipInfo.voyageScheduleDataList[0].spmName}}</text>
+				</view>
+				<view class="li">
+					<p><text class="required" v-if="obj.state != 'look'">*</text>航次：</p>
+					<uni-data-select v-model="vvyId" :localdata="hcList" @change="hcChange"
 						v-if="obj.state != 'look'"></uni-data-select>
-					<span v-else>CK98796</span>
-				</li>
-				<li>
+					<text v-else>{{vvyName}}</text>
+				</view>
+				<view class="li">
 					<p>进出口：</p>
-					<span>进口</span>
-				</li>
-				<li>
+					<text>{{shipInfo.voyageScheduleDataList[0].importExportFlagName}}</text>
+				</view>
+				<view class="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"
+					<text>{{shipInfo.voyageScheduleDataList[0].tradeTypeName}}</text>
+				</view>
+				<view class="li">
+					<p><text class="required" v-if="obj.state != 'look'">*</text>作业日期：</p>
+					<uni-datetime-picker v-model="workTime" type="date" :clear-icon="false" @change="changeLog"
 						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>
+					<text v-else>{{workTime}}</text>
+				</view>
+				<view class="li">
+					<p><text class="required" v-if="obj.state != 'look'">*</text>马菲板号：</p>
+					<uni-easyinput v-if="obj.state != 'look'" v-model="mafiBarcode" placeholder="请输入"></uni-easyinput>
+					<text v-else>{{mafiBarcode}}</text>
+				</view>
+				<view class="li">
+					<p><text class="required" v-if="obj.state != 'look'">*</text>尺码：</p>
+					<uni-number-box v-model="size" v-if="obj.state != 'look'" />
+					<text v-else>{{size}}</text>
+				</view>
+				<view class="li">
+					<p><text class="required" v-if="obj.state != 'look'">*</text>类型：</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"
+					<text v-else>{{lxTextValue}}</text>
+				</view>
+				<view class="li">
+					<p><text class="required" v-if="obj.state != 'look'">*</text>装卸类型：</p>
+					<uni-data-select v-model="loaderTypeId" :localdata="zxList" @change="zxChange"
 						v-if="obj.state != 'look'"></uni-data-select>
-					<span v-else>装卸类型1</span>
-				</li>
-			</ul>
+					<text v-else>{{loaderType}}</text>
+				</view>
+			</view>
 			<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="danger" v-if="obj.state == 'look'" @click="del">删除</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>
@@ -63,58 +63,42 @@
 	export default {
 		data() {
 			return {
+				shipInfo: {
+					voyageScheduleDataList: [{
+						spmName: "",
+						importExportFlagName: "",
+						tradeTypeName: ""
+					}]
+				},
 				obj: {},
+				mafiRow: {},
+				mafiRowIndex: 0,
 				// 航次下拉框
-				hcValue: "",
-				hcList: [{
-						value: 0,
-						text: "航次0"
-					},
-					{
-						value: 1,
-						text: "航次1"
-					},
-					{
-						value: 2,
-						text: "航次2"
-					},
-				],
+				vvyId: "",
+				vvyName: "",
+				hcList: [],
 				// 作业时间
-				workTime: "",
+				workTime: [""],
 				// 马菲板号
-				vinCode: "",
+				mafiBarcode: "",
 				// 尺码
-				sizeNum: 0,
+				size: 0,
 				// 类型下拉框
 				lxValue: "",
+				lxTextValue: "",
 				lxList: [{
 						value: 0,
-						text: "类型0"
+						text: "空板"
 					},
 					{
 						value: 1,
-						text: "类型1"
-					},
-					{
-						value: 2,
-						text: "类型2"
+						text: "重板"
 					},
 				],
 				// 装卸类型下拉框
-				zxValue: "",
-				zxList: [{
-						value: 0,
-						text: "装卸类型0"
-					},
-					{
-						value: 1,
-						text: "装卸类型1"
-					},
-					{
-						value: 2,
-						text: "装卸类型2"
-					},
-				],
+				loaderTypeId: "",
+				loaderType: "",
+				zxList: [],
 			}
 		},
 		onLoad(options) {
@@ -123,18 +107,75 @@
 				this.obj = JSON.parse(decodeURIComponent(options.params))
 			}
 		},
+		mounted() {
+			if (this.obj.state == 'edit' || this.obj.state == 'look') {
+				this.getRow();
+			}
+			this.getShip()
+		},
 		methods: {
+			// 获取船只信息
+			getShip() {
+				this.shipInfo = uni.getStorageSync('shipInfo')
+				// 航次数据
+				this.shipInfo.voyageScheduleDataList.forEach((v, index) => {
+					this.hcList.push({
+						text: v.vvyName,
+						value: v.vvyId
+					})
+				})
+				// 装卸类型数据
+				this.shipInfo.handTypeList.forEach((v, index) => {
+					this.zxList.push({
+						text: v.ptrDesc,
+						value: v.ptrCode
+					})
+				})
+			},
+			// 获取当前行信息
+			getRow() {
+				this.mafiRow = uni.getStorageSync('mafiRow');
+				this.mafiRowIndex = uni.getStorageSync('mafiRowIndex');
+				this.vvyId = this.mafiRow.vvyId
+				this.vvyName = this.mafiRow.vvyName
+				this.loaderTypeId = this.mafiRow.loaderTypeId
+				this.loaderType = this.mafiRow.loaderType
+				this.workTime = this.mafiRow.workTime
+				this.lxValue = this.mafiRow.lxValue
+				this.lxTextValue = this.mafiRow.lxTextValue
+				this.size = this.mafiRow.size
+				this.mafiBarcode = this.mafiRow.mafiBarcode
+			},
 			// 航次下拉
 			hcChange(e) {
-				this.hcValue = e;
+				this.vvyId = e;
+				this.hcList.forEach(v => {
+					if (v.value == e) {
+						this.vvyName = v.text
+					}
+				})
 			},
 			// 类型下拉
 			lxChange(e) {
 				this.lxValue = e;
+				this.lxList.forEach(v => {
+					if (v.value == e) {
+						this.lxTextValue = v.text
+					}
+				})
 			},
 			// 装卸类型下拉
 			zxChange(e) {
-				this.zxValue = e;
+				this.loaderTypeId = e;
+				this.zxList.forEach(v => {
+					if (v.value == e) {
+						this.loaderType = v.text
+					}
+				})
+			},
+			// 作业时间
+			changeLog(e) {
+				this.workTime = e
 			},
 			// 取消
 			cancel() {
@@ -142,8 +183,45 @@
 					url: '/pages/shipWork/mafi'
 				})
 			},
+			// 删除
+			del() {
+				let addMafiArr = uni.getStorageSync('addMafiArr')
+				addMafiArr.splice(this.mafiRowIndex, 1)
+				uni.setStorageSync('addMafiArr', addMafiArr);
+				uni.navigateTo({
+					url: '/pages/shipWork/mafi'
+				})
+			},
 			// 保存
 			save() {
+				let addMafiArr = uni.getStorageSync('addMafiArr')
+				let addMafiObj = {
+					vvyId: this.vvyId,
+					vvyName: this.vvyName,
+					loaderTypeId: this.loaderTypeId,
+					loaderType: this.loaderType,
+					lxValue: this.lxValue,
+					lxTextValue: this.lxTextValue,
+					size: this.size,
+					mafiBarcode: this.mafiBarcode,
+					workTime: this.workTime,
+					tradeTypeName: this.shipInfo.voyageScheduleDataList[0].tradeTypeName,
+					importExportFlagName: this.shipInfo.voyageScheduleDataList[0].importExportFlagName,
+					spmName: this.shipInfo.voyageScheduleDataList[0].spmName,
+				}
+				if (this.obj.state == "edit") {
+					addMafiArr[this.mafiRowIndex] = addMafiObj;
+					uni.setStorageSync('addMafiArr', addMafiArr);
+				} else if (this.obj.state == "add") {
+					if (addMafiArr != "") {
+						addMafiArr.push(addMafiObj)
+						uni.setStorageSync('addMafiArr', addMafiArr);
+					} else {
+						addMafiArr = []
+						addMafiArr.push(addMafiObj)
+						uni.setStorageSync('addMafiArr', addMafiArr);
+					}
+				}
 				uni.navigateTo({
 					url: '/pages/shipWork/mafi'
 				})
@@ -165,12 +243,12 @@
 		.container {
 			padding: 30px 20px;
 
-			ul {
+			.ul {
 				display: flex;
 				flex-wrap: wrap;
 				justify-content: space-between;
 
-				li {
+				.li {
 					width: 44%;
 					border-top: 1px solid #ccc;
 					border-bottom: 1px solid #ccc;
diff --git a/pages/shipWork/mixWork.vue b/pages/shipWork/mixWork.vue
index ae710ff..e068a43 100644
--- a/pages/shipWork/mixWork.vue
+++ b/pages/shipWork/mixWork.vue
@@ -50,7 +50,8 @@
 		},
 		mounted() {
 			this.tabsType = this.$route.query.infoType
-			if (this.tabsType != 0 || this.tabsType != 1) {
+			console.log(this.tabsType)
+			if (this.tabsType != 0 && this.tabsType != 1) {
 				this.tabsType = 0
 				this.tabsIndex = 0
 			} else {
@@ -71,8 +72,10 @@
 				}
 			},
 			add(state, item, index) {
-				uni.setStorageSync('peopleRow', item);
-				uni.setStorageSync('peopleRowIndex', index);
+				if (state != 'add') {
+					uni.setStorageSync('peopleRow', item);
+					uni.setStorageSync('peopleRowIndex', index);
+				}
 				let obj = {
 					state: state
 				}
diff --git a/pages/shipWork/notice.vue b/pages/shipWork/notice.vue
index 048bdcd..3255e27 100644
--- a/pages/shipWork/notice.vue
+++ b/pages/shipWork/notice.vue
@@ -1,15 +1,15 @@
 <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="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>
 			<view class="addBtn" @click="add('add')">+ 新增</view>
 		</view>
 	</view>
@@ -19,29 +19,20 @@
 	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",
-				}]
+				shipInfo: {},
+				infoList: []
 			}
 		},
+		mounted() {
+			this.shipInfo = uni.getStorageSync('shipInfo')
+			this.infoList = uni.getStorageSync('addNoticeArr')
+		},
 		methods: {
-			add(state) {
+			add(state, item, index) {
+				if (state != 'add') {
+					uni.setStorageSync('noticeRow', item);
+					uni.setStorageSync('noticeRowIndex', index);
+				}
 				const obj = {
 					state: state,
 				}
@@ -59,10 +50,10 @@
 		.container {
 			padding: 30px 20px;
 
-			ul {
+			.ul {
 				padding: 20px 0;
 
-				li {
+				.li {
 					display: flex;
 					justify-content: space-between;
 					border-bottom: 1px solid #ccc;
diff --git a/pages/shipWork/noticeAdd.vue b/pages/shipWork/noticeAdd.vue
index cb71c8c..5f939bc 100644
--- a/pages/shipWork/noticeAdd.vue
+++ b/pages/shipWork/noticeAdd.vue
@@ -1,36 +1,35 @@
 <template>
 	<view class="noticeAdd">
 		<view class="container">
-			<ul>
-				<li>
+			<view class="ul">
+				<view class="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"
+					<text>{{shipInfo.voyageScheduleDataList[0].spmName}}</text>
+				</view>
+				<view class="li">
+					<p><text class="required" v-if="obj.state != 'look'">*</text>航次：</p>
+					<uni-data-select v-model="vvyId" :localdata="hcList" @change="hcChange"
 						v-if="obj.state != 'look'"></uni-data-select>
-					<span v-else>CK98796</span>
-				</li>
-				<li>
+					<text v-else>{{vvyName}}</text>
+				</view>
+				<view class="li">
 					<p>进出口：</p>
-					<span>进口</span>
-				</li>
-				<li>
+					<text>{{shipInfo.voyageScheduleDataList[0].importExportFlagName}}</text>
+				</view>
+				<view class="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"
+					<text>{{shipInfo.voyageScheduleDataList[0].tradeTypeName}}</text>
+				</view>
+				<view class="li">
+					<p><text class="required" v-if="obj.state != 'look'">*</text>作业日期：</p>
+					<uni-datetime-picker v-model="workDate" type="date" :clear-icon="false" @change="changeLog"
 						v-if="obj.state != 'look'" />
-					<span v-else>2020-04-21</span>
-				</li>
-
-			</ul>
+					<text v-else>{{workDate}}</text>
+				</view>
+			</view>
 			<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="danger" v-if="obj.state == 'look'" @click="del">删除</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>
@@ -42,24 +41,22 @@
 	export default {
 		data() {
 			return {
+				shipInfo: {
+					voyageScheduleDataList: [{
+						spmName: "",
+						importExportFlagName: "",
+						tradeTypeName: ""
+					}]
+				},
 				obj: {},
+				noticeRow: {},
+				noticeRowIndex: 0,
 				// 航次下拉框
-				hcValue: "",
-				hcList: [{
-						value: 0,
-						text: "航次0"
-					},
-					{
-						value: 1,
-						text: "航次1"
-					},
-					{
-						value: 2,
-						text: "航次2"
-					},
-				],
+				vvyId: "",
+				vvyName: "",
+				hcList: [],
 				// 作业时间
-				workTime: "",
+				workDate: [''],
 			}
 		},
 		onLoad(options) {
@@ -68,10 +65,44 @@
 				this.obj = JSON.parse(decodeURIComponent(options.params))
 			}
 		},
+		mounted() {
+			if (this.obj.state == 'edit' || this.obj.state == 'look') {
+				this.getRow();
+			}
+			this.getShip()
+		},
 		methods: {
+			// 获取船只信息
+			getShip() {
+				this.shipInfo = uni.getStorageSync('shipInfo')
+				// 航次数据
+				this.shipInfo.voyageScheduleDataList.forEach((v, index) => {
+					this.hcList.push({
+						text: v.vvyName,
+						value: v.vvyId
+					})
+				})
+			},
+			// 获取当前行信息
+			getRow() {
+				this.noticeRow = uni.getStorageSync('noticeRow');
+				this.noticeRowIndex = uni.getStorageSync('noticeRowIndex');
+				this.vvyId = this.noticeRow.vvyId
+				this.vvyName = this.noticeRow.vvyName
+				this.workDate = (this.noticeRow.workDate[0] ? this.noticeRow.workDate : '')
+			},
 			// 航次下拉
 			hcChange(e) {
-				this.hcValue = e;
+				this.vvyId = e;
+				this.hcList.forEach(v => {
+					if (v.value == e) {
+						this.vvyName = v.text
+					}
+				})
+			},
+			// 作业时间
+			changeLog(e) {
+				this.workDate = e
 			},
 			// 取消
 			cancel() {
@@ -79,8 +110,39 @@
 					url: '/pages/shipWork/notice'
 				})
 			},
+			// 删除
+			del() {
+				let addNoticeArr = uni.getStorageSync('addNoticeArr')
+				addNoticeArr.splice(this.noticeRowIndex, 1)
+				uni.setStorageSync('addNoticeArr', addNoticeArr);
+				uni.navigateTo({
+					url: '/pages/shipWork/notice'
+				})
+			},
 			// 保存
 			save() {
+				let addNoticeArr = uni.getStorageSync('addNoticeArr')
+				let addNoticeObj = {
+					vvyId: this.vvyId,
+					vvyName: this.vvyName,
+					workDate: this.workDate,
+					tradeTypeName: this.shipInfo.voyageScheduleDataList[0].tradeTypeName,
+					importExportFlagName: this.shipInfo.voyageScheduleDataList[0].importExportFlagName,
+					spmName: this.shipInfo.voyageScheduleDataList[0].spmName,
+				}
+				if (this.obj.state == "edit") {
+					addNoticeArr[this.noticeRowIndex] = addNoticeObj;
+					uni.setStorageSync('addNoticeArr', addNoticeArr);
+				} else if (this.obj.state == "add") {
+					if (addNoticeArr != "") {
+						addNoticeArr.push(addNoticeObj)
+						uni.setStorageSync('addNoticeArr', addNoticeArr);
+					} else {
+						addNoticeArr = []
+						addNoticeArr.push(addNoticeObj)
+						uni.setStorageSync('addNoticeArr', addNoticeArr);
+					}
+				}
 				uni.navigateTo({
 					url: '/pages/shipWork/notice'
 				})
@@ -102,12 +164,12 @@
 		.container {
 			padding: 30px 20px;
 
-			ul {
+			.ul {
 				display: flex;
 				flex-wrap: wrap;
 				justify-content: space-between;
 
-				li {
+				.li {
 					width: 44%;
 					border-top: 1px solid #ccc;
 					border-bottom: 1px solid #ccc;
diff --git a/pages/shipWork/opinion.vue b/pages/shipWork/opinion.vue
index 42bd701..6914c1c 100644
--- a/pages/shipWork/opinion.vue
+++ b/pages/shipWork/opinion.vue
@@ -1,16 +1,18 @@
 <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 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>
+			<view>
+				<view class="addBtn" @click="add('add')">+ 新增</view>
+			</view>
 		</view>
 	</view>
 </template>
@@ -19,29 +21,20 @@
 	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",
-				}]
+				shipInfo: {},
+				infoList: []
 			}
 		},
+		mounted() {
+			this.shipInfo = uni.getStorageSync('shipInfo')
+			this.infoList = uni.getStorageSync('addOpinionArr')
+		},
 		methods: {
-			add(state) {
+			add(state, item, index) {
+				if (state != 'add') {
+					uni.setStorageSync('opinionRow', item);
+					uni.setStorageSync('opinionRowIndex', index);
+				}
 				const obj = {
 					state: state,
 				}
@@ -59,10 +52,10 @@
 		.container {
 			padding: 30px 20px;
 
-			ul {
+			.ul {
 				padding: 20px 0;
 
-				li {
+				.li {
 					display: flex;
 					justify-content: space-between;
 					border-bottom: 1px solid #ccc;
diff --git a/pages/shipWork/opinionAdd.vue b/pages/shipWork/opinionAdd.vue
index e9b63d8..99461d4 100644
--- a/pages/shipWork/opinionAdd.vue
+++ b/pages/shipWork/opinionAdd.vue
@@ -1,58 +1,57 @@
 <template>
 	<view class="opinionAdd">
 		<view class="container">
-			<ul>
-				<li>
+			<view class="ul">
+				<view class="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"
+					<text>{{shipInfo.voyageScheduleDataList[0].spmName}}</text>
+				</view>
+				<view class="li">
+					<p><text class="required" v-if="obj.state != 'look'">*</text>航次：</p>
+					<uni-data-select v-model="vvyId" :localdata="hcList" @change="hcChange"
 						v-if="obj.state != 'look'"></uni-data-select>
-					<span v-else>CK98796</span>
-				</li>
-				<li>
+					<text v-else>{{vvyName}}</text>
+				</view>
+				<view class="li">
 					<p>进出口：</p>
-					<span>进口</span>
-				</li>
-				<li>
+					<text>{{shipInfo.voyageScheduleDataList[0].importExportFlagName}}</text>
+				</view>
+				<view class="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"
+					<text>{{shipInfo.voyageScheduleDataList[0].tradeTypeName}}</text>
+				</view>
+				<view class="li">
+					<p><text class="required" v-if="obj.state != 'look'">*</text>泊位：</p>
+					<uni-data-select v-model="bthId" :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"
+					<text v-else>{{bthIdName}}</text>
+				</view>
+				<view class="li">
+					<p><text class="required" v-if="obj.state != 'look'">*</text>装卸类型：</p>
+					<uni-data-select v-model="loaderTypeId" :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"
+					<text v-else>{{loaderType}}</text>
+				</view>
+				<view class="li">
+					<p><text class="required" v-if="obj.state != 'look'">*</text>车辆数量：</p>
+					<uni-number-box v-model="vehicleSize" v-if="obj.state != 'look'" />
+					<text v-else>{{vehicleSize}}</text>
+				</view>
+				<view class="li">
+					<p><text class="required" v-if="obj.state != 'look'">*</text>备件数量：</p>
+					<uni-number-box v-model="sparePart" v-if="obj.state != 'look'" />
+					<text v-else>{{sparePart}}</text>
+				</view>
+				<view class="li">
+					<p><text class="required" v-if="obj.state != 'look'">*</text>作业日期：</p>
+					<uni-datetime-picker v-model="workTime" type="date" :clear-icon="false" @change="changeLog"
 						v-if="obj.state != 'look'" />
-					<span v-else>2020-04-21</span>
-				</li>
-
-			</ul>
+					<text v-else>{{workTime}}</text>
+				</view>
+			</view>
 			<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="danger" v-if="obj.state == 'look'" @click="del">删除</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>
@@ -64,58 +63,34 @@
 	export default {
 		data() {
 			return {
+				shipInfo: {
+					voyageScheduleDataList: [{
+						spmName: "",
+						importExportFlagName: "",
+						tradeTypeName: ""
+					}]
+				},
 				obj: {},
+				opinionRow: {},
+				opinionRowIndex: 0,
 				// 航次下拉框
-				hcValue: "",
-				hcList: [{
-						value: 0,
-						text: "航次0"
-					},
-					{
-						value: 1,
-						text: "航次1"
-					},
-					{
-						value: 2,
-						text: "航次2"
-					},
-				],
+				vvyId: "",
+				vvyName: "",
+				hcList: [],
 				// 泊位下拉框
-				bwValue: "",
-				bwList: [{
-						value: 0,
-						text: "泊位0"
-					},
-					{
-						value: 1,
-						text: "泊位1"
-					},
-					{
-						value: 2,
-						text: "泊位2"
-					},
-				],
+				bthId: "",
+				bthIdName: "",
+				bwList: [],
 				// 装卸类型下拉框
-				zxValue: "",
-				zxList: [{
-						value: 0,
-						text: "装卸类型0"
-					},
-					{
-						value: 1,
-						text: "装卸类型1"
-					},
-					{
-						value: 2,
-						text: "装卸类型2"
-					},
-				],
+				loaderTypeId: "",
+				loaderType: "",
+				zxList: [],
 				// 车辆数量
-				carNum: 0,
+				vehicleSize: 0,
 				// 备件数量
-				partsNum: 0,
+				sparePart: 0,
 				// 作业时间
-				workTime: "",
+				workTime: [''],
 			}
 		},
 		onLoad(options) {
@@ -124,18 +99,82 @@
 				this.obj = JSON.parse(decodeURIComponent(options.params))
 			}
 		},
+		mounted() {
+			if (this.obj.state == 'edit' || this.obj.state == 'look') {
+				this.getRow();
+			}
+			this.getShip()
+		},
 		methods: {
+			// 获取船只信息
+			getShip() {
+				this.shipInfo = uni.getStorageSync('shipInfo')
+				// 航次数据
+				this.shipInfo.voyageScheduleDataList.forEach((v, index) => {
+					this.hcList.push({
+						text: v.vvyName,
+						value: v.vvyId
+					})
+				})
+				// 装卸类型数据
+				this.shipInfo.handTypeList.forEach((v, index) => {
+					this.zxList.push({
+						text: v.ptrDesc,
+						value: v.ptrCode
+					})
+				})
+				// 泊位数据
+				this.shipInfo.pubBerthesManageRespList.forEach((v, index) => {
+					this.bwList.push({
+						text: v.bthBthnm,
+						value: v.bthId
+					})
+				})
+			},
+			// 获取当前行信息
+			getRow() {
+				this.opinionRow = uni.getStorageSync('opinionRow');
+				this.opinionRowIndex = uni.getStorageSync('opinionRowIndex');
+				this.vvyId = this.opinionRow.vvyId
+				this.vvyName = this.opinionRow.vvyName
+				this.bthId = this.opinionRow.bthId
+				this.bthIdName = this.opinionRow.bthIdName
+				this.loaderTypeId = this.opinionRow.loaderTypeId
+				this.loaderType = this.opinionRow.loaderType
+				this.vehicleSize = this.opinionRow.vehicleSize
+				this.sparePart = this.opinionRow.sparePart
+				this.workTime = this.opinionRow.workTime
+			},
 			// 航次下拉
 			hcChange(e) {
-				this.hcValue = e;
+				this.vvyId = e;
+				this.hcList.forEach(v => {
+					if (v.value == e) {
+						this.vvyName = v.text
+					}
+				})
 			},
 			// 泊位下拉
 			bwChange(e) {
-				this.bwValue = e;
+				this.bthId = e;
+				this.bwList.forEach(v => {
+					if (v.value == e) {
+						this.bthIdName = v.text
+					}
+				})
 			},
 			// 装卸类型下拉
 			zxChange(e) {
-				this.zxValue = e;
+				this.loaderTypeId = e;
+				this.zxList.forEach(v => {
+					if (v.value == e) {
+						this.loaderType = v.text
+					}
+				})
+			},
+			// 作业时间
+			changeLog(e) {
+				this.workTime = e
 			},
 			// 取消
 			cancel() {
@@ -143,8 +182,45 @@
 					url: '/pages/shipWork/opinion'
 				})
 			},
+			// 删除
+			del() {
+				let addOpinionArr = uni.getStorageSync('addOpinionArr')
+				addOpinionArr.splice(this.opinionRowIndex, 1)
+				uni.setStorageSync('addOpinionArr', addOpinionArr);
+				uni.navigateTo({
+					url: '/pages/shipWork/opinion'
+				})
+			},
 			// 保存
 			save() {
+				let addOpinionArr = uni.getStorageSync('addOpinionArr')
+				let addOpinionObj = {
+					vvyId: this.vvyId,
+					vvyName: this.vvyName,
+					bthId: this.bthId,
+					bthIdName: this.bthIdName,
+					loaderTypeId: this.loaderTypeId,
+					loaderType: this.loaderType,
+					vehicleSize: this.vehicleSize,
+					sparePart: this.sparePart,
+					workTime: this.workTime,
+					tradeTypeName: this.shipInfo.voyageScheduleDataList[0].tradeTypeName,
+					importExportFlagName: this.shipInfo.voyageScheduleDataList[0].importExportFlagName,
+					spmName: this.shipInfo.voyageScheduleDataList[0].spmName,
+				}
+				if (this.obj.state == "edit") {
+					addOpinionArr[this.opinionRowIndex] = addOpinionObj;
+					uni.setStorageSync('addOpinionArr', addOpinionArr);
+				} else if (this.obj.state == "add") {
+					if (addOpinionArr != "") {
+						addOpinionArr.push(addOpinionObj)
+						uni.setStorageSync('addOpinionArr', addOpinionArr);
+					} else {
+						addOpinionArr = []
+						addOpinionArr.push(addOpinionObj)
+						uni.setStorageSync('addOpinionArr', addOpinionArr);
+					}
+				}
 				uni.navigateTo({
 					url: '/pages/shipWork/opinion'
 				})
@@ -166,12 +242,12 @@
 		.container {
 			padding: 30px 20px;
 
-			ul {
+			.ul {
 				display: flex;
 				flex-wrap: wrap;
 				justify-content: space-between;
 
-				li {
+				.li {
 					width: 44%;
 					border-top: 1px solid #ccc;
 					border-bottom: 1px solid #ccc;
diff --git a/pages/shipWork/patrol.vue b/pages/shipWork/patrol.vue
index 29c6c86..ccbd3c3 100644
--- a/pages/shipWork/patrol.vue
+++ b/pages/shipWork/patrol.vue
@@ -1,15 +1,15 @@
 <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="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 class="addBtn" @click="add('add')">+ 新增</view>
 		</view>
 	</view>
@@ -19,29 +19,20 @@
 	export default {
 		data() {
 			return {
-				infoList: [{
-					val1: "大风预警",
-					val2: "上传成功",
-					val3: "JK097085964",
-					val4: "内贸",
-					val5: "进口",
-				}, {
-					val1: "大风预警",
-					val2: "待上传",
-					val3: "JK097085964",
-					val4: "内贸",
-					val5: "进口",
-				}, {
-					val1: "大风预警",
-					val2: "待上传",
-					val3: "JK097085964",
-					val4: "内贸",
-					val5: "进口",
-				}, ]
+				shipInfo: {},
+				infoList: []
 			}
 		},
+		mounted() {
+			this.shipInfo = uni.getStorageSync('shipInfo')
+			this.infoList = uni.getStorageSync('addPatrolArr')
+		},
 		methods: {
-			add(state) {
+			add(state, item, index) {
+				if (state != 'add') {
+					uni.setStorageSync('patrolRow', item);
+					uni.setStorageSync('patrolRowIndex', index);
+				}
 				const obj = {
 					state: state,
 				}
@@ -59,10 +50,10 @@
 		.container {
 			padding: 30px 20px;
 
-			ul {
+			.ul {
 				padding: 20px 0;
 
-				li {
+				.li {
 					display: flex;
 					justify-content: space-between;
 					border-bottom: 1px solid #ccc;
diff --git a/pages/shipWork/patrolAdd.vue b/pages/shipWork/patrolAdd.vue
index 61b6d93..0f86c31 100644
--- a/pages/shipWork/patrolAdd.vue
+++ b/pages/shipWork/patrolAdd.vue
@@ -1,51 +1,54 @@
 <template>
 	<view class="patrolAdd">
 		<view class="container">
-			<ul>
-				<li>
+			<view class="ul">
+				<view class="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"
+					<text>{{shipInfo.voyageScheduleDataList[0].spmName}}</text>
+				</view>
+				<view class="li">
+					<p><text class="required" v-if="obj.state != 'look'">*</text>航次：</p>
+					<uni-data-select v-model="vvyId" :localdata="hcList" @change="hcChange"
 						v-if="obj.state != 'look'"></uni-data-select>
-					<span v-else>CK98796</span>
-				</li>
-				<li>
+					<text v-else>{{vvyName}}</text>
+				</view>
+				<view class="li">
 					<p>进出口：</p>
-					<span>进口</span>
-				</li>
-				<li>
+					<text>{{shipInfo.voyageScheduleDataList[0].importExportFlagName}}</text>
+				</view>
+				<view class="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>
+					<text>{{shipInfo.voyageScheduleDataList[0].tradeTypeName}}</text>
+				</view>
+				<view class="li">
+					<p><text class="required" v-if="obj.state != 'look'">*</text>类型：</p>
+					<uni-easyinput v-if="obj.state != 'look'" v-model="type" placeholder="请输入"></uni-easyinput>
+					<text v-else>{{type}}</text>
+				</view>
+				<view class="li tpLi">
+					<p><text class="required" v-if="obj.state != 'look'">*</text>图片上传：</p>
 					<template v-if="obj.state != 'look'">
 						<view class="picture">
-							<uni-file-picker limit="9" title="最多选择9张图片"></uni-file-picker>
+							<uni-file-picker limit="9" v-model="imageValue" fileMediatype="image" @select="select"
+								title="最多选择9张图片"></uni-file-picker>
 						</view>
 					</template>
 					<view class="pictureLook" v-else>
-						<img src="../../static/images/testImg.jpg">
+						<view v-for="(item,index) in imageValue" :key="index">
+							<image :src="item">
+						</view>
 					</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字以内)"
+				</view>
+				<view class="li wLi">
+					<p><text class="required" v-if="obj.state != 'look'">*</text>描述：</p>
+					<uni-easyinput type="textarea" autoHeight v-model="remark" placeholder="请输入任务描述(200字以内)"
 						maxlength="200" v-if="obj.state != 'look'"></uni-easyinput>
-					<span v-else>描述描述描述</span>
-				</li>
-			</ul>
+					<text v-else>{{remark}}</text>
+				</view>
+			</view>
 			<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="danger" v-if="obj.state == 'look'" @click="del">删除</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>
@@ -57,26 +60,26 @@
 	export default {
 		data() {
 			return {
+				shipInfo: {
+					voyageScheduleDataList: [{
+						spmName: "",
+						importExportFlagName: "",
+						tradeTypeName: ""
+					}]
+				},
 				obj: {},
+				patrolRow: {},
+				patrolRowIndex: {},
 				// 航次下拉框
-				hcValue: "",
-				hcList: [{
-						value: 0,
-						text: "航次0"
-					},
-					{
-						value: 1,
-						text: "航次1"
-					},
-					{
-						value: 2,
-						text: "航次2"
-					},
-				],
+				vvyId: "",
+				vvyName: "",
+				hcList: [],
 				// 类型
-				typeValue: "",
+				type: "",
+				// 图片
+				imageValue: [],
 				// 描述
-				describe: "",
+				remark: "",
 			}
 		},
 		onLoad(options) {
@@ -84,12 +87,47 @@
 				// 获取传递的对象参数，使用decodeURIComponent解码，并转为对象
 				this.obj = JSON.parse(decodeURIComponent(options.params))
 			}
-			console.log(this.obj)
+		},
+		mounted() {
+			if (this.obj.state == 'edit' || this.obj.state == 'look') {
+				this.getRow();
+			}
+			this.getShip()
 		},
 		methods: {
+			// 获取船只信息
+			getShip() {
+				this.shipInfo = uni.getStorageSync('shipInfo')
+				// 航次数据
+				this.shipInfo.voyageScheduleDataList.forEach((v, index) => {
+					this.hcList.push({
+						text: v.vvyName,
+						value: v.vvyId
+					})
+				})
+			},
+			// 获取当前行信息
+			getRow() {
+				this.patrolRow = uni.getStorageSync('patrolRow');
+				this.patrolRowIndex = uni.getStorageSync('patrolRowIndex');
+				this.vvyId = this.patrolRow.vvyId
+				this.vvyName = this.patrolRow.vvyName
+				this.type = this.patrolRow.type
+				this.remark = this.patrolRow.remark
+				this.imageValue = this.patrolRow.imageValue
+			},
 			// 航次下拉
 			hcChange(e) {
-				this.hcValue = e;
+				this.vvyId = e;
+				this.hcList.forEach(v => {
+					if (v.value == e) {
+						this.vvyName = v.text
+					}
+				})
+			},
+			// 图片上传
+			select(e) {
+				console.log(e)
 			},
 			// 取消
 			cancel() {
@@ -97,8 +135,41 @@
 					url: '/pages/shipWork/patrol'
 				})
 			},
+			// 删除
+			del() {
+				let addPatrolArr = uni.getStorageSync('addPatrolArr')
+				addPatrolArr.splice(this.patrolRowIndex, 1)
+				uni.setStorageSync('addPatrolArr', addPatrolArr);
+				uni.navigateTo({
+					url: '/pages/shipWork/patrol'
+				})
+			},
 			// 保存
 			save() {
+				let addPatrolArr = uni.getStorageSync('addPatrolArr')
+				let addPatrolObj = {
+					vvyId: this.vvyId,
+					vvyName: this.vvyName,
+					type: this.type,
+					remark: this.remark,
+					imageValue: this.imageValue,
+					tradeTypeName: this.shipInfo.voyageScheduleDataList[0].tradeTypeName,
+					importExportFlagName: this.shipInfo.voyageScheduleDataList[0].importExportFlagName,
+					spmName: this.shipInfo.voyageScheduleDataList[0].spmName,
+				}
+				if (this.obj.state == "edit") {
+					addPatrolArr[this.patrolRowIndex] = addPatrolObj;
+					uni.setStorageSync('addPatrolArr', addPatrolArr);
+				} else if (this.obj.state == "add") {
+					if (addPatrolArr != "") {
+						addPatrolArr.push(addPatrolObj)
+						uni.setStorageSync('addPatrolArr', addPatrolArr);
+					} else {
+						addPatrolArr = []
+						addPatrolArr.push(addPatrolObj)
+						uni.setStorageSync('addPatrolArr', addPatrolArr);
+					}
+				}
 				uni.navigateTo({
 					url: '/pages/shipWork/patrol'
 				})
@@ -120,25 +191,25 @@
 		.container {
 			padding: 30px 20px;
 
-			ul {
+			.ul {
 				display: flex;
 				flex-wrap: wrap;
 				justify-content: space-between;
 
 				.wLi {
-					width: 100%;
+					width: 100% !important;
 				}
 
 				.tpLi {
-					width: 100%;
-					display: block;
+					width: 100% !important;
+					display: block !important;
 
 					p {
-						text-align: left;
+						text-align: left !important;
 					}
 				}
 
-				li {
+				.li {
 					width: 44%;
 					border-top: 1px solid #ccc;
 					border-bottom: 1px solid #ccc;
@@ -188,7 +259,7 @@
 						display: flex;
 						flex-wrap: wrap;
 
-						img {
+						image {
 							width: 120px;
 							height: 120px;
 							margin: 10px;
diff --git a/pages/shipWork/shiftAdd.vue b/pages/shipWork/shiftAdd.vue
index 81f3276..933e5f2 100644
--- a/pages/shipWork/shiftAdd.vue
+++ b/pages/shipWork/shiftAdd.vue
@@ -234,19 +234,7 @@
 
 				// 翻仓信息
 				// 翻仓类型下拉
-				fcList: [{
-						value: "0",
-						text: "翻仓类型0"
-					},
-					{
-						value: "1",
-						text: "翻仓类型1"
-					},
-					{
-						value: "2",
-						text: "翻仓类型2"
-					},
-				],
+				fcList: [],
 				fcUlList: [{
 					fcValue: "",
 					fcTextValue: "",
@@ -286,10 +274,10 @@
 			}
 		},
 		mounted() {
-			this.getShip()
 			if (this.obj.state == 'edit') {
 				this.editData();
 			}
+			this.getShip()
 		},
 		methods: {
 			// 获取船只信息
@@ -331,10 +319,11 @@
 					})
 				})
 				// 翻仓类型
-				this.shipInfo.retallyMessageRespList.forEach((v, index) => {
+				this.shipInfo.turnoverTypeList.forEach((v, index) => {
 					this.fcList.push({
-						text: v.retallyTypeName,
-						value: v.retallyType
+						text: v.ptrDesc,
+						value: v.ptrCode
+
 					})
 				})
 			},
diff --git a/pages/shipWork/shiftDetails.vue b/pages/shipWork/shiftDetails.vue
index 1ce236c..7019767 100644
--- a/pages/shipWork/shiftDetails.vue
+++ b/pages/shipWork/shiftDetails.vue
@@ -137,7 +137,7 @@
 			</custom-tabs>
 			<view class="btnList">
 				<van-button type="default" @click="cancel">取消</van-button>
-				<van-button type="default" @click="del">删除</van-button>
+				<van-button type="danger" @click="del">删除</van-button>
 				<van-button type="info" @click="edit('edit')">编辑</van-button>
 			</view>
 		</view>
diff --git a/pages/shipWork/supply.vue b/pages/shipWork/supply.vue
index 77b7779..dc1baa6 100644
--- a/pages/shipWork/supply.vue
+++ b/pages/shipWork/supply.vue
@@ -1,15 +1,15 @@
 <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="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>
 			<view class="addBtn" @click="add('add')">+ 新增</view>
 		</view>
 	</view>
@@ -19,29 +19,21 @@
 	export default {
 		data() {
 			return {
-				infoList: [{
-					val1: "供水",
-					val2: "待上传",
-					val3: "JK9868548",
-					val4: "进口",
-					val5: "外贸",
-				}, {
-					val1: "供水",
-					val2: "待上传",
-					val3: "JK9868548",
-					val4: "进口",
-					val5: "外贸",
-				}, {
-					val1: "供水",
-					val2: "待上传",
-					val3: "JK9868548",
-					val4: "进口",
-					val5: "外贸",
-				}, ]
+				shipInfo: {},
+				infoList: []
 			}
 		},
+		mounted() {
+			this.shipInfo = uni.getStorageSync('shipInfo')
+			this.infoList = uni.getStorageSync('addSupplyArr')
+			console.log(this.infoList)
+		},
 		methods: {
-			add(state) {
+			add(state, item, index) {
+				if (state != 'add') {
+					uni.setStorageSync('supplyRow', item);
+					uni.setStorageSync('supplyRowIndex', index);
+				}
 				const obj = {
 					state: state,
 				}
@@ -59,10 +51,10 @@
 		.container {
 			padding: 30px 20px;
 
-			ul {
+			.ul {
 				padding: 20px 0;
 
-				li {
+				.li {
 					display: flex;
 					justify-content: space-between;
 					border-bottom: 1px solid #ccc;
diff --git a/pages/shipWork/supplyAdd.vue b/pages/shipWork/supplyAdd.vue
index 3dff2c3..7dde8be 100644
--- a/pages/shipWork/supplyAdd.vue
+++ b/pages/shipWork/supplyAdd.vue
@@ -1,52 +1,52 @@
 <template>
 	<view class="supplyAdd">
 		<view class="container">
-			<ul>
-				<li>
+			<view class="ul">
+				<view class="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"
+					<text>{{shipInfo.voyageScheduleDataList[0].spmName}}</text>
+				</view>
+				<view class="li">
+					<p><text class="required" v-if="obj.state != 'look'">*</text>航次：</p>
+					<uni-data-select v-model="vvyId" :localdata="hcList" @change="hcChange"
 						v-if="obj.state != 'look'"></uni-data-select>
-					<span v-else>CK98796</span>
-				</li>
-				<li>
+					<text v-else>{{vvyName}}</text>
+				</view>
+				<view class="li">
 					<p>进出口：</p>
-					<span>进口</span>
-				</li>
-				<li>
+					<text>{{shipInfo.voyageScheduleDataList[0].importExportFlagName}}</text>
+				</view>
+				<view class="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"
+					<text>{{shipInfo.voyageScheduleDataList[0].tradeTypeName}}</text>
+				</view>
+				<view class="li">
+					<p><text class="required" v-if="obj.state != 'look'">*</text>泊位：</p>
+					<uni-data-select v-model="bthId" :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"
+					<text v-else>{{bthIdName}}</text>
+				</view>
+				<view class="li">
+					<p><text class="required" v-if="obj.state != 'look'">*</text>供给类型：</p>
+					<uni-data-select v-model="supplyTypeId" :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"
+					<text v-else>{{supplyType}}</text>
+				</view>
+				<view class="li">
+					<p><text class="required" v-if="obj.state != 'look'">*</text>供给量：</p>
+					<uni-number-box v-model="supplyAmount" v-if="obj.state != 'look'" />
+					<text v-else>{{supplyAmount}}</text>
+				</view>
+				<view class="li">
+					<p><text class="required" v-if="obj.state != 'look'">*</text>日期：</p>
+					<uni-datetime-picker v-model="supplyDate" type="date" :clear-icon="false" @change="changeLog"
 						v-if="obj.state != 'look'" />
-					<span v-else>2020-04-21</span>
-				</li>
-			</ul>
+					<text v-else>{{supplyDate}}</text>
+				</view>
+			</view>
 			<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="danger" v-if="obj.state == 'look'" @click="del">删除</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>
@@ -58,57 +58,31 @@
 	export default {
 		data() {
 			return {
+				shipInfo: {
+					voyageScheduleDataList: [{
+						spmName: "",
+						importExportFlagName: "",
+						tradeTypeName: ""
+					}]
+				},
 				obj: {},
+				supplyRow: {},
+				supplyRowIndex: 0,
 				// 航次下拉框
-				hcValue: "",
-				hcList: [{
-						value: 0,
-						text: "航次0"
-					},
-					{
-						value: 1,
-						text: "航次1"
-					},
-					{
-						value: 2,
-						text: "航次2"
-					},
-				],
-				// 船舶净吨
-				zlShip: 100,
+				vvyId: "",
+				vvyName: "",
+				hcList: [],
 				// 泊位下拉框
-				bwValue: "",
-				bwList: [{
-						value: 0,
-						text: "泊位0"
-					},
-					{
-						value: 1,
-						text: "泊位1"
-					},
-					{
-						value: 2,
-						text: "泊位2"
-					},
-				],
+				bthId: "",
+				bthIdName: "",
+				bwList: [],
 				// 供给类型
-				gjValue: "",
-				gjList: [{
-						value: 0,
-						text: "供给类型0"
-					},
-					{
-						value: 1,
-						text: "供给类型1"
-					},
-					{
-						value: 2,
-						text: "供给类型2"
-					},
-				],
-				gjNum: 10,
+				supplyTypeId: "",
+				supplyType: "",
+				gjList: [],
+				supplyAmount: 0,
 				// 日期
-				dateTime: "",
+				supplyDate: [""],
 			}
 		},
 		onLoad(options) {
@@ -117,18 +91,78 @@
 				this.obj = JSON.parse(decodeURIComponent(options.params))
 			}
 		},
+		mounted() {
+			if (this.obj.state == "edit" || this.obj.state == "look") {
+				this.getRow()
+			}
+			this.getShip()
+		},
 		methods: {
+			// 获取船只信息
+			getShip() {
+				this.shipInfo = uni.getStorageSync('shipInfo')
+				this.shipInfo.pubBerthesManageRespList.forEach((v, index) => {
+					this.bwList.push({
+						text: v.bthBthnm,
+						value: v.bthId
+					})
+				})
+				this.shipInfo.voyageScheduleDataList.forEach((v, index) => {
+					this.hcList.push({
+						text: v.vvyName,
+						value: v.vvyId
+					})
+				})
+				this.shipInfo.supplyTypeList.forEach((v, index) => {
+					this.gjList.push({
+						text: v.ptrDesc,
+						value: v.ptrCode
+					})
+				})
+			},
+			// 获取当前行信息
+			getRow() {
+				this.supplyRow = uni.getStorageSync('supplyRow');
+				this.supplyRowIndex = uni.getStorageSync('supplyRowIndex');
+				this.vvyId = this.supplyRow.vvyId
+				this.vvyName = this.supplyRow.vvyName
+				this.bthId = this.supplyRow.bthId
+				this.bthIdName = this.supplyRow.bthIdName
+				this.supplyTypeId = this.supplyRow.sssId
+				this.supplyType = this.supplyRow.supplyType
+				this.supplyAmount = this.supplyRow.supplyAmount
+				this.supplyDate = (this.supplyRow.supplyDate[0] ? this.supplyRow.supplyDate : '')
+			},
 			// 航次下拉
 			hcChange(e) {
-				this.hcValue = e;
+				this.vvyId = e;
+				this.hcList.forEach(v => {
+					if (v.value == e) {
+						this.vvyName = v.text
+					}
+				})
 			},
 			// 泊位下拉
 			bwChange(e) {
-				this.bwValue = e;
+				this.bthId = e;
+				this.bwList.forEach(v => {
+					if (v.value == e) {
+						this.bthIdName = v.text
+					}
+				})
 			},
-			// 攻击类型下拉
+			// 供给类型下拉
 			gjChange(e) {
-				this.bwValue = e;
+				this.supplyTypeId = e;
+				this.gjList.forEach(v => {
+					if (v.value == e) {
+						this.supplyType = v.text
+					}
+				})
+			},
+			// 日期选择
+			changeLog(e) {
+				this.attachTime = e.slice(0, e.length - 3)
 			},
 			// 取消
 			cancel() {
@@ -136,8 +170,45 @@
 					url: '/pages/shipWork/supply'
 				})
 			},
+			// 删除
+			del() {
+				let addSupplyArr = uni.getStorageSync('addSupplyArr')
+				addSupplyArr.splice(this.supplyRowIndex, 1)
+				uni.setStorageSync('addSupplyArr', addSupplyArr);
+				uni.navigateTo({
+					url: '/pages/shipWork/supply'
+				})
+			},
 			// 保存
 			save() {
+				let addSupplyArr = uni.getStorageSync('addSupplyArr')
+				let addSupplyObj = {
+					vvyId: this.vvyId,
+					vvyName: this.vvyName,
+					bthId: this.bthId,
+					bthIdName: this.bthIdName,
+					sssId: this.supplyTypeId,
+					supplyType: this.supplyType,
+					supplyAmount: this.supplyAmount,
+					supplyDate: this.supplyDate,
+					tradeTypeName: this.shipInfo.voyageScheduleDataList[0].tradeTypeName,
+					importExportFlagName: this.shipInfo.voyageScheduleDataList[0].importExportFlagName,
+					spmName: this.shipInfo.voyageScheduleDataList[0].spmName,
+				}
+
+				if (this.obj.state == "edit") {
+					addSupplyArr[this.supplyRowIndex] = addSupplyObj;
+					uni.setStorageSync('addSupplyArr', addSupplyArr);
+				} else if (this.obj.state == "add") {
+					if (addSupplyArr != "") {
+						addSupplyArr.push(addSupplyObj)
+						uni.setStorageSync('addSupplyArr', addSupplyArr);
+					} else {
+						addSupplyArr = []
+						addSupplyArr.push(addSupplyObj)
+						uni.setStorageSync('addSupplyArr', addSupplyArr);
+					}
+				}
 				uni.navigateTo({
 					url: '/pages/shipWork/supply'
 				})
@@ -159,12 +230,12 @@
 		.container {
 			padding: 30px 20px;
 
-			ul {
+			.ul {
 				display: flex;
 				flex-wrap: wrap;
 				justify-content: space-between;
 
-				li {
+				.li {
 					width: 44%;
 					border-top: 1px solid #ccc;
 					border-bottom: 1px solid #ccc;
diff --git a/pages/shipWork/untieAdd.vue b/pages/shipWork/untieAdd.vue
index 34e87ed..f291d21 100644
--- a/pages/shipWork/untieAdd.vue
+++ b/pages/shipWork/untieAdd.vue
@@ -13,9 +13,9 @@
 				</view>
 				<view class="li">
 					<p><text class="required" v-if="obj.state != 'look'">*</text>航次：</p>
-					<uni-data-select v-model="hcValue" :localdata="hcList" @change="hcChange"
+					<uni-data-select v-model="vvyId" :localdata="hcList" @change="hcChange"
 						v-if="obj.state != 'look'"></uni-data-select>
-					<text v-else>{{hcTextValue}}</text>
+					<text v-else>{{vvyName}}</text>
 				</view>
 				<view class="li">
 					<p>进出口：</p>
@@ -27,29 +27,29 @@
 				</view>
 				<view class="li">
 					<p><text class="required" v-if="obj.state != 'look'">*</text>泊位：</p>
-					<uni-data-select v-model="bwValue" :localdata="bwList" @change="bwChange"
+					<uni-data-select v-model="bthId" :localdata="bwList" @change="bwChange"
 						v-if="obj.state != 'look'"></uni-data-select>
-					<text v-else>{{bwTextValue}}</text>
+					<text v-else>{{bthIdName}}</text>
 				</view>
 				<view class="li">
 					<p><text class="required" v-if="obj.state != 'look'">*</text>系缆时间：</p>
-					<uni-datetime-picker v-model="xlTime" @change="changeLog1" v-if="obj.state != 'look'" />
-					<text v-else>{{xlTime}}</text>
+					<uni-datetime-picker v-model="attachTime" @change="changeLog1" v-if="obj.state != 'look'" />
+					<text v-else>{{attachTime}}</text>
 				</view>
 				<view class="li">
 					<p>解缆时间：</p>
-					<uni-datetime-picker v-model="jlTime" @change="changeLog2" v-if="obj.state != 'look'" />
-					<text v-else>{{jlTime}}</text>
+					<uni-datetime-picker v-model="unmoorTime" @change="changeLog2" v-if="obj.state != 'look'" />
+					<text v-else>{{unmoorTime}}</text>
 				</view>
 				<view class="li">
 					<p>移泊时间：</p>
-					<uni-datetime-picker v-model="ybTime" @change="changeLog3" v-if="obj.state != 'look'" />
-					<text v-else>{{ybTime}}</text>
+					<uni-datetime-picker v-model="shiftingBerthTime" @change="changeLog3" v-if="obj.state != 'look'" />
+					<text v-else>{{shiftingBerthTime}}</text>
 				</view>
 				<view class="li">
 					<p>停泊时间：</p>
-					<uni-datetime-picker v-model="tbTime" @change="changeLog4" v-if="obj.state != 'look'" />
-					<text v-else>{{tbTime}}</text>
+					<uni-datetime-picker v-model="noProductBerthTime" @change="changeLog4" v-if="obj.state != 'look'" />
+					<text v-else>{{noProductBerthTime}}</text>
 				</view>
 			</view>
 			<view class="btnList">
@@ -77,30 +77,29 @@
 				untieRow: {},
 				untieRowIndex: 0,
 				// 航次下拉框
-				hcValue: "",
-				hcTextValue: "",
+				vvyId: "",
+				vvyName: "",
 				hcList: [],
 				// 船舶净吨
 				zlShip: 0,
 				// 泊位下拉框
-				bwValue: "",
-				bwTextValue: "",
+				bthId: "",
+				bthIdName: "",
 				bwList: [],
 				// 系缆时间
-				xlTime: [''],
+				attachTime: [''],
 				// 解缆时间
-				jlTime: [''],
+				unmoorTime: [''],
 				// 移泊时间
-				ybTime: [''],
+				shiftingBerthTime: [''],
 				// 停泊时间
-				tbTime: [''],
+				noProductBerthTime: [''],
 			}
 		},
 		onLoad(options) {
 			if ('params' in options) {
 				// 获取传递的对象参数，使用decodeURIComponent解码，并转为对象
 				this.obj = JSON.parse(decodeURIComponent(options.params))
-				console.log(this.obj)
 			}
 		},
 		mounted() {
@@ -130,51 +129,49 @@
 			getRow() {
 				this.untieRow = uni.getStorageSync('untieRow');
 				this.untieRowIndex = uni.getStorageSync('untieRowIndex');
-				console.log(this.untieRow)
-				console.log(this.untieRowIndex)
-				this.hcValue = this.untieRow.vvyId
-				this.hcTextValue = this.untieRow.vvyName
+				this.vvyId = this.untieRow.vvyId
+				this.vvyName = this.untieRow.vvyName
 				this.zlShip = this.untieRow.zlShip
-				this.bwValue = this.untieRow.bthId
-				this.bwTextValue = this.untieRow.bthIdName
-				this.xlTime = this.untieRow.xlTime
-				this.jlTime = this.untieRow.jlTime
-				this.ybTime = this.untieRow.ybTime
-				this.tbTime = this.untieRow.tbTime
+				this.bthId = this.untieRow.bthId
+				this.bthIdName = this.untieRow.bthIdName
+				this.attachTime = (this.untieRow.attachTime[0] ? this.untieRow.attachTime : '')
+				this.unmoorTime = (this.untieRow.unmoorTime[0] ? this.untieRow.unmoorTime : '')
+				this.shiftingBerthTime = (this.untieRow.shiftingBerthTime[0] ? this.untieRow.shiftingBerthTime : '')
+				this.noProductBerthTime = (this.untieRow.noProductBerthTime[0] ? this.untieRow.noProductBerthTime : '')
 			},
 			// 航次下拉
 			hcChange(e) {
-				this.hcValue = e;
+				this.vvyId = e;
 				this.hcList.forEach(v => {
 					if (v.value == e) {
-						this.hcTextValue = v.text
+						this.vvyName = v.text
 					}
 				})
 			},
 			// 泊位下拉
 			bwChange(e) {
-				this.bwValue = e;
+				this.bthId = e;
 				this.bwList.forEach(v => {
 					if (v.value == e) {
-						this.bwTextValue = v.text
+						this.bthIdName = v.text
 					}
 				})
 			},
 			// 系缆时间
 			changeLog1(e) {
-				this.xlTime = e.slice(0, e.length - 3)
+				this.attachTime = e.slice(0, e.length - 3)
 			},
 			// 解缆时间
 			changeLog2(e) {
-				this.jlTime = e.slice(0, e.length - 3)
+				this.unmoorTime = e.slice(0, e.length - 3)
 			},
 			// 移泊时间
 			changeLog3(e) {
-				this.ybTime = e.slice(0, e.length - 3)
+				this.shiftingBerthTime = e.slice(0, e.length - 3)
 			},
 			// 停泊时间
 			changeLog4(e) {
-				this.tbTime = e.slice(0, e.length - 3)
+				this.noProductBerthTime = e.slice(0, e.length - 3)
 			},
 			// 取消
 			cancel() {
@@ -196,17 +193,17 @@
 				let addUntieArr = uni.getStorageSync('addUntieArr')
 				let addUntieObj = {
 					zlShip: this.zlShip,
-					vvyId: this.hcValue,
-					vvyName: this.hcTextValue,
-					bthId: this.bwValue,
-					bthIdName: this.bwTextValue,
+					vvyId: this.vvyId,
+					vvyName: this.vvyName,
+					bthId: this.bthId,
+					bthIdName: this.bthIdName,
 					tradeTypeName: this.shipInfo.voyageScheduleDataList[0].tradeTypeName,
 					importExportFlagName: this.shipInfo.voyageScheduleDataList[0].importExportFlagName,
 					spmName: this.shipInfo.voyageScheduleDataList[0].spmName,
-					xlTime: this.xlTime,
-					jlTime: this.jlTime,
-					ybTime: this.ybTime,
-					tbTime: this.tbTime
+					attachTime: this.attachTime,
+					unmoorTime: this.unmoorTime,
+					shiftingBerthTime: this.shiftingBerthTime,
+					noProductBerthTime: this.noProductBerthTime
 				}
 
 				if (this.obj.state == "edit") {
diff --git a/pages/shipWork/untieCord.vue b/pages/shipWork/untieCord.vue
index 24e0351..386973e 100644
--- a/pages/shipWork/untieCord.vue
+++ b/pages/shipWork/untieCord.vue
@@ -3,12 +3,12 @@
 		<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.spmName}}</view>
+					<view class="title">航次：{{item.vvyName}}</view>
 					<p>状态：未上传</p>
 					<p>进出口：{{item.importExportFlagName}}</p>
 					<p>贸易类型：{{item.tradeTypeName}}</p>
 					<p>泊位：{{item.bthIdName}}</p>
-					<p>系缆时间：{{item.xlTime}}</p>
+					<p>系缆时间：{{item.attachTime}}</p>
 				</view>
 			</view>
 			<view class="addBtn" @click="add('add')">+ 新增</view>
@@ -27,13 +27,13 @@
 		mounted() {
 			this.shipInfo = uni.getStorageSync('shipInfo')
 			this.infoList = uni.getStorageSync('addUntieArr')
-			console.log(this.shipInfo)
-			console.log(this.infoList)
 		},
 		methods: {
 			add(state, item, index) {
-				uni.setStorageSync('untieRow', item);
-				uni.setStorageSync('untieRowIndex', index);
+				if (state != 'add') {
+					uni.setStorageSync('untieRow', item);
+					uni.setStorageSync('untieRowIndex', index);
+				}
 				const obj = {
 					state: state,
 				}
diff --git a/pages/shipWork/workAssign.vue b/pages/shipWork/workAssign.vue
index ffae9e1..d9ddf7b 100644
--- a/pages/shipWork/workAssign.vue
+++ b/pages/shipWork/workAssign.vue
@@ -1,15 +1,15 @@
 <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="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>
 			<view class="addBtn" @click="add('add')">+ 新增</view>
 		</view>
 	</view>
@@ -19,29 +19,20 @@
 	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",
-				}]
+				shipInfo: {},
+				infoList: []
 			}
 		},
+		mounted() {
+			this.shipInfo = uni.getStorageSync('shipInfo')
+			this.infoList = uni.getStorageSync('addAssignArr')
+		},
 		methods: {
-			add(state) {
+			add(state, item, index) {
+				if (state != 'add') {
+					uni.setStorageSync('assignRow', item);
+					uni.setStorageSync('assignRowIndex', index);
+				}
 				const obj = {
 					state: state,
 				}
@@ -59,10 +50,10 @@
 		.container {
 			padding: 30px 20px;
 
-			ul {
+			.ul {
 				padding: 20px 0;
 
-				li {
+				.li {
 					display: flex;
 					justify-content: space-between;
 					border-bottom: 1px solid #ccc;
diff --git a/pages/shipWork/workAssignAdd.vue b/pages/shipWork/workAssignAdd.vue
index 3d941ad..70a22d2 100644
--- a/pages/shipWork/workAssignAdd.vue
+++ b/pages/shipWork/workAssignAdd.vue
@@ -1,69 +1,68 @@
 <template>
 	<view class="workAssignAdd">
 		<view class="container">
-			<ul>
-				<li>
+			<view class="ul">
+				<view class="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"
+					<text>{{shipInfo.voyageScheduleDataList[0].spmName}}</text>
+				</view>
+				<view class="li">
+					<p><text class="required" v-if="obj.state != 'look'">*</text>航次：</p>
+					<uni-data-select v-model="vvyId" :localdata="hcList" @change="hcChange"
 						v-if="obj.state != 'look'"></uni-data-select>
-					<span v-else>CK98796</span>
-				</li>
-				<li>
+					<text v-else>{{vvyName}}</text>
+				</view>
+				<view class="li">
 					<p>进出口：</p>
-					<span>进口</span>
-				</li>
-				<li>
+					<text>{{shipInfo.voyageScheduleDataList[0].importExportFlagName}}</text>
+				</view>
+				<view class="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"
+					<text>{{shipInfo.voyageScheduleDataList[0].tradeTypeName}}</text>
+				</view>
+				<view class="li">
+					<p><text class="required" v-if="obj.state != 'look'">*</text>泊位：</p>
+					<uni-data-select v-model="bthId" :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"
+					<text v-else>{{bthIdName}}</text>
+				</view>
+				<view class="li">
+					<p><text class="required" v-if="obj.state != 'look'">*</text>工班：</p>
+					<uni-data-select v-model="pwcTypeId" :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"
+					<text v-else>{{pwcType}}</text>
+				</view>
+				<view class="li">
+					<p><text class="required" v-if="obj.state != 'look'">*</text>人数：</p>
+					<uni-number-box v-model="personNumber" v-if="obj.state != 'look'" />
+					<text v-else>{{personNumber}}</text>
+				</view>
+				<view class="li">
+					<p><text class="required" v-if="obj.state != 'look'">*</text>装卸类型：</p>
+					<uni-data-select v-model="loaderTypeId" :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>
+					<text v-else>{{loaderType}}</text>
+				</view>
+				<view class="li">
+					<p><text class="required" v-if="obj.state != 'look'">*</text>车辆数量：</p>
+					<uni-number-box v-model="vehicleSize" v-if="obj.state != 'look'" />
+					<text v-else>{{vehicleSize}}</text>
+				</view>
+				<view class="li">
+					<p><text class="required" v-if="obj.state != 'look'">*</text>备件数量：</p>
+					<uni-number-box v-model="sparePart" v-if="obj.state != 'look'" />
+					<text v-else>{{sparePart}}</text>
+				</view>
+				<view class="li">
+					<p><text class="required" v-if="obj.state != 'look'">*</text>作业时间：</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>
+					<text v-else>{{startTime}} - {{endTime}}</text>
+				</view>
+			</view>
 			<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="danger" v-if="obj.state == 'look'" @click="del">删除</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>
@@ -75,77 +74,42 @@
 	export default {
 		data() {
 			return {
+				shipInfo: {
+					voyageScheduleDataList: [{
+						spmName: "",
+						importExportFlagName: "",
+						tradeTypeName: ""
+					}]
+				},
 				obj: {},
+				assignRow: {},
+				assignRowIndex: {},
 				// 航次下拉框
-				hcValue: "",
-				hcList: [{
-						value: 0,
-						text: "航次0"
-					},
-					{
-						value: 1,
-						text: "航次1"
-					},
-					{
-						value: 2,
-						text: "航次2"
-					},
-				],
-				// 船舶净吨
-				zlShip: 100,
+				vvyId: "",
+				vvyName: "",
+				hcList: [],
 				// 泊位下拉框
-				bwValue: "",
-				bwList: [{
-						value: 0,
-						text: "泊位0"
-					},
-					{
-						value: 1,
-						text: "泊位1"
-					},
-					{
-						value: 2,
-						text: "泊位2"
-					},
-				],
+				bthId: "",
+				bthIdName: "",
+				bwList: [],
 				// 工班下拉框
-				gbValue: "",
-				gbList: [{
-						value: 0,
-						text: "工班0"
-					},
-					{
-						value: 1,
-						text: "工班1"
-					},
-					{
-						value: 2,
-						text: "工班2"
-					},
-				],
+				pwcTypeId: "",
+				pwcType: "",
+				gbList: [],
 				// 人数
-				peopleNum: 0,
+				personNumber: 0,
 				// 装卸类型下拉框
-				zxValue: "",
-				zxList: [{
-						value: 0,
-						text: "装卸类型0"
-					},
-					{
-						value: 1,
-						text: "装卸类型1"
-					},
-					{
-						value: 2,
-						text: "装卸类型2"
-					},
-				],
+				loaderTypeId: "",
+				loaderType: "",
+				zxList: [],
 				// 车辆数量
-				carNum: 0,
+				vehicleSize: 0,
 				// 备件数量
-				partsNum: 0,
+				sparePart: 0,
 				// 作业时间
-				workTime: "",
+				workTime: ['', ''],
+				startTime: "",
+				endTime: "",
 			}
 		},
 		onLoad(options) {
@@ -154,22 +118,105 @@
 				this.obj = JSON.parse(decodeURIComponent(options.params))
 			}
 		},
+		mounted() {
+			if (this.obj.state == 'edit' || this.obj.state == 'look') {
+				this.getRow();
+			}
+			this.getShip()
+		},
 		methods: {
+			// 获取船只信息
+			getShip() {
+				this.shipInfo = uni.getStorageSync('shipInfo')
+				// 航次数据
+				this.shipInfo.voyageScheduleDataList.forEach((v, index) => {
+					this.hcList.push({
+						text: v.vvyName,
+						value: v.vvyId
+					})
+				})
+				// 装卸类型数据
+				this.shipInfo.handTypeList.forEach((v, index) => {
+					this.zxList.push({
+						text: v.ptrDesc,
+						value: v.ptrCode
+					})
+				})
+				// 工班数据
+				this.shipInfo.shipmentBasicShiftList.forEach((v, index) => {
+					this.gbList.push({
+						text: v.pwcTypeDesc,
+						value: v.pwcId
+					})
+				})
+				// 泊位数据
+				this.shipInfo.pubBerthesManageRespList.forEach((v, index) => {
+					this.bwList.push({
+						text: v.bthBthnm,
+						value: v.bthId
+					})
+				})
+			},
+			// 获取当前行信息
+			getRow() {
+				this.assignRow = uni.getStorageSync('assignRow');
+				this.assignRowIndex = uni.getStorageSync('assignRowIndex');
+				this.vvyId = this.assignRow.vvyId
+				this.vvyName = this.assignRow.vvyName
+				this.bthId = this.assignRow.bthId
+				this.bthIdName = this.assignRow.bthIdName
+				this.pwcTypeId = this.assignRow.pwcTypeId
+				this.pwcType = this.assignRow.pwcType
+				this.personNumber = this.assignRow.personNumber
+				this.loaderTypeId = this.assignRow.loaderTypeId
+				this.loaderType = this.assignRow.loaderType
+				this.vehicleSize = this.assignRow.vehicleSize
+				this.sparePart = this.assignRow.sparePart
+				this.workTime = this.assignRow.workTime
+				this.startTime = this.assignRow.startTime
+				this.endTime = this.assignRow.endTime
+			},
 			// 航次下拉
 			hcChange(e) {
-				this.hcValue = e;
+				this.vvyId = e;
+				this.hcList.forEach(v => {
+					if (v.value == e) {
+						this.vvyName = v.text
+					}
+				})
 			},
 			// 泊位下拉
 			bwChange(e) {
-				this.bwValue = e;
+				this.bthId = e;
+				this.bwList.forEach(v => {
+					if (v.value == e) {
+						this.bthIdName = v.text
+					}
+				})
 			},
 			// 工班下拉
 			gbChange(e) {
-				this.gbValue = e;
+				this.pwcTypeId = e;
+				this.gbList.forEach(v => {
+					if (v.value == e) {
+						this.pwcType = v.text
+					}
+				})
 			},
 			// 装卸类型下拉
 			zxChange(e) {
-				this.zxValue = e;
+				this.loaderTypeId = e;
+				this.zxList.forEach(v => {
+					if (v.value == e) {
+						this.loaderType = v.text
+					}
+				})
+			},
+			// 作业时间
+			changeLog(e) {
+				this.workTime = e
+				this.startTime = this.workTime[0].slice(0, this.workTime[0].length - 3)
+				this.endTime = this.workTime[1].slice(0, this.workTime[1].length - 3)
 			},
 			// 取消
 			cancel() {
@@ -177,8 +224,50 @@
 					url: '/pages/shipWork/workAssign'
 				})
 			},
+			// 删除
+			del() {
+				let addAssignArr = uni.getStorageSync('addAssignArr')
+				addAssignArr.splice(this.assignRowIndex, 1)
+				uni.setStorageSync('addAssignArr', addAssignArr);
+				uni.navigateTo({
+					url: '/pages/shipWork/workAssign'
+				})
+			},
 			// 保存
 			save() {
+				let addAssignArr = uni.getStorageSync('addAssignArr')
+				let addAssignObj = {
+					vvyId: this.vvyId,
+					vvyName: this.vvyName,
+					bthId: this.bthId,
+					bthIdName: this.bthIdName,
+					pwcTypeId: this.pwcTypeId,
+					pwcType: this.pwcType,
+					personNumber: this.personNumber,
+					loaderTypeId: this.loaderTypeId,
+					loaderType: this.loaderType,
+					vehicleSize: this.vehicleSize,
+					sparePart: this.sparePart,
+					workTime: this.workTime,
+					startTime: this.startTime,
+					endTime: this.endTime,
+					tradeTypeName: this.shipInfo.voyageScheduleDataList[0].tradeTypeName,
+					importExportFlagName: this.shipInfo.voyageScheduleDataList[0].importExportFlagName,
+					spmName: this.shipInfo.voyageScheduleDataList[0].spmName,
+				}
+				if (this.obj.state == "edit") {
+					addAssignArr[this.assignRowIndex] = addAssignObj;
+					uni.setStorageSync('addAssignArr', addAssignArr);
+				} else if (this.obj.state == "add") {
+					if (addAssignArr != "") {
+						addAssignArr.push(addAssignObj)
+						uni.setStorageSync('addAssignArr', addAssignArr);
+					} else {
+						addAssignArr = []
+						addAssignArr.push(addAssignObj)
+						uni.setStorageSync('addAssignArr', addAssignArr);
+					}
+				}
 				uni.navigateTo({
 					url: '/pages/shipWork/workAssign'
 				})
@@ -200,12 +289,12 @@
 		.container {
 			padding: 30px 20px;
 
-			ul {
+			.ul {
 				display: flex;
 				flex-wrap: wrap;
 				justify-content: space-between;
 
-				li {
+				.li {
 					width: 44%;
 					border-top: 1px solid #ccc;
 					border-bottom: 1px solid #ccc;