From ffd3238acb14d2d0b33700c677be4c70813508f6 Mon Sep 17 00:00:00 2001 From: wuwx <1960@qq.com> Date: Tue, 26 Mar 2024 09:33:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/discharge/index.vue | 4 + pages/discharge/instruct.vue | 17 +- pages/index/domesticTrade.vue | 15 +- pages/index/index.vue | 4 + pages/index/instruct.vue | 37 +- pages/monitor/index.vue | 17 +- pages/quality/index.vue | 11 +- pages/receipt/details.vue | 2 +- pages/shipWork/carDetails.vue | 46 +- pages/shipWork/mixSign.vue | 893 +++++++++++++++++++++++++++------ pages/shipWork/mixSign1.vue | 896 ++++++++++++++++++++++++++++++++++ pages/shipWork/noticeAdd.vue | 2 +- pages/shipWork/noticeSign.vue | 2 +- pages/shipWork/patrolAdd.vue | 3 +- 14 files changed, 1757 insertions(+), 192 deletions(-) create mode 100644 pages/shipWork/mixSign1.vue diff --git a/pages/discharge/index.vue b/pages/discharge/index.vue index 3099e08..3dda369 100644 --- a/pages/discharge/index.vue +++ b/pages/discharge/index.vue @@ -314,6 +314,10 @@ this.onSearch() this.$refs.showRight.close(); }, + //返回 + back() { + this.$refs.showRight.close(); + }, //切换时间 changeLog(e) { if(e.length) { diff --git a/pages/discharge/instruct.vue b/pages/discharge/instruct.vue index b2971b4..93cdeb5 100644 --- a/pages/discharge/instruct.vue +++ b/pages/discharge/instruct.vue @@ -28,7 +28,7 @@ + placeholder="提单号" @iconClick="search" @input="inputChange">

品牌

@@ -219,7 +219,7 @@ + placeholder="提单号" @iconClick="search" @input="inputChange">

发送状态

@@ -436,7 +436,7 @@ + placeholder="提单号" @iconClick="search" @input="inputChange">

品牌

@@ -589,7 +589,7 @@ + placeholder="提单号" @iconClick="search" @input="inputChange">

堆场

@@ -793,6 +793,7 @@ diff --git a/pages/receipt/details.vue b/pages/receipt/details.vue index de31ce1..15c17cb 100644 --- a/pages/receipt/details.vue +++ b/pages/receipt/details.vue @@ -284,7 +284,7 @@ toSign(type) { this.shipInfo['type'] = type const params = encodeURIComponent(JSON.stringify(this.shipInfo)); - uni.reLaunch({ + uni.redirectTo({ url: '/pages/receipt/sign?params=' + params }) }, diff --git a/pages/shipWork/carDetails.vue b/pages/shipWork/carDetails.vue index 5d480bd..597e348 100644 --- a/pages/shipWork/carDetails.vue +++ b/pages/shipWork/carDetails.vue @@ -118,9 +118,9 @@ {{ item.yardPos }} - + @@ -185,27 +185,27 @@ console.error(error); }); }, - initData() { - let newArr = this.getMapping(this.vinCodeDetails, this.pageSize) - this.vinCodeDetails = newArr[this.pageCurrent - 1]; - }, - // 点击分页 - pageChange(e) { - this.pageCurrent = e.current - this.initData() - }, - // 分页切割数组(数组，分割个数) - getMapping(list, num) { - let len = list.length - let newList = [] - if (len) { - var chunk = num - for (var i = 0, j = len; i < j; i += chunk) { - newList.push(list.slice(i, i + chunk)) - } - } - return newList - }, + // initData() { + // let newArr = this.getMapping(this.vinCodeDetails, this.pageSize) + // this.vinCodeDetails = newArr[this.pageCurrent - 1]; + // }, + // // 点击分页 + // pageChange(e) { + // this.pageCurrent = e.current + // this.initData() + // }, + // // 分页切割数组(数组，分割个数) + // getMapping(list, num) { + // let len = list.length + // let newList = [] + // if (len) { + // var chunk = num + // for (var i = 0, j = len; i < j; i += chunk) { + // newList.push(list.slice(i, i + chunk)) + // } + // } + // return newList + // }, }, } diff --git a/pages/shipWork/mixSign.vue b/pages/shipWork/mixSign.vue index ceff6d4..5280fe3 100644 --- a/pages/shipWork/mixSign.vue +++ b/pages/shipWork/mixSign.vue @@ -12,14 +12,14 @@ -

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

