Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/icore-pass

src/views/appoint/components/saleContract/editSaleOrder.vue

@@ -1081,6 +1081,31 @@ export default {
                 this.selectionList.push(item);
               }
             });
+            //若添加的车序号为最后一个车序号
+            if((this.selectionList.length-1)==toCxh){
+                //插入新增物资
+                this.materialList.forEach((e) => {
+                  var addmap = {
+                    cxh: arr[toCxh].cxh,
+                    materialName: e.materialName,
+                    Specification: e.Specification,
+                    materialCode: e.materialCode,
+                    orderPlanWeight: e.orderPlanWeight,
+                    meterNumber: e.meterNumber,
+                    isPound: e.isPound,
+                    saleShipperAddressId: arr[toCxh].saleShipperAddressId,
+                    place: arr[toCxh].place,
+                    saleShipperAddressName:arr[toCxh].saleShipperAddressName,
+                    saleDateOfReceipt: arr[toCxh].saleDateOfReceipt,
+                    saleOrderConsigneeTel: arr[toCxh].saleOrderConsigneeTel,
+                    materialId: e.materialId,
+                    haveMeter: e.haveMeter
+                  };
+                  this.selectionList.push(addmap);
+                });
+                //清空materialList
+                this.materialList = [];
+            }
           //调用记录每一行的合并数的方法
           this.getSpanArr(this.selectionList);
       }

src/views/sale/components/offSiteTransportation/checkGPS.vue

@@ -22,9 +22,9 @@
              </div>
             
              <div class="driving_information">  
-                <span class="item_details">时间:{{runRoute.gtm}}</span>
+                <span class="item_details2">时间:{{runRoute.gtm}}</span>
                 <br/>
-                <span class="item_details">车速:{{runRoute.spd}}千米/小时</span>
+                <span class="item_details2" >车速:{{runRoute.spd}}千米/小时</span>
                 <br/>
                 <!--控制条-->
                
@@ -508,7 +508,7 @@ export default {
 .inputStyle{
     position: absolute;
     width: 200px;
-    left: 30px;
+    left: 50px;
 }
 
 .controller{
@@ -534,15 +534,19 @@ export default {
 	height: 100%;
     
 }
+span.item_details2 {
+    position: relative;
+    top: 20px;
+}
 .date_picker_style{
     position: relative;
-    left: 40px;
+    left: 50px;
 }
 .item_details {
     position: relative;
-    left: 30px;
     top: 5px;
     height: 0px;
+    left: 0px;
 }
 #amap-container {
     position: relative;

src/views/sale/components/offSiteTransportation/inTransit.vue

@@ -13,23 +13,23 @@
         </el-date-picker>
       </el-form-item>
       <el-form-item>
-        <label class="el-form-item__label" style="width: auto;">产品分类</label>
+        <span class="el-form-item__span" style="width: auto;">产品分类</span>
           <el-input v-model="inputValue" placeholder="请输入内容"></el-input>
       </el-form-item>
       <el-form-item>
-          <label class="el-form-item__label" style="width: auto;">车牌号</label>
+          <span class="el-form-item__span" style="width: auto;">车牌号</span>
           <el-input v-model="capacityNumber1" placeholder="请输入内容"></el-input>
       </el-form-item>
       <el-form-item>
-          <label class="el-form-item__label" style="width: auto;">收货单位</label>
+          <span class="el-form-item__span" style="width: auto;">收货单位</span>
           <el-input v-model="consigneeCompanyName1" placeholder="请输入内容"></el-input>
       </el-form-item> 
       <el-form-item>
-          <label class="el-form-item__label" style="width: auto;">承运单位</label>
+          <span class="el-form-item__span" style="width: auto;">承运单位</span>
           <el-input v-model="carrierName" placeholder="请输入内容"></el-input>
       </el-form-item> 
       <el-form-item>
-        <label class="el-form-item__label" style="width: auto;">门岗名称</label>
+        <span class="el-form-item__span" style="width: auto;">门岗名称</span>
         <el-input v-model="gatepostName" placeholder="请输入内容"></el-input>
       </el-form-item> 
       <el-form-item>
@@ -380,6 +380,14 @@ export default {
 };
 </script>
 <style lang='scss' scoped>
+.el-input {
+    width: 150px;
+    margin-left: 5px;
+}
+span.el-form-item__span {
+    float: left;
+    margin-top: 7px;
+}
 .homeworkPath {
   .top {
     padding: 20px 30px;

src/views/sale/components/transport_excute/tms-offsite/receiptResult.vue

@@ -77,7 +77,7 @@ export default {
      toPhotoClick(orderNumber){
       console.log(orderNumber)
       this.axios
-       .post("/api/v1/tms/getReceivingPhoto?orderNumber="+orderNumber)
+       .post("/api/v1/tms/getReceivingPhotoByUrl?orderNumber="+orderNumber)
        .then((res)=>{
          console.log(res)
           this.srcList=[];