diff --git a/public/api_address_config.js b/public/api_address_config.js index 1e554c33..b4344f0b 100644 --- a/public/api_address_config.js +++ b/public/api_address_config.js @@ -12,5 +12,5 @@ window._CONFIG.casPrefixUrl = 'http://cas.example.org:8443/cas' window._CONFIG.onlinePreviewDomainURL = 'http://127.0.0.1:8012/onlinePreview' // onlyOffice前端服务地址 window._CONFIG.onlyOfficeUrl = 'http://127.0.0.1:8080' -// onlyOffice下载文件地址 +// onlyOffice下载文件地址(暂时没用) window._CONFIG.onlyOfficeDownloadFileUrl = 'http://localhost:8184/sys/common/download' diff --git a/src/api/standardRegulationLibraryApi.js b/src/api/standardRegulationLibraryApi.js new file mode 100644 index 00000000..19c94289 --- /dev/null +++ b/src/api/standardRegulationLibraryApi.js @@ -0,0 +1,17 @@ +import { getAction } from './manage' + +// 国内法规标准-获取查询条件 +const getDomesticStandardSearchForm = (params) => getAction('/laws/standard/domestic/getQueryCondition', params) +// 国内法规标准-获取表单模型 +const getDomesticStandardFormModal = (params) => getAction('/laws/standard/domestic/getFormModel', params) +// 国内法规标准-获取信息 +const getDomesticStandardDocumentInfo = (params) => getAction('/laws/standard/domestic/getByIdAndModule', params) +// 国内法规标准-获取表头信息 +const getDomesticStandardTableHeader = (params) => getAction('/laws/standard/domestic/getCommonHeader', params) + +export { + getDomesticStandardSearchForm, + getDomesticStandardFormModal, + getDomesticStandardDocumentInfo, + getDomesticStandardTableHeader +} diff --git a/src/assets/less/common.less b/src/assets/less/common.less index be70f67c..b76aa1a8 100644 --- a/src/assets/less/common.less +++ b/src/assets/less/common.less @@ -387,6 +387,7 @@ height: 100%; padding: 24px; box-sizing: border-box; + overflow-y: auto; } } @@ -459,6 +460,7 @@ /*抽屉样式修改*/ .ant-drawer-body { height: calc(100vh - 55px); + padding: 24px 0; .ant-spin-container { height: 100%; @@ -467,9 +469,19 @@ .drawer-container { height: calc(100% - 52px); overflow: auto; + padding: 0 24px; } .drawer-footer { margin-top: 20px; + height: 32px; + display: flex; + justify-content: center; + + .ant-btn { + margin-left: 30px; + margin-bottom: 30px; + float: right; + } } -} \ No newline at end of file +} diff --git a/src/components/customField/AddForm.vue b/src/components/customField/AddForm.vue index b7cfd38e..d784bcba 100644 --- a/src/components/customField/AddForm.vue +++ b/src/components/customField/AddForm.vue @@ -2,14 +2,14 @@
{{ index }}
- +
* - {{item.dbFieldTxt}} + {{ item.dbFieldTxt }}
+ style="width: 100%" />
@@ -28,14 +28,14 @@
* - {{item.dbFieldTxt}} + {{ item.dbFieldTxt }}
+ :disabled="disabled" />
@@ -44,14 +44,14 @@
* - {{item.dbFieldTxt}} + {{ item.dbFieldTxt }}
+ :disabled="disabled" />
@@ -60,7 +60,7 @@
* - {{item.dbFieldTxt}} + {{ item.dbFieldTxt }}
* - {{item.dbFieldTxt}} + {{ item.dbFieldTxt }}
+ v-model="formInline[item.dbFieldName]" :rows="4" />
@@ -89,14 +89,14 @@
* - {{item.dbFieldTxt}} + {{ item.dbFieldTxt }}
+ v-model="formInline[item.dbFieldName]" />
@@ -105,14 +105,14 @@
* - {{item.dbFieldTxt}} + {{ item.dbFieldTxt }}
+ :disabled="disabled" />
@@ -121,7 +121,7 @@
* - {{item.dbFieldTxt}} + {{ item.dbFieldTxt }}
* - {{item.dbFieldTxt}} + {{ item.dbFieldTxt }}
+ :placeholder="$t('pleaseEnter')+item.dbFieldTxt" />
@@ -157,14 +157,14 @@
* - {{item.dbFieldTxt}} + {{ item.dbFieldTxt }}
+ :triggerChange="false" :dictCode="item.dict_field" />
@@ -173,14 +173,14 @@
* - {{item.dbFieldTxt}} + {{ item.dbFieldTxt }}
+ :triggerChange="false" :dictCode="item.dict_field" />
@@ -214,7 +214,6 @@ + + diff --git a/src/views/standardRegulationLibrary/overseasStandard/modules/OverseasStandardModal.vue b/src/views/standardRegulationLibrary/overseasStandard/modules/OverseasStandardModal.vue new file mode 100644 index 00000000..9e09efbf --- /dev/null +++ b/src/views/standardRegulationLibrary/overseasStandard/modules/OverseasStandardModal.vue @@ -0,0 +1,98 @@ + + + + +