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

src/views/tranManagement/tranManagementShippingArrangemen.vue

@@ -80,6 +80,7 @@
           </el-row>
           <div class="small-title" style="font-size: 16px">联络员及航次</div>
           <el-row class="myTest">
+
             <!--当前运输总价-->
             <el-form-item label="当前运输总价(元/吨):" prop="tranPrice" label-width="150px" class="input-item-margin">
               <el-input v-model="deptBudgetList.tranPrice" maxlength="70" disabled />
@@ -770,8 +771,11 @@
     // background: green;
     padding-left: 20px;
     align-items: center;
+    width: 800px;
   }
-
+.myTest .el-form-item {
+  width: 33.333%;
+}
   .content3 {
     width: calc(100% + 20px);
 

src/views/tranManagement/tranManagementShippingLook.vue

@@ -392,13 +392,13 @@
     }
 
     .el-input__inner {
-      background-color: #fff;
-      border-color: #fff !important;
-      color: #000 !important;
+      // background-color: #fff;
+      // border-color: #fff !important;
+      color: #c0c4cc !important;
       font-size: 14px;
       cursor: text;
-      padding: 0 !important;
-      border: none;
+      padding: 0 10px !important;
+      // border: none;
     }
   }
 

src/views/tranManagement/tranManagementTransporTrainDetails.vue

@@ -95,7 +95,7 @@
               <ws-input
                 v-model="deptBudgetList.tranPrice"
                 maxlength="70"
-                :disabled="readonly"
+                disabled
                 size="small"
                 style="width:70px"
               />
@@ -553,12 +553,11 @@ export default {
     display: none;
   }
   .el-input__inner {
-    background-color: #fff;
-    border-color: #fff !important;
-    color: #000 !important;
+    color: #c0c4cc !important;
     font-size: 14px;
     cursor: text;
-    padding: 0 !important;
+    padding: 0 10px !important;
+
   }
 }
 .winseaview-view {

src/views/tranManagement/tranManagementTransporTrainNo.vue

@@ -103,24 +103,25 @@
                   style="width:70px"
                 />
             </ws-form-item>
-            <ws-form-item>
-
+            <!-- <ws-form-item>
+            </ws-form-item> -->
              <el-button
               v-if="deptBudgetList.priceStatus=='审核中'"
               type="primary"
               v-hasPermission="`tranManager.transportationInfo.trian`" 
               size="small"
               @click="examine()"
+              class="submit"
               >审核中</el-button
             >
              <el-button
              v-else
               type="primary"
               size="small"
+              class="submit"
               @click="priceSubmit()"
               >提交</el-button
             >
-            </ws-form-item>
           </div>
       <div
         class="liaison"
@@ -752,7 +753,7 @@ export default {
   margin: 0 auto;
 }
 .el-form-item {
-  width: 50%;
+  width: 33.333%;
 }
 .el-form-item__label {
   text-align: center;
@@ -811,10 +812,10 @@ export default {
     display: none;
   }
   .el-input__inner {
-    color: #000 !important;
+     color: #c0c4cc !important;
     font-size: 14px;
     cursor: text;
-    padding: 0 !important;
+    padding: 0 10px !important;
   }
 }
 //减号
@@ -940,10 +941,14 @@ export default {
   padding: 0px;
 }
  .myTest{
-    width: 800px;
     display: flex;
-    height: 40px;
     margin: 20px 0;
+    // background: green;
+    padding-left: 20px;
+    align-items: center;
+    width: 800px;
   }
-
+.myTest .submit{
+ margin-top: -16px;
+}
 </style>