Merge remote-tracking branch 'origin/master'

cuilei

14 小时以前 83f051915bbe4562abfb5f1589642dd393ea8490

 src/views/cms/CuttingInventoryList.vue

@@ -147,7 +147,7 @@
          {
            title:'刀具编码',
            align:"center",
            dataIndex: 'cuttingId'
            dataIndex: 'cuttingId_dictText'
          },
          {
            title:'刀具条码',
@@ -179,7 +179,7 @@
          deleteBatch: "/cms/cuttingInventory/deleteBatch",
          exportXlsUrl: "/cms/cuttingInventory/exportXls",
          importExcelUrl: "cms/cuttingInventory/importExcel",
          

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