|
|
@@ -104,7 +104,7 @@
|
|
|
</div>
|
|
|
<BaseForm ref="baseForm" @ok="handleOk"/>
|
|
|
<Detail ref="detail" @ok="handleOk"/>
|
|
|
- <MargeModal ref="margeModal" @ok="handleOk"/>
|
|
|
+ <MergeModal ref="mergeModal" @ok="handleOk"/>
|
|
|
<AddSpareForm ref="addSpareForm" />
|
|
|
</a-card>
|
|
|
</template>
|
|
|
@@ -319,7 +319,7 @@ export default {
|
|
|
this.selectedRows = selectedRows
|
|
|
},
|
|
|
handleMerge () {
|
|
|
- this.$refs.margeModal.base(null, this.selectedRows)
|
|
|
+ this.$refs.mergeModal.base(null, this.selectedRows)
|
|
|
},
|
|
|
handleOk () {
|
|
|
this.visible = true
|
