Merge branch 'dev-220309' into dev

src/views/components/CTable.vue

@@ -93,10 +93,10 @@
           <el-button v-for="item in operations"
                      v-show="item.isShow(scope.row)"
                      :key="item.lable"
-                     :style=item.style
+                     :type="item.type"
-                     :type=item.type
+                     :style="item.style"
-                     :size=item.size
+                     :size="item.size"
-                     :plain=item.plain
+                      :class="item.class"
                      @click.stop="handleMethod(scope.$index, scope.row,item.methodName)">{{item.lable}}</el-button>
         </template>
       </el-table-column>

src/views/modules/communityService/measure/index.vue

@@ -163,14 +163,14 @@
           :prop="item.columnName"
           :label="item.label"
           :align="item.align"
-          :width="item.width"
+          :min-width="item.width"
           :show-overflow-tooltip="true"
         >
           <template slot-scope="scope">
             <span>{{ handleFilterSpan(scope.row, item) }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="200">
+        <el-table-column fixed="right" label="操作" align="center" width="200">
           <template slot-scope="scope">
             <template v-if="filterEdit(scope.row.agencyId)">
               <el-button

src/views/modules/workPc/guidance/guidanceList.vue

@@ -136,11 +136,12 @@ export default {
       operations: [
         {
           lable: '详情', // 按钮显示名称
-          size: 'mini',
+          size: 'small',
           style: 'margin: 0 6px;',
           type: 'text',
           slot: '',
           plain: false,
+          class: 'div-table-button--detail',
           methodName: 'detail', // 回调方法名称
           isShow: (row) => {
             return true
@@ -148,11 +149,12 @@ export default {
         },
         {
           lable: '修改', // 按钮显示名称
-          size: 'mini',
+          size: 'small',
           style: 'margin: 0 6px;',
           type: 'text',
           slot: '',
           plain: false,
+          class: 'div-table-button--edit',
           methodName: 'edit', // 回调方法名称
           isShow: (row) => {
             // return true
@@ -165,11 +167,12 @@ export default {
         },
         {
           lable: '删除', // 按钮显示名称
-          size: 'mini',
+          size: 'small',
           style: 'margin: 0 6px;',
           type: 'text',
           slot: '',
           plain: false,
+          class: 'div-table-button--delete',
           methodName: 'confirmDel', // 回调方法名称
           isShow: (row) => {
             if (row.createdId === this.userId) {

src/views/modules/workSys/resiCate.vue

@@ -75,7 +75,7 @@
             <span v-else>{{ handleFilterSpan(scope.row, item) }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="120">
+        <el-table-column fixed="right" label="操作" align="center" width="120">
           <template slot-scope="scope">
             <el-button
               @click="handleLook(scope.row)"