修改了合同登记历史记录委托日期显示

pages/meter-contract/contract-register/MeterContractRegisterHis.vue

@@ -37,7 +37,9 @@
                 :min-width="item.width?item.width:200"
                 :fixed="item.fixed?item.fixed:undefined" sortable>
                 <template slot-scope="scope">
-                  <span>{{scope.row[item.key]}}</span>
+                  <span v-if="item.key==='edate'">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):''}}
+                  </span>
+                  <span v-else>{{scope.row[item.key]}}</span>
                 </template>
               </vxe-table-column>
             </PTVXETable>

pages/meter-entrust/send-test/MeterSendTestEdit.vue

@@ -404,9 +404,34 @@ export default {
       })
     },
     _inputBack(data) {
+      console.log(data)
       if (undefined !== data) {
+        if (this.getPage.records.length > 0) {
+          const j = this.getPage.records.length
+          for (let i = j; i < data.length + j; i++) {
+            console.log(i)
+            this.getPage.records.push(data[i - j])
+            if (data[i - j].lastTime !== undefined) {
+              this.getPage.records[i].lastTime = new Date(data[i - j].lastTime)
+            }
+            console.log(this.getPage.records)
+            // this.getPage.records[i].lastTime = new Date(data[0].lastTime)
+          }
+        } else {
           for (let i = 0; i < data.length; i++) {
+            // if (this.getPage.records[i].lastTime !== undefined) {
+            //   const t = this.getPage.records[i].lastTime
+            //   const d = t.valueOf(t)
+            //   console.log('时间戳', d)
+            //   this.getPage.records[i].lastTime = d
+            //   this.getPage.records = []
+            // }
             this.getPage.records.push(data[i])
+            if (data[i].lastTime !== undefined) {
+              this.getPage.records[i].lastTime = new Date(data[i].lastTime)
+            }
+            console.log(data[i].lastTime)
+          }
         }
       }
     },
@@ -718,6 +743,13 @@ export default {
       this._showAddress(formObj)
       this._showTime(formObj)
       this.getPage.records = formObj.sampleList
+      for (let i = 0; i < formObj.sampleList.length; i++) {
+        if (formObj.sampleList[i].lastTime !== undefined) {
+          this.getPage.records[i].lastTime = new Date(
+            formObj.sampleList[i].lastTime
+          )
+        }
+      }
     },
 
     _showTime(formObj) {