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

api/soil/soil-test.js

@@ -212,6 +212,12 @@ export default {
     http
       .post('soil/v1/exp_report/page_group_exp_report_end', data)
       .then(res => res),
+
+  seniorTestReport: data =>
+    http
+      .post('soil/v1/experiment/senior_test_report?id=' + data)
+      .then(res => res),
+
   pageExperimentReport: data =>
     http.post('soil/v1/exp_report/page', data).then(res => res),
   deleteReport: data =>

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

@@ -5,11 +5,14 @@
       <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="模板名称:">
+          <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 class="search-item" label="附件类型:">
+            <Input v-model="formObj.remark" @on-enter="_formSearch" placeholder="请输入附件类型" clearable></Input>
+          </Form-item>
+          <Form-item class="search-item" label="样品编号:">
+            <Input v-model="formObj.sampleCode" @on-enter="_formSearch" placeholder="请输入样品编号" clearable></Input>
           </Form-item>
           <Form-item class="search-btn">
             <Button @click="_formSearch" type="primary">搜索</Button>
@@ -85,7 +88,7 @@ export default {
       formObj: {
         entrustId: ''
       },
-      searchOpen: false
+      searchOpen: true
     }
   },
   computed: {

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

@@ -6,21 +6,21 @@
         <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.sampleCode" name="sampleCode" placeholder="请输入试样编号" clearable @on-enter="_formSearch"></Input>
           </Form-item>
           <Form-item class="search-btn">
-            <Button @click="_formSearch" type="primary">搜索</Button>
+            <Button type="primary" @click="_formSearch">搜索</Button>
           </Form-item>
         </Form>
       </Col>
       <!--操作-->
       <Col span="24">
-        <btn-list :msg="btn" @on-result-change="_btnClick" class="contHide"></btn-list>
+        <btn-list :msg="btn" class="contHide" @on-result-change="_btnClick"></btn-list>
       </Col>
       <!-- 表格 -->
       <Col span="24">
         <PTVXETable ref="pageTable" :page-columns="pageColumns" :table-height="tableHeight"
-                    :get-page="getPage" :icon-msg="iconMsg" :table-name="tableName" @on-result-change="_tableResultChange"  is-task select-data>
+                    :get-page="getPage" :icon-msg="iconMsg" :table-name="tableName" is-task  select-data @on-result-change="_tableResultChange">
           <vxe-table-column
             v-for="item in userColumns.length > 0 ?userColumns:pageColumns"
             :key="item.key"
@@ -149,6 +149,7 @@ export default {
       ],
       iconMsg: [
         { type: 'ios-book', id: '', name: '查看原始记录' },
+        { type: 'md-clipboard', id: '', name: '高级实验报告生成' },
         { type: 'ios-list-box', id: '', name: '查看GDS数据' },
         { type: 'md-apps', id: '', name: '查看指标' },
         { type: 'ios-bookmarks', id: '', name: '查看采集数据' },
@@ -212,15 +213,9 @@ export default {
         switch (res) {
           case '查看原始记录':
             this._reportView(data)
-            // console.log(data)
-            // if (data.recorded === '是') {
-            //   this.$refs.editModal._openWithType(
-            //     data.recordId,
-            //     'ENVTESTMAKEEDIT'
-            //   )
-            // } else {
-            //   this.$Message.warning('未填写原始记录')
-            // }
+            break
+          case '高级实验报告生成':
+            this._seniorTestReport(data)
             break
           case '查看GDS数据':
             this._viewGdsData(data.sampleCode)
@@ -272,6 +267,14 @@ export default {
         this.$Message.warning('未填写原始记录')
       }
     },
+
+    _seniorTestReport: async function(data) {
+      const result = await soilTest.seniorTestReport(data.id)
+      if (result) {
+        this._viewExpReport(result)
+      }
+    },
+
     _reportMakeLook: async function(data) {
       const result = await soilReport.getExcelOriginalRecord(data.id)
       if (result) {
@@ -325,6 +328,17 @@ export default {
         })
       }
     },
+    _viewExpReport(data) {
+      this.$refs.pageTable._hideLoading()
+      if (data) {
+        this.$openWindowModeless({
+          objectKey: data.objectKey,
+          idType: 13,
+          id: data.id,
+          isReport: 4
+        })
+      }
+    },
     _collectManage(data) {
       this.$refs.collectModal._open(data)
     },