Merge remote-tracking branch 'origin/master'

zhaowei

2025-03-06 ddd818f74d59c1fdeeed29714d660d7e49200c04

 src/views/eam/EquipmentTransferInList.vue

@@ -1,6 +1,6 @@
<template>
  <a-card
    title='设备调入'
    title=''
    :bordered='false'
  >
    <div class='table-page-search-wrapper'>
@@ -60,12 +60,13 @@
        style='margin-top: 15px'
        @click='handleAdd'
        type='primary'
       v-has="'equipmentTransferIn:add'"
        icon='plus'
      >新增
      </a-button>
      <a-button
        v-if="selectedRowKeys.length > 0  && (selectionRows[0].auditStatus==='notSubmitted' || selectionRows[0].auditStatus==='Rejected')"
        @click='handleSubmit' type='primary' icon='check'>提交
        @click='handleSubmit' type='primary' icon='check' v-has="'equipmentTransferIn:submitAndCancel'">提交
      </a-button>
      <a-button v-if="selectedRowKeys.length > 0  && selectionRows[0].auditStatus === 'pendingApproval'"
                @click='handleRevocation' type='primary' icon='rollback'>撤回
@@ -85,13 +86,13 @@
          @click='onClearSelected'
        >清空</a>
      </div>

<!--  X轴滑动      :scroll="{ x: 'calc(1400px + 50%)', y: 900 }"-->
      <a-table
        ref='table'
        size='middle'
        bordered
        rowKey='id'
        :scroll="{ x: 'calc(1400px + 50%)', y: 900 }"
        :scroll="{ x: true}"
        :columns='columns'
        :dataSource='dataSource'
        :pagination='ipagination'
@@ -100,12 +101,19 @@
        :customRow='clickThenSelect'
        @change='handleTableChange'
      >

        <template slot="num" slot-scope="text" >
          <a-tooltip placement="top" :title="text" trigger="hover">
            <div>
              <template slot="title"> </template>
              <p style="cusor:pointer; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; width: 130px;">{{ text }}</p>
            </div>
          </a-tooltip>
        </template>
         <span
           slot='action'
           slot-scope='text, record'
         >
          <a v-if="record.auditStatus === 'notSubmitted' || record.auditStatus === 'Rejected'" @click='handleEdit(record)'>编辑</a>
          <a v-if="record.auditStatus === 'notSubmitted' || record.auditStatus === 'Rejected'" @click='handleEdit(record)' v-has="'equipmentTransferIn:edit'">编辑</a>
          <a v-if="record.auditStatus === 'pendingApproval'" @click='handleApprove(record)'>审批</a>

          <a-divider
@@ -118,7 +126,7 @@
                           <a-menu-item>
                            <a @click='handleDetail(record)'>详情</a>
                            </a-menu-item>
                            <a-menu-item v-if="record.auditStatus === 'notSubmitted'||record.auditStatus === 'Rejected'">
                            <a-menu-item v-if="record.auditStatus === 'notSubmitted'||record.auditStatus === 'Rejected'" v-has="'equipmentTransferIn:delete'">
                                <a-popconfirm title='确定删除吗?'
                                              @confirm='() => handleDelete(record.id)'>
                                    <a>删除</a>
@@ -194,7 +202,10 @@
        {
          title: '单据号',
          align: 'center',
          dataIndex: 'num'
          dataIndex: 'num',
          scopedSlots: { customRender: 'num' },
          width: 100,
          ellipsis: true,
        },
        {
          title: '调出公司',