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

pages/meter-business/quote-register/MeterQuoteRegisterEdit.vue

@@ -405,9 +405,34 @@ export default {
     },
 
     _inputBack(data) {
+      console.log(data)
       if (undefined !== data) {
-        for (let i = 0; i < data.length; i++) {
-          this.getPage.records.push(data[i])
+        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)
+          }
         }
       }
     },
@@ -664,21 +689,26 @@ export default {
       this._showAddress(formObj)
       this._showTime(formObj)
       this.getPage.records = formObj.sampleList
+      console.log(formObj)
       for (let i = 0; i < formObj.sampleList.length; i++) {
-        this.getPage.records[i].lastTime = new Date(
-          formObj.sampleList[i].lastTime
-        )
+        if (formObj.sampleList[i].lastTime !== undefined) {
+          this.getPage.records[i].lastTime = new Date(
+            formObj.sampleList[i].lastTime
+          )
+        }
       }
     },
     _getList: async function() {
       const result = await meterEntrust.pageList()
-      const list = []
+      // const list = []
       if (result) {
         for (let i = 0; i < result.length; i++) {
-          list.push(result[i].cname)
+          // list.push(result[i].cname)
+          this.customerData.push(result[i].cname)
+          console.log(this.customerData)
         }
-        console.log('委托单位名单', list)
-        this.customerData = list
+        // console.log('委托单位名单', list)
+        // this.customerData = list
       }
     },
     _getQueryList: async function(data) {

pages/meter-out/personal-task/SelectOriTempRecord.vue

@@ -80,7 +80,7 @@ export default {
       ],
       formObj: {
         // id: '',
-        title: ''
+        title: undefined
         // businessTypeList: 0
       },
       again: false,
@@ -124,7 +124,7 @@ export default {
       if (result !== undefined) {
         this.formObj.id = result.id
       } else {
-        this.formObj.id = ''
+        this.formObj.id = undefined
       }
       this._search()
     },
@@ -153,15 +153,18 @@ export default {
       this._hideLoading()
       count = 0
     },
-    _page: async function(data) {
-      const result = await meterPrint.pageSampleTemplate(data)
+    _page: async function() {
+      Object.assign(this.formObj, this.$refs.pageTable._searchParams())
+      console.log('this.formObj', this.formObj)
+      const result = await meterPrint.pageSampleTemplate(this.formObj)
       if (result) {
         this.getPage = result
+        this.$refs.pageTable._hideLoading()
       }
     },
     _search() {
-      // this.$refs.pageTable._pageChange(1)
-      this._page(this.formObj)
+      this.$refs.pageTable._pageChange(1)
+      // this._page(this.formObj)
     },
     _tableResultChange(msg, data) {
       switch (msg) {