统计查询修改

api/meter/meter-sample.js

@@ -215,5 +215,9 @@ export default {
   pageCertificateRateStatistics: data =>
     http
       .post('meter/v1/sample/page_certificate_rate_statistics', data)
+      .then(res => res),
+  pageCertificateRateSample: data =>
+    http
+      .post('meter/v1/sample/page_certificate_rate_sample', data)
       .then(res => res)
 }

pages/meter-statistics/certificate-rate/MeterCertificateRate.vue

@@ -67,7 +67,10 @@ export default {
   data() {
     const date = this.$dateformat(new Date(), 'yyyy-mm')
     return {
-      forObject: {},
+      forObject: {
+        edateBegin: undefined,
+        edateEnd: undefined
+      },
       tempData: {
         beginDate: date,
         endDate: date

pages/meter-statistics/certificate-rate/ReportTimelyTable.vue

@@ -6,15 +6,15 @@
       <input name="warningDate" type="hidden">
       <input name="type" type="hidden">
     </Form>
-    <PTVXETable id="reportTimelyTable" ref="pageTable" :pageColumns="pageColumns"
-                :tableHeight="tableHeight" @on-result-change="_tableResultChange" :getPage="getPage" select-data>
+    <PTVXETable id="reportTimelyTable" ref="pageTable" :page-columns="pageColumns"
+                :table-height="tableHeight" :get-page="getPage" select-data @on-result-change="_tableResultChange">
       <vxe-table-column
+        v-for="item in pageColumns"
+        :key="item.key"
         :field="item.key"
         :title="item.title"
         :min-width="item.width?item.width:200"
-        :fixed="item.fixed?item.fixed:undefined"
-        v-for="item in pageColumns"
-        :key="item.key" sortable>
+        :fixed="item.fixed?item.fixed:undefined" sortable>
         <template slot-scope="scope">
           <span v-if="item.date">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):''}}</span>
           <span v-else>{{scope.row[item.key]}}</span>
@@ -25,7 +25,7 @@
 </template>
 
 <script>
-import { meterContract } from '../../../api'
+import { meterSample } from '../../../api'
 export default {
   data() {
     return {
@@ -34,12 +34,11 @@ export default {
         client: undefined
       },
       pageColumns: [
-        { title: '样品编号', key: 'sampleNum', width: 180 },
+        { title: '样品编号', key: 'code', width: 180 },
         { title: '委托单位', key: 'client' },
-        { title: '委托编号', key: 'contractCode', width: 180 },
-        { title: '应出报告日期', key: 'dueDate', width: 120, date: true },
-        { title: '签发日期', key: 'issueDate', width: 120, date: true },
-        { title: '报告超期原因', key: 'reason' }
+        { title: '委托编号', key: 'entrustCode', width: 180 },
+        { title: '应出证书日期', key: 'odate', width: 120, date: true },
+        { title: '签发日期', key: 'reportIssueTime', width: 120, date: true }
       ],
       getPage: {},
       selectData: []
@@ -83,7 +82,7 @@ export default {
     // },
     _page: async function() {
       Object.assign(this.formObj, this.$refs.pageTable._searchParams())
-      const result = await meterContract.page(this.formObj)
+      const result = await meterSample.pageCertificateRateSample(this.formObj)
       if (result) {
         this.$refs.pageTable._hideLoading()
         this.getPage = result