Merge remote-tracking branch 'origin/master'

zhangherong

2025-07-05 aeb4d26b6c546f4abfcf31c636b70f40f2e49788

 src/views/eam/base/EamMaintenanceStandardList.vue

@@ -104,19 +104,22 @@
        :customRow='clickThenSelect'
        @change="handleTableChange">
        <span slot="action" slot-scope="text, record">
          <a v-if="record.standardStatus === 'WAIT_SUBMIT'" @click.stop="handleEdit(record)">编辑</a>

          <template v-if="record.standardStatus === 'START'">
             <a-divider type="vertical"/>

             <a @click.stop="handleUpgrade(record)">升版</a>
          </template>
          <a v-if="record.standardStatus === 'START'" @click.stop="handleUpgrade(record)">升版</a>

          <template v-if="record.standardStatus === 'WAIT_SUBMIT'">
              <a @click.stop="handleEdit(record)">编辑</a>

              <a-divider type="vertical"/>

              <a-popconfirm title="确定发起流程吗?" @confirm="() => startProcess(record.id)">
                  <a @click.stop="event=>event.stopPropagation()">发起流程</a>
              </a-popconfirm>


             <a-divider type="vertical"/>

              <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
                  <a @click="event=>event.stopPropagation()">删除</a>
                  <a @click.stop="event=>event.stopPropagation()">删除</a>
              </a-popconfirm>
          </template>
        </span>
@@ -125,7 +128,8 @@
      <a-tabs defaultActiveKey="1">
        <a-tab-pane tab='保养标准明细项' key="1">
          <div class="table-operator" style="margin:-16px">
            <eam-maintenance-standard-detail-list ref="standardDetailRef" :standardId="standardId"/>
            <eam-maintenance-standard-detail-list ref="standardDetailRef" :standardId="standardId"
                                                  :selectionRows="selectionRows"/>
          </div>
        </a-tab-pane>

@@ -143,7 +147,7 @@
  import EamMaintenanceStandardModal from './modules/EamMaintenanceStandardModal'
  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
  import EamMaintenanceStandardDetailList from '@views/eam/base/modules/EamMaintenanceStandardDetailList'
  import { deleteAction, templateXlsDownload } from '@api/manage'
  import { deleteAction, getAction, templateXlsDownload } from '@api/manage'
  import LxSearchEquipmentSelect from '@views/eam/equipment/modules/LxSearchEquipmentSelect.vue'


@@ -233,6 +237,7 @@
          list: '/eam/maintenanceStandard/list',
          delete: '/eam/maintenanceStandard/delete',
          deleteBatch: '/eam/maintenanceStandard/deleteBatch',
          startProcess: '/eam/maintenanceStandard/saveEamMaintenanceStandardProcess',
          exportXlsUrl: 'eam/maintenanceStandard/exportXls',
          inspectionImportExcel: 'eam/maintenanceStandard/inspectionImportExcel',
          weekMaintenanceImportExcel: 'eam/maintenanceStandard/weekMaintenanceImportExcel',
@@ -241,8 +246,7 @@
          inspectionXlsDownloadUrl: '导入模板/点检标准导入模板_v1.0.xlsx',
          weekMaintenanceXlsDownloadUrl: '导入模板/周保标准导入模板_v1.0.xlsx',
          secondMaintenanceXlsDownloadUrl: '导入模板/二保标准导入模板_v1.0.xlsx',
          thirdMaintenanceXlsDownloadUrl: '导入模板/三保标准导入模板_v1.0.xlsx',
          abolish: '/eam/maintenanceStandard/abolish'
          thirdMaintenanceXlsDownloadUrl: '导入模板/三保标准导入模板_v1.0.xlsx'
        },
        standardId: '-1'
      }
@@ -308,6 +312,33 @@
        templateXlsDownload(url)
      },

      /**
       * 点击发起流程触发
       * @param id 列表行记录ID
       */
      startProcess(id) {
        this.loading = true
        const that = this
        getAction(this.url.startProcess, { id })
          .then(res => {
            if (res.success) {
              that.$notification.success({
                message: '消息',
                description: res.message
              })
              that.loadData()
            } else {
              that.$notification.warning({
                message: '消息',
                description: res.message
              })
            }
          })
          .finally(() => {
            that.loading = false
          })
      },

      handleUpgrade(record) {
        //升版
        this.$refs.modalForm.upgrade(record)