Merge branch 'dev' of http://git.patzn.com/root/patzn-cloud-service-metr-web into dev

api/meter/meter-sample.js

@@ -104,6 +104,10 @@ export default {
       .then(res => res),
   pageCertificatePrint: data =>
     http.post('meter/v1/sample/page_certificate_print', data).then(res => res),
+  pageCertificatePrinted: data =>
+    http
+      .post('meter/v1/sample/page_certificate_printed', 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),
@@ -145,6 +149,10 @@ export default {
     http
       .post('meter/v1/sample/submit_report_to_end?ids=' + data)
       .then(res => res),
+
+  printEnd: data =>
+    http.post('meter/v1/sample/print_end?ids=' + data).then(res => res),
+
   endReport: data =>
     http.post('meter/v1/sample/end_report?ids=' + data).then(res => res),
   submitFlow: data =>

pages/meter-certificate/check/MeterCertificateCheck.vue

@@ -120,7 +120,7 @@ export default {
       getPage: {},
       pageColumns: [
         { title: '样品名称', key: 'name', width: 120 },
-        { title: '样品编号', key: 'code', width: 120 },
+        { title: '样品编号', key: 'code', width: 145 },
         { title: '证书编号', key: 'reportCode', width: 140 },
         { title: '型号规格', key: 'spec', width: 100 },
         { title: '出厂编号', key: 'factoryNumber' },

pages/meter-certificate/print/MeterCertificatePrintIndex.vue

@@ -48,6 +48,7 @@
                           外观检查
                       </span>
                   </span>
+                  <span v-else-if="item.date">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd HH:MM:ss'):''}}</span>
                   <span v-else>{{scope.row[item.key]}}</span>
                 </template>
               </vxe-table-column>
@@ -109,8 +110,29 @@ export default {
       getPage: {},
       pageColumns: [
         { title: '样品名称', key: 'name', width: 120 },
-        { title: '样品编号', key: 'code', width: 120 },
+        { title: '样品编号', key: 'code', width: 145 },
         { title: '证书编号', key: 'reportCode', width: 145 },
+        { title: '证书编制人', key: 'reportMaker', width: 145 },
+        {
+          title: '证书编制时间',
+          key: 'reportMakeTime',
+          width: 145,
+          date: true
+        },
+        { title: '证书审核人', key: 'reportChecker', width: 145 },
+        {
+          title: '证书审核时间',
+          key: 'reportCheckTime',
+          width: 145,
+          date: true
+        },
+        { title: '证书签发人', key: 'reportIssuer', width: 145 },
+        {
+          title: '证书签发时间',
+          key: 'reportIssueTime',
+          width: 145,
+          date: true
+        },
         { title: '型号规格', key: 'spec', width: 100 },
         { title: '出厂编号', key: 'factoryNumber' },
         { title: '检测类型', key: 'type', width: 100 },
@@ -178,8 +200,21 @@ export default {
       if (ids.length === 0) {
         this.$Message.warning('请至少选择一条数据！')
       } else {
-        console.log(ids)
-        // this.$pageofficePrint({ ids: ids, type: 'xlsx' })
+        this.$Modal.confirm({
+          title: '提示',
+          content: '确定这 ' + ids.length + ' 条记录已经打印完成？',
+          onOk: () => {
+            this._submitPrintEnd(ids)
+          }
+        })
+      }
+    },
+
+    _submitPrintEnd: async function(data) {
+      const result = await meterSample.printEnd(data)
+      if (result) {
+        this.$Message.success('提交成功！')
+        await this._page()
       }
     },
 

pages/meter-certificate/print/MeterCertificatePrintIndexHis.vue

@@ -48,6 +48,7 @@
                           外观检查
                       </span>
                   </span>
+                  <span v-else-if="item.date">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd HH:MM:ss'):''}}</span>
                   <span v-else>{{scope.row[item.key]}}</span>
                 </template>
               </vxe-table-column>
@@ -104,8 +105,29 @@ export default {
       getPage: {},
       pageColumns: [
         { title: '样品名称', key: 'name', width: 120 },
-        { title: '样品编号', key: 'code', width: 120 },
+        { title: '样品编号', key: 'code', width: 145 },
         { title: '证书编号', key: 'reportCode', width: 145 },
+        { title: '证书编制人', key: 'reportMaker', width: 145 },
+        {
+          title: '证书编制时间',
+          key: 'reportMakeTime',
+          width: 145,
+          date: true
+        },
+        { title: '证书审核人', key: 'reportChecker', width: 145 },
+        {
+          title: '证书审核时间',
+          key: 'reportCheckTime',
+          width: 145,
+          date: true
+        },
+        { title: '证书签发人', key: 'reportIssuer', width: 145 },
+        {
+          title: '证书签发时间',
+          key: 'reportIssueTime',
+          width: 145,
+          date: true
+        },
         { title: '型号规格', key: 'spec', width: 100 },
         { title: '出厂编号', key: 'factoryNumber' },
         { title: '检测类型', key: 'type', width: 100 },
@@ -268,7 +290,7 @@ export default {
     },
     _page: async function() {
       Object.assign(this.formObj, this.$refs.pageTable._searchParams())
-      const result = await meterSample.pageCertificatePrint(this.formObj)
+      const result = await meterSample.pageCertificatePrinted(this.formObj)
       if (result) {
         this.$refs.pageTable._hideLoading()
         this.getPage = result

pages/meter-certificate/print/MeterCertificatePrintTabIndex.vue

@@ -3,10 +3,10 @@
     <div class="layout-content-padding">
       <div class="layout-content-main">
         <el-tabs v-model="activeName" @tab-click="_changeTabs">
-          <el-tab-pane label="待完成" name="wait">
+          <el-tab-pane label="待打印" name="wait">
             <MeterGoOutEntrust ref="waitTabs"></MeterGoOutEntrust>
           </el-tab-pane>
-          <el-tab-pane label="历史记录" name="his">
+          <el-tab-pane label="已完成" name="his">
             <MeterGoOutEntrustHis ref="hisTabs"></MeterGoOutEntrustHis>
           </el-tab-pane>
         </el-tabs>