diff --git a/pages/index/instruct.vue b/pages/index/instruct.vue index 77e9d12..4810082 100644 --- a/pages/index/instruct.vue +++ b/pages/index/instruct.vue @@ -541,8 +541,25 @@ - + + + + {{item3.amount}} {{item3.potName}} {{item3.stowageNo,}} + + +

+ {{item3.amount}} {{item3.potName}} {{item3.stowageNo,}} +

+ + + + + + { - if (res.data.status == "200") { this.imgInfo = res.data.data // 默认船舱画布高度最小为162 暂定10000 防止不画 @@ -1645,6 +1661,9 @@ success: (res) => { if (res.data.status == "200") { this.goodsInfo = res.data.data + if (this.imgInfo.whetherNormal == "0") { + this.goodsInfo.reverse() + } this.goodsInfo.forEach((item, index) => { item.stowageList.forEach(ele => { let vertexPositionArr = ele.vertexPosition.split(',') @@ -1657,45 +1676,71 @@ ...this.imgInfo.cabinInfoList[index], maxHeight: bigNum }) + this.$set(ele, "isShow", false) }) - this.initCanvas(item, index) + // this.initCanvas(item, index) }) } } }) }, - initCanvas(item, index) { - let canvas = 'mycanvas' + index - const ctx = uni.createCanvasContext(canvas, this) - let sum = item.cabinNo - item.stowageList.forEach(ele => { - // 宽为850 每个仓位为20 850/20 - let widthDw = (42.5 / sum).toFixed(5) - let vertexPositionArr = ele.vertexPosition.split(',') - let x = vertexPositionArr[0] * widthDw - let y = vertexPositionArr[1] * 35 - // let bigNum = (vertexPositionArr[1] + ele.blockLength) * 35 - // console.log(this.imgInfo.cabinInfoList[index]); - // if (this.imgInfo.cabinInfoList[index].maxHeight < bigNum) { - // this.$set(this.imgInfo.cabinInfoList, index, { - // ...this.imgInfo.cabinInfoList[index], - // maxHeight: bigNum - // }) - // } - ctx.setFillStyle(ele.potColor); - // 每层加一个 - ctx.fillRect(x, y, widthDw * ele.blockWidth - 3, ele.blockLength * 35 - 3); - ctx.fillStyle = '#fff' - ctx.font = 'bold 18px Arial' - ctx.setFontSize(20); - let stowageNo = '' - if (ele.stowageNo) { - stowageNo = ',' + ele.stowageNo - } - ctx.fillText(ele.potName + ',' + ele.amount + stowageNo, x, y + 22, widthDw * ele - .blockWidth, ele.blockLength * 35) - }) - ctx.draw(); + // initCanvas(item, index) { + // let canvas = 'mycanvas' + index + // const ctx = uni.createCanvasContext(canvas, this) + // let sum = item.cabinNo + // item.stowageList.forEach(ele => { + // // 宽为850 每个仓位为20 850/20 + // let widthDw = (42.5 / sum).toFixed(5) + // let vertexPositionArr = ele.vertexPosition.split(',') + // let x = vertexPositionArr[0] * widthDw + // let y = vertexPositionArr[1] * 35 + // // let bigNum = (vertexPositionArr[1] + ele.blockLength) * 35 + // // console.log(this.imgInfo.cabinInfoList[index]); + // // if (this.imgInfo.cabinInfoList[index].maxHeight < bigNum) { + // // this.$set(this.imgInfo.cabinInfoList, index, { + // // ...this.imgInfo.cabinInfoList[index], + // // maxHeight: bigNum + // // }) + // // } + // ctx.setFillStyle(ele.potColor); + // // 每层加一个 + // ctx.fillRect(x, y, widthDw * ele.blockWidth - 3, ele.blockLength * 35 - 3); + // ctx.fillStyle = '#fff' + // ctx.font = 'bold 18px Arial' + // ctx.setFontSize(20); + // let stowageNo = '' + // if (ele.stowageNo) { + // stowageNo = ele.stowageNo + // } + // ctx.fillText(ele.amount + ' ' + ele.potName + ' ' + stowageNo, x + 10, y + 22, widthDw * ele + // .blockWidth, ele.blockLength * 35) + // }) + // ctx.draw(); + // }, + showItemDialog(item) { + console.log(item); + }, + getDynamicStyle(item, sum) { + // 计算宽高\\ + // 重新想法子计算 + // 整体宽度为850 哪吒根据sum 每份sun为20 则假如有5个sun 则一份px值为 850/20/5 + let widthDw = (42.5 / sum).toFixed(5) //每一份的px值 + let vertexPositionArr = item.vertexPosition.split(',') + let y = vertexPositionArr[0] * widthDw + let x = vertexPositionArr[1] * 35 + let potColor = "#000" + if (item.potColor) { + potColor = item.potColor + } + return { + top: x + 'px', + left: y + 'px', + width: (widthDw * item.blockWidth - 3) + 'px', + height: (item.blockLength * 35 - 3) + 'px', + color: '#fff', + background: potColor, + overflown: 'hidden' + }; }, // 场位图相关 // 获取左侧堆场列表 @@ -2414,6 +2459,17 @@ width: 850px; } + .myArrList { + position: absolute; + top: 0; + left: 0; + width: 850px; + + .arrItem { + position: absolute; + } + } + } } diff --git a/pages/quality/edit.vue b/pages/quality/edit.vue index acb465a..35c0caa 100644 --- a/pages/quality/edit.vue +++ b/pages/quality/edit.vue @@ -1202,19 +1202,21 @@ // 上传板车照片 select(e) { this.lotusLoadingData.isShow = true - uni.uploadFile({ - url: `${this.$local}/api/file/upload`, //上传图片api - header: { - 'Authorization': `Bearer ${this.loginObj.access_token}` - }, - filePath: e.tempFilePaths[0], - name: 'file', - success: (res) => { - this.lotusLoadingData.isShow = false - this.bcPhoto2.push(e.tempFiles[0]) - let data = JSON.parse(res.data).data - this.bcPhoto.push(data) - }, + e.tempFiles.forEach(v => { + uni.uploadFile({ + url: `${this.$local}/api/file/upload`, //上传图片api + header: { + 'Authorization': `Bearer ${this.loginObj.access_token}` + }, + filePath: v.path, + name: 'file', + success: (res) => { + this.lotusLoadingData.isShow = false + this.bcPhoto2.push(v) + let data = JSON.parse(res.data).data + this.bcPhoto.push(data) + }, + }) }) }, // 上传板车照片移除 @@ -1231,20 +1233,21 @@ // 上传板车车牌照 select2(e) { this.lotusLoadingData.isShow = true - uni.uploadFile({ - url: `${this.$local}/api/file/upload`, //上传图片api - header: { - // "Content-Type": "multipart/form-data", - 'Authorization': `Bearer ${this.loginObj.access_token}` - }, - filePath: e.tempFilePaths[0], - name: 'file', - success: (res) => { - this.lotusLoadingData.isShow = false - this.bcLicense2.push(e.tempFiles[0]) - let data = JSON.parse(res.data).data - this.bcLicense.push(data) - }, + e.tempFiles.forEach(v => { + uni.uploadFile({ + url: `${this.$local}/api/file/upload`, //上传图片api + header: { + 'Authorization': `Bearer ${this.loginObj.access_token}` + }, + filePath: v.path, + name: 'file', + success: (res) => { + this.lotusLoadingData.isShow = false + this.bcLicense2.push(v) + let data = JSON.parse(res.data).data + this.bcLicense.push(data) + }, + }) }) }, // 上传板车车牌照移除 @@ -1261,20 +1264,21 @@ // 上传质损照片 select3(e) { this.lotusLoadingData.isShow = true - uni.uploadFile({ - url: `${this.$local}/api/file/upload`, //上传图片api - header: { - // "Content-Type": "multipart/form-data", - 'Authorization': `Bearer ${this.loginObj.access_token}` - }, - filePath: e.tempFilePaths[0], - name: 'file', - success: (res) => { - this.lotusLoadingData.isShow = false - this.zsPhoto2.push(e.tempFiles[0]) - let data = JSON.parse(res.data).data - this.zsPhoto.push(data) - }, + e.tempFiles.forEach(v => { + uni.uploadFile({ + url: `${this.$local}/api/file/upload`, //上传图片api + header: { + 'Authorization': `Bearer ${this.loginObj.access_token}` + }, + filePath: v.path, + name: 'file', + success: (res) => { + this.lotusLoadingData.isShow = false + this.zsPhoto2.push(v) + let data = JSON.parse(res.data).data + this.zsPhoto.push(data) + }, + }) }) }, // 上传质损照片移除 @@ -1291,21 +1295,22 @@ // 上传车架号图片 select4(e) { this.lotusLoadingData.isShow = true - uni.uploadFile({ - url: `${this.$local}/api/file/upload`, //上传图片api - header: { - // "Content-Type": "multipart/form-data", - 'Authorization': `Bearer ${this.loginObj.access_token}` - }, - filePath: e.tempFilePaths[0], - name: 'file', - success: (res) => { - this.lotusLoadingData.isShow = false - this.carPhoto2.push(e.tempFiles[0]) - let data = JSON.parse(res.data).data - this.carPhoto.push(data) - console.log(this.carPhoto) - }, + e.tempFiles.forEach(v => { + uni.uploadFile({ + url: `${this.$local}/api/file/upload`, //上传图片api + header: { + // "Content-Type": "multipart/form-data", + 'Authorization': `Bearer ${this.loginObj.access_token}` + }, + filePath: v.path, + name: 'file', + success: (res) => { + this.lotusLoadingData.isShow = false + this.carPhoto2.push(v) + let data = JSON.parse(res.data).data + this.carPhoto.push(data) + }, + }) }) }, // 上传车架号图片移除 diff --git a/pages/quality/zsEdit.vue b/pages/quality/zsEdit.vue index f57da0c..665fbe2 100644 --- a/pages/quality/zsEdit.vue +++ b/pages/quality/zsEdit.vue @@ -258,8 +258,6 @@ .mycanvas { margin: auto 0rpx; - background-color: #fff; - border: 1px dashed #eee; } .canvasBg { diff --git a/pages/receipt/details.vue b/pages/receipt/details.vue index cb3b7af..e820384 100644 --- a/pages/receipt/details.vue +++ b/pages/receipt/details.vue @@ -118,24 +118,28 @@ - - -

{{item}}

+ 残损具体情况 + + + +

{{item}}

+ - - - - {{index + 1}} - - - {{item.vinCode}} - - - {{item.qdLinkName}} - - - {{item.disposalSituationName}} + + + {{index + 1}} + + + {{item.vinCode}} + + + {{item.qdLinkName}} + + + {{item.disposalSituationName}} + + @@ -361,7 +365,7 @@ flex-wrap: wrap; font-size: 14px; color: #23262E; - margin-top: 15.5px; + margin-top: 16px; padding: 0 60px; .li { @@ -479,6 +483,20 @@ } .table { + .popupTitle { + width: 100%; + height: 60px; + line-height: 60px; + font-size: 18px; + font-weight: bold; + border-bottom: 1px solid #999; + text-align: center; + } + + .tableContent { + padding: 16px; + } + .tableTop { display: flex; background: #F4F4F4; diff --git a/pages/shipWork/abnormal.vue b/pages/shipWork/abnormal.vue index 14315f2..106245f 100644 --- a/pages/shipWork/abnormal.vue +++ b/pages/shipWork/abnormal.vue @@ -13,9 +13,9 @@ 航次：{{item.vvyName}} -

类型：{{item.type}}

-

进出口：{{item.importExportFlagName}}

-

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

+

类型：{{item.type}}

+

进出口：{{item.importExportFlagName}}

+

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

 @@ -104,11 +104,14 @@ justify-content: flex-end; .sign { - text-align: right; + width: 86px; + height: 36px; + line-height: 36px; + text-align: center; + color: #2979ff; + border: 1px solid #2979ff; + border-radius: 4px; color: #2979ff; - padding: 10px; - background: #fff; - border: 1px solid #ccc; } } @@ -148,14 +151,16 @@ display: flex; flex-wrap: wrap; justify-content: space-between; - margin-top: 16px; + margin-top: 24px; p { width: 49%; margin-bottom: 12px; + color: #999; text { font-weight: bold; + color: #23262e; } } } diff --git a/pages/shipWork/abnormalSign.vue b/pages/shipWork/abnormalSign.vue index f43a488..7600d25 100644 --- a/pages/shipWork/abnormalSign.vue +++ b/pages/shipWork/abnormalSign.vue @@ -313,6 +313,7 @@ padding: 0px 16px; background: #FFFFFF; border-radius: 8px; + font-size: 16px; .head { height: 85px; diff --git a/pages/shipWork/documentList.vue b/pages/shipWork/documentList.vue index bea3a6b..8011027 100644 --- a/pages/shipWork/documentList.vue +++ b/pages/shipWork/documentList.vue @@ -215,7 +215,7 @@ .workBox { background-color: #fff; margin-bottom: 20px; - padding: 25px 16px; + padding: 24px 16px; } .title { @@ -239,7 +239,8 @@ flex-wrap: wrap; .li { - margin: 10px 20px; + margin: 24px; + margin-left: 0; width: 195px; height: 70px; line-height: 70px; diff --git a/pages/shipWork/mafi.vue b/pages/shipWork/mafi.vue index 5c39f10..14b4d3d 100644 --- a/pages/shipWork/mafi.vue +++ b/pages/shipWork/mafi.vue @@ -13,10 +13,10 @@ 航次：{{item.vvyName}} -

马菲板号：{{item.mafiBarcode}}

-

尺码：{{item.size}}

-

类型：{{item.type}}

-

装卸方式：{{item.loadType}}

+

马菲板号：{{item.mafiBarcode}}

+

尺码：{{item.size}}

+

类型：{{item.type}}

+

装卸方式：{{item.loadType}}

未提交审核

@@ -123,11 +123,14 @@ justify-content: flex-end; .sign { - text-align: right; + width: 86px; + height: 36px; + line-height: 36px; + text-align: center; + color: #2979ff; + border: 1px solid #2979ff; + border-radius: 4px; color: #2979ff; - padding: 10px; - background: #fff; - border: 1px solid #ccc; } } @@ -167,14 +170,16 @@ display: flex; flex-wrap: wrap; justify-content: space-between; - margin-top: 16px; + margin-top: 24px; p { width: 49%; margin-bottom: 12px; + color: #999; text { font-weight: bold; + color: #23262e; } } } diff --git a/pages/shipWork/mafiSign.vue b/pages/shipWork/mafiSign.vue index 6a23bfe..11863ba 100644 --- a/pages/shipWork/mafiSign.vue +++ b/pages/shipWork/mafiSign.vue @@ -257,7 +257,7 @@ #t-mafi td { padding: 0px 10px; text-align: center; - height: 30px; + height: 36px; } .container { @@ -295,7 +295,7 @@ .headTItle { display: flex; justify-content: space-around; - padding: 24px 0; + padding: 36px 0; margin: 0 8px; border-bottom: 1px solid #EEEEEE; @@ -341,7 +341,7 @@ .ul { display: flex; flex-wrap: wrap; - padding: 15px 0; + padding: 16px 0; .li { min-width: 33%; diff --git a/pages/shipWork/mixSign.vue b/pages/shipWork/mixSign.vue index e15cc1d..8960aee 100644 --- a/pages/shipWork/mixSign.vue +++ b/pages/shipWork/mixSign.vue @@ -39,6 +39,18 @@

Date:

{{dateId}} + +

Weather:

{{tqInfo}} + + +

Gangs:

{{zyzsInfo}} + + +

Foreman:

{{dcrsInfo}} + + +

Berthed at Haitong:

{{bwInfo}} + @@ -205,6 +217,15 @@ startTime: "", // 一天结束时间 endTime: "", + // 人员信息 + peopleInfo: {}, + peopleList: [], + peopleArr: [], + tqInfo: "", + bwArr: [], + bwInfo: "", + zyzsInfo: 0, + dcrsInfo: 0, // 单证数量 tabsArr: [], gbArr: [], @@ -268,10 +289,24 @@ let arr = api.arrFrom(v.infoArr, "webId") that.$set(v, "infoArr", arr) }) + that.peopleList.forEach(v => { + let endT = v.jobEndTime.slice(0, 10) + if (endT == that.dateId) { + that.peopleArr.push(v) + } + }) + console.log(that.peopleArr) + that.tqInfo = that.peopleArr[0].weatherType + that.peopleArr.forEach(v => { + that.zyzsInfo += Number(v.workSuite) + that.dcrsInfo += Number(v.shipPerson) + that.bwArr.push(v.bthIdName) + }) + that.bwInfo = that.bwArr.join(",") }, 300) }, methods: { - // 查船舶信息 + // 查船舶信息/人员信息 executeSql(tableName) { let sql = `select * from ${tableName} WHERE vtpId = '${this.vtpId}'` sqlite.executeSqlCeshi(sql).then((value) => { @@ -279,7 +314,7 @@ if (tableName == 'shipInfoTable') { this.shipInfo = value[0] } else { - console.log(value) + this.peopleInfo = value[0] } }).catch((error) => { // 在reject时执行的回调函数 @@ -308,10 +343,13 @@ this.executeSql22(sql2, index) let sql3 = `SELECT * FROM retallyMessageRespList WHERE retallyMessageRespList.retallyStartTime>='${this.startTime}' and retallyMessageRespList.retallyEndTime<'${this.endTime}' and vtpId = '${this.vtpId}'` - this.executeSql3(sql3, this.endTime) + this.executeSql3(sql3) let sql4 = `SELECT * FROM infoRespList WHERE infoRespList.startTm>='${this.startTime}' and infoRespList.endTm<'${this.endTime}' and vtpId = '${this.vtpId}'` - this.executeSql4(sql4, 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 that = this setTimeout(function() { @@ -386,7 +424,7 @@ }); }, // 查翻仓信息 - executeSql3(sql, endTIme) { + executeSql3(sql) { sqlite.executeSqlCeshi(sql).then((value) => { if (value.length > 0) { this.fcList.push(...value) @@ -398,7 +436,7 @@ }); }, // 查其他信息 - executeSql4(sql, endTIme) { + executeSql4(sql) { sqlite.executeSqlCeshi(sql).then((value) => { // 在resolve时执行的回调函数 if (value.length > 0) { @@ -410,6 +448,19 @@ console.error(error); }); }, + // 查人员信息 + executeSql6(sql) { + sqlite.executeSqlCeshi(sql).then((value) => { + // 在resolve时执行的回调函数 + if (value.length > 0) { + this.peopleList.push(...value) + } + this.peopleList = api.arrFrom(this.peopleList, "pmeId") + }).catch((error) => { + // 在reject时执行的回调函数 + console.error(error); + }); + }, // 查单证签字表 executeSql5() { let sql = `select * from workSignTable WHERE bizId = '${this.dateId}';` @@ -480,6 +531,12 @@ this.shiftInf = [] this.fcArr = [] this.qtArr = [] + this.peopleArr = [] + this.tqInfo = "" + this.zyzsInfo = 0 + this.dcrsInfo = 0 + this.bwArr = [] + this.bwInfo = "" this.executeSql2(0) this.executeSql5() this.shiftInfo.forEach(v => { @@ -506,6 +563,19 @@ if (this.qtArr.length == 0) { this.qtArr.push({}) } + this.peopleList.forEach(v => { + let endT = v.jobEndTime.slice(0, 10) + if (endT == this.dateId) { + this.peopleArr.push(v) + } + }) + this.tqInfo = this.peopleArr[0].weatherType + this.peopleArr.forEach(v => { + this.zyzsInfo += Number(v.workSuite) + this.dcrsInfo += Number(v.shipPerson) + this.bwArr.push(v.bthIdName) + }) + this.bwInfo = this.bwArr.join(",") }, // 点击签名 togoSign(signType) { diff --git a/pages/shipWork/mixWork.vue b/pages/shipWork/mixWork.vue index 096de12..5819668 100644 --- a/pages/shipWork/mixWork.vue +++ b/pages/shipWork/mixWork.vue @@ -18,7 +18,7 @@ 航次：{{item.vvyName}} -

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

+

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

进出口：{{item.importExportFlagName}}

作业组数：{{item.workSuite}}

单船人数：{{item.shipPerson}}

@@ -284,21 +284,25 @@ padding-right: 20px; .addBtn { - width: 80px; + width: 86px; + height: 36px; + line-height: 36px; + text-align: center; background-color: #2979ff; color: #fff; - text-align: center; - padding: 10px; margin-right: 10px; + border-radius: 4px; } .sign { - width: 80px; + width: 86px; + height: 36px; + line-height: 36px; text-align: center; color: #2979ff; - padding: 10px; - background: #fff; - border: 1px solid #ccc; + border: 1px solid #2979ff; + border-radius: 4px; + color: #2979ff; } } @@ -360,14 +364,16 @@ display: flex; flex-wrap: wrap; justify-content: space-between; - margin-top: 16px; + margin-top: 24px; p { width: 49%; margin-bottom: 12px; + color: #999; text { font-weight: bold; + color: #23262E; } } } diff --git a/pages/shipWork/notice.vue b/pages/shipWork/notice.vue index 158f2b0..5c31eb1 100644 --- a/pages/shipWork/notice.vue +++ b/pages/shipWork/notice.vue @@ -13,9 +13,9 @@ 航次：{{item.vvyName}} -

进出口：{{item.importExportFlagName}}

-

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

-

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

+

进出口：{{item.importExportFlagName}}

+

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

+

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

 @@ -104,11 +104,14 @@ justify-content: flex-end; .sign { - text-align: right; + width: 86px; + height: 36px; + line-height: 36px; + text-align: center; + color: #2979ff; + border: 1px solid #2979ff; + border-radius: 4px; color: #2979ff; - padding: 10px; - background: #fff; - border: 1px solid #ccc; } } @@ -148,14 +151,16 @@ display: flex; flex-wrap: wrap; justify-content: space-between; - margin-top: 16px; + margin-top: 24px; p { width: 49%; margin-bottom: 12px; + color: #999; text { font-weight: bold; + color: #23262e; } } } diff --git a/pages/shipWork/opinion.vue b/pages/shipWork/opinion.vue index 60f22c7..d308c5f 100644 --- a/pages/shipWork/opinion.vue +++ b/pages/shipWork/opinion.vue @@ -13,9 +13,9 @@ 航次：{{item.vvyName}} -

进出口：{{item.importExportFlagName}}

-

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

-

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

+

进出口：{{item.importExportFlagName}}

+

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

+

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

 @@ -106,11 +106,14 @@ justify-content: flex-end; .sign { - text-align: right; + width: 86px; + height: 36px; + line-height: 36px; + text-align: center; + color: #2979ff; + border: 1px solid #2979ff; + border-radius: 4px; color: #2979ff; - padding: 10px; - background: #fff; - border: 1px solid #ccc; } } @@ -150,14 +153,16 @@ display: flex; flex-wrap: wrap; justify-content: space-between; - margin-top: 16px; + margin-top: 24px; p { width: 49%; margin-bottom: 12px; + color: #999; text { font-weight: bold; + color: #23262e; } } } diff --git a/pages/shipWork/opinionSign.vue b/pages/shipWork/opinionSign.vue index efe2618..4ed78bb 100644 --- a/pages/shipWork/opinionSign.vue +++ b/pages/shipWork/opinionSign.vue @@ -808,13 +808,8 @@ } } - #t-main { - border-collapse: collapse; - border-spacing: 0px; - - td { - padding: 0px 10px; - } + .t-main { + font-size: 16px; } .content { diff --git a/pages/shipWork/patrol.vue b/pages/shipWork/patrol.vue index 38fb2c0..39650f5 100644 --- a/pages/shipWork/patrol.vue +++ b/pages/shipWork/patrol.vue @@ -10,9 +10,9 @@ 航次：{{item.vvyName}} -

类型：{{item.type}}

-

贸易类型：{{item.tradeTypeName}}

-

进出口：{{item.importExportName}}

+

类型：{{item.type}}

+

贸易类型：{{item.tradeTypeName}}

+

进出口：{{item.importExportName}}