Merge branch 'dev-huji' into dev

src/views/components/resiChangeRecord.vue

@@ -20,38 +20,46 @@
                        label="变更类型"
                        width="80">
       </el-table-column>
-      <el-table-column prop="beforeChangeName"
+      <el-table-column prop="reason"
-                       header-align="center"
-                       align="center"
-                       label="变更前"
-                       width="230">
-      </el-table-column>
-      <el-table-column prop="afterChangeName"
                        header-align="center"
                        align="center"
-                       label="变更后"
+                       label="原因"
-                       min-width="230">
+                       show-overflow-tooltip
+                       min-width="120">
       </el-table-column>
-
       <el-table-column prop="changeTime"
                        header-align="center"
                        align="center"
                        label="变更时间"
                        width="160">
       </el-table-column>
-      <el-table-column prop="remark"
+      <el-table-column prop="beforeChangeName"
                        header-align="center"
                        align="center"
-                       label="原因"
+                       label="变更前"
                        show-overflow-tooltip
-                       min-width="120">
+                       width="230">
       </el-table-column>
+      <el-table-column prop="afterChangeName"
+                       header-align="center"
+                       align="center"
+                       label="变更后"
+                       show-overflow-tooltip
+                       min-width="230">
+      </el-table-column>
+      
       <el-table-column prop="operatorName"
                        header-align="center"
                        align="center"
                        label="操作人"
                        width="80">
       </el-table-column>
+      <el-table-column prop="createdTime"
+                       header-align="center"
+                       align="center"
+                       label="调整时间"
+                       width="160">
+      </el-table-column>
 
       <el-table-column prop="remark"
                        header-align="center"
@@ -60,12 +68,7 @@
                        show-overflow-tooltip
                        min-width="120">
       </el-table-column>
-      <el-table-column prop="createdTime"
+      
-                       header-align="center"
-                       align="center"
-                       label="调整时间"
-                       width="160">
-      </el-table-column>
     </el-table>
     <div>
       <el-pagination @size-change="handleSizeChange"

src/views/modules/base/huji/immigration/index.vue

@@ -347,9 +347,10 @@
         >
         </el-table-column>
 
-        <el-table-column fixed="right" label="操作" align="center" width="160">
+        <el-table-column fixed="right" label="操作" align="center" width="120">
           <template slot-scope="scope">
             <el-button
+              v-if="false"
               @click="handleWatch(scope.$index)"
               type="text"
               size="small"