修改了证书管理证书打印

pages/meter-certificate/print/MeterCertificatePrintHis.vue

@@ -220,6 +220,7 @@ export default {
         })
       }
     },
+    _resultRecord() {},
     _record(id) {
       this.$refs.operationModal._open(id)
     },

pages/meter-certificate/print/MeterCertificatePrintIndex.vue

@@ -80,6 +80,11 @@ export default {
           type: 'success',
           id: '',
           name: '打印'
+        },
+        {
+          type: 'success',
+          id: '',
+          name: '打印完成'
         }
       ],
       iconMsg: [
@@ -145,6 +150,9 @@ export default {
           case '打印':
             this._printExcel()
             break
+          case '打印完成':
+            this._printOverExcel()
+            break
           case '退回':
             this._goBack()
             break
@@ -165,6 +173,15 @@ export default {
         this.$pageofficePrint({ ids: ids, type: 'xlsx' })
       }
     },
+    _printOverExcel() {
+      const ids = this.selectIds
+      if (ids.length === 0) {
+        this.$Message.warning('请至少选择一条数据！')
+      } else {
+        console.log(ids)
+        // this.$pageofficePrint({ ids: ids, type: 'xlsx' })
+      }
+    },
 
     _submitEnd: async function(data) {
       const result = await meterSample.endReport(data)
@@ -321,6 +338,7 @@ export default {
         )
       }
     },
+    _resultRecord() {},
     _getById: async function(id) {
       const result = await meterSample.getById(id)
       if (result) {

pages/meter-certificate/print/MeterCertificatePrintIndexHis.vue

+<template>
+  <div>
+    <!--内容-->
+    <div class="layout-content-padding">
+      <div class="layout-content-main">
+        <Row>
+          <!--查询-->
+          <Col span="24" style="margin-top: 10px">
+            <Form v-show="searchOpen" id="formId" :label-width="90" inline onsubmit="return false">
+              <label class="label-sign"></label>
+              <Form-item class="search-item" label="委托单位:">
+                <Input v-model="formObj.client" name="client" placeholder="请输入委托单位" clearable @on-enter="_formSearch"/>
+              </Form-item>
+              <Form-item class="search-item" label="委托编号:">
+                <Input v-model="formObj.entrustCode" name="entrustCode" placeholder="请输入委托编号" clearable @on-enter="_formSearch"/>
+              </Form-item>
+              <Form-item class="search-btn">
+                <Button type="primary" @click="_formSearch">搜索</Button>
+              </Form-item>
+            </Form>
+          </Col>
+          <!--操作-->
+          <Col span="24">
+
+            <btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" class="contHide"
+                      @on-result-change="_btnClick" style="height: 30px;"></btn-list>
+          </Col>
+          <!--表格-->
+          <Col span="24">
+            <PTVXETable ref="pageTable" :table-height="tableHeight" :form-id="formId" :loading="true"
+                        :get-page="getPage" :icon-msg="iconMsg" 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" sortable>
+                <template slot-scope="scope">
+                  <span v-if="item.key==='type'">
+                      <span v-if="scope.row[item.key]===0">
+                          检定
+                      </span>
+                      <span v-else-if="scope.row[item.key]===1">
+                          校准
+                      </span>
+                       <span v-else-if="scope.row[item.key]===2">
+                          外观检查
+                      </span>
+                  </span>
+                  <span v-else>{{scope.row[item.key]}}</span>
+                </template>
+              </vxe-table-column>
+            </PTVXETable>
+          </Col>
+        </Row>
+      </div>
+    </div>
+    <operationModal ref="operationModal"></operationModal>
+    <FileManage ref="FileManage"></FileManage>
+
+    <!--编辑证书-->
+    <CertificateMakeLook ref="itemOriginalRecordLookModal" @on-result-change="_resultRecord"></CertificateMakeLook>
+  </div>
+
+</template>
+<script>
+import { meterSample } from '../../../api'
+import operationModal from '../../../components/operation/Operation'
+import CertificateMakeLook from '../../meter-certificate/CertificateMakeLook'
+export default {
+  components: { operationModal, CertificateMakeLook },
+  data() {
+    return {
+      currentComponent: '',
+      formId: 'meterCertificatePrintIndexFormId',
+      searchOpen: true,
+      btn: [
+        // {
+        //   type: 'success',
+        //   id: '',
+        //   name: '打印'
+        // }
+      ],
+      iconMsg: [
+        // {
+        //   type: 'ios-book',
+        //   id: '',
+        //   name: '查看证书'
+        // },
+        {
+          type: 'ios-book',
+          id: '',
+          name: '在线查看证书'
+        },
+        { type: 'md-cloud', id: '', name: '附件' }
+      ],
+      formObj: {
+        client: undefined,
+        entrustCode: undefined
+      },
+      selectIds: [],
+      selectData: [],
+      getPage: {},
+      pageColumns: [
+        { title: '样品名称', key: 'name', width: 120 },
+        { title: '样品编号', key: 'code', width: 120 },
+        { title: '证书编号', key: 'reportCode', width: 145 },
+        { title: '型号规格', key: 'spec', width: 100 },
+        { title: '出厂编号', key: 'factoryNumber' },
+        { title: '检测类型', key: 'type', width: 100 },
+        { title: '委托单位', key: 'client', width: 200 },
+        { title: '委托编号', key: 'entrustCode', width: 130 },
+        { title: '联系人', key: 'person', width: 120 },
+        { title: '联系电话', key: 'tel', width: 120 },
+        { title: '详细地址', key: 'address', width: 250 },
+        { title: '数量', key: 'quantity' },
+        { title: '备注', key: 'remark' }
+      ]
+    }
+  },
+  computed: {
+    tableHeight: function() {
+      if (this.searchOpen) {
+        return this.$tableHeight('search')
+      } else {
+        return this.$tableHeight('noSearch')
+      }
+    }
+  },
+  mounted() {
+    this._page()
+  },
+  methods: {
+    _btnClick(msg, componentName) {
+      this.currentComponent = componentName
+      this.$nextTick(function() {
+        switch (msg) {
+          case '生成':
+            this._create()
+            break
+          case '添加':
+            this._editModal(false)
+            break
+          case '打印':
+            this._printExcel()
+            break
+          case '退回':
+            this._goBack()
+            break
+          case 'search':
+            this.searchOpen = !this.searchOpen
+            break
+        }
+      })
+    },
+    _submitToReview() {
+      this._submitByContractIds()
+    },
+    _printExcel() {
+      const ids = this.selectIds
+      if (ids.length === 0) {
+        this.$Message.warning('请至少选择一条数据！')
+      } else {
+        this.$pageofficePrint({ ids: ids, type: 'xlsx' })
+      }
+    },
+
+    _submitEnd: async function(data) {
+      const result = await meterSample.endReport(data)
+      if (result) {
+        this.$Message.success('提交成功！')
+        await this._page()
+      }
+    },
+
+    _create() {
+      const selectData = JSON.parse(JSON.stringify(this.selectData))
+      console.log(selectData)
+      if (this.selectIds.length === 0) {
+        this.$Message.warning('请至少选择一条数据！')
+      } else {
+        this.$refs.CreateReport._open(this.selectData)
+      }
+    },
+    _iconClick(res, data, componentName) {
+      this.currentComponent = componentName
+      this.$nextTick(function() {
+        switch (res) {
+          case '预览':
+            // this._editModal(true, data.id)
+            this._personModal(data)
+            break
+          case '附件':
+            this._upload(data.id)
+            break
+          case '查看证书':
+            this._itemOriginalRecordLook(data, 'only')
+            break
+          case '在线查看证书':
+            this._reportMakeLook(data)
+            break
+          case '删除':
+            this._deleteByIds([data.id])
+            break
+          case '操作日志':
+            this._record(data.id)
+            break
+        }
+      })
+    },
+    _reportMakeLook: 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: 5
+        })
+      }
+    },
+    _personModal(data) {
+      this._previewEdit(data.id)
+    },
+    // 预览编辑
+    async _previewEdit(id) {
+      const result = await meterSample.reportPreview(id)
+      if (result) {
+        this.$openWindowModeless({
+          objectKey: result.objectKey,
+          id: id,
+          isReport: 0
+        })
+      }
+    },
+    _record(id) {
+      this.$refs.operationModal._open(id)
+    },
+    _tableResultChange(msg, data) {
+      switch (msg) {
+        case 'iconClick':
+          this._iconClick(data.name, data.rowData, data.componentName)
+          console.log('操作按钮点击后的值', data)
+          break
+        // case 'selectIds':
+        //   this.selectIds = data
+        //   console.log('操作按钮点击后的值', data)
+        //   break
+        case 'selectData':
+          this.selectData = data
+          this.selectIds = []
+          for (let i = 0; i < data.length; i++) {
+            this.selectIds.push(data[i].id)
+          }
+          break
+        case 'changeSize':
+          this._page()
+          break
+      }
+    },
+    _page: async function() {
+      Object.assign(this.formObj, this.$refs.pageTable._searchParams())
+      const result = await meterSample.pageCertificatePrint(this.formObj)
+      if (result) {
+        this.$refs.pageTable._hideLoading()
+        this.getPage = result
+      }
+    },
+    _formSearch() {
+      this.$refs.pageTable._pageChange(1)
+    },
+    // 删除
+    _deleteByIds(ids, content) {
+      this.$Modal.confirm({
+        title: '提示',
+        content: content || '确定删除该记录？',
+        onOk: () => {
+          this._delete(ids)
+        }
+      })
+    },
+    // 编辑&添加
+    _editModal(edit, id) {
+      if (edit) {
+        // 编辑
+        this._getById(id)
+      } else {
+        // 添加
+        this.$refs.editSubcontractorModal._open()
+      }
+    },
+    // 追加项目
+    _itemModal(data) {
+      this.$refs.refModal._open(data)
+    },
+
+    _upload(id) {
+      // 上传文件
+      this.$refs.FileManage._open(id, 'subcontractorId')
+    },
+    _itemOriginalRecordLook(data, name) {
+      if (
+        data.recordId === null ||
+        undefined === data.recordId ||
+        data.recordId === ''
+      ) {
+        this.$Message.warning('证书暂未编制！')
+      } else {
+        this.$refs.itemOriginalRecordLookModal._open(
+          data.recordId,
+          name,
+          data.id
+        )
+      }
+    },
+    _resultRecord() {},
+    _getById: async function(id) {
+      const result = await meterSample.getById(id)
+      if (result) {
+        this.$refs.editSubcontractorModal._openEdit(result)
+      }
+    },
+    _delete: async function(ids) {
+      const result = await meterSample.deleteById(ids)
+      if (result) {
+        this._formSearch()
+        this.$Message.success('删除成功！')
+      }
+    }
+  }
+}
+</script>

pages/meter-certificate/print/MeterCertificatePrintTabIndex.vue

+<template>
+  <div>
+    <div class="layout-content-padding">
+      <div class="layout-content-main">
+        <el-tabs v-model="activeName" @tab-click="_changeTabs">
+          <el-tab-pane label="待完成" name="wait">
+            <MeterGoOutEntrust ref="waitTabs"></MeterGoOutEntrust>
+          </el-tab-pane>
+          <el-tab-pane label="历史记录" name="his">
+            <MeterGoOutEntrustHis ref="hisTabs"></MeterGoOutEntrustHis>
+          </el-tab-pane>
+        </el-tabs>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import MeterGoOutEntrust from './MeterCertificatePrintIndex'
+import MeterGoOutEntrustHis from './MeterCertificatePrintIndexHis'
+export default {
+  name: 'MeterGoOutEntrustIndex',
+  components: {
+    MeterGoOutEntrust,
+    MeterGoOutEntrustHis
+  },
+  data() {
+    return {
+      activeName: 'wait'
+    }
+  },
+  mounted() {
+    this.activeName = 'wait'
+    this._page()
+  },
+  methods: {
+    _changeTabs(tab, event) {
+      if (tab.name === 'wait') {
+        this._page()
+      } else {
+        this.$refs.hisTabs._page()
+      }
+    },
+    _page() {
+      this.$refs.waitTabs._page()
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>

router/meter-routes.js

@@ -39,7 +39,7 @@ import MeterEntrustProgress from '../pages/meter-progress/progress-entrust/Meter
 import MeterClientOnlineEntrustIndex from '../pages/meter-entrust/client-online/MeterClientOnlineEntrustIndex'
 import MeterMeterWarehouseInIndex from '../pages/meter-warehouse/warehouse-in/MeterMeterWarehouseInIndex'
 import MeterMeterWarehouseOutIndex from '../pages/meter-warehouse/warehouse-out/MeterMeterWarehouseOutIndex'
-import MeterCertificatePrintIndex from '../pages/meter-certificate/print/MeterCertificatePrintIndex'
+import MeterCertificatePrintIndex from '../pages/meter-certificate/print/MeterCertificatePrintTabIndex'
 import MeterCannotSubIndex from '../pages/meter-subcontract/cannot-sub/MeterCannotSubIndex'
 import MeterPersonalTask from '../pages/meter-statistics/personal-task/MeterPersonalTask'
 import MeterAnnualEntrust from '../pages/meter-statistics/annual-entrust/MeterAnnualEntrust'