diff --git a/src/page/jobManage/modules/InHandleJob.vue b/src/page/jobManage/modules/InHandleJob.vue
index 1a1f05e..cb2c2b6 100644
--- a/src/page/jobManage/modules/InHandleJob.vue
+++ b/src/page/jobManage/modules/InHandleJob.vue
@@ -21,9 +21,11 @@
             <div class="card-left">
               <div>
                 <span class="card-alarm">{{item.alarmContentName}}</span>
-                <span class="card-wellcode">{{item.wellCode}}</span>
                 <span class="card-createtime">{{item.createTime}}</span>
               </div>
+              <div class="card-wellcode">
+                <span>{{item.wellCode}}</span>
+              </div>
               <div class="card-position">
                 <span>{{item.position}}</span>
               </div>
@@ -185,7 +187,7 @@
         color #f7615a
       }
       .card-wellcode {
-        margin-left 10px
+        margin-top 12px
         font-size: 0.8rem
       }
       .card-welltype {

diff --git a/src/page/jobManage/modules/InHandleJob.vue b/src/page/jobManage/modules/InHandleJob.vue
index 1a1f05e..cb2c2b6 100644
--- a/src/page/jobManage/modules/InHandleJob.vue
+++ b/src/page/jobManage/modules/InHandleJob.vue
@@ -21,9 +21,11 @@
             <div class="card-left">
               <div>
                 <span class="card-alarm">{{item.alarmContentName}}</span>
-                <span class="card-wellcode">{{item.wellCode}}</span>
                 <span class="card-createtime">{{item.createTime}}</span>
               </div>
+              <div class="card-wellcode">
+                <span>{{item.wellCode}}</span>
+              </div>
               <div class="card-position">
                 <span>{{item.position}}</span>
               </div>
@@ -185,7 +187,7 @@
         color #f7615a
       }
       .card-wellcode {
-        margin-left 10px
+        margin-top 12px
         font-size: 0.8rem
       }
       .card-welltype {
diff --git a/src/page/jobManage/modules/JobDetail.vue b/src/page/jobManage/modules/JobDetail.vue
index 3847c36..bb9cbc6 100644
--- a/src/page/jobManage/modules/JobDetail.vue
+++ b/src/page/jobManage/modules/JobDetail.vue
@@ -50,7 +50,7 @@
             </mt-radio>
           </div>
         </div>
-        <!--处理中工单显示现场情况-->
+        <!--处理中,已完成工单显示现场情况-->
         <div class="well-info-card" v-if="(winType=='inHandleJob'||winType=='overJob')&& jobForm.firstState">
           <div v-if="jobForm.firstState" class="well-info firststate" >
             <span class="info-name">现场情况</span>
@@ -62,6 +62,10 @@
           <div v-if="firstStateImgs.length>0" class="img-area">
             <img class="img-show" v-for="img in firstStateImgs" :src="img" @click="showBigImage(img)"/>
           </div>
+          <div v-if="firstStateImgs.length>0" class="well-info firststate" >
+            <span class="info-name">确认人</span>
+            <span class="info-value">{{jobForm.confirmJobPerson}}</span>
+          </div>
         </div>
         <!--处理中必填项-->
         <div class="well-info-card" v-if="jobForm.editable==1 && winType=='inHandleJob'">
@@ -90,6 +94,10 @@
           <div v-if="handleImgs.length>0" class="img-area">
             <img class="img-show" v-for="img in handleImgs" :src="img" @click="showBigImage(img)"/>
           </div>
+          <div v-if="handleImgs.length>0" class="well-info firststate" >
+            <span class="info-name">处理人</span>
+            <span class="info-value">{{jobForm.handleJobPerson}}</span>
+          </div>
         </div>
 
         <!--工单相关阶段时间倒序-->
@@ -142,6 +150,7 @@
         jobForm: {
           id: '', // 工单id
           jobCode:'',//工单编号
+          jobBelongTo:'',
           createTime:'',//工单创建时间
           jobFlag: '', //工单延时标志，1为超时未接单，2位超时未处理
           wellId:1,
@@ -164,10 +173,12 @@
           flow:[],
           firstState:'',
           firstStatePhotos:'',
+          confirmJobPerson:'',
           shouldGetTime:'',
           shouldHandleTime:'',
           handleMessage:'',
           handlePhotos:'',
+          handleJobPerson:'',
           editable:1
         }, // 表单
         isLoading:true, //是否显示加载按钮
@@ -220,7 +231,7 @@
             class:'text-red'
           },
           {
-            title:'位置描述',
+            title:'详细地址',
             value:this.jobForm.position
           }
         ]

