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

pages/meter-certificate/template/MeterReportEdit.vue

@@ -82,10 +82,10 @@ export default {
       },
       typeList: [
         {
-          value: '检定证书模板'
+          value: '检定证书'
         },
         {
-          value: '校准证书模板'
+          value: '校准证书'
         }
       ],
       id: '',

pages/meter-certificate/template/MeterReportTemplateEdit.vue

@@ -80,10 +80,10 @@ export default {
       },
       typeList: [
         {
-          value: '检定证书模板'
+          value: '检定证书'
         },
         {
-          value: '校准证书模板'
+          value: '校准证书'
         }
       ],
       showEditModal: false,

pages/meter-send/sample-input/SelectOriTempRecordExcel.vue

@@ -168,10 +168,14 @@ export default {
       this._edit({ id: id, obj: { orderBy: value } })
     },
     _tableResultChange(msg, data) {
+      console.log(msg)
       switch (msg) {
         case 'page':
           this._page()
           break
+        case 'changeSize':
+          this._page()
+          break
         case 'selectData':
           this.selectData = data
           break