FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
yanyizhou
2021-11-04 09:11:58 +08:00
parent 025d60bbe1 d172c99d49
commit f62024ceab
5 changed files with 396 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
-4
View File
@@ -3077,11 +3077,7 @@ export default {
userId: this.$store.getters.userInfo.userId
}, {}, res => {
if (res.ok) {
for (let i in res.data) {
let arr = res.data[i].children
arr.push(arr.shift())
this.treeList = res.data
}
}
})
},
src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
-4
View File
@@ -2057,11 +2057,7 @@ export default {
userId: this.$store.getters.userInfo.userId
}, {}, res => {
if (res.ok) {
for (let i in res.data) {
let arr = res.data[i].children
arr.push(arr.shift())
this.treeList = res.data
}
}
})
},
src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue
+5 -5
View File
@@ -538,7 +538,7 @@
></el-input>
</el-form-item>
</template>
<template v-else-if="field.attrField === 'DTQBBHBUSS'">
<template v-else-if="field.attrField === 'DTWJHLAWS'">
<custom-input-for-standards
:key="field.attrField"
:config="field"
@@ -548,7 +548,7 @@
@popoverHide="popoverHideQuery"
></custom-input-for-standards>
</template>
<template v-else-if="field.attrField === 'BDTQBBHBUSS'">
<template v-else-if="field.attrField === 'BDTWJHLAWS'">
<custom-input
:key="field.attrField"
:config="field"
@@ -755,7 +755,7 @@
</el-table-column>
<el-table-column
prop="issueTime"
label="发布日期"
label="发文日期"
width="180"
sortable
align="center">
@@ -1277,7 +1277,7 @@
import CustomSelect from '@/components/CustomFormComponents/Select'
import CustomDatePick from '@/components/CustomFormComponents/DatePicker'
import CustomFile from '@/components/CustomFormComponents/File'
import CustomInputForStandards from '@/components/CustomFormComponents/InputForStandardsForEnterprise'
import CustomInputForStandards from '@/components/CustomFormComponents/InputForStandardsForLaws'
import customSelectArray from '@/components/CustomFormComponents/SelectArray'
import CustomOrg from '@/components/CustomFormComponents/OrgTree'
import CustomSVPPS from '@/components/CustomFormComponents/SVPPS'
@@ -3751,7 +3751,7 @@
disabled: false
},
{
label: '发布日期',
label: '发文日期',
value: 'issue_time',
type: 'DATE_PIC_OPTS',
disabled: false
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+1 -5
View File
@@ -2866,11 +2866,7 @@ export default {
userId: this.$store.getters.userInfo.userId
}, {}, res => {
if (res.ok) {
for (let i in res.data) {
let arr = res.data[i].children
arr.push(arr.shift())
this.treeList = res.data
}
this.treeList = res.data
}
})
},