修改了送检管理证书编制

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

@@ -6,24 +6,24 @@
         <Row>
           <!--查询-->
           <Col span="24" style="margin-top: 10px">
-            <Form v-show="searchOpen" id="formId" :label-width="90" inline onsubmit="return false">
+            <Form id="formId" v-show="searchOpen" :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"/>
+                <Input v-model="formObj.name" @on-enter="_formSearch" name="name" placeholder="请输入样品名称" clearable/>
               </Form-item>
               <Form-item class="search-item" label="样品编号:">
-                <Input v-model="formObj.code" name="aptitude" placeholder="请输入样品编号" clearable @on-enter="_formSearch"/>
+                <Input v-model="formObj.code" @on-enter="_formSearch" name="aptitude" placeholder="请输入样品编号" clearable/>
               </Form-item>
               <Form-item class="search-btn">
-                <Button type="primary" @click="_formSearch">搜索</Button>
+                <Button @click="_formSearch" type="primary">搜索</Button>
               </Form-item>
             </Form>
           </Col>
           <!--操作-->
           <Col span="24">
 
-            <btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" class="contHide"
-                     @on-result-change="_btnClick"></btn-list>
+            <btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" @on-result-change="_btnClick"
+                     class="contHide"></btn-list>
           </Col>
           <!--表格-->
           <Col span="24">
@@ -63,10 +63,9 @@
     <MeterPersonItemTaskManage ref="personModal"></MeterPersonItemTaskManage>
     <MeterSubcontractorEdit ref="editSubcontractorModal" @on-result-change="_page"></MeterSubcontractorEdit>
     <SelectOriTempRecord ref="SelectOriTempRecord" @on-result-change="_certificateSelectBack"></SelectOriTempRecord>
-
+    <RecordIframe ref="iframeModal" @on-result-change="_resultRecord"></RecordIframe>
     <!--自定义编制证书-->
     <CertificateMake ref="itemOriginalRecordModal" @on-result-change="_resultRecord"></CertificateMake>
-
     <!--编辑证书-->
     <CertificateMakeLook ref="itemOriginalRecordLookModal" @on-result-change="_resultRecord"></CertificateMakeLook>
 
@@ -82,8 +81,10 @@ import CarManage from './CarManage'
 import MeterPersonItemTaskManage from './MeterPersonItemTaskManage'
 import InstruMentEdit from './InstrumentEdit'
 import SelectOriTempRecord from './SelectOriTempRecord'
