diff --git a/src/components/customField/AddForm.vue b/src/components/customField/AddForm.vue
index 166d7ee6..c4562bb2 100644
--- a/src/components/customField/AddForm.vue
+++ b/src/components/customField/AddForm.vue
@@ -311,7 +311,7 @@ export default {
},
flag: {
type: String,
- default: ''
+ default: null
},
disabled: {
type: Boolean,
diff --git a/src/components/selection/StandardSelectionModal.vue b/src/components/selection/StandardSelectionModal.vue
index bdb4ebbb..18e989d7 100644
--- a/src/components/selection/StandardSelectionModal.vue
+++ b/src/components/selection/StandardSelectionModal.vue
@@ -131,15 +131,17 @@ export default {
open () {
this.visible = true
this.queryParam = {}
- this.replacePage()
+ this.$nextTick(() => {
+ this.source ? this.queryParam.source = this.source : this.queryParam = {}
+ this.replacePage()
+ })
},
// 获取表格数据
replacePage () {
const query = {
...this.queryParam,
pageNo: this.ipagination.current,
- pageSize: this.ipagination.pageSize,
- source: this.source
+ pageSize: this.ipagination.pageSize
}
this.selectedRowKeys = []
this.loading = true
diff --git a/src/views/standardRegulationLibrary/commonPage/modules/SubmitQuestionModal.vue b/src/views/standardRegulationLibrary/commonPage/modules/SubmitQuestionModal.vue
index f998b721..78dc4b9b 100644
--- a/src/views/standardRegulationLibrary/commonPage/modules/SubmitQuestionModal.vue
+++ b/src/views/standardRegulationLibrary/commonPage/modules/SubmitQuestionModal.vue
@@ -37,16 +37,6 @@
v-decorator="['standardNumber', validatorRules.standardNumber]" />
-
-
-
-
-
-
diff --git a/src/views/standardRegulationLibrary/domesticStandard/DomesticStandardList.vue b/src/views/standardRegulationLibrary/domesticStandard/DomesticStandardList.vue
index e9e62293..7bbb3920 100644
--- a/src/views/standardRegulationLibrary/domesticStandard/DomesticStandardList.vue
+++ b/src/views/standardRegulationLibrary/domesticStandard/DomesticStandardList.vue
@@ -197,7 +197,7 @@ import {
collectionDomesticStandard,
cancelCollectionDomesticStandard
} from '../../../api/standardRegulationLibraryApi'
-import { StandardSystemTreeNodeType, YesOrNoEnum } from '../../../enums/commonEnums'
+import { StandardSource, StandardSystemTreeNodeType, YesOrNoEnum } from '../../../enums/commonEnums'
import UserSelectModal from '../../../components/selection/UserSelectModal.vue'
import DomesticSystemTreeModal from './modules/DomesticSystemTreeModal.vue'
import SelectionDomesticStandardDrawer from './modules/SelectionDomesticStandardDrawer.vue'
@@ -246,7 +246,7 @@ export default {
list: '/laws/standard/domestic/getCommonPage',
delete: '/laws/standard/domestic/deleteByIdsAndModule',
deleteBatch: '/laws/standard/domestic/deleteByIdsAndModule',
- downTemplateUrl: '', // 下载模板
+ downTemplateUrl: '/laws/standard/domestic/templateDownload', // 下载模板
exportXlsUrl: '/laws/standard/domestic/exportData', // 导出
exportZipUrl: '/laws/standard/domestic/exportDataWithFile', // 带文件导出
importExcelUrl: '' // 导入
@@ -567,6 +567,7 @@ export default {
if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
param.selections = this.selectedRowKeys.join(',')
}
+ param.module = StandardSource.DOMESTIC.value
console.log('导出参数', param)
// 加一个大的提示
const modalLoading = this.$info({
diff --git a/src/views/standardRegulationLibrary/overseasStandard/OverseasStandardList.vue b/src/views/standardRegulationLibrary/overseasStandard/OverseasStandardList.vue
index 0532ea3f..02dca213 100644
--- a/src/views/standardRegulationLibrary/overseasStandard/OverseasStandardList.vue
+++ b/src/views/standardRegulationLibrary/overseasStandard/OverseasStandardList.vue
@@ -196,7 +196,7 @@ import {
configOverseasStandard,
removeOverseasStandard
} from '../../../api/standardRegulationLibraryApi'
-import { StandardSystemTreeNodeType, YesOrNoEnum } from '../../../enums/commonEnums'
+import { StandardSource, StandardSystemTreeNodeType, YesOrNoEnum } from '../../../enums/commonEnums'
import UserSelectModal from '../../../components/selection/UserSelectModal.vue'
import OverseasStandardModal from './modules/OverseasStandardModal.vue'
import OverseasSystemTreeModal from './modules/OverseasSystemTreeModal.vue'
@@ -246,7 +246,7 @@ export default {
list: '/laws/standard/overseas/getCommonPage',
delete: '/laws/standard/overseas/deleteByIdsAndModule',
deleteBatch: '/laws/standard/overseas/deleteByIdsAndModule',
- downTemplateUrl: '', // 下载模板
+ downTemplateUrl: '/laws/standard/overseas/templateDownload', // 下载模板
exportXlsUrl: '/laws/standard/overseas/exportData', // 导出
exportZipUrl: '/laws/standard/overseas/exportDataWithFile', // 带文件导出
importExcelUrl: '' // 导入
@@ -567,6 +567,7 @@ export default {
if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
param.selections = this.selectedRowKeys.join(',')
}
+ param.module = StandardSource.OVERSEAS.value
console.log('导出参数', param)
// 加一个大的提示
const modalLoading = this.$info({