+ 上海海通国际汽车码头有限公司 SHANGHAI HAITONG INTERNATIONAL AUTOMOTIVE TERMINAL CO. LTD. -

海通码头装卸和杂项作业单

+ 海通码头装卸和杂项作业单 SHANGHAI HARBOUR BUREAU STEVEDORE WORKING RECORD @@ -31,158 +31,364 @@ -

Name of ship:

{{shipInfo.vslCnname}} + Name of ship:{{shipInfo.vslCnname}} -

Voy No:

{{vvyName}} + Voy No:{{vvyName}} -

Date:

{{dateId}} + Weather:{{tqInfo}} -

Weather:

{{tqInfo}} + Date:{{dateId}} -

Gangs:

{{zyzsInfo}} + Gangs:{{zyzsInfo}} -

Foreman:

{{dcrsInfo}} + Foreman:{{dcrsInfo}} - + + + Foreman Working time:？？？ + + + Berthed at Haitong: + + + + + + + + {{bwInfo}} - - - - - - - - - - - - - - - - - - -
Working timeKind Of WorksB/LHandling method
FromToLoading/UnLoadingRo/RoPortDevicesOthers
- - {{item2.pwcTypeName == '一工班' ? 'First Shift（一工班）' : item2.pwcTypeName == '二工班' ? 'Second Shift（二工班）' : item2.pwcTypeName == '三工班' ? 'Third Shift（三工班）' : ''}} - {{item2.workStartTime}} - {{item2.workEndTime}} - - - - 车型:{{item3.carTypeName}},数量:{{item3.goodsNumber}} + + + + + + + + Working time + + + + From + + + To + + + + + + Kind Of Works + + + Loading/UnLoading + + + + + + B/L + + + + Handling method + + + Ro/Ro + PortDevices + Others - {{item3.remark}} - √ - √ - √ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + {{item2.pwcTypeName == '一工班' ? 'First Shift' : item2.pwcTypeName == '二工班' ? 'Second Shift' : item2.pwcTypeName == '三工班' ? 'Third Shift' : ''}} + + + + {{item2.workStartTime}} + + + {{item2.workEndTime}} + + + + + 车型:{{item3.carTypeName}},数量:{{item3.goodsNumber}} + + + + + - -
Rehangdling（翻舱）Kind of RehangdlingDK/HWorking timeWeight/Measure
FromToFromToVehicle type/QuantityTotal W/M
{{item.retallyTypeName}}{{item.retallyOrigin}}{{item.retallyTerminus}}{{item.retallyStartTime}}{{item.retallyEndTime}}车型:{{item.carTypeName}},数量:{{item.goodsNumber}}重量:{{item.goodsWeight}},体积:{{item.goodsVolume}}
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 Tech StevFromToWeight/MeasureMenFromToWeight/Measure
 {{v.tecNum}}{{v.startTm}}{{v.endTm}}重量:{{v.weight}},体积:{{v.volume}}{{v.genNum}}{{v.startTmPt}}{{v.endTmPt}}重量:{{v.weightPt}},体积:{{v.volumePt}}
Extra Labour（辅助作业）{{v.auxRemark}}
Stand by（待工）{{v.waitRemark}}
Remark（备注）{{v.workRemark}}
- - - - - -

指导员:

-

Foreman:

