From e71d539aa86e3bada2e69948be2a00a645d1d247 Mon Sep 17 00:00:00 2001 From: Panzihang <819652404@qq.com> Date: Tue, 15 Aug 2023 09:18:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E8=AF=81=E4=BB=A3=E7=A0=81=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=20+=20=E5=9C=BA=E4=BD=8D=E7=9B=91=E6=8E=A7=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/createDataTable.js | 22 +- components/sider-bar/slider-bar.vue | 12 +- pages.json | 16 +- pages/monitor/index.vue | 763 +++++++++++++++++++------ pages/monitor/place.vue | 358 ++++++++++++ pages/{monitor => quality}/details.vue | 0 pages/{monitor => quality}/edit.vue | 0 pages/quality/index.vue | 227 ++++++++ pages/{monitor => quality}/sign.vue | 0 pages/shipWork/documentList.vue | 22 +- pages/shipWork/index.vue | 21 +- pages/shipWork/mixWork.vue | 33 +- pages/shipWork/shiftAdd.vue | 479 +++++++++++----- pages/shipWork/shiftDetails.vue | 182 ++++-- 14 files changed, 1726 insertions(+), 409 deletions(-) create mode 100644 pages/monitor/place.vue rename pages/{monitor => quality}/details.vue (100%) rename pages/{monitor => quality}/edit.vue (100%) create mode 100644 pages/quality/index.vue rename pages/{monitor => quality}/sign.vue (100%) diff --git a/common/createDataTable.js b/common/createDataTable.js index d6d1e06..2d180c4 100644 --- a/common/createDataTable.js +++ b/common/createDataTable.js @@ -13,11 +13,9 @@ module.exports = { // 创建工班信息详细 this.createWorkMessageRespInfoList() // // 创建工班信息翻仓 - // this.createRetallyMessageRespList() - // // 创建工班信息翻仓详情 - // this.createRetallyMessageRespInfoList() + this.createRetallyMessageRespList() // // 创建工班信息其他 - // this.createInfoRespList() + this.createInfoRespList() // 创建系解缆 this.creatAttachUnmoorRespList() // 创建供给 @@ -43,7 +41,6 @@ module.exports = { }, // 创建船舶基本信息 shipInfoTable createShipInfoTable() { - console.log("创建船舶基本信息表") let sql = 'CREATE TABLE if not exists shipInfoTable ("webId" text NOT NULL,"vslCd" text,"vslCnname" text,"vvyId" text,"vvyName" text,"importExportFlag" text,"importExportFlagName" text,"tradeType" text,"tradeTypeName" text,"webStatus" text,"webDate" text, PRIMARY KEY("webId"));' this.executeSql(sql) @@ -68,23 +65,14 @@ module.exports = { }, // 创建工班信息翻仓 retallyMessageRespList createRetallyMessageRespList() { - console.log('创建工班信息翻仓表'); let sql = - 'CREATE TABLE if not exists workMessageRespFlipList ("webId" text NOT NULL,"contactId" text,"vvyId" text,"vvyName" text,"retallyType" text,"retallyTypeName" text,"tradeTypeName" text,"importExportFlagName" text,"spmName" text,"webStatus" text,"webDate" text, PRIMARY KEY("webId"));' - this.executeSql(sql) - }, - // 创建工班信息翻仓详情 retallyMessageRespInfoList - createRetallyMessageRespInfoList() { - console.log('创建工班信息翻仓详情表'); - let sql = - 'CREATE TABLE if not exists retallyMessageRespInfoList ("webId" text NOT NULL,"contactId" text,"vvyId" text,"vvyName" text,"retallyOrigin" text,"retallyTerminus" text,"carType" text,"carTypeName" text,"retallyStartTime" text,"retallyEndTime" text,"goodsNumber" text,"goodsVolume" text,"goodsWeight" text,"tradeTypeName" text,"importExportFlagName" text,"spmName" text,"webStatus" text,"webDate" text, PRIMARY KEY("webId"));' + 'CREATE TABLE if not exists retallyMessageRespList ("webId" text NOT NULL,"contactId" text,"vvyId" 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,"tradeTypeName" text,"importExportFlagName" text,"spmName" text,"editStatus" text,"webStatus" text,"webDate" text, PRIMARY KEY("webId"));' this.executeSql(sql) }, // 创建工班信息其他 infoRespList createInfoRespList() { - console.log('创建工班信息翻仓其他表'); let sql = - 'CREATE TABLE if not exists infoRespList ("webId" text NOT NULL,"contactId" text,"vvyId" text,"vvyName" text,"tecNum" text,"tecStartTm" text,"tecEndTm" text,"tecWeight" text,"tecVolume" text,"genNum" text,"genStartTm" text,"genEndTm" text,"genWeight" text,"genVolume" text,"tradeTypeName" text,"importExportFlagName" text,"spmName" text,"webStatus" text,"webDate" text, PRIMARY KEY("webId"));' + 'CREATE TABLE if not exists infoRespList ("webId" text NOT NULL,"contactId" text,"vvyId" text,"vvyName" text,"tecNum" text,"tecStartTm" text,"tecEndTm" text,"tecWeight" text,"tecVolume" text,"genNum" text,"genStartTm" text,"genEndTm" text,"genWeight" text,"genVolume" text,"auxRemark" text,"waitRemark" text,"workRemark" text,"tradeTypeName" text,"importExportFlagName" text,"spmName" text,"webStatus" text,"webDate" text, PRIMARY KEY("webId"));' this.executeSql(sql) }, // 创建系解缆 attachUnmoorRespList @@ -156,7 +144,7 @@ module.exports = { executeSql(sql) { sqlite.executeSqlCeshi(sql).then((value) => { // 在resolve时执行的回调函数 - // console.log(value); + console.log(value); }).catch((error) => { // 在reject时执行的回调函数 console.error(error); diff --git a/components/sider-bar/slider-bar.vue b/components/sider-bar/slider-bar.vue index 33faf73..bc68671 100644 --- a/components/sider-bar/slider-bar.vue +++ b/components/sider-bar/slider-bar.vue @@ -15,8 +15,10 @@ 船舶作业 - - 货物质量 + + + 货物质量 + @@ -24,7 +26,7 @@ - + 测试 @@ -50,7 +52,7 @@ + \ No newline at end of file diff --git a/pages.json b/pages.json index a6fe760..6c1901b 100644 --- a/pages.json +++ b/pages.json @@ -178,29 +178,35 @@ } }, { - "path": "pages/monitor/index", + "path": "pages/quality/index", "style": { - "navigationBarTitleText": "场位监控" + "navigationBarTitleText": "货物质量" } }, { - "path": "pages/monitor/edit", + "path": "pages/quality/edit", "style": { "navigationBarTitleText": "编辑货物质量" } }, { - "path": "pages/monitor/details", + "path": "pages/quality/details", "style": { "navigationBarTitleText": "质损详情" } }, { - "path": "pages/monitor/sign", + "path": "pages/quality/sign", "style": { "navigationBarTitleText": "签名" } }, + { + "path": "pages/monitor/index", + "style": { + "navigationBarTitleText": "场位监控" + } + }, { "path": "pages/test/ceshi", "style": { diff --git a/pages/monitor/index.vue b/pages/monitor/index.vue index 1195c1e..1a097c6 100644 --- a/pages/monitor/index.vue +++ b/pages/monitor/index.vue @@ -3,86 +3,248 @@ - - - - - - - - - + + + + + + + + + + + + 堆场 + + + + 进出口 + + + + 贸易类型 + + + + 船名/航次 + + + + 品牌 + + + + 港口 + + - - - + + + + 车架号/条形码 + 堆场名称：高东库 + 提单号：TD197906 + 品牌：特斯拉 + 作业状态：已装船 + 场位：A2-09-08 + 进出口：进口 + 型号：A系列 + 作业时间：2023/09/08 14:00 + 船名：运程10 + 贸易类型：内贸 + 车型：轿车 + 作业人员：张星星 + 航次：HC867468096 + 港口：上海港 + 车型明细：B系列 + + + 作业记录 + 残损 + + - - - - - - - CJH290387532753799 - - - 品牌：特斯拉 - - - 车型：轿车 - - - - - 船名：运程10 - - - 航次：HC867468096 - - - 场位：A2-09-08 - - - - - 货物状态：已装船 - - - 作业时间：2023/09/08 14:00 - - - 作业人：张星星 - - - - - 质损发生环节：收车交接 - - - 质损概况：碰撞 - - - 处置情况：带伤发运 - - - - - 详情 - - - 编辑 - - - - + + @@ -91,63 +253,118 @@ + + \ No newline at end of file diff --git a/pages/monitor/details.vue b/pages/quality/details.vue similarity index 100% rename from pages/monitor/details.vue rename to pages/quality/details.vue diff --git a/pages/monitor/edit.vue b/pages/quality/edit.vue similarity index 100% rename from pages/monitor/edit.vue rename to pages/quality/edit.vue diff --git a/pages/quality/index.vue b/pages/quality/index.vue new file mode 100644 index 0000000..fb59447 --- /dev/null +++ b/pages/quality/index.vue @@ -0,0 +1,227 @@ + + + + + \ No newline at end of file diff --git a/pages/monitor/sign.vue b/pages/quality/sign.vue similarity index 100% rename from pages/monitor/sign.vue rename to pages/quality/sign.vue diff --git a/pages/shipWork/documentList.vue b/pages/shipWork/documentList.vue index 4550c59..dc8232d 100644 --- a/pages/shipWork/documentList.vue +++ b/pages/shipWork/documentList.vue @@ -77,20 +77,20 @@ } }, mounted() { - this.executeSql1('shipOption') + // this.executeSql1('shipOption') }, methods: { // 查 - executeSql1(tableName) { - let sql = `select * from ${tableName}` - sqlite.executeSqlCeshi(sql).then((value) => { - // 在resolve时执行的回调函数 - console.log(value) - }).catch((error) => { - // 在reject时执行的回调函数 - console.error(error); - }); - }, + // executeSql1(tableName) { + // let sql = `select * from ${tableName}` + // sqlite.executeSqlCeshi(sql).then((value) => { + // // 在resolve时执行的回调函数 + // console.log(value) + // }).catch((error) => { + // // 在reject时执行的回调函数 + // console.error(error); + // }); + // }, toGo(url) { uni.navigateTo({ url: `/pages/shipWork/${url}` diff --git a/pages/shipWork/index.vue b/pages/shipWork/index.vue index aa50163..9226acb 100644 --- a/pages/shipWork/index.vue +++ b/pages/shipWork/index.vue @@ -97,9 +97,6 @@ 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 { @@ -121,8 +118,8 @@ shipInfo: { vslCd: "123", vslCnname: "测试船只", - vvyId: "hangciId", - vvyName: "hangciName", + vvyId: "1", + vvyName: "hc123", importExportFlag: "jinchukouId", importExportFlagName: "进口", tradeType: "maoyileixingId", @@ -304,11 +301,7 @@ dictionariesName: "vvyList", ptrCode: "1", ptrDesc: "hc123", - }, { - dictionariesName: "vvyList", - ptrCode: "2", - ptrDesc: "hc456", - }, + } ] } }, @@ -357,11 +350,12 @@ }, dropTable() { console.log('删除表'); - let sql = 'DROP TABLE shipInfoTable;' + let sql = 'DROP TABLE retallyMessageRespList;' this.executeSql(sql) }, dropData() { - let sql = "delete from shipInfoTable" + console.log('删除数据'); + let sql = "delete from retallyMessageRespList" this.executeSql(sql) }, // 查 @@ -408,7 +402,7 @@ } return newList }, - // 点击页面 + // 点击分页 changePage(e) { this.current = e.current; this.initData() @@ -479,7 +473,6 @@ '${this.shipData.spmCabinht}','${this.shipData.spmMintide}','${this.shipData.spmCab}','${this.shipData.spmBoardCentrele}', '${this.shipData.spmBoardFrontle}','${this.shipData.spmBoardLaterle}','${this.shipData.spmBoardCentrerg}','${this.shipData.spmBoardFrontrg}','${this.shipData.spmBoardLaterrg}', '${webStatus}','${webDate}')` - console.log(sql) this.executeSql(sql) }, // 作业查询数据 diff --git a/pages/shipWork/mixWork.vue b/pages/shipWork/mixWork.vue index 40eb9b6..eef5e8c 100644 --- a/pages/shipWork/mixWork.vue +++ b/pages/shipWork/mixWork.vue @@ -22,14 +22,15 @@ +