From 954467256618fcec6f302ccf9080d50e0386ee9a Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Mon, 8 Nov 2021 17:12:33 +0800 Subject: [PATCH 1/9] feat: There is no way the --- .../otherBussStandardDetails/index.vue | 388 +++++++++++++----- .../details/otherStandardDetails/index.vue | 13 +- .../components/EnterpriseStandardDatabase.vue | 7 +- 3 files changed, 302 insertions(+), 106 deletions(-) diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue index 3bbd4c9cf..c6b8c090e 100644 --- a/src/pages/details/otherBussStandardDetails/index.vue +++ b/src/pages/details/otherBussStandardDetails/index.vue @@ -15,129 +15,169 @@ :key="index" v-if="item.isShowImp === '0'" > -
-
{{ item.label }}
-
-
-
{{ item.label }}
- - -
- - - 更新LOG -
-
-
- - +
+ +
更多
@@ -518,6 +558,40 @@ 关 闭 + +
+ {{ index + 1 }}. + {{ file.oldFileName }} + + +
+ +
+
+
+ 关 闭 +
+

@@ -874,13 +948,26 @@ export default { components: { PutQuestionButton }, + filters: { + ellipsis (value) { + if (!value) return '' + if (value.length > 12) { + return value.slice(0,12) + '...' + } + return value + } + }, data () { return { + activeNames: ['基础信息'], + activeState: false, visiblePlanCheck: false, form: {}, relateDialog: false, + relateDialog1: false, relateList: [], relateNowList: [], + relateNowList1: [], sarType: sarType, loading: true, showItemInfoModal: false, @@ -1079,6 +1166,22 @@ export default { watch: { }, methods: { + child1Func(child1){ + const list = [] + if(child1 && child1.length > 1){ + list.push(child1[0]) + return list + } + return child1 + }, + handleChange(val) { + console.log(val) + }, + handleChange1(val) { + if(val && val === '基础信息'){ + this.activeState = true; + } + }, getPlanStatusName(status) { switch (status) { case "1": @@ -1913,6 +2016,10 @@ export default { }) } }, + relateEvent1(list){ + this.relateDialog1 = true + this.relateNowList1 = list + }, // 更新LOG relateEvent () { this.$http.get('lawss/sarUpdLog/getLogList', { @@ -1942,6 +2049,10 @@ export default { }) }, + relateDialogClose1() { + this.relateDialog1 = false + this.relateNowList = [] + }, relateDialogClose () { this.relateDialog = false this.relateNowList = [] @@ -2051,17 +2162,42 @@ export default { } }) }) + + for (let i = 0; i < displayLocation.length; i++) { + // sss + if(displayLocation[i].label !== '基础信息' && displayLocation[i].label !== '过程稿件'){ + const childList = displayLocation[i].child.filter ( item => item.value !== null && item.value !== ''); + if(childList.length === 0){ + displayLocation.splice(i,1) + } + } + } + displayLocation.forEach(location => { + // 动态属性字段-FBGBJBD 单独添加至基础信息 + const list = displayLocation.filter ( item => item.label === '过程稿件'); + if(location.label === '基础信息' && list && list.length > 0){ + if (!list[0].child) { + location['child1'] = [] + }else { + console.log(list) + const childList = list[0].child.filter ( item => item.attrField === 'FBGBUSS'); + location['child1'] = childList + } + } + const child = location.child || [] const halfType = ['INPUT_STR', 'DATE_PICKER', 'SEL_OPTION', 'INPUT_NUM'] const fieldsIsTextAreaOrFile = child.filter(field => { - return !halfType.includes(field.attrType) + return field.attrField !== 'FBGBUSS' && !halfType.includes(field.attrType) }) const fieldOthers = child.filter(field => { - return halfType.includes(field.attrType) + return halfType.includes(field.attrType) }) + console.log(fieldOthers) location.child = [...fieldOthers, ...fieldsIsTextAreaOrFile].sort(this.compare('orderNum')) }) + console.log(displayLocation) this.dynamicFormField = displayLocation sessionStorage.setItem('displayLocation', JSON.stringify(displayLocation)) this.loading = false @@ -2085,6 +2221,55 @@ export default { diff --git a/src/pages/config/pages/attributeCustom/index.vue b/src/pages/config/pages/attributeCustom/index.vue index b07ad6d53..c9aab0979 100644 --- a/src/pages/config/pages/attributeCustom/index.vue +++ b/src/pages/config/pages/attributeCustom/index.vue @@ -16,6 +16,11 @@ + @@ -24,12 +29,14 @@ import Laws from './components/laws' import Stand from './components/stand' import Buss from './components/buss' +/*import Other from './components/other'*/ export default { name: 'index', components: { Laws, Stand, - Buss + Buss, + // Other }, data () { return { From 381c5bc1251b3664330dfcdc66a7e56c32efb56d Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Mon, 8 Nov 2021 17:51:12 +0800 Subject: [PATCH 4/9] feat: There is no way the, --- .../otherBussStandardDetails/index.vue | 72 ++++++++++------- .../details/otherStandardDetails/index.vue | 81 ++++++++++--------- 2 files changed, 84 insertions(+), 69 deletions(-) diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue index cd8235e34..548e41d5b 100644 --- a/src/pages/details/otherBussStandardDetails/index.vue +++ b/src/pages/details/otherBussStandardDetails/index.vue @@ -39,37 +39,39 @@

{{ sarStandardsInfoEO.standCode }}

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

@@ -1168,6 +1170,7 @@ export default { methods: { child1Func(child1){ const list = [] + console.log(child1) if(child1 && child1.length > 1){ list.push(child1[0]) return list @@ -2130,6 +2133,7 @@ export default { const [displayLocation, {attrInfoMap: dynamicFormField}, formFieldList] = values // const relatedPlansRes = await this.queryRelatedPlans() // const relatedPlans = relatedPlansRes.list + console.log(formFieldList) formFieldList.forEach((field) => { displayLocation.forEach((location) => { location.isShowImp = '0' @@ -2157,12 +2161,14 @@ export default { // } } } - if (location.label === '文本信息') { + if (location.label === '过程稿件') { location.isShowImp = '0' } }) }) + console.log(displayLocation) + for (let i = 0; i < displayLocation.length; i++) { // sss if(displayLocation[i].label !== '基础信息' && displayLocation[i].label !== '过程稿件'){ @@ -2176,13 +2182,16 @@ export default { displayLocation.forEach(location => { // 动态属性字段-FBGBJBD 单独添加至基础信息 const list = displayLocation.filter ( item => item.label === '过程稿件'); + console.log(list) if(location.label === '基础信息' && list && list.length > 0){ if (!list[0].child) { location['child1'] = [] }else { - console.log(list) const childList = list[0].child.filter ( item => item.attrField === 'FBGBUSS'); + console.log(childList) + console.log(childList.length) location['child1'] = childList + console.log(location['child1']) } } @@ -2196,6 +2205,7 @@ export default { }) console.log(fieldOthers) location.child = [...fieldOthers, ...fieldsIsTextAreaOrFile].sort(this.compare('orderNum')) + console.log(location) }) console.log(displayLocation) this.dynamicFormField = displayLocation diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 44ca508f3..8496f0c9c 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -57,37 +57,39 @@

{{ @@ -3112,18 +3114,10 @@ }) }) - for (let i = 0; i < displayLocation.length; i++) { - // sss - if(displayLocation[i].label !== '基础信息' && displayLocation[i].label !== '过程稿件'){ - const childList = displayLocation[i].child.filter ( item => item.value !== null && item.value !== ''); - if(childList.length === 0){ - displayLocation.splice(i,1) - } - } - } displayLocation.forEach(location => { // 动态属性字段-FBGBJBD 单独添加至基础信息 const list = displayLocation.filter ( item => item.label === '过程稿件'); + console.log() if(location.label === '基础信息' && list && list.length > 0){ if (!list[0].child) { location['child1'] = [] @@ -3167,6 +3161,17 @@ location.half = half location.showAll = false }) + + for (let i = 0; i < displayLocation.length; i++) { + // sss + if(displayLocation[i].label !== '基础信息' && displayLocation[i].label !== '过程稿件'){ + const childList = displayLocation[i].child.filter ( item => item.value !== null && item.value !== ''); + if(childList.length === 0){ + displayLocation.splice(i,1) + } + } + } + this.$http.get('sarLawsAttrDetailedList/sar-laws-attr-detailed-list', { id: this.$route.params.id }, { From 5f849fa11b5bd7e8ef6c525832511545c6947f68 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Mon, 8 Nov 2021 18:02:05 +0800 Subject: [PATCH 5/9] commit --- src/components/personalCenter/index.vue | 36 +- .../components/workingGroup1/index.vue | 867 +++++++++++++++++- 2 files changed, 857 insertions(+), 46 deletions(-) diff --git a/src/components/personalCenter/index.vue b/src/components/personalCenter/index.vue index ae500d7f9..ef0dfb12a 100644 --- a/src/components/personalCenter/index.vue +++ b/src/components/personalCenter/index.vue @@ -10,24 +10,24 @@ 标准法规管理系统 Standard and Regulations Management System -

-
- -
- - - {{ $store.getters.userInfo.uName }} - -
- - 退出 - - -
-
+ + + + + + + + + + + + + + + + + + diff --git a/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue b/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue index fa10328ed..2e19c5d87 100644 --- a/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue +++ b/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue @@ -1,7 +1,491 @@