diff --git a/jero-web/src/components/CollectionType/index.vue b/jero-web/src/components/CollectionType/index.vue
index 0430379dd..f9b542c28 100644
--- a/jero-web/src/components/CollectionType/index.vue
+++ b/jero-web/src/components/CollectionType/index.vue
@@ -3,7 +3,7 @@
-
+
@@ -95,11 +95,14 @@
v-model="item.dataValue"/>
+
-
+
@@ -124,7 +127,7 @@
-
+
-
+
-
+
-
+
-
-
+
-
+
@@ -490,7 +500,7 @@
-
+
-
+
-
+
{
+ for (const key in this.detailDate.paramsConfigData){
+ this.detailDateList = this.detailDate.paramsConfigData[key]
+ }
+ this.detailDateList.forEach((item) => {
if (item.type === 'pull_more' && !item.dataValue) {
item.dataValue = []
}
@@ -709,7 +722,7 @@
onInput(r) {
let value = r.target.value
r.target.value = value.replace(/[^\u4e00-\u9fa5]/g, '')
- this.detailDate.list.forEach((item) => {
+ this.detailDateList.forEach((item) => {
if (item.controlVerify == '2') {
item.dataValue = r.target.value
}
@@ -731,7 +744,7 @@
// console.log('form',this.formInline)
}
- this.detailDate.list.forEach((item, index) => {
+ this.detailDateList.forEach((item, index) => {
if (item.type === 'file') {
item.dataValue = attIdList.join(',')
}
@@ -751,7 +764,13 @@
this.$refs.uploadFile.perentHandleFunc()
}
})
- }
+ },
+ addconfig(){
+
+ },
+ delconfig(){
+
+ },
},
watch: {
detailDate(newold, oldold) {
@@ -846,7 +865,14 @@
.add--number {
width: 101%;
}
-
+ .addicon{
+ display: inline-block;
+ margin-left: 5px;
+ }
+ .delicon{
+ display: inline-block;
+ margin-left: 5px;
+ }
.ant-input-disabled {
color: rgba(0, 0, 0, 0.65);
}
diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue
index 18c5465eb..3c3fa209c 100644
--- a/jero-web/src/components/tableCollection/index.vue
+++ b/jero-web/src/components/tableCollection/index.vue
@@ -873,12 +873,20 @@
res.result.records.forEach((Obj) => {
Object.keys(Obj).forEach((item) => {
if (Obj[item] instanceof Object && Obj[item].controlType !== undefined) {
- Obj[item].list.forEach((itemLi) => {
- itemLi.isLock = 1
- if (itemLi.type === 'pull_more') {
- itemLi.dataValue = itemLi.dataValue === null ? [] : itemLi.dataValue.split(',')
- }
- })
+ for (const key in Obj[item].paramsConfigData){
+ Obj[item].paramsConfigData[key].forEach((itemLi) => {
+ itemLi.isLock = 1
+ if (itemLi.type === 'pull_more') {
+ itemLi.dataValue = itemLi.dataValue === null ? [] : itemLi.dataValue.split(',')
+ }
+ })
+ }
+ // Obj[item].list.forEach((itemLi) => {
+ // itemLi.isLock = 1
+ // if (itemLi.type === 'pull_more') {
+ // itemLi.dataValue = itemLi.dataValue === null ? [] : itemLi.dataValue.split(',')
+ // }
+ // })
}
})
tt.push(Obj)
@@ -887,11 +895,18 @@
res.result.records.forEach((Obj) => {
Object.keys(Obj).forEach((item) => {
if (Obj[item] instanceof Object && Obj[item].controlType !== undefined) {
- Obj[item].list.forEach((itemLi) => {
- if (itemLi.type === 'pull_more') {
- itemLi.dataValue = itemLi.dataValue === null ? [] : itemLi.dataValue.split(',')
- }
- })
+ for (const key in Obj[item].paramsConfigData){
+ Obj[item].paramsConfigData[key].forEach((itemLi) => {
+ if (itemLi.type === 'pull_more') {
+ itemLi.dataValue = itemLi.dataValue === null ? [] : itemLi.dataValue.split(',')
+ }
+ })
+ }
+ // Obj[item].list.forEach((itemLi) => {
+ // if (itemLi.type === 'pull_more') {
+ // itemLi.dataValue = itemLi.dataValue === null ? [] : itemLi.dataValue.split(',')
+ // }
+ // })
}
})
tt.push(Obj)
@@ -958,17 +973,30 @@
res.result.records.forEach((Obj) => {
Object.keys(Obj).forEach((item) => {
if (Obj[item] instanceof Object && Obj[item].controlType !== undefined) {
- Obj[item].list.forEach((itemLi) => {
- console.log(item)
- if((this.currentPersonRole == 'homo' || this.currentPersonRole == 'admin') && item == 'referencesCol'){
- itemLi.isLock = 0
- }else{
- itemLi.isLock = 1
- }
- if (itemLi.type === 'pull_more') {
- itemLi.dataValue = !itemLi.dataValue ? [] : itemLi.dataValue.split(',')
- }
- })
+ for (const key in Obj[item].paramsConfigData){
+ Obj[item].paramsConfigData[key].forEach((itemLi) => {
+ console.log(item)
+ if((this.currentPersonRole == 'homo' || this.currentPersonRole == 'admin') && item == 'referencesCol'){
+ itemLi.isLock = 0
+ }else{
+ itemLi.isLock = 1
+ }
+ if (itemLi.type === 'pull_more') {
+ itemLi.dataValue = !itemLi.dataValue ? [] : itemLi.dataValue.split(',')
+ }
+ })
+ }
+ // Obj[item].list.forEach((itemLi) => {
+ // console.log(item)
+ // if((this.currentPersonRole == 'homo' || this.currentPersonRole == 'admin') && item == 'referencesCol'){
+ // itemLi.isLock = 0
+ // }else{
+ // itemLi.isLock = 1
+ // }
+ // if (itemLi.type === 'pull_more') {
+ // itemLi.dataValue = !itemLi.dataValue ? [] : itemLi.dataValue.split(',')
+ // }
+ // })
}
})
tt.push(Obj)
@@ -977,11 +1005,18 @@
res.result.records.forEach((Obj) => {
Object.keys(Obj).forEach((item) => {
if (Obj[item] instanceof Object && Obj[item].controlType !== undefined) {
- Obj[item].list.forEach((itemLi) => {
- if (itemLi.type === 'pull_more') {
- itemLi.dataValue = !itemLi.dataValue ? [] : itemLi.dataValue.split(',')
- }
- })
+ for (const key in Obj[item].paramsConfigData){
+ Obj[item].paramsConfigData[key].forEach((itemLi) => {
+ if (itemLi.type === 'pull_more') {
+ itemLi.dataValue = !itemLi.dataValue ? [] : itemLi.dataValue.split(',')
+ }
+ })
+ }
+ // Obj[item].list.forEach((itemLi) => {
+ // if (itemLi.type === 'pull_more') {
+ // itemLi.dataValue = !itemLi.dataValue ? [] : itemLi.dataValue.split(',')
+ // }
+ // })
}
})
tt.push(Obj)
diff --git a/jero-web/src/components/uploadFileChangeDown/file.vue b/jero-web/src/components/uploadFileChangeDown/file.vue
index 19b236668..a8f328bc0 100644
--- a/jero-web/src/components/uploadFileChangeDown/file.vue
+++ b/jero-web/src/components/uploadFileChangeDown/file.vue
@@ -73,12 +73,20 @@ import { mapGetters } from 'vuex'
this.containerId = 'container-ty-' + new Date().getTime()
},
mounted() {
- this.detailDate.list.forEach((item) => {
- if (item.type === 'file') {
- this.template.templateId = item.templateId
- this.template.templateName = item.templateName
- }
- })
+ for (const key in this.detailDate.paramsConfigData){
+ this.detailDate.paramsConfigData[key].forEach((item) => {
+ if (item.type === 'file') {
+ this.template.templateId = item.templateId
+ this.template.templateName = item.templateName
+ }
+ })
+ }
+ // this.detailDate.list.forEach((item) => {
+ // if (item.type === 'file') {
+ // this.template.templateId = item.templateId
+ // this.template.templateName = item.templateName
+ // }
+ // })
let long = localStorage.getItem('language')
this.cut = ''
if (long && long == 'zh-cn') {