证书编制修改

api/meter/meter-sample.js

@@ -246,5 +246,14 @@ export default {
   pageSampleQuantityStatistics: data =>
     http
       .post('meter/v1/sample/page_sample_quantity_statistics', data)
+      .then(res => res),
+  makeCode: data =>
+    http
+      .post(
+        'meter/v1/sample/make_report_code?sampleId=' +
+          data.sampleId +
+          '&remark=' +
+          data.remark
+      )
       .then(res => res)
 }

pages/meter-certificate/CertificateMake.vue

@@ -73,6 +73,7 @@ export default {
     _open(sampleId, modelId, dataSource) {
       const client = undefined === dataSource.client ? '' : dataSource.client
       const name = undefined === dataSource.name ? '' : dataSource.name
+      const cc = undefined === dataSource.cc ? '' : dataSource.cc
       const spec = undefined === dataSource.spec ? '' : dataSource.spec
       const factoryNumber =
         undefined === dataSource.factoryNumber ? '' : dataSource.factoryNumber
@@ -96,6 +97,8 @@ export default {
         client +
         '&spec=' +
         spec +
+        '&cc=' +
+        cc +
         '&factoryNumber=' +
         factoryNumber +
         '&manufacturer=' +
@@ -116,6 +119,7 @@ export default {
         tempId: modelId,
         client: client,
         spec: spec,
+        cc: cc,
         name: name,
         factoryNumber: factoryNumber,
         manufacturer: manufacturer,

pages/meter-certificate/CertificateMakeLook.vue

 <template>
   <div>
-<!--    <Modal v-model="showDiagramModalSampleLook" title="检定（校准）证书" width="100%" class="footer-hidden iframeSampleLookThree">-->
-<!--      <div id="iframeSampleLookThree" style="text-align:center;align-content:center;width: 100%;height: 790px">-->
-<!--      </div>-->
-<!--      <div slot="footer">-->
-<!--      </div>-->
-<!--    </Modal>-->
+    <Modal v-model="showDiagramModalSampleLook" title="检定（校准）证书" width="100%" class="footer-hidden iframeSampleLookThree">
+      <div id="iframeSampleLookThree" style="text-align:center;align-content:center;width: 100%;height: 790px">
+      </div>
+      <div slot="footer">
+      </div>
+    </Modal>
     <div v-show="showDiagramModalSampleLook">
       <RecordIframe ref="iframeModal"></RecordIframe>
     </div>
@@ -79,12 +79,12 @@ export default {
         name !== 'only'
           ? 'http://record.patzn.com:7000/print/v1/eln/form_meter_' + formId
           : 'http://record.patzn.com:7000/print/v1/form/' + formId
-      // $('#iframeSampleLookThree').html(
-      //   '<iframe style="padding: 0px;width:100%;height:100%" frameborder="0" src=' +
-      //     encodeURI(url) +
-      //     '></iframe>'
-      // )
-      this.$refs.iframeModal._createIframe(url)
+      $('#iframeSampleLookThree').html(
+        '<iframe style="padding: 0px;width:100%;height:100%" frameborder="0" src=' +
+          encodeURI(url) +
+          '></iframe>'
+      )
+      // this.$refs.iframeModal._createIframe(url)
     }
   }
 }

pages/meter-certificate/make/MeterCertificateMake.vue

@@ -183,11 +183,12 @@ export default {
     },
     _certificateSelectBack(data) {
       if (data) {
-        this.$refs.itemOriginalRecordModal._open(
-          data.sampleId,
-          data.tempId,
-          data.dataSource
-        )
+        // this.$refs.itemOriginalRecordModal._open(
+        //   data.sampleId,
+        //   data.tempId,
+        //   data.dataSource
+        // )
+        this._makeCode(data)
       } else {
         const ids = this.selectIds
         if (ids.length === 0) {
@@ -197,6 +198,21 @@ export default {
         }
       }
     },
+    _makeCode: async function(data) {
+      const result = await meterSample.makeCode(data)
+      if (result) {
+        if (result === '' || result === undefined) {
+          this.$Message.warning('证书编号暂未生成！')
+          return false
+        }
+        data.dataSource.cc = result
+        this.$refs.itemOriginalRecordModal._open(
+          data.sampleId,
+          data.tempId,
+          data.dataSource
+        )
+      }
+    },
     _submitToReview() {
       this._submitByContractIds('委托评审')
     },

pages/meter-certificate/make/SelectOriTempRecord.vue

@@ -3,7 +3,7 @@
     <Modal v-model="showModal" v-drag width="1100">
       <p slot="header">选择原始记录模板</p>
       <div>
-        <TwoCard :gutter=16 @on-result-change="_refresh" left-name="原始记录模板类别" right-name="实验室原始记录模板名称" left-span="8">
+        <TwoCard :gutter=16 left-name="证书模板类别" right-name="证书模板名称" left-span="8" @on-result-change="_refresh">
           <template slot="left">
             <OriginalRecordClassTree ref="classTree" @on-result-change="_classData"></OriginalRecordClassTree>
           </template>
@@ -14,18 +14,18 @@
                 <Form :label-width="50" inline onsubmit="return false">
                   <label class="label-sign"></label>
                   <Form-item label="名称:">
-                    <Input v-model="formObj.title" @on-enter="_search" placeholder="请输入名称" style="width: 200px"
-                           clearable/>
+                    <Input v-model="formObj.title" placeholder="请输入名称" style="width: 200px" clearable
+                           @on-enter="_search"/>
                   </Form-item>
                   <Form-item class="search-btn">
-                    <Button @click="_search" type="primary">搜索</Button>
+                    <Button type="primary" @click="_search">搜索</Button>
                   </Form-item>
                 </Form>
               </Col>
               <!-- 表格 -->
               <Col span="24">
                 <PTVXETable ref="pageTable" :height="300"
-                            :get-page="getPage" :is-radio="true" @on-result-change="_tableResultChange" hide-checkbox>
+                            :get-page="getPage" :is-radio="true" hide-checkbox @on-result-change="_tableResultChange">
                   <vxe-table-column
                     v-for="(item,index) in pageColumns"
                     :key="index"
@@ -75,7 +75,10 @@ export default {
     return {
       showModal: false,
       getPage: {},
-      pageColumns: [{ title: '名称', key: 'title' }],
+      pageColumns: [
+        { title: '名称', key: 'title' },
+        { title: '项目代号', key: 'remark' }
+      ],
       formObj: {
         // id: '',
         title: ''

pages/meter-certificate/print/MeterCertificatePrint.vue

@@ -194,7 +194,7 @@ export default {
             this._upload(data.id)
             break
           case '查看证书':
-            this._itemOriginalRecordLook(data, 'write')
+            this._itemOriginalRecordLook(data, 'only')
             break
           case '删除':
             this._deleteByIds([data.id])

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

@@ -6,7 +6,7 @@
         <Row>
           <!--查询-->
           <Col span="24" style="margin-top: 10px">
-            <Form id="formId" v-show="searchOpen" :label-width="90" inline onsubmit="return false">
+            <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.name" name="name" placeholder="请输入样品名称" clearable @on-enter="_formSearch"/>
@@ -15,20 +15,20 @@
                 <Input v-model="formObj.code" name="aptitude" placeholder="请输入样品编号" clearable @on-enter="_formSearch"/>
               </Form-item>
               <Form-item class="search-btn">
-                <Button @click="_formSearch" type="primary">搜索</Button>
+                <Button type="primary" @click="_formSearch">搜索</Button>
               </Form-item>
             </Form>
           </Col>
           <!--操作-->
           <Col span="24">
 
-            <btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" @on-result-change="_btnClick"
-                     class="contHide"></btn-list>
+            <btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" class="contHide"
+                     @on-result-change="_btnClick"></btn-list>
           </Col>
           <!--表格-->
           <Col span="24">
             <PTVXETable ref="pageTable" :table-height="tableHeight" :form-id="formId" :loading="true"
-                        :get-page="getPage" :icon-msg="iconMsg" @on-result-change="_tableResultChange" select-data>
+                        :get-page="getPage" :icon-msg="iconMsg" select-data @on-result-change="_tableResultChange">
               <vxe-table-column
                 v-for="item in pageColumns"
                 :key="item.key"
@@ -169,6 +169,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: 'spec', width: 120 },
         { title: '出厂编号', key: 'factoryNumber', width: 120 },
         { title: '检测类型', key: 'type', width: 100 },
@@ -326,12 +327,9 @@ export default {
       })
     },
     _certificateSelectBack(data) {
+      console.log('_certificateSelectBack', data)
       if (data) {
-        this.$refs.itemOriginalRecordModal._open(
-          data.sampleId,
-          data.tempId,
-          data.dataSource
-        )
+        this._makeCode(data)
       } else {
         const ids = this.selectIds
         if (ids.length === 0) {
@@ -341,6 +339,23 @@ export default {
         }
       }
     },
+
+    _makeCode: async function(data) {
+      const result = await meterSample.makeCode(data)
+      if (result) {
+        if (result === '' || result === undefined) {
+          this.$Message.warning('证书编号暂未生成！')
+          return false
+        }
+        data.dataSource.cc = result
+        this.$refs.itemOriginalRecordModal._open(
+          data.sampleId,
+          data.tempId,
+          data.dataSource
+        )
+      }
+    },
+
     _makeCertificate(data) {
       if (data.onlineReported === '否' || undefined === data.recordId) {
         console.log('click')

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

@@ -3,7 +3,7 @@
     <Modal v-model="showModal" v-drag width="1100">
       <p slot="header">选择原始记录模板</p>
       <div>
-        <TwoCard :gutter=16 @on-result-change="_refresh" left-name="原始记录模板类别" right-name="实验室原始记录模板名称" left-span="8">
+        <TwoCard :gutter=16 left-name="证书模板类别" right-name="证书模板名称" left-span="8" @on-result-change="_refresh">
           <template slot="left">
             <OriginalRecordClassTree ref="classTree" @on-result-change="_classData"></OriginalRecordClassTree>
           </template>
@@ -14,18 +14,18 @@
                 <Form :label-width="50" inline onsubmit="return false">
                   <label class="label-sign"></label>
                   <Form-item label="名称:">
-                    <Input v-model="formObj.title" @on-enter="_search" placeholder="请输入名称" style="width: 200px"
-                           clearable/>
+                    <Input v-model="formObj.title" placeholder="请输入名称" style="width: 200px" clearable
+                           @on-enter="_search"/>
                   </Form-item>
                   <Form-item class="search-btn">
-                    <Button @click="_search" type="primary">搜索</Button>
+                    <Button type="primary" @click="_search">搜索</Button>
                   </Form-item>
                 </Form>
               </Col>
               <!-- 表格 -->
               <Col span="24">
                 <PTVXETable ref="pageTable" :height="300"
-                            :get-page="getPage" :is-radio="true" @on-result-change="_tableResultChange" hide-checkbox>
+                            :get-page="getPage" :is-radio="true" hide-checkbox @on-result-change="_tableResultChange">
                   <vxe-table-column
                     v-for="(item,index) in pageColumns"
                     :key="index"
@@ -74,7 +74,10 @@ export default {
     return {
       showModal: false,
       getPage: {},
-      pageColumns: [{ title: '名称', key: 'title' }],
+      pageColumns: [
+        { title: '名称', key: 'title' },
+        { title: '项目代号', key: 'remark' }
+      ],
       formObj: {
         // id: '',
         title: ''
@@ -180,6 +183,10 @@ export default {
         const param = {
           sampleId: this.sampleId,
           tempId: this.selectData[0].id,
+          remark:
+            undefined === this.selectData[0].remark
+              ? ''
+              : this.selectData[0].remark,
           dataSource: this.sampleData
         }
         console.log(param)

pages/meter-out/task-distribute/MeterOutTaskAlloca.vue

@@ -184,6 +184,7 @@ export default {
       if (result) {
         this.$Message.success('分配成功!')
         await this._page()
+        this.$emit('on-result-change')
       }
     },
     _changePeople() {

pages/meter-out/task-distribute/MeterOutTaskDistribute.vue

@@ -8,11 +8,11 @@
           <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.name" name="name" placeholder="请输入实验室名称" clearable @on-enter="_formSearch"/>
+              <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.aptitude" name="aptitude" placeholder="请输入资质" clearable @on-enter="_formSearch"/>
+              <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>
@@ -63,7 +63,7 @@ export default {
     return {
       currentComponent: '',
       formId: 'meterSubcontractorFormId',
-      searchOpen: false,
+      searchOpen: true,
       btn: [],
       iconMsg: [
         // {
@@ -84,8 +84,8 @@ export default {
         }
       ],
       formObj: {
-        name: undefined,
-        aptitude: undefined
+        client: undefined,
+        entrustCode: undefined
       },
       selectIds: [],
       getPage: {},

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

@@ -158,6 +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: 'spec', width: 115 },
         { title: '出厂编号', key: 'factoryNumber', width: 115 },
         { title: '制造厂商', key: 'manufacturer', width: 125 },
@@ -392,11 +393,12 @@ export default {
     },
     _certificateSelectBack(data) {
       if (data) {
-        this.$refs.itemOriginalRecordModal._open(
-          data.sampleId,
-          data.tempId,
-          data.dataSource
-        )
+        // this.$refs.itemOriginalRecordModal._open(
+        //   data.sampleId,
+        //   data.tempId,
+        //   data.dataSource
+        // )
+        this._makeCode(data)
       } else {
         const ids = this.selectIds
         if (ids.length === 0) {
@@ -407,6 +409,22 @@ export default {
       }
     },
 
+    _makeCode: async function(data) {
+      const result = await meterSample.makeCode(data)
+      if (result) {
+        if (result === '' || result === undefined) {
+          this.$Message.warning('证书编号暂未生成！')
+          return false
+        }
+        data.dataSource.cc = result
+        this.$refs.itemOriginalRecordModal._open(
+          data.sampleId,
+          data.tempId,
+          data.dataSource
+        )
+      }
+    },
+
     _formSearch() {
       this.$refs.pageTable._pageChange(1)
     },

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

@@ -2,7 +2,7 @@
   <div>
     <div class="layout-content-padding">
       <div class="layout-content-main">
-        <el-tabs v-model="activeName">
+        <el-tabs v-model="activeName" @tab-click="_changeTabs">
           <el-tab-pane label="待完成" name="wait">
             <MeterGoOutEntrust ref="waitTabs"></MeterGoOutEntrust>
           </el-tab-pane>
@@ -28,6 +28,22 @@ export default {
     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>

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

@@ -3,7 +3,7 @@
     <Modal v-model="showModal" v-drag width="1100">
       <p slot="header">选择原始记录模板</p>
       <div>
-        <TwoCard :gutter=16 @on-result-change="_refresh" left-name="原始记录模板类别" right-name="实验室原始记录模板名称" left-span="8">
+        <TwoCard :gutter=16 left-name="证书模板类别" right-name="证书模板名称" left-span="8" @on-result-change="_refresh">
           <template slot="left">
             <OriginalRecordClassTree ref="classTree" @on-result-change="_classData"></OriginalRecordClassTree>
           </template>
@@ -14,18 +14,18 @@
                 <Form :label-width="50" inline onsubmit="return false">
                   <label class="label-sign"></label>
                   <Form-item label="名称:">
-                    <Input v-model="formObj.title" @on-enter="_search" placeholder="请输入名称" style="width: 200px"
-                           clearable/>
+                    <Input v-model="formObj.title" placeholder="请输入名称" style="width: 200px" clearable
+                           @on-enter="_search"/>
                   </Form-item>
                   <Form-item class="search-btn">
-                    <Button @click="_search" type="primary">搜索</Button>
+                    <Button type="primary" @click="_search">搜索</Button>
                   </Form-item>
                 </Form>
               </Col>
               <!-- 表格 -->
               <Col span="24">
                 <PTVXETable ref="pageTable" :height="300"
-                            :get-page="getPage" :is-radio="true" @on-result-change="_tableResultChange" hide-checkbox>
+                            :get-page="getPage" :is-radio="true" hide-checkbox @on-result-change="_tableResultChange">
                   <vxe-table-column
                     v-for="(item,index) in pageColumns"
                     :key="index"
@@ -74,7 +74,10 @@ export default {
       count: 0,
       showModal: false,
       getPage: {},
-      pageColumns: [{ title: '名称', key: 'title' }],
+      pageColumns: [
+        { title: '名称', key: 'title' },
+        { title: '项目代号', key: 'remark' }
+      ],
       formObj: {
         // id: '',
         title: ''