修改了收样管理工程类型和项目报告编制查看报告

pages/soil-alone-sample/EntrustRegisterEdit.vue

@@ -70,7 +70,13 @@
 /**
  * 添加编辑分包商
  */
-import { meterEntrust, meterSample, soilEntrust, soilSample } from '../../api'
+import {
+  meterEntrust,
+  meterSample,
+  soilAptitude,
+  soilEntrust,
+  soilSample
+} from '../../api'
 import importModal from '../../components/import/DownloadTemplateImport'
 import AutoComplete from '../../components/base/AutoCompletes'
 import SampleItemSelect from '../meter-aptitude/standard-manage/SampleItemSelect'
@@ -104,20 +110,7 @@ export default {
       searchOpen: true,
       testedCityData: [],
       judgeType: [{ value: 1, name: '是' }, { value: 0, name: '否' }],
-      projectArray: [
-        {
-          name: '开发项目'
-        },
-        {
-          name: '井场项目'
-        },
-        {
-          name: '风电项目'
-        },
-        {
-          name: '其他'
-        }
-      ],
+      projectArray: [],
       itemArray: [
         {
           name: '深孔'
@@ -686,6 +679,7 @@ export default {
       this.edit = false
       this._getProjectList()
       this._getLeaderList()
+      this._getProjectArray()
       this.showBtn = true
       this.showModal = true
       this._hideLoading()
@@ -760,6 +754,16 @@ export default {
         this.projectData = projectlist
       }
     },
+    _getProjectArray: async function() {
+      const result = await soilAptitude.getDictInfo({
+        type: '工程类型',
+        page: 1,
+        rows: 50
+      })
+      if (result) {
+        this.projectArray = result.records
+      }
+    },
     _getLeaderList: async function() {
       const result = await soilSample.getUserList()
       if (result) {

pages/soil-exp-report/report-make/SoilGroupExpReportMake.vue

@@ -9,21 +9,21 @@
             <Form id="search-contract-record" :label-width="70" inline onsubmit="return false">
               <label class="label-sign"></label>
               <Form-item label="项目名称:">
-                <Input v-model="formObj.expName" name="expName" placeholder="请输入项目名称" style="width: 200px"
-                       clearable @on-enter="_search"/>
+                <Input v-model="formObj.expName" @on-enter="_search" name="expName" placeholder="请输入项目名称"
+                       style="width: 200px" clearable/>
               </Form-item>
               <Form-item class="search-btn">
-                <Button type="primary" @click="_search">搜索</Button>
+                <Button @click="_search" type="primary">搜索</Button>
               </Form-item>
             </Form>
           </Col>
           <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 ref="pageTable" :table-height="tableHeight"
-                        :get-page="getPage"  show-check-box @on-result-change="_tableResultChange">
+                        :get-page="getPage" :icon-msg="iconMsg"  @on-result-change="_tableResultChange" show-check-box>
               <vxe-table-column
                 v-for="item in pageColumns"
                 :key="item.key"
@@ -68,6 +68,13 @@ export default {
         { title: '创建时间', key: 'ctime', dateTime: true }
       ],
       btn: [{ id: 'make-report-submit', type: 'primary', name: '提交至审核' }],
+      iconMsg: [
+        {
+          type: 'ios-book',
+          id: 'make-report-view-item-report',
+          name: '查看项目报告'
+        }
+      ],
       formObj: {
         entrustId: undefined,
         expName: undefined,
@@ -97,7 +104,23 @@ export default {
           break
       }
     },
-
+    _iconClick(name, data) {
+      switch (name) {
+        case '查看项目报告':
+          this._viewReport(data)
+          break
+      }
+    },
+    _viewReport(data) {
+      if (data.objectKey) {
+        this.$openWindowModeless({
+          objectKey: data.objectKey,
+          id: data.id,
+          isReport: 4,
+          idType: 11
+        })
+      }
+    },
     _submitExpReportMake() {
       const ids = this.selectIds
       if (ids.length === 0) {
@@ -146,6 +169,9 @@ export default {
         case 'selectIds':
           this.selectIds = data
           break
+        case 'iconClick':
+          this._iconClick(data.name, data.rowData, data.componentName)
+          break
       }
     },
     _search() {