Merge branch 'bianww' into test-new

src/pages/main/departWorkLists/index.vue

@@ -172,7 +172,7 @@
                             align="center"
                         >
                         </el-table-column>
-                        <el-table-column label="操作" align="center"  min-width="20%">
+                        <el-table-column label="操作" align="center" width="150">
                             <template slot-scope="scope">
                                 <el-button
                                     :disabled="scope.row.editFlag=='1'?false:true"