Merge remote-tracking branch 'origin/master'

cuilei

8 小时以前 665c1372ff732ba6b5ae23e2c92d52b76cdf2beb

 src/views/cms/RatedLifeList.vue

@@ -43,10 +43,10 @@
    <!-- 操作按钮区域 -->
    <div class="table-operator">
      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
      <!-- <a-button type="primary" icon="download" @click="handleExportXls('额定寿命')">导出</a-button>
      <a-button type="primary" icon="download" @click="handleExportXls('额定寿命')">导出</a-button>
      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
        <a-button type="primary" icon="import">导入</a-button>
      </a-upload> -->
      </a-upload>
    </div>

    <!-- table区域-begin -->
@@ -147,7 +147,8 @@
          {
            title:'刀具编码',
            align:"center",
            dataIndex: 'cuttingId'
            dataIndex: 'cuttingId',
            sorter: true
          },
          {
            title:'工件材质',
@@ -174,7 +175,7 @@
          deleteBatch: "/cms/ratedLife/deleteBatch",
          exportXlsUrl: "/cms/ratedLife/exportXls",
          importExcelUrl: "cms/ratedLife/importExcel",
          

        },
        dictOptions:{},
        superFieldList:[],