diff --git a/common/createDataTable.js b/common/createDataTable.js
index 2e17f3f..30de7ca 100644
--- a/common/createDataTable.js
+++ b/common/createDataTable.js
@@ -98,7 +98,7 @@ module.exports = {
 	// 创建工班信息翻仓 retallyMessageRespList
 	createRetallyMessageRespList() {
 		let sql =
-			'CREATE TABLE if not exists retallyMessageRespList ("webId" text NOT NULL,"vtpId" text,"contactId" text,"aId" text,"reyVvyId" text,"vvyName" text,"retallyType" text,"retallyTypeName" text,"retallyOrigin" text,"retallyTerminus" text,"retallyStartTime" text,"retallyEndTime" text,"carType" text,"carTypeName" text,"goodsNumber" text,"goodsVolume" text,"goodsWeight" text,"mafiGroupNum" text,"editStatus" text,"webStatus" text,"webDate" text, PRIMARY KEY("webId"));'
+			'CREATE TABLE if not exists retallyMessageRespList ("webId" text NOT NULL,"vtpId" text,"contactId" text,"aId" text,"reyVvyId" text,"vvyName" text,"retallyType" text,"retallyTypeName" text,"retallyOrigin" text,"retallyTerminus" text,"retallyStartTime" text,"retallyEndTime" text,"carType" text,"carTypeName" text,"goodsNumber" text,"goodsVolume" text,"goodsWeight" text,"mafiGroupNum" text,"mafiSize" text,"editStatus" text,"webStatus" text,"webDate" text, PRIMARY KEY("webId"));'
 		this.executeSql(sql)
 	},
 	// 创建工班信息其他 infoRespList
diff --git a/components/head-info/head-info.vue b/components/head-info/head-info.vue
index 7d9a371..e0957f6 100644
--- a/components/head-info/head-info.vue
+++ b/components/head-info/head-info.vue
@@ -9,10 +9,10 @@
 				</view>
 				<view class="navList">
 					<template v-for="(item,index) in navList">
-						<navigator :key="index" :url="item.url" open-type="redirect" class="item">
+						<navigator :key="index" :url="item.path" open-type="redirect" class="item" @click="changeNav(index)">
 							<view class="itemInfo" :class="item.type?'navActive':''">
-								<image :src="item.imageUrl" mode="widthFix" v-if="item.type"></image>
-								<image :src="item.imageUrl2" mode="widthFix" v-if="!item.type"></image>
+								<image :src="item.icon" mode="widthFix" v-if="item.type"></image>
+								<image :src="item.smpId" mode="widthFix" v-if="!item.type"></image>
 								<text>{{item.name}}</text>
 							</view>
 						</navigator>
@@ -89,45 +89,46 @@
 				portName: "",
 				activeIndex: 0,
 				mediaType: "pad",
-				navList: [{
-						url: "/pages/index/index",
-						name: "装船指令",
-						type: false,
-						imageUrl: "../../static/images/theme/zcIcon1-1.png",
-						imageUrl2: "../../static/images/theme/zcIcon1-2.png"
-					},
-					{
-						url: "/pages/discharge/index",
-						name: "卸船指令",
-						type: false,
-						imageUrl: "../../static/images/theme/xcIcon1-1.png",
-						imageUrl2: "../../static/images/theme/xcIcon1-2.png"
-					}, {
-						url: "/pages/shipWork/index",
-						name: "船舶作业",
-						type: false,
-						imageUrl: "../../static/images/theme/cbIcon1-1.png",
-						imageUrl2: "../../static/images/theme/cbIcon1-2.png"
-					}, {
-						url: "/pages/quality/index",
-						name: "残损信息",
-						type: false,
-						imageUrl: "../../static/images/theme/csIcon1-1.png",
-						imageUrl2: "../../static/images/theme/csIcon1-2.png"
-					}, {
-						url: "/pages/monitor/index",
-						name: "场位管控",
-						type: false,
-						imageUrl: "../../static/images/theme/jcIcon1-1.png",
-						imageUrl2: "../../static/images/theme/jcIcon1-2.png"
-					},
-					{
-						url: "/pages/receipt/index",
-						name: "进出口货物交接单",
-						type: false,
-						imageUrl: "../../static/images/theme/jckIcon1-1.png",
-						imageUrl2: "../../static/images/theme/jckIcon1-2.png"
-					}
+				navList: [
+					// {
+					// 	url: "/pages/index/index",
+					// 	name: "装船指令",
+					// 	type: false,
+					// 	imageUrl: "../../static/images/theme/zcIcon1-1.png",
+					// 	imageUrl2: "../../static/images/theme/zcIcon1-2.png"
+					// },
+					// {
+					// 	url: "/pages/discharge/index",
+					// 	name: "卸船指令",
+					// 	type: false,
+					// 	imageUrl: "../../static/images/theme/xcIcon1-1.png",
+					// 	imageUrl2: "../../static/images/theme/xcIcon1-2.png"
+					// }, {
+					// 	url: "/pages/shipWork/index",
+					// 	name: "船舶作业",
+					// 	type: false,
+					// 	imageUrl: "../../static/images/theme/cbIcon1-1.png",
+					// 	imageUrl2: "../../static/images/theme/cbIcon1-2.png"
+					// }, {
+					// 	url: "/pages/quality/index",
+					// 	name: "残损信息",
+					// 	type: false,
+					// 	imageUrl: "../../static/images/theme/csIcon1-1.png",
+					// 	imageUrl2: "../../static/images/theme/csIcon1-2.png"
+					// }, {
+					// 	url: "/pages/monitor/index",
+					// 	name: "场位管控",
+					// 	type: false,
+					// 	imageUrl: "../../static/images/theme/jcIcon1-1.png",
+					// 	imageUrl2: "../../static/images/theme/jcIcon1-2.png"
+					// },
+					// {
+					// 	url: "/pages/receipt/index",
+					// 	name: "进出口货物交接单",
+					// 	type: false,
+					// 	imageUrl: "../../static/images/theme/jckIcon1-1.png",
+					// 	imageUrl2: "../../static/images/theme/jckIcon1-2.png"
+					// }
 				],
 				lotusLoadingData: {
 					isShow: false //设置显示加载中组件true显示false隐藏
@@ -145,13 +146,26 @@
 			},
 		},
 		mounted() {
+			this.navList = uni.getStorageSync('qxList')
+			this.navList.map(item => {
+				item.type = false
+				if(item.name == '装船指令') {
+					item.path = '/pages/index/index'
+					item.icon = '../../static/images/theme/zcIcon1-1.png'
+					item.smpId = '../../static/images/theme/zcIcon1-2.png'
+				}
+				return item
+			})
 			this.loginObj = uni.getStorageSync('loginObj')
 			this.initData()
 			this.activeIndex = uni.getStorageSync("selectPortIndex")
-			this.navList[this.navIndex].type = true
+			this.navList[uni.getStorageSync("navIndex")].type = true
 			this.getUser()
 		},
 		methods: {
+			changeNav(index) {
+				uni.setStorageSync("navIndex",index)
+			},
 			// 获取用户信息
 			getUser() {
 				uni.request({
diff --git a/pages/discharge/instruct.vue b/pages/discharge/instruct.vue
index 8d58807..6cef91a 100644
--- a/pages/discharge/instruct.vue
+++ b/pages/discharge/instruct.vue
@@ -1156,6 +1156,14 @@
 			},
 			// 点击指令下发
 			distribute(type, a, item) {
+				if(a == 'solo' && this.checkList.length == 0) {
+					uni.showModal({
+						title: '提示',
+						showCancel: false,
+						content: '请选择分指令！'
+					})
+					return
+				}
 				this.delValue = false
 				this.distributeType = a
 				this.$refs.popup.open(type)
diff --git a/pages/index/domesticTrade.vue b/pages/index/domesticTrade.vue
index c7c7d15..b1fd3e1 100644
--- a/pages/index/domesticTrade.vue
+++ b/pages/index/domesticTrade.vue
@@ -996,6 +996,14 @@
 			},
 			// 点击指令下发
 			distribute(type, a, item) {
+				if(a == 'solo' && this.checkList.length == 0) {
+					uni.showModal({
+						title: '提示',
+						showCancel: false,
+						content: '请选择分指令！'
+					})
+					return
+				}
 				this.distributeType = a
 				this.$refs.popup.open(type)
 				if (a == 'again' || a == 'solo') {
diff --git a/pages/index/instruct.vue b/pages/index/instruct.vue
index 8661f2a..88bf35f 100644
--- a/pages/index/instruct.vue
+++ b/pages/index/instruct.vue
@@ -1358,6 +1358,14 @@
 			},
 			// 点击指令下发
 			distribute(type, a, item) {
+				if(a == 'solo' && this.checkList.length == 0) {
+					uni.showModal({
+						title: '提示',
+						showCancel: false,
+						content: '请选择分指令！'
+					})
+					return
+				}
 				this.delValue = false
 				this.distributeType = a
 				this.$refs.popup.open(type)
diff --git a/pages/login/index.vue b/pages/login/index.vue
index 7d3fa1d..2f754af 100644
--- a/pages/login/index.vue
+++ b/pages/login/index.vue
@@ -203,9 +203,6 @@
 							uni.setStorageSync('selectPortIndex', this.activeIndex)
 							this.$refs.popup.close()
 							this.qxdata()
-							uni.navigateTo({
-								url: '/pages/index/index'
-							})
 							this.open()
 							this.createTable()
 						} else {
@@ -230,6 +227,10 @@
 					method: 'GET', //请求方式，必须为大写
 					success: (res) => {
 						uni.setStorageSync('qxList', res.data.data);
+						uni.setStorageSync("navIndex",0)
+						uni.navigateTo({
+							url: '/pages/index/index'
+						})
 					},
 				})
 			},
diff --git a/pages/shipWork/index.vue b/pages/shipWork/index.vue
index 2c0b556..dfa6c4a 100644
--- a/pages/shipWork/index.vue
+++ b/pages/shipWork/index.vue
@@ -245,7 +245,7 @@
 			},
 			dropTable() {
 				console.log('删除表');
-				let sql = 'DROP TABLE workMessageRespInfoList'
+				let sql = 'DROP TABLE workSignTable'
 				this.executeSql(sql)
 			},
 			dropData() {
@@ -629,7 +629,7 @@
 												`insert into retallyMessageRespList values('${v.reyId}','${this.vtpId}','${this.downloadData.shipmentShipManage.spmId}','${aId}',
 														'${v.reyVvyId}','${v.reyVvyName}','${v.retallyType}','${v.retallyTypeName}','${v.retallyOrigin}','${v.retallyTerminus}',
 														'${v.retallyStartTime}','${v.retallyEndTime}','${v.carType}','${v.carTypeName}',
-														'${v.goodsNumber}','${v.goodsVolume}','${v.goodsWeight}','${v.mafiGroupNum}','${editStatus}','${webStatus}','${webDate}')`
+														'${v.goodsNumber}','${v.goodsVolume}','${v.goodsWeight}','${v.mafiGroupNum}','${v.mafiSize}','${editStatus}','${webStatus}','${webDate}')`
 											this.executeSql(sql)
 										})
 									}
@@ -1168,6 +1168,7 @@
 			// 查
 			executeSql1(tableName, id) {
 				let sql = `select * from ${tableName}  WHERE vtpId = '${id}';`
+				// if(tableName == 'workSignTable') sql = `SELECT webId,vtpId,strftime('%Y-%m-%d', bizId) as bizId,signFile,bizType,sort,vvyId,webDate FROM workSignTable t WHERE vtpId='${id}';`
 				this.executeSql(sql, tableName)
 			},
 			toGo(item) {
diff --git a/pages/shipWork/mixSign.vue b/pages/shipWork/mixSign.vue
index 34a14c4..96883f6 100644
--- a/pages/shipWork/mixSign.vue
+++ b/pages/shipWork/mixSign.vue
@@ -1085,7 +1085,9 @@ export default {
 		},
 		// 查单证签字表
 		executeSql5() {
-			let sql = `select * from workSignTable WHERE bizId = '${this.dateId}';`
+			let signId = this.dateId.split('-')
+			signId = signId[0] + signId[1] + signId[2]
+			let sql = `select * from workSignTable WHERE bizId = '${signId}';`
 			sqlite.executeSqlCeshi(sql).then((value) => {
 				// 在resolve时执行的回调函数
 				let zdyList = []
diff --git a/pages/shipWork/shiftAdd.vue b/pages/shipWork/shiftAdd.vue
index 7109fad..5691569 100644
--- a/pages/shipWork/shiftAdd.vue
+++ b/pages/shipWork/shiftAdd.vue
@@ -266,6 +266,10 @@
 									<p class="liTitle"><text class="required">*</text>组数：</p>
 									<uni-number-box v-model="item.mafiGroupNum" :max="1000000000" />
 								</view>
+								<view class="li" v-if="item.mfType">
+									<p class="liTitle"><text class="required">*</text>尺码：</p>
+									<uni-number-box v-model="item.mafiSize" :max="1000000000" />
+								</view>
 								<view class="li">
 									<p class="liTitle"><text class="required" v-if="!item.mfType">*</text>体积：</p>
 									<uni-number-box v-model="item.goodsVolume" :max="1000000000" />
@@ -1731,7 +1735,7 @@
 											retallyStartTime = '${this.fcUlList[i].retallyStartTime}', retallyEndTime = '${this.fcUlList[i].retallyEndTime}', 
 											carType = '${this.fcUlList[i].carType}',carTypeName = '${this.fcUlList[i].carTypeName}',
 											goodsNumber = '${this.fcUlList[i].goodsNumber}', goodsVolume = '${this.fcUlList[i].goodsVolume}',
-											goodsWeight = '${this.fcUlList[i].goodsWeight}',mafiGroupNum = '${this.fcUlList[i].mafiGroupNum}', webStatus = '${webStatus}', 
+											goodsWeight = '${this.fcUlList[i].goodsWeight}',mafiGroupNum = '${this.fcUlList[i].mafiGroupNum}', mafiSize = '${this.fcUlList[i].mafiSize}',webStatus = '${webStatus}',
 											webDate = '${webDate}' WHERE webId = '${this.fcUlList[i].webId}';`
 								this.executeSql(sql)
 							} else {
@@ -1742,7 +1746,7 @@
 										'${this.fcUlList[i].retallyTypeName}','${this.fcUlList[i].retallyOrigin}','${this.fcUlList[i].retallyTerminus}',
 										'${this.fcUlList[i].retallyStartTime}','${this.fcUlList[i].retallyEndTime}','${this.fcUlList[i].carType}',
 										'${this.fcUlList[i].carTypeName}','${this.fcUlList[i].goodsNumber}','${this.fcUlList[i].goodsVolume}',
-										'${this.fcUlList[i].goodsWeight}','${this.fcUlList[i].mafiGroupNum}','${editStatus}','${webStatus}','${webDate}')`
+										'${this.fcUlList[i].goodsWeight}','${this.fcUlList[i].mafiGroupNum}','${this.fcUlList[i].mafiSize}','${editStatus}','${webStatus}','${webDate}')`
 								this.executeSql(sql)
 							}
 						}
