合并冲突

licp

2024-05-10 3a4041f3eef38f38fa03d6305bea9faead06c133

 src/components/view/b1-inspect-order-plan.vue

@@ -189,7 +189,7 @@

<script>
   import ValueTable from '../tool/value-table.vue'
  import Inspection from '../do/b1-inspect-order-plan/Inspection.vue'
     import Inspection from '../do/b1-inspect-order-plan/Inspection.vue'
   import {
      getYearAndMonthAndDays
   } from '../../util/date'
@@ -245,9 +245,9 @@
                     font: '复核',
                     type: 'text',
                     method: 'handleReview',
                     /* disabFun: (row, index) => {
                     disabFun: (row, index) => {
                        return row.userId == null || row.insState != 3
                     } */
                     }
                  }, {
                     id: '',
                     font: '认领',