Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-ui into dev

src/views/system/user/profile/workunitSelect.vue

@@ -24,9 +24,9 @@
       @selection-change="handleSelectionChange"
     >
     <el-table-column type="selection" width="55" align="center" />
+    <el-table-column label="工作单元名称" align="center" prop="workunitName" />
+     <el-table-column  label="工作单元编码" align="center" prop="workunitCode" />
       <el-table-column label="工作中心名称" align="center" prop="workstationName" />
-      <el-table-column  label="工作单元编码" align="center" prop="workunitCode" />
-      <el-table-column label="工作单元名称" align="center" prop="workunitName" />
     </el-table>
     <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
       @pagination="getList" />

src/views/system/user/profile/workunitSelect1.vue

@@ -68,15 +68,15 @@
             >
           </template>
         </el-table-column>
-        <el-table-column label="工作中心名称" width="180" prop="workstationName" />
+        <el-table-column label="工作单元名称"  align="center" prop="workunitName" />
         <el-table-column
           label="工作单元编码"
-          width="200"
+          
           align="center"
           prop="workunitCode"
           :show-overflow-tooltip="true"
         />
-        <el-table-column label="工作单元名称" align="center" prop="workunitName" />
+        <el-table-column label="工作中心名称"  prop="workstationName" />
       </el-table>
       <pagination
         v-show="total > 0"