作者 小范

货运单功能优化

@@ -211,14 +211,10 @@ @@ -211,14 +211,10 @@
211 }, 211 },
212 // 打开编辑 212 // 打开编辑
213 applyEdit(row) { 213 applyEdit(row) {
214 - this.$router.push(  
215 - {  
216 - path:'/Way',  
217 - query:{  
218 - id: row.id  
219 - }  
220 - }  
221 - ) 214 + this.$router.push({
  215 + path:'/Way',
  216 + query:{id:row.id}
  217 + })
222 }, 218 },
223 // 编辑功能 219 // 编辑功能
224 edit() { 220 edit() {
@@ -878,7 +878,6 @@ Handling Information @@ -878,7 +878,6 @@ Handling Information
878 <el-row style="margin-top: 40px;margin-left: 35%"> 878 <el-row style="margin-top: 40px;margin-left: 35%">
879 <el-form-item> 879 <el-form-item>
880 <el-button type="primary" @click="addFwb">提交</el-button> 880 <el-button type="primary" @click="addFwb">提交</el-button>
881 - <el-button>返回</el-button>  
882 </el-form-item> 881 </el-form-item>
883 </el-row> 882 </el-row>
884 </el-form> 883 </el-form>
@@ -1514,7 +1513,7 @@ Handling Information @@ -1514,7 +1513,7 @@ Handling Information
1514 <el-row style="margin-bottom: -5px"> 1513 <el-row style="margin-bottom: -5px">
1515 <el-col style="width: 95%"> 1514 <el-col style="width: 95%">
1516 <el-form-item> 1515 <el-form-item>
1517 - <el-input auto-complete="off" placeholder="体积" size="mini"></el-input> 1516 + <el-input disabled auto-complete="off" placeholder="体积" size="mini"></el-input>
1518 </el-form-item> 1517 </el-form-item>
1519 </el-col> 1518 </el-col>
1520 </el-row> 1519 </el-row>
@@ -1770,7 +1769,6 @@ Handling Information @@ -1770,7 +1769,6 @@ Handling Information
1770 <el-row style="margin-top: 40px;margin-left: 35%"> 1769 <el-row style="margin-top: 40px;margin-left: 35%">
1771 <el-form-item> 1770 <el-form-item>
1772 <el-button type="primary" @click="addFhl">提交</el-button> 1771 <el-button type="primary" @click="addFhl">提交</el-button>
1773 - <el-button>返回</el-button>  
1774 </el-form-item> 1772 </el-form-item>
1775 </el-row> 1773 </el-row>
1776 </el-form> 1774 </el-form>
@@ -2379,7 +2377,7 @@ Handling Information @@ -2379,7 +2377,7 @@ Handling Information
2379 if (res.code !== '200'){ 2377 if (res.code !== '200'){
2380 return this.$message.error('新增主运单,失败'); 2378 return this.$message.error('新增主运单,失败');
2381 } 2379 }
2382 - this.$message.success('新增主运单,成功'); 2380 + this.$message.success(res.msg);
2383 this.form = { 2381 this.form = {
2384 acc:[], 2382 acc:[],
2385 agt:{ 2383 agt:{
@@ -2511,7 +2509,6 @@ Handling Information @@ -2511,7 +2509,6 @@ Handling Information
2511 cer_signature:'' 2509 cer_signature:''
2512 } 2510 }
2513 }; 2511 };
2514 -  
2515 }).catch(error => { 2512 }).catch(error => {
2516 this.$message.error(error.toString()); 2513 this.$message.error(error.toString());
2517 }); 2514 });
@@ -2560,6 +2557,36 @@ Handling Information @@ -2560,6 +2557,36 @@ Handling Information
2560 for (const i of res.data.acc) { 2557 for (const i of res.data.acc) {
2561 _this.acc_info=i 2558 _this.acc_info=i
2562 } 2559 }
  2560 + //获取dmi数组
  2561 + let dim = _this.form.rtd.dimensions
  2562 + if (dim){
  2563 + dim.forEach((item,index,arr)=>{
  2564 + let dim_form = {
  2565 + long:"",
  2566 + wide:"",
  2567 + height:"",
  2568 + pic:"",
  2569 + vol:"",
  2570 + weight:""
  2571 + };
  2572 + dim_form.weight = item.dim_weight;
  2573 + if(item.dim_measurement_info){
  2574 + let measures = item.dim_measurement_info.split("-");
  2575 + if (measures.length>2){
  2576 + dim_form.long = measures[0];
  2577 + dim_form.wide = measures[1];
  2578 + let height_piece = measures[2];
  2579 + let h_p = height_piece.split("/");
  2580 + if(h_p.length>1){
  2581 + dim_form.height= h_p[0];
  2582 + dim_form.pic = h_p[1];
  2583 + dim_form.vol = dim_form.long*dim_form.wide*dim_form.height*dim_form.pic/1000000;
  2584 + }
  2585 + _this.gridData.push(dim_form)
  2586 + }
  2587 + }
  2588 + })
  2589 + }
2563 _this.$message.success(res.msg) 2590 _this.$message.success(res.msg)
2564 }).catch(error => { 2591 }).catch(error => {
2565 // 关闭加载 2592 // 关闭加载