修改

“linengliang”

2023-12-13 fd6e935f391501358357f3e6bc1957764510b8bc

 src/views/eam/EquipmentOfLine.vue

@@ -61,7 +61,7 @@
        @click="searchReset"
        icon="reload"
      >重置</a-button>
      <a-button @click="handleAdd" type="primary" icon="plus" v-has="'equipmentAccount:add&delete&import&Edit'">新增</a-button>
      <a-button @click="handleAdd" type="primary" icon="plus" v-has="'line:add&edit&delete'">新增</a-button>
      <!-- <a-button type="primary" icon="download" @click="handleExportXls('设备台账')" v-has="'equipmentAccount:outport'">导出</a-button>
      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
        <a-button type="primary" icon="import"  v-has="'equipmentAccount:add&delete&import&Edit'">导入</a-button>
@@ -78,7 +78,7 @@

      <a-table
        ref="table"
        size="middle"
        size="small"
        bordered
        rowKey="id"
        :scroll="{x:true}"
@@ -119,20 +119,21 @@
        >详情</a>
        <a-divider type="vertical" />
        <a @click="handleEdit(record)" >编辑</a>
        <a-divider type="vertical" />
        <a-dropdown>
          <a class="ant-dropdown-link">
            更多
            <a-icon type="down" />
          </a>
          <a-menu slot="overlay">
            <a-menu-item  v-has="'equipmentAccount:add&delete&import&Edit'">
            <a-menu-item  v-has="'line:add&edit&delete'">
             
            </a-menu-item>
            <a-menu-item>
              <a-popconfirm
                title="确定删除吗?"
                @confirm="() => handleDelete(record.id)"
                v-has="'equipmentAccount:add&delete&import&Edit'"
                v-has="'line:add&edit&delete'"
              >
                <a>删除</a>
              </a-popconfirm>
@@ -159,7 +160,7 @@
  import '@/assets/less/TableExpand.less'
  import JSearchSelectTag from '../../components/dict/JSearchSelectTag.vue'
  import EquipmentOfLineModal from './modules/line/EquipmentOfLineModal.vue'
  import EquipmentListOfLine from './modules/line/EquipmentListOfLine.vue'
  import EquipmentListOfLine from './modules/line/EquipmentListOfLine'
  export default {
    name: "EquipmentOfLine",
    mixins:[JeecgListMixin,mixinDevice],
@@ -188,16 +189,43 @@
          title: '生产线编码',
          align: "center",
          dataIndex: 'num',
          width: 200,
        },
        {
          title: '生产线名称',
          align: "center",
          dataIndex: 'name',
          width: 200,
        },
        {
          title: '使用部门',
          align: "center",
          dataIndex: 'useId_dictText',
          width: 150,
        },
        {
          title: '维护部门',
          align: "center",
          dataIndex: 'manageId_dictText',
          width: 150,
        },
        {
          title: '维修班组',
          align: "center",
          dataIndex: 'teamId_dictText',
          width: 150,
        },
        {
          title: '工区',
          align: "center",
          dataIndex: 'factoryModelId_dictText',
          width: 150,
        },
        {
          title: '设备总数',
          align: "center",
          dataIndex: 'sumOfEquipment',
          width: 150,
        },
        {
          title: '操作',
@@ -206,8 +234,7 @@
          scopedSlots: {
            customRender: 'action',
          },
          width: 147,
          fixed: 'right',
          width: 150,
        },
        ],
        url: {