@@ -1825,7 +1829,7 @@
 									'${this.fcUlList[i].retallyTypeName}','${this.fcUlList[i].retallyOrigin}','${this.fcUlList[i].retallyTerminus}',
 									'${this.fcUlList[i].retallyStartTime}','${this.fcUlList[i].retallyEndTime}','${this.fcUlList[i].carType}',
 									'${this.fcUlList[i].carTypeName}','${this.fcUlList[i].goodsNumber}','${this.fcUlList[i].goodsVolume}',
-									'${this.fcUlList[i].goodsWeight}','${this.fcUlList[i].mafiGroupNum}','${editStatus}','${webStatus}','${webDate}')`
+									'${this.fcUlList[i].goodsWeight}','${this.fcUlList[i].mafiGroupNum}','${this.fcUlList[i].mafiSize}','${editStatus}','${webStatus}','${webDate}')`
 								this.executeSql(sql)
 							}
 							// 其他信息
diff --git a/pages/shipWork/sign.vue b/pages/shipWork/sign.vue
index 476987f..894c6f2 100644
--- a/pages/shipWork/sign.vue
+++ b/pages/shipWork/sign.vue
@@ -182,6 +182,11 @@
 											  	console.error(error);
 											  });
 										    }
+											// 去除签名 - 
+											if(that.nextUrl == 'mixSign') {
+												signId = signId.split('-')
+												signId = signId[0] + signId[1] + signId[2]
+											}
 											let sql =
 												`insert into workSignTable values('${webId}','${that.vtpId}','${signId}','${that.signImgUrl}','${that.signTable}','${that.signType}','${that.vvyId}','${webDate}')`
 											sqlite.executeSqlCeshi(sql).then((
diff --git a/pages/shipWork/untieAdd.vue b/pages/shipWork/untieAdd.vue
index c1c3326..7ff352b 100644
--- a/pages/shipWork/untieAdd.vue
+++ b/pages/shipWork/untieAdd.vue
@@ -34,7 +34,7 @@
 						<text v-else>{{bthIdName}}</text>
 					</view>
 					<view class="li">
-						<p><text class="required" v-if="obj.state != 'look'">*</text>系缆时间：</p>
+						<p>系缆时间：</p>
 						<uni-datetime-picker v-model="attachTime" @change="changeLog1" v-if="obj.state != 'look'"
 							:border="false" />
 						<text v-else>{{attachTime}}</text>
@@ -326,14 +326,6 @@
 					})
 					return
 				}
-				if (this.attachTime == "") {
-					uni.showModal({
-						title: '提示',
-						showCancel: false,
-						content: '请输入系揽时间！'
-					})
-					return
-				}
 				let date = new Date().getTime()
 				let sauId = uuidv4()
 				let webStatus = 0