添加了数据录入查看项目报告合并报告功能

添加了分项报告编制查看原始记录功能

api/soil/soil-report.js

@@ -34,5 +34,7 @@ export default {
   reportDelete: data =>
     http.delete('soil/v1/report/?ids=' + data).then(res => res),
   generateAppendix: data =>
-    http.post('soil/v1/exp_report/generate_appendix', data).then(res => res)
+    http.post('soil/v1/exp_report/generate_appendix', data).then(res => res),
+  itemReportMerge: data =>
+    http.post('soil/v1/exp_report/item_report_merge', data).then(res => res)
 }

pages/soil-exp-report/report-make/tabs/ExpReportMake.vue

@@ -2,8 +2,8 @@
   <div>
     <Row>
       <Form
-        v-show="searchOpen"
         id="lab-sample-form"
+        v-show="searchOpen"
         :label-width="70"
         inline
         onsubmit="return false"
@@ -11,19 +11,19 @@
       >
         <label class="label-sign" />
         <Form-item class="search-item" label="委托方:">
-          <Input name="client" placeholder="请输入委托方" clearable @on-enter="_formSearch" />
+          <Input @on-enter="_formSearch" name="client" placeholder="请输入委托方" clearable />
         </Form-item>
         <Form-item class="search-item" label="委托编号:">
-          <Input name="entrustCode" placeholder="请输入委托编号" clearable @on-enter="_formSearch" />
+          <Input @on-enter="_formSearch" name="entrustCode" placeholder="请输入委托编号" clearable />
         </Form-item>
         <Form-item class="search-btn">
-          <Button type="primary" @click="_formSearch">
+          <Button @click="_formSearch" type="primary">
             搜索
           </Button>
         </Form-item>
       </Form>
       <Col span="24">
-      <btn-list :msg="btn" :open="searchOpen" show-search-btn="true" @on-result-change="_btnClick" />
+      <btn-list :msg="btn" :open="searchOpen" @on-result-change="_btnClick" show-search-btn="true" />
       </Col>
       <Col span="24">
       <PTVXETable
@@ -32,9 +32,9 @@
         :table-height="tableHeight"
         :get-page="getPage"
         :icon-msg="iconMsg"
+        @on-result-change="_tableResultChange"
         show-check-box
         select-data
-        @on-result-change="_tableResultChange"
       >
         <vxe-table-column
           v-for="item in pageColumns"
@@ -65,6 +65,7 @@
     <Reason ref="reasonModal" @on-result-change="_reasonResult" />
     <SoilGroupExpReportMake ref="soilGroupExpReportMakeModal" @on-result-change="_page" />
     <OperationModal ref="operationModal" />
+    <OriginalRecordView ref="OriginalRecordView" @on-result-change="_page" />
   </div>
 </template>
 
@@ -75,9 +76,15 @@ import global from '../../../../api/config'
 import Reason from '../../../../components/base/Reason'
 import OperationModal from '../../../../components/operation/Operation'
 import SoilGroupExpReportMake from '../../report-make/SoilGroupExpReportMake'
+import OriginalRecordView from '../../../soil-report-manage/report-make/OriginalRecordView'
 export default {
   name: 'PreparationManage',
-  components: { Reason, OperationModal, SoilGroupExpReportMake },
+  components: {
+    Reason,
+    OperationModal,
+    SoilGroupExpReportMake,
+    OriginalRecordView
+  },
   data() {
     return {
       name: '',
@@ -109,6 +116,7 @@ export default {
       selectData: [],
       iconMsg: [
         // { id: '', type: 'md-image', name: '预览报告' },
+        { id: 'make-report', type: 'ios-beaker', name: '查看原始记录' },
         { id: 'make-report', type: 'md-image', name: '项目报告' },
         { id: 'make-upload', type: 'ios-cloud', name: '附件' },
         { id: 'make-record', type: 'ios-clock', name: '操作日志' }
@@ -311,8 +319,14 @@ export default {
         case '项目报告':
           this._expReport(data)
           break
+        case '查看原始记录':
+          this._viewRecord(data.id)
+          break
       }
     },
+    _viewRecord(id) {
+      this.$refs.OriginalRecordView._open(id)
+    },
     _viewReport(data) {
       this._getObjectKey(data)
     },

pages/soil-test-manage/test-input/ItemReportView.vue

@@ -66,6 +66,11 @@ export default {
           type: 'error',
           id: 'do-test-sample-viewitem-delete-batch',
           name: '批量删除'
+        },
+        {
+          type: 'primary',
+          id: '',
+          name: '合并'
         }
       ],
       selectIds: [],
@@ -133,12 +138,31 @@ export default {
           case '批量删除':
             this._batchDelete()
             break
+          case '合并':
+            this._merge()
+            break
           case 'search':
             this.searchOpen = !this.searchOpen
             break
         }
       })
     },
+    _merge() {
+      if (this.selectIds.length === 0) {
+        this.$Message.warning('请至少选择一条数据')
+      } else {
+        this._mergeFile()
+      }
+    },
+    _mergeFile: async function() {
+      const result = await soilReport.itemReportMerge({
+        ids: this.selectIds.join(',')
+      })
+      if (result) {
+        this.$Message.success('合并成功')
+        this._page()
+      }
+    },
     _batchDelete() {
       if (this.selectIds.length === 0) {
         this.$Message.warning('请至少选择一条数据')