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

Dockerfile

+FROM node:lts-alpine
+MAINTAINER 1516330897@qq.com
+RUN npm install -g cnpm --registry=https://registry.npm.taobao.org && cnpm install -g pm2@latest && mkdir /app
+WORKDIR /app
+COPY . /app
+EXPOSE 8133
+RUN chmod 755 ./pm2-start.sh
+CMD ["./pm2-start.sh"]

package.json

@@ -32,7 +32,7 @@
     "iview": "^3.3.3",
     "koa": "^2.6.2",
     "mescroll.js": "^1.4.2",
-    "node-schedule": "^1.3.0",
+    "node-schedule": "1.3.0",
     "nuxt": "^2.4.0",
     "nuxt-start": "^2.5.1",
     "script-loader": "^0.7.2",

pages/soil-sample-manage/SoilSampleSplit.vue

@@ -39,7 +39,7 @@
                     ></Input>
                   </div>
                   <div v-else-if="item.key==='sampleCode'">
-                    {{scope.row[item.key]}}{{'--'+scope.row.index}}
+                    {{scope.row[item.key]+'--'}}{{Number(scope.row.index)+1}}
                   </div>
                   <span v-else>
                   {{ scope.row[item.key] }}
@@ -202,7 +202,7 @@ export default {
         this.getPage.records[i].sampleCode =
           this.getPage.records[i].sampleCode +
           '-' +
-          this.getPage.records[i].index
+          (this.getPage.records[i].index + 1)
         console.log(this.getPage.records[i])
         this._addSample(this.getPage.records[i])
       }

