Merge remote-tracking branch 'origin/master'

zhaowei

2025-07-12 d286265fcefa1ab2233742cf1e30b38ae6c9215f

Merge remote-tracking branch 'origin/master'

 src/views/eam/technical/EamTechnicalStatusEvaluationOrderList.vue

@@ -6,7 +6,8 @@
        <a-row :gutter="24">
          <a-col :xl="5" :lg="6" :md="8" :sm="12">
            <a-form-item label="统一编码">
              <technical-status-equipment-select placeholder="请输入统一编码或名称搜索" v-model="queryParam.equipmentId"/>
              <technical-status-equipment-select placeholder="请输入统一编码或名称搜索"
                                                 v-model="queryParam.equipmentId" />
            </a-form-item>
          </a-col>
          <a-col :xl="5" :lg="6" :md="8" :sm="12">
@@ -39,7 +40,7 @@
             :scroll="{ x: 'max-content' }" :loading="loading" @change="handleTableChange">

        <span slot="action" slot-scope="text, record">
          <a-popconfirm v-if="record.evaluationStatus=='WAIT_EVALUATION'" title="确定领取吗？"
          <a-popconfirm v-if="record.evaluationStatus === 'WAIT_EVALUATION'" title="确定领取吗？"
                        @confirm="handleReceive(record.id)">
            <a>领取</a>
          </a-popconfirm>
@@ -242,32 +243,29 @@
        url: {
          list: '/eam/eamTechnicalStatusEvaluationOrder/list',
          receive: '/eam/eamTechnicalStatusEvaluationOrder/collect',
          delete: '/eam/eamTechnicalStatusEvaluationOrder/delete',
          deleteBatch: '/eam/eamTechnicalStatusEvaluationOrder/deleteBatch',
          exportXlsUrl: 'eam/eamTechnicalStatusEvaluationOrder/exportXls',
          importExcelUrl: 'eam/eamTechnicalStatusEvaluationOrder/importExcel'
        }
      }
    },
    computed: {
      importExcelUrl: function() {
        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
      }
    },
    methods: {
      handleReceive(id) {
        getAction(this.url.receive, { id })
      let that = this
      this.loading = true
      getAction(that.url.receive, { id })
          .then(res => {
            if (res.success) {
              this.$notification.success({
            that.$notification.success({
                message: '消息',
                description: res.message
              })
            that.loadData();
            } else {
              this.$notification.warning({
            that.$notification.warning({
                message: '消息',
                description: res.message
              })
            that.loading = false
            }
          })
      }