diff --git a/src/api/api.js b/src/api/api.js
index 9b578556..67770cd9 100644
--- a/src/api/api.js
+++ b/src/api/api.js
@@ -121,7 +121,7 @@ const editCategoryItem = (params) => postAction('/sys/category/edit', params)
const getFileInfo = (params) => getAction('/sys/oss/file/queryById', params)
// 标准选择框,分页查询标准数据
-const getStandardList = (params) => getAction('', params)
+const getStandardList = (params) => getAction('/laws/standard/common/getManyStandardSelectionBox', params)
// 内部工作组,左侧树查询
const getWorkGroupTreeList = (params) => getAction('/sys/lawsWorkingGroup/list', params)
diff --git a/src/assets/less/common.less b/src/assets/less/common.less
index b2de34c3..7e958217 100644
--- a/src/assets/less/common.less
+++ b/src/assets/less/common.less
@@ -1,7 +1,7 @@
@primary-color: #D52C26;
/* 页面不出全局滚动条的高度,如果在vue文件使用,就只能在style里引入common.less */
-/*59px是用户信息那块,52px是标签,24px是上下的留白*/
-@page-content-h: calc(100vh - 59px - 52px - 24px);
+/*59px是用户信息那块,52px是标签,12px是上下的留白*/
+@page-content-h: calc(100vh - 59px - 52px - 12px);
/*列表上方操作按钮区域*/
/*.ant-card-body .table-operator {
diff --git a/src/components/customField/Search.vue b/src/components/customField/Search.vue
index d0dbe553..c97aca1d 100644
--- a/src/components/customField/Search.vue
+++ b/src/components/customField/Search.vue
@@ -76,6 +76,16 @@
/>
+
+
+
+
+
+
diff --git a/src/components/selection/StandardSelectionModal.vue b/src/components/selection/StandardSelectionModal.vue
index e1bb2734..fe2ef460 100644
--- a/src/components/selection/StandardSelectionModal.vue
+++ b/src/components/selection/StandardSelectionModal.vue
@@ -34,8 +34,8 @@
0) {
// let content = JSON.parse(JSON.stringify(this.selectedRowList))
this.selectedRowList.forEach(res => {
- serialNumber.push(res.serial_number)
+ serialNumber.push(res.standardNumber)
replaceStandardId.push(res.id)
})
this.$emit('input', serialNumber.join(','))
diff --git a/src/mixins/JeroListMixin.js b/src/mixins/JeroListMixin.js
index bfea54c7..72c94de0 100644
--- a/src/mixins/JeroListMixin.js
+++ b/src/mixins/JeroListMixin.js
@@ -180,10 +180,7 @@ export const JeroListMixin = {
if (this.selectedRowKeys.length <= 0) {
this.$message.warning(this.$t('selectARecord'))
} else {
- let ids = ''
- for (let a = 0; a < this.selectedRowKeys.length; a++) {
- ids += this.selectedRowKeys[a] + ','
- }
+ const ids = this.selectedRowKeys.join(',')
const that = this
this.$confirm({
title: this.$t('confirmBatchDeletion'),
diff --git a/src/views/standardRegulationLibrary/domesticStandard/DomesticStandardList.vue b/src/views/standardRegulationLibrary/domesticStandard/DomesticStandardList.vue
index 04a19138..1fb8642a 100644
--- a/src/views/standardRegulationLibrary/domesticStandard/DomesticStandardList.vue
+++ b/src/views/standardRegulationLibrary/domesticStandard/DomesticStandardList.vue
@@ -120,6 +120,7 @@
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
:pagination="ipagination"
:scroll="{x: '100%'}"
+ :loading="loading"
@change="tableOnChange">