Merge branch 'master' of ssh://111.61.77.35:15/gengdidi/gassafety

gassafety-web/src/views/workOrder/detail/index.vue

@@ -112,14 +112,14 @@
 
       <div v-if="form.actualTime != '' && form.actualTime != null">
         <el-divider></el-divider>
-        <el-col :span="24" style="margin-top: -15px;margin-bottom: -10px;">
-          <div style="color: #31EAEA;width: 100%;height: 40px;">
-            <ul>
-              <li>接单信息</li>
-            </ul>
-          </div>
-        </el-col>
-        <el-row>
+          <el-col :span="24" style="margin-top: -15px;margin-bottom: -10px;">
+            <div style="color: #31EAEA;width: 100%;height: 40px;">
+              <ul>
+                <li>接单信息</li>
+              </ul>
+            </div>
+          </el-col>
+        <el-row style="margin-bottom: -20px;">
           <el-col :span="6"style="margin-bottom: 15px;">
             <el-form ref="form" v-model="form" :rules="rules" label-width="100px" style="height: 30px;width: 100%;">
               <el-form-item label="接单人:" prop="actualInspectorName">
@@ -222,7 +222,7 @@
       <!-- 归档信息 -->
       <div v-if="form.orderStatus == 3">
         <el-divider></el-divider>
-        <el-row>
+        <el-row style="margin-top: -15px;">
           <el-col :span="24">
             <div style="color: #31EAEA;width: 100%;height: 40px;">
               <ul>
@@ -232,14 +232,14 @@
           </el-col>
         </el-row>
         <el-row style="padding-left: 40px;">
-          <el-col :span="6">
+          <el-col :span="6" style="margin-top: -10px;margin-bottom: 10px;">
             <el-form ref="form" v-model="form" :rules="rules" label-width="100px" style="height: 30px;width: 100%;">
               <el-form-item label="归档信息:" prop="archiving">
                 <font>{{form.archiving}}</font>
               </el-form-item>
             </el-form>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="6" style="margin-top: -10px;">
             <el-form ref="form" v-model="form" :rules="rules" label-width="100px" style="height: 30px;width: 100%;">
               <el-form-item label="归档时间:" prop="updateTime">
                 <font>{{form.updateTime}}</font>