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

jero-web/src/components/tableCollection/index.vue

@@ -74,7 +74,7 @@
          </span>
 
         <span slot="detailClick" slot-scope="text,record">
-          <collection-type :detailDate='text' :recordList = 'record' @collectionForm='collectionForm'/>
+          <collection-type :detailDate='text' :recordList = 'record' :columName='content' @collectionForm='collectionForm'/>
         </span>
       </a-table>
     </div>
@@ -779,7 +779,7 @@
                   align: 'left',
                   ellipsis: true,
                   sorter: res.sort,
-                  width: 500
+                  width: 600
                 })
                 num++
                 this.content.push(res)
@@ -787,6 +787,7 @@
                   customRender: 'detailClick',
                   title: 'titleName' + num
                 }
+                console.log( this.content," this.content this.content this.content this.content this.content")
                 //  非配置列
               } else {
                 this.columns.push({
@@ -847,6 +848,7 @@
         console.log(pagination, filters, sorter, 'iiiiiiiiiiiiiiiii')
       },
       getTableListReset() {
+
         this.formInline = {}
         this.queryParamQuery = {}
         let params = {
@@ -875,9 +877,12 @@
             if (this.currentPersonRole !== 'dre') {
               res.result.records.forEach((Obj) => {
                 Object.keys(Obj).forEach((item) => {
+
                   if (Obj[item] instanceof Object && Obj[item].controlType !== undefined) {
                     for (const key in Obj[item].paramsConfigData){
-                      Obj[item].paramsConfigData[key].forEach((itemLi) => {
+                      Obj[item].paramsConfigData[key].forEach((itemLi) =>
+                      {
+
                         itemLi.isLock = 1
                         if (itemLi.type === 'pull_more') {
                           itemLi.dataValue = itemLi.dataValue === null ? [] : itemLi.dataValue.split(',')
@@ -972,6 +977,7 @@
             // })
             let tt = []
             if (this.currentPersonRole !== 'dre') {
+
               console.log(res.result.records, 'res.result.records')
               res.result.records.forEach((Obj) => {
                 Object.keys(Obj).forEach((item) => {
@@ -1005,6 +1011,7 @@
                 tt.push(Obj)
               })
             } else {
+
               res.result.records.forEach((Obj) => {
                 Object.keys(Obj).forEach((item) => {
                   if (Obj[item] instanceof Object && Obj[item].controlType !== undefined) {