LY 工作票

master/src/main/java/com/ruoyi/project/ehs/controller/TJobticketController.java

@@ -193,7 +193,6 @@ public class TJobticketController extends BaseController {
     /**
      * 批量新增工作票
      */
-    @PreAuthorize("@ss.hasPermi('ehs:jobticket:add')")
     @Log(title = "工作票", businessType = BusinessType.INSERT)
     @RequestMapping("/batchAddJobticket")
     public AjaxResult batchEdit(@RequestBody List<TInvoiceWorkcontent> dto) {

ui/src/views/invoice/bookingworkticket/index.vue

@@ -122,7 +122,6 @@
           size="mini"
           :disabled="multiple"
           @click="tickedStatis()"
-          v-hasPermi="['ehs:jobticket:add']"
         >作业票统计
         </el-button>
       </el-col>
@@ -189,7 +188,7 @@
       <el-table-column label="高处作业级别" align="center" prop="gczyjb" :formatter="gczyjbFormat"/>
       <el-table-column label="延期许可证号" align="center" prop="yqxkzh" :show-overflow-tooltip="true"/>
       <el-table-column label="索引" align="center" prop="tag" width="60" :show-overflow-tooltip="true"/>
-      <el-table-column label="开票" align="center" width="90">
+      <el-table-column label="开票" align="center" fixed="right" width="90">
         <template slot-scope="scope">
           <el-tag v-if="scope.row.addStatus == 1" size="small" type="success">已开票</el-tag>
           <el-button
@@ -202,7 +201,7 @@
         </template>
 
       </el-table-column>
-      <el-table-column label="续票预约" align="center" width="90">
+      <el-table-column label="续票预约" fixed="right" align="center" width="90">
         <template slot-scope="scope">
           <el-button
             v-if="scope.row.bookingworkticket.status== 3"
@@ -1349,7 +1348,7 @@ export default {
     //合并单元格
     mergeMethod({row, column, rowIndex, columnIndex}) {
       // console.log(row)
-      if ([1, 2, 3, 4, 5, 11, 12, 13, 14, 26].includes(columnIndex)) {
+      if ([1, 2, 3, 4, 5, 11, 12, 13, 14, 27].includes(columnIndex)) {
         const _row = this.setTable(this.bookingworkticketList).merge[rowIndex];
         const _col = _row > 0 ? 1 : 0;
         return {