修改了原始记录填写

pages/soil-test-manage/test-input/item-tabs/CreateReport.vue

@@ -63,21 +63,10 @@ export default {
     }
   },
   methods: {
-    _open(data) {
+    _open() {
       this.getPage.records = []
       this.backData = {}
-      this.tableData = data
       this.showBatchModal = true
-      const tableData = {}
-      tableData.name = data.name
-      tableData.code = data.code
-      if (data.reportCode) {
-        tableData.certificate = data.reportCode
-      } else {
-        tableData.certificate = ''
-      }
-      console.log(tableData)
-      this.getPage.records.push(tableData)
       this._reportTemplate()
       this.reportModelId = ''
       this.isLoading = false
@@ -113,10 +102,8 @@ export default {
         this.$Message.warning('请选择一个原始记录模板！')
         // this._hideLoading()
       } else {
-        this.backData.sampleId = this.tableData.id
         this.$emit('on-result-change', this.backData)
         this.showBatchModal = false
-        console.log('this.backData', this.backData)
       }
     },
     _issueCancel() {

pages/soil-test-manage/test-input/item-tabs/ItemRightList.vue

@@ -120,6 +120,7 @@ export default {
       ],
       btn: [
         { type: 'success', id: '', name: '填写原始记录' },
+        { type: 'success', id: '', name: '原始记录填写' },
         { type: 'success', id: '', name: '完成提交' },
         { type: 'success', id: '', name: '设备' }
       ],
@@ -130,7 +131,6 @@ export default {
       ],
       iconMsg: [
         { type: 'ios-book', id: '', name: '查看原始记录' },
-        { type: 'ios-book', id: '', name: '填写原始记录' },
         { type: 'md-apps', id: '', name: '查看指标' },
         { type: 'ios-bookmarks', id: '', name: '查看采集数据' },
         { type: 'ios-browsers', id: '', name: '查看采集文件' },
@@ -198,9 +198,6 @@ export default {
           case '查看指标':
             this._indexManage(data)
             break
-          case '填写原始记录':
-            this._makeCertificateExcelByTemp(data)
-            break
           case '查看采集数据':
             this._collectManage(data)
             break
@@ -228,9 +225,10 @@ export default {
     },
     _makeCertificateExcelByTemp(data) {
       // this.$refs.SelectOriTempRecordExcel._open(data.id, data)
-      this.$refs.createModal._open(data)
+      this.$refs.createModal._open()
     },
     _makeCodeExcel: async function(data) {
+      console.log(this.selectIds)
       console.log('----dddd---', data)
       this.$refs.pageTable._hideLoading()
       const result = await soilSample.generateExcelReport(data)
@@ -451,6 +449,9 @@ export default {
         case '填写原始记录':
           this._addRecord()
           break
+        case '原始记录填写':
+          this._makeCertificateExcelByTemp()
+          break
         case '完成提交':
           this._submitItem(this.selectData)
           break

pages/soil-test-manage/test-input/item-tabs/ReportTemplate.vue

@@ -4,8 +4,8 @@
     <Col span="24">
       <Form id="formId" :label-width="80" inline onsubmit="return false">
         <label class="label-sign"></label>
-        <Form-item label="证书名称:" class="search-item">
-          <Input v-model="formObj.name" @on-enter="_formSearch" placeholder="请输入证书名称" clearable/>
+        <Form-item label="模板名称:" class="search-item">
+          <Input v-model="formObj.alias" @on-enter="_formSearch" placeholder="请输入模板名称" clearable/>
         </Form-item>
         <Form-item class="search-btn" style="margin-left: -10px">
           <Button @click="_formSearch" type="primary">搜索</Button>
@@ -50,7 +50,7 @@ export default {
     return {
       tableHeight: '400',
       pageColumns: [
-        { title: '证书名称', key: 'name', width: 220 },
+        { title: '模板名称', key: 'alias', width: 220 },
         { title: '类别', key: 'classType', width: 140 },
         { title: '备注', key: 'remark' }
       ],