Merge remote-tracking branch 'origin/master'

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

@@ -69,7 +69,7 @@
                   <font v-if="form.deviceType == 4">压力表</font>
                 </el-form-item>
                 <el-form-item label="设备名称:" prop="deviceName" style="margin-bottom: 0px;">
-                  <!-- <font v-if="form.orderType != 1">{{form.deviceName}}</font> -->
+                  <font v-if="form.orderType != 1">{{form.deviceName}}</font>
                   <el-tree
                     :data="deviceOptions"
                     :props="defaultProps"
@@ -126,8 +126,9 @@
               </el-form>
             </el-col>
           </el-row>
-        </div>
           <el-divider></el-divider>
+        </div>
+        
         <!-- 反馈信息 -->
         <div style="width: 100%;font-weight: 600;" v-if="form.feedbackList != null">
           <div style="color: #31EAEA;width: 100%;height: 40px;">
@@ -199,6 +200,34 @@
               </div>
         </div>
 
+<!-- 归档信息 -->
+        <div v-if="form.orderStatus == 3">
+          <el-divider></el-divider>
+          <el-row>
+            <el-col :span="24">
+              <div style="color: #31EAEA;width: 100%;height: 40px;">
+                <ul><li>归档信息</li></ul>
+              </div>
+            </el-col>
+          </el-row>
+          <el-row style="padding-left: 40px;">
+            <el-col :span="6">
+              <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-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>
+                </el-form-item>
+              </el-form>
+            </el-col>
+          </el-row>
+        </div>
+
         <!-- 归档 -->
 
         <div class="" style="width: 95%; height: 60px;margin-left: 50px;text-align: center;">
@@ -419,15 +448,17 @@ export default {
       getBasicsInfo (){
         getBasicsInfo(this.orderId).then(response =>{
           this.form = response.data;
+          console.log(this.form)
           this.active = parseInt(response.data.orderStatus) + 1;
+          for(var i = 0; i < this.form.deviceInfoList.length; i++){
             if(this.form.deviceInfoList.length>0){
               console.log("this.form.deviceInfoList",this.form.deviceInfoList)
               this.gaoMap.resetMapCenter([this.form.deviceInfoList[0].longitude,this.form.deviceInfoList[0].latitude]);
             }
-          for(var i = 0; i < this.form.deviceInfoList.length; i++){
             let obj = this.form.deviceInfoList[i];
             this.gaoMap.addMarker(DEVICE_TYPE.WORKORDER, obj);
           }
+          
             for(var i = 0; i < this.form.pipeList.length; i++){
               let obj = this.form.pipeList[i];
               this.gaoMap.onlyLine(obj);