计量证书修改

pages/meter-certificate/check/MeterCertificateCheck.vue

@@ -116,7 +116,7 @@ export default {
       pageColumns: [
         { title: '样品名称', key: 'name', width: 120 },
         { title: '样品编号', key: 'code', width: 120 },
-        { title: '报告编号', key: 'reportCode', width: 140 },
+        { title: '证书编号', key: 'reportCode', width: 140 },
         { title: '型号规格', key: 'spec', width: 100 },
         { title: '出厂编号', key: 'factoryNumber' },
         { title: '检测类型', key: 'type', width: 100 },
@@ -286,6 +286,8 @@ export default {
       const result = await meterSample.getCertificateReport(data.id)
       if (result) {
         this._viewReport(result)
+      } else {
+        this._itemOriginalRecordLook(data)
       }
     },
     _viewReport(data) {

pages/meter-certificate/check/MeterCertificateCheckHis.vue

@@ -111,6 +111,7 @@ export default {
       pageColumns: [
         { title: '样品名称', key: 'name', width: 120 },
         { title: '样品编号', key: 'code', width: 120 },
+        { title: '证书编号', key: 'reportCode', width: 140 },
         { title: '型号规格', key: 'spec', width: 100 },
         { title: '出厂编号', key: 'factoryNumber' },
         { title: '检测类型', key: 'type', width: 100 },
@@ -239,6 +240,23 @@ export default {
       const result = await meterSample.getCertificateReport(data.id)
       if (result) {
         this._viewReport(result)
+      } else {
+        this._itemRecordLook(data)
+      }
+    },
+    _itemRecordLook(data, name) {
+      if (
+        data.recordId === null ||
+        undefined === data.recordId ||
+        data.recordId === ''
+      ) {
+        this.$Message.warning('证书暂未编制！')
+      } else {
+        this.$refs.itemOriginalRecordLookModal._open(
+          data.recordId,
+          name,
+          data.id
+        )
       }
     },
     _viewReport(data) {

pages/meter-certificate/issue/MeterCertificateIssue.vue

@@ -265,6 +265,8 @@ export default {
       const result = await meterSample.getCertificateReport(data.id)
       if (result) {
         this._viewReport(result)
+      } else {
+        this._itemOriginalRecordLook(data, 'write')
       }
     },
     _viewReport(data) {

pages/meter-certificate/issue/MeterCertificateIssueHis.vue

@@ -251,6 +251,23 @@ export default {
       const result = await meterSample.getCertificateReport(data.id)
       if (result) {
         this._viewReport(result)
+      } else {
+        this._itemRecordLook(data, 'only')
+      }
+    },
+    _itemRecordLook(data, name) {
+      if (
+        data.recordId === null ||
+        undefined === data.recordId ||
+        data.recordId === ''
+      ) {
+        this.$Message.warning('证书暂未编制！')
+      } else {
+        this.$refs.itemOriginalRecordLookModal._open(
+          data.recordId,
+          name,
+          data.id
+        )
       }
     },
     _viewReport(data) {

pages/meter-certificate/make/MeterCertificateMake.vue

@@ -115,14 +115,14 @@ export default {
         }
       ],
       iconMsg: [
-        // {
-        //   type: 'ios-bookmarks',
-        //   id: '',
-        //   name: '编制证书'
-        // },
         {
           type: 'ios-bookmarks',
-          id: '',
+          id: 'meter-certificate-make-spread-js-make',
+          name: '编制证书'
+        },
+        {
+          type: 'ios-bookmarks',
+          id: 'meter-certificate-make-pageoffice-make',
           name: '在线编制证书'
         },
         {

pages/meter-certificate/print/MeterCertificatePrintIndex.vue

@@ -219,6 +219,8 @@ export default {
       const result = await meterSample.getCertificateReport(data.id)
       if (result) {
         this._viewReport(result)
+      } else {
+        this._itemOriginalRecordLook(data, 'only')
       }
     },
     _viewReport(data) {

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

@@ -133,14 +133,14 @@ export default {
         }
       ],
       iconMsg: [
-        // {
-        //   type: 'ios-bookmarks',
-        //   id: 'meter-out-personal-task-create-o',
-        //   name: '编制证书'
-        // },
         {
           type: 'ios-bookmarks',
-          id: '',
+          id: 'meter-out-personal-task-spread-js-create',
+          name: '编制证书'
+        },
+        {
+          type: 'ios-bookmarks',
+          id: 'meter-out-personal-task-create-o',
           name: '在线编制证书'
         },
         {
@@ -180,7 +180,7 @@ export default {
         { title: '样品名称', key: 'name', width: 120 },
         { title: '样品编号', key: 'code', width: 120 },
         { title: '证书是否编制', key: 'onlineReported', width: 120 },
-        { title: '证书编号', key: 'reportCode', width: 130 },
+        { title: '证书编号', key: 'reportCode', width: 150 },
         { title: '型号规格', key: 'spec', width: 120 },
         { title: '出厂编号', key: 'factoryNumber', width: 120 },
         { title: '检测类型', key: 'type', width: 100 },

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

@@ -158,7 +158,7 @@ export default {
         { title: '样品名称', key: 'name', width: 120 },
         { title: '样品编号', key: 'code', width: 120 },
         { title: '证书是否编制', key: 'onlineReported', width: 120 },
-        { title: '证书编号', key: 'reportCode', width: 130 },
+        { title: '证书编号', key: 'reportCode', width: 150 },
         { title: '型号规格', key: 'spec', width: 120 },
         { title: '出厂编号', key: 'factoryNumber', width: 120 },
         { title: '检测类型', key: 'type', width: 100 },
@@ -345,15 +345,24 @@ export default {
       }
     },
 
-    _makeCertificate(data) {
-      if (data.onlineReported === '否' || undefined === data.recordId) {
-        // console.log('click')
-        // this.$refs.SelectOriTempRecord._open(data.id, data)
-        this.$Message.warning('证书暂未编制！')
+    _makeCertificate: async function(data) {
+      const result = await meterSample.getCertificateReport(data.id)
+      if (result) {
+        this._viewReport(result)
       } else {
         this._itemOriginalRecordLook(data, 'only')
       }
     },
+    _viewReport(data) {
+      if (data) {
+        this.$openWindowModeless({
+          objectKey: data.objectKey,
+          idType: 10,
+          id: data.id,
+          isReport: 4
+        })
+      }
+    },
     _itemOriginalRecordLook(data, name) {
       if (
         data.recordId === null ||

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

@@ -122,14 +122,14 @@ export default {
         }
       ],
       iconMsg: [
-        // {
-        //   type: 'ios-bookmarks',
-        //   id: 'meter-sample-input-create',
-        //   name: '编制证书'
-        // },
         {
           type: 'ios-bookmarks',
-          id: '',
+          id: 'meter-sample-input-spread-js-create',
+          name: '编制证书'
+        },
+        {
+          type: 'ios-bookmarks',
+          id: 'meter-sample-input-create',
           name: '在线编制证书'
         },
         {

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

@@ -316,14 +316,24 @@ export default {
       })
     },
 
-    _makeCertificate(data) {
-      if (data.onlineReported === '否' || undefined === data.recordId) {
-        // this.$refs.SelectOriTempRecord._open(data.id, data)
-        this.$Message.warning('证书暂未编制！')
+    _makeCertificate: async function(data) {
+      const result = await meterSample.getCertificateReport(data.id)
+      if (result) {
+        this._viewReport(result)
       } else {
         this._itemOriginalRecordLook(data, 'only')
       }
     },
+    _viewReport(data) {
+      if (data) {
+        this.$openWindowModeless({
+          objectKey: data.objectKey,
+          idType: 10,
+          id: data.id,
+          isReport: 4
+        })
+      }
+    },
 
     _itemOriginalRecordLook(data, name) {
       if (