1. 优化

src/views/appletMr/index.vue

@@ -78,19 +78,21 @@
             @click="ionlineApi(scope.row)"
             v-hasPermi="['appletMr:appletMr:release']"
           >{{scope.row.onlineStatus == '1' ? '取消发布' : '发布'}}</el-button>
-          <span v-hasPermi="['appletMr:appletMr:edit']" style="display: inline-block;margin-left: 10px;">
+          <span v-hasPermi="['appletMr:appletMr:edit']" style="display: inline-block;">
             <el-button
               size="mini"
               type="text"
+              style="margin-left: 10px;"
               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;">
+          <span v-hasPermi="['appletMr:appletMr:delete']" style="display: inline-block;">
             <el-button
               size="mini"
               type="text"
+              style="margin-left: 10px;"
               v-if="scope.row.onlineStatus != '1'"
               @click="handleDelete(scope.row,scope.index)"
             >删除</el-button>

src/views/finance/InvoiceRecords/index.vue

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

src/views/finance/refundMr/index.vue

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

src/views/information/informationMr/index.vue

@@ -102,19 +102,21 @@
 <!--            v-hasPermi="['informationMr:informationMr:release']"-->
 <!--          >{{scope.row.status == '1' ? '取消置顶' : '置顶'}}</el-button>-->
           
-          <span v-hasPermi="['informationMr:informationMr:edit']" style="display: inline-block;margin-left: 10px;">
+          <span v-hasPermi="['informationMr:informationMr:edit']" style="display: inline-block;">
             <el-button
               size="mini"
               type="text"
+              style="margin-left: 10px;"
               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;">
+          <span v-hasPermi="['informationMr:informationMr:delete']" style="display: inline-block;">
             <el-button
               size="mini"
               type="text"
+              style="margin-left: 10px;"
               v-if="scope.row.status != '1'"
               @click="handleDelete(scope.row,scope.index)"
             >删除</el-button>

src/views/order/groupBuyingMr/index.vue

@@ -263,28 +263,31 @@
                 @click="openDetails(scope.row)"
                 v-hasPermi="['groupBuyingMr:groupBuyingMr:details']"
               >详情</el-button>
-              <span v-hasPermi="['groupBuyingMr:groupBuyingMr:details']" style="display: inline-block;margin-left: 10px;">
+              <span v-hasPermi="['groupBuyingMr:groupBuyingMr:details']" style="display: inline-block;">
                 <el-button
                 v-if="scope.row.payWay == 'corporate'||scope.row.status === 0"
                   size="mini"
                   type="text"
+                  style="margin-left: 10px;"
                   @click="handleCorporatePay(scope.row)"
                 
                 >对公转账</el-button>
               </span>
-              <span v-hasPermi="['groupBuyingMr:groupBuyingMr:cancel']" style="display: inline-block;margin-left: 10px;">
+              <span v-hasPermi="['groupBuyingMr:groupBuyingMr:cancel']" style="display: inline-block;">
                 <el-button
                   v-if="scope.row.status == 0"
                   size="mini"
                   type="text"
+                  style="margin-left: 10px;"
                   @click="handleCancelOrder(scope.row)"
                 >关闭订单</el-button>
               </span>
-              <span v-hasPermi="['groupBuyingMr:groupBuyingMr:print']" style="display: inline-block;margin-left: 10px;">
+              <span v-hasPermi="['groupBuyingMr:groupBuyingMr:print']" style="display: inline-block;">
                 <el-button
                   v-if="scope.row.status == 3 || scope.row.status == 7"
                   size="mini"
                   type="text"
+                  style="margin-left: 10px;"
                   @click="handleOpen([scope.row])"
                 >打印小票</el-button>
               </span>

src/views/order/orderMr/index.vue

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

src/views/order/viewers/index.vue

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

src/views/otaMr/meituan/index.vue

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

src/views/otaMr/tiktok/index.vue

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

src/views/perform/performMr/index.vue

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

src/views/schedulingMr/index.vue

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

src/views/system/dept/index.vue

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

src/views/team/applicationMr/index.vue

@@ -104,33 +104,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">
-            <span v-hasPermi="['applicationMr:applicationMr:edit']" style="display: inline-block;margin-left: 10px;">
+            <span v-hasPermi="['applicationMr:applicationMr:edit']" style="display: inline-block;">
               <el-button
                 size="mini"
                 type="text"
+                style="margin-left: 10px;"
                 @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;">
+            <span v-hasPermi="['applicationMr:applicationMr:examine']" style="display: inline-block;">
               <el-button
                 size="mini"
                 type="text"
+                style="margin-left: 10px;"
                 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;">
+            <span v-hasPermi="['applicationMr:applicationMr:details']" style="display: inline-block;">
               <el-button
                 size="mini"
                 type="text"
+                style="margin-left: 10px;"
                 @click="handleDetails(scope.row)"
               >详情</el-button>
             </span>
-            <span v-hasPermi="['applicationMr:applicationMr:order']" style="display: inline-block;margin-left: 10px;">
+            <span v-hasPermi="['applicationMr:applicationMr:order']" style="display: inline-block;">
               <el-button
                 size="mini"
                 type="text"
+                style="margin-left: 10px;"
                 v-if="scope.row.status == 1"
                 @click="handleOrderDetails(scope.row)"
               >查看订单</el-button>

src/views/team/teamMr/index.vue

@@ -124,35 +124,39 @@
             @click="handleAudit(scope.row,'details')"
             v-hasPermi="['teamMr:teamMr:details']"
           >详情</el-button>
-          <span v-hasPermi="['teamMr:teamMr:audit']" style="display: inline-block;margin-left: 10px;">
+          <span v-hasPermi="['teamMr:teamMr:audit']" style="display: inline-block;">
             <el-button
               size="mini"
               type="text"
               @click="handleAudit(scope.row,'Audit')"
+              style="margin-left: 10px;"
               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;">
+          <span v-hasPermi="['teamMr:teamMr:edit']" style="display: inline-block;">
             <el-button
               size="mini"
               type="text"
               @click="handleUpdate(scope.row)"
+              style="margin-left: 10px;"
               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;">
+          <span v-hasPermi="['teamMr:teamMr:edit']" style="display: inline-block;">
             <el-button
               size="mini"
               type="text"
+              style="margin-left: 10px;"
               @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;">
+          <span v-hasPermi="['teamMr:teamMr:delete']" style="display: inline-block;">
             <el-button
               size="mini"
               type="text"
               @click="handleDelete(scope.row,scope.index)"
+              style="margin-left: 10px;"
               v-if="(scope.row.checkStatus == 1 && name!=scope.row.createBy)||scope.row.checkStatus != 1"
             >删除</el-button>
           </span>

src/views/ticket/ticketMr/dialog/details.vue

@@ -44,18 +44,6 @@
         <el-col :span="12">
           <div class="grid-content bg-purple item-class">停止售卖时间: <span>开演前{{ form.goodsPerform && form.goodsPerform.stopSaleTime }}分钟内</span></div>
         </el-col>
-        <el-col :span="12">
-          <div class="grid-content bg-purple item-class">核销时间: <span>开演前{{ form.goodsPerform && form.goodsPerform.beforeTime }}分钟内</span></div>
-        </el-col>
-        <el-col :span="12" v-if="form.goodsPerform">
-          <div class="grid-content bg-purple item-class">核销播报次数: <span>{{ form.goodsPerform.verificationSpeaker + '次' || '' }}</span></div>
-        </el-col>
-        <el-col :span="12" v-if="form.goodsPerform">
-          <div class="grid-content bg-purple item-class">核销凭证: 
-            <el-tag v-if="form.goodsPerform.verificationQrcode == 0">电子核销码</el-tag>
-            <el-tag style="margin-left: 10px;" v-if="form.goodsPerform.verificationIdcard == 0">身份证</el-tag>
-          </div>
-        </el-col>
         <el-col :span="12" v-if="form.goodsPerform">
           <div class="grid-content bg-purple item-class">票务说明: <span>{{ form.goodsPerform.detail || '' }}</span></div>
         </el-col>
@@ -113,6 +101,23 @@
           </div>
         </el-col>
       </el-row>
+
+      <!--   核销信息   -->
+      <div class="title-class">核销信息</div>
+      <el-row>
+        <el-col :span="12">
+          <div class="grid-content bg-purple item-class">核销时间: <span>开演前{{ form.goodsPerform && form.goodsPerform.beforeTime }}分钟内</span></div>
+        </el-col>
+        <el-col :span="12" v-if="form.goodsPerform">
+          <div class="grid-content bg-purple item-class">核销播报次数: <span>{{ form.goodsPerform.verificationSpeaker + '次' || '' }}</span></div>
+        </el-col>
+        <el-col :span="12" v-if="form.goodsPerform">
+          <div class="grid-content bg-purple item-class">核销凭证: 
+            <el-tag v-if="form.goodsPerform.verificationQrcode == 0">电子核销码</el-tag>
+            <el-tag style="margin-left: 10px;" v-if="form.goodsPerform.verificationIdcard == 0">身份证</el-tag>
+          </div>
+        </el-col>
+      </el-row>
     </div>
 
 

src/views/ticket/ticketMr/index.vue

@@ -95,18 +95,20 @@
             @click="openDetails(scope.row)"
             v-hasPermi="['ticketMr:ticketMr:details']"
           >详情</el-button>
-          <span v-hasPermi="['ticketMr:ticketMr:edit']" style="display: inline-block;margin-left: 10px;">
+          <span v-hasPermi="['ticketMr:ticketMr:edit']" style="display: inline-block;">
             <el-button
               size="mini"
               type="text"
+              style="margin-left: 10px;"
               @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;">
+          <span v-hasPermi="['ticketMr:ticketMr:delete']" style="display: inline-block;">
             <el-button
               size="mini"
               type="text"
+              style="margin-left: 10px;"
               @click="handleDelete(scope.row,scope.index)"
             >删除</el-button>
           </span>

src/views/userMr/index.vue

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