Merge remote-tracking branch 'origin/huyt' into huyt
# Conflicts: # src/views/masterDataOptions/dataOrigin/index.vue # src/views/masterDataOptions/dataOrigin/indexOld.vue
This commit is contained in:
commit
c15629bbdb
|
@ -1,3 +1,4 @@
|
|||
<script src="configData.js"></script>
|
||||
<template>
|
||||
<div class="wrap">
|
||||
<!--数据表-->
|
||||
|
@ -140,23 +141,17 @@
|
|||
@sonSaveHandle="sonSaveHandle"
|
||||
></sonTable>
|
||||
</div>
|
||||
</base-right-dialog>
|
||||
</baseDialog>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import sonTable from '@/views/masterDataOptions/dataOrigin/sonTable.vue'
|
||||
import mainTable from '@/views/masterDataOptions/dataOrigin/mainTable.vue'
|
||||
import ruleAddTable from '@/views/masterDataOptions/dataOrigin/ruleAddTable.vue'
|
||||
import BaseTable from '@/views/intergrationTask/compoments/baseTable.vue'
|
||||
import configData from './configData'
|
||||
import { getApiModuleApi } from '@/api/apiChunks/index.js'
|
||||
import baseNewForm from '../compoments/baseNewForm'
|
||||
import { deepClone } from '@/utils/index.js'
|
||||
import baseDialog from '@/views/integrationOption/compoments/baseDialog'
|
||||
import baseForm from '@/components/base/baseNewForm/index.vue'
|
||||
import baseRightDialog from '@/components/base/baseRightDialog/index.vue'
|
||||
import { authApi } from '@/api/apis/auth'
|
||||
|
||||
export default {
|
||||
data() {
|
||||
|
|
Loading…
Reference in New Issue