diff --git a/src/page/jobManage/modules/InHandleJob.vue b/src/page/jobManage/modules/InHandleJob.vue
index 1a1f05e..cb2c2b6 100644
--- a/src/page/jobManage/modules/InHandleJob.vue
+++ b/src/page/jobManage/modules/InHandleJob.vue
@@ -21,9 +21,11 @@
             <div class="card-left">
               <div>
                 <span class="card-alarm">{{item.alarmContentName}}</span>
-                <span class="card-wellcode">{{item.wellCode}}</span>
                 <span class="card-createtime">{{item.createTime}}</span>
               </div>
+              <div class="card-wellcode">
+                <span>{{item.wellCode}}</span>
+              </div>
               <div class="card-position">
                 <span>{{item.position}}</span>
               </div>
@@ -185,7 +187,7 @@
         color #f7615a
       }
       .card-wellcode {
-        margin-left 10px
+        margin-top 12px
         font-size: 0.8rem
       }
       .card-welltype {
diff --git a/src/page/jobManage/modules/JobDetail.vue b/src/page/jobManage/modules/JobDetail.vue
index 3847c36..bb9cbc6 100644
--- a/src/page/jobManage/modules/JobDetail.vue
+++ b/src/page/jobManage/modules/JobDetail.vue
@@ -50,7 +50,7 @@
             </mt-radio>
           </div>
         </div>
-        <!--处理中工单显示现场情况-->
+        <!--处理中,已完成工单显示现场情况-->
         <div class="well-info-card" v-if="(winType=='inHandleJob'||winType=='overJob')&& jobForm.firstState">
           <div v-if="jobForm.firstState" class="well-info firststate" >
             <span class="info-name">现场情况</span>
@@ -62,6 +62,10 @@
           <div v-if="firstStateImgs.length>0" class="img-area">
             <img class="img-show" v-for="img in firstStateImgs" :src="img" @click="showBigImage(img)"/>
           </div>
+          <div v-if="firstStateImgs.length>0" class="well-info firststate" >
+            <span class="info-name">确认人</span>
+            <span class="info-value">{{jobForm.confirmJobPerson}}</span>
+          </div>
         </div>
         <!--处理中必填项-->
         <div class="well-info-card" v-if="jobForm.editable==1 && winType=='inHandleJob'">
@@ -90,6 +94,10 @@
           <div v-if="handleImgs.length>0" class="img-area">
             <img class="img-show" v-for="img in handleImgs" :src="img" @click="showBigImage(img)"/>
           </div>
+          <div v-if="handleImgs.length>0" class="well-info firststate" >
+            <span class="info-name">处理人</span>
+            <span class="info-value">{{jobForm.handleJobPerson}}</span>
+          </div>
         </div>
 
         <!--工单相关阶段时间倒序-->
@@ -142,6 +150,7 @@
         jobForm: {
           id: '', // 工单id
           jobCode:'',//工单编号
+          jobBelongTo:'',
           createTime:'',//工单创建时间
           jobFlag: '', //工单延时标志，1为超时未接单，2位超时未处理
           wellId:1,
@@ -164,10 +173,12 @@
           flow:[],
           firstState:'',
           firstStatePhotos:'',
+          confirmJobPerson:'',
           shouldGetTime:'',
           shouldHandleTime:'',
           handleMessage:'',
           handlePhotos:'',
+          handleJobPerson:'',
           editable:1
         }, // 表单
         isLoading:true, //是否显示加载按钮
@@ -220,7 +231,7 @@
             class:'text-red'
           },
           {
-            title:'位置描述',
+            title:'详细地址',
             value:this.jobForm.position
           }
         ]
diff --git a/src/page/jobManage/modules/OverJob.vue b/src/page/jobManage/modules/OverJob.vue
index a211802..da9155b 100644
--- a/src/page/jobManage/modules/OverJob.vue
+++ b/src/page/jobManage/modules/OverJob.vue
@@ -21,9 +21,11 @@
             <div class="card-left">
               <div>
                 <span class="card-alarm">{{item.alarmContentName}}</span>
-                <span class="card-wellcode">{{item.wellCode}}</span>
                 <span class="card-createtime">{{item.createTime}}</span>
               </div>
