Merge remote-tracking branch 'origin/dev' into dev

api/soil/soil-test.js

@@ -65,6 +65,8 @@ export default {
     http.post('soil/v1/experiment/page_exp_allot_his', data).then(res => res),
   pageTestByExp: data =>
     http.post('soil/v1/experiment/page_test_by_exp', data).then(res => res),
+  pageDocumentByExp: data =>
+    http.post('soil/v1/experiment/page_document_by_exp', data).then(res => res),
   pagePrepareByExp: data =>
     http.post('soil/v1/experiment/page_prepare_by_exp', data).then(res => res),
   pageExperimentTest: data =>
@@ -81,6 +83,16 @@ export default {
         JSON.stringify(data.obj)
       )
       .then(res => res),
+  pageDocumentTestBath: data =>
+    https
+      .post(
+        'soil/v1/experiment/page_document_test_bath?page=' +
+          data.page +
+          '&rows=' +
+          data.rows,
+        JSON.stringify(data.obj)
+      )
+      .then(res => res),
   pageExperimentCheckBath: data =>
     https
       .post(

env/.env.devtest

-// 请求地址
-WEB_URL=http://sys.devtest.patzn.com
-BASE_URL=http://api.devtest.patzn.com
-SSO_URL=http://sso.devtest.patzn.com
-STATIC_URL=http://static.patzn.com
-NC_URL=http://123.133.38.68:8088

env/.env.zhyf

@@ -5,3 +5,4 @@ SSO_URL=http://sso.lims.com
 STATIC_URL=http://static.lims.com
 RECORD_URL=http://record.patzn.com
 NC_URL=http://123.133.38.68:8088
+NODE_ENV=zhyf

package.json

@@ -11,8 +11,7 @@
     "zhyf": "cross-env NODE_ENV=zhyf STATIC_URL=http://static.lims.com nuxt build",
     "dockertest": "cross-env NODE_ENV=dockertest STATIC_URL=http://static.docker.com:9000 nuxt build",
     "test": "cross-env NODE_ENV=testing node server/index.js",
-    "pertest": "cross-env NODE_ENV=pertesting node server/index.js",
-    "devtest": "cross-env NODE_ENV=devtest node server/index.js",
+    "pertest": "cross-env NODE_ENV=pertest node server/index.js",
     "generate": "nuxt generate",
     "lint": "eslint --fix --ext .js,.vue --ignore-path .gitignore .",
     "precommit": "npm run lint"

pages/soil-exp-report/OriginalRecordView.vue

+<template>
+  <div>
+    <Modal v-model="showModal" @on-visible-change="_visibleChange"
+           width="1200" class="zIndex-900 modal-footer-none">
+      <div slot="header"><p>查看原始记录</p></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.title" @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>
+    </Modal>
+    <ItemOriginalRecordEdit ref="recordEditModal"></ItemOriginalRecordEdit>
+    <ItemView ref="itemViewModal"></ItemView>
+    <ReportTemplateModal ref="templateModal" @on-result-change="_page"></ReportTemplateModal>
+  </div>
+</template>
+<script>
+/**
+ * 原始记录查看
+ */
+import Global from '../../api/config'
+import { soilSample, soilTest } from '../../api'
+import ItemOriginalRecordEdit from '../soil-report-manage/report-make/OriginalRecordEdit'
+import ItemView from '../soil-report-manage/report-make/ItemView'
+import ReportTemplateModal from '../soil-report-manage/report-make/ReportTemplateModal'
+
+export default {
+  components: {
+    ItemOriginalRecordEdit,
+    ItemView,
+    ReportTemplateModal
+  },
+  data() {
+    return {
+      currentComponent: '',
+      getPage: {},
+      showModal: false,
+      btn: [],
+      selectIds: [],
+      iconMsg: [
+        {
+          type: 'ios-book',
+          id: '',
+          name: '查看原始记录'
+        }
+      ],
+      pageColumns: [
+        { title: '模板名称', key: 'title' },
+        { title: '委托编号', key: 'entrustCode' },
+        { title: '钻孔编号', key: 'boreholeName' },
+        { title: '填写人', key: 'uname' },
+        { title: '创建时间', key: 'ctime', dateTime: true }
+      ],
+      formObj: {
+        entrustId: '',
+        batchNos: '',
+        sampleNums: '',
+        templateTitle: '',
+        fillInTimeBegin: '',
+        fillInTimeEnd: '',
+        cusNames: '',
+        codes: '',
+        itemNames: '',
+        testAccordings: '',
+        title: undefined
+      },
+      searchOpen: false
+    }
+  },
+  computed: {
+    tableHeight: function() {
+      if (this.searchOpen) {
+        return this.$tableHeight('', 340)
+      } else {
+        return this.$tableHeight('tabNoSearch')
+      }
+    }
+  },
+  methods: {
+    _componentResult(data) {
+      switch (this.currentComponent) {
+        default:
+          this._page()
+      }
+    },
+    _btnClick(msg, componentName) {
+      this.currentComponent = componentName
+      this.$nextTick(function() {
+        switch (msg) {
+          case '生成报告':
+            this._reportMake()
+            break
+          case 'search':
+            this.searchOpen = !this.searchOpen
+            break
+        }
+      })
+    },
+    _visibleChange(data) {
+      if (data === false) {
+        this.$emit('on-result-change')
+      }
+    },
+    _reportMake(data) {
+      if (this.selectIds.length === 0) {
+        this.$Message.warning('请至少选择一条数据')
+      } else {
+        this.$Modal.confirm({
+          title: '提示',
+          content: '确定这' + this.selectIds.length + '条数据生成报告',
+          onOk: () => {
+            this.openTooltip()
+            this.$refs.pageTable._showLoading()
+            this._reportMakeOk()
+          }
+        })
+      }
+    },
+    _reportMakeOk: async function() {
+      const result = await soilSample.reportMake({
+        entrustId: this.formObj.entrustId,
+        originalList: this.selectIds
+      })
+      if (result) {
+        this.$Message.success('报告成功生成')
+        await this._page()
+        this.$emit('on-result-change')
+      }
+      this.$refs.pageTable._hideLoading()
+    },
+    openTooltip() {
+      this.$notify.info({
+        title: '提示',
+        message: '正在生成，请稍后',
+        duration: 3000
+      })
+    },
+    _dateChange(data) {
+      this.formObj.fillInTimeBegin = data[0]
+      this.formObj.fillInTimeEnd = data[1]
+    },
+    _iconClick(res, data, currentComponent) {
+      this.currentComponent = currentComponent
+      this.$nextTick(() => {
+        switch (res) {
+          case '编辑':
+            this._recordEdit(data)
+            break
+          case '查看原始记录':
+            this._recordLook(data)
+            break
+          case '查看试验项目':
+            this._itemView(data.id)
+            break
+          case '查看检测项目':
+            this.$refs.refModal._open(data)
+            break
+        }
+      })
+    },
+    _recordLook(data) {
+      if (data.objectKey) {
+        this._reportMakeLook(data)
+      } else {
+        this._recordView(data.originalRecordId)
+      }
+    },
+    _recordEdit(data) {
+      if (data.objectKey) {
+        this._reportMakeLook(data)
+      } else {
+        this.$refs.recordEditModal._openWithType(
+          data.originalRecordId,
+          'ENVTESTMAKEEDIT'
+        )
+      }
+    },
+    _reportMakeLook(data) {
+      console.log(data)
+      this._viewReport(data)
+    },
+    _viewReport(data) {
+      if (data) {
+        this.$openWindowModeless({
+          objectKey: data.objectKey,
+          idType: 10,
+          id: data.id,
+          isReport: 4
+        })
+      }
+    },
+    // 查看试验项目
+    _itemView(id) {
+      this.$refs.itemViewModal._open(id)
+    },
+    // 查看原始记录
+    _recordView(originalRecordId) {
+      // layx.iframe('labRecordWriteOriView', '原始记录预览', Global.recordURL + '/print/v1/form/' + 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.showModal = true
+      this.formObj.entrustId = entrustId
+      this._page()
+    },
+    _tableResultChange(msg, data) {
+      switch (msg) {
+        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() {
+      Object.assign(this.formObj, this.$refs.pageTable._searchParams())
+      const result = await soilTest.recordPage(
+        this.$serializeForm(this.formObj)
+      )
+      if (result) {
+        this.$refs.pageTable._hideLoading()
+        this.getPage = result
+      }
+    }
+  }
+}
+</script>

pages/soil-exp-report/report-check/tabs/ExpReportCheck.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-check/SoilGroupExpReportCheck'
+import OriginalRecordView from '../../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: '', type: 'ios-beaker', name: '查看原始记录' },
         { id: 'item-check-report', type: 'md-image', name: '项目报告' },
         { id: 'item-check-upload', type: 'ios-cloud', name: '附件' },
         { id: 'item-check-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-exp-report/report-issue/tabs/ExpReportIssue.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-issue/SoilGroupExpReportIssue'
+import OriginalRecordView from '../../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: '', type: 'ios-beaker', name: '查看原始记录' },
         { id: 'issue-report', type: 'md-image', name: '项目报告' },
         { id: 'issue-upload', type: 'ios-cloud', name: '附件' },
         { id: 'issue-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-exp-report/report-make/tabs/ExpReportMake.vue

@@ -76,7 +76,7 @@ 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'
+import OriginalRecordView from '../../OriginalRecordView'
 export default {
   name: 'PreparationManage',
   components: {

pages/soil-report-manage/report-manage/ItemLeftList.vue

@@ -119,7 +119,7 @@ export default {
     _page: async function() {
       Object.assign(this.formObj, this.$refs.pageTable._searchParams())
       this.formObj.entrustId = this.id
-      const result = await soilTest.pageTestByExp(
+      const result = await soilTest.pageDocumentByExp(
         this.$serializeForm(this.formObj)
       )
       if (result) {

pages/soil-report-manage/report-manage/ItemRightList.vue

@@ -6,7 +6,7 @@
         <Form id="task-assign-item-right" :label-width="70" inline onsubmit="return false">
           <label class="label-sign"></label>
           <Form-item class="search-item" label="试样编号:">
-            <Input v-model="formObj.sampleCode" @on-enter="_formSearch" name="sampleCode" placeholder="请输入试样编号" clearable></Input>
+            <Input v-model="formObj.specimenNum" @on-enter="_formSearch" name="specimenNum" placeholder="请输入试样编号" clearable></Input>
           </Form-item>
           <Form-item class="search-btn">
             <Button @click="_formSearch" type="primary">搜索</Button>
@@ -60,9 +60,11 @@ export default {
         name: '',
         testMethod: '',
         testBasis: '',
+        specimenNum: undefined,
         obj: {
           entrustId: '',
-          nameList: []
+          nameList: [],
+          sampleCode: undefined
         }
       },
       entrustId: '',
@@ -198,22 +200,15 @@ export default {
     _formSearch() {
       this.$refs.pageTable._pageChange(1)
     },
-    _searchParams() {
-      const obj = {}
-      const obj1 = this.$refs.selInput1._getFormObj()
-      const obj2 = this.$refs.selInput2._getFormObj()
-      const obj3 = { foodItemList: this.leftSelectData }
-      Object.assign(obj, obj1, obj2, obj3)
-      return obj
-    },
     _page: async function() {
       this.formObj.obj.nameList = []
       Object.assign(this.formObj, this.$refs.pageTable._searchParams())
       this.formObj.obj.entrustId = this.entrustId
       this.formObj.obj.nameList = this.leftSelectData
+      this.formObj.obj.sampleCode = this.formObj.specimenNum
       // this.formObj.entrustId = this.entrustId
       // this.formObj.nameList = this.leftSelectData.join(',')
-      const result = await soilTest.pageExperimentTestBath(
+      const result = await soilTest.pageDocumentTestBath(
         this.$serializeForm(this.formObj)
       )
       if (result) {
@@ -252,6 +247,7 @@ export default {
     _clearAll() {
       this.getPage.records = []
       this.selectIds = []
+      this.formObj.specimenNum = undefined
     }
   }
 }

pages/soil-report-manage/report-manage/ItemTabs.vue

@@ -50,6 +50,7 @@ export default {
       this.id = id
       this.$refs.leftModal._open(this.id)
       this.$refs.rightModal._getEntrustId(this.id)
+      this.$refs.rightModal._clearAll()
       // this.$refs.rightModal._getColumn()
     },
     _clearTable() {

pages/soil-sample-manage/sample-preparation/AptitudeItem.vue

@@ -106,6 +106,7 @@ export default {
       }
     },
     _page: async function() {
+      Object.assign(this.formObj, this.$refs.pageTable._searchParams())
       const result = await soilAptitude.page(this.$serializeForm(this.formObj))
       if (result) {
         console.log(result)

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

@@ -89,6 +89,7 @@ export default {
       ],
       pageColumns: [
         { title: '项目名称', key: 'expName' },
+        { title: '钻孔编号', key: 'boreholeName' },
         { title: '备注', key: 'remark' },
         { title: '创建人', key: 'uname' },
         { title: '创建时间', key: 'ctime', dateTime: true }

pages/soil-test-manage/test-data-audit/OriginalRecordView.vue

@@ -93,6 +93,7 @@ export default {
       pageColumns: [
         { title: '模板名称', key: 'title' },
         { title: '委托编号', key: 'entrustCode' },
+        { title: '钻孔编号', key: 'boreholeName' },
         { title: '填写人', key: 'uname' },
         { title: '创建时间', key: 'ctime', dateTime: true }
       ],

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

@@ -89,6 +89,7 @@ export default {
       ],
       pageColumns: [
         { title: '项目名称', key: 'expName' },
+        { title: '钻孔编号', key: 'boreholeName' },
         { title: '备注', key: 'remark' },
         { title: '创建人', key: 'uname' },
         { title: '创建时间', key: 'ctime', dateTime: true }

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

@@ -93,6 +93,7 @@ export default {
       pageColumns: [
         { title: '模板名称', key: 'title' },
         { title: '委托编号', key: 'entrustCode' },
+        { title: '钻孔编号', key: 'boreholeName' },
         { title: '填写人', key: 'uname' },
         { title: '创建时间', key: 'ctime', dateTime: true }
       ],

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

@@ -98,6 +98,7 @@ export default {
       ],
       pageColumns: [
         { title: '项目名称', key: 'expName' },
+        { title: '钻孔编号', key: 'boreholeName' },
         { title: '备注', key: 'remark' },
         { title: '创建人', key: 'uname' },
         { title: '创建时间', key: 'ctime', dateTime: true }

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

@@ -93,6 +93,7 @@ export default {
       pageColumns: [
         { title: '模板名称', key: 'title' },
         { title: '委托编号', key: 'entrustCode' },
+        { title: '钻孔编号', key: 'boreholeName' },
         { title: '填写人', key: 'uname' },
         { title: '创建时间', key: 'ctime', dateTime: true }
       ],

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

@@ -87,6 +87,7 @@ export default {
         { title: '附录标题', key: 'title', width: 85 },
         { title: '附录名称', key: 'name', width: 120 },
         { title: '附件类型', key: 'remark', width: 85 },
+        { title: '钻孔编号', key: 'boreholeName' },
         { title: '样品编号', key: 'sampleCode', width: 90 },
         { title: '填写人', key: 'uname', width: 85 },
         { title: '创建时间', key: 'ctime', dateTime: true, width: 120 }