Commit e369de19 authored by 耿迪迪's avatar 耿迪迪

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

parents 2aca4270 80e3bedd
...@@ -112,14 +112,14 @@ ...@@ -112,14 +112,14 @@
<div v-if="form.actualTime != '' && form.actualTime != null"> <div v-if="form.actualTime != '' && form.actualTime != null">
<el-divider></el-divider> <el-divider></el-divider>
<el-col :span="24" style="margin-top: -15px;margin-bottom: -10px;"> <el-col :span="24" style="margin-top: -15px;margin-bottom: -10px;">
<div style="color: #31EAEA;width: 100%;height: 40px;"> <div style="color: #31EAEA;width: 100%;height: 40px;">
<ul> <ul>
<li>接单信息</li> <li>接单信息</li>
</ul> </ul>
</div> </div>
</el-col> </el-col>
<el-row> <el-row style="margin-bottom: -20px;">
<el-col :span="6"style="margin-bottom: 15px;"> <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 ref="form" v-model="form" :rules="rules" label-width="100px" style="height: 30px;width: 100%;">
<el-form-item label="接单人:" prop="actualInspectorName"> <el-form-item label="接单人:" prop="actualInspectorName">
...@@ -222,7 +222,7 @@ ...@@ -222,7 +222,7 @@
<!-- 归档信息 --> <!-- 归档信息 -->
<div v-if="form.orderStatus == 3"> <div v-if="form.orderStatus == 3">
<el-divider></el-divider> <el-divider></el-divider>
<el-row> <el-row style="margin-top: -15px;">
<el-col :span="24"> <el-col :span="24">
<div style="color: #31EAEA;width: 100%;height: 40px;"> <div style="color: #31EAEA;width: 100%;height: 40px;">
<ul> <ul>
...@@ -232,14 +232,14 @@ ...@@ -232,14 +232,14 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row style="padding-left: 40px;"> <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 ref="form" v-model="form" :rules="rules" label-width="100px" style="height: 30px;width: 100%;">
<el-form-item label="归档信息:" prop="archiving"> <el-form-item label="归档信息:" prop="archiving">
<font>{{form.archiving}}</font> <font>{{form.archiving}}</font>
</el-form-item> </el-form-item>
</el-form> </el-form>
</el-col> </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 ref="form" v-model="form" :rules="rules" label-width="100px" style="height: 30px;width: 100%;">
<el-form-item label="归档时间:" prop="updateTime"> <el-form-item label="归档时间:" prop="updateTime">
<font>{{form.updateTime}}</font> <font>{{form.updateTime}}</font>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment