diff --git a/src/assets/styles/newStyle.less b/src/assets/styles/newStyle.less index ef8706955..34d3fea50 100644 --- a/src/assets/styles/newStyle.less +++ b/src/assets/styles/newStyle.less @@ -906,3 +906,6 @@ tr.el-table__row{ margin: 10px; width: calc(~'100% - 20px'); } +.button-list { + padding: 5px 0px; +} diff --git a/src/common/axios/index.js b/src/common/axios/index.js index 9034bc7c2..c53e52bc9 100644 --- a/src/common/axios/index.js +++ b/src/common/axios/index.js @@ -282,6 +282,47 @@ export default { exeFun.call(this, err) }) }, + downloadFile (url, param, fileName) { + _axios({ + method: 'post', + url, + data: param, + responseType: 'blob' + }).then( + res => { + const data = res.data + const r = new FileReader() + r.onload = function () { + try { + const resData = JSON.parse(this.result) + } catch (err) { + // 下载正常处理 + // 兼容ie11 + if (window.navigator.msSaveOrOpenBlob) { + try { + const blobObject = new Blob([data]) + window.navigator.msSaveOrOpenBlob(blobObject, fileName) + } catch (e) { + console.log(e) + } + return + } + // a标签实现下载 + let url = window.URL.createObjectURL(new Blob([data])) + let link = document.createElement('a') + link.style.display = 'none' + link.href = url + link.setAttribute('download', fileName) + document.body.appendChild(link) + link.click() + resolve(fileName) + } + } + r.readAsText(data) // FileReader的API + }).catch(res => { + console.log(res) + }) + }, /** * @description: delete方法 * @author: chenxiaoxi diff --git a/src/components/CustomFormComponents/InputForAllStandards.vue b/src/components/CustomFormComponents/InputForAllStandards.vue index 9921e957f..ed9bae380 100644 --- a/src/components/CustomFormComponents/InputForAllStandards.vue +++ b/src/components/CustomFormComponents/InputForAllStandards.vue @@ -226,7 +226,7 @@ export default { this.quoteIdList1 = [] this.replaceLawsNumForm.quoteIdList = '' } - this.$http.get('lawss/sarStandardsInfo/getSarStandardsInfoPage', this.replaceLawsNumForm, { + this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.replaceLawsNumForm, { _this: this, loading: 'replaceLoading' }, res => { diff --git a/src/components/CustomFormComponents/InputForStandAndForeign.vue b/src/components/CustomFormComponents/InputForStandAndForeign.vue index 25cd1b5f2..50545c954 100644 --- a/src/components/CustomFormComponents/InputForStandAndForeign.vue +++ b/src/components/CustomFormComponents/InputForStandAndForeign.vue @@ -238,7 +238,7 @@ export default { } this.replaceLawsNumForm.page = 1 this.replacePage = 1 - this.$http.get('lawss/sarStandardsInfo/getSarStandardsInfoPage', this.replaceLawsNumForm, { + this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.replaceLawsNumForm, { _this: this, loading: 'replaceLoading' }, res => { @@ -265,7 +265,7 @@ export default { this.replaceLawsNumForm.quoteIdList = '' } this.replaceLawsNumForm.standType = this.config.attrField === 'CBBH' ? 'FOREIGN' : 'INLAND' - this.$http.get('lawss/sarStandardsInfo/getSarStandardsInfoPage', this.replaceLawsNumForm, { + this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.replaceLawsNumForm, { _this: this, loading: 'replaceLoading' }, res => { diff --git a/src/components/CustomFormComponents/InputForStandards.vue b/src/components/CustomFormComponents/InputForStandards.vue index f21a6c117..13cd59906 100644 --- a/src/components/CustomFormComponents/InputForStandards.vue +++ b/src/components/CustomFormComponents/InputForStandards.vue @@ -226,7 +226,7 @@ export default { } this.replaceLawsNumForm.page = 1 this.replacePage = 1 - this.$http.get('lawss/sarStandardsInfo/getSarStandardsInfoPage', this.replaceLawsNumForm, { + this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.replaceLawsNumForm, { _this: this, loading: 'replaceLoading' }, res => { @@ -253,7 +253,7 @@ export default { this.replaceLawsNumForm.quoteIdList = '' } // this.replaceLawsNumForm.standType = this.config.attrField === 'CBBH' ? 'FOREIGN' : 'INLAND' - this.$http.get('lawss/sarStandardsInfo/getSarStandardsInfoPage', this.replaceLawsNumForm, { + this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.replaceLawsNumForm, { _this: this, loading: 'replaceLoading' }, res => { diff --git a/src/components/CustomFormComponents/InputForStandardsForEnterprise.vue b/src/components/CustomFormComponents/InputForStandardsForEnterprise.vue index d8d781c58..2dd49786c 100644 --- a/src/components/CustomFormComponents/InputForStandardsForEnterprise.vue +++ b/src/components/CustomFormComponents/InputForStandardsForEnterprise.vue @@ -256,7 +256,7 @@ export default { formData.standType = this.replaceLawsNumForm.dataSource === 'INLAND_STAND' ? 'INLAND' : this.replaceLawsNumForm.dataSource === 'FOREIGN_STAND' ? 'FOREIGN' : '' formData.standNumber = formData.numberName - let url = this.replaceLawsNumForm.dataSource === 'BUSINESS' ? 'lawss/sarBussionessStand/getSarBussionStandPage' : 'lawss/sarStandardsInfo/getSarStandardsInfoPage' + let url = this.replaceLawsNumForm.dataSource === 'BUSINESS' ? 'lawss/sarBussionessStand/getSarBussionStandPage' : 'sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage' this.$http.get(url, formData, { _this: this, loading: 'replaceLoading' diff --git a/src/components/CustomFormComponents/InputForStandardsForForeign.vue b/src/components/CustomFormComponents/InputForStandardsForForeign.vue index e05ff727d..31d90ad21 100644 --- a/src/components/CustomFormComponents/InputForStandardsForForeign.vue +++ b/src/components/CustomFormComponents/InputForStandardsForForeign.vue @@ -234,7 +234,7 @@ export default { this.quoteIdList1 = [] this.replaceLawsNumForm.quoteIdList = '' } - this.$http.get('lawss/sarStandardsInfo/getSarStandardsInfoPage', this.replaceLawsNumForm, { + this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.replaceLawsNumForm, { _this: this, loading: 'replaceLoading' }, res => { diff --git a/src/components/treeSelect/treeSelect.vue b/src/components/treeSelect/treeSelect.vue new file mode 100644 index 000000000..f52259f19 --- /dev/null +++ b/src/components/treeSelect/treeSelect.vue @@ -0,0 +1,203 @@ + + + + + + + + diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 867093e59..347e22d9a 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -8,36 +8,6 @@
-
-
标准信息 -
-
- - - 更新记录 - - -
-
-
-

{{ sarStandardsInfoEO.standName || '-' }}

-

{{ sarStandardsInfoEO.standEnName || '-' }}

-

- - {{ sarStandardsInfoEO.standSortShow + ' ' + sarStandardsInfoEO.standNumber + '-' + sarStandardsInfoEO.standYear }} - {{ sarStandardsInfoEO.standSort + ' ' + sarStandardsInfoEO.standNumber }} -

-

- - {{ sarStandardsInfoEO.textStatus || '-' }} -

-

{{ sarStandardsInfoEO.issueTime || '-' }}

- - - -
-
+
{{ item.label }}
+
+
{{ item.label }}
+
+
+ + +
+ + + 更新记录 + + +
+
+
+
+