+ + + + + + + + + + + √ + + + √ + + + √ + + + + - - 去签名 + + + Rehangdling（翻舱） + + + + + + Kind of Rehangdling + + + + DK/H + + From + To + + + + Working time + + From + To + + + + + + Weight/Measure + + Vehicle type/Quantity + Total W/M + + + + + + + + + Shift Of Pier + + + + + + {{item.retallyOrigin}} + {{item.retallyOrigin}} + + + {{item.retallyStartTime}} + {{item.retallyEndTime}} + + + + + 车型:{{item.carTypeName}},数量:{{item.goodsNumber}} + + + 重量:{{item.goodsWeight}},体积:{{item.goodsVolume}} + + + + + + + + + + Shift Of Dock + + + + + + {{item.retallyOrigin}} + {{item.retallyOrigin}} + + + {{item.retallyStartTime}} + {{item.retallyEndTime}} + + + + + 车型:{{item.carTypeName}},数量:{{item.goodsNumber}} + + + 重量:{{item.goodsWeight}},体积:{{item.goodsVolume}} + + + + + + + + + + Reloading + + + + + + {{item.retallyOrigin}} + {{item.retallyOrigin}} + + + {{item.retallyStartTime}} + {{item.retallyEndTime}} + + + + + 车型:{{item.carTypeName}},数量:{{item.goodsNumber}} + + + 重量:{{item.goodsWeight}},体积:{{item.goodsVolume}} + + + + + + + - - - + + + + + + Reason + + + Tech Stev + Men + From + To + + + Weight/Measure + + + + + + Extra Labour + + + + + + {{ JSGR[0].totalTecNum }} + + + + + + + + {{ JSGR[0].minStartTime }} + + + + {{ JSGR[0].maxEndTime }} + + + + + {{ JSGR[0].totalWeight }}/{{ JSGR[0].totalvolume }} + + + + + + Stand by + + + {{ JSGR[0].allWaitRemark }} + + + + + Remark + + + {{ JSGR[0].allAuxRemark }} + + + - - - -

船长/大副:

-

Capt/Chief Mate:

+ + + + +

指导员:

+

Foreman:

+ + + 去签名 + + + + + - - 去签名 - - - - + + + +

船长/大副:

+

Capt/Chief Mate:

+ + + 去签名 + + + + + @@ -232,11 +438,11 @@ // 船舶信息 shipInfo: {}, shiftInfo: [], - // 工班信息 - shiftList: [], // 翻仓信息 fcList: [], - fcArr: [], + fcArr1: [], + fcArr2: [], + fcArr3: [], // 其他信息 qtList: [], qtArr: [], @@ -251,6 +457,8 @@ id: "" }, delId: "", + PTGR:[], + JSGR:[] } }, onLoad(option) { @@ -268,7 +476,13 @@ that.fcList.forEach(v => { let endT = v.retallyEndTime.slice(0, 10) if (endT == that.dateId) { - that.fcArr.push(v) + if(v.retallyTypeName == '舱内翻') { + that.fcArr1.push(v) + } else if(v.retallyTypeName == '舱外翻'){ + that.fcArr2.push(v) + } else if(v.retallyTypeName == '货物重装') { + that.fcArr3.push(v) + } } }) that.qtList.forEach(v => { @@ -343,12 +557,19 @@ let sql3 = `SELECT * FROM retallyMessageRespList WHERE retallyMessageRespList.retallyStartTime>='${this.startTime}' and retallyMessageRespList.retallyEndTime<'${this.endTime}' and vtpId = '${this.vtpId}'` this.executeSql3(sql3) - let sql4 = `SELECT * FROM infoRespList WHERE infoRespList.startTm>='${this.startTime}' and - infoRespList.endTm<'${this.endTime}' and vtpId = '${this.vtpId}'` + // let sql4 = `SELECT * FROM infoRespList WHERE infoRespList.startTm>='${this.startTime}' and + // infoRespList.endTm<'${this.endTime}' and vtpId = '${this.vtpId}'` + // 普通工人查询 + let sql4 = `SELECT MIN(startTmPt) AS minStartTimePt,MAX(endTmPt) AS maxEndTimePt,SUM(genNum) AS totalGenNum,SUM(weightPt) AS totalWeightPt,SUM(volumePt) AS totalvolumePt + FROM infoRespList WHERE vtpId = '${this.vtpId}' AND startTmPt>='${this.startTime}' AND endTmPt<='${this.endTime}'` this.executeSql4(sql4) let sql5 = `SELECT * FROM messageRespList WHERE messageRespList.jobStartTime>='${this.startTime}' and messageRespList.jobEndTime<'${this.endTime}' and vtpId = '${this.vtpId}'` this.executeSql6(sql5) + // 技术工人查询 + let sql6 = `SELECT MIN(startTm) AS minStartTime,MAX(endTm) AS maxEndTime,SUM(tecNum) AS totalTecNum,SUM(weight) AS totalWeight,SUM(volume) AS totalvolume,GROUP_CONCAT(waitRemark, ', ') AS allWaitRemark, GROUP_CONCAT(auxRemark, ', ') AS allAuxRemark + FROM infoRespList WHERE vtpId = '${this.vtpId}' AND startTm>='${this.startTime}'AND endTm<='${this.endTime}'` + this.executeSql7(sql6) }) let that = this setTimeout(function() { @@ -434,14 +655,28 @@ console.error(error); }); }, - // 查其他信息 + // 查普通工人信息 executeSql4(sql) { sqlite.executeSqlCeshi(sql).then((value) => { // 在resolve时执行的回调函数 + // console.log('value',value); if (value.length > 0) { - this.qtList.push(...value) + this.PTGR.push(...value) } - this.qtList = api.arrFrom(this.qtList, "webId") + // this.qtList = api.arrFrom(this.qtList, "webId") + }).catch((error) => { + // 在reject时执行的回调函数 + console.error(error); + }); + }, + // 查技术工人信息 + executeSql7(sql) { + sqlite.executeSqlCeshi(sql).then((value) => { + // 在resolve时执行的回调函数 + if (value.length > 0) { + this.JSGR.push(...value) + } + // this.qtList = api.arrFrom(this.qtList, "webId") }).catch((error) => { // 在reject时执行的回调函数 console.error(error); @@ -528,7 +763,9 @@ this.tabsList = [] this.shiftList = [] this.shiftInf = [] - this.fcArr = [] + this.fcArr1 = [] + this.fcArr2 = [] + this.fcArr3 = [] this.qtArr = [] this.peopleArr = [] this.tqInfo = "" @@ -545,7 +782,13 @@ this.fcList.forEach(v => { let endT = v.retallyEndTime.slice(0, 10) if (endT == this.dateId) { - this.fcArr.push(v) + if(v.retallyTypeName == '舱内翻') { + this.fcArr1.push(v) + } else if(v.retallyTypeName == '舱外翻'){ + this.fcArr2.push(v) + } else if(v.retallyTypeName == '货物重装') { + this.fcArr3.push(v) + } } }) this.qtList.forEach(v => { @@ -655,7 +898,7 @@ justify-content: center; text-align: right; - p { + .p { font-size: 22px; color: #0052A4; font-weight: bold; @@ -679,7 +922,7 @@ flex: 3; text-align: center; - p { + .p { font-size: 24px; color: #23262E; font-weight: bold; @@ -716,12 +959,12 @@ .ul { display: flex; - justify-content: space-between; + justify-content: flex-start; flex-wrap: wrap; padding: 15px 0; .li { - width: 33%; + width: 33.33%; display: flex; justify-content: center; @@ -729,7 +972,24 @@ color: #23262E; font-weight: bold; font-size: 14px; - margin-left: 8px; + width: 50%; + } + + text:first-child { + text-align: right; + } + } + + .li:last-child { + width: 66.67%; + + text { + + width: 75%; + } + + text:first-child { + width: 25%; } } } @@ -739,6 +999,347 @@ } } + .bo_r { + border-right: 1px solid #000; + } + + .bo_b { + border-bottom: 1px solid #000; + } + + .bo_l { + border-left: 1px solid #000; + } + + .cellX { + display: flex; + } + + .rowOne { + width: 100%; + height: 60px; + display: flex; + justify-content: space-between; + border: 1px solid #000; + border-bottom: 0; + text-align: center; + background-color: #e9e9e9; + + .left { + width: 55%; + display: flex; + + .cell { + width: 25%; + border-right: 1px solid #000; + } + + .cellY { + display: flex; + flex-direction: column; + + .item { + height: 30px; + line-height: 30px; + } + + .cellX { + height: 30px; + line-height: 30px; + display: flex; + justify-content: space-around; + + view { + width: 50%; + } + } + + } + + .cellB { + width: 50%; + + view { + height: 30px; + line-height: 30px; + } + } + } + + .right { + width: 45%; + text-align: center; + + .itemLeft { + width: 30%; + line-height: 60px; + } + + .cellY { + height: 30px; + line-height: 30px; + display: flex; + flex-direction: column; + } + + .itemRight { + width: 70%; + + text { + width: 33.3333%; + } + } + } + } + + .rowTwo { + width: 100%; + display: flex; + justify-content: space-between; + border: 1px solid #000; + border-bottom: 0; + text-align: center; + + .left { + width: 55%; + display: flex; + min-height: 30px; + line-height: 30px; + + .cell { + width: 25%; + vertical-align: middle; + } + + .cellX { + display: flex; + justify-content: space-between; + + .item { + width: 50%; + } + } + + .cellY { + width: 50%; + text-align: center; + + .item { + width: 100%; + line-height: 30px; + border-bottom: 1px solid #000; + } + + .item:last-child { + border-bottom: 0; + } + } + } + + .right { + width: 45%; + line-height: 30px; + + .itemLeft { + width: 30%; + } + + .itemRight { + width: 70%; + position: relative; + + .gezi { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + display: flex; + + view { + width: 33.33%; + border-right: 1px solid #000; + } + + view:last-child { + width: 33.34%; + border-right: 0; + } + } + + .itemList { + width: 100%; + height: auto; + display: flex; + + .item { + width: 33.3333%; + } + } + + .itemList:last-child { + border: 0; + } + + } + } + } + + .rowThree { + display: flex; + border: 1px solid #000; + border-bottom: 0; + text-align: center; + + .title { + // 0.55*0.25 + width: 13.75%; + line-height: 30px; + } + + .fclist { + display: flex; + width: 86.25%; + flex-direction: column; + + .fcbt { + line-height: 30px; + text-align: center; + border-bottom: 1px solid #000; + + .bt { + display: flex; + + .kind { + width: 15.96%; + } + + .ceY { + width: 84.04%; + + .concat { + width: 100%; + display: flex; + border-bottom: 1px solid #000; + + .date { + width: 37.84%; + } + + .weight { + width: 62.16%; + } + } + + .concat:last-child { + border-bottom: 0; + } + } + + + .date { + width: 31.8%; + display: flex; + + .item { + width: 50%; + display: flex; + + .sz { + width: 50%; + } + } + + .cellY { + width: 100%; + + .cellX view { + width: 50%; + } + } + } + + .weight { + width: 52.24%; + + .text { + width: 50%; + } + + .cellX view { + width: 50%; + } + } + + } + } + + } + } + + .rowFour { + text-align: center; + line-height: 30px; + + .row { + display: flex; + height: 30px; + width: 100%; + border-bottom: 1px solid #000; + } + + .rowC { + display: flex; + height: 60px; + width: 100%; + border-bottom: 1px solid #000; + + .date { + .sz { + height: 30px; + width: 100%; + border-right: 1px solid #000; + } + } + } + + .title { + // 0.55*0.25 + width: 13.75%; + } + + .kind { + width: 13.78%; + } + + .rownr { + // 0.55*0.25 + width: 86.25%; + } + + .date { + width: 27.45%; + display: flex; + justify-content: space-around; + + view { + width: 25%; + } + } + + .weight { + width: 45%; + text-align: center; + + .sz { + height: 30px; + } + } + + } + + + .headZx { background: #E9E9E9; } diff --git a/pages/shipWork/mixSign1.vue b/pages/shipWork/mixSign1.vue new file mode 100644 index 0000000..7fd893b --- /dev/null +++ b/pages/shipWork/mixSign1.vue @@ -0,0 +1,896 @@ + + + + + \ No newline at end of file diff --git a/pages/shipWork/noticeAdd.vue b/pages/shipWork/noticeAdd.vue index 30fcab5..62d4de7 100644 --- a/pages/shipWork/noticeAdd.vue +++ b/pages/shipWork/noticeAdd.vue @@ -114,7 +114,7 @@ } 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] + if(this.shipInfo.actualBerthingTime != 'null') this.workDate = this.shipInfo.actualBerthingTime.split(' ')[0] } } else if (tableName == 'voyageScheduleDataDetailRespDTOList') { this.vvyInfo = value diff --git a/pages/shipWork/noticeSign.vue b/pages/shipWork/noticeSign.vue index 3116684..1652a28 100644 --- a/pages/shipWork/noticeSign.vue +++ b/pages/shipWork/noticeSign.vue @@ -9,7 +9,7 @@ - +

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

diff --git a/pages/shipWork/patrolAdd.vue b/pages/shipWork/patrolAdd.vue index 4e1bdcd..dddbb67 100644 --- a/pages/shipWork/patrolAdd.vue +++ b/pages/shipWork/patrolAdd.vue @@ -37,7 +37,7 @@ - + @@ -215,6 +215,7 @@ method: 'GET', //请求方式，必须为大写 success: (res) => { if (res.statusCode == 200) { + console.log('res',res.data); this.urlList2.push(res.data) } }