pages/soil-sample-manage/sample-preparation/OriginalRecordView.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.title" @on-enter="_formSearch" placeholder="请输入模板名称" clearable></Input>
+          </Form-item>
+          <Form-item class="search-item" label="委托编号:">
+            <Input v-model="formObj.entrustCode" @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" :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: 'error',
+          id: '',
+          name: '批量删除'
+        }
+      ],
+      selectIds: [],
+      iconMsg: [
+        {
+          type: 'md-create',
+          id: '',
+          name: '编辑'
+        },
+        {
+          type: 'ios-book',
+          id: '',
+          name: '查看原始记录'
+        },
+        {
+          type: 'ios-list',
+          id: '',
+          name: '查看试验项目'
+        },
+        { type: 'md-trash', id: '', name: '删除' }
+      ],
+      pageColumns: [
+        { title: '模板名称', key: 'title' },
+        { title: '委托编号', key: 'entrustCode' },
+        { title: '填写人', key: 'uname' },
+        { title: '创建时间', key: 'ctime', dateTime: true }
+      ],
+      formObj: {
+        entrustId: ''
+      },
+      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()
+      }
+    },
+    _btnClick(msg, componentName) {
+      this.currentComponent = componentName
+      this.$nextTick(function() {
+        switch (msg) {
+          case '批量删除':
+            this._batchDelete()
+            break
+          case 'search':
+            this.searchOpen = !this.searchOpen
+            break
+        }
+      })
+    },
+    _batchDelete() {
+      if (this.selectIds.length === 0) {
+        this.$Message.warning('请至少选择一条数据')
+      } else {
+        this.$Modal.confirm({
+          title: '提示',
+          content: '确定删除？',
+          onOk: () => {
+            this._delete()
+          }
+        })
+      }
+    },
+    _delete: async function() {
+      const result = await soilTest.deleteRecord(this.selectIds.join(','))
+      if (result) {
+        this.$Message.success('删除成功')
+        this._page()
+      }
+    },
+    _iconClick(res, data, currentComponent) {
+      this.currentComponent = currentComponent
+      this.$nextTick(() => {
+        switch (res) {
+          case '编辑':
+            this._reportEdit(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)
+      }
+    },
+    _reportEdit(data) {
+      if (data.objectKey) {
+        this._reportMakeLook(data)
+      } else {
+        this.$refs.recordEditModal._openWithType(
+          data.originalRecordId,
+          'ENVTESTMAKEEDIT'
+        )
+      }
+    },
+    _reportMakeLook: async function(data) {
+      console.log(data)
+      const result = await soilReport.originalRecordGetById(data.id)
+      if (result) {
+        this._viewReport(result)
+      }
+    },
+    _viewReport(data) {
+      if (data) {
+        this.$openWindowModeless({
+          objectKey: data.objectKey,
+          idType: 10,
+          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.recordPage(
+        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.deleteRecord(ids)
+      if (result) {
+        this.$Message.success('删除成功')
+        this._page()
+      }
+    }
+  }
+}
+</script>

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

@@ -11,6 +11,9 @@
           <el-tab-pane label="原始记录填写" name="recordModal">
             <RecordWrite ref="recordModal"></RecordWrite>
           </el-tab-pane>
+          <el-tab-pane label="查看原始记录" name="viewRecord">
+            <OriginalRecordView ref="recordViewModal"></OriginalRecordView>
+          </el-tab-pane>
         </el-tabs>
 <!--        <keep-alive>-->
 <!--          &lt;!&ndash; eslint-disable-next-line vue/require-component-is &ndash;&gt;-->
@@ -23,10 +26,12 @@
 <script>
 import SoilSampleManage from '../SoilSampleManageTab'
 import RecordWrite from './sample-preparation-record/RecordIndex'
+import OriginalRecordView from './OriginalRecordView'
 export default {
   components: {
     SoilSampleManage,
-    RecordWrite
+    RecordWrite,
+    OriginalRecordView
   },
   data() {
     return {
@@ -60,11 +65,16 @@ export default {
     _recordPage() {
       this.$refs.recordModal._open(this.entrustId)
     },
+    _recordView() {
+      this.$refs.recordViewModal._open(this.entrustId)
+    },
     _changeTabs(tab, event) {
       if (tab.name === 'prepareManage') {
         // this._issuedPage()
         this.$refs.prepareManage._open(this.entrustId)
         this.$refs.recordModal._clearTable()
+      } else if (tab.name === 'viewRecord') {
+        this._recordView()
       } else {
         this.$refs.recordModal._open(this.entrustId)
       }

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

@@ -59,14 +59,22 @@
   </div>
 </template>
 <script>
-import { soilAptitude, soilEntrust } from '../../../api'
+import { soilAptitude, soilEntrust, soilSample } from '../../../api'
 import MeterEntrustRecord from '../../../components/operation/Operation'
-import global from '../../../api/config'
 import SoilSampleManageHis from './SampleManageHis'
 import SoilEntrustItemNum from './SoilItemNum'
+import CreateReport from './CreateReport'
 export default {
-  // eslint-disable-next-line vue/no-unused-components
-  components: { SoilSampleManageHis, MeterEntrustRecord, SoilEntrustItemNum },
+  components: {
+    // eslint-disable-next-line vue/no-unused-components
+    SoilSampleManageHis,
+    // eslint-disable-next-line vue/no-unused-components
+    MeterEntrustRecord,
+    // eslint-disable-next-line vue/no-unused-components
+    SoilEntrustItemNum,
+    // eslint-disable-next-line vue/no-unused-components
+    CreateReport
+  },
   data() {
     return {
       currentComponent: '',
@@ -212,25 +220,75 @@ export default {
       })
     },
     _exportPrepare(id) {
-      this.$Modal.confirm({
-        title: '提示',
-        content: '确定导出这条记录',
-        onOk: () => {
-          window.open(
-            global.baseURL +
-              '/soil/v1/entrust/export_soil_prepare_record?ids=' +
-              id,
-            '_blank'
-          )
-        }
+      // this.$Modal.confirm({
+      //   title: '提示',
+      //   content: '确定导出这条记录',
+      //   onOk: () => {
+      //     window.open(
+      //       global.baseURL +
+      //         '/soil/v1/entrust/export_soil_prepare_record?ids=' +
+      //         id,
+      //       '_blank'
+      //     )
+      //   }
+      // })
+      this.currentComponent = 'CreateReport'
+      this.$nextTick(() => {
+        this.$refs.refModal._open(id)
       })
     },
     _componentResult(data, msg) {
       switch (this.currentComponent) {
+        case 'CreateReport':
+          this._openSoilRecordMake(data)
+          break
         default:
           this._page()
       }
     },
+    _openSoilRecordMake(data) {
+      if (data) {
+        this.$refs.pageTable._showLoading()
+        this._makeCodeExcel(data)
+      } else {
+        const ids = this.selectIds
+        if (ids.length === 0) {
+          this.$Message.warning('请至少选择一条数据!')
+        } else {
+          // this._appendOriginalRecord()
+        }
+      }
+    },
+    _makeCodeExcel: async function(data) {
+      this.$refs.pageTable._showLoading()
+      const result = await soilSample.saveExcelOpenSoilRecord({
+        entrustId: data.entrustId,
+        templateId: data.id
+      })
+      this.$refs.pageTable._hideLoading()
+      if (result) {
+        await this._page()
+        if (result === null || result === undefined) {
+          this.$Message.warning('证书编制失败，请联系管理员！')
+          this.$refs.pageTable._hideLoading()
+          return false
+        } else {
+          this.$emit('on-result-change')
+          this._viewReport(result)
+        }
+      }
+    },
+    _viewReport(data) {
+      this.$refs.pageTable._hideLoading()
+      if (data) {
+        this.$openWindowModeless({
+          objectKey: data.objectKey,
+          idType: 10,
+          id: data.id,
+          isReport: 4
+        })
+      }
+    },
     _sampleManage(data) {
       this.currentComponent = 'SoilSampleManageHis'
       this.$nextTick(() => {

pm2-start.sh

+#docker 容器启动脚本
+#!/bin/bash
+# 防止container启动后退出，使用命令 tail -f /dev/null
+pm2 start ecosystem.config.js && tail -f /dev/null