Browse Source

修改展示问题

shaun-sheep 4 years ago
parent
commit
132626dae2

+ 8 - 9
src/views/ledger/facility/details/index.vue

@@ -53,10 +53,10 @@
     </div>
     <div class="footer">
       <el-button-group style="float:right;margin:8px 10px 0 0">
-        <el-button 
+        <el-button
           :disabled="list.findIndex(item => item.value == id) == 0"
           @click="handleClickPrev"
-          size="mini" 
+          size="mini"
           icon="el-icon-arrow-left">
           上一页
         </el-button>
@@ -68,7 +68,7 @@
             :value="item.value">
           </el-option>
         </el-select>
-        <el-button 
+        <el-button
           :disabled="list.findIndex(item => item.value == id) == list.length-1"
           @click="handleClickNext"
           size="mini">
@@ -248,10 +248,9 @@
             BeatchQueryParam(params, res => {
               arr = res.Content
               arr && arr.length && arr.map(child => {
-
                 this.pointData.forEach(head => {
                   if (head.InfoPointCode == child.code) {
-                    console.log(head.FirstName,child,'==')
+                    // console.log(head.FirstName,child,'==')
                     this.exhibitionEnergy.firstName = head.FirstName;
                     this.exhibitionEnergy.dynamic.push({
                       FirstName: head.FirstName,
@@ -278,10 +277,8 @@
         let isArr = []
         isList.map(j => {
           if (this.instance.hasOwnProperty(j.Path)) {
-            return {
-              ...j,
-              value: this.instance[j.Path]
-            }
+            j.value = this.instance[j.Path]
+            return j
           }
         })
         isArr = isList.filter(k => k.value)
@@ -382,11 +379,13 @@
         //处理数据格式
         arr.map(i => {
           if (i.InputMode == 'F2') {
+            console.log(i.Path, 'ppp')
             switch (i.Path) {
               case 'LedgerParam.InsuranceDoc.InsuranceFile':
               case 'LedgerParam.PhotoDoc.Archive':
               case 'LedgerParam.Siteinstall.CheckReport':
                 if (this.instance.hasOwnProperty(i.Path)) {
+                  debugger
                   i.fileList = this.instance[i.Path]
                 }
                 if (picObject[i.InfoPointName]) {

+ 2 - 4
src/views/ledger/facility/details/index_old.vue

@@ -251,10 +251,8 @@
         let isArr = []
         isList.map(j => {
           if (this.instance.hasOwnProperty(j.Path)) {
-            return {
-              ...j,
-              value: this.instance[j.Path]
-            }
+            j.value = this.instance[j.Path]
+            return j
           }
         })
         isArr = isList.filter(k => k.value)

+ 6 - 8
src/views/ledger/property/details/index.vue

@@ -43,10 +43,10 @@
     </div>
     <div class="footer">
       <el-button-group style="float:right;margin:8px 10px 0 0">
-        <el-button 
+        <el-button
           :disabled="list.findIndex(item => item.value == id) == 0"
           @click="handleClickPrev"
-          size="mini" 
+          size="mini"
           icon="el-icon-arrow-left">
           上一页
         </el-button>
@@ -58,14 +58,14 @@
             :value="item.value">
           </el-option>
         </el-select>
-        <el-button 
+        <el-button
           :disabled="list.findIndex(item => item.value == id) == list.length-1"
           @click="handleClickNext"
           size="mini">
           下一页
           <i class="el-icon-arrow-right el-icon--right"></i>
         </el-button>
-      </el-button-group> 
+      </el-button-group>
     </div>
   </div>
 </template>
@@ -205,10 +205,8 @@
         let isArr = []
         isList.map(j => {
           if (this.instance.hasOwnProperty(j.Path)) {
-            return {
-              ...j,
-              value: this.instance[j.Path]
-            }
+            j.value = this.instance[j.Path]
+            return j
           }
         })
         isArr = isList.filter(k => k.value)

+ 3 - 5
src/views/ledger/property/details/index_old.vue

@@ -186,10 +186,8 @@
         let isArr = []
         isList.map(j => {
           if (this.instance.hasOwnProperty(j.Path)) {
-            return {
-              ...j,
-              value: this.instance[j.Path]
-            }
+            j.value = this.instance[j.Path]
+            return j
           }
         })
         isArr = isList.filter(k => k.value)
@@ -372,7 +370,7 @@
             }
             source.forEach(j => {
               if (j.Code == this.instance[i.Path]) {
-                console.log(j.Name)
+
                 i.value = j.Name
               }
             })

+ 2 - 4
src/views/ledger/spacelist/spaceDetail/index.vue

@@ -274,10 +274,8 @@
       let isArr = []
       isList.map(j => {
         if (this.instance.hasOwnProperty(j.Path)) {
-          return {
-            ...j,
-            value: this.instance[j.Path]
-          }
+          j.value = this.instance[j.Path]
+          return j
         }
       })
       isArr = isList.filter(k => k.value)

+ 2 - 4
src/views/ledger/system/systemDetail/index.vue

@@ -256,10 +256,8 @@
       let isArr = []
       isList.map(j => {
         if (this.instance.hasOwnProperty(j.Path)) {
-          return {
-            ...j,
-            value: this.instance[j.Path]
-          }
+          j.value = this.instance[j.Path]
+          return j
         }
       })
       isArr = isList.filter(k => k.value)