|
@@ -206,7 +206,7 @@
|
|
|
</div>
|
|
</div>
|
|
|
<template #footer>
|
|
<template #footer>
|
|
|
<div class="dialog-footer">
|
|
<div class="dialog-footer">
|
|
|
- <el-button size="large" @click="showImportModal = false">取消</el-button>
|
|
|
|
|
|
|
+ <el-button size="large" @click="importModal = false">取消</el-button>
|
|
|
<el-button
|
|
<el-button
|
|
|
:disabled="fileList.length <= 0" :loading="importLoading" hc-btn type="primary"
|
|
:disabled="fileList.length <= 0" :loading="importLoading" hc-btn type="primary"
|
|
|
@click="handleImportClick"
|
|
@click="handleImportClick"
|
|
@@ -264,7 +264,7 @@ const matchTableColumn = [
|
|
|
{ key: 'cement', name: '水泥' },
|
|
{ key: 'cement', name: '水泥' },
|
|
|
{ key: 'sand', name: '砂' },
|
|
{ key: 'sand', name: '砂' },
|
|
|
{ key: 'macadamOne', name: '碎石1' },
|
|
{ key: 'macadamOne', name: '碎石1' },
|
|
|
- { macadamTwo: 'name', name: '碎石2' },
|
|
|
|
|
|
|
+ { key: 'macadamTwo', name: '碎石2' },
|
|
|
{ key: 'macadamThree', name: '碎石3' },
|
|
{ key: 'macadamThree', name: '碎石3' },
|
|
|
{ key: 'water', name: '水' },
|
|
{ key: 'water', name: '水' },
|
|
|
{ key: 'admixture', name: '掺加剂' },
|
|
{ key: 'admixture', name: '掺加剂' },
|
