From 9daa1cb4b217ab03d3aeec56557dc28df96624f0 Mon Sep 17 00:00:00 2001
From: Panzihang <819652404@qq.com>
Date: Tue, 1 Aug 2023 14:35:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96=EF=BC=8C?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9Eapi?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/api.js                    | 13 ++++++++
 common/createDataTable.js        |  8 +++++
 pages/shipWork/abnormal.vue      |  7 ++---
 pages/shipWork/abnormalAdd.vue   | 14 ++-------
 pages/shipWork/index.vue         | 52 ++++++++++++++++----------------
 pages/shipWork/mafi.vue          |  7 ++---
 pages/shipWork/mafiAdd.vue       | 14 ++-------
 pages/shipWork/mixWork.vue       | 10 ++----
 pages/shipWork/notice.vue        |  7 ++---
 pages/shipWork/noticeAdd.vue     | 14 ++-------
 pages/shipWork/patrol.vue        |  7 ++---
 pages/shipWork/patrolAdd.vue     | 14 ++-------
 pages/shipWork/peopleAdd.vue     | 14 ++-------
 pages/shipWork/supply.vue        |  7 ++---
 pages/shipWork/supplyAdd.vue     | 15 ++-------
 pages/shipWork/untieAdd.vue      | 14 ++-------
 pages/shipWork/untieCord.vue     |  8 ++---
 pages/shipWork/workAssign.vue    |  7 ++---
 pages/shipWork/workAssignAdd.vue | 17 +++--------
 19 files changed, 81 insertions(+), 168 deletions(-)
 create mode 100644 common/api.js

diff --git a/common/api.js b/common/api.js
new file mode 100644
index 0000000..7a32754
--- /dev/null
+++ b/common/api.js
@@ -0,0 +1,13 @@
+module.exports = {
+	// 获取日期 传一个时间戳 转为YY-MM-DD hh-mm-ss 格式
+	getDate(date) {
+		var date = new Date(date);
+		var YY = date.getFullYear() + '-';
+		var MM = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-';
+		var DD = (date.getDate() < 10 ? '0' + (date.getDate()) : date.getDate());
+		var hh = (date.getHours() < 10 ? '0' + date.getHours() : date.getHours()) + ':';
+		var mm = (date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()) + ':';
+		var ss = (date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds());
+		return YY + MM + DD + " " + hh + mm + ss;
+	},
+}
\ No newline at end of file
diff --git a/common/createDataTable.js b/common/createDataTable.js
index 7d13287..d23e2af 100644
--- a/common/createDataTable.js
+++ b/common/createDataTable.js
@@ -14,6 +14,7 @@ module.exports = {
 		this.createAbnormalConditionRespList()
 		this.createMafiListRespList()
 		this.createSafetyInspectionRespList()
+		this.createShipmentShipLoadPlansRespList()
 	},
 	// 创建人员信息 messageRespList
 	createMessageRespList() {
@@ -76,6 +77,13 @@ module.exports = {
 			'CREATE TABLE if not exists safetyInspectionRespList ("webId" text NOT NULL,"vvyId" text,"vvyName" text,"type" text,"remark" text,"tradeTypeName" text,"importExportFlagName" text,"spmName" text,"webStatus" text,"webDate" text, PRIMARY KEY("webId"));'
 		this.executeSql(sql)
 	},
+	// 创建作业查询 shipmentShipLoadPlansRespList
+	createShipmentShipLoadPlansRespList() {
+		console.log("创建作业查询表");
+		let sql =
+			'CREATE TABLE if not exists shipmentShipLoadPlansRespList ("webId" text NOT NULL,"agentId" text,"agentName" text,"amount" text,"brdId" text,"brdName" text,"bvdId" text,"bvdName" text,"bvmId" text,"bvmName" text,"carHeight" text,"carLength" text,"carWidth" text,"customsDeclareNo" text,"customsDeclareStatus" text,"mnfBl" text,"potId" text,"potName" text,"sourceType" text,"vvyId" text,"vvyName" text,"yardPos" text, PRIMARY KEY("webId"));'
+		this.executeSql(sql)
+	},
 	executeSql(sql) {
 		sqlite.executeSqlCeshi(sql).then((value) => {
 			// 在resolve时执行的回调函数
diff --git a/pages/shipWork/abnormal.vue b/pages/shipWork/abnormal.vue
index c3e24b0..01d90e6 100644
--- a/pages/shipWork/abnormal.vue
+++ b/pages/shipWork/abnormal.vue
@@ -37,7 +37,8 @@
 		},
 		methods: {
 			// 查
-			executeSql(sql) {
+			executeSql1(tableName) {
+				let sql = `select * from ${tableName}`
 				sqlite.executeSqlCeshi(sql).then((value) => {
 					// 在resolve时执行的回调函数
 					this.infoList = value
@@ -47,10 +48,6 @@
 					console.error(error);
 				});
 			},
-			executeSql1(tableName) {
-				let sql = `select * from ${tableName}`
-				this.executeSql(sql)
-			},
 			// 点击签名
 			sign() {
 				uni.navigateTo({
diff --git a/pages/shipWork/abnormalAdd.vue b/pages/shipWork/abnormalAdd.vue
index 4e71c49..af66d3a 100644
--- a/pages/shipWork/abnormalAdd.vue
+++ b/pages/shipWork/abnormalAdd.vue
@@ -54,6 +54,7 @@
 
 <script>
 	import sqlite from "../../common/sqlite.js"
+	import api from "../../common/api.js"
 	export default {
 		data() {
 			return {
@@ -153,7 +154,7 @@
 				let str = String(date)
 				let webId = Number(str.slice(str.length - 5))
 				let webStatus = 0
-				let webDate = this.getDate(date)
+				let webDate = api.getDate(date)
 				if (this.obj.state == "edit") {
 					let sql =
 						`UPDATE abnormalConditionRespList SET vvyId = '${this.vvyId}', vvyName = '${this.vvyName}', 
@@ -203,17 +204,6 @@
 					url: `/pages/shipWork/abnormalAdd?params=${params}`
 				})
 			},
-			// 获取日期
-			getDate(date) {
-				var date = new Date(date);
-				var YY = date.getFullYear() + '-';
-				var MM = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-';
-				var DD = (date.getDate() < 10 ? '0' + (date.getDate()) : date.getDate());
-				var hh = (date.getHours() < 10 ? '0' + date.getHours() : date.getHours()) + ':';
-				var mm = (date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()) + ':';
-				var ss = (date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds());
-				return YY + MM + DD + " " + hh + mm + ss;
-			},
 			executeSql(sql) {
 				sqlite.executeSqlCeshi(sql).then((value) => {
 					// 在resolve时执行的回调函数
diff --git a/pages/shipWork/index.vue b/pages/shipWork/index.vue
index e4b572a..266ce98 100644
--- a/pages/shipWork/index.vue
+++ b/pages/shipWork/index.vue
@@ -127,8 +127,6 @@
 		mounted() {
 			this.pamValue = uni.getStorageSync('portObj').portId
 			this.shipInfo = uni.getStorageSync('shipInfo').voyageScheduleDataList
-			// 进页面创建表
-			tableList.createAllTable()
 		},
 		methods: {
 			open() {
@@ -282,30 +280,32 @@
 			},
 			// 下载
 			download(item) {
-				let ids = []
-				if (item.inVvyId != null && item.outVvyId == null) {
-					ids.push(item.inVvyId)
-				} else if (item.outVvyId != null && item.inVvyId == null) {
-					ids.push(item.outVvyId)
-				} else if (item.inVvyId != null && item.outVvyId != null) {
-					ids.push(item.inVvyId)
-					ids.push(item.outVvyId)
-				}
-				console.log(ids)
-				uni.request({
-					url: this.$local + '/api/shipOperate/download?vvyIds=' + ids,
-					header: {
-						'Content-Type': 'application/json' //自定义请求头信息
-					},
-					method: 'GET', //请求方式，必须为大写
-					success: (res) => {
-						console.log('接口返回------', res);
-						if (res.statusCode == 200) {
-							// 存储数据
-							uni.setStorageSync('shipInfo', res.data.data);
-						}
-					}
-				})
+				// 下载创建单证内的表
+				tableList.createAllTable()
+				// let ids = []
+				// if (item.inVvyId != null && item.outVvyId == null) {
+				// 	ids.push(item.inVvyId)
+				// } else if (item.outVvyId != null && item.inVvyId == null) {
+				// 	ids.push(item.outVvyId)
+				// } else if (item.inVvyId != null && item.outVvyId != null) {
+				// 	ids.push(item.inVvyId)
+				// 	ids.push(item.outVvyId)
+				// }
+				// console.log(ids)
+				// uni.request({
+				// 	url: this.$local + '/api/shipOperate/download?vvyIds=' + ids,
+				// 	header: {
+				// 		'Content-Type': 'application/json' //自定义请求头信息
+				// 	},
+				// 	method: 'GET', //请求方式，必须为大写
+				// 	success: (res) => {
+				// 		console.log('接口返回------', res);
+				// 		if (res.statusCode == 200) {
+				// 			// 存储数据
+				// 			uni.setStorageSync('shipInfo', res.data.data);
+				// 		}
+				// 	}
+				// })
 			},
 			// 上传
 			upload(item) {
diff --git a/pages/shipWork/mafi.vue b/pages/shipWork/mafi.vue
index 376b55b..bc06246 100644
--- a/pages/shipWork/mafi.vue
+++ b/pages/shipWork/mafi.vue
@@ -38,7 +38,8 @@
 		},
 		methods: {
 			// 查
-			executeSql(sql) {
+			executeSql1(tableName) {
+				let sql = `select * from ${tableName}`
 				sqlite.executeSqlCeshi(sql).then((value) => {
 					// 在resolve时执行的回调函数
 					this.infoList = value
@@ -48,10 +49,6 @@
 					console.error(error);
 				});
 			},
-			executeSql1(tableName) {
-				let sql = `select * from ${tableName}`
-				this.executeSql(sql)
-			},
 			// 点击签名
 			sign() {
 				uni.navigateTo({
diff --git a/pages/shipWork/mafiAdd.vue b/pages/shipWork/mafiAdd.vue
index 9ed7ebe..a108eba 100644
--- a/pages/shipWork/mafiAdd.vue
+++ b/pages/shipWork/mafiAdd.vue
@@ -65,6 +65,7 @@
 
 <script>
 	import sqlite from "../../common/sqlite.js"
+	import api from "../../common/api.js";
 	export default {
 		data() {
 			return {
@@ -209,7 +210,7 @@
 				let str = String(date)
 				let webId = Number(str.slice(str.length - 5))
 				let webStatus = 0
-				let webDate = this.getDate(date)
+				let webDate = api.getDate(date)
 				if (this.obj.state == "edit") {
 					let sql =
 						`UPDATE mafiListRespList SET vvyId = '${this.vvyId}', vvyName = '${this.vvyName}', 
@@ -264,17 +265,6 @@
 					url: `/pages/shipWork/mafiAdd?params=${params}`
 				})
 			},
-			// 获取日期
-			getDate(date) {
-				var date = new Date(date);
-				var YY = date.getFullYear() + '-';
-				var MM = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-';
-				var DD = (date.getDate() < 10 ? '0' + (date.getDate()) : date.getDate());
-				var hh = (date.getHours() < 10 ? '0' + date.getHours() : date.getHours()) + ':';
-				var mm = (date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()) + ':';
-				var ss = (date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds());
-				return YY + MM + DD + " " + hh + mm + ss;
-			},
 			executeSql(sql) {
 				sqlite.executeSqlCeshi(sql).then((value) => {
 					// 在resolve时执行的回调函数
diff --git a/pages/shipWork/mixWork.vue b/pages/shipWork/mixWork.vue
index 2e821d3..43f47e9 100644
--- a/pages/shipWork/mixWork.vue
+++ b/pages/shipWork/mixWork.vue
@@ -68,7 +68,6 @@
 			}
 			// this.peopleInfo = uni.getStorageSync('addPeopleArr')
 			this.shiftInfo = uni.getStorageSync('addShiftArr')
-			console.log(this.shiftInfo)
 			this.shipInfo = uni.getStorageSync('shipInfo')
 			if (this.tabsType == 0) {
 				this.executeSql1('messageRespList')
@@ -76,10 +75,9 @@
 		},
 		methods: {
 			// 查
-			executeSql(sql) {
+			executeSql1(tableName) {
+				let sql = `select * from ${tableName}`
 				sqlite.executeSqlCeshi(sql).then((value) => {
-					// 在resolve时执行的回调函数
-					// this.sqlData = value
 					if (this.tabsType == 0) {
 						this.peopleInfo = value
 						console.log(this.peopleInfo)
@@ -89,10 +87,6 @@
 					console.error(error);
 				});
 			},
-			executeSql1(tableName) {
-				let sql = `select * from ${tableName}`
-				this.executeSql(sql)
-			},
 			// 点击签名
 			sign() {
 				uni.navigateTo({
diff --git a/pages/shipWork/notice.vue b/pages/shipWork/notice.vue
index 58107a3..a747812 100644
--- a/pages/shipWork/notice.vue
+++ b/pages/shipWork/notice.vue
@@ -37,7 +37,8 @@
 		},
 		methods: {
 			// 查
-			executeSql(sql) {
+			executeSql1(tableName) {
+				let sql = `select * from ${tableName}`
 				sqlite.executeSqlCeshi(sql).then((value) => {
 					// 在resolve时执行的回调函数
 					this.infoList = value
@@ -47,10 +48,6 @@
 					console.error(error);
 				});
 			},
-			executeSql1(tableName) {
-				let sql = `select * from ${tableName}`
-				this.executeSql(sql)
-			},
 			// 点击签名
 			sign() {
 				uni.navigateTo({
diff --git a/pages/shipWork/noticeAdd.vue b/pages/shipWork/noticeAdd.vue
index 5e65ecf..144ac0d 100644
--- a/pages/shipWork/noticeAdd.vue
+++ b/pages/shipWork/noticeAdd.vue
@@ -43,6 +43,7 @@
 
 <script>
 	import sqlite from "../../common/sqlite.js"
+	import api from "../../common/api.js"
 	export default {
 		data() {
 			return {
@@ -136,7 +137,7 @@
 				let str = String(date)
 				let webId = Number(str.slice(str.length - 5))
 				let webStatus = 0
-				let webDate = this.getDate(date)
+				let webDate = api.getDate(date)
 				if (this.obj.state == "edit") {
 					let sql =
 						`UPDATE shipmentLoadUnloadNoticeRespList SET vvyId = '${this.vvyId}', vvyName = '${this.vvyName}', 
@@ -182,17 +183,6 @@
 					url: `/pages/shipWork/noticeAdd?params=${params}`
 				})
 			},
-			// 获取日期
-			getDate(date) {
-				var date = new Date(date);
-				var YY = date.getFullYear() + '-';
-				var MM = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-';
-				var DD = (date.getDate() < 10 ? '0' + (date.getDate()) : date.getDate());
-				var hh = (date.getHours() < 10 ? '0' + date.getHours() : date.getHours()) + ':';
-				var mm = (date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()) + ':';
-				var ss = (date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds());
-				return YY + MM + DD + " " + hh + mm + ss;
-			},
 			executeSql(sql) {
 				sqlite.executeSqlCeshi(sql).then((value) => {
 					// 在resolve时执行的回调函数
diff --git a/pages/shipWork/patrol.vue b/pages/shipWork/patrol.vue
index f5a09b1..bb1aef7 100644
--- a/pages/shipWork/patrol.vue
+++ b/pages/shipWork/patrol.vue
@@ -34,7 +34,8 @@
 		},
 		methods: {
 			// 查
-			executeSql(sql) {
+			executeSql1(tableName) {
+				let sql = `select * from ${tableName}`
 				sqlite.executeSqlCeshi(sql).then((value) => {
 					// 在resolve时执行的回调函数
 					this.infoList = value
@@ -44,10 +45,6 @@
 					console.error(error);
 				});
 			},
-			executeSql1(tableName) {
-				let sql = `select * from ${tableName}`
-				this.executeSql(sql)
-			},
 			add(state, item, index) {
 				if (state != 'add') {
 					uni.setStorageSync('patrolRow', item);
diff --git a/pages/shipWork/patrolAdd.vue b/pages/shipWork/patrolAdd.vue
index 6cb54d2..0da66db 100644
--- a/pages/shipWork/patrolAdd.vue
+++ b/pages/shipWork/patrolAdd.vue
@@ -62,6 +62,7 @@
 
 <script>
 	import sqlite from "../../common/sqlite.js"
+	import api from "../../common/api.js";
 	export default {
 		data() {
 			return {
@@ -161,7 +162,7 @@
 				let str = String(date)
 				let webId = Number(str.slice(str.length - 5))
 				let webStatus = 0
-				let webDate = this.getDate(date)
+				let webDate = api.getDate(date)
 				if (this.obj.state == "edit") {
 					let sql =
 						`UPDATE safetyInspectionRespList SET vvyId = '${this.vvyId}', vvyName = '${this.vvyName}', 
@@ -210,17 +211,6 @@
 					url: `/pages/shipWork/patrolAdd?params=${params}`
 				})
 			},
-			// 获取日期
-			getDate(date) {
-				var date = new Date(date);
-				var YY = date.getFullYear() + '-';
-				var MM = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-';
-				var DD = (date.getDate() < 10 ? '0' + (date.getDate()) : date.getDate());
-				var hh = (date.getHours() < 10 ? '0' + date.getHours() : date.getHours()) + ':';
-				var mm = (date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()) + ':';
-				var ss = (date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds());
-				return YY + MM + DD + " " + hh + mm + ss;
-			},
 			executeSql(sql) {
 				sqlite.executeSqlCeshi(sql).then((value) => {
 					// 在resolve时执行的回调函数
diff --git a/pages/shipWork/peopleAdd.vue b/pages/shipWork/peopleAdd.vue
index f985132..6f7bae3 100644
--- a/pages/shipWork/peopleAdd.vue
+++ b/pages/shipWork/peopleAdd.vue
@@ -65,6 +65,7 @@
 
 <script>
 	import sqlite from "../../common/sqlite.js"
+	import api from "../../common/api.js"
 	export default {
 		data() {
 			return {
@@ -224,7 +225,7 @@
 				let str = String(date)
 				let webId = Number(str.slice(str.length - 5))
 				let webStatus = 0
-				let webDate = this.getDate(date)
+				let webDate = api.getDate(date)
 				if (this.obj.state == "edit") {
 					let sql =
 						`UPDATE messageRespList SET bthId = '${this.bwValue}',bthIdName = '${this.bthIdName}',
@@ -284,17 +285,6 @@
 					url: `/pages/shipWork/peopleAdd?params=${params}`
 				})
 			},
-			// 获取日期
-			getDate(date) {
-				var date = new Date(date);
-				var YY = date.getFullYear() + '-';
-				var MM = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-';
-				var DD = (date.getDate() < 10 ? '0' + (date.getDate()) : date.getDate());
-				var hh = (date.getHours() < 10 ? '0' + date.getHours() : date.getHours()) + ':';
-				var mm = (date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()) + ':';
-				var ss = (date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds());
-				return YY + MM + DD + " " + hh + mm + ss;
-			},
 			executeSql(sql) {
 				sqlite.executeSqlCeshi(sql).then((value) => {
 					// 在resolve时执行的回调函数
diff --git a/pages/shipWork/supply.vue b/pages/shipWork/supply.vue
index 3d4de7a..8ee7e48 100644
--- a/pages/shipWork/supply.vue
+++ b/pages/shipWork/supply.vue
@@ -37,7 +37,8 @@
 		},
 		methods: {
 			// 查
-			executeSql(sql) {
+			executeSql1(tableName) {
+				let sql = `select * from ${tableName}`
 				sqlite.executeSqlCeshi(sql).then((value) => {
 					// 在resolve时执行的回调函数
 					this.infoList = value
@@ -47,10 +48,6 @@
 					console.error(error);
 				});
 			},
-			executeSql1(tableName) {
-				let sql = `select * from ${tableName}`
-				this.executeSql(sql)
-			},
 			// 点击签名
 			sign() {
 				uni.navigateTo({
diff --git a/pages/shipWork/supplyAdd.vue b/pages/shipWork/supplyAdd.vue
index 906ccbe..97cc19d 100644
--- a/pages/shipWork/supplyAdd.vue
+++ b/pages/shipWork/supplyAdd.vue
@@ -60,6 +60,7 @@
 
 <script>
 	import sqlite from "../../common/sqlite.js"
+	import api from "../../common/api.js"
 	export default {
 		data() {
 			return {
@@ -196,14 +197,13 @@
 				let str = String(date)
 				let webId = Number(str.slice(str.length - 5))
 				let webStatus = 0
-				let webDate = this.getDate(date)
+				let webDate = api.getDate(date)
 				if (this.obj.state == "edit") {
 					let sql =
 						`UPDATE shipmentShipSupplyRespList SET vvyId = '${this.vvyId}',vvyName = '${this.vvyName}',
 						stopBerthage = '${this.stopBerthage}',stopBerthageName = '${this.stopBerthageName}',sssId = '${this.supplyTypeId}',
 						supplyType = '${this.supplyType}',supplyAmount = '${this.supplyAmount}',supplyDate = '${this.supplyDate}',webStatus = '${webStatus}',
 						webDate = '${webDate}' WHERE webId = ${this.supplyRow.webId};`
-					console.log(sql)
 					this.executeSql(sql)
 				} else if (this.obj.state == "add") {
 					let sql =
@@ -254,17 +254,6 @@
 					url: `/pages/shipWork/supplyAdd?params=${params}`
 				})
 			},
-			// 获取日期
-			getDate(date) {
-				var date = new Date(date);
-				var YY = date.getFullYear() + '-';
-				var MM = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-';
-				var DD = (date.getDate() < 10 ? '0' + (date.getDate()) : date.getDate());
-				var hh = (date.getHours() < 10 ? '0' + date.getHours() : date.getHours()) + ':';
-				var mm = (date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()) + ':';
-				var ss = (date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds());
-				return YY + MM + DD + " " + hh + mm + ss;
-			},
 			executeSql(sql) {
 				sqlite.executeSqlCeshi(sql).then((value) => {
 					// 在resolve时执行的回调函数
diff --git a/pages/shipWork/untieAdd.vue b/pages/shipWork/untieAdd.vue
index 6abf4df..1dacd83 100644
--- a/pages/shipWork/untieAdd.vue
+++ b/pages/shipWork/untieAdd.vue
@@ -68,6 +68,7 @@
 
 <script>
 	import sqlite from "../../common/sqlite.js"
+	import api from "../../common/api.js"
 	export default {
 		data() {
 			return {
@@ -205,7 +206,7 @@
 				let str = String(date)
 				let webId = Number(str.slice(str.length - 5))
 				let webStatus = 0
-				let webDate = this.getDate(date)
+				let webDate = api.getDate(date)
 				if (this.obj.state == "edit") {
 					let sql =
 						`UPDATE attachUnmoorRespList SET shipDeadWeight = '${this.zlShip}',vvyId = '${this.vvyId}',
@@ -262,17 +263,6 @@
 					url: `/pages/shipWork/untieAdd?params=${params}`
 				})
 			},
-			// 获取日期
-			getDate(date) {
-				var date = new Date(date);
-				var YY = date.getFullYear() + '-';
-				var MM = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-';
-				var DD = (date.getDate() < 10 ? '0' + (date.getDate()) : date.getDate());
-				var hh = (date.getHours() < 10 ? '0' + date.getHours() : date.getHours()) + ':';
-				var mm = (date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()) + ':';
-				var ss = (date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds());
-				return YY + MM + DD + " " + hh + mm + ss;
-			},
 			executeSql(sql) {
 				sqlite.executeSqlCeshi(sql).then((value) => {
 					// 在resolve时执行的回调函数
diff --git a/pages/shipWork/untieCord.vue b/pages/shipWork/untieCord.vue
index 63d95bb..c60c879 100644
--- a/pages/shipWork/untieCord.vue
+++ b/pages/shipWork/untieCord.vue
@@ -38,20 +38,16 @@
 		},
 		methods: {
 			// 查
-			executeSql(sql) {
+			executeSql1(tableName) {
+				let sql = `select * from ${tableName}`
 				sqlite.executeSqlCeshi(sql).then((value) => {
 					// 在resolve时执行的回调函数
-					// this.sqlData = value
 					this.infoList = value
 				}).catch((error) => {
 					// 在reject时执行的回调函数
 					console.error(error);
 				});
 			},
-			executeSql1(tableName) {
-				let sql = `select * from ${tableName}`
-				this.executeSql(sql)
-			},
 			// 点击签名
 			sign() {
 				uni.navigateTo({
diff --git a/pages/shipWork/workAssign.vue b/pages/shipWork/workAssign.vue
index 04eda87..ab8431f 100644
--- a/pages/shipWork/workAssign.vue
+++ b/pages/shipWork/workAssign.vue
@@ -37,7 +37,8 @@
 		},
 		methods: {
 			// 查
-			executeSql(sql) {
+			executeSql1(tableName) {
+				let sql = `select * from ${tableName}`
 				sqlite.executeSqlCeshi(sql).then((value) => {
 					// 在resolve时执行的回调函数
 					this.infoList = value
@@ -47,10 +48,6 @@
 					console.error(error);
 				});
 			},
-			executeSql1(tableName) {
-				let sql = `select * from ${tableName}`
-				this.executeSql(sql)
-			},
 			// 点击签名
 			sign() {
 				uni.navigateTo({
diff --git a/pages/shipWork/workAssignAdd.vue b/pages/shipWork/workAssignAdd.vue
index 6065e42..798b274 100644
--- a/pages/shipWork/workAssignAdd.vue
+++ b/pages/shipWork/workAssignAdd.vue
@@ -76,6 +76,7 @@
 
 <script>
 	import sqlite from "../../common/sqlite.js"
+	import api from "../../common/api.js"
 	export default {
 		data() {
 			return {
@@ -165,6 +166,7 @@
 			// 获取当前行信息
 			getRow() {
 				this.assignRow = uni.getStorageSync('assignRow');
+				console.log(this.assignRow)
 				this.assignRowIndex = uni.getStorageSync('assignRowIndex');
 				this.vvyId = this.assignRow.vvyId
 				this.vvyName = this.assignRow.vvyName
@@ -177,7 +179,7 @@
 				this.loaderType = this.assignRow.loaderType
 				this.vehicleSize = this.assignRow.vehicleSize
 				this.sparePart = this.assignRow.sparePart
-				this.workTime = this.assignRow.workTime
+				this.workTime = [this.assignRow.startTime, this.assignRow.endTime]
 				this.startTime = this.assignRow.startTime
 				this.endTime = this.assignRow.endTime
 			},
@@ -250,7 +252,7 @@
 				let str = String(date)
 				let webId = Number(str.slice(str.length - 5))
 				let webStatus = 0
-				let webDate = this.getDate(date)
+				let webDate = api.getDate(date)
 				if (this.obj.state == "edit") {
 					let sql =
 						`UPDATE shipmentAdviserLayoutRespList SET vvyId = '${this.vvyId}', vvyName = '${this.vvyName}', 
@@ -314,17 +316,6 @@
 					url: `/pages/shipWork/workAssignAdd?params=${params}`
 				})
 			},
-			// 获取日期
-			getDate(date) {
-				var date = new Date(date);
-				var YY = date.getFullYear() + '-';
-				var MM = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-';
-				var DD = (date.getDate() < 10 ? '0' + (date.getDate()) : date.getDate());
-				var hh = (date.getHours() < 10 ? '0' + date.getHours() : date.getHours()) + ':';
-				var mm = (date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()) + ':';
-				var ss = (date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds());
-				return YY + MM + DD + " " + hh + mm + ss;
-			},
 			executeSql(sql) {
 				sqlite.executeSqlCeshi(sql).then((value) => {
 					// 在resolve时执行的回调函数