Merge branch 'dev2' of http://61.184.202.72:3000/wsnet/PDA-App into dev2

package-lock.json

@@ -8,6 +8,7 @@
             "name": "tongtong-条件筛选",
             "version": "1.0.6",
             "dependencies": {
+                "uuid": "^9.0.0",
                 "vant": "^2.12.54"
             }
         },
@@ -257,6 +258,14 @@
                 "node": ">=0.10.0"
             }
         },
+        "node_modules/uuid": {
+            "version": "9.0.0",
+            "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz",
+            "integrity": "sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==",
+            "bin": {
+                "uuid": "dist/bin/uuid"
+            }
+        },
         "node_modules/vant": {
             "version": "2.12.54",
             "resolved": "https://registry.npmjs.org/vant/-/vant-2.12.54.tgz",

package.json

@@ -17,6 +17,7 @@
         ]
     },
     "dependencies": {
+        "uuid": "^9.0.0",
         "vant": "^2.12.54"
     }
 }

pages/shipWork/abnormalAdd.vue

@@ -55,6 +55,9 @@
 <script>
 	import sqlite from "../../common/sqlite.js"
 	import api from "../../common/api.js"
+	import {
+		v4 as uuidv4
+	} from 'uuid';
 	export default {
 		data() {
 			return {
@@ -151,8 +154,7 @@
 			// 保存
 			save() {
 				let date = new Date().getTime()
-				let str = String(date)
+				let webId = uuidv4()
-				let webId = Number(str.slice(str.length - 5))
 				let webStatus = 0
 				let webDate = api.getDate(date)
 				if (this.obj.state == "edit") {

pages/shipWork/index.vue

@@ -98,6 +98,9 @@
 	import sqlite from "../../common/sqlite.js"
 	import tableList from "../../common/createDataTable.js"
 	import api from "../../common/api.js"
+	import {
+		v4 as uuidv4
+	} from 'uuid';
 	export default {
 		data() {
 			return {
@@ -331,8 +334,7 @@
 				let sql = ""
 				for (let i = 0; i < this.workList.length; i++) {
 					let date = new Date().getTime()
-					let str = String(date)
+					let webId = uuidv4()
-					let webId = Number(str.slice(str.length - 5))
 					let webDate = api.getDate(date)
 					sql =
 						`insert into shipmentShipLoadPlansRespList values('${webId}','${this.workList[i].agentId}','${this.workList[i].agentName}',

pages/shipWork/mafiAdd.vue

@@ -66,6 +66,9 @@
 <script>
 	import sqlite from "../../common/sqlite.js"
 	import api from "../../common/api.js";
+	import {
+		v4 as uuidv4
+	} from 'uuid';
 	export default {
 		data() {
 			return {
@@ -207,8 +210,7 @@
 			// 保存
 			save() {
 				let date = new Date().getTime()
-				let str = String(date)
+				let webId = uuidv4()
-				let webId = Number(str.slice(str.length - 5))
 				let webStatus = 0
 				let webDate = api.getDate(date)
 				if (this.obj.state == "edit") {

pages/shipWork/noticeAdd.vue

@@ -44,6 +44,9 @@
 <script>
 	import sqlite from "../../common/sqlite.js"
 	import api from "../../common/api.js"
+	import {
+		v4 as uuidv4
+	} from 'uuid';
 	export default {
 		data() {
 			return {
@@ -134,8 +137,7 @@
 			// 保存
 			save() {
 				let date = new Date().getTime()
-				let str = String(date)
+				let webId = uuidv4()
-				let webId = Number(str.slice(str.length - 5))
 				let webStatus = 0
 				let webDate = api.getDate(date)
 				if (this.obj.state == "edit") {

pages/shipWork/opinionAdd.vue

@@ -66,6 +66,9 @@
 <script>
 	import sqlite from "../../common/sqlite.js"
 	import api from "../../common/api.js"
+	import {
+		v4 as uuidv4
+	} from 'uuid';
 	export default {
 		data() {
 			return {
@@ -206,8 +209,7 @@
 			// 保存
 			save() {
 				let date = new Date().getTime()
-				let str = String(date)
+				let webId = uuidv4()
-				let webId = Number(str.slice(str.length - 5))
 				let webStatus = 0
 				let webDate = api.getDate(date)
 				if (this.obj.state == "edit") {

pages/shipWork/patrolAdd.vue

@@ -63,6 +63,9 @@
 <script>
 	import sqlite from "../../common/sqlite.js"
 	import api from "../../common/api.js";
+	import {
+		v4 as uuidv4
+	} from 'uuid';
 	export default {
 		data() {
 			return {
@@ -159,8 +162,7 @@
 			// 保存
 			save() {
 				let date = new Date().getTime()
-				let str = String(date)
+				let webId = uuidv4()
-				let webId = Number(str.slice(str.length - 5))
 				let webStatus = 0
 				let webDate = api.getDate(date)
 				if (this.obj.state == "edit") {

pages/shipWork/peopleAdd.vue

@@ -66,6 +66,9 @@
 <script>
 	import sqlite from "../../common/sqlite.js"
 	import api from "../../common/api.js"
+	import {
+		v4 as uuidv4
+	} from 'uuid';
 	export default {
 		data() {
 			return {
@@ -222,8 +225,7 @@
 			// 保存
 			save() {
 				let date = new Date().getTime()
-				let str = String(date)
+				let webId = uuidv4()
-				let webId = Number(str.slice(str.length - 5))
 				let webStatus = 0
 				let webDate = api.getDate(date)
 				if (this.obj.state == "edit") {

pages/shipWork/sign.vue

@@ -35,7 +35,6 @@
 			};
 		},
 		mounted() {},
-
 		onLoad(option) {
 			that = this;
 			console.log(option);

pages/shipWork/supplyAdd.vue

@@ -61,6 +61,9 @@
 <script>
 	import sqlite from "../../common/sqlite.js"
 	import api from "../../common/api.js"
+	import {
+		v4 as uuidv4
+	} from 'uuid';
 	export default {
 		data() {
 			return {
@@ -194,8 +197,7 @@
 			// 保存
 			save() {
 				let date = new Date().getTime()
-				let str = String(date)
+				let webId = uuidv4()
-				let webId = Number(str.slice(str.length - 5))
 				let webStatus = 0
 				let webDate = api.getDate(date)
 				if (this.obj.state == "edit") {

pages/shipWork/untieAdd.vue

@@ -69,6 +69,9 @@
 <script>
 	import sqlite from "../../common/sqlite.js"
 	import api from "../../common/api.js"
+	import {
+		v4 as uuidv4
+	} from 'uuid';
 	export default {
 		data() {
 			return {
@@ -203,8 +206,7 @@
 			// 保存
 			save() {
 				let date = new Date().getTime()
-				let str = String(date)
+				let webId = uuidv4()
-				let webId = Number(str.slice(str.length - 5))
 				let webStatus = 0
 				let webDate = api.getDate(date)
 				if (this.obj.state == "edit") {

pages/shipWork/workAssignAdd.vue

@@ -77,6 +77,9 @@
 <script>
 	import sqlite from "../../common/sqlite.js"
 	import api from "../../common/api.js"
+	import {
+		v4 as uuidv4
+	} from 'uuid';
 	export default {
 		data() {
 			return {
@@ -249,8 +252,7 @@
 			// 保存
 			save() {
 				let date = new Date().getTime()
-				let str = String(date)
+				let webId = uuidv4()
-				let webId = Number(str.slice(str.length - 5))
 				let webStatus = 0
 				let webDate = api.getDate(date)
 				if (this.obj.state == "edit") {