1、各类审批状态提至列表靠前位置 2、新增二保、技术鉴定状态申请以及技术鉴定工单变更流程驳回时的审批节点展示条件

zhaowei

18 小时以前 3a8181119526dd55814fc69ac0566f93009fa71f

 src/views/eam/maintenance/EamSecondMaintenanceOrderList.vue

@@ -106,7 +106,8 @@

            <a-divider v-if="record.maintenanceStatus === 'ABOLISH'" type="vertical"/>

            <a-popconfirm v-if="record.maintenanceStatus === 'ABOLISH'" title="确定还原吗?" @confirm="() => handlerRestore(record.id)">
            <a-popconfirm v-if="record.maintenanceStatus === 'ABOLISH'" title="确定还原吗?"
                          @confirm="() => handlerRestore(record.id)">
              <a>还原</a>
            </a-popconfirm>

@@ -189,6 +190,12 @@
            fixed: 'left'
          },
          {
            title: '保养状态',
            align: 'center',
            dataIndex: 'maintenanceStatus_dictText',
            fixed: 'left'
          },
          {
            title: '工单号',
            align: 'center',
            dataIndex: 'orderNum'
@@ -222,11 +229,6 @@
            title: '维修工',
            align: 'center',
            dataIndex: 'repairman_dictText'
          },
          {
            title: '保养状态',
            align: 'center',
            dataIndex: 'maintenanceStatus_dictText'
          },
          {
            title: '创建方式',
@@ -263,10 +265,10 @@
          list: '/eam/secondMaintenanceOrder/list',
          abolish: '/eam/secondMaintenanceOrder/abolish',
          collect: '/eam/secondMaintenanceOrder/collect',
          restore:'/eam/secondMaintenanceOrder/restore',
          restore: '/eam/secondMaintenanceOrder/restore',
          abolishBatch: '/eam/secondMaintenanceOrder/abolishBatch',
          collectBatch: '/eam/secondMaintenanceOrder/collectBatch',
          restoreBatch: '/eam/secondMaintenanceOrder/restoreBatch',
          restoreBatch: '/eam/secondMaintenanceOrder/restoreBatch'
        }
      }
    },
@@ -325,7 +327,7 @@
        this.$refs.secondMaintenanceApprovalModal.title = '详情'
        this.$refs.secondMaintenanceApprovalModal.visible = true
        this.$refs.secondMaintenanceApprovalModal.disableSubmit = true
        this.$refs.secondMaintenanceApprovalModal.recordDetail(record)
        this.$refs.secondMaintenanceApprovalModal.handleDetail(record)
      },

      /**
@@ -388,7 +390,7 @@
        })
      },
      //还原
      handlerRestore(id){
      handlerRestore(id) {
        let that = this
        this.loading = true
        getAction(that.url.restore, { id })
@@ -409,7 +411,7 @@
          })
      },
      //批量还原
      handlerBatchRestore(){
      handlerBatchRestore() {
        if (!this.url.restoreBatch) {
          this.$message.error('请设置url.restoreBatch属性!')
          return