+import RecordIframe from './RecordIframe'
 export default {
   components: {
+    RecordIframe,
     SelectOriTempRecord,
     MeterSubcontractorEdit,
     CertificateMake,
@@ -185,8 +186,33 @@ export default {
   },
   mounted() {
     this._page()
+    window.addEventListener('message', this._saveOriginal)
   },
   methods: {
+    async _saveOriginal(data) {
+      console.log('data11111', data)
+      console.log('formId', this.formId)
+      console.log('sampleId: [],', this.sampleId)
+      console.log('data.data.msg,', data.data.msg)
+      if (this.again) {
+        this.again = false
+        if (
+          undefined !== this.formId &&
+          this.formId !== '' &&
+          this.sampleId !== undefined
+        ) {
+          await meterSample.certificateEdit({
+            sampleId: this.sampleId,
+            formId: this.formId
+          })
+        }
+        if (data.data.msg === true) {
+          this.$refs.iframeModal._closeIframe()
+        } else {
+          this.$refs.iframeModal._closeIframe()
+        }
+      }
+    },
     _btnClick(msg, componentName) {
       this.currentComponent = componentName
       this.$nextTick(function() {
@@ -328,13 +354,28 @@ export default {
       ) {
         this.$Message.warning('该检测项目暂无原始记录！')
       } else {
-        this.$refs.itemOriginalRecordLookModal._open(
-          data.recordId,
-          name,
-          data.id
-        )
+        // this.$refs.itemOriginalRecordLookModal._open(
+        //   data.recordId,
+        //   name,
+        //   data.id
+        // )
+        this._iframeModal(data, name)
       }
     },
+    _iframeModal(data, name) {
+      this.again = true
+      this.formId = data.recordId
+      this.showDiagramModalSampleLook = true
+      this.sampleId = data.id
+      this.name = name
+      let url = ''
+      url =
+        name !== 'only'
+          ? 'http://record.patzn.com:7000/print/v1/eln/form_meter_' +
+            data.recordId
+          : 'http://record.patzn.com:7000/print/v1/form/' + data.recordId
+      this.$refs.iframeModal._createIframe(url)
+    },
     _personModal(data) {
       console.log(data)
       this.$refs.personModal._open(data.id)

plugins/iframe.js

@@ -24,7 +24,6 @@ const Iframe = {
     // document.body.appendChild(div);
 
     const modalId = 'modal-' + new Date().getTime()
-
     // 首先创建框架的 div 等视觉元素
     const modalDiv = document.createElement('div')
     // 创建loading div
@@ -58,7 +57,7 @@ const Iframe = {
     // 放入 document 中
     document.body.appendChild(modalDiv)
 
-    $(modalDiv).draggable()
+    // $(modalDiv).draggable()
 
     // modalDiv 创建标题栏
     const modalHeaderDiv = document.createElement('div')
@@ -68,7 +67,7 @@ const Iframe = {
     const modalTitleDiv = document.createElement('div')
     modalTitleDiv.className = 'record-modal-title'
     modalHeaderDiv.appendChild(modalTitleDiv)
-    modalTitleDiv.innerText = '原始记录添加'
+    modalTitleDiv.innerText = '检定（校准）证书编制'
 
     // 标题栏中有按钮
     const modalBtnDiv = document.createElement('div')
@@ -85,9 +84,9 @@ const Iframe = {
     // — □ x
     minBtn.className = 'record-modal-min'
     minBtn.title = '最小化'
-    // minBtn.innerText = '—';
+    minBtn.innerText = '—'
     modalBtnDiv.appendChild(minBtn)
-    minIcon.className = 'ivu-icon ivu-icon-ios-minus-empty'
+    // minIcon.className = 'ivu-icon ios-bookmarks'
     minBtn.appendChild(minIcon)
 
     maxBtn.className = 'record-modal-max'
@@ -99,8 +98,8 @@ const Iframe = {
 
     closeBtn.className = 'record-modal-close'
     closeBtn.title = '关闭'
-    // closeBtn.innerText = '×';
-    colseIcon.className = 'ivu-icon ivu-icon-ios-close-empty'
+    closeBtn.innerText = '×'
+    // colseIcon.className = 'ivu-icon ivu-icon-ios-close-empty'
     closeBtn.appendChild(colseIcon)
 
     closeBtn.addEventListener('click', function closeBtnClickFunc() {
@@ -139,7 +138,7 @@ const Iframe = {
     formElement.action = url
     formElement.target = name
     // 表单的方法提交
-    formElement.method = 'post'
+    formElement.method = 'GET'
     formElement.style.display = 'none'
     contentDiv.appendChild(formElement)
 
@@ -211,7 +210,7 @@ const Iframe = {
         'line-height': '30px',
         'padding-left': '5px'
       })
-      $(littleTitleDiv).text('原始记录添加')
+      $(littleTitleDiv).text('检定（校准）证书编制')
       littleModal.appendChild(littleTitleDiv)
 
       // 存放按钮的 div
@@ -260,7 +259,7 @@ const Iframe = {
     $(iframeElement).bind('load', function() {
       $(loadingDiv).css('display', 'none')
       $(modalDiv).css('display', 'block')
-      $(modalTitleDiv).text('原始记录添加')
+      $(modalTitleDiv).text('检定（校准）证书编制')
       $(iframeElement).css('display', 'block')
     })
     window.onresize = function() {