优化修改

api/meter/meter-sample.js

@@ -9,7 +9,7 @@ export default {
   // page
   page: data => http.post('meter/v1/sample/page', data).then(res => res),
   pageTemplate: data =>
-    http.post('base/v1/file_template/page', data).then(res => res),
+    http.post('meter/v1/file_template/page', data).then(res => res),
   templateList: data =>
     http.post('base/v1/file_template_classify/list', data).then(res => res),
   pageSubSample: data =>

pages/meter-certificate/template/MeterReportTemplateEdit.vue

@@ -10,17 +10,17 @@
       </div>
       <div>
         <Form id="edit-form" ref="formObj" :model="formObj" :rules="ruleValidate" :label-width="80">
-          <Form-item label="类别" prop="pname">
-            <Input v-model="pname" @click.native="_selectZtree" placeholder="请选择类别" icon="plus-circled"
-                   readonly></Input>
+          <Form-item label="类别" prop="classType">
+            <Input v-model="formObj.classType" name="classType" placeholder="请选择类别" icon="plus-circled" @on-keyup="_onKeyUp"
+                   ></Input>
           </Form-item>
           <Form-item label="别名" prop="alias">
-            <Input v-model="formObj.alias" @on-keyup="_onKeyUp" name="alias" placeholder="请输入别名"></Input>
+            <Input v-model="formObj.alias" name="alias" placeholder="请输入别名" @on-keyup="_onKeyUp"></Input>
           </Form-item>
         </Form>
       </div>
       <div slot="footer" class="btn-width clearfix">
-        <Button @click="_cancel" type="" style="margin-left: 8px;">取消</Button>
+        <Button type="" style="margin-left: 8px;" @click="_cancel">取消</Button>
         <label style="margin-bottom: 0;float: right">
           <Upload
             :action="action"
@@ -51,6 +51,7 @@ import global from '../../../api/config'
 
 const defVal = {
   alias: '',
+  classType: '',
   classifyId: 0
 }
 
@@ -62,7 +63,9 @@ export default {
       formObj: defVal,
       ruleValidate: {
         alias: [{ required: true, message: '别名不能为空', trigger: 'blur' }],
-        pname: [{ required: true, message: '类别不能为空', trigger: 'blur' }]
+        classType: [
+          { required: true, message: '类别不能为空', trigger: 'blur' }
+        ]
       },
       showEditModal: false,
       dataObj: {
@@ -77,16 +80,16 @@ export default {
   },
   methods: {
     _onKeyUp() {
-      if (this.formObj.alias === '' || this.pname === '') {
+      if (this.formObj.alias === '' || this.formObj.classType === '') {
         this.isDisable = true
       } else {
         this.isDisable = false
         this.action =
           global.baseURL +
-          '/base/v1/file_template/?alias=' +
-          this.formObj.alias +
-          '&classifyId=' +
-          this.formObj.classifyId
+          '/meter/v1/file_template/upload_template/?classType=' +
+          this.formObj.classType +
+          '&alias=' +
+          this.formObj.alias
       }
     },
     _selectZtree() {

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

@@ -63,6 +63,7 @@
     <MeterPersonItemTaskManage ref="personModal"></MeterPersonItemTaskManage>
     <MeterSubcontractorEdit ref="editSubcontractorModal" @on-result-change="_page"></MeterSubcontractorEdit>
     <SelectOriTempRecord ref="SelectOriTempRecord" @on-result-change="_certificateSelectBack"></SelectOriTempRecord>
+    <SelectOriTempRecordExcel ref="SelectOriTempRecordExcel" @on-result-change="_certificateSelectExcelBack"></SelectOriTempRecordExcel>
     <!--自定义编制证书-->
     <CertificateMake ref="itemOriginalRecordModal" @on-result-change="_resultRecord"></CertificateMake>
     <!--编辑证书-->
@@ -80,9 +81,11 @@ import CarManage from './CarManage'
 import MeterPersonItemTaskManage from './MeterPersonItemTaskManage'
 import InstruMentEdit from './InstrumentEdit'
 import SelectOriTempRecord from './SelectOriTempRecord'
+import SelectOriTempRecordExcel from './SelectOriTempRecordExcel'
 export default {
   components: {
     SelectOriTempRecord,
+    SelectOriTempRecordExcel,
     MeterSubcontractorEdit,
     CertificateMake,
     CertificateMakeLook,
@@ -125,6 +128,11 @@ export default {
           name: '编制证书'
         },
         {
+          type: 'ios-bookmarks',
+          id: '',
+          name: '在线编制证书'
+        },
+        {
           type: 'md-create',
           id: 'meter-sample-input-edit',
           name: '编辑'
@@ -290,6 +298,9 @@ export default {
           case '编制证书':
             this._makeCertificate(data)
             break
+          case '在线编制证书':
+            this._makeCertificateExcel(data)
+            break
           case '仪器领用':
             this.$refs.InstruEdit._open()
             break
@@ -324,6 +335,14 @@ export default {
       }
     },
 
+    _makeCertificateExcel(data) {
+      if (data.onlineReported === '否' || undefined === data.recordId) {
+        this.$refs.SelectOriTempRecordExcel._open(data.id, data)
+      } else {
+        this._itemOriginalRecordLook(data, 'write')
+      }
+    },
+
     _itemOriginalRecordLook(data, name) {
       if (
         data.recordId === null ||
@@ -413,6 +432,24 @@ export default {
         }
       }
     },
+    _certificateSelectExcelBack(data) {
+      if (data) {
+        // this.$refs.itemOriginalRecordModal._open(
+        //   data.sampleId,
+        //   data.tempId,
+        //   data.dataSource
+        // )
+        console.log('_certificateSelectBack--', data)
+        this._makeCodeExcel(data)
+      } else {
+        const ids = this.selectIds
+        if (ids.length === 0) {
+          this.$Message.warning('请至少选择一条数据!')
+        } else {
+          // this._appendOriginalRecord()
+        }
+      }
+    },
 
     _makeCode: async function(data) {
       const result = await meterSample.makeCode(data)
@@ -430,6 +467,22 @@ export default {
       }
     },
 
+    _makeCodeExcel: async function(data) {
+      const result = await meterSample.makeExcelReport(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/SelectOriTempRecordExcel.vue

+<!--检测项目编辑列表（添加、导入检测项目）-->
+<template>
+  <div>
+    <Modal
+      v-model="showModal"
+      v-drag
+      :mask-closable="false"
+      :width="800"
+      title="证书模板选择"
+
+    >
+      <Row>
+        <Col span="24" />
+        <Form v-model="formObj" :label-width="90" inline onsubmit="return false">
+          <Form-item class="search-item" label="证书模板名称:">
+            <Input v-model="formObj.code" placeholder="请输入证书模板名称" clearable @on-enter="_formSearch" />
+          </Form-item>
+          <Form-item class="search-item" label="类别:">
+            <Input v-model="formObj.standardName" 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" />
+        </Col>
+        <!-- 表格 -->
+        <Col span="24">
+          <PTVXETable
+            ref="pageTable"
+            :form-id="formId"
+            :table-height="500"
+            :get-page="getPage"
+            :icon-msg="iconMsg"
+            @on-result-change="_tableResultChange">
+            <vxe-table-column
+              v-for="item in pageColumns"
+              :key="item.key"
+              :field="item.key"
+              :title="item.title"
+              :width="item.width"
+              :min-width="200"
+              :fixed="item.fixed?item.fixed:undefined"
+              sortable
+            >
+              <template slot-scope="scope">
+                <span v-if="item.dateTime">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd HH:MM:ss'):''}}</span>
+                <span v-else-if="item.judged">{{scope.row[item.key]===1?'是':'否'}}</span>
+                <span v-else>{{scope.row[item.key]}}</span>
+              </template>
+            </vxe-table-column>
+          </PTVXETable>
+        </Col>
+        <div slot="footer">
+          <modal-footer ref="footerModal" :footer="footerList" @on-result-change="_footerResult"></modal-footer>
+        </div>
+      </Row>
+
+    </Modal>
+    <DownloadTemplateImport ref="importModal" @on-result-change="_page" />
+  </div>
+</template>
+<script>
+// import { drugCatalogueItem } from '../../api'
+// import SampleItemSelect from './SampleItemSelect'
+import DownloadTemplateImport from '../../../components/import/DownloadTemplateImport'
+import ModalFooter from '../../../components/base/modalFooter'
+import { meterManageItem, meterSample } from '../../../api'
+export default {
+  components: {
+    ModalFooter,
+    DownloadTemplateImport
+    // SampleItemSelect
+  },
+  data() {
+    return {
+      formId: 'SampleItemListFormId',
+      formObj: {
+        aptitudeId: '',
+        name: '',
+        code: '',
+        standardName: ''
+      },
+      showModal: false,
+      searchOpen: false,
+      btn: [],
+      iconMsg: [],
+      footerList: [
+        { id: '', name: '取消', type: '' },
+        { id: '', name: '保存', type: 'primary' }
+      ],
+      pageColumns: [
+        { title: '证书名称', key: 'name', width: 220 },
+        { title: '类别', key: 'classType', width: 140 },
+        { title: '备注', key: 'remark' }
+      ],
+      catalogueId: '',
+      getPage: {},
+      selectData: []
+    }
+  },
+  methods: {
+    _open(aptitudeId) {
+      this.formObj = this.$resetFields(this.formObj)
+      this.showModal = true
+      this.formObj.aptitudeId = aptitudeId
+      this._page()
+    },
+    _page: async function() {
+      Object.assign(this.formObj, this.$refs.pageTable._searchParams())
+      console.log('this.formObj', this.formObj)
+      const result = await meterSample.pageTemplate(this.formObj)
+      if (result) {
+        this.getPage = result
+        this.$refs.pageTable._hideLoading()
+      }
+    },
+    _footerResult(name) {
+      switch (name) {
+        case '取消':
+          this._cancel()
+          break
+        case '保存':
+          this._ok()
+          break
+      }
+    },
+    _cancel() {
+      this.showModal = false
+    },
+    // 操作的序号
+    _handleRow(data) {
+      this.currentRow = data.row
+    },
+    _formSearch() {
+      this.$refs.pageTable._pageChange(1)
+    },
+    // _page: async function() {
+    //   Object.assign(this.formObj, this.$refs.pageTable._searchParams())
+    //   const result = await drugCatalogueItem.pageCatalogueItem(
+    //     this.$serializeForm(this.formObj)
+    //   )
+    //   if (result) {
+    //     this.getPage = result
+    //     this.$refs.pageTable._initTable()
+    //   }
+    // },
+    _btnClick(msg) {
+      switch (msg) {
+        case '导入检测项目':
+          this.$refs.relItemModal._open(this.catalogueId)
+          break
+      }
+    },
+
+    _importItem() {
+      const data = {
+        importUrl:
+          '/meter/v1/aptitude_item/import_aptitude_item?aptitudeId=' +
+          this.formObj.aptitudeId,
+        downloadUrl: '/meter/v1/excel/template/MeterAptitudeItemImport',
+        title: '导入'
+      }
+      this.$refs.importModal._open(data, '授权资质项目导入')
+    },
+    // 操作列操作
+    _iconClick(res, data) {
+      switch (res) {
+        case '删除':
+          this._deleteById(data.id)
+          break
+      }
+    },
+    // 删除
+    _deleteById(id) {
+      this.$Modal.confirm({
+        title: '提示',
+        content: '确定删除该数据？',
+        onOk: () => {
+          this._deleteOk(id)
+        }
+      })
+    },
+    _deleteOk: async function(id) {
+      const result = await meterManageItem.deleteItemById(id)
+      if (result) {
+        await this._page()
+        this.$Message.success('删除成功')
+      }
+    },
+    _handleOrderValueEdit(id, value) {
+      this._edit({ id: id, obj: { orderBy: value } })
+    },
+
+    // _edit: async function(data) {
+    //   const result = await drugCatalogueItem.edit(data)
+    //   if (result) {
+    //     this._page()
+    //   }
+    // },
+
+    // _deleteOk: async function(id) {
+    //   const result = await drugCatalogueItem.deleteById(id)
+    //   if (result) {
+    //     this.$Message.success('删除成功')
+    //     this._page()
+    //   }
+    // },
+    // table结果  返回整行
+    _tableResultChange(msg, data) {
+      switch (msg) {
+        case 'page':
+          this._page()
+          break
+        case 'selectData':
+          this.selectData = data
+          break
+        case 'iconClick':
+          this._iconClick(data.name, data.rowData)
+          break
+      }
+    }
+  }
+}
+</script>

plugins/common.js

@@ -836,6 +836,8 @@ Vue.prototype.$openWindowModeless = function(data) {
     data.isReport +
     '&userId=' +
     global.getUserInfo().id +
+    '&companyId=' +
+    global.getUserInfo().companyId +
     '&userName=' +
     realname
   // eslint-disable-next-line no-undef