From 343ce2dcd1f8a468ac8faa576ba3f332a7db0879 Mon Sep 17 00:00:00 2001 From: user <1137490146@qq.com> Date: Wed, 9 Aug 2023 17:44:13 +0800 Subject: [PATCH] 货运单功能优化 --- src/views/nav3/Telegram.vue | 12 ++++-------- src/views/nav3/Way.vue | 37 ++++++++++++++++++++++++++++++++----- 2 files changed, 36 insertions(+), 13 deletions(-) diff --git a/src/views/nav3/Telegram.vue b/src/views/nav3/Telegram.vue index 3ace1b4..21a98fc 100644 --- a/src/views/nav3/Telegram.vue +++ b/src/views/nav3/Telegram.vue @@ -211,14 +211,10 @@ }, // 打开编辑 applyEdit(row) { - this.$router.push( - { - path:'/Way', - query:{ - id: row.id - } - } - ) + this.$router.push({ + path:'/Way', + query:{id:row.id} + }) }, // 编辑功能 edit() { diff --git a/src/views/nav3/Way.vue b/src/views/nav3/Way.vue index 1c3587c..7fdc596 100644 --- a/src/views/nav3/Way.vue +++ b/src/views/nav3/Way.vue @@ -878,7 +878,6 @@ Handling Information <el-row style="margin-top: 40px;margin-left: 35%"> <el-form-item> <el-button type="primary" @click="addFwb">提交</el-button> - <el-button>返回</el-button> </el-form-item> </el-row> </el-form> @@ -1514,7 +1513,7 @@ Handling Information <el-row style="margin-bottom: -5px"> <el-col style="width: 95%"> <el-form-item> - <el-input auto-complete="off" placeholder="体积" size="mini"></el-input> + <el-input disabled auto-complete="off" placeholder="体积" size="mini"></el-input> </el-form-item> </el-col> </el-row> @@ -1770,7 +1769,6 @@ Handling Information <el-row style="margin-top: 40px;margin-left: 35%"> <el-form-item> <el-button type="primary" @click="addFhl">提交</el-button> - <el-button>返回</el-button> </el-form-item> </el-row> </el-form> @@ -2379,7 +2377,7 @@ Handling Information if (res.code !== '200'){ return this.$message.error('新增主运单,失败'); } - this.$message.success('新增主运单,成功'); + this.$message.success(res.msg); this.form = { acc:[], agt:{ @@ -2511,7 +2509,6 @@ Handling Information cer_signature:'' } }; - }).catch(error => { this.$message.error(error.toString()); }); @@ -2560,6 +2557,36 @@ Handling Information for (const i of res.data.acc) { _this.acc_info=i } + //获取dmi数组 + let dim = _this.form.rtd.dimensions + if (dim){ + dim.forEach((item,index,arr)=>{ + let dim_form = { + long:"", + wide:"", + height:"", + pic:"", + vol:"", + weight:"" + }; + dim_form.weight = item.dim_weight; + if(item.dim_measurement_info){ + let measures = item.dim_measurement_info.split("-"); + if (measures.length>2){ + dim_form.long = measures[0]; + dim_form.wide = measures[1]; + let height_piece = measures[2]; + let h_p = height_piece.split("/"); + if(h_p.length>1){ + dim_form.height= h_p[0]; + dim_form.pic = h_p[1]; + dim_form.vol = dim_form.long*dim_form.wide*dim_form.height*dim_form.pic/1000000; + } + _this.gridData.push(dim_form) + } + } + }) + } _this.$message.success(res.msg) }).catch(error => { // 关闭加载 -- libgit2 0.24.0