修改了数据复核查看项目报告

api/soil/soil-report.js

@@ -24,5 +24,7 @@ export default {
     http.get('soil/v1/original_record/' + data).then(res => res),
   expReportGetById: data =>
     http.get('soil/v1/exp_report/' + data).then(res => res),
-  reportGetById: data => http.get('soil/v1/report/' + data).then(res => res)
+  reportGetById: data => http.get('soil/v1/report/' + data).then(res => res),
+  expReportCheck: data =>
+    http.post('soil/v1/exp_report/exp_report_check', data).then(res => res)
 }

pages/meter-entrust/entrust-register/EntrustRegister.vue

@@ -148,7 +148,6 @@ export default {
         { title: '钻孔位置', key: 'boreholeLocation', width: 120 },
         { title: '水深（米）', key: 'waterDepth', width: 120 },
         { title: '钻孔名称', key: 'boreholeName', width: 120 },
-        { title: '进度', key: 'progress', width: 120, status: true },
         { title: '平均容重', key: 'projectNo', width: 120 },
         { title: '制表日期', key: 'tabulateDate', width: 120, date: true },
         { title: '制表人', key: 'tabulater', width: 120 },

pages/soil-test-manage/test-data-check/CheckDataModal.vue

@@ -11,6 +11,9 @@
           <el-tab-pane label="按样品复核" name="waitScan">
             <WaitScan ref="waitScanModal"></WaitScan>
           </el-tab-pane>
+          <el-tab-pane label="查看项目报告" name="viewReport">
+            <ItemReportView ref="reportModal"></ItemReportView>
+          </el-tab-pane>
 <!--          <el-tab-pane label="查看原始记录" name="viewRecord">-->
 <!--            <OriginalRecordView ref="recordModal"></OriginalRecordView>-->
 <!--          </el-tab-pane>-->
@@ -26,12 +29,14 @@
 <script>
 import WaitReceive from './item-tabs/ItemTabs'
 import WaitScan from './sample-tabs/SampleTabs'
+import ItemReportView from './ItemReportView'
 // import OriginalRecordView from './OriginalRecordView'
 
 export default {
   components: {
     WaitReceive,
-    WaitScan
+    WaitScan,
+    ItemReportView
     // OriginalRecordView
   },
   data() {
@@ -85,6 +90,8 @@ export default {
         this.$refs.waitReceiveModal._clearTable()
         this.$refs.waitScanModal._open(this.entrustId)
         // this._waitSend()
+      } else if (tab.name === 'viewReport') {
+        this.$refs.reportModal._open(this.entrustId)
       }
     },
     _search() {

pages/soil-test-manage/test-data-check/ItemReportView.vue

+<template>
+  <div>
+    <Row>
+      <!--查询-->
+      <Col span="24">
+        <Form :label-width="80" v-show="searchOpen" inline onsubmit="return false">
+          <label class="label-sign"></label>
+          <Form-item class="search-item" label="项目名称:">
+            <Input v-model="formObj.expName" @on-enter="_formSearch" placeholder="请输入项目名称" clearable></Input>
+          </Form-item>
+          <Form-item class="search-btn">
+            <Button @click="_formSearch" type="primary">搜索</Button>
+          </Form-item>
+        </Form>
+      </Col>
+      <!--操作-->
+      <Col span="24">
+        <btn-list  :open="searchOpen" :msg="btn" :showSearchBtn="true" @on-result-change="_btnClick"
+                 class="contHide"></btn-list>
+      </Col>
+      <!-- 表格 -->
+      <Col span="24">
+        <PTVXETable ref="pageTable" :tableHeight="tableHeight"
+                    @on-result-change="_tableResultChange" :icon-msg="iconMsg" :getPage="getPage">
+          <vxe-table-column
+            :field="item.key"
+            :title="item.title"
+            :min-width="item.width?item.width:200"
+            :fixed="item.fixed?item.fixed:undefined"
+            v-for="item in pageColumns"
+            :key="item.key" sortable>
+            <template slot-scope="scope">
+              <div v-if="item.dateTime">
+                {{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd HH:MM'):''}}
+              </div>
+              <div v-else>{{scope.row[item.key]}}</div>
+            </template>
+          </vxe-table-column>
+        </PTVXETable>
+      </Col>
+    </Row>
+    <ItemOriginalRecordEdit ref="recordEditModal"></ItemOriginalRecordEdit>
+    <ItemView ref="itemViewModal"></ItemView>
+  </div>
+</template>
+<script>
+/**
+ * 原始记录查看
+ */
+import Global from '../../../api/config'
+import { soilReport, soilTest } from '../../../api'
+import ItemOriginalRecordEdit from './OriginalRecordEdit'
+import ItemView from './ItemView'
+
+export default {
+  components: {
+    ItemOriginalRecordEdit,
+    ItemView
+  },
+  data() {
+    return {
+      currentComponent: '',
+      getPage: {},
+      btn: [
+        {
+          type: 'primary',
+          id: '',
+          name: '通过'
+        }
+      ],
+      selectIds: [],
+      iconMsg: [
+        {
+          type: 'md-create',
+          id: '',
+          name: '编辑'
+        },
+        {
+          type: 'ios-book',
+          id: '',
+          name: '查看项目报告'
+        },
+        { type: 'md-trash', id: '', name: '删除' }
+      ],
+      pageColumns: [
+        { title: '项目名称', key: 'expName' },
+        { title: '备注', key: 'remark' },
+        { title: '创建人', key: 'uname' },
+        { title: '创建时间', key: 'ctime', dateTime: true }
+      ],
+      formObj: {
+        entrustId: '',
+        expName: undefined
+      },
+      searchOpen: false
+    }
+  },
+  computed: {
+    tableHeight: function() {
+      if (this.searchOpen) {
+        return this.$tableHeight('', 340)
+      } else {
+        return this.$tableHeight('tabNoSearch')
+      }
+    }
+  },
+  mounted() {
+    this._page()
+  },
+  methods: {
+    _componentResult(data) {
+      switch (this.currentComponent) {
+        case 'EditDateModal':
+          this._updateDate(data)
+          break
+        default:
+          this._page()
+      }
+    },
+    _updateDate(date) {
+      this.$store
+        .dispatch('PrintForm/updateTimeBatch', {
+          ids: this.selectIds.join(','),
+          fillInTime: date
+        })
+        .then(() => {
+          if (this.$store.state.PrintForm.success) {
+            this._page()
+            this.$Message.success('更新成功!')
+          }
+        })
+    },
+    _btnClick(msg, componentName) {
+      this.currentComponent = componentName
+      this.$nextTick(function() {
+        switch (msg) {
+          case '通过':
+            this._pass()
+            break
+          case 'search':
+            this.searchOpen = !this.searchOpen
+            break
+        }
+      })
+    },
+    _pass() {
+      if (this.selectIds.length === 0) {
+        this.$Message.warning('请至少选择一条数据')
+      } else {
+        this.$Modal.confirm({
+          title: '提示',
+          content: '确定通过？',
+          onOk: () => {
+            this.$refs.pageTable._showLoading()
+            this._passItemReport(this.selectIds)
+          }
+        })
+      }
+    },
+    _passItemReport: async function(ids) {
+      const result = await soilReport.expReportCheck({ ids: ids.join(',') })
+      if (result) {
+        this.$refs.pageTable._hideLoading()
+        this.$Message.success('提交成功')
+        this._page()
+      } else {
+        this.$refs.pageTable._hideLoading()
+      }
+    },
+    _iconClick(res, data, currentComponent) {
+      this.currentComponent = currentComponent
+      this.$nextTick(() => {
+        switch (res) {
+          case '编辑':
+            // this.$refs.recordEditModal._openWithType(
+            //   data.originalRecordId,
+            //   'ENVTESTMAKEEDIT'
+            // )
+            this._reportMakeLook(data)
+            break
+          case '查看项目报告':
+            this._reportView(data)
+            // this._recordView(data.originalRecordId)
+            break
+          case '查看试验项目':
+            this._itemView(data.id)
+            break
+          case '删除':
+            this._deleteByIds([data.id])
+            break
+        }
+      })
+    },
+    // 查看试验项目
+    _itemView(id) {
+      this.$refs.itemViewModal._open(id)
+    },
+    _reportView(data) {
+      if (data.objectKey) {
+        this._reportMakeLook(data)
+      } else {
+        this._recordView(data.originalRecordId)
+      }
+    },
+    _reportMakeLook: async function(data) {
+      console.log(data)
+      const result = await soilReport.expReportGetById(data.id)
+      // this._viewReport(data)
+      // const result = await soilReport.getExcelOriginalRecord(data.id)
+      if (result) {
+        console.log('result')
+        this._viewReport(result)
+      }
+    },
+    _viewReport(data) {
+      if (data) {
+        this.$openWindowModeless({
+          objectKey: data.objectKey,
+          idType: 13,
+          id: data.id,
+          isReport: 4
+        })
+      }
+    },
+    // 查看原始记录
+    _recordView(originalRecordId) {
+      let recordUrl = ''
+      if (process.env.NODE_ENV === 'production') {
+        recordUrl = 'http://record.patzn.com'
+      } else {
+        recordUrl = Global.recordURL
+      }
+      // eslint-disable-next-line no-undef
+      layx.iframe(
+        'labRecordWriteOriView',
+        '原始记录预览',
+        recordUrl + '/print/v1/form/' + originalRecordId + '?type=ENVTESTMAKE',
+        {
+          event: {
+            onload: {
+              after: function(layxWindow, winform) {
+                // eslint-disable-next-line no-undef
+                layx.max(winform.id)
+              }
+            }
+          }
+        }
+      )
+    },
+    _open(entrustId) {
+      this.formObj.entrustId = entrustId
+      this._page()
+    },
+    _tableResultChange(msg, data) {
+      switch (msg) {
+        case 'page':
+          this.getPage = this.$store.state.EnvItem.page
+          break
+        case 'selectIds':
+          this.selectIds = data
+          break
+        case 'iconClick':
+          this._iconClick(data.name, data.rowData, data.componentName)
+          break
+        case 'changeSize':
+          this._page()
+          break
+      }
+    },
+    _formSearch() {
+      this.$refs.pageTable._pageChange(1)
+    },
+    _page: async function() {
+      this.selectIds = []
+      Object.assign(this.formObj, this.$refs.pageTable._searchParams())
+      const result = await soilTest.expReportPage(
+        this.$serializeForm(this.formObj)
+      )
+      if (result) {
+        this.$refs.pageTable._hideLoading()
+        this.getPage = result
+      }
+    },
+    // 删除原始记录
+    _deleteByIds(ids, content) {
+      this.$Modal.confirm({
+        title: '提示',
+        content: content || '确定删除该记录？',
+        onOk: () => {
+          this._deleteOk(ids)
+        }
+      })
+    },
+    _deleteOk: async function(ids) {
+      const result = await soilTest.deleteReport(ids)
+      if (result) {
+        this.$Message.success('删除成功')
+        this._page()
+      }
+    }
+  }
+}
+</script>

pages/soil-test-manage/test-data-check/OriginalRecordEdit.vue

+<template>
+  <div>
+    <!--<Modal v-model="showModal" title="原始记录" :mask-closable="false" width="1300" class="modal-footer-none">-->
+    <!--<div style="text-align:center;align-content:center;width: 100%;height: 790px" v-html="htmlContent">-->
+    <!--</div>-->
+    <!--</Modal>-->
+  </div>
+</template>
+<script>
+import Global from '../../../api/config'
+import { soilTest } from '../../../api'
+
+/**
+ * 编辑原始记录详情
+ */
+export default {
+  data() {
+    return {
+      // showModal: false,
+      again: false,
+      formId: '',
+      htmlContent: '',
+      formIdTemp: ''
+    }
+  },
+  created() {
+    // 监听原始记录消息
+    // eslint-disable-next-line nuxt/no-globals-in-created
+    window.addEventListener('message', this._saveOriginal)
+  },
+  // 销毁监听事件
+  beforeDestroy() {
+    this.again = false
+    window.removeEventListener('message', this._saveOriginal)
+  },
+  methods: {
+    _open(formId) {
+      this.formId = formId
+      this.formIdTemp = formId + this.$randomCode()
+      this.again = true
+      // this.showModal = true;
+      let recordUrl = ''
+      if (process.env.NODE_ENV === 'production') {
+        recordUrl = 'http://record.patzn.com'
+      } else {
+        recordUrl = Global.recordURL
+      }
+      // 编辑的时候传此bindUri 是为了 绑定spreadJs自定义的公式
+      const bindUri =
+        Global.baseURL + '/env/v1/env_item/original_record_data_bind?source='
+      const url =
+        recordUrl +
+        '/print/v1/eln/form_soil_' +
+        formId +
+        '?bindUri=' +
+        encodeURIComponent(bindUri)
+      // this.htmlContent = '<iframe style="padding: 0px;width:100%;height:100%" frameborder="0" src=' + encodeURI(url) + '></iframe>';
+      this.$layx(this.formIdTemp, '编辑原始记录', url)
+    },
+    _openWithType(formId, fromType) {
+      this.formId = formId
+      this.formIdTemp = formId + this.$randomCode()
+      this.again = true
+      // this.showModal = true;
+      let recordUrl = ''
+      if (process.env.NODE_ENV === 'production') {
+        recordUrl = 'http://record.patzn.com'
+      } else {
+        recordUrl = Global.recordURL
+      }
+      // 编辑的时候传此bindUri 是为了 绑定spreadJs自定义的公式
+      const bindUri =
+        Global.baseURL + '/env/v1/env_item/original_record_data_bind?source='
+      const url =
+        recordUrl +
+        '/print/v1/eln/form_soil_' +
+        formId +
+        '?bindUri=' +
+        encodeURIComponent(bindUri) +
+        '&type=' +
+        fromType
+      // this.htmlContent = '<iframe style="padding: 0px;width:100%;height:100%" frameborder="0" src=' + encodeURI(url) + '></iframe>';
+      this.$layx(this.formIdTemp, '编辑原始记录', url)
+    },
+    _saveOriginal(data) {
+      console.log('修改的数据', data)
+      if (this.again) {
+        if (data.data.msg === true) {
+          this._editSaveRecord(data)
+        } else {
+          this._cancel()
+        }
+        this.again = false
+      }
+    },
+    _cancel() {
+      // this.showModal = false;
+      // 关闭所有layx弹框
+      // eslint-disable-next-line no-undef
+      layx.destroyAll(this.formIdTemp)
+    },
+    _updateRecord: async function(param) {
+      const result = await soilTest.updateItem(param)
+      console.log(result)
+      if (result) {
+        this.$Message.success('保存成功')
+        this._cancel()
+        this.$emit('on-result-change')
+      }
+    },
+    // 保存后解析项目的检测值
+    _editSaveRecord(data) {
+      const param = {
+        formId: this.formId
+      }
+      console.log('data', data)
+      const copyMapTemp = {}
+      if (data.data.copySheet && data.data.copyedSheet) {
+        param.copyMap = {}
+        const copyedKey = String(data.data.copyedSheet)
+        copyMapTemp[copyedKey] = ''
+        copyMapTemp[copyedKey] = String(data.data.copySheet)
+        // 存在复制sheet的情况
+        param.copyMap = JSON.stringify(copyMapTemp)
+      } else if (typeof data.data.testValueArry !== 'undefined') {
+        const testValue = data.data.testValueArry
+        param.copyMap = {}
+        testValue.forEach(item => {
+          const copyedKey = String(item.copyedSheet)
+          copyMapTemp[copyedKey] = ''
+          copyMapTemp[copyedKey] = String(item.copySheet)
+          param.copyMap = JSON.stringify(copyMapTemp)
+        })
+      }
+      this._updateRecord(param)
+      // this.$store.dispatch('EnvItem/updateFormForItem', param).then(() => {
+      //   if (this.$store.state.EnvItem.success) {
+      //     this.$Message.success('保存成功')
+      //     // this.showModal = false;
+      //     this.$emit('on-result-change')
+      //     this._cancel()
+      //   }
+      // })
+    }
+  }
+}
+</script>

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

@@ -2,7 +2,7 @@
   <div>
     <Modal v-model="showBatchModal" v-drag width="900">
       <p slot="header">
-        原始记录填写
+        生成项目报告
       </p>
       <div>
         <!--内容-->

pages/workbench/sample-progress/SampleSteps.vue

 <template>
   <div>
-    <div v-for="itemInfo in info" :key="itemInfo" class="contract-box">
+    <div v-for="(itemInfo, index) in info" :key="index" class="contract-box">
       <Row>
         <!--样品信息-->
         <Col span="6">