Merge branch 'master' of http://49.233.37.222:3000/wjm/mec-cloud_IntelligentManufacturing_CRM

ruoyi-ui/src/views/system/post/index.vue

@@ -95,7 +95,7 @@
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -112,6 +112,48 @@
             v-hasPermi="['system:post:remove']"
           >删除</el-button>
         </template>
+      </el-table-column> -->
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
+        <template slot-scope="scope">
+          <el-dropdown>
+            <el-button type="warning" plain size="small">
+              处理<i class="el-icon-arrow-down el-icon--right"></i>
+            </el-button>
+            <el-dropdown-menu slot="dropdown">
+              <el-dropdown-item
+              >
+                <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-edit"
+                  @click="handleUpdate(scope.row)"
+                  v-hasPermi="['system:post:edit']"
+                >修改
+                </el-button
+                >
+              </el-dropdown-item
+              >
+              <el-dropdown-item
+              >
+                <el-button
+                  v-if="scope.row.parentId != 0"
+                  size="mini"
+                  type="text"
+                  icon="el-icon-delete"
+                  @click="handleDelete(scope.row)"
+                  v-hasPermi="['system:post:remove']"
+                >删除
+                </el-button
+                >
+              </el-dropdown-item
+              >
+            </el-dropdown-menu>
+          </el-dropdown>
+        </template>
       </el-table-column>
     </el-table>
 

ruoyi-ui/src/views/system/tenant/index.vue

@@ -107,14 +107,14 @@
           v-hasPermi="['system:tenant:export']"
           >导出
         </el-button>
-        <el-button
+        <!-- <el-button
           type="warning"
           plain
           icon="el-icon-download"
           size="mini"
           @click="handleTest"
           >test
-        </el-button>
+        </el-button> -->
       </el-col>
       <right-toolbar
         :showSearch.sync="showSearch"