diff --git a/common/createDataTable.js b/common/createDataTable.js index 5e5b24f..5367358 100644 --- a/common/createDataTable.js +++ b/common/createDataTable.js @@ -56,7 +56,7 @@ module.exports = { // 创建船舶基本信息 shipInfoTable createShipInfoTable() { let sql = - 'CREATE TABLE if not exists shipInfoTable ("webId" text NOT NULL,"vtpId" text,"agencyCname" text,"ctyCnname" text,"ctyCode" text,"dataVersion" text,"shipCname" text,"shipTypeName" text,"spmBoardCentrele" text,"spmBoardCentrerg" text,"spmBoardFrontle" text,"spmBoardFrontrg" text,"spmBoardLaterle" text,"spmBoardLaterrg" text,"spmCab" text,"spmCabinht" text,"spmCountrycd" text,"spmEdicd" text,"spmId" text,"spmLightWeight" text,"spmMadeTime" text,"spmMintide" text,"spmMmsi" text,"spmNationality" text,"spmPilot" text,"spmPilotName" text,"spmRemark" text,"spmShipSign" text,"spmShipType" text,"spmTotalCargo" text,"spmTrade" text,"spmTradeName" text,"tenantId" text,"termcd" text,"valid" text,"vslAudio" text,"vslBaynum" text,"vslBkbaynum" text,"vslBkendbay" text,"vslBkstartbay" text,"vslBksternnum" text,"vslBreadth" text,"vslCallid" text,"vslCallsign" text,"vslCd" text,"vslCnname" text,"vslCstAgency" text,"vslCstShippingline" text,"vslCtyCountrycd" text,"vslDeckmaxrows" text,"vslDeckmaxtiers" text,"vslDepth" text,"vslDerrickamount" text,"vslDraftload" text,"vslDraftunload" text,"vslEndlength" text,"vslEnname" text,"vslGton" text,"vslHatchamount" text,"vslHatchcoveramount" text,"vslHatchmaxrows" text,"vslHatchmaxtiers" text,"vslImono" text,"vslLcg" text,"vslLoa" text,"vslLoaddisargereq" text,"vslMadedt" text,"vslNetton" text,"vslOrigin" text,"vslPilotage" text,"vslRfsocket" text,"vslSailspeed" text,"vslSpoptp" text,"vslStdId" text,"vslStopsign" text,"vslStowagereq" text,"vslSummaryloading" text,"vslTcg" text,"vslTotallocation" text,"vslUncode" text,"vslVcg" text,"vslVtpcode" text,"webDate" text, PRIMARY KEY("webId"));' + 'CREATE TABLE if not exists shipInfoTable ("webId" text NOT NULL,"vtpId" text,"agencyCname" text,"ctyCnname" text,"ctyCode" text,"dataVersion" text,"shipCname" text,"shipTypeName" text,"spmBoardCentrele" text,"spmBoardCentrerg" text,"spmBoardFrontle" text,"spmBoardFrontrg" text,"spmBoardLaterle" text,"spmBoardLaterrg" text,"spmCab" text,"spmCabinht" text,"spmCountrycd" text,"spmEdicd" text,"spmId" text,"spmLightWeight" text,"spmMadeTime" text,"spmMintide" text,"spmMmsi" text,"spmNationality" text,"spmPilot" text,"spmPilotName" text,"spmRemark" text,"spmShipSign" text,"spmShipType" text,"spmTotalCargo" text,"spmTrade" text,"spmTradeName" text,"tenantId" text,"termcd" text,"valid" text,"vslAudio" text,"vslBaynum" text,"vslBkbaynum" text,"vslBkendbay" text,"vslBkstartbay" text,"vslBksternnum" text,"vslBreadth" text,"vslCallid" text,"vslCallsign" text,"vslCd" text,"vslCnname" text,"vslCstAgency" text,"vslCstShippingline" text,"vslCtyCountrycd" text,"vslDeckmaxrows" text,"vslDeckmaxtiers" text,"vslDepth" text,"vslDerrickamount" text,"vslDraftload" text,"vslDraftunload" text,"vslEndlength" text,"vslEnname" text,"vslGton" text,"vslHatchamount" text,"vslHatchcoveramount" text,"vslHatchmaxrows" text,"vslHatchmaxtiers" text,"vslImono" text,"vslLcg" text,"vslLoa" text,"vslLoaddisargereq" text,"vslMadedt" text,"vslNetton" text,"vslOrigin" text,"vslPilotage" text,"vslRfsocket" text,"vslSailspeed" text,"vslSpoptp" text,"vslStdId" text,"vslStopsign" text,"vslStowagereq" text,"vslSummaryloading" text,"vslTcg" text,"vslTotallocation" text,"vslUncode" text,"vslVcg" text,"vslVtpcode" text,"webDate" text,"actualBerthingTime" text, PRIMARY KEY("webId"));' this.executeSql(sql) }, // 创建船舶计划信息 voyageScheduleDataPadRespDTO @@ -134,7 +134,7 @@ module.exports = { // 创建质量意见征询 shipmentQualityConsultationRespList createShipmentQualityConsultationRespList() { let sql = - 'CREATE TABLE if not exists shipmentQualityConsultationRespList ("vqcId" text NOT NULL,"vtpId" text,"vvyId" text,"vvyName" text,"importExportFlagName" text,"bthId" text,"bthIdName" text,"handlingType" text,"handlingName" text,"vehiclesNumber" text,"spareNumber" text,"operationDate" text,"webStatus" text,"webDate" text, PRIMARY KEY("vqcId"));' + 'CREATE TABLE if not exists shipmentQualityConsultationRespList ("vqcId" text NOT NULL,"vtpId" text,"vvyId" text,"vvyName" text,"importExportFlagName" text,"bthId" text,"bthIdName" text,"handlingType" text,"handlingName" text,"vehiclesNumber" text,"spareNumber" text,"operationDate" text,"webStatus" text,"webDate" text,"vehiclesNumberDe" text,"spareNumberDe" text, PRIMARY KEY("vqcId"));' this.executeSql(sql) }, // 创建质量意见征询评价表 evaluateTable diff --git a/pages/shipWork/index.vue b/pages/shipWork/index.vue index 662dbe5..4412962 100644 --- a/pages/shipWork/index.vue +++ b/pages/shipWork/index.vue @@ -245,7 +245,7 @@ }, dropTable() { console.log('删除表'); - let sql = 'DROP TABLE workQueryDetails;' + let sql = 'DROP TABLE shipmentQualityConsultationRespList;' this.executeSql(sql) }, dropData() { @@ -370,7 +370,7 @@ '${info.vslHatchmaxtiers}','${info.vslImono}','${info.vslLcg}','${info.vslLoa}','${info.vslLoaddisargereq}','${info.vslMadedt}', '${info.vslNetton}','${info.vslOrigin}','${info.vslPilotage}','${info.vslRfsocket}','${info.vslSailspeed}','${info.vslSpoptp}', '${info.vslStdId}','${info.vslStopsign}','${info.vslStowagereq}','${info.vslSummaryloading}','${info.vslTcg}','${info.vslTotallocation}', - '${info.vslUncode}','${info.vslVcg}','${info.vslVtpcode}','${webDate}')` + '${info.vslUncode}','${info.vslVcg}','${info.vslVtpcode}','${webDate}','${info.actualBerthingTime}')` this.executeSql(sql) }, // 船舶计划信息 diff --git a/pages/shipWork/mixSign.vue b/pages/shipWork/mixSign.vue index f73d7b7..ceff6d4 100644 --- a/pages/shipWork/mixSign.vue +++ b/pages/shipWork/mixSign.vue @@ -9,7 +9,7 @@ - +

上海海通国际汽车码头有限公司

@@ -55,15 +55,15 @@ - + - - + + @@ -72,7 +72,7 @@
Working time Kind Of Works B/L Handling method
FromToFromTo Loading/UnLoading Ro/Ro PortDevices
- {{item2.pwcTypeName}} + {{item2.pwcTypeName == '一工班' ? 'First Shift（一工班）' : item2.pwcTypeName == '二工班' ? 'Second Shift（二工班）' : item2.pwcTypeName == '三工班' ? 'Third Shift（三工班）' : ''}} {{item2.workStartTime}} {{item2.workEndTime}} @@ -90,7 +90,7 @@ - + @@ -121,11 +121,11 @@ - + - + @@ -759,7 +759,7 @@ .name { border-right: 1px solid #000; - width: 70px; + width: 200px; text-align: center; display: flex; flex-direction: column; diff --git a/pages/shipWork/noticeAdd.vue b/pages/shipWork/noticeAdd.vue index 4953416..30fcab5 100644 --- a/pages/shipWork/noticeAdd.vue +++ b/pages/shipWork/noticeAdd.vue @@ -113,6 +113,9 @@ this.optionData = value } else if (tableName == 'shipInfoTable') { this.shipInfo = value[0] + if(this.obj.state == "edit" || this.obj.state == "add") { + if(this.shipInfo.actualBerthingTime) this.workDate = this.shipInfo.actualBerthingTime.split(' ')[0] + } } else if (tableName == 'voyageScheduleDataDetailRespDTOList') { this.vvyInfo = value value.forEach((v, index) => { diff --git a/pages/shipWork/opinion.vue b/pages/shipWork/opinion.vue index d308c5f..19627b8 100644 --- a/pages/shipWork/opinion.vue +++ b/pages/shipWork/opinion.vue @@ -13,8 +13,12 @@ 航次：{{item.vvyName}} -

进出口：{{item.importExportFlagName}}

-

贸易类型：{{shipInfo.spmTradeName}}

+ +

车辆数：{{item.handlingType == 2 ? 'discharge' : item.handlingType == 1 ? 'load' : ''}}{{item.vehiclesNumber}}

+

备件数：{{item.handlingType == 2 ? 'discharge' : item.handlingType == 1 ? 'load' : ''}}{{item.spareNumber}}

+

车辆数：{{item.handlingType == '1/2' ? `load${item.vehiclesNumber}/discharge${item.vehiclesNumberDe}` : item.handlingType == '2/1' ? `discharge${item.vehiclesNumber}/load${item.vehiclesNumberDe}` : ''}}

+

备件数：{{item.handlingType == '1/2' ? `load${item.spareNumber}/discharge${item.spareNumberDe}` : item.handlingType == '2/1' ? `discharge${item.spareNumber}/load${item.spareNumberDe}` : ''}}

作业日期：{{item.operationDate}}

 @@ -54,8 +58,10 @@ // 在resolve时执行的回调函数 if (tableName == 'shipInfoTable') { this.shipInfo = value[0] + console.log(this.shipInfo); } else { this.infoList = value + console.log(this.infoList); } }).catch((error) => { // 在reject时执行的回调函数 @@ -123,7 +129,7 @@ flex-wrap: wrap; .li { - width: 33%; + width: 100%; padding: 16px; border: 1px solid #ccc; background-color: #fff; @@ -151,12 +157,12 @@ .liInfo { display: flex; - flex-wrap: wrap; + // flex-wrap: wrap; justify-content: space-between; margin-top: 24px; p { - width: 49%; + width: 30%; margin-bottom: 12px; color: #999; diff --git a/pages/shipWork/opinionAdd.vue b/pages/shipWork/opinionAdd.vue index c977571..398ab91 100644 --- a/pages/shipWork/opinionAdd.vue +++ b/pages/shipWork/opinionAdd.vue @@ -8,48 +8,54 @@

船名：

{{shipInfo.vslCnname}} - -

*航次：

- - {{vvyName}} - - -

进出口：

- {{importExportFlagName}} - - -

贸易类型：

- {{spmTradeName}} -

*泊位：

{{bthIdName}} - -

*装卸类型：

- - {{handlingName}} - - -

*车辆数量：

- - {{vehiclesNumber}} - - -

*备件数量：

- - {{spareNumber}} -

*作业日期：

{{operationDate}} + + + +

*航次：

+ + {{ item.vvyName }} + + +

进出口：

+ + {{ item.importExportFlagName }} + + +

贸易类型：

+ + {{ item.tradeTypeName }} + + +

*装卸类型：

+ + + {{ item.importExportFlagName == "进口" ? '卸货' : '装货' }} + + +

*车辆数量：

+ + {{item['vehiclesNumber' + index]}} + + +

*备件数量：

+ + {{item['spareNumber' + index]}} + { + let vehiclesNumber = 'vehiclesNumber' + index + let spareNumber = 'spareNumber' + index + item[vehiclesNumber] = 0 + item[spareNumber] = 0 + return item + }) + // console.log(this.vvyInfo); value.forEach((v, index) => { this.hcList.push({ text: v.vvyName, @@ -202,8 +220,12 @@ this.bthIdName = this.opinionRow.bthIdName this.handlingType = this.opinionRow.handlingType this.handlingName = this.opinionRow.handlingName - this.vehiclesNumber = this.opinionRow.vehiclesNumber - this.spareNumber = this.opinionRow.spareNumber + this.vvyInfo[0].vehiclesNumber0 = this.opinionRow.vehiclesNumber + this.vvyInfo[0].spareNumber0 = this.opinionRow.spareNumber + if(this.vvyInfo.length > 1) { + this.vvyInfo[1].vehiclesNumber1 = this.opinionRow.vehiclesNumberDe + this.vvyInfo[1].spareNumber1 = this.opinionRow.spareNumberDe + } this.operationDate = this.opinionRow.operationDate this.vvyInfo.forEach(v => { if (this.vvyId == v.vvyId) { @@ -286,17 +308,52 @@ let webStatus = 0 let webDate = api.getDate(date) if (this.obj.state == "edit") { + if(this.vvyInfo.length == 1) { let sql = - `UPDATE shipmentQualityConsultationRespList SET vvyId = '${this.vvyId}', vvyName = '${this.vvyName}', importExportFlagName = '${this.importExportFlagName}', - bthId = '${this.bthId}',bthIdName = '${this.bthIdName}',handlingType = '${this.handlingType}', - handlingName = '${this.handlingName}', vehiclesNumber = '${this.vehiclesNumber}', spareNumber = '${this.spareNumber}', - operationDate = '${this.operationDate}',webStatus = '${webStatus}',webDate = '${webDate}' WHERE vqcId = '${this.opinionRow.vqcId}';` + `UPDATE shipmentQualityConsultationRespList SET vvyId = '${this.vvyInfo[0].vvyId}',vvyName = '${this.vvyInfo[0].vvyName}',importExportFlagName = '${this.vvyInfo[0].importExportFlagName}', + bthId = '${this.bthId}',bthIdName = '${this.bthIdName}',handlingType = '${this.vvyInfo[0].importExportFlagName == '进口' ? '2' : '1'}',handlingName = '${this.vvyInfo[0].importExportFlagName == '进口' ? '卸货' : '装货'}', + vehiclesNumber = '${this.vvyInfo[0].vehiclesNumber0}',spareNumber = '${this.vvyInfo[0].spareNumber0}',operationDate = '${this.operationDate}',webStatus = '${webStatus}',webDate = '${webDate}',vehiclesNumberDe='null',spareNumberDe='null' WHERE vqcId = '${this.opinionRow.vqcId}';` this.executeSql(sql) + } + if(this.vvyInfo.length > 1) { + let vvyId = this.vvyInfo[0].vvyId+'/'+this.vvyInfo[1].vvyId + let vvyName = this.vvyInfo[0].vvyName+'/'+this.vvyInfo[1].vvyName + let importExportFlagName = this.vvyInfo[0].importExportFlagName+'/'+this.vvyInfo[1].importExportFlagName + let handlingType0 = this.vvyInfo[0].importExportFlagName == '进口' ? '2' : '1' + let handlingType1 = this.vvyInfo[1].importExportFlagName == '进口' ? '2' : '1' + let handlingType = handlingType0+'/'+handlingType1 + let handlingName0 = this.vvyInfo[0].importExportFlagName == '进口' ? '卸货' : '装货' + let handlingName1 = this.vvyInfo[1].importExportFlagName == '进口' ? '卸货' : '装货' + let handlingName = handlingName0+'/'+handlingName1 + let sql = + `UPDATE shipmentQualityConsultationRespList SET vvyId = '${vvyId}',vvyName = '${vvyName}',importExportFlagName = '${importExportFlagName}', + bthId = '${this.bthId}',bthIdName = '${this.bthIdName}',handlingType = '${handlingType}',handlingName = '${handlingName}', + vehiclesNumber = '${this.vvyInfo[0].vehiclesNumber0}',spareNumber = '${this.vvyInfo[0].spareNumber0}',operationDate = '${this.operationDate}',webStatus = '${webStatus}',webDate = '${webDate}',vehiclesNumberDe='${this.vvyInfo[1].vehiclesNumber1}',spareNumberDe='${this.vvyInfo[1].spareNumber1}' WHERE vqcId = '${this.opinionRow.vqcId}';` + this.executeSql(sql) + } } else if (this.obj.state == "add") { - let sql = `insert into shipmentQualityConsultationRespList values('${vqcId}','${this.vtpId}','${this.vvyId}','${this.vvyName}','${this.importExportFlagName}', - '${this.bthId}','${this.bthIdName}','${this.handlingType}','${this.handlingName}','${this.vehiclesNumber}', - '${this.spareNumber}','${this.operationDate}','${webStatus}','${webDate}')` + if(this.vvyInfo.length == 1) { + let sql = `insert into shipmentQualityConsultationRespList values('${vqcId}','${this.vvyInfo[0].vtpId}','${this.vvyInfo[0].vvyId}','${this.vvyInfo[0].vvyName}','${this.vvyInfo[0].importExportFlagName}', + '${this.bthId}','${this.bthIdName}','${this.vvyInfo[0].importExportFlagName == '进口' ? '2' : '1'}','${this.vvyInfo[0].importExportFlagName == '进口' ? '卸货' : '装货'}','${this.vvyInfo[0].vehiclesNumber0}', + '${this.vvyInfo[0].spareNumber0}','${this.operationDate}','${webStatus}','${webDate}','null','null')` this.executeSql(sql) + } + if(this.vvyInfo.length > 1) { + let vtpId = this.vvyInfo[0].vtpId + let vvyId = this.vvyInfo[0].vvyId+'/'+this.vvyInfo[1].vvyId + let vvyName = this.vvyInfo[0].vvyName+'/'+this.vvyInfo[1].vvyName + let importExportFlagName = this.vvyInfo[0].importExportFlagName+'/'+this.vvyInfo[1].importExportFlagName + let handlingType0 = this.vvyInfo[0].importExportFlagName == '进口' ? '2' : '1' + let handlingType1 = this.vvyInfo[1].importExportFlagName == '进口' ? '2' : '1' + let handlingType = handlingType0+'/'+handlingType1 + let handlingName0 = this.vvyInfo[0].importExportFlagName == '进口' ? '卸货' : '装货' + let handlingName1 = this.vvyInfo[1].importExportFlagName == '进口' ? '卸货' : '装货' + let handlingName = handlingName0+'/'+handlingName1 + let sql = `insert into shipmentQualityConsultationRespList values('${vqcId}','${vtpId}','${vvyId}','${vvyName}','${importExportFlagName}', + '${this.bthId}','${this.bthIdName}','${handlingType}','${handlingName}','${this.vvyInfo[0].vehiclesNumber0}', + '${this.vvyInfo[0].spareNumber0}','${this.operationDate}','${webStatus}','${webDate}','${this.vvyInfo[1].vehiclesNumber1}','${this.vvyInfo[1].spareNumber1}')` + this.executeSql(sql) + } } uni.navigateTo({ url: '/pages/shipWork/opinion' diff --git a/pages/shipWork/opinionSign.vue b/pages/shipWork/opinionSign.vue index 4ed78bb..f94d3a6 100644 --- a/pages/shipWork/opinionSign.vue +++ b/pages/shipWork/opinionSign.vue @@ -10,7 +10,7 @@ - +

上海海通国际汽车码头有限公司

@@ -41,7 +41,7 @@

装卸量（件）/Qualitu/Pkg’s:

-

{{tableInfo.spareNumber}}

+

{{tableInfo.handlingType == 2 ? 'discharge' : 'load'}}{{tableInfo.vehiclesNumber}}+{{tableInfo.spareNumber}}

泊位/Berth:

@@ -405,6 +405,7 @@ // 在resolve时执行的回调函数 this.tabsList = [] this.tableInfo = value[tabsValue] + // console.log(this.tableInfo); this.executeSq4() this.vvyId = value[0].vvyId value.forEach((v, index) => { @@ -775,7 +776,7 @@ p { display: flex; - flex-direction: column; + // flex-direction: column; justify-content: center; } diff --git a/pages/shipWork/shiftAdd.vue b/pages/shipWork/shiftAdd.vue index 73b19bb..40cbdaa 100644 --- a/pages/shipWork/shiftAdd.vue +++ b/pages/shipWork/shiftAdd.vue @@ -183,11 +183,13 @@ @change="fcChange(item,index)"> -

*翻舱起点位置：

+

翻舱起点位置：

+ -

*翻舱终点位置：

+

翻舱终点位置：

+
翻仓信息Rehangdling（翻舱） Kind of Rehangdling DK/H Working time
  技术工人Tech Stev From To Weight/Measure普通工人Men From To Weight/Measure