Merge branch 'dev' of http://git.patzn.com/wangweidong/pt-cloud-service-soil-web into dev

api/soil/soil-test.js

@@ -75,6 +75,9 @@ export default {
       .then(res => res),
   recordPage: data =>
     http.post('soil/v1/original_record/page', data).then(res => res),
+
+  pageSoilAppendix: data =>
+    http.post('soil/v1/appendix/page', data).then(res => res),
   pageTest: data =>
     http.post('soil/v1/experiment/page_test', data).then(res => res),
   pageCheck: data =>

pages/soil-report-manage/soil-item-report-template/ConfigTemplate.vue

@@ -54,7 +54,8 @@ export default {
         { title: '属性', key: 'dataAttribute', width: 120 },
         { title: '列位置', key: 'columnPlace', width: 120 },
         { title: '合并开始列', key: 'mergeBegin', width: 120 },
-        { title: '合并结束列', key: 'mergeEnd', width: 120 }
+        { title: '合并结束列', key: 'mergeEnd', width: 120 },
+        { title: '合并行数', key: 'mergeRowNum', width: 120 }
       ],
       getPage: {},
       iconMsg: [{ type: 'md-create', id: '', name: '编辑' }],

pages/soil-report-manage/soil-item-report-template/ConfigTemplateEdit.vue

@@ -44,6 +44,16 @@
                     placeholder="请输入合并结束列"
                   />
                 </Form-item>
+                <Form-item label="合并行数" prop="mergeRowNum" class="width-48">
+                  <Input
+                    v-model="formObj.mergeRowNum"
+                    @keydown.native="channelInputLimit"
+                    name="mergeRowNum"
+                    type="number"
+                    onmousewheel="return false"
+                    placeholder="请输入合并行数"
+                  />
+                </Form-item>
               </div>
         </Form>
       </div>
@@ -77,6 +87,7 @@ export default {
         mainType: undefined,
         smallType: undefined,
         testValue: undefined,
+        mergeRowNum: undefined,
         mergeBegin: undefined,
         mergeEnd: undefined
       },

pages/soil-report-manage/soil-item-report-template/SoilReportEdit.vue

@@ -32,24 +32,14 @@
               placeholder="请输入样品开始行"
             />
           </Form-item>
-          <Form-item label="数据占用行" prop="dataTotalRow" class="width-48">
+          <Form-item label="数据占用行" prop="sampleMergerNum" class="width-48">
             <el-input
-              v-model="formObj.dataTotalRow"
-              @keydown.native="channelInputLimit"
-              name="sampleBeginCol"
-              type="number"
-              onmousewheel="return false"
-              placeholder="请输入数据占用行"
-            />
-          </Form-item>
-          <Form-item label="总列数" prop="totalColumn" class="width-48">
-            <el-input
-              v-model="formObj.totalColumn"
+              v-model="formObj.sampleMergerNum"
               @keydown.native="channelInputLimit"
               name="sampleMergerNum"
               type="number"
               onmousewheel="return false"
-              placeholder="请输入总列数"
+              placeholder="请输入数据占用行"
             />
           </Form-item>
           <Form-item label="模板样品数" prop="templateSampleNum" class="width-48">

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

 <template>
   <div>
-    <Modal v-model="showSampleModal" v-drag @on-visible-change="_visibleChange"  width="1200"
-           class="zIndex-900 modal-footer-none">
+    <Modal v-model="showSampleModal" v-drag width="1200"  class="zIndex-900 modal-footer-none"
+           @on-visible-change="_visibleChange">
       <p slot="header"> {{name}}--管理样品</p>
       <div>
         <el-tabs v-model="activeName" @tab-click="_changeTabs">
@@ -17,11 +17,10 @@
           <el-tab-pane label="查看原始记录" name="viewRecord">
             <OriginalRecordView ref="recordModal"></OriginalRecordView>
           </el-tab-pane>
+          <el-tab-pane label="查看报告附件" name="soilAppendixRecord">
+            <SoilAppendix ref="soilAppendixRecordModal"></SoilAppendix>
+          </el-tab-pane>
         </el-tabs>
-<!--        <keep-alive>-->
-<!--          &lt;!&ndash; eslint-disable-next-line vue/require-component-is &ndash;&gt;-->
-<!--          <component ref="refModal" :is="currentComponent"></component>-->
-<!--        </keep-alive>-->
       </div>
     </Modal>
   </div>
@@ -30,11 +29,13 @@
 import WaitReceive from './item-tabs/ItemTabs'
 import WaitScan from './sample-tabs/SampleTabs'
 import OriginalRecordView from './OriginalRecordView'
+import SoilAppendix from './SoilAppendix'
 import ItemReportView from './ItemReportView'
 
 export default {
   components: {
     WaitReceive,
+    SoilAppendix,
     WaitScan,
     OriginalRecordView,
     ItemReportView
@@ -80,16 +81,15 @@ export default {
     },
     _changeTabs(tab, event) {
       if (tab.name === 'viewRecord') {
-        // this._issuedPage()
         this.$refs.recordModal._open(this.entrustId)
+      } else if (tab.name === 'soilAppendixRecord') {
+        this.$refs.soilAppendixRecordModal._open(this.entrustId)
       } else if (tab.name === 'waitReceive') {
-        // this._waitPage()
         this.$refs.waitScanModal._clearTable()
         this.$refs.waitReceiveModal._open(this.entrustId)
       } else if (tab.name === 'waitScan') {
         this.$refs.waitReceiveModal._clearTable()
         this.$refs.waitScanModal._open(this.entrustId)
-        // this._waitSend()
       } else {
         this.$refs.reportModal._open(this.entrustId)
       }

pages/soil-test-manage/test-input/SoilAppendix.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: [],
+      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: '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()
+      }
+    },
+    _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 'search':
+            this.searchOpen = !this.searchOpen
+            break
+        }
+      })
+    },
+    _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._viewReport(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() {
+      Object.assign(this.formObj, this.$refs.pageTable._searchParams())
+      const result = await soilTest.pageSoilAppendix(
+        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-test-manage/test-input/TestInput.vue

@@ -59,10 +59,7 @@
         </Row>
       </div>
     </div>
-    <!--组件加载-->
-    <!--选择领样人-->
     <keep-alive>
-      <!-- eslint-disable-next-line vue/require-component-is -->
       <component ref="refModal" :is="currentComponent" @on-result-change="_componentResult"></component>
     </keep-alive>
   </div>
@@ -73,7 +70,6 @@ import { soilTest } from '../../../api'
 import Operation from '../../../components/operation/Operation'
 import SampleManage from './SampleManage'
 export default {
-  // eslint-disable-next-line vue/no-unused-components
   components: { UserInfo, Operation, SampleManage },
   data() {
     return {
@@ -104,12 +100,8 @@ export default {
         { title: '水深（米）', key: 'waterDepth', width: 120 },
         { title: '钻孔名称', key: 'boreholeName', width: 120 },
         { title: '进度', key: 'progress', width: 120, status: true },
-        // { title: '平均容重', key: 'projectNo', width: 120 },
-        // { title: '报告编号', key: 'reportCode', width: 120 },
         { title: '制表日期', key: 'tabulateDate', width: 120, date: true },
         { title: '制表人', key: 'tabulater', width: 120 },
-        // { title: '批准日期', key: 'approveDate', width: 120, date: true },
-        // { title: '批准人', key: 'approver', width: 120 },
         { title: '检验类别', key: 'testType', width: 120 }
       ],
       searchOpen: false,
@@ -365,7 +357,6 @@ export default {
       this.$nextTick(() => {
         this.$refs.refModal._open(id, type, '数据录入')
       })
-      // this.$refs.sampleManageModal._open(id, type, '数据录入')
     },
     _editModals(res, data) {
       if (res === '登记协议') {

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

@@ -2,20 +2,11 @@
   <div>
     <div class="layout-content-padding">
       <div class="layout-content-main">
-<!--        <el-tabs v-model="activeName" @tab-click="_changeTabs">-->
-<!--          <el-tab-pane label="数据录入" name="wait">-->
-<!--            <SampleBackupsManage ref="waitTabs"></SampleBackupsManage>-->
-<!--          </el-tab-pane>-->
-<!--          <el-tab-pane label="录入历史" name="query">-->
-<!--            <SampleBackupsQuery ref="queryTabs"></SampleBackupsQuery>-->
-<!--          </el-tab-pane>-->
-<!--        </el-tabs>-->
         <el-tabs v-model="activeName" @tab-click="_changeTabs">
           <el-tab-pane label="数据录入" name="waitTabs"></el-tab-pane>
           <el-tab-pane label="录入历史" name="queryTabs"></el-tab-pane>
         </el-tabs>
         <keep-alive>
-          <!-- eslint-disable-next-line vue/require-component-is -->
           <component ref="refModal" :is="currentComponent"></component>
         </keep-alive>
       </div>