优化修改

api/meter/meter-sample.js

@@ -158,7 +158,15 @@ export default {
     https
       .post('meter/v1/sample/report_generate', JSON.stringify(data))
       .then(res => res),
-
+  generateExcelReport: data =>
+    http
+      .post(
+        'meter/v1/sample/excel_report_generate?sampleId=' +
+          data.sampleId +
+          '&templateId=' +
+          data.id
+      )
+      .then(res => res),
   subpackageInfoReg: data =>
     http
       .post('meter/v1/sample/subpackage_info_reg?ids=' + data.ids, data.reg)
@@ -309,5 +317,7 @@ export default {
           '&remark=' +
           data.remark
       )
-      .then(res => res)
+      .then(res => res),
+  getCertificateReport: data =>
+    http.post('meter/v1/sample/get_certificate_report?sampleId=' + data)
 }

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

@@ -336,10 +336,17 @@ export default {
     },
 
     _makeCertificateExcel(data) {
-      if (data.onlineReported === '否' || undefined === data.recordId) {
+      if (data.onlineReported === '否') {
         this.$refs.SelectOriTempRecordExcel._open(data.id, data)
       } else {
-        this._itemOriginalRecordLook(data, 'write')
+        this._reportMakeLook(data)
+      }
+    },
+
+    _reportMakeLook: async function(data) {
+      const result = await meterSample.getCertificateReport(data.id)
+      if (result) {
+        this._viewReport(result)
       }
     },
 
@@ -432,6 +439,17 @@ export default {
         }
       }
     },
+    _viewReport(data) {
+      if (data) {
+        alert(data.objectKey)
+        this.$openWindowModeless({
+          objectKey: data.objectKey,
+          idType: 10,
+          id: data.id,
+          isReport: 4
+        })
+      }
+    },
     _certificateSelectExcelBack(data) {
       if (data) {
         // this.$refs.itemOriginalRecordModal._open(
@@ -439,8 +457,9 @@ export default {
         //   data.tempId,
         //   data.dataSource
         // )
-        console.log('_certificateSelectBack--', data)
+        // console.log('_certificateSelectBack--', data)
         this._makeCodeExcel(data)
+        // this._viewReport(data)
       } else {
         const ids = this.selectIds
         if (ids.length === 0) {
@@ -468,18 +487,15 @@ export default {
     },
 
     _makeCodeExcel: async function(data) {
-      const result = await meterSample.makeExcelReport(data)
+      const result = await meterSample.generateExcelReport(data)
       if (result) {
-        if (result === '' || result === undefined) {
-          this.$Message.warning('证书编号暂未生成！')
+        if (result === null || result === undefined) {
+          this.$Message.warning('证书编制失败，请联系管理员！')
           return false
+        } else {
+          this.$emit('on-result-change')
+          this._viewReport(result)
         }
-        data.dataSource.cc = result
-        this.$refs.itemOriginalRecordModal._open(
-          data.sampleId,
-          data.tempId,
-          data.dataSource
-        )
       }
     },
 

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

@@ -38,8 +38,8 @@
             :icon-msg="iconMsg"
             :is-radio="true"
             select-data="true"
-            @on-result-change="_tableResultChange"
-            hide-checkbox>
+            hide-checkbox
+            @on-result-change="_tableResultChange">
             <vxe-table-column
               v-for="item in pageColumns"
               :key="item.key"
@@ -98,16 +98,16 @@ export default {
         { title: '类别', key: 'classType', width: 140 },
         { title: '备注', key: 'remark' }
       ],
-      catalogueId: '',
+      sampleId: '',
       getPage: {},
       selectData: []
     }
   },
   methods: {
-    _open(aptitudeId) {
+    _open(sampleId) {
       this.formObj = this.$resetFields(this.formObj)
       this.showModal = true
-      this.formObj.aptitudeId = aptitudeId
+      this.sampleId = sampleId
       this._page()
     },
     _page: async function() {
@@ -135,17 +135,10 @@ export default {
         // this._hideLoading()
         this.$refs.pageTable._hideLoading()
       } else {
-        // 校验多样品多项目原始记录模板
-        // const param = {
-        //   sampleId: this.sampleId,
-        //   tempId: this.selectData[0].id,
-        //   remark: this.selectData[0].remark,
-        //   dataSource: this.sampleData
-        // }
-        // console.log(param)
-        // this.$emit('on-result-change', param)
-        console.log('单选选中的值', this.selectData)
-        // this.showModal = false
+        const data = this.selectData[0]
+        data.sampleId = this.sampleId
+        this.$emit('on-result-change', data)
+        this.showModal = false
       }
     },
     _cancel() {

plugins/common.js

@@ -839,7 +839,9 @@ Vue.prototype.$openWindowModeless = function(data) {
     '&companyId=' +
     global.getUserInfo().companyId +
     '&userName=' +
-    realname
+    realname +
+    '&idType=' +
+    data.idType
   // eslint-disable-next-line no-undef
   return POBrowser.openWindowModeless(uri, 'width=1200px;height=800px;')
 }