Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

src/main.js

@@ -18,9 +18,9 @@ Vue.config.productionTip = false
 import AMap from 'vue-amap';
 Vue.use(AMap);
 import imgPreview from '@/components/imgPreview'
- 
 Vue.use(imgPreview)
-
+import echarts from "echarts";
+Vue.prototype.$echarts = echarts;
 import $ from 'jquery'
 // import Warehouse from './common.js'
 import Warehouse from './common.js'

src/views/home/index.vue

@@ -13,7 +13,7 @@
           <el-button @click="closePort()">closePort</el-button>
           <div>{{text}}</div>
         </div>
-       <!-- <img style='width:100%;margin-top:10px;' src="../../../public/img/tmt.gif" alt=""> -->
+       <img style='width:100%;margin-top:10px;' src="../../../public/img/tmt.gif" alt="">
       </div>
     </div>
     <div id="mapXY"></div>

src/views/houseSelfCollect/customerManagementAdd.vue

@@ -414,6 +414,8 @@
                if(Number(imgObj.width) < Number(imgObj.height)){
                  let i = document.getElementsByClassName("avatar");
                  i[index].style.width='auto'
+                  let j = document.getElementsByClassName("avatar-uploader" + (index+1))
+                  j[0].style.background = "#e7e3e3"
                }
             }
       },
@@ -438,7 +440,7 @@
               this.$set( this.customerList,'compAddress',response.recPersonAddr)
             }
           })
-           this.obtainWH(e,1)
+           this.obtainWH(e,0)
       },
 
       upLoadSuccess2(e) {
@@ -464,7 +466,7 @@
         //       this.$set( this.customerList,'compAddress',response.recPersonAddr)
         //     }
         //   })
-        this.obtainWH(e,0)
+        this.obtainWH(e,1)
       },
       bankSuccess1(e) {
         this.bankUps = 'bankUp'

src/views/tranManagement/tranManagementVehicleDispatching.vue

@@ -12,7 +12,7 @@
       </el-col>
     </el-row>
     <div class="center">
-      <el-form ref="deptBudgetList" :model="deptBudgetList" :rules="rules" label-width="110px">
+      <el-form ref="deptBudgetList" :model="deptBudgetList"  label-width="110px">
         <div class="basicInformation">
           <div class="small-title" style="font-size: 16px">任务详情</div>
           <el-row>
@@ -96,7 +96,7 @@
             <div class="content3-item1">
 
               <div class="">
-                <span style="margin-left: 30px;">司机-{{ index + 1 }}</span>
+                <span style="margin-left: 30px;font-weight: 600;">司机-{{ index + 1 }}</span>
                 <span class="noservice" v-show="item.status == '未装车'">{{
                      item.status
                    }}</span>
@@ -110,7 +110,7 @@
 
               <el-col :span="8">
 
-                <el-form-item label="姓名：" span="1" prop="driverName">
+                <el-form-item label="姓名：" span="1" prop="driverName" label-width="125px">
                   <el-select v-show="!item.temporaryDriverFlag" v-model="item.driver" placeholder="请选择司机"
                     class="row-item" @change="
                              (val) => {
@@ -127,7 +127,7 @@
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="司机电话：" span="1" prop="impurity">
+                <el-form-item label="司机电话：" span="1" prop="impurity" label-width="125px">
                   <el-select v-show="!item.temporaryDriverFlag" v-model="item.driverPhone" placeholder="请选择司机电话"
                     class="row-item" @change="
                                (val) => {
@@ -144,52 +144,52 @@
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="车牌号：" span="1" prop="carNo">
+                <el-form-item label="车牌号：" span="1" prop="carNo" label-width="125px">
                   <el-input :disabled="readonly" v-model="item.carNo" placeholder="" maxlength="120"
                     size="small" />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="派车编号：" span="1" prop="carModel">
+                <el-form-item label="派车编号：" span="1" prop="carModel" label-width="125px">
                   <el-input :disabled="readonly" v-model="item.tranCarNo" maxlength="120" size="small" />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="箱号：" span="1" prop="carModel">
+                <el-form-item label="箱号：" span="1" prop="carModel" label-width="125px">
                   <el-input v-if="item.status == '已装车'||item.status == '已送达'" :disabled="readonly" v-model="item.caseNo"
                     maxlength="120" size="small" />
                   <el-input v-else v-model="item.caseNo" placeholder="请输入箱号" maxlength="120" size="small" />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="封号：" span="1" prop="carModel">
+                <el-form-item label="封号：" span="1" prop="carModel" label-width="125px">
                   <el-input v-if="item.status == '已装车'||item.status == '已送达'" v-model="item.titleNo" placeholder=""
                     :disabled="readonly" maxlength="120" size="small" />
                   <el-input v-model="item.titleNo" placeholder="请输入封号" v-else maxlength="120" size="small" />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="车型：" span="1" prop="carModel">
+                <el-form-item label="车型：" span="1" prop="carModel" label-width="125px">
                   <el-input :disabled="readonly" v-model="item.carModel" placeholder="" maxlength="120"
                     size="small" />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
 
-                <el-form-item label="车长：" span="1" prop="carLength">
+                <el-form-item label="车长：" span="1" prop="carLength" label-width="125px">
                   <el-input :disabled="readonly" v-model="item.carLength" placeholder="" maxlength="120"
                     size="small" />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="载重(吨):" span="1" prop="loadWeight">
+                <el-form-item label="载重(吨):" span="1" prop="loadWeight" label-width="125px">
                   <el-input :disabled="readonly" v-model="item.loadWeight" placeholder="" maxlength="120"
                     size="small" />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="运输单价(元/吨):" span="1" prop="carModel" label-width="150px">
-                  <el-input :disabled="readonly" v-model="item.tranPrice" maxlength="120" size="small" />
+                <el-form-item label="运输单价(元/吨):" span="1" prop="carModel" label-width="125px">
+                  <el-input :disabled="readonly" v-model="item.tranPrice" size="small" />
                 </el-form-item>
               </el-col>
               <span v-if="item.status == '未装车'||item.temporaryDriverFlag!=0" width="22" height="22" class="del"
@@ -891,7 +891,6 @@
     position: relative;
     padding: 10px;
     font-weight: 600;
-    margin-left: 27px;
   }
 
   //小标题文字
@@ -923,7 +922,7 @@
 
   .myTest {
     display: flex;
-    margin: 20px 0;
+    margin-bottom: 20px;
     // background: green;
     padding-left: 20px;
     align-items: center;
@@ -959,8 +958,8 @@
 
   .del {
     position: absolute;
-    right: 10px;
-    top: 6px;
+    right: 4px;
+    top: 0px;
     cursor: pointer;
     font-size: 20px;
     width: 16px;