MONSTER-ygh 1 سال پیش
والد
کامیت
63abdbbaa1

+ 1 - 1
src/api/system/dict/type.js

@@ -46,7 +46,7 @@ export function delType(dictId) {
 // 刷新字典缓存
 export function refreshCache() {
   return request({
-    url: '/system/dict/type/refreshCache',
+    url: '/system/dict/type/clearCache',
     method: 'delete'
   })
 }

+ 17 - 14
src/views/appletMr/index.vue

@@ -78,20 +78,23 @@
             @click="ionlineApi(scope.row)"
             v-hasPermi="['appletMr:appletMr:release']"
           >{{scope.row.onlineStatus == '1' ? '取消发布' : '发布'}}</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            v-if="scope.row.onlineStatus != '1'"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['appletMr:appletMr:edit']"
-          >编辑</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            v-if="scope.row.onlineStatus != '1'"
-            @click="handleDelete(scope.row,scope.index)"
-            v-hasPermi="['appletMr:appletMr:delete']"
-          >删除</el-button>
+          <span v-hasPermi="['appletMr:appletMr:edit']" style="display: inline-block;margin-left: 10px;">
+            <el-button
+              size="mini"
+              type="text"
+              v-if="scope.row.onlineStatus != '1'"
+              @click="handleUpdate(scope.row)"
+            >编辑</el-button>
+          </span>
+          
+          <span v-hasPermi="['appletMr:appletMr:delete']" style="display: inline-block;margin-left: 10px;">
+            <el-button
+              size="mini"
+              type="text"
+              v-if="scope.row.onlineStatus != '1'"
+              @click="handleDelete(scope.row,scope.index)"
+            >删除</el-button>
+          </span>
         </template>
       </el-table-column>
     </el-table>

+ 9 - 7
src/views/finance/InvoiceRecords/index.vue

@@ -94,13 +94,15 @@
             @click="openDetails(scope.row)"
             v-hasPermi="['finance:InvoiceRecords:details']"
           >详情</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            v-if="scope.row.status == 1 || scope.row.status == 7"
-            @click="openRedBlood(scope.row)"
-            v-hasPermi="['finance:InvoiceRecords:redblood']"
-          >冲红</el-button>
+          
+          <span v-hasPermi="['finance:InvoiceRecords:redblood']" style="display: inline-block;margin-left: 10px;">
+            <el-button
+              size="mini"
+              type="text"
+              v-if="scope.row.status == 1 || scope.row.status == 7"
+              @click="openRedBlood(scope.row)"
+            >冲红</el-button>
+          </span>
         </template>
       </el-table-column>
     </el-table>

+ 9 - 7
src/views/finance/refundMr/index.vue

@@ -113,13 +113,15 @@
 <!--            @click="openDetails(scope.row)"-->
 <!--            v-hasPermi="['refundMr:refundMr:edit']"-->
 <!--          >查看</el-button>-->
-          <el-button
-            size="mini"
-            type="text"
-            v-if="scope.row.status == 0 || scope.row.status == 4"
-            @click="openDetails(scope.row, 'refund')"
-            v-hasPermi="['refundMr:refundMr:delete']"
-          >审核</el-button>
+          
+          <span v-hasPermi="['refundMr:refundMr:delete']" style="display: inline-block;margin-left: 10px;">
+            <el-button
+              size="mini"
+              type="text"
+              v-if="scope.row.status == 0 || scope.row.status == 4"
+              @click="openDetails(scope.row, 'refund')"
+            >审核</el-button>
+          </span>
         </template>
       </el-table-column>
     </el-table>

+ 18 - 14
src/views/information/informationMr/index.vue

@@ -101,20 +101,24 @@
 <!--            @click="toppingApi(scope.row)"-->
 <!--            v-hasPermi="['informationMr:informationMr:release']"-->
 <!--          >{{scope.row.status == '1' ? '取消置顶' : '置顶'}}</el-button>-->
-          <el-button
-            size="mini"
-            type="text"
-            v-if="scope.row.status != '1'"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['informationMr:informationMr:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            v-if="scope.row.status != '1'"
-            @click="handleDelete(scope.row,scope.index)"
-            v-hasPermi="['informationMr:informationMr:delete']"
-          >删除</el-button>
+          
+          <span v-hasPermi="['informationMr:informationMr:edit']" style="display: inline-block;margin-left: 10px;">
+            <el-button
+              size="mini"
+              type="text"
+              v-if="scope.row.status != '1'"
+              @click="handleUpdate(scope.row)"
+            >修改</el-button>
+          </span>
+          
+          <span v-hasPermi="['informationMr:informationMr:delete']" style="display: inline-block;margin-left: 10px;">
+            <el-button
+              size="mini"
+              type="text"
+              v-if="scope.row.status != '1'"
+              @click="handleDelete(scope.row,scope.index)"
+            >删除</el-button>
+          </span>
         </template>
       </el-table-column>
     </el-table>

+ 1 - 1
src/views/marketing/coupon/dialog/addAndEdit.vue

@@ -102,7 +102,7 @@
           <el-radio v-model="form.useType" :label="1">指定时间</el-radio>
           <el-radio v-model="form.useType" :label="2">有效天数</el-radio>
         </el-form-item>
-        <el-form-item v-if="form.useType==1" label="指定时间" prop="useDate" required>
+        <el-form-item v-if="form.useType==1" label="指定时间" prop="useStartDate" required>
           <el-date-picker
             @change="useStartDateChange"
             v-model="form.useDate"

+ 1 - 1
src/views/marketing/coupon/index.vue

@@ -83,7 +83,7 @@
           <!-- <dict-tag :options="dict.type.template_ident" :value="scope.row.templateIdent"/> -->
         </template>
       </el-table-column>
-      <el-table-column label="用时间" align="center" prop="useStartDate">
+      <el-table-column label="使用时间" align="center" prop="useStartDate">
         <template slot-scope="scope">
           <span v-if="scope.row.useType==1">{{scope.row.useStartDate}}至{{scope.row.useEndDate}}</span>
           <span v-if="scope.row.useType==2">领取{{scope.row.useDay}}天后失效</span>

+ 21 - 17
src/views/order/groupBuyingMr/index.vue

@@ -218,7 +218,7 @@
             </template>
           </el-table-column>
           <el-table-column label="支付单号" align="center" prop="paymentId" />
-          <el-table-column label="订单状态" align="center" prop="type">
+          <el-table-column label="订单状态" align="center" prop="status">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.order_status_type" :value="scope.row.status"/>
             </template>
@@ -263,27 +263,31 @@
                 @click="openDetails(scope.row)"
                 v-hasPermi="['groupBuyingMr:groupBuyingMr:details']"
               >详情</el-button>
-              <el-button
-              v-if="scope.row.payWay == 'corporate'||scope.row.status === 0"
-                size="mini"
-                type="text"
-                @click="handleCorporatePay(scope.row)"
-                v-hasPermi="['groupBuyingMr:groupBuyingMr:details']"
-              >对公转账</el-button>
-              <el-button
-                v-if="scope.row.status === 0"
-                size="mini"
-                type="text"
-                @click="handleCancelOrder(scope.row)"
-                v-hasPermi="['groupBuyingMr:groupBuyingMr:cancel']"
-              >关闭订单</el-button>
-              <el-button
+              <span v-hasPermi="['groupBuyingMr:groupBuyingMr:details']" style="display: inline-block;margin-left: 10px;">
+                <el-button
+                v-if="scope.row.payWay == 'corporate'||scope.row.status === 0"
+                  size="mini"
+                  type="text"
+                  @click="handleCorporatePay(scope.row)"
+                
+                >对公转账</el-button>
+              </span>
+              <span v-hasPermi="['groupBuyingMr:groupBuyingMr:cancel']" style="display: inline-block;margin-left: 10px;">
+                <el-button
+                  v-if="scope.row.status == 0"
+                  size="mini"
+                  type="text"
+                  @click="handleCancelOrder(scope.row)"
+                >关闭订单</el-button>
+              </span>
+              <span v-hasPermi="['groupBuyingMr:groupBuyingMr:print']" style="display: inline-block;margin-left: 10px;">
+                <el-button
                   v-if="scope.row.status == 3 || scope.row.status == 7"
                   size="mini"
                   type="text"
                   @click="handleOpen([scope.row])"
-                  v-hasPermi="['groupBuyingMr:groupBuyingMr:print']"
                 >打印小票</el-button>
+              </span>
             </template>
           </el-table-column>
         </el-table>

+ 11 - 9
src/views/order/orderMr/index.vue

@@ -303,20 +303,22 @@
                 @click="openDetails(scope.row)"
                 v-hasPermi="['orderMr:orderMr:details']"
               >详情</el-button>
-              <el-button
-                v-if="scope.row.status === 0"
-                size="mini"
-                type="text"
-                @click="handleCancelOrder(scope.row)"
-                v-hasPermi="['orderMr:orderMr:cancel']"
-              >关闭订单</el-button>
-              <el-button
+              <span v-hasPermi="['orderMr:orderMr:cancel']" style="display: inline-block;margin-left: 10px;">
+                <el-button
+                  v-if="scope.row.status == 0"
+                  size="mini"
+                  type="text"
+                  @click="handleCancelOrder(scope.row)"
+                >关闭订单</el-button>
+              </span>
+              <span v-hasPermi="['orderMr:orderMr:print']" style="display: inline-block;margin-left: 10px;">
+                <el-button
                   v-if="scope.row.status == 3 || scope.row.status == 7"
                   size="mini"
                   type="text"
                   @click="handleOpen([scope.row])"
-                  v-hasPermi="['orderMr:orderMr:print']"
                 >打印小票</el-button>
+              </span>
             </template>
           </el-table-column>
         </el-table>

+ 9 - 4
src/views/order/viewers/index.vue

@@ -158,12 +158,17 @@
             <template slot-scope="scope">
               <el-button size="mini" type="text" @click="openDetails(scope.row)"
                 v-hasPermi="['order:viewers:details']">详情</el-button>
-              <el-button v-if="scope.row.status == 3 || scope.row.status == 7" size="mini" type="text"
+              <span v-hasPermi="['order:viewers:print']" style="display: inline-block;margin-left: 10px;">
+                <el-button 
+                v-if="scope.row.status == 3 || scope.row.status == 7" size="mini" type="text"
                 @click="handleOpen([scope.row])"
-                v-hasPermi="['order:viewers:print']">打印</el-button>
-              <el-button v-if="scope.row.status == 3 || scope.row.status == 6" size="mini" type="text"
+                >打印</el-button>
+              </span>
+              <span v-hasPermi="['order:viewers:tuikuai']" style="display: inline-block;margin-left: 10px;">
+                <el-button v-if="scope.row.status == 3 || scope.row.status == 6" size="mini" type="text"
                 @click="openRefundSubmitModel([scope.row])"
-                v-hasPermi="['order:viewers:tuikuai']">退款</el-button>
+                >退款</el-button>
+              </span>
             </template>
           </el-table-column>
         </el-table>

+ 16 - 14
src/views/otaMr/meituan/index.vue

@@ -53,20 +53,22 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            v-if="scope.row.status != '1'"
-            @click="handleUpdate(scope.row,scope.index)"
-            v-hasPermi="['otaMr:otaMr:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            v-if="scope.row.status != '1'"
-            @click="handleDelete(scope.row,scope.index)"
-            v-hasPermi="['otaMr:otaMr:delete']"
-          >删除</el-button>
+          <span v-hasPermi="['otaMr:otaMr:edit']" style="display: inline-block;margin-left: 10px;">
+            <el-button
+              size="mini"
+              type="text"
+              v-if="scope.row.status != '1'"
+              @click="handleUpdate(scope.row,scope.index)"
+            >修改</el-button>
+          </span>
+          <span v-hasPermi="['otaMr:otaMr:delete']" style="display: inline-block;margin-left: 10px;">
+            <el-button
+              size="mini"
+              type="text"
+              v-if="scope.row.status != '1'"
+              @click="handleDelete(scope.row,scope.index)"
+            >删除</el-button>
+          </span>
         </template>
       </el-table-column>
     </el-table>

+ 1 - 1
src/views/otaMr/tiktok/dialog/dataEdit.vue

@@ -61,7 +61,7 @@
             <el-input-number v-else v-model="scope.row.actualAmount" controls-position="right"></el-input-number>
           </template>
         </el-table-column>
-        <el-table-column label="结算价" align="center" prop="originAmount" width="250">
+        <el-table-column label="划线价" align="center" prop="originAmount" width="250">
           <template slot-scope="scope">
             <span v-if="!isCheck(scope.row)">{{ scope.row.originAmount }}</span>
             <el-input-number v-else v-model="scope.row.originAmount" controls-position="right"></el-input-number>

+ 16 - 14
src/views/otaMr/tiktok/index.vue

@@ -53,20 +53,22 @@
       <el-table-column label="最新上架时间" align="center" prop="goodsName3" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            @click="handlePush(scope.row,scope.index)"
-            v-if="(scope.row.status == 0 || scope.row.status == 1) && scope.row.process == 4"
-            v-hasPermi="['otaMr:tiktok:push']"
-          >{{ scope.row.status == 0 ? '上线' : '下线' }}</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            @click="handleInventory(scope.row,scope.index)"
-            v-if="scope.row.status == 1"
-            v-hasPermi="['otaMr:tiktok:push']"
-          >日历库存推送</el-button>
+          <span v-hasPermi="['otaMr:tiktok:push']" style="display: inline-block;margin-left: 10px;">
+            <el-button
+              size="mini"
+              type="text"
+              @click="handlePush(scope.row,scope.index)"
+              v-if="(scope.row.status == 0 || scope.row.status == 1) && scope.row.process == 4"
+            >{{ scope.row.status == 0 ? '上线' : '下线' }}</el-button>
+          </span>
+          <span v-hasPermi="['otaMr:tiktok:push']" style="display: inline-block;margin-left: 10px;">
+            <el-button
+              size="mini"
+              type="text"
+              @click="handleInventory(scope.row,scope.index)"
+              v-if="scope.row.status == 1"
+            >日历库存推送</el-button>
+          </span>
           <el-button
             size="mini"
             type="text"

+ 16 - 14
src/views/perform/performMr/index.vue

@@ -43,20 +43,22 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            v-if="scope.row.status != '1'"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['performMr:performMr:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            v-if="scope.row.status != '1'"
-            @click="handleDelete(scope.row,scope.index)"
-            v-hasPermi="['performMr:performMr:delete']"
-          >删除</el-button>
+          <span v-hasPermi="['performMr:performMr:edit']" style="display: inline-block;margin-left: 10px;">
+            <el-button
+              size="mini"
+              type="text"
+              v-if="scope.row.status != '1'"
+              @click="handleUpdate(scope.row)"
+            >修改</el-button>
+          </span>
+          <span v-hasPermi="['performMr:performMr:delete']" style="display: inline-block;margin-left: 10px;">
+            <el-button
+              size="mini"
+              type="text"
+              v-if="scope.row.status != '1'"
+              @click="handleDelete(scope.row,scope.index)"
+            >删除</el-button>
+          </span>
         </template>
       </el-table-column>
     </el-table>

+ 16 - 14
src/views/schedulingMr/index.vue

@@ -43,20 +43,22 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            v-if="scope.row.status != '1'"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['performMr:performMr:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            v-if="scope.row.status != '1'"
-            @click="handleDelete(scope.row,scope.index)"
-            v-hasPermi="['performMr:performMr:delete']"
-          >删除</el-button>
+          <span v-hasPermi="['performMr:performMr:edit']" style="display: inline-block;margin-left: 10px;">
+            <el-button
+              size="mini"
+              type="text"
+              v-if="scope.row.status != '1'"
+              @click="handleUpdate(scope.row)"
+            >修改</el-button>
+          </span>
+          <span v-hasPermi="['performMr:performMr:delete']" style="display: inline-block;margin-left: 10px;">
+            <el-button
+              size="mini"
+              type="text"
+              v-if="scope.row.status != '1'"
+              @click="handleDelete(scope.row,scope.index)"
+            >删除</el-button>
+          </span>
         </template>
       </el-table-column>
     </el-table>

+ 9 - 8
src/views/system/dept/index.vue

@@ -84,14 +84,15 @@
             @click="handleAdd(scope.row)"
             v-hasPermi="['system:dept:add']"
           >新增</el-button>
-          <el-button
-            v-if="scope.row.parentId != 0"
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['system:dept:remove']"
-          >删除</el-button>
+          <span v-hasPermi="['system:dept:remove']" style="display: inline-block;margin-left: 10px;">
+            <el-button
+              v-if="scope.row.parentId != 0"
+              size="mini"
+              type="text"
+              icon="el-icon-delete"
+              @click="handleDelete(scope.row)"
+            >删除</el-button>
+          </span>
         </template>
       </el-table-column>
     </el-table>

+ 31 - 27
src/views/team/applicationMr/index.vue

@@ -102,33 +102,37 @@
         <el-table-column label="审核人" align="center" prop="checkorName" />
         <el-table-column label="操作" align="center" fixed="right" width="150" class-name="small-padding fixed-width">
           <template slot-scope="scope">
-          <el-button
-              size="mini"
-              type="text"
-              @click="handleUpdate(scope.row)"
-              v-if="name==scope.row.createBy && scope.row.status == 2"
-              v-hasPermi="['applicationMr:applicationMr:edit']"
-            >修改</el-button>
-            <el-button
-              size="mini"
-              type="text"
-              v-if="scope.row.status == 0"
-              @click="handleDetails(scope.row, 'examine')"
-              v-hasPermi="['applicationMr:applicationMr:examine']"
-            >审核</el-button>
-            <el-button
-              size="mini"
-              type="text"
-              @click="handleDetails(scope.row)"
-              v-hasPermi="['applicationMr:applicationMr:details']"
-            >详情</el-button>
-            <el-button
-              size="mini"
-              type="text"
-              v-if="scope.row.status == 1"
-              @click="handleOrderDetails(scope.row)"
-              v-hasPermi="['applicationMr:applicationMr:order']"
-            >查看订单</el-button>
+            <span v-hasPermi="['applicationMr:applicationMr:edit']" style="display: inline-block;margin-left: 10px;">
+              <el-button
+                size="mini"
+                type="text"
+                @click="handleUpdate(scope.row)"
+                v-if="name==scope.row.createBy && scope.row.status == 2"
+              >修改</el-button>
+            </span>
+            <span v-hasPermi="['applicationMr:applicationMr:examine']" style="display: inline-block;margin-left: 10px;">
+              <el-button
+                size="mini"
+                type="text"
+                v-if="scope.row.status == 0"
+                @click="handleDetails(scope.row, 'examine')"
+              >审核</el-button>
+            </span>
+            <span v-hasPermi="['applicationMr:applicationMr:details']" style="display: inline-block;margin-left: 10px;">
+              <el-button
+                size="mini"
+                type="text"
+                @click="handleDetails(scope.row)"
+              >详情</el-button>
+            </span>
+            <span v-hasPermi="['applicationMr:applicationMr:order']" style="display: inline-block;margin-left: 10px;">
+              <el-button
+                size="mini"
+                type="text"
+                v-if="scope.row.status == 1"
+                @click="handleOrderDetails(scope.row)"
+              >查看订单</el-button>
+            </span>
           </template>
         </el-table-column>
       </el-table>

+ 32 - 28
src/views/team/teamMr/index.vue

@@ -124,34 +124,38 @@
             @click="handleAudit(scope.row,'details')"
             v-hasPermi="['teamMr:teamMr:details']"
           >详情</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            @click="handleAudit(scope.row,'Audit')"
-            v-hasPermi="['teamMr:teamMr:audit']"
-            v-if="scope.row.checkStatus == 0 && name!=scope.row.createBy"
-          >审核</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['teamMr:teamMr:edit']"
-            v-if="scope.row.checkStatus == 1 && name!=scope.row.createBy" 
-          >编辑</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['teamMr:teamMr:edit']"
-            v-if="scope.row.checkStatus == 2 && name==scope.row.createBy" 
-          >修改重新提交</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            @click="handleDelete(scope.row,scope.index)"
-            v-hasPermi="['teamMr:teamMr:delete']"
-            v-if="(scope.row.checkStatus == 1 && name!=scope.row.createBy)||scope.row.checkStatus != 1"
-          >删除</el-button>
+          <span v-hasPermi="['teamMr:teamMr:audit']" style="display: inline-block;margin-left: 10px;">
+            <el-button
+              size="mini"
+              type="text"
+              @click="handleAudit(scope.row,'Audit')"
+              v-if="scope.row.checkStatus == 0 && name!=scope.row.createBy"
+            >审核</el-button>
+          </span>
+          <span v-hasPermi="['teamMr:teamMr:edit']" style="display: inline-block;margin-left: 10px;">
+            <el-button
+              size="mini"
+              type="text"
+              @click="handleUpdate(scope.row)"
+              v-if="scope.row.checkStatus == 1 && name!=scope.row.createBy" 
+            >编辑</el-button>
+          </span>
+          <span v-hasPermi="['teamMr:teamMr:edit']" style="display: inline-block;margin-left: 10px;">
+            <el-button
+              size="mini"
+              type="text"
+              @click="handleUpdate(scope.row)"
+              v-if="scope.row.checkStatus == 2 && name==scope.row.createBy" 
+            >修改重新提交</el-button>
+          </span>
+          <span v-hasPermi="['teamMr:teamMr:delete']" style="display: inline-block;margin-left: 10px;">
+            <el-button
+              size="mini"
+              type="text"
+              @click="handleDelete(scope.row,scope.index)"
+              v-if="(scope.row.checkStatus == 1 && name!=scope.row.createBy)||scope.row.checkStatus != 1"
+            >删除</el-button>
+          </span>
           <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row,scope.index)">
             <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
             <el-dropdown-menu slot="dropdown">

+ 15 - 13
src/views/ticket/ticketMr/index.vue

@@ -95,19 +95,21 @@
             @click="openDetails(scope.row)"
             v-hasPermi="['ticketMr:ticketMr:details']"
           >详情</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            @click="handleUpdate(scope.row)"
-            v-if="scope.row.status != 0"
-            v-hasPermi="['ticketMr:ticketMr:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            @click="handleDelete(scope.row,scope.index)"
-            v-hasPermi="['ticketMr:ticketMr:delete']"
-          >删除</el-button>
+          <span v-hasPermi="['ticketMr:ticketMr:edit']" style="display: inline-block;margin-left: 10px;">
+            <el-button
+              size="mini"
+              type="text"
+              @click="handleUpdate(scope.row)"
+              v-if="scope.row.status != 0"
+            >修改</el-button>
+          </span>
+          <span v-hasPermi="['ticketMr:ticketMr:delete']" style="display: inline-block;margin-left: 10px;">
+            <el-button
+              size="mini"
+              type="text"
+              @click="handleDelete(scope.row,scope.index)"
+            >删除</el-button>
+          </span>
         </template>
       </el-table-column>
     </el-table>

+ 8 - 7
src/views/userMr/index.vue

@@ -90,13 +90,14 @@
             @click="openDetails(scope.row)"
             v-hasPermi="['userMr:userMr:details']"
           >详情</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            v-hasPermi="['userMr:userMr:authentication']"
-            v-if="scope.row.isAuth == 1"
-            @click="updateAuthStatusEven(scope.row)"
-          >取消实名认证</el-button>
+          <span v-hasPermi="['userMr:userMr:authentication']" style="display: inline-block;margin-left: 10px;">
+            <el-button
+              size="mini"
+              type="text"
+              v-if="scope.row.isAuth == 1"
+              @click="updateAuthStatusEven(scope.row)"
+            >取消实名认证</el-button>
+          </span>
           <el-button
             size="mini"
             type="text"