Merge remote-tracking branch 'origin/master'

zhaowei

2 天以前 9be2e2f91332ed341406acf9739d8912dddbf6fe

 src/views/eam/maintenance/EamThirdMaintenanceOrderList.vue

@@ -58,6 +58,12 @@
            <a-divider type="vertical"/>
          </template>

          <template v-if="record.maintenanceStatus == 'WAIT_MAINTENANCE'||record.maintenanceStatus=='FREEZE'">
             <a @click="handleOrderChange(record)">变更</a>

             <a-divider type="vertical"/>
          </template>

          <a @click="handleDetail(record)">详情</a>

          <template v-if="record.maintenanceStatus === 'COMPLETE'">
@@ -74,6 +80,9 @@

    <third-maintenance-approval-modal ref="thirdMaintenanceApprovalModal"
                                      :selectShenpiData="selectThirdMaintenanceData"/>

    <!--工单变更弹窗-->
    <eam-third-maintenance-change-modal ref="orderChangeModal" @ok="modalFormOk"/>
  </a-card>
</template>

@@ -84,11 +93,14 @@
  import { deleteAction, getAction } from '@api/manage'
  import ThirdMaintenanceApprovalModal
    from '@views/flowable/workflow/thirdMaintenance/ThirdMaintenanceApprovalModal.vue'
  import EamThirdMaintenanceChangeModal
    from '@views/eam/technical/modules/EamThirdMaintenanceChangeModal.vue'

  export default {
    name: 'EamThirdMaintenanceOrderList',
    mixins: [JeecgListMixin],
    components: {
      EamThirdMaintenanceChangeModal,
      LxSearchEquipmentSelect,
      EamThirdMaintenanceOrderModal,
      ThirdMaintenanceApprovalModal
@@ -305,6 +317,15 @@
      },

      /**
       * 点击变更时触发
       * @param record
       */
      handleOrderChange(record) {
        this.$refs.orderChangeModal.title = '变更'
        this.$refs.orderChangeModal.add(record)
      },

      /**
       * 点击领取时触发
       * @param id
       */