整体优化

api/meter/meter-sample.js

@@ -69,6 +69,10 @@ export default {
     http.post('meter/v1/sample/page_certificate_check', data).then(res => res),
   pageCertificateIssue: data =>
     http.post('meter/v1/sample/page_certificate_issue', data).then(res => res),
+  pageCertificatePrint: data =>
+    http.post('meter/v1/sample/page_certificate_print', data).then(res => res),
+  pageCertificateEnd: data =>
+    http.post('meter/v1/sample/page_certificate_end', data).then(res => res),
   getById: data => http.get('meter/v1/sample/' + data).then(res => res),
   reportPreview: data =>
     http
@@ -108,6 +112,8 @@ export default {
     http
       .post('meter/v1/sample/submit_report_to_end?ids=' + data)
       .then(res => res),
+  endReport: data =>
+    http.post('meter/v1/sample/end_report?ids=' + data).then(res => res),
   submitFlow: data =>
     https
       .post('meter/v1/sample/sample_flow', JSON.stringify(data))

pages/meter-certificate/print/MeterCertificatePrint.vue

@@ -76,11 +76,6 @@ export default {
           type: 'success',
           id: '',
           name: '提交'
-        },
-        {
-          type: 'error',
-          id: '',
-          name: '退回'
         }
       ],
       iconMsg: [
@@ -163,16 +158,16 @@ export default {
       } else {
         this.$Modal.confirm({
           title: '提示',
-          content: '确定要把这 ' + ids.length + ' 条记录批准通过吗？',
+          content: '确定提交吗？',
           onOk: () => {
-            this._submitIssue(ids)
+            this._submitEnd(ids)
           }
         })
       }
     },
 
-    _submitIssue: async function(data) {
-      const result = await meterSample.submitReportToEnd(data)
+    _submitEnd: async function(data) {
+      const result = await meterSample.endReport(data)
       if (result) {
         this.$Message.success('提交成功！')
         await this._page()
@@ -249,7 +244,7 @@ export default {
     },
     _page: async function() {
       Object.assign(this.formObj, this.$refs.pageTable._searchParams())
-      const result = await meterSample.pageCertificateIssue(this.formObj)
+      const result = await meterSample.pageCertificatePrint(this.formObj)
       if (result) {
         this.$refs.pageTable._hideLoading()
         this.getPage = result