+              <div class="card-wellcode">
+                <span>{{item.wellCode}}</span>
+              </div>
               <div class="card-position">
                 <span>{{item.position}}</span>
               </div>
@@ -189,7 +191,7 @@
         color #f7615a
       }
       .card-wellcode {
-        margin-left 10px
+        margin-top 12px
         font-size: 0.8rem
       }
       .card-welltype {

diff --git a/src/page/jobManage/modules/InHandleJob.vue b/src/page/jobManage/modules/InHandleJob.vue
index 1a1f05e..cb2c2b6 100644
--- a/src/page/jobManage/modules/InHandleJob.vue
+++ b/src/page/jobManage/modules/InHandleJob.vue
@@ -21,9 +21,11 @@
             <div class="card-left">
               <div>
                 <span class="card-alarm">{{item.alarmContentName}}</span>
-                <span class="card-wellcode">{{item.wellCode}}</span>
                 <span class="card-createtime">{{item.createTime}}</span>
               </div>
+              <div class="card-wellcode">
+                <span>{{item.wellCode}}</span>
+              </div>
               <div class="card-position">
                 <span>{{item.position}}</span>
               </div>
@@ -185,7 +187,7 @@
         color #f7615a
       }
       .card-wellcode {
-        margin-left 10px
+        margin-top 12px
         font-size: 0.8rem
       }
       .card-welltype {
diff --git a/src/page/jobManage/modules/JobDetail.vue b/src/page/jobManage/modules/JobDetail.vue
index 3847c36..bb9cbc6 100644
--- a/src/page/jobManage/modules/JobDetail.vue
+++ b/src/page/jobManage/modules/JobDetail.vue
@@ -50,7 +50,7 @@
             </mt-radio>
           </div>
         </div>
-        <!--处理中工单显示现场情况-->
+        <!--处理中,已完成工单显示现场情况-->
         <div class="well-info-card" v-if="(winType=='inHandleJob'||winType=='overJob')&& jobForm.firstState">
           <div v-if="jobForm.firstState" class="well-info firststate" >
             <span class="info-name">现场情况</span>
@@ -62,6 +62,10 @@
           <div v-if="firstStateImgs.length>0" class="img-area">
             <img class="img-show" v-for="img in firstStateImgs" :src="img" @click="showBigImage(img)"/>
           </div>
+          <div v-if="firstStateImgs.length>0" class="well-info firststate" >
+            <span class="info-name">确认人</span>
+            <span class="info-value">{{jobForm.confirmJobPerson}}</span>
+          </div>
         </div>
         <!--处理中必填项-->
         <div class="well-info-card" v-if="jobForm.editable==1 && winType=='inHandleJob'">
@@ -90,6 +94,10 @@
           <div v-if="handleImgs.length>0" class="img-area">
             <img class="img-show" v-for="img in handleImgs" :src="img" @click="showBigImage(img)"/>
           </div>
+          <div v-if="handleImgs.length>0" class="well-info firststate" >
+            <span class="info-name">处理人</span>
+            <span class="info-value">{{jobForm.handleJobPerson}}</span>
+          </div>
         </div>
 
         <!--工单相关阶段时间倒序-->
@@ -142,6 +150,7 @@
         jobForm: {
           id: '', // 工单id
           jobCode:'',//工单编号
+          jobBelongTo:'',
           createTime:'',//工单创建时间
           jobFlag: '', //工单延时标志，1为超时未接单，2位超时未处理
           wellId:1,
@@ -164,10 +173,12 @@
           flow:[],
           firstState:'',
           firstStatePhotos:'',
+          confirmJobPerson:'',
           shouldGetTime:'',
           shouldHandleTime:'',
           handleMessage:'',
           handlePhotos:'',
+          handleJobPerson:'',
           editable:1
         }, // 表单
         isLoading:true, //是否显示加载按钮
@@ -220,7 +231,7 @@
             class:'text-red'
           },
           {
-            title:'位置描述',
+            title:'详细地址',
             value:this.jobForm.position
           }
         ]
diff --git a/src/page/jobManage/modules/OverJob.vue b/src/page/jobManage/modules/OverJob.vue
index a211802..da9155b 100644
--- a/src/page/jobManage/modules/OverJob.vue
+++ b/src/page/jobManage/modules/OverJob.vue
@@ -21,9 +21,11 @@
             <div class="card-left">
               <div>
                 <span class="card-alarm">{{item.alarmContentName}}</span>
-                <span class="card-wellcode">{{item.wellCode}}</span>
                 <span class="card-createtime">{{item.createTime}}</span>
               </div>
+              <div class="card-wellcode">
+                <span>{{item.wellCode}}</span>
+              </div>
               <div class="card-position">
                 <span>{{item.position}}</span>
               </div>
@@ -189,7 +191,7 @@
         color #f7615a
       }
       .card-wellcode {
-        margin-left 10px
+        margin-top 12px
         font-size: 0.8rem
       }
       .card-welltype {
diff --git a/src/page/jobManage/modules/WaitConfirmJob.vue b/src/page/jobManage/modules/WaitConfirmJob.vue
index 15cda87..702063e 100644
--- a/src/page/jobManage/modules/WaitConfirmJob.vue
+++ b/src/page/jobManage/modules/WaitConfirmJob.vue
@@ -21,9 +21,11 @@
             <div class="card-left">
               <div>
                 <span class="card-alarm">{{item.alarmContentName}}</span>
-                <span class="card-wellcode">{{item.wellCode}}</span>
                 <span class="card-createtime">{{item.createTime}}</span>
               </div>
+              <div class="card-wellcode">
+                <span>{{item.wellCode}}</span>
+              </div>
               <div class="card-position">
                 <span>{{item.position}}</span>
               </div>
@@ -181,7 +183,7 @@
         color #f7615a
       }
       .card-wellcode {
-        margin-left 10px
+        margin-top 12px
         font-size: 0.8rem
       }
       .card-welltype {

diff --git a/src/page/jobManage/modules/InHandleJob.vue b/src/page/jobManage/modules/InHandleJob.vue
index 1a1f05e..cb2c2b6 100644
--- a/src/page/jobManage/modules/InHandleJob.vue
+++ b/src/page/jobManage/modules/InHandleJob.vue
@@ -21,9 +21,11 @@
             <div class="card-left">
               <div>
                 <span class="card-alarm">{{item.alarmContentName}}</span>
-                <span class="card-wellcode">{{item.wellCode}}</span>
                 <span class="card-createtime">{{item.createTime}}</span>
               </div>
+              <div class="card-wellcode">
+                <span>{{item.wellCode}}</span>
+              </div>
               <div class="card-position">
                 <span>{{item.position}}</span>
               </div>
@@ -185,7 +187,7 @@
         color #f7615a
       }
       .card-wellcode {
-        margin-left 10px
+        margin-top 12px
         font-size: 0.8rem
       }
       .card-welltype {
diff --git a/src/page/jobManage/modules/JobDetail.vue b/src/page/jobManage/modules/JobDetail.vue
index 3847c36..bb9cbc6 100644
--- a/src/page/jobManage/modules/JobDetail.vue
+++ b/src/page/jobManage/modules/JobDetail.vue
@@ -50,7 +50,7 @@
             </mt-radio>
           </div>
         </div>
-        <!--处理中工单显示现场情况-->
+        <!--处理中,已完成工单显示现场情况-->
         <div class="well-info-card" v-if="(winType=='inHandleJob'||winType=='overJob')&& jobForm.firstState">
           <div v-if="jobForm.firstState" class="well-info firststate" >
             <span class="info-name">现场情况</span>
@@ -62,6 +62,10 @@
           <div v-if="firstStateImgs.length>0" class="img-area">
             <img class="img-show" v-for="img in firstStateImgs" :src="img" @click="showBigImage(img)"/>
           </div>
+          <div v-if="firstStateImgs.length>0" class="well-info firststate" >
+            <span class="info-name">确认人</span>
+            <span class="info-value">{{jobForm.confirmJobPerson}}</span>
+          </div>
         </div>
         <!--处理中必填项-->
         <div class="well-info-card" v-if="jobForm.editable==1 && winType=='inHandleJob'">
@@ -90,6 +94,10 @@
           <div v-if="handleImgs.length>0" class="img-area">
             <img class="img-show" v-for="img in handleImgs" :src="img" @click="showBigImage(img)"/>
           </div>
+          <div v-if="handleImgs.length>0" class="well-info firststate" >
+            <span class="info-name">处理人</span>
+            <span class="info-value">{{jobForm.handleJobPerson}}</span>
+          </div>
         </div>
 
         <!--工单相关阶段时间倒序-->
@@ -142,6 +150,7 @@
         jobForm: {
           id: '', // 工单id
           jobCode:'',//工单编号
+          jobBelongTo:'',
           createTime:'',//工单创建时间
           jobFlag: '', //工单延时标志，1为超时未接单，2位超时未处理
           wellId:1,
@@ -164,10 +173,12 @@
           flow:[],
           firstState:'',
           firstStatePhotos:'',
+          confirmJobPerson:'',
           shouldGetTime:'',
           shouldHandleTime:'',
           handleMessage:'',
           handlePhotos:'',
+          handleJobPerson:'',
           editable:1
         }, // 表单
         isLoading:true, //是否显示加载按钮
@@ -220,7 +231,7 @@
             class:'text-red'
           },
           {
-            title:'位置描述',
+            title:'详细地址',
             value:this.jobForm.position
           }
         ]
diff --git a/src/page/jobManage/modules/OverJob.vue b/src/page/jobManage/modules/OverJob.vue
index a211802..da9155b 100644
--- a/src/page/jobManage/modules/OverJob.vue
+++ b/src/page/jobManage/modules/OverJob.vue
@@ -21,9 +21,11 @@
             <div class="card-left">
               <div>
                 <span class="card-alarm">{{item.alarmContentName}}</span>
-                <span class="card-wellcode">{{item.wellCode}}</span>
                 <span class="card-createtime">{{item.createTime}}</span>
               </div>
+              <div class="card-wellcode">
+                <span>{{item.wellCode}}</span>
+              </div>
               <div class="card-position">
                 <span>{{item.position}}</span>
               </div>
@@ -189,7 +191,7 @@
         color #f7615a
       }
       .card-wellcode {
-        margin-left 10px
+        margin-top 12px
         font-size: 0.8rem
       }
       .card-welltype {
diff --git a/src/page/jobManage/modules/WaitConfirmJob.vue b/src/page/jobManage/modules/WaitConfirmJob.vue
index 15cda87..702063e 100644
--- a/src/page/jobManage/modules/WaitConfirmJob.vue
+++ b/src/page/jobManage/modules/WaitConfirmJob.vue
@@ -21,9 +21,11 @@
             <div class="card-left">
               <div>
                 <span class="card-alarm">{{item.alarmContentName}}</span>
-                <span class="card-wellcode">{{item.wellCode}}</span>
                 <span class="card-createtime">{{item.createTime}}</span>
               </div>
+              <div class="card-wellcode">
+                <span>{{item.wellCode}}</span>
+              </div>
               <div class="card-position">
                 <span>{{item.position}}</span>
               </div>
@@ -181,7 +183,7 @@
         color #f7615a
       }
       .card-wellcode {
-        margin-left 10px
+        margin-top 12px
         font-size: 0.8rem
       }
       .card-welltype {
diff --git a/src/page/jobManage/modules/WaitGetJob.vue b/src/page/jobManage/modules/WaitGetJob.vue
index 53c8032..f21dbe3 100644
--- a/src/page/jobManage/modules/WaitGetJob.vue
+++ b/src/page/jobManage/modules/WaitGetJob.vue
@@ -20,14 +20,20 @@
             <div class="card-left">
               <div>
                 <span class="card-alarm">{{item.alarmContentName}}</span>
-                <span class="card-wellcode">{{item.wellCode}}</span>
+                <span class="card-createtime">{{item.createTime}}</span>
               </div>
-              <div class="card-position">
-                <span>{{item.position}}</span>
+              <div class="card-wellcode">
+                <span>{{item.wellCode}}</span>
               </div>
-            </div>
-            <div class="card-right">
-              <mt-button type="primary" size="small" @click.stop="getJob(item.id)">接单</mt-button>
+              <div class="card-info">
+                <div class="card-position">
+                  <span>{{item.position}}</span>
+                </div>
+                <div class="card-right">
+                  <mt-button type="primary" size="small" @click.stop="getJob(item.id)">接单</mt-button>
+                </div>
+                <div class="clear-float"></div>
+              </div>
             </div>
             <div class="clear-float"></div>
           </div>
@@ -157,7 +163,7 @@
   }
   .job-card {
     .card-left {
-      width 70%
+      width 90%
       float left
       padding 15px 15px
       .card-alarm {
@@ -167,31 +173,44 @@
         color #f7615a
       }
       .card-wellcode {
-        margin-left 10px
+        margin-top 12px
         font-size: 0.8rem
       }
+      .card-createtime {
+        margin-top 5px
+        float right
+        font-size 0.8rem
+        color #bbbbbb
+      }
       .card-welltype {
         margin-left 10px
         font-size 0.8rem
         color #13ad00
       }
-      .card-position {
-        margin-top 18px
-        font-size 0.8rem
-        line-height 0.9rem
-        color #646464
+      .card-info {
+        .card-position {
+          margin-top 18px
+          font-size 0.8rem
+          line-height 0.9rem
+          color #646464
+          width 70%
+          float: left;
+        }
+        .card-right {
+          height: 100%
+          width 70px;
+          padding-top: 1px
+          float: right
+          text-align: right
+          .mint-button {
+            /*margin-top:7px*/
+            /*margin-top 20px*/
+            margin-left 10px
+          }
+        }
       }
+
     }
-    .card-right {
-      height: 100%
-      width 20%
-      padding-top: 1px
-      float: left
-      .mint-button{
-        /*margin-top:7px*/
-        margin-top 20px
-        margin-left 10px
-      }
-    }
+
   }
 </style>

diff --git a/src/page/jobManage/modules/InHandleJob.vue b/src/page/jobManage/modules/InHandleJob.vue
index 1a1f05e..cb2c2b6 100644
--- a/src/page/jobManage/modules/InHandleJob.vue
+++ b/src/page/jobManage/modules/InHandleJob.vue
@@ -21,9 +21,11 @@
             <div class="card-left">
               <div>
                 <span class="card-alarm">{{item.alarmContentName}}</span>
-                <span class="card-wellcode">{{item.wellCode}}</span>
                 <span class="card-createtime">{{item.createTime}}</span>
               </div>
+              <div class="card-wellcode">
+                <span>{{item.wellCode}}</span>
+              </div>
               <div class="card-position">
                 <span>{{item.position}}</span>
               </div>
@@ -185,7 +187,7 @@
         color #f7615a
       }
       .card-wellcode {
-        margin-left 10px
+        margin-top 12px
         font-size: 0.8rem
       }
       .card-welltype {
diff --git a/src/page/jobManage/modules/JobDetail.vue b/src/page/jobManage/modules/JobDetail.vue
index 3847c36..bb9cbc6 100644
--- a/src/page/jobManage/modules/JobDetail.vue
+++ b/src/page/jobManage/modules/JobDetail.vue
@@ -50,7 +50,7 @@
             </mt-radio>
           </div>
         </div>
-        <!--处理中工单显示现场情况-->
+        <!--处理中,已完成工单显示现场情况-->
         <div class="well-info-card" v-if="(winType=='inHandleJob'||winType=='overJob')&& jobForm.firstState">
           <div v-if="jobForm.firstState" class="well-info firststate" >
             <span class="info-name">现场情况</span>
@@ -62,6 +62,10 @@
           <div v-if="firstStateImgs.length>0" class="img-area">
             <img class="img-show" v-for="img in firstStateImgs" :src="img" @click="showBigImage(img)"/>
           </div>
+          <div v-if="firstStateImgs.length>0" class="well-info firststate" >
+            <span class="info-name">确认人</span>
+            <span class="info-value">{{jobForm.confirmJobPerson}}</span>
+          </div>
         </div>
         <!--处理中必填项-->
         <div class="well-info-card" v-if="jobForm.editable==1 && winType=='inHandleJob'">
@@ -90,6 +94,10 @@
           <div v-if="handleImgs.length>0" class="img-area">
             <img class="img-show" v-for="img in handleImgs" :src="img" @click="showBigImage(img)"/>
           </div>
+          <div v-if="handleImgs.length>0" class="well-info firststate" >
+            <span class="info-name">处理人</span>
+            <span class="info-value">{{jobForm.handleJobPerson}}</span>
+          </div>
         </div>
 
         <!--工单相关阶段时间倒序-->
@@ -142,6 +150,7 @@
         jobForm: {
           id: '', // 工单id
           jobCode:'',//工单编号
+          jobBelongTo:'',
           createTime:'',//工单创建时间
           jobFlag: '', //工单延时标志，1为超时未接单，2位超时未处理
           wellId:1,
@@ -164,10 +173,12 @@
           flow:[],
           firstState:'',
           firstStatePhotos:'',
+          confirmJobPerson:'',
           shouldGetTime:'',
           shouldHandleTime:'',
           handleMessage:'',
           handlePhotos:'',
+          handleJobPerson:'',
           editable:1
         }, // 表单
         isLoading:true, //是否显示加载按钮
@@ -220,7 +231,7 @@
             class:'text-red'
           },
           {
-            title:'位置描述',
+            title:'详细地址',
             value:this.jobForm.position
           }
         ]
diff --git a/src/page/jobManage/modules/OverJob.vue b/src/page/jobManage/modules/OverJob.vue
index a211802..da9155b 100644
--- a/src/page/jobManage/modules/OverJob.vue
+++ b/src/page/jobManage/modules/OverJob.vue
@@ -21,9 +21,11 @@
             <div class="card-left">
               <div>
                 <span class="card-alarm">{{item.alarmContentName}}</span>
-                <span class="card-wellcode">{{item.wellCode}}</span>
                 <span class="card-createtime">{{item.createTime}}</span>
               </div>
+              <div class="card-wellcode">
+                <span>{{item.wellCode}}</span>
+              </div>
               <div class="card-position">
                 <span>{{item.position}}</span>
               </div>
@@ -189,7 +191,7 @@
         color #f7615a
       }
       .card-wellcode {
-        margin-left 10px
+        margin-top 12px
         font-size: 0.8rem
       }
       .card-welltype {
diff --git a/src/page/jobManage/modules/WaitConfirmJob.vue b/src/page/jobManage/modules/WaitConfirmJob.vue
index 15cda87..702063e 100644
--- a/src/page/jobManage/modules/WaitConfirmJob.vue
+++ b/src/page/jobManage/modules/WaitConfirmJob.vue
@@ -21,9 +21,11 @@
             <div class="card-left">
               <div>
                 <span class="card-alarm">{{item.alarmContentName}}</span>
-                <span class="card-wellcode">{{item.wellCode}}</span>
                 <span class="card-createtime">{{item.createTime}}</span>
               </div>
+              <div class="card-wellcode">
+                <span>{{item.wellCode}}</span>
+              </div>
               <div class="card-position">
                 <span>{{item.position}}</span>
               </div>
@@ -181,7 +183,7 @@
         color #f7615a
       }
       .card-wellcode {
-        margin-left 10px
+        margin-top 12px
         font-size: 0.8rem
       }
       .card-welltype {
diff --git a/src/page/jobManage/modules/WaitGetJob.vue b/src/page/jobManage/modules/WaitGetJob.vue
index 53c8032..f21dbe3 100644
--- a/src/page/jobManage/modules/WaitGetJob.vue
+++ b/src/page/jobManage/modules/WaitGetJob.vue
@@ -20,14 +20,20 @@
             <div class="card-left">
               <div>
                 <span class="card-alarm">{{item.alarmContentName}}</span>
-                <span class="card-wellcode">{{item.wellCode}}</span>
+                <span class="card-createtime">{{item.createTime}}</span>
               </div>
-              <div class="card-position">
-                <span>{{item.position}}</span>
+              <div class="card-wellcode">
+                <span>{{item.wellCode}}</span>
               </div>
-            </div>
-            <div class="card-right">
-              <mt-button type="primary" size="small" @click.stop="getJob(item.id)">接单</mt-button>
+              <div class="card-info">
+                <div class="card-position">
+                  <span>{{item.position}}</span>
+                </div>
+                <div class="card-right">
+                  <mt-button type="primary" size="small" @click.stop="getJob(item.id)">接单</mt-button>
+                </div>
+                <div class="clear-float"></div>
+              </div>
             </div>
             <div class="clear-float"></div>
           </div>
@@ -157,7 +163,7 @@
   }
   .job-card {
     .card-left {
-      width 70%
+      width 90%
       float left
       padding 15px 15px
       .card-alarm {
@@ -167,31 +173,44 @@
         color #f7615a
       }
       .card-wellcode {
-        margin-left 10px
+        margin-top 12px
         font-size: 0.8rem
       }
+      .card-createtime {
+        margin-top 5px
+        float right
+        font-size 0.8rem
+        color #bbbbbb
+      }
       .card-welltype {
         margin-left 10px
         font-size 0.8rem
         color #13ad00
       }
-      .card-position {
-        margin-top 18px
-        font-size 0.8rem
-        line-height 0.9rem
-        color #646464
+      .card-info {
+        .card-position {
+          margin-top 18px
+          font-size 0.8rem
+          line-height 0.9rem
+          color #646464
+          width 70%
+          float: left;
+        }
+        .card-right {
+          height: 100%
+          width 70px;
+          padding-top: 1px
+          float: right
+          text-align: right
+          .mint-button {
+            /*margin-top:7px*/
+            /*margin-top 20px*/
+            margin-left 10px
+          }
+        }
       }
+
     }
-    .card-right {
-      height: 100%
-      width 20%
-      padding-top: 1px
-      float: left
-      .mint-button{
-        /*margin-top:7px*/
-        margin-top 20px
-        margin-left 10px
-      }
-    }
+
   }
 </style>
diff --git a/src/page/jobSearch/searchList.vue b/src/page/jobSearch/searchList.vue
index e88b506..3751755 100644
--- a/src/page/jobSearch/searchList.vue
+++ b/src/page/jobSearch/searchList.vue
@@ -28,9 +28,11 @@
                   <div class="card-left">
                     <div>
                       <span class="card-alarm">{{item.alarmContentName}}</span>
-                      <span class="card-wellcode">{{item.wellCode}}</span>
                       <span class="card-createtime">{{item.createTime}}</span>
                     </div>
+                    <div class="card-wellcode">
+                      <span>{{item.wellCode}}</span>
+                    </div>
                     <div class="card-position">
                       <span>{{item.position}}</span>
                     </div>
@@ -58,10 +60,10 @@
                         <span class="timeline-left">{{item.confirmJobTime}}</span> <span class="timeline-right">{{item.confirmJobPerson}}确认工单</span>
                       </timeline-item>
                       <timeline-item v-if="item.jobStatus=='3' && item.handleJobTime!=''">
-                        <span class="timeline-left">{{item.handleJobTime}}</span> <span class="timeline-right">{{item.confirmJobPerson}}完成工单</span>
+                        <span class="timeline-left">{{item.handleJobTime}}</span> <span class="timeline-right">{{item.handleJobPerson}}完成工单</span>
                       </timeline-item>
                       <timeline-item v-if="item.jobStatus=='4' && item.handleJobTime!=''">
-                        <span class="timeline-left">{{item.handleJobTime}}</span> <span class="timeline-right">{{item.confirmJobPerson}}取消工单</span>
+                        <span class="timeline-left">{{item.handleJobTime}}</span> <span class="timeline-right">{{item.handleJobPerson}}取消工单</span>
                       </timeline-item>
                       <div class="detail-btn" @click.stop="item.showTimeline=!item.showTimeline">
                         <i class="iconfont icon-fanhui3"></i>
@@ -77,9 +79,11 @@
                 <div class="card-left">
                   <div>
                     <span class="card-alarm">{{item.alarmContentName}}</span>
-                    <span class="card-wellcode">{{item.wellCode}}</span>
                     <span class="card-createtime">{{item.createTime}}</span>
                   </div>
+                  <div class="card-wellcode">
+                    <span>{{item.wellCode}}</span>
+                  </div>
                   <div class="card-info">
                     <div class="card-position">
                       <span>{{item.position}}</span>
@@ -105,9 +109,9 @@
 
 <script>
   import {Timeline, TimelineItem, TimelineTitle} from 'vue-cute-timeline'
-  import {Loadmore, Indicator, Toast} from 'mint-ui'
+  import {MessageBox, Indicator, Toast} from 'mint-ui'
   import Loading from '@/components/Loading'
-  import {getJobSearchList} from '@/api/job'
+  import {getJobSearchList, getJob} from '@/api/job'
 
   let isFromDetail = false
   export default {
@@ -217,6 +221,21 @@
         this.$router.push({
           path: `/jobDetail/${id}`
         })
+      },
+      getJob(id){
+        MessageBox.confirm('确定要接单吗?').then(action => {
+          if(action=='confirm'){
+            getJob(id).then(response => {
+              if(response.code==200){
+                Toast({
+                  message: '接单成功',
+                  position: 'bottom',
+                })
+                this.loadTop()
+              }
+            })
+          }
+        })
       }
     }
   }
@@ -250,7 +269,7 @@
         color #f7615a
       }
       .card-wellcode {
-        margin-left 10px
+        margin-top 12px
         font-size: 0.8rem
       }
       .card-welltype {
@@ -295,7 +314,7 @@
         color #f7615a
       }
       .card-wellcode {
-        margin-left 10px
+        margin-top 12px
         font-size: 0.8rem
       }
       .card-createtime {
@@ -326,7 +345,7 @@
           text-align: right
           .mint-button {
             /*margin-top:7px*/
-            margin-top 20px
+            /*margin-top 20px*/
             margin-left 10px
           }
         }