diff --git a/src/pages/config/pages/roleManage/index.vue b/src/pages/config/pages/roleManage/index.vue index 16ea6e2fd..35dd4fc35 100644 --- a/src/pages/config/pages/roleManage/index.vue +++ b/src/pages/config/pages/roleManage/index.vue @@ -538,6 +538,7 @@ export default { }) }, closeDialog() { + this.treeData2 = [] this.modalshowflag = false }, confirmDialog() { @@ -548,6 +549,7 @@ export default { if (res.ok) { this.$message.success('设置权限成功') this.modalshowflag = false + this.treeData2 = [] } }) }, diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue index 78e3d4530..881324144 100644 --- a/src/pages/details/otherBussStandardDetails/index.vue +++ b/src/pages/details/otherBussStandardDetails/index.vue @@ -6,8 +6,8 @@ {{sarStandardsInfoEO.standCode}}-{{sarStandardsInfoEO.standYear}} 《{{sarStandardsInfoEO.standName}}》 企标详情 -
-
+
+
+
+
+
+ + + 更新记录 +
+
+
diff --git a/src/pages/details/otherLawsStandDetails/index.vue b/src/pages/details/otherLawsStandDetails/index.vue index 71eb0f0fa..3e150bed7 100644 --- a/src/pages/details/otherLawsStandDetails/index.vue +++ b/src/pages/details/otherLawsStandDetails/index.vue @@ -6,8 +6,8 @@ {{sarStandardsInfoEO.lawsNumber}}-{{sarStandardsInfoEO.lawsYear}} 《{{sarStandardsInfoEO.lawsName}}》 企标详情
-
-
+
+
-
-
{{ item.label }}
-
-
-
{{ item.label }}
- - -
- - - 更新LOG + +
+
+
+ + + 更新LOG +
+
-
-
- - +
+ +
更多
@@ -886,13 +901,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, @@ -1091,6 +1119,14 @@ export default { watch: { }, methods: { + handleChange(val) { + console.log(val) + }, + handleChange1(val) { + if(val && val === '基础信息'){ + this.activeState = true + } + }, getPlanStatusName(status) { switch (status) { case "1": @@ -2064,16 +2100,39 @@ export default { }) }) displayLocation.forEach(location => { + + // 动态属性字段-SYRZ 单独添加至基础信息 + const list2 = displayLocation.filter ( item => item.label === '适用范围'); + if(location.label === '基础信息' && list2 && list2.length > 0){ + if (!list2[0].child) { + location['child2'] = [] + }else { + const childList = list2[0].child.filter ( item => item.attrField === 'YYRZLAWS'); + location['child2'] = 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 !== 'YYRZLAWS' && !halfType.includes(field.attrType) }) const fieldOthers = child.filter(field => { return halfType.includes(field.attrType) }) location.child = [...fieldOthers, ...fieldsIsTextAreaOrFile].sort(this.compare('orderNum')) }) + + 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.dynamicFormField = displayLocation sessionStorage.setItem('displayLocation', JSON.stringify(displayLocation)) this.loading = false @@ -2097,6 +2156,62 @@ export default {