hzya
/
middleground_code_v2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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:
hyt 2024-06-14 15:20:48 +08:00
parent a6a8f235d1 f82ae5ea2f
commit c15629bbdb
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/views/masterDataOptions/dataOrigin/index.vue
View File

@ -1,3 +1,4 @@
<script src="configData.js"></script>
<template> <template>
<div class="wrap"> <div class="wrap">
<!--数据表--> <!--数据表-->
@ -140,23 +141,17 @@
@sonSaveHandle="sonSaveHandle" @sonSaveHandle="sonSaveHandle"
></sonTable> ></sonTable>
</div> </div>
</base-right-dialog> </baseDialog>
</div> </div>
</template> </template>
<script> <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 BaseTable from '@/views/intergrationTask/compoments/baseTable.vue'
import configData from './configData' import configData from './configData'
import { getApiModuleApi } from '@/api/apiChunks/index.js' import { getApiModuleApi } from '@/api/apiChunks/index.js'
import baseNewForm from '../compoments/baseNewForm' import baseNewForm from '../compoments/baseNewForm'
import { deepClone } from '@/utils/index.js' import { deepClone } from '@/utils/index.js'
import baseDialog from '@/views/integrationOption/compoments/baseDialog' 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 { export default {
data() { data() {