diff --git a/src/components/roleTree/index.vue b/src/components/roleTree/index.vue index 93406e0ea..572e5cda8 100644 --- a/src/components/roleTree/index.vue +++ b/src/components/roleTree/index.vue @@ -149,7 +149,8 @@ }, getChildren (node, resolve) { this.$http.get('SarInstitution/institution/getNext', { - institutionId: node.key + institutionId: node.key, + userName: this.filterText }, {}, res => { resolve(res) }) diff --git a/src/pages/config/pages/attributeCustom/components/other.vue b/src/pages/config/pages/attributeCustom/components/other.vue new file mode 100644 index 000000000..461ea9542 --- /dev/null +++ b/src/pages/config/pages/attributeCustom/components/other.vue @@ -0,0 +1,674 @@ + + + + + + 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 { diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue index 3bbd4c9cf..548e41d5b 100644 --- a/src/pages/details/otherBussStandardDetails/index.vue +++ b/src/pages/details/otherBussStandardDetails/index.vue @@ -15,132 +15,174 @@ :key="index" v-if="item.isShowImp === '0'" > -
-
{{ item.label }}
-
-
-
{{ item.label }}
- - -
- - - 更新LOG -
-
-
- - +
+ + -
更多
+ 关 闭 + +
+ {{ index + 1 }}. + {{ file.oldFileName }} + + +
+ +
+
+
+ 关 闭 +
+

@@ -874,13 +950,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 +1168,23 @@ export default { watch: { }, methods: { + child1Func(child1){ + const list = [] + console.log(child1) + 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 +2019,10 @@ export default { }) } }, + relateEvent1(list){ + this.relateDialog1 = true + this.relateNowList1 = list + }, // 更新LOG relateEvent () { this.$http.get('lawss/sarUpdLog/getLogList', { @@ -1942,6 +2052,10 @@ export default { }) }, + relateDialogClose1() { + this.relateDialog1 = false + this.relateNowList = [] + }, relateDialogClose () { this.relateDialog = false this.relateNowList = [] @@ -2019,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' @@ -2046,22 +2161,53 @@ 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 !== '过程稿件'){ + 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(list) + if(location.label === '基础信息' && list && list.length > 0){ + if (!list[0].child) { + location['child1'] = [] + }else { + const childList = list[0].child.filter ( item => item.attrField === 'FBGBUSS'); + console.log(childList) + console.log(childList.length) + location['child1'] = childList + console.log(location['child1']) + } + } + 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(location) }) + console.log(displayLocation) this.dynamicFormField = displayLocation sessionStorage.setItem('displayLocation', JSON.stringify(displayLocation)) this.loading = false @@ -2085,6 +2231,55 @@ export default {