diff --git a/common/createDataTable.js b/common/createDataTable.js index 0cced17..5e5b24f 100644 --- a/common/createDataTable.js +++ b/common/createDataTable.js @@ -46,6 +46,8 @@ module.exports = { this.createShipmentShipLoadPlansRespList() // 创建作业查询明细 this.createWorkQueryDetails() + // 创建作业查询车架号明细 + this.createVinCodeDetails() // 创建下拉数据 this.createShipOption() // 创建单证签名表 @@ -168,13 +170,19 @@ module.exports = { // 创建作业查询 shipmentShipLoadPlansRespList createShipmentShipLoadPlansRespList() { let sql = - 'CREATE TABLE if not exists shipmentShipLoadPlansRespList ("webId" text NOT NULL,"vtpId" text,"agentId" text,"agentName" text,"amount" text,"brdId" text,"brdName" text,"bvdId" text,"bvdName" text,"bvmId" text,"bvmName" text,"carHeight" text,"carLength" text,"carWidth" text,"customsDeclareNo" text,"customsDeclareStatus" text,"mnfBl" text,"potId" text,"potName" text,"sourceType" text,"vvyId" text,"vvyName" text,"yardPos" text,"webStatus" text,"webDate" text, PRIMARY KEY("webId"));' + 'CREATE TABLE if not exists shipmentShipLoadPlansRespList ("webId" text NOT NULL,"vtpId" text,"agentId" text,"agentName" text,"amount" text,"brdId" text,"brdName" text,"bvdId" text,"bvdName" text,"bvmId" text,"bvmName" text,"carHeight" text,"carLength" text,"carWidth" text,"consignee" text,"customsDeclareNo" text,"customsDeclareStatus" text,"ieFg" text,"ieFgNm" text,"mnfBl" text,"model" text,"potId" text,"potName" text,"sourceType" text,"sourceTypeNm" text,"spmId" text,"telephone" text,"ticketGtpks" text,"ticketVolume" text,"ticketWeight" text,"tradeType" text,"tradeTypeNm" text,"volume" text,"vslCnname" text,"vvyId" text,"vvyName" text,"weight" text,"yardPos" text,"webStatus" text,"webDate" text, PRIMARY KEY("webId"));' this.executeSql(sql) }, // 创建作业查询明细 workQueryDetails createWorkQueryDetails() { let sql = - 'CREATE TABLE if not exists workQueryDetails ("webId" text NOT NULL,"vtpId" text,"contactId" text,"agentId" text,"agentName" text,"amount" text,"brdId" text,"brdName" text,"bvdId" text,"bvdName" text,"bvmId" text,"bvmName" text,"carHeight" text,"carLength" text,"carWidth" text,"consignee" text,"customsDeclareNo" text,"customsDeclareStatus" text,"importExportFlag" text,"mnfBl" text,"model" text,"potId" text,"potName" text,"sourceType" text,"spmId" text,"telephone" text,"ticketGtpks" text,"ticketVolume" text,"ticketWeight" text,"tradeType" text,"webStatus" text,"webDate" text, PRIMARY KEY("webId"));' + 'CREATE TABLE if not exists workQueryDetails ("webId" text NOT NULL,"vtpId" text,"contactId" text,"agentId" text,"agentName" text,"amount" text,"brdId" text,"brdName" text,"bvdId" text,"bvdName" text,"bvmId" text,"bvmName" text,"carHeight" text,"carLength" text,"carWidth" text,"consignee" text,"customsDeclareNo" text,"customsDeclareStatus" text,"ieFg" text,"ieFgNm" text,"mnfBl" text,"model" text,"potId" text,"potName" text,"sourceType" text,"sourceTypeNm" text,"spmId" text,"telephone" text,"ticketGtpks" text,"ticketVolume" text,"ticketWeight" text,"tradeType" text,"tradeTypeNm" text,"volume" text,"vslCnname" text,"vvyId" text,"vvyName" text,"weight" text,"yardPos" text,"webStatus" text,"webDate" text, PRIMARY KEY("webId"));' + this.executeSql(sql) + }, + // 创建作业查询车架号明细 + createVinCodeDetails() { + let sql = + 'CREATE TABLE if not exists vinCodeDetails ("webId" text NOT NULL,"vtpId" text,"contactId" text,"godId" text,"storeArea" text,"storeLine" text,"storeSeat" text,"vinCode" text,"yacId" text,"yardId" text,"yardName" text,"yardPos" text,"webStatus" text,"webDate" text, PRIMARY KEY("webId"));' this.executeSql(sql) }, // 创建下拉数据 shipOption diff --git a/components/head-view/head-view.vue b/components/head-view/head-view.vue index e681efd..c9081ec 100644 --- a/components/head-view/head-view.vue +++ b/components/head-view/head-view.vue @@ -60,6 +60,14 @@ mounted() { this.vtpId = uni.getStorageSync('vtpId') this.executeSql1("voyageScheduleDataDetailRespDTOList") + let that = this + setTimeout(function() { + that.shipList.forEach((v, index) => { + if (v.vtpId == that.vtpId) { + that.activeIndex = index + } + }) + }, 100) }, methods: { // 船只 @@ -90,6 +98,7 @@ this.$refs.popup.close() this.title = `${this.shipName} 进口航次：${this.inVvyName} / 出口航次：${this.outVvyName}` uni.setStorageSync('shipWorkTitle', this.title) + this.$emit("isPreview", this.title) }, // 查 executeSql(sql) { @@ -114,8 +123,32 @@ shipName: v.spmName, vtpId: v.vtpId } - this.shipList.push(obj) + this.shipList.unshift(obj) }) + const array = this.shipList + const mergedArray = array.reduce((accumulator, currentValue) => { + const existingValue = accumulator.find(item => item.vtpId === currentValue.vtpId); + if (existingValue) { + // 如果找到了具有相同 vtpId 的元素，则合并它们的值 + if (existingValue.inVvyId == "") { + existingValue.inVvyId = currentValue.inVvyId; + } + if (existingValue.inVvyName == "") { + existingValue.inVvyName = currentValue.inVvyName; + } + if (existingValue.outVvyId == "") { + existingValue.outVvyId = currentValue.outVvyId; + } + if (existingValue.outVvyName == "") { + existingValue.outVvyName = currentValue.outVvyName; + } + } else { + // 如果没有找到具有相同 vtpId 的元素，则将当前元素添加到 accumulator 中 + accumulator.push(currentValue); + } + return accumulator; + }, []); + this.shipList = mergedArray }).catch((error) => { // 在reject时执行的回调函数 console.error(error); @@ -155,7 +188,7 @@ text-align: center; font-weight: bold; box-shadow: 0 2px 6px 0 rgba(0, 0, 0, 0.10); - z-index: 9999; + z-index: 997; .icon { position: absolute; diff --git a/pages/discharge/instruct.vue b/pages/discharge/instruct.vue index eff0840..b240a67 100644 --- a/pages/discharge/instruct.vue +++ b/pages/discharge/instruct.vue @@ -508,136 +508,70 @@ - - - + +

港区:{{cwData.pamName}}

+

船名/航次:{{cwData.voyName}}

+

总数量:{{cwData.total}}

+

已配数量:{{cwData.allocatNumber}}

+

未配数量:{{cwData.notNumber}}

+ + + + + 车道 + + + 车位 + + + + + + + {{item}}道 + + + + + {{item.name}} +

{{item.name}}

+ + + @@ -692,7 +626,6 @@ @@ -1363,6 +1414,7 @@ background-color: #F6F7F9; position: relative; overflow: hidden; + min-height: calc(100vh - 110px); /deep/.tab .tab-bar { height: 66px; @@ -1392,6 +1444,7 @@ /deep/.tab-pane { width: 100%; + height: calc(100vh - 134px); } .main { @@ -1477,6 +1530,10 @@ } } + .dc { + width: 200px; + } + .btn { height: 35px; line-height: 35px; @@ -2086,199 +2143,130 @@ } } - .field { - padding: 20px; - background-color: #000; + // 场位图样式 + .cwMain { + width: 100%; + height: calc(100vh - 134px); - .boxTop { - display: flex; - - .title { - margin-right: 20px; - font-size: 18px; - display: flex; - flex-direction: column; - justify-content: center; - color: #fff; - } - - .option { - width: 200px; - } - } - - .carTabs { + .cwTop { width: 100%; - background-color: #fff; - margin-top: 20px; - border-radius: 8px; - - /deep/.tab { - border-radius: 8px !important; - } - - .carList { - display: flex; - justify-content: space-around; - padding: 20px; - - .carInfo { - width: 19%; - padding: 20px; - background-color: #ccc; - text-align: center; - border-radius: 6px; - } - } - - .partsList { - width: 100%; - display: flex; - justify-content: space-around; - padding: 20px; - - .partsInfo { - width: 19%; - padding: 20px; - background-color: #ccc; - text-align: center; - border-radius: 6px; - } - } - } - - .infoTitle { - font-size: 16px; - color: #666; - } - - .infoNum { - font-size: 28px; - } - - .fpList { - width: 100%; - margin-top: 20px; + height: 36px; + line-height: 36px; display: flex; justify-content: space-between; + padding: 0 36px; + background: #FDFEFE; + border: 1px solid #E1E5ED; - .fpInfo { - width: 49%; - + .status { + width: 10px; + height: 10px; + margin-right: 8px; + border-radius: 50%; + margin-top: 12px; } - .fpTitle { + .statusText { + display: flex; + font-size: 14px; + color: #666666; + margin-right: 20px; + + .kz { + background: #EEEEEE; + } + + .sy { + background: #4476F6; + } + } + + .topRight { + display: flex; + + p { + margin-left: 20px; + } + } + } + + .cwTitle { + width: 100%; + height: 32px; + line-height: 32px; + display: flex; + text-align: center; + background: #E1E5ED; + border: 1px solid #DBDDE3; + font-size: 15px; + color: #0B266A; + margin-bottom: 4px; + + .titleLeft { + width: 128px; + height: 100%; + border-right: 1px solid #DBDDE3; + } + + .titleRight { + width: calc(100% - 128px); + height: 100%; + } + } + + .cwContent { + background-color: #fff; + display: flex; + height: calc(100% - 83px); + overflow: scroll; + + .cwLeftBox { + width: 128px; + height: 100%; + display: flex; + flex-direction: column; text-align: center; - background: #262626; - padding: 10px; - color: #fff; + font-size: 15px; + color: #0B266A; + margin-right: 4px; + + .cwLeft { + height: 32px; + line-height: 32px; + border: 1px solid #DBDDE3; + background: #E1E5ED; + } } - .fpListInfo { - padding: 20px 10px; - background: #262626; - color: #fff; - margin-top: 10px; + .cwRightBox { + width: calc(100% - 128px); + height: 100%; + text-align: center; + font-size: 12px; - .infoTop { - width: 100%; + .cwRight { + height: 32px; display: flex; - justify-content: space-between; + flex-direction: column; + justify-content: center; - .infoTopTitle { - font-size: 18px; - font-weight: bold; - padding-left: 10px; - border-left: 5px solid #0079FE; + text { + padding: 5px; + background: #FFFFFF; + border: 1px solid #E4E4E4; + border-radius: 1px; + color: #666666; } - .titleRight { + p { + background: #C7D4F3; + color: #4476F6; + height: 32px; display: flex; - - .titleIcon { - width: 16px; - height: 16px; - background: #0079FE; - margin-left: 5px; - line-height: 16px; - text-align: center; - border-radius: 50%; - margin-top: 5px; - - /deep/.van-icon { - transform: scale(0.8); - margin-left: 2px; - } - } - - text { - color: #0079FE; - margin-top: 2px; - } + flex-direction: column; + justify-content: center; } } - - .infoCarNum { - display: flex; - flex-wrap: wrap; - margin-top: 10px; - - text { - margin: 10px 20px; - } - } - - .progressBox { - width: 100%; - } - - .carInfoList { - display: flex; - flex-wrap: wrap; - justify-content: space-between; - - .carBrand { - width: 32%; - background-color: #2C2D2D; - padding: 10px; - margin-bottom: 10px; - - .brandTitle { - color: #0079FE; - margin-bottom: 10px; - } - } - } - } - - .notListInfo { - .notTitle { - font-size: 22px; - font-weight: bold; - text-align: center; - margin: 30px 0; - } - - .infoTop { - text { - margin-right: 0; - } - } - - text { - margin-right: 30px; - } - } - - .tipInfo { - width: 100%; - font-size: 24px; - color: #5FE515; - font-weight: bold; - padding: 20px 0; - text-align: center; - background: #fff; - margin-top: 10px; } } } diff --git a/pages/discharge/place.vue b/pages/discharge/place.vue deleted file mode 100644 index 6e61eb5..0000000 --- a/pages/discharge/place.vue +++ /dev/null @@ -1,358 +0,0 @@ - - - - - \ No newline at end of file diff --git a/pages/index/instruct.vue b/pages/index/instruct.vue index 6428d8d..75d82ba 100644 --- a/pages/index/instruct.vue +++ b/pages/index/instruct.vue @@ -619,139 +619,105 @@ - - - - + + @@ -813,7 +779,6 @@ - @@ -168,189 +250,286 @@ \ No newline at end of file diff --git a/pages/monitor/place.vue b/pages/monitor/place.vue index 6e61eb5..22e191c 100644 --- a/pages/monitor/place.vue +++ b/pages/monitor/place.vue @@ -2,92 +2,140 @@ - 堆场资源 B3区 - - - - - - - - 车道 - - - 车位 - - - - - - 车位总数：12*15=180车位 - 使用车位：40车位 - 剩余车位：40车位 - 虚拟场位：12车位 - 可停放车辆：12辆 - 已停放车辆：12辆 - - - - 空置 - - - - 使用 - - - - 虚拟车位 - - - - - - - - 01道（合计12辆车-13车位） - - - - 宝马-轿车 12辆 - - - 奔驰-轿车 12辆 - - - 未使用：5车位 + + + + 返回 - - - - 02道（合计12辆车-13车位） - - - -