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

api/homePage.js

+function test() {
+  console.log(123)
+}
+function waveImg(dataPersonal) {
+  const xData = []
+  const yData = []
+  const sevenList = dataPersonal
+  for (let i = 0; i < sevenList.length; i++) {
+    const obj = sevenList[i]
+    xData.push(obj.dayIns)
+    yData.push(obj.insNum)
+  }
+  const echarts = require('echarts')
+  const myChart = echarts.init(document.getElementById('waveImg'))
+  myChart.setOption({
+    title: {
+      text: ''
+    },
+    tooltip: {},
+    xAxis: {
+      data: xData,
+      boundaryGap: false,
+      show: false,
+      splitLine: {
+        show: false
+      }
+    },
+    yAxis: {
+      show: false,
+      splitLine: {
+        show: false
+      }
+    },
+    series: [
+      {
+        name: '',
+        type: 'line',
+        smooth: true,
+        areaStyle: {},
+        itemStyle: {
+          normal: {
+            color: 'lightblue', // 圈圈的颜色
+            lineStyle: {
+              color: 'lightblue' // 线的颜色
+            }
+          }
+        },
+        data: yData
+      }
+    ],
+    grid: {
+      top: 30,
+      // left: 0,
+      height: 60
+    }
+  })
+  // setTimeout(() => {
+  //   myChart.resize()
+  // }, 1000)
+}
+function histogram(listSevenReceive) {
+  const xData = []
+  const yData = []
+  const sevenList = listSevenReceive
+  for (let i = 0; i < sevenList.length; i++) {
+    const obj = sevenList[i]
+    xData.push(obj.dayIns)
+    yData.push(obj.insNum)
+  }
+  console.log(xData)
+  console.log(yData)
+  const echarts = require('echarts')
+  const myChart = echarts.init(document.getElementById('histogram'))
+  myChart.setOption({
+    title: {
+      text: ''
+    },
+    tooltip: {},
+    xAxis: {
+      data: xData,
+      type: 'category',
+      boundaryGap: true,
+      show: false,
+      splitLine: {
+        show: false
+      }
+    },
+    yAxis: {
+      show: false,
+      splitLine: {
+        show: false
+      }
+    },
+    series: [
+      {
+        name: '',
+        type: 'bar',
+        smooth: true,
+        areaStyle: {},
+        itemStyle: {
+          normal: {
+            color: 'lightblue', // 圈圈的颜色
+            lineStyle: {
+              color: 'lightblue' // 线的颜色
+            }
+          }
+        },
+        data: yData
+      }
+    ],
+    grid: {
+      top: 30,
+      // left: 0,
+      height: 60
+    }
+  })
+}
+function saleImg(itemNotOk) {
+  const xData = []
+  const yData = []
+  const sevenList = itemNotOk
+  for (let i = 0; i < sevenList.length; i++) {
+    const obj = sevenList[i]
+    xData.push(obj.name)
+    yData.push(obj.number)
+  }
+  const echarts = require('echarts')
+  const myChart = echarts.init(document.getElementById('saleImg'))
+  myChart.setOption({
+    color: ['#3398DB'],
+    tooltip: {
+      trigger: 'axis',
+      axisPointer: {
+        // 坐标轴指示器，坐标轴触发有效
+        type: 'shadow' // 默认为直线，可选为：'line' | 'shadow'
+      }
+    },
+    grid: {
+      left: '3%',
+      right: '4%',
+      bottom: '3%',
+      containLabel: true
+    },
+    xAxis: [
+      {
+        type: 'category',
+        data: xData,
+        axisTick: {
+          alignWithLabel: true
+        }
+      }
+    ],
+    yAxis: [
+      {
+        type: 'value'
+      }
+    ],
+    series: [
+      {
+        name: '不合格数量',
+        type: 'bar',
+        barWidth: '60%',
+        data: yData
+      }
+    ]
+  })
+}
+function salesTrendImg(sampleList) {
+  const xData = []
+  const yData = []
+  const sevenList = sampleList
+  for (let i = 0; i < sevenList.length; i++) {
+    const obj = sevenList[i]
+    xData.push(obj.name)
+    yData.push(obj.number)
+  }
+  const echarts = require('echarts')
+  const myChart = echarts.init(document.getElementById('salesTrendImg'))
+  myChart.setOption({
+    color: ['lightblue'],
+    tooltip: {
+      trigger: 'axis',
+      axisPointer: {
+        // 坐标轴指示器，坐标轴触发有效
+        type: 'shadow' // 默认为直线，可选为：'line' | 'shadow'
+      }
+    },
+    grid: {
+      top: 10,
+      left: '3%',
+      right: '4%',
+      bottom: '3%',
+      containLabel: true
+    },
+    xAxis: [
+      {
+        type: 'category',
+        data: xData,
+        axisTick: {
+          alignWithLabel: true
+        }
+      }
+    ],
+    yAxis: [
+      {
+        type: 'value'
+      }
+    ],
+    series: [
+      {
+        name: '',
+        type: 'bar',
+        barWidth: '60%',
+        data: yData
+      }
+    ]
+  })
+}
+function visitImg(data) {
+  const xData = []
+  const yData = []
+  const zData = []
+  const sevenList = data.sampleRank
+  const sevenListItem = data.itemRank
+  for (let i = 0; i < sevenList.length; i++) {
+    const obj = sevenList[i]
+    xData.push(obj.name)
+    yData.push(obj.number)
+  }
+  for (let i = 0; i < sevenListItem.length; i++) {
+    const obj = sevenListItem[i]
+    zData.push(obj.number)
+  }
+  const echarts = require('echarts')
+  const myChart = echarts.init(document.getElementById('visitImg'))
+  myChart.setOption({
+    title: {
+      // text: '折线图堆叠'
+    },
+    tooltip: {
+      trigger: 'axis'
+    },
+    legend: {
+      data: ['报检量', '项目量']
+    },
+    grid: {
+      top: 20,
+      left: '3%',
+      right: '4%',
+      bottom: '3%',
+      containLabel: true
+      // height: 320
+    },
+    toolbox: {
+      feature: {
+        saveAsImage: {}
+      }
+    },
+    xAxis: {
+      type: 'category',
+      boundaryGap: false,
+      data: xData
+    },
+    yAxis: {
+      type: 'value'
+    },
+    series: [
+      {
+        name: '报检量',
+        type: 'line',
+        data: yData
+      },
+      {
+        name: '项目量',
+        type: 'line',
+        data: zData
+      }
+    ]
+  })
+  console.log('js加载完成')
+}
+export { test, waveImg, histogram, saleImg, salesTrendImg, visitImg }

api/index.js

@@ -30,3 +30,4 @@ export { default as soilAptitude } from './soil/soil-aptitude'
 export { default as soilEntrust } from './soil/soil-entrust'
 export { default as soilSample } from './soil/soil-sample'
 export { default as soilTest } from './soil/soil-test'
+export { default as soilStatistics } from './soil/soil-statistics'

api/soil/soil-statistics.js

+/**
+ * 工作台
+ */
+
+import http from '../http'
+// import { https } from '../https'
+
+export default {
+  // 检测依据管理
+  standardPage: data =>
+    http.post('soil/v1/standard/page', data).then(res => res),
+  standardGetById: data =>
+    http.get('soil/v1/standard/' + data).then(res => res),
+  standardSave: data => http.post('soil/v1/standard/', data).then(res => res),
+  standardEdit: data =>
+    http.put('soil/v1/standard/' + data.id, data.obj).then(res => res),
+  standardDeleteById: data =>
+    http.delete('soil/v1/standard/?ids=' + data).then(res => res),
+  // 试验项目
+  // page
+  page: data => http.post('soil/v1/aptitude_exp/page', data).then(res => res),
+  getById: data => http.get('soil/v1/aptitude_exp/' + data).then(res => res),
+  deleteById: data =>
+    http.delete('soil/v1/aptitude_exp/?ids=' + data).then(res => res),
+  // 保存
+  save: data => http.post('soil/v1/aptitude_exp/', data).then(res => res),
+  edit: data =>
+    http.put('soil/v1/aptitude_exp/' + data.id, data.obj).then(res => res),
+  // 指标页面
+  expItemPage: data =>
+    http.post('soil/v1/exp_item/page', data).then(res => res),
+  expItemDeleteByIds: data =>
+    http.delete('soil/v1/exp_item/?ids=' + data).then(res => res),
+  expItemSave: data => http.post('soil/v1/exp_item/', data).then(res => res),
+  expItemEdit: data =>
+    http.put('soil/v1/exp_item/' + data.id, data.obj).then(res => res),
+  expItemGetById: data => http.get('soil/v1/exp_item/' + data).then(res => res)
+}

api/soil/soil-test.js

@@ -43,5 +43,23 @@ export default {
       .post('/env/v1/env_item/search_all_common_sample_count', data)
       .then(res => res),
   saveItem: data =>
-    http.post('/env/v1/env_item/save_form_for_item', data).then(res => res)
+    http
+      .post('soil/v1/original_record/save_original_record', data)
+      .then(res => res),
+  recordPage: data =>
+    http.post('soil/v1/original_record/page', data).then(res => res),
+  pageTest: data =>
+    http.post('soil/v1/experiment/page_test', data).then(res => res),
+  updateItem: data =>
+    http
+      .post('soil/v1/original_record/update_original_record', data)
+      .then(res => res),
+  pageOriginalExp: data =>
+    http.post('soil/v1/experiment/page_original_exp', data).then(res => res),
+  // 查看指标分页列表
+  itemPage: data => http.post('soil/v1/item/page', data).then(res => res),
+  itemSave: data => http.post('soil/v1/item/', data).then(res => res),
+  itemEdit: data =>
+    http.put('soil/v1/item/' + data.id, data.obj).then(res => res),
+  itemGetById: data => http.get('soil/v1/item/' + data).then(res => res)
 }

nuxt.config.js

@@ -27,6 +27,9 @@ module.exports = {
       {
         src:
           'http://static.patzn.com/thirdparty/ztree/zTree_v3-3.5.29/js/jquery.ztree.all.min.js'
+      },
+      {
+        src: 'http://static.patzn.com/thirdparty/layx/layx-2.5.3.min.js'
       }
     ],
     link: [
@@ -52,7 +55,11 @@ module.exports = {
         rel: 'stylesheet',
         href: 'http://static.patzn.com/theme/my-theme/main.css'
       },
-      { rel: 'stylesheet', href: '', name: 'theme' }
+      { rel: 'stylesheet', href: '', name: 'theme' },
+      {
+        rel: 'stylesheet',
+        href: 'http://static.patzn.com/thirdparty/layx/layx-2.5.3.min.css'
+      }
     ]
   },
 

pages/meter-entrust/SoilSampleItemManage.vue

@@ -121,10 +121,7 @@ export default {
     return {
       formId: 'SampleItemManage',
       currentComponent: '',
-      btn: [
-        { type: 'success', id: '', name: '提交分包' },
-        { type: 'success', id: '', name: '取消分包' }
-      ],
+      btn: [],
       iconMsg: [{ type: 'pt-a-end', id: '', name: '删除' }],
       sampleId: '', // 样品id
       showModal: false,

pages/meter-entrust/SoilSampleManage.vue

@@ -43,7 +43,7 @@
           <!-- 表格 -->
           <Col span="24">
             <PTVXETable ref="pageTable" :table-height="tableHeight" :form-id="formId" :loading="true"
-                        :get-page="getPage" :icon-msg="iconMsg"  @on-result-change="_tableResultChange">
+                        :get-page="getPage" :icon-msg="iconMsg" @on-result-change="_tableResultChange"  select-data>
               <vxe-table-column
                 v-for="item in pageColumns"
                 :key="item.key"
@@ -90,21 +90,21 @@ export default {
       formId: 'soilSampleManage',
       currentComponent: '',
       btn: [
-        {
-          type: 'success',
-          id: '',
-          name: '导入检测项目'
-        },
-        {
-          type: 'success',
-          id: '',
-          name: '导入检测项目包'
-        },
-        {
-          type: 'success',
-          id: '',
-          name: '打印标签'
-        }
+        // {
+        //   type: 'success',
+        //   id: '',
+        //   name: '导入检测项目'
+        // }
+        // {
+        //   type: 'success',
+        //   id: '',
+        //   name: '导入检测项目包'
+        // },
+        // {
+        //   type: 'success',
+        //   id: '',
+        //   name: '打印标签'
+        // }
       ],
       itemList: [],
       indexList: [],

pages/meter-entrust/entrust-register/EntrustRegister.vue

@@ -314,7 +314,7 @@ export default {
 
     _upload(id) {
       // 上传文件
-      this.$refs.FileManage._open(id, 'contractId')
+      this.$refs.FileManage._open(id, 'entrustId')
     },
     _exportEntrust(id) {
       this.$Modal.confirm({

pages/meter-entrust/entrust-review/ReviewEntrust.vue

@@ -58,8 +58,8 @@
 import { soilEntrust } from '../../../api'
 import Operation from '../../../components/operation/Operation'
 import Reason from '../../../components/base/Reason'
+import SampleManage from '../SoilSampleManage'
 import EntrustDetail from './EntrustDetail'
-import SampleManage from './SampleManage'
 export default {
   components: { Operation, Reason, EntrustDetail, SampleManage },
   data() {
@@ -313,7 +313,7 @@ export default {
 
     _upload(id) {
       // 上传文件
-      this.$refs.FileManage._open(id, 'contractId')
+      this.$refs.FileManage._open(id, 'entrustId')
     }
     // _getById: async function(id) {
     //   const result = await meterSubcontractor.getById(id)

pages/meter-entrust/entrust-review/SampleManage.vue

@@ -63,6 +63,7 @@
   </div>
 </template>
 <script>
+import { soilEntrust } from '../../../api'
 export default {
   components: {
     // FoodSampleGovernDetail,
@@ -136,14 +137,11 @@ export default {
       selectData: [],
       getPage: {},
       pageColumns: [
-        { title: '样品编号', key: 'code', width: 140 },
-        { title: '样品名称', key: 'name', width: 140 },
-        { title: '型号规格', key: 'spec', width: 140 },
-        { title: '出厂编号', key: 'factoryNumber', width: 140 },
-        // { title: '检测项目', key: 'itemNames', width: 140 },
-        { title: '是否分包', key: 'jobOut', width: 110 },
-        { title: '检测类型', key: 'type', width: 140 },
-        { title: '数量', key: 'quantity', width: 140 }
+        { title: '试样编号', key: 'sampleCode', width: 160, fixed: 'left' },
+        { title: '试样深度', key: 'sampleDepth', width: 160 },
+        { title: '土质描述', key: 'sampleDescribe', width: 160 },
+        { title: '样品包装类型', key: 'samplePack', width: 160 },
+        { title: '现场编号', key: 'siteNo', width: 130 }
       ],
       dateList: [],
       formObj: {
@@ -259,8 +257,15 @@ export default {
     _formSearch() {
       this.$refs.pageTable._pageChange(1)
     },
-    _page() {
-      console.log(123)
+    _page: async function() {
+      Object.assign(this.formObj, this.$refs.pageTable._searchParams())
+      const result = await soilEntrust.samplePage(
+        this.$serializeForm(this.formObj)
+      )
+      if (result) {
+        this.$refs.pageTable._hideLoading()
+        this.getPage = result
+      }
     },
     // _page: async function() {
     //   this.selectIds = []

pages/soil-report-manage/report-make/ReportMakeIndex.vue

+<template>
+  <div>
+    <div class="layout-content-padding">
+      <div class="layout-content-main">
+        <el-tabs v-model="activeName" @tab-click="_changeTabs">
+          <el-tab-pane label="按委托编制" name="check">
+            <ReportMakeByEntrust ref="checkTabs"></ReportMakeByEntrust>
+          </el-tab-pane>
+          <el-tab-pane label="历史报告" name="checkHis">
+            <ReportMakeHis ref="checkHisTabs"></ReportMakeHis>
+          </el-tab-pane>
+        </el-tabs>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import ReportMakeByEntrust from './tabs/ReportMakeByEntrust'
+import ReportMakeHis from './ReportMakeHis'
+
+export default {
+  components: {
+    ReportMakeByEntrust,
+    ReportMakeHis
+  },
+  data() {
+    return {
+      activeName: 'check'
+    }
+  },
+  mounted() {
+    this.activeName = 'check'
+    this.$refs.checkTabs._page()
+  },
+  methods: {
+    _changeTabs(tab, event) {
+      if (tab.name === 'check') {
+        this.$refs.checkTabs._open()
+      } else if (tab.name === 'applyRecord') {
+        // this.$refs.applyRecordTabs._page()
+      } else {
+        this.$refs.checkHisTabs._page()
+      }
+    }
+  }
+}
+</script>

pages/soil-report-manage/report-make/SampleByMakeModal.vue

+<template>
+  <div>
+    <!--内容-->
+    <Modal v-model="showModal" :width="100" class="modal-footer-none modal-top-0">
+      <p slot="header">{{modalTitle}}</p>
+      <div>
+        <el-tabs v-model="activeName" @tab-click="_changeTabs">
+          <el-tab-pane label="样品台账" name="sample">
+            <ReportMakeBySample ref="sampleTabs" @on-result-change="_sampleTabResult"></ReportMakeBySample>
+          </el-tab-pane>
+          <el-tab-pane label="报告台账" name="report">
+            <ReportInfoMake ref="reportTabs"></ReportInfoMake>
+          </el-tab-pane>
+        </el-tabs>
+      </div>
+    </Modal>
+  </div>
+</template>
+<script>
+import ReportInfoMake from './tabs/ReportInfoMake'
+import ReportMakeBySample from './tabs/ReportMakeBySample'
+
+export default {
+  components: {
+    ReportMakeBySample,
+    ReportInfoMake
+  },
+  data() {
+    return {
+      showModal: false,
+      modalTitle: '',
+      activeName: '',
+      contractId: '',
+      type: '',
+      personal: ''
+    }
+  },
+  computed: {
+    tableHeight: function() {
+      return document.documentElement.clientHeight - 135
+    }
+  },
+  methods: {
+    _open(contractId, title, type, personal) {
+      this.modalTitle = '管理样品和报告'
+      this.showModal = true
+      this.activeName = 'sample'
+      this.contractId = contractId
+      this.type = type
+      this.personal = personal
+      // 先初始化样品台账的数据
+      // this.$nextTick(() =>
+      //   this.$refs.sampleTabs._getPage(
+      //     this.contractId,
+      //     this.type,
+      //     this.personal
+      //   )
+      // )
+      // this._sampleData(contractId)
+    },
+    // 判断待编样品是否为0
+    _sampleData(contractId) {
+      const data = {
+        contractId: contractId,
+        onlyReportMake: 1,
+        reported: 0,
+        page: 1,
+        rows: 50,
+        personal: this.personal
+      }
+      this.$store.dispatch('FoodSample/pageSampleReportMake', data).then(() => {
+        const records = this.$store.state.FoodSample.page.records
+        if (records.length === 0) {
+          this.activeName = 'report'
+          this.$nextTick(() => this._report())
+        } else {
+          this.activeName = 'sample'
+          this.$nextTick(() =>
+            this.$refs.sampleTabs._getPage(
+              this.contractId,
+              this.type,
+              this.personal
+            )
+          )
+        }
+      })
+    },
+    _report() {
+      this.$refs.reportTabs._open(this.contractId, this.personal)
+    },
+    _sample() {
+      this.$refs.sampleTabs._open(this.contractId, this.type, this.personal)
+    },
+    _changeTabs(tab, event) {
+      switch (tab.name) {
+        case 'sample':
+          this._sample()
+          break
+        case 'report':
+          this._report()
+          break
+      }
+    },
+    _sampleTabResult(msg) {
+      if (msg === 'changeTab') {
+        this.activeName = 'report'
+        this.$refs.reportTabs._open(this.contractId, this.personal)
+      }
+    }
+  }
+}
+</script>

pages/soil-report-manage/report-make/tabs/ReportMakeByEntrust.vue

+<template>
+  <div>
+    <!--内容-->
+    <div class="layout-content-padding">
+      <div class="layout-content-main">
+        <Row>
+          <!--查询-->
+          <Col span="24">
+            <Form id="search-form-make-contract" :label-width="90" v-show="searchOpen" inline onsubmit="return false">
+              <label class="label-sign"></label>
+              <Form-item class="search-item" label="委托单位:">
+                <Input @on-enter="_formSearch" name="cname" placeholder="请输入委托单位" clearable/>
+              </Form-item>
+              <Form-item class="search-item" label="委托编号:">
+                <Input @on-enter="_formSearch" name="code" placeholder="请输入委托编号" clearable/>
+              </Form-item>
+              <Form-item class="search-item" label="样品编号:">
+                <Input @on-enter="_formSearch" name="num" placeholder="请输入样品编号" clearable/>
+              </Form-item>
+              <Form-item class="search-btn">
+                <Button @click="_formSearch" type="primary">搜索</Button>
+              </Form-item>
+            </Form>
+          </Col>
+          <Col span="24">
+            <btn-list :open="searchOpen" @on-result-change="_btnClick" :showSearchBtn="true"
+                     :msg="btn" class="contHide">
+<!--              <template slot="processTask">-->
+<!--                <div class="fr process-task">-->
+<!--                  <el-checkbox v-model="personal" @change="_page" :true-label="1" :false-label="0" size="medium">-->
+<!--                    个人任务-->
+<!--                  </el-checkbox>-->
+<!--                  <el-checkbox v-model="onlyReportMake" @change="_page" :true-label="1"-->
+<!--                               :false-label="0" size="medium">只显示待编报告-->
+<!--                  </el-checkbox>-->
+<!--                </div>-->
+<!--              </template>-->
+            </btn-list>
+          </Col>
+          <!-- 表格 -->
+          <Col span="24">
+            <PTVXETable
+              ref="pageTable"
+              :tableHeight="tableHeight"
+              :getPage="getPage"
+              :iconMsg="iconMsg"
+              @on-result-change="_tableResultChange" :rows="100">
+              <vxe-table-column
+                v-for="item in pageColumns"
+                :key="item.key"
+                :field="item.key"
+                :title="item.title"
+                :width="item.width"
+                :min-width="200"
+                :fixed="item.fixed?item.fixed:undefined"
+                sortable
+              >
+                <template slot-scope="scope">
+                  <a @click.stop="_detailModal(scope.row.id,scope.row.type)"
+                     v-if="item.detail">{{scope.row[item.key]}}</a>
+                  <div v-else-if="item.type">{{scope.row[item.key]?'政府':'企业'}}</div>
+                  <div v-else-if="item.date">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'): ''}}
+                  </div>
+                  <div v-else-if="item.key==='havePhoto'">{{scope.row[item.key]===1?'是':
+                    scope.row[item.key]===0?'否':''}}
+                  </div>
+                  <div v-else-if="item.status">
+                    {{scope.row[item.key].display}}
+                  </div>
+                  <div v-else-if="item.judge">
+                    {{Number(scope.row[item.key]) === 0? '否':'是'}}
+                  </div>
+                  <div v-else>{{scope.row[item.key]}}</div>
+                </template>
+              </vxe-table-column>
+            </PTVXETable>
+          </Col>
+        </Row>
+      </div>
+    </div>
+    <SampleByMakeModal ref="sampleByMakeModal"></SampleByMakeModal>
+  </div>
+</template>
+<script>
+import { soilTest } from '../../../../api'
+import SampleByMakeModal from '../SampleByMakeModal'
+export default {
+  components: { SampleByMakeModal },
+  data() {
+    return {
+      typeList: [{ name: '企业', value: 0 }, { name: '政府', value: 1 }],
+      currentComponent: '',
+      getPage: {},
+      formObj: {},
+      pageColumns: [
+        {
+          title: '委托单位',
+          key: 'cname',
+          width: 180,
+          detail: true,
+          fixed: 'left'
+        },
+        { title: '委托名称', key: 'name', width: 160 },
+        { title: '委托编号', key: 'code', width: 180 },
+        { title: '类型', key: 'type', width: 80, type: true },
+        { title: '状态', key: 'progress', width: 110, status: true },
+        { title: '应出报告日期', key: 'reportDueDate', width: 130, date: true },
+        { title: '是否判定', key: 'judge', width: 100, judge: true },
+        {
+          title: '报告剩余天数',
+          key: 'reportRemainDay',
+          width: 130,
+          day: true
+        },
+        { title: '报告进度统计', key: 'reportProgress', width: 450 },
+        { title: '主联系人', key: 'linkman', width: 100 },
+        { title: '联系手机', key: 'tel', width: 120 },
+        { title: '检测类型', key: 'detectType', width: 130 },
+        { title: '服务类型', key: 'serviceType', width: 120 },
+        { title: '是否带照片', key: 'havePhoto', width: 120 },
+        { title: '报告语言', key: 'reportType', width: 100 },
+        { title: '报告类别', key: 'reportClass', width: 120 },
+        { title: '备注', key: 'remark' }
+      ],
+      iconMsg: [
+        {
+          type: 'ios-flask-outline',
+          id: '',
+          name: '管理样品和报告'
+        },
+        {
+          type: 'ios-document-outline',
+          id: '',
+          name: '检测项目'
+        },
+        { type: 'ios-cloud-outline', id: '', name: '附件' },
+        {
+          type: 'ios-clock-outline',
+          id: '',
+          name: '操作记录',
+          componentName: 'FoodContractRecord'
+        }
+      ],
+      onlyReportMake: 1,
+      searchOpen: false,
+      btn: [
+        {
+          type: 'primary',
+          id: 'food-report-make-maintain-info',
+          name: '信息维护'
+        }
+      ],
+      selectIds: [],
+      personal: 0
+    }
+  },
+  computed: {
+    tableHeight: function() {
+      if (this.searchOpen) {
+        return this.$tableHeight('tabSearchTwo')
+      } else {
+        return this.$tableHeight('tabNoSearch')
+      }
+    }
+  },
+  mounted() {
+    // this._dicSearch()
+  },
+  methods: {
+    _open() {
+      // this._dicSearch()
+    },
+    _reportDateChange(data) {
+      $('input[name="reportDueDateBegin"]').val(data[0])
+      $('input[name="reportDueDateEnd"]').val(data[1])
+    },
+    // 从字典查预警期
+    _dicSearch() {
+      // 食品报告编制个人任务是否勾选
+      const data = ['食品报告编制个人任务是否勾选']
+      this.$store.dispatch('LmsBaseDict/listDict', data).then(() => {
+        const result = this.$store.state.LmsBaseDict.list
+        const personalList = result[0]
+        // 食品报告编制个人任务是否勾选
+        if (personalList.length && personalList[0].name === '是') {
+          this.personal = 1
+        } else {
+          this.personal = 0
+        }
+        this._page()
+      })
+    },
+    _btnClick(msg) {
+      switch (msg) {
+        case '信息维护':
+          this._maintainInfo()
+          break
+        case 'search':
+          this.searchOpen = !this.searchOpen
+          break
+      }
+    },
+    // 信息维护
+    _maintainInfo() {
+      if (this.selectIds.length === 0) {
+        this.$Message.warning('请至少选择一条数据！')
+      } else {
+        this.currentComponent = 'MaintainInfoModal'
+        this.$nextTick(() => {
+          this.$refs.refModal._open(this.selectIds, 1)
+        })
+      }
+    },
+    _iconClick(res, data, componentName) {
+      this.currentComponent = componentName
+      this.$nextTick(function() {
+        switch (res) {
+          case '管理样品和报告':
+            this.$refs.sampleByMakeModal._open(
+              data.id,
+              data.cname + '【' + data.code + '】',
+              data.type,
+              this.personal
+            )
+            break
+          case '检测项目':
+            this.$refs.refModal._open(data)
+            break
+          case '操作记录':
+            this.$refs.refModal._open(data.id)
+            break
+          case '附件':
+            this._upload(data.id)
+            break
+        }
+      })
+    },
+    _tableResultChange(msg, data) {
+      switch (msg) {
+        case 'page':
+          this.getPage = this.$store.state.FoodContract.page
+          this.selectIds = []
+          break
+        case 'selectIds':
+          this.selectIds = data
+          break
+        case 'iconClick':
+          this._iconClick(data.name, data.rowData, data.componentName)
+          break
+        case 'changeSize':
+          this._page()
+          break
+      }
+    },
+    _page: async function() {
+      Object.assign(this.formObj, this.$refs.pageTable._searchParams())
+      const result = await soilTest.pageExpTest(
+        this.$serializeForm(this.formObj)
+      )
+      if (result) {
+        this.$refs.pageTable._hideLoading()
+        this.getPage = result
+      }
+    },
+    _formSearch() {
+      this.$refs.pageTable._pageChange(1)
+    },
+    _detailModal(id, type) {
+      // 查看
+      this.$store.dispatch('FoodContract/getById', id).then(() => {
+        if (type === 0) {
+          // 企业委托 ’0‘
+          this.currentComponent = 'FoodContractCompanyDetail'
+        } else {
+          // 政府委托 ’1‘
+          this.currentComponent = 'FoodContractGovernDetail'
+        }
+        this.$nextTick(function() {
+          this.$refs.refModal._open(this.$store.state.FoodContract.model)
+        })
+      })
+    },
+    _upload(id) {
+      // 上传文件
+      this.$refs.refModal._open(id, 'contractId')
+    }
+  }
+}
+</script>

pages/soil-sample-manage/backups-manage/tab/SampleBackupsManage.vue

@@ -166,20 +166,20 @@ export default {
       pageColumns: [
         { title: '委托商', key: 'client', width: 180 },
         { title: '委托编号', key: 'entrustCode', width: 180 },
-        { title: '存储条件', key: 'conditions', width: 180 },
         { title: '试样编号', key: 'sampleCode', width: 180 },
         { title: '试样深度', key: 'sampleDepth', width: 180 },
         { title: '样品包装类型', key: 'samplePack', width: 180 },
         { title: '现场编号', key: 'siteNo', width: 180 },
+        { title: '存储条件', key: 'conditions', width: 180 },
         { title: '备样位置', key: 'backupLocation', width: 180 },
         { title: '备样数量', key: 'quantity', width: 180 },
         { title: '备样人', key: 'backupUser', width: 140 },
         { title: '钻孔位置', key: 'boreholeLocation', width: 110 },
         { title: '钻孔名称', key: 'boreholeName', width: 160 },
         { title: '水深（米）', key: 'waterDepth', width: 160 },
-        { title: '状态', key: 'status', width: 160 },
-        { title: '备份开始日期', key: 'startTime', width: 170 },
-        { title: '备份结束日期', key: 'endTime', width: 170 }
+        { title: '状态', key: 'status', width: 160 }
+        // { title: '备份开始日期', key: 'startTime', width: 170 },
+        // { title: '备份结束日期', key: 'endTime', width: 170 }
         /*  {title: '处置方式', key: 'handleMethod', width: 120,}, */
       ],
       conditionList: [],

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

@@ -144,12 +144,12 @@ 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: '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: 'approveDate', width: 120, date: true },
+        // { title: '批准人', key: 'approver', width: 120 },
         { title: '检验类别', key: 'testType', width: 120 }
       ]
     }

pages/soil-sample-manage/sample-receive/ReceiveByEntrust.vue

@@ -65,6 +65,7 @@
     <SampleManage ref="sampleManageModal" @on-result-change="_page"></SampleManage>
     <ItemManage ref="itemManageModal" @on-result-change="_page"></ItemManage>
     <Operation ref="operation"></Operation>
+    <FileManage ref="FileManage"></FileManage>
   </div>
 </template>
 <script>
@@ -98,13 +99,13 @@ export default {
           id: '',
           name: '项目管理'
         },
-        {
-          type: 'md-create',
-          id: '',
-          name: '编辑协议'
-        },
+        // {
+        //   type: 'md-create',
+        //   id: '',
+        //   name: '编辑协议'
+        // },
         { type: 'md-cloud', id: '', name: '附件' },
-        { type: 'md-trash', id: '', name: '删除' },
+        // { type: 'md-trash', id: '', name: '删除' },
         {
           type: 'ios-clock',
           id: '',
@@ -452,7 +453,7 @@ export default {
     },
     _upload(id) {
       // 上传文件
-      this.$refs.refModal._open(id, 'contractId')
+      this.$refs.FileManage._open(id, 'entrustId')
     }
   }
 }

pages/soil-sample-manage/sample-receive/ReceiveBySample.vue

@@ -33,7 +33,6 @@
               :tableHeight="tableHeight"
               @on-result-change="_tableResultChange"
               :getPage="getPage"
-              :icon-msg="iconMsg"
               select-data>
               <vxe-table-column
                 v-for="item in pageColumns"
@@ -80,13 +79,13 @@ export default {
       formObj: { num: undefined, name: undefined },
       iconMsgDis: [],
       iconMsg: [
-        {
-          type: 'md-create',
-          id: '',
-          name: '编辑'
-        },
+        // {
+        //   type: 'md-create',
+        //   id: '',
+        //   name: '编辑'
+        // },
         { type: 'md-cloud', id: '', name: '附件' },
-        { type: 'md-trash', id: '', name: '删除' },
+        // { type: 'md-trash', id: '', name: '删除' },
         {
           type: 'ios-clock',
           id: '',

pages/soil-sample-manage/sample-receive/entrust-sample-manage/AlreadyIssued.vue

@@ -36,7 +36,6 @@
             :tableHeight="tableHeight"
             @on-result-change="_tableResultChange"
             :getPage="getPage"
-            :iconMsg="iconMsg"
             select-data>
             <vxe-table-column
               v-for="item in pageColumns"

pages/soil-sample-manage/sample-receive/entrust-sample-manage/WaitReceive.vue

@@ -34,7 +34,6 @@
             :tableHeight="tableHeight"
             @on-result-change="_tableResultChange"
             :getPage="getPage"
-            :iconMsg="iconMsg"
             select-data>
             <vxe-table-column
               v-for="item in pageColumns"
@@ -82,7 +81,6 @@ export default {
       ],
       iconMsg: [
         { type: 'md-create', id: '', name: '编辑' },
-        { type: 'ios-browsers', id: '', name: '复制' },
         { type: 'md-trash', id: '', name: '删除' },
         {
           type: 'ios-clock',

pages/soil-sample-manage/sample-receive/entrust-sample-manage/WaitScan.vue

@@ -34,7 +34,6 @@
             :tableHeight="tableHeight"
             @on-result-change="_tableResultChange"
             :getPage="getPage"
-            :iconMsg="iconMsg"
             select-data>
             <vxe-table-column
               v-for="item in pageColumns"

pages/soil-sample-manage/sample-take/TakeByEntrust.vue

@@ -120,12 +120,12 @@ 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: '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: 'approveDate', width: 120, date: true },
+        // { title: '批准人', key: 'approver', width: 120 },
         { title: '检验类别', key: 'testType', width: 120 }
       ],
       searchOpen: false,

pages/soil-sample-manage/surplus-manage/tab/SampleSurplusManage.vue

@@ -166,20 +166,18 @@ export default {
       pageColumns: [
         { title: '委托商', key: 'client', width: 180 },
         { title: '委托编号', key: 'entrustCode', width: 180 },
-        { title: '存储条件', key: 'conditions', width: 180 },
         { title: '试样编号', key: 'sampleCode', width: 180 },
         { title: '试样深度', key: 'sampleDepth', width: 180 },
         { title: '样品包装类型', key: 'samplePack', width: 180 },
         { title: '现场编号', key: 'siteNo', width: 180 },
+        { title: '存储条件', key: 'conditions', width: 180 },
         { title: '备样位置', key: 'backupLocation', width: 180 },
         { title: '备样数量', key: 'quantity', width: 180 },
         { title: '备样人', key: 'backupUser', width: 140 },
         { title: '钻孔位置', key: 'boreholeLocation', width: 110 },
         { title: '钻孔名称', key: 'boreholeName', width: 160 },
         { title: '水深（米）', key: 'waterDepth', width: 160 },
-        { title: '状态', key: 'status', width: 160 },
-        { title: '备份开始日期', key: 'startTime', width: 170 },
-        { title: '备份结束日期', key: 'endTime', width: 170 }
+        { title: '状态', key: 'status', width: 160 }
         /*  {title: '处置方式', key: 'handleMethod', width: 120,}, */
       ],
       conditionList: [],

pages/soil-statistics/annual-entrust/MeterAnnualEntrust.vue

+<template>
+  <div>
+    <div class="layout-content-padding">
+      <div class="layout-content-main">
+        <Row style="margin-top: 10px;">
+          <!--查询条件-->
+          <Col span="24">
+          <div class="fl">
+            <Form id="search-form" :label-width="70" inline onsubmit="return false">
+              <label class="label-sign"></label>
+              <Form-item label="委托日期:">
+                <DatePicker
+                  v-model="entrustDate"
+                  :editable="false"
+                  :clearable="false"
+                  @on-change="_dateChange"
+                  type="year"
+                  style="width:90px"
+                ></DatePicker>
+              </Form-item>
+            </Form>
+          </div>
+          <div class="clear"></div>
+          </Col>
+          <!--内容-->
+          <Col span="24">
+          <Row :gutter="16">
+            <Col span="16" style="margin-bottom: 10px">
+            <!--bar-->
+            <YearContractBar ref="barModal"></YearContractBar>
+            </Col>
+            <Col span="8">
+            <!--bar-->
+            <YearContractPie ref="pieModal"></YearContractPie>
+            </Col>
+            <Col span="24">
+            <!--table-->
+            <YearContractTable ref="tableModal"></YearContractTable>
+            </Col>
+          </Row>
+          </Col>
+        </Row>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+// eslint-disable-next-line import/named
+import { soilStatistics } from '../../../api'
+import YearContractTable from './YearContractTable'
+import YearContractBar from './YearContractBar'
+import YearContractPie from './YearContractPie'
+
+export default {
+  components: {
+    YearContractTable,
+    YearContractBar,
+    YearContractPie
+  },
+  data() {
+    return {
+      entrustDate: new Date(),
+      formObj: {}
+    }
+  },
+  mounted() {
+    // this._getData(this.entrustDate.getFullYear())
+  },
+  methods: {
+    _getData: async function(data) {
+      this.formObj.entrustDate = data
+      const result = await soilStatistics.pageAnnualEntrustStatistics(
+        this.formObj
+      )
+      console.log('result', result)
+      if (result) {
+        this._open(result)
+      }
+    },
+    _open(data) {
+      this.$refs.tableModal._openTable(this.entrustDate.getFullYear(), data)
+      this.$refs.barModal._openBar(this.entrustDate.getFullYear(), data)
+      this.$refs.pieModal._openPie(this.entrustDate.getFullYear(), data)
+    },
+    _dateChange(data) {
+      this._getData(data)
+    },
+    _export() {
+      this.$refs.tableModal._exportSampleForm()
+    }
+  }
+}
+</script>
+<style>
+.border-chart-color {
+  border: 1px solid #e9eaec;
+}
+.chartTitle {
+  height: 32px;
+  line-height: 32px;
+  background: #f8f8f9;
+  padding-left: 15px;
+  border-bottom: 1px solid #e9eaec;
+}
+.chartTitle label {
+  display: inline-block;
+  max-width: 100%;
+  margin-bottom: 5px;
+  font-weight: 700;
+}
+</style>

pages/soil-statistics/annual-entrust/YearContractBar.vue

+<template>
+  <div class="border-chart-color" style="border: 1px solid #e9eaec">
+    <div class="chartTitle">
+      <label>{{ year }}年度委托量统计</label>
+    </div>
+    <div :style="heightObj" class="chartCont">
+      <div style="width:85%">
+        <IEcharts :option="option" :style="optionObj"></IEcharts>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+// import IEcharts from '../../../../../../node_modules/vue-echarts-v3/src/full.js';
+
+export default {
+  // components: {IEcharts},
+  data() {
+    return {
+      name: 'A',
+      heightObj: {
+        height: '300px'
+      },
+      option: {
+        color: this.$echartColor,
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: {
+            type: 'cross',
+            crossStyle: {
+              color: '#999'
+            }
+          }
+        },
+        grid: {
+          left: '3%',
+          right: '4%',
+          bottom: '3%',
+          containLabel: true,
+          x: 130
+        },
+        legend: {
+          data: ['合同量']
+        },
+        xAxis: [
+          {
+            type: 'category',
+            data: [],
+            axisPointer: {
+              type: ''
+            },
+            axisLine: {
+              lineStyle: {
+                color: 'gray'
+              }
+            },
+            splitLine: { show: false }
+          }
+        ],
+        yAxis: [
+          {
+            type: 'value',
+            name: '委托量(份)',
+            min: 0,
+            axisLabel: {
+              formatter: '{value}'
+            },
+            axisLine: {
+              lineStyle: {
+                color: 'gray'
+              }
+            },
+            splitLine: { show: false }
+          },
+          {
+            type: 'value',
+            name: '委托金额(元)',
+            min: 0,
+            axisLabel: {
+              formatter: '{value}'
+            },
+            axisLine: {
+              lineStyle: {
+                color: 'gray'
+              }
+            },
+            splitLine: { show: false }
+          }
+        ],
+        series: [
+          {
+            name: '委托量',
+            type: 'bar',
+            data: []
+          },
+          {
+            name: '委托金额',
+            type: 'line',
+            yAxisIndex: 1,
+            data: []
+          }
+        ]
+      },
+      optionObj: {
+        height: ''
+      },
+      year: ''
+    }
+  },
+  mounted() {
+    this._contHide()
+  },
+  methods: {
+    _contHide() {
+      this.optionObj.height =
+        (document.documentElement.clientHeight - 300) * (2 / 3) + 'px'
+      this.optionObj.width =
+        (document.documentElement.clientWidth - 200) / 1.6 + 'px'
+      this.heightObj.height =
+        (document.documentElement.clientHeight - 272) * (2 / 3) + 'px'
+    },
+    _openBar(data, result) {
+      this.year = data
+      this.option.xAxis[0].data = []
+      if (result.length === 0) {
+        this.option.xAxis[0].data = []
+        this.option.series[0].data = []
+        this.option.series[1].data = []
+      } else {
+        for (let i = 0; i < result.length; i++) {
+          this.option.xAxis[0].data.push(result[i].entrustDate)
+          this.option.series[0].data.push(result[i].quantity)
+          this.option.series[1].data.push(result[i].fee)
+        }
+      }
+
+      // this.$store
+      //   .dispatch('StatisticContract/pageYearContract', { year: data })
+      //   .then(() => {
+      //     const bar = this.$store.state.StatisticContract.page
+      //     this.option.series[0].data = []
+      //     this.option.series[1].data = []
+      //     for (let j = 0; j < bar.length; j++) {
+      //       for (let k = 0; k < this.option.xAxis[0].data.length; k++) {
+      //         if (bar[j].yearMonth === this.option.xAxis[0].data[k]) {
+      //           this.option.series[0].data[k] = bar[j].total
+      //           this.option.series[1].data[k] = bar[j].price
+      //         }
+      //       }
+      //     }
+      //   })
+    }
+  }
+}
+</script>

pages/soil-statistics/annual-entrust/YearContractPie.vue

+<template>
+  <div class="border-chart-color">
+    <div class="chartTitle">
+      <label>{{year}}年度委托量统计</label>
+    </div>
+    <div :style="heightObj" class="chartCont">
+      <div v-if="showStatistic" style="width:90%">
+        <IEcharts :option="option"  :style="optionObj"></IEcharts>
+      </div>
+      <div v-else class="no-statistic-bg" style="margin-top: 100px"></div>
+    </div>
+  </div>
+</template>
+
+<script>
+// import IEcharts from '../../../../../../node_modules/vue-echarts-v3/src/full.js';
+
+export default {
+  // components: {IEcharts},
+  data() {
+    return {
+      name: 'A',
+      heightObj: {
+        height: '300px'
+      },
+      option: {
+        title: {
+          textStyle: {
+            fontSize: 14,
+            fontWeight: 'normal'
+          },
+          text: '',
+          x: 'center'
+        },
+        tooltip: {
+          trigger: 'item',
+          // formatter: "{b}<br/> : {c} ({d}%)"
+          formatter: function(a) {
+            return (
+              a.name +
+              '<br>委托额: ' +
+              a.value +
+              '</br>占比: ' +
+              a.percent +
+              '%'
+            )
+          }
+        },
+        legend: {
+          type: 'scroll',
+          orient: 'vertical',
+          right: 0,
+          top: 20,
+          bottom: 20,
+          data: []
+        },
+        color: this.$echartColor,
+        series: [
+          {
+            name: '',
+            type: 'pie',
+            radius: ['30%', '65%'],
+            center: ['40%', '50%'],
+            data: [],
+            label: {
+              normal: {
+                show: false
+              }
+            },
+            labelLine: {
+              normal: {
+                show: false
+              }
+            }
+          }
+        ]
+      },
+      optionObj: {
+        height: ''
+      },
+      pageParams: {},
+      pie: [],
+      year: '',
+      showStatistic: true
+    }
+  },
+  mounted() {
+    console.log(this.option.series[0].data)
+    this._contHide()
+  },
+  methods: {
+    _contHide() {
+      this.optionObj.height =
+        (document.documentElement.clientHeight - 300) * (2 / 3) + 'px'
+      this.optionObj.width =
+        (document.documentElement.clientWidth - 200) / 3.2 + 'px'
+      this.heightObj.height =
+        (document.documentElement.clientHeight - 272) * (2 / 3) + 'px'
+    },
+    _openPie(data, result) {
+      this.showStatistic = true
+      this._page(data, result)
+    },
+    _page(data, result) {
+      this.year = data
+      if (result.length === 0) {
+        this.option.series[0].data = []
+      } else {
+        let total = 0
+        const testerList = []
+        for (let i = 0; i < result.length; i++) {
+          testerList.push(result[i].entrustDate)
+          total = total + result[i].quantity
+          const obj = {}
+          obj.name = result[i].entrustDate
+          obj.value = result[i].quantity
+          obj.fee = result[i].fee
+          this.option.series[0].data.push(obj)
+        }
+        this.option.title.text = '检测项目总量(个):' + total
+        this.option.legend.data = testerList
+      }
+    },
+    _searchParams() {
+      const data = this.$serialize('customer-contract-pie')
+      return this.$extend(data, this.pageParams)
+    }
+  }
+}
+</script>

pages/soil-statistics/annual-entrust/YearContractTable.vue

+<template>
+  <div>
+    <Form id="year-contract-table">
+      <input name="year" type="hidden">
+    </Form>
+    <!--<PTVXETable id="table-year" :tableHeight="tableHeight" @on-result-change="_tableResultChange"-->
+    <!--ref="pageTable" :getPage="getPage" hide-checkbox hide-page :show-footer="true">-->
+    <!--<vxe-table-column-->
+    <!--sortable-->
+    <!--: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">-->
+    <!--<template slot-scope="scope">-->
+    <!--<div v-if="item.detail"><a @click.stop="_detailModal(scope.row)">{{scope.row[item.key]}}</a></div>-->
+    <!--<span v-else>{{scope.row[item.key]}}</span>-->
+    <!--</template>-->
+    <!--</vxe-table-column>-->
+    <!--</PTVXETable>-->
+
+    <!--合计 暂时用此表格-->
+    <element-table
+      id="table-year"
+      ref="pageTable"
+      show-summary="true"
+      sum="true"
+      :get-page="getPage"
+      hide-checkbox
+      @on-result-change="_tableResultChange"
+    >
+      <el-table-column
+        v-for="item in pageColumns"
+        :key="item.key"
+        :prop="item.key"
+        :label="item.title"
+        :width="item.width"
+        :min-width="200"
+        :fixed="item.fixed?item.fixed:undefined"
+        sortable
+      >
+        <template slot-scope="scope">
+          <div v-if="item.detail">
+            <a @click.stop="_detailModal(scope.row)">{{ scope.row[item.key] }}</a>
+          </div>
+          <span v-else>{{ scope.row[item.key] }}</span>
+        </template>
+      </el-table-column>
+    </element-table>
+    <!--    <Details ref="detailsModal"></Details>-->
+  </div>
+</template>
+
+<script>
+export default {
+  components: {
+    // Details
+  },
+  data() {
+    return {
+      // tableHeight: '260',
+      pageColumns: [
+        {
+          title: '签订日期',
+          key: 'entrustDate',
+          width: 200,
+          detail: true,
+          month: true
+        },
+        { title: '委托数量', key: 'quantity' },
+        { title: '委托额度', key: 'fee' }
+      ],
+      getPage: {
+        records: []
+      },
+      year: ''
+    }
+  },
+  mounted() {
+    this.$refs.pageTable._hideLoading()
+  },
+  methods: {
+    _openTable(data, result) {
+      this.year = data
+      this.$refs.pageTable._hideLoading()
+      this._page(result)
+    },
+    _page(data) {
+      this.getPage.records = data
+    },
+    _tableResultChange(msg, data) {
+      switch (msg) {
+        case 'changeSize':
+          // this._page()
+          this.$refs.pageTable._hideLoading()
+          break
+      }
+    },
+    _detailModal(data) {
+      console.log(data)
+      // this.$refs.detailsModal._open(data)
+    },
+
+    /** *********************************导出-begin*********************************************/
+    _exportSampleForm() {
+      let result = []
+      this.$store
+        .dispatch('StatisticContract/pageYearContract', this._searchParams())
+        .then(() => {
+          result = this.$store.state.StatisticContract.page
+          if (result.length === 0) {
+            this.$Message.warning('暂无数据，不可导出！')
+          } else {
+            this.$Modal.confirm({
+              title: '提示',
+              content: '确定导出全部数据(最多导出5000条)？',
+              onOk: () => {
+                this.$exportExcel(
+                  'table-year',
+                  '年度委托量统计表',
+                  this.pageColumns,
+                  result
+                )
+              }
+            })
+          }
+        })
+    },
+    // 参数
+    _searchParams() {
+      const data = this.$serialize('year-contract-table')
+      if (this.year) {
+        data.year = this.year
+      }
+      return this.$extend(data, { page: 1, rows: 5000 })
+    }
+    /** *********************************导出样品台账-end*********************************************/
+  }
+}
+</script>

pages/soil-statistics/customer-entrust/MeterCustomerEntrust.vue

+<template>
+  <div>
+    <div class="layout-content-padding">
+      <div class="layout-content-main">
+        <Row style="margin-top: 10px;">
+          <!--查询条件-->
+          <Col span="24">
+          <div class="fl">
+            <Form id="search-form" :label-width="70" inline onsubmit="return false">
+              <label class="label-sign"></label>
+              <Form-item label="委托日期:">
+                <el-date-picker
+                  v-model="queryDate"
+                  @change="_dateChange"
+                  type="monthrange"
+                  range-separator="-"
+                  start-placeholder="开始月份"
+                  end-placeholder="结束月份"
+                  size="small"
+                  value-format="yyyy-MM"
+                >
+                </el-date-picker>
+              </Form-item>
+              <Form-item class="search-btn">
+                <Button @click="_getData" type="primary" class="width-80">
+                  搜索
+                </Button>
+              </Form-item>
+            </Form>
+          </div>
+          <div class="clear"></div>
+          </Col>
+          <!--内容-->
+          <Col span="24">
+          <Row :gutter="16">
+            <Col span="14">
+            <element-table
+              id="table-year"
+              ref="pageTable"
+              :table-height="tableHeight"
+              :get-page="getPage"
+              @on-result-change="_tableResultChange"
+              hide-checkbox
+            >
+              <el-table-column fixed type="index" label="序号" width="100">
+              </el-table-column>
+              <el-table-column
+                v-for="item in pageColumns"
+                :key="item.key"
+                :prop="item.key"
+                :label="item.title"
+                :width="item.width"
+                :min-width="200"
+                :fixed="item.fixed?item.fixed:undefined"
+              >
+                <template slot-scope="scope">
+                  <div v-if="item.detail">
+                    <a @click.stop="_detailModal(scope.row)">{{ scope.row[item.key] }}</a>
+                  </div>
+                  <span v-else>{{ scope.row[item.key] }}</span>
+                </template>
+              </el-table-column>
+            </element-table>
+            </Col>
+            <Col span="10">
+            <!--pie-->
+            <UserTestPie ref="testPieModal"></UserTestPie>
+            </Col>
+          </Row>
+          </Col>
+        </Row>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+// eslint-disable-next-line import/named
+import { soilStatistics } from '../../../api'
+import UserTestPie from './UserTestPie'
+
+export default {
+  components: {
+    UserTestPie
+  },
+  data() {
+    const date = this.$dateformat(new Date(), 'yyyy-mm')
+    const nextMonth = this.$dateformat(
+      new Date().setMonth(new Date().getMonth() + 1),
+      'yyyy-mm'
+    )
+    return {
+      beginDate: new Date(),
+      endDate: new Date(),
+      groupId: '',
+      groupName: '',
+      tester: '',
+      testerId: '',
+      pageColumns: [
+        { title: '委托单位', key: 'client', detail: true },
+        { title: '委托数量', key: 'quantity' },
+        { title: '委托额度', key: 'fee' }
+      ],
+      groupData: [],
+      getPage: {
+        records: []
+      },
+      formObj: {
+        edateBegin: undefined,
+        edateEnd: undefined
+      },
+      tempData: {
+        groupId: '',
+        groupName: '',
+        beginDate: date,
+        endDate: nextMonth
+      },
+      testerData: [],
+      queryDate: [date, nextMonth],
+      serviceType: '',
+      serviceTypeList: []
+    }
+  },
+  computed: {
+    tableHeight: function() {
+      return this.$tableHeight('search')
+    }
+  },
+  mounted() {
+    this.$refs.pageTable._hideLoading()
+    const str = this.tempData.endDate
+    const arr = str.split('-')
+    const lastday = this.mGetDate(arr[0], arr[1]).getTime() - 1
+    // this._contHide()
+    // this._getUserGroup()
+    this.formObj.edateBegin = this.tempData.beginDate
+    this.formObj.edateEnd = this.$dateformat(lastday, 'yyyy-mm-dd HH:MM:ss')
+    // this._getData()
+    // this._getServiceTypeList()
+  },
+  methods: {
+    mGetDate(year, month) {
+      const d = new Date(year, month, 1)
+      return d
+    },
+    // 服务类型
+    _getData: async function() {
+      console.log('753951')
+      console.log('选择时间后的请求', this.formObj)
+      const result = await soilStatistics.pageCustomerEntrustStatistics(
+        this.formObj
+      )
+      if (result) {
+        this.getPage.records = result
+        this.$refs.testPieModal._openPie(this.getPage.records)
+      }
+    },
+    // 检测项目详情
+    _detailModal(data) {
+      const obj = {
+        testerIds: [data.testerId],
+        groupIds: this.groupIds,
+        beginDate: this.tempData.beginDate,
+        endDate: this.tempData.endDate
+      }
+      console.log(obj)
+      // this.$refs.detailModal._open(obj)
+    },
+    _dateChange(data) {
+      if (data) {
+        this.formObj.edateBegin = data[0]
+        this.formObj.edateEnd = data[1]
+        const str = data[1]
+        const arr = str.split('-')
+        const lastday = this.mGetDate(arr[0], arr[1]).getTime() - 1
+        this.formObj.edateEnd = this.$dateformat(lastday, 'yyyy-mm-dd HH:MM:ss')
+      } else {
+        this.tempData.edateBegin = ''
+        this.tempData.edateEnd = ''
+        this.formObj.edateBegin = undefined
+        this.formObj.edateEnd = undefined
+      }
+    },
+    _contHide() {
+      this.tempData.beginDate = this.$dateformat(new Date(), 'yyyy-mm')
+      this.tempData.endDate = this.$dateformat(new Date(), 'yyyy-mm')
+      // this._page()
+      // this._getById()
+    },
+    _page() {
+      const data = {}
+      if (this.groupId) {
+        data.groupId = this.groupId
+      }
+      if (this.tester && this.testerId) {
+        data.testerId = this.testerId
+      } else {
+        this.testerId = ''
+      }
+      if (this.tempData.beginDate) {
+        data.beginDate = this.tempData.beginDate
+      }
+      if (this.tempData.endDate) {
+        data.endDate = this.tempData.endDate
+      }
+      if (this.serviceType) {
+        data.serviceType = this.serviceType
+      }
+      this.$refs.pageTable._page(
+        'search-form',
+        'FoodItem/pagePersonalTask',
+        data
+      )
+    },
+    _formSearch() {
+      this.$refs.pageTable._pageChange(1)
+    },
+    _search() {
+      this.tempData.groupId = this.groupId
+      this.tempData.groupName = this.groupId ? this.groupName : ''
+      this.tempData.serviceType = this.serviceType ? this.serviceType : ''
+      this.$refs.testPieModal._openPie(this.tempData)
+      this._formSearch()
+    },
+    _tableResultChange(msg, data) {
+      switch (msg) {
+        case 'changeSize':
+          // this._page()
+          break
+      }
+    },
+    /** *********************************导出-begin*********************************************/
+    _exportSampleForm() {
+      let result = []
+      this.$store
+        .dispatch('FoodItem/pagePersonalTask', this._searchParams())
+        .then(() => {
+          result = this.$store.state.FoodItem.page.records
+          this.$Modal.confirm({
+            title: '提示',
+            content: '确定导出全部数据？',
+            onOk: () => {
+              this.$exportExcel(
+                'personalTestNum',
+                '个人检测量统计表',
+                this.pageColumns,
+                result
+              )
+            }
+          })
+        })
+    },
+    // 参数
+    _searchParams() {
+      const data = {}
+      if (this.groupId) {
+        data.groupId = this.groupId
+      }
+      if (this.tester && this.testerId) {
+        data.testerId = this.testerId
+      } else {
+        this.testerId = ''
+      }
+      if (this.tempData.beginDate) {
+        data.beginDate = this.tempData.beginDate
+      }
+      if (this.tempData.endDate) {
+        data.endDate = this.tempData.endDate
+      }
+      return this.$extend(data, { page: 1, rows: 5000 })
+    },
+    /** *********************************导出样品台账-end*********************************************/
+    _getUserGroup() {
+      this.$store.dispatch('LmsUserGroup/list').then(() => {
+        this.groupData = this.$store.state.LmsUserGroup.list
+      })
+    },
+    // 主检人&检测科室
+    _groupChange(data) {
+      if (data) {
+        this.groupName = data.label
+        this.groupId = data.value
+        this.testerId = ''
+        this.tester = ''
+        this._getUserList(data.value)
+      }
+    },
+    _getUserList(groupId, realname) {
+      const data = { page: 1, rows: 50 }
+      if (groupId) {
+        Object.assign(data, { groupId: groupId })
+      }
+      if (realname) {
+        Object.assign(data, { realname: realname })
+      }
+      this.$store.dispatch('LmsUserGroup/getUserByGroupId', data).then(() => {
+        this.testerData = this.$store.state.LmsUserGroup.userPage.records
+      })
+    },
+    _testerChange(msg, data) {
+      switch (msg) {
+        case 'select':
+          this.tester = data.realname
+          this.testerId = data.userId
+          break
+        case 'blur':
+          this.tester = ''
+          break
+        case 'query':
+          this.tester = data.realname
+          this._getUserList('', data.realname)
+          break
+      }
+    }
+  }
+}
+</script>
+<style>
+.border-chart-color {
+  border: 1px solid #e9eaec;
+}
+.chartTitle {
+  height: 32px;
+  line-height: 32px;
+  background: #f8f8f9;
+  padding-left: 15px;
+  border-bottom: 1px solid #e9eaec;
+}
+.chartTitle label {
+  display: inline-block;
+  max-width: 100%;
+  margin-bottom: 5px;
+  font-weight: 700;
+}
+</style>

pages/soil-statistics/customer-entrust/UserTestPie.vue

+<template>
+  <div class="border-chart-color">
+    <div class="chartTitle">
+      <label>{{ groupName }} 客户委托量比率</label>
+    </div>
+    <div :style="heightObj" class="chartCont">
+      <div v-if="showStatistic" style="width:90%">
+        <IEcharts :option="option" :style="optionObj"></IEcharts>
+      </div>
+      <div v-else :style="noDataObj" class="no-statistic-bg"></div>
+    </div>
+    <form id="persontal-task-pie">
+      <input name="groupId" type="hidden" />
+      <input name="beginDate" type="hidden" />
+      <input name="endDate" type="hidden" />
+      <input name="groupName" type="hidden" />
+      <input name="serviceType" type="hidden" />
+    </form>
+  </div>
+</template>
+
+<script>
+// import IEcharts from 'vue-echarts-v3/src/full'
+export default {
+  // components: { IEcharts },
+  data() {
+    return {
+      // 科室名称
+      groupName: '',
+      showStatistic: true,
+      heightObj: {
+        height: '300px'
+      },
+      option: {
+        title: {
+          x: 'center',
+          textStyle: {
+            fontSize: 14,
+            fontWeight: 'normal'
+          }
+        },
+        tooltip: {
+          trigger: 'item',
+          formatter: function(a) {
+            return (
+              a.name +
+              '</br>样品量: ' +
+              a.data.value +
+              '<br>占比: ' +
+              a.percent +
+              '%'
+            )
+          }
+        },
+        legend: {
+          type: 'scroll',
+          orient: 'vertical',
+          right: 0,
+          top: 20,
+          bottom: 20,
+          data: ['直接访问', '邮件营销', '联盟广告', '视频广告', '搜索引擎']
+        },
+        color: this.$echartColor,
+        series: [
+          {
+            name: '访问来源',
+            type: 'pie',
+            radius: ['50%', '70%'],
+            avoidLabelOverlap: false,
+            label: {
+              show: false,
+              position: 'center'
+            },
+            emphasis: {
+              label: {
+                show: true,
+                fontSize: '30',
+                fontWeight: 'bold'
+              }
+            },
+            labelLine: {
+              show: false
+            },
+            data: [
+              { value: 335, name: '直接访问' },
+              { value: 310, name: '邮件营销' },
+              { value: 234, name: '联盟广告' },
+              { value: 135, name: '视频广告' },
+              { value: 1548, name: '搜索引擎' }
+            ]
+          }
+        ]
+      },
+      optionObj: {
+        height: ''
+      },
+      noDataObj: {
+        marginTop: ''
+      }
+    }
+  },
+  mounted() {
+    this._contHide()
+  },
+  methods: {
+    _contHide() {
+      this.optionObj.height = document.documentElement.clientHeight - 300 + 'px'
+      this.heightObj.height = document.documentElement.clientHeight - 272 + 'px'
+      this.noDataObj.marginTop =
+        (document.documentElement.clientHeight - 450) / 2 + 'px'
+      this.optionObj.width =
+        (document.documentElement.clientWidth - 200) / 2.6 + 'px'
+    },
+    _openPie(data) {
+      const testerList = []
+      const seriesList = []
+      let total = 0
+      for (let i = 0; i < data.length; i++) {
+        testerList.push(data[i].client)
+        total = total + data[i].quantity
+        seriesList.push({
+          value: data[i].quantity,
+          name: data[i].client,
+          total: data[i].quantity
+        })
+      }
+      this.option.title.text = '委托单总量(个):' + total
+      this.option.legend.data = testerList
+      this.option.series[0].data = seriesList
+      console.log(this.option.series[0].data)
+    },
+
+    _searchParams() {
+      const data = this.$serialize('persontal-task-pie')
+      return this.$extend(data)
+    }
+  }
+}
+</script>

pages/soil-statistics/failItem.vue

+<template>
+  <div>
+    <div class="tabBox clearfix" style="position: relative;background-color: white;margin-bottom: 20px;margin-top: 20px;">
+      <el-tabs v-model="activeName">
+        <el-tab-pane label="不合格项目" name="first">
+          <div class="saleBox" style="padding-left: 20px;float: left;background-color: lightblue">
+            <p style="font-size: 14px;">
+              <!--                      {{ range }}不合格数量-->
+              不合格数量
+            </p>
+            <div id="saleImg" style="width: 660px;height: 260px;" />
+          </div>
+        </el-tab-pane>
+      </el-tabs>
+      <div class="timeBox" style="float: right;position: absolute;right: 0px;top: 0px;">
+        <div style="float: left;line-height: 34px;">
+          <!--        <a @click="_rangeDayChange" :class="{actived:pitch=='_rangeDayChange'}">今日</a>-->
+          <!--        <a @click="_rangeWeekChange" :class="{actived:pitch=='_rangeWeekChange'}">本周</a>-->
+          <!--        <a @click="_rangeMonthChange" :class="{actived:pitch=='_rangeMonthChange'}">本月</a>-->
+          <!--        <a @click="_rangeYearChange" :class="{actived:pitch=='_rangeYearChange'}">本年</a>-->
+          <a>今日</a>
+          <a>本周</a>
+          <a>本月</a>
+          <a>本年</a>
+        </div>
+        <div class="calendar" style="overflow: hidden">
+          <div class="block">
+            <el-date-picker
+              v-model="value1"
+              :default-time="['12:00:00']"
+              type="datetimerange"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              style="width: 200px;margin-left: 20px;"
+            />
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="failTable">
+      <Form
+        v-show="searchOpen"
+        :label-width="70"
+        inline
+        onsubmit="return false"
+        class="search-form"
+      >
+        <label class="label-sign" />
+        <Form-item class="search-item" label="物料类型:">
+          <Input v-model="formObj.name" @on-enter="_formSearch" placeholder="请输入物料类型" clearable />
+        </Form-item>
+        <Form-item class="search-btn">
+          <Button @click="_formSearch" type="primary">
+            搜索
+          </Button>
+        </Form-item>
+      </Form>
+
+      <element-table
+        ref="pageTable"
+        :page-columns="pageColumns"
+        :table-height="tableHeight"
+        :get-page="getPage"
+        :opt-col-width="80"
+        @on-result-change="_tableResultChange"
+      >
+        <el-table-column
+          v-for="item in pageColumns"
+          :key="item.key"
+          :prop="item.key"
+          :label="item.title"
+          :width="item.width"
+          :min-width="200"
+          :fixed="item.fixed?item.fixed:undefined"
+          show-overflow-tooltip
+          sortable
+        >
+          <template slot-scope="scope">
+            <div v-if="item.dateTime">
+              {{ scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd HH:MM:ss'):'' }}
+            </div>
+            <span v-else-if="item.type" class="blue-color">
+              {{ scope.row[item.key] === undefined ? '': scope.row[item.key].display }}
+            </span>
+            <div v-else>
+              {{ scope.row[item.key] }}
+            </div>
+          </template>
+        </el-table-column>
+        <!--        <el-table-column-->
+        <!--          slot="col"-->
+        <!--          label="操作"-->
+        <!--          align="center"-->
+        <!--          :width="100"-->
+        <!--          fixed="right"-->
+        <!--        >-->
+        <!--          <template slot-scope="scope">-->
+        <!--            <icon-list-->
+        <!--              :msg="iconMsg"-->
+        <!--              :row-data="scope.row"-->
+        <!--              @on-result-change="_iconClick"-->
+        <!--            />-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+      </element-table>
+    </div>
+  </div>
+</template>
+<script>
+// eslint-disable-next-line import/named
+import { soilStatistics } from '../../api'
+import { saleImg } from '../../api/homePage'
+export default {
+  name: 'FailItem',
+  data() {
+    return {
+      activeName: 'first',
+      value1: '',
+      searchOpen: false,
+      pageColumns: [
+        { title: '项目名称', key: 'name', width: '150' },
+        { title: '样品编号', key: 'sampleCode', width: '130' },
+        { title: '物料名称', key: 'sampleName', width: '130' },
+        { title: '检测值', key: 'testValue', width: '100' },
+        { title: '限量值', key: 'limitValue', width: '190' },
+        { title: '检测依据', key: 'code', width: '350' },
+        { title: '检测依据名称', key: 'standardName', width: '350' }
+      ],
+      formObj: {
+        name: ''
+      },
+      getPage: {},
+      iconMsg: [
+        // { type: 'pt-a-edit', id: '', name: '编辑' },
+        // { type: 'pt-a-trash', id: '', name: '删除' }
+      ]
+    }
+  },
+  computed: {
+    tableHeight: function() {
+      if (this.searchOpen) {
+        return this.$tableHeight('search') - 200
+      } else {
+        return this.$tableHeight('noSearch') - 200
+      }
+    }
+  },
+  mounted() {
+    // this._getItemFail()
+    // this._page()
+  },
+  methods: {
+    _getItemFail: async function() {
+      const result = await soilStatistics.getItemFail(this.queryRange)
+      if (result) {
+        console.log('getItemFail', result)
+        this.itemNotOk = result
+        saleImg(result)
+      }
+    },
+    _page: async function() {
+      Object.assign(this.formObj, this.$refs.pageTable._searchParams())
+      const result = await soilStatistics.pageItemFail(
+        this.$serializeForm(this.formObj)
+      )
+      if (result) {
+        this.getPage = result
+        this.$refs.pageTable._initTable()
+      }
+    },
+    _formSearch() {},
+    _iconClick(res, data) {
+      switch (res) {
+        case '编辑':
+          this._editModal(data.id)
+          break
+        case '删除':
+          this._deleteById(data.id)
+          break
+      }
+    },
+    _tableResultChange(msg, data) {
+      switch (msg) {
+        case 'page':
+          this._page()
+          break
+        case 'iconClick':
+          this._iconClick(data.name, data.rowData)
+          break
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>

pages/soil-statistics/personal-task/UserTestPie.vue

+<template>
+  <div class="border-chart-color">
+    <div class="chartTitle">
+      <label>{{groupName}} 员工工作量比率</label>
+    </div>
+    <div :style="heightObj" class="chartCont">
+      <div v-if="showStatistic" style="width:90%">
+        <IEcharts :option="option" :style="optionObj"></IEcharts>
+      </div>
+      <div v-else :style="noDataObj" class="no-statistic-bg"></div>
+    </div>
+    <form id="persontal-task-pie">
+      <input name="groupId" type="hidden"/>
+      <input name="beginDate" type="hidden"/>
+      <input name="endDate" type="hidden"/>
+      <input name="groupName" type="hidden"/>
+      <input name="serviceType" type="hidden"/>
+    </form>
+  </div>
+</template>
+
+<script>
+// import IEcharts from 'vue-echarts-v3/src/full'
+export default {
+  // components: { IEcharts },
+  data() {
+    return {
+      // 科室名称
+      groupName: '',
+      showStatistic: true,
+      heightObj: {
+        height: '300px'
+      },
+      option: {
+        title: {
+          x: 'center',
+          textStyle: {
+            fontSize: 14,
+            fontWeight: 'normal'
+          }
+        },
+        tooltip: {
+          trigger: 'item',
+          formatter: function(a) {
+            return (
+              a.name +
+              '</br>样品量: ' +
+              a.data.value +
+              '<br>占比: ' +
+              a.percent +
+              '%'
+            )
+          }
+        },
+        legend: {
+          type: 'scroll',
+          orient: 'vertical',
+          right: 0,
+          top: 20,
+          bottom: 20,
+          data: ['直接访问', '邮件营销', '联盟广告', '视频广告', '搜索引擎']
+        },
+        color: this.$echartColor,
+        series: [
+          {
+            name: '访问来源',
+            type: 'pie',
+            radius: ['50%', '70%'],
+            avoidLabelOverlap: false,
+            label: {
+              show: false,
+              position: 'center'
+            },
+            emphasis: {
+              label: {
+                show: true,
+                fontSize: '30',
+                fontWeight: 'bold'
+              }
+            },
+            labelLine: {
+              show: false
+            },
+            data: [
+              { value: 335, name: '直接访问' },
+              { value: 310, name: '邮件营销' },
+              { value: 234, name: '联盟广告' },
+              { value: 135, name: '视频广告' },
+              { value: 1548, name: '搜索引擎' }
+            ]
+          }
+        ]
+      },
+      optionObj: {
+        height: ''
+      },
+      noDataObj: {
+        marginTop: ''
+      }
+    }
+  },
+  mounted() {
+    this._contHide()
+  },
+  methods: {
+    _contHide() {
+      this.optionObj.height = document.documentElement.clientHeight - 300 + 'px'
+      this.heightObj.height = document.documentElement.clientHeight - 272 + 'px'
+      this.noDataObj.marginTop =
+        (document.documentElement.clientHeight - 450) / 2 + 'px'
+      this.optionObj.width =
+        (document.documentElement.clientWidth - 200) / 2.6 + 'px'
+    },
+    _openPie(data) {
+      // alert(this.option.series[0].data)
+      const testerList = []
+      const seriesList = []
+      let total = 0
+      for (let i = 0; i < data.length; i++) {
+        testerList.push(data[i].tester)
+        total = total + data[i].total
+        seriesList.push({
+          value: data[i].total,
+          name: data[i].tester,
+          total: data[i].total,
+          ratio: data[i].ratio
+        })
+      }
+      this.option.title.text = '检测项目总量(个):' + total
+      this.option.legend.data = testerList
+      this.option.series[0].data = seriesList
+      console.log(this.option.series[0].data)
+    },
+
+    _searchParams() {
+      const data = this.$serialize('persontal-task-pie')
+      return this.$extend(data)
+    }
+  }
+}
+</script>

pages/soil-statistics/yearDeclara.vue

+<template>
+  <div>
+    <div class="dateBox">
+      <div class="block">
+        <span class="demonstration">签订日期</span>
+        <el-date-picker
+          v-model="dateValue"
+          type="year"
+          style="width: 150px;"
+          placeholder="选择年"
+        />
+      </div>
+    </div>
+    <div class="chartBox clearfix">
+      <div class="barChartBox" style="width: 700px;height: 240px;margin-top: 20px;border: 1px solid lightgray;float: left">
+        <div class="barChartTitle" style="height: 32px;background-color: #f8f8f9;line-height: 32px;border-bottom: 1px solid lightgray">
+          <span style="font-size: 14px;color: #333333;font-weight: bold;">年度委托量统计</span>
+        </div>
+        <div class="barChartBody" style="padding: 15px;">
+          <div id="barChart" style="width: 100%;height: 180px;" />
+        </div>
+      </div>
+      <div class="pieChartBox" style="width: 350px;height: 240px;margin-top: 20px;border: 1px solid lightgray;float: left">
+        <div class="pieChartTitle" style="height: 32px;background-color: #f8f8f9;line-height: 32px;border-bottom: 1px solid lightgray">
+          <span style="font-size: 14px;color: #333333;font-weight: bold;">年度委托量统计</span>
+        </div>
+        <div class="pieChartBody" style="padding: 15px;">
+          <div id="pieChart" style="width: 100%;height: 180px;" />
+        </div>
+      </div>
+    </div>
+    <div class="tableBox">
+      <el-table
+        :data="tableData"
+        border
+        show-summary
+        style="width: 100%;"
+      >
+        <el-table-column
+          v-for="(item,index) in tableColumn"
+          :key="index"
+          :prop="item.key"
+          :label="item.title"
+          sortable
+          class="tablecolumn"
+        />
+      </el-table>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'YearDeclara',
+  data() {
+    return {
+      dateValue: ' ',
+      tableColumn: [
+        { title: '签订日期', key: 'date' },
+        { title: '委托数量', key: 'entrustNum' },
+        { title: '委托额度', key: 'entrustLimit' },
+        { title: '实收额度', key: 'chargedLImit' },
+        { title: '未收额度', key: 'unchargedLImit' }
+      ],
+      tableData: [
+        {
+          date: '2020-1',
+          entrustNum: 1,
+          entrustLimit: 1,
+          chargedLImit: 1,
+          unchargedLImit: 1
+        },
+        {
+          date: '2020-2',
+          entrustNum: 2,
+          entrustLimit: 2,
+          chargedLImit: 2,
+          unchargedLImit: 2
+        },
+        {
+          date: '2020-3',
+          entrustNum: 3,
+          entrustLimit: 3,
+          chargedLImit: 3,
+          unchargedLImit: 3
+        },
+        {
+          date: '2020-4',
+          entrustNum: 4,
+          entrustLimit: 4,
+          chargedLImit: 4,
+          unchargedLImit: 4
+        }
+      ]
+    }
+  },
+  mounted() {
+    // this.barChart()
+    // this.pieChart()
+  },
+  methods: {
+    barChart() {
+      const echarts = require('echarts')
+      const myChart = echarts.init(document.getElementById('barChart'))
+      myChart.setOption({
+        // color: ['#3398DB'],
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: {
+            type: 'cross',
+            crossStyle: {
+              color: '#999'
+            }
+          }
+        },
+        grid: {
+          // left: '2%',
+          // right: '4%',
+          bottom: '3%',
+          containLabel: true
+        },
+        xAxis: [
+          {
+            type: 'category',
+            splitLine: {
+              show: false
+            },
+            data: [
+              '2020-1',
+              '2020-2',
+              '2020-3',
+              '2020-4',
+              '2020-5',
+              '2020-6',
+              '2020-7',
+              '2020-8',
+              '2020-9',
+              '2020-10',
+              '2020-11',
+              '2020-12'
+            ],
+            axisTick: {
+              alignWithLabel: true
+            }
+          }
+        ],
+        yAxis: [
+          {
+            type: 'value',
+            splitLine: {
+              show: false
+            },
+            name: '委托量(份)'
+          },
+          {
+            type: 'value',
+            splitLine: {
+              show: false
+            },
+            name: '委托金额(元)'
+          }
+        ],
+        series: [
+          {
+            name: '委托量',
+            type: 'bar',
+            barWidth: '60%',
+            data: [9, 16, 59, 39, 89],
+            itemStyle: {
+              normal: {
+                color: 'lightblue'
+              }
+            }
+          },
+          {
+            name: '委托金额',
+            type: 'line',
+            // barWidth: '60%',
+            yAxisIndex: 1,
+            data: [0, 0, 0, 100000, 2000],
+            itemStyle: {
+              normal: {
+                color: 'red'
+              }
+            }
+          }
+        ]
+      })
+    },
+    pieChart() {
+      const echarts = require('echarts')
+      const myChart = echarts.init(document.getElementById('pieChart'))
+      myChart.setOption({
+        title: {
+          text: '委托总金额',
+          left: 'center'
+        },
+        tooltip: {
+          trigger: 'item',
+          formatter: '{a} <br/>{b}: {c} ({d}%)'
+        },
+        legend: {
+          orient: 'vertical',
+          left: 'right',
+          data: ['2020-1', '2020-2', '2020-3', '2020-4', '2020-5']
+        },
+        series: [
+          {
+            name: '委托金额',
+            type: 'pie',
+            radius: ['50%', '70%'],
+            avoidLabelOverlap: false,
+            label: {
+              show: false,
+              position: 'center'
+            },
+            labelLine: {
+              show: false
+            },
+            data: [
+              { value: 0, name: '2020-1' },
+              { value: 0, name: '2020-2' },
+              { value: 0, name: '2020-3' },
+              { value: 100000, name: '2020-4' },
+              { value: 2000, name: '2020-5' }
+            ]
+          }
+        ]
+      })
+    }
+  }
+}
+</script>
+<style scoped>
+</style>

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

+<template>
+  <div>
+    <Modal v-model="showSampleModal" @on-visible-change="_visibleChange" width="1200"
+           class="zIndex-900 modal-footer-none">
+      <p slot="header">数据审核</p>
+      <div>
+        <el-tabs v-model="activeName" @tab-click="_changeTabs">
+          <el-tab-pane label="按项目审核" name="waitReceive">
+            <WaitReceive ref="waitReceiveModal"></WaitReceive>
+          </el-tab-pane>
+          <el-tab-pane label="按样品审核" name="waitScan">
+            <WaitScan ref="waitScanModal"></WaitScan>
+          </el-tab-pane>
+<!--          <el-tab-pane label="查看原始记录" name="viewRecord">-->
+<!--            <OriginalRecordView ref="recordModal"></OriginalRecordView>-->
+<!--          </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>
+</template>
+<script>
+import WaitReceive from './item-tabs/ItemTabs'
+import WaitScan from './sample-tabs/SampleTabs'
+// import OriginalRecordView from './OriginalRecordView'
+
+export default {
+  components: {
+    WaitReceive,
+    WaitScan
+    // OriginalRecordView
+  },
+  data() {
+    return {
+      type: '',
+      contractId: '', // 合同id
+      entrustId: '',
+      showSampleModal: false,
+      modalTitle: '',
+      selectIds: [],
+      activeName: 'waitReceive',
+      name: '',
+      currentComponent: ''
+    }
+  },
+  mounted() {
+    // this.currentComponent = 'waitScan'
+  },
+  methods: {
+    _open(contractId, type, name) {
+      this.type = type // 类型（采样或送样）
+      this.name = name
+      this.showSampleModal = true
+      this.entrustId = contractId // 合同id
+      this.activeName = 'waitReceive'
+      // this.currentComponent = 'waitScan'
+      this.selectIds = []
+      this._waitPage()
+    },
+    // 待接收
+    _waitPage() {
+      this.$refs.waitReceiveModal._open(this.entrustId)
+    },
+    // 待发放
+    _waitSend() {
+      this.$refs.waitScanModal._open(this.entrustId)
+    },
+    // 已接收
+    _issuedPage() {
+      this.$refs.alreadyIssuedModal._open(this.contractId, this.type)
+    },
+    _changeTabs(tab, event) {
+      if (tab.name === 'viewRecord') {
+        // this._issuedPage()
+        this.$refs.recordModal._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()
+      }
+    },
+    _search() {
+      this.$refs.waitReceiveModal._clearTable()
+      this.$refs.waitScanModal._clearTable()
+      this.$emit('on-result-change')
+    },
+    // 关闭弹框的时候刷新上个界面
+    _visibleChange(data) {
+      if (data === false) {
+        this._search()
+      }
+    }
+  }
+}
+</script>

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

+<template>
+  <div>
+    <div class="layout-content-padding">
+      <div class="layout-content-main">
+        <el-tabs v-model="activeName" @tab-click="_changeTabs">
+          <el-tab-pane label="数据审核" name="check">
+            <SampleBackupsManage ref="checkTabs"></SampleBackupsManage>
+          </el-tab-pane>
+          <el-tab-pane label="历史任务" name="checkHis">
+            <SampleBackupsQuery ref="checkHisTabs"></SampleBackupsQuery>
+          </el-tab-pane>
+        </el-tabs>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import SampleBackupsManage from './DataAudit'
+import SampleBackupsQuery from './DataAuditHis'
+
+export default {
+  components: {
+    SampleBackupsManage,
+    SampleBackupsQuery
+  },
+  data() {
+    return {
+      activeName: 'check'
+    }
+  },
+  mounted() {
+    this.activeName = 'check'
+    this.$refs.checkTabs._page()
+  },
+  methods: {
+    _changeTabs(tab, event) {
+      if (tab.name === 'check') {
+        this.$refs.checkTabs._page()
+      } else if (tab.name === 'applyRecord') {
+        // this.$refs.applyRecordTabs._page()
+      } else {
+        this.$refs.checkHisTabs._page()
+      }
+    }
+  }
+}
+</script>

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

+<template>
+  <div>
+    <Modal v-model="showModal" width="100" class="modal-footer-none full-screen">
+      <div slot="header">{{modalTitle}}</div>
+      <div>
+        <Form id="index-right-form" :label-width="80" inline onsubmit="return false">
+          <label class="label-sign"></label>
+          <Form-item class="search-item" label="指标名称:">
+            <Input v-model="formObj.name" @on-enter="_formSearch" placeholder="请输入类别" clearable/>
+          </Form-item>
+          <Form-item class="search-btn">
+            <Button @click="_formSearch" type="primary">搜索</Button>
+          </Form-item>
+        </Form>
+          <btn-list :msg="btn" @on-result-change="_btnClick" class="contHide" style="margin-bottom: 10px;"/>
+        <PTVXETable ref="pageTable" :tableHeight="tableHeight"
+                    @on-result-change="_tableResultChange" :getPage="getPage" :iconMsg="iconMsg">
+          <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">
+            <template slot-scope="scope">
+              <span v-if="item.key==='defaulted'">{{scope.row[item.key]?'是':'否'}}</span>
+              <span v-else>{{scope.row[item.key]}}</span>
+            </template>
+          </vxe-table-column>
+        </PTVXETable>
+      </div>
+    </Modal>
+    <IndexManageEdit ref="indexEdit" @on-result-change="_page"></IndexManageEdit>
+  </div>
+</template>
+
+<script>
+import { soilAptitude, soilTest } from '../../../api'
+import IndexManageEdit from './IndexManageEdit'
+
+export default {
+  components: { IndexManageEdit },
+  data() {
+    return {
+      id: '',
+      modalTitle: '',
+      showModal: false,
+      btn: [
+        { type: 'success', id: '', name: '添加指标' },
+        { type: 'error', id: '', name: '删除' }
+      ],
+      tableHeight: document.documentElement.clientHeight - 180,
+      pageColumns: [
+        { title: '试验指标名称', key: 'name' },
+        { title: '试验指标大类', key: 'mainType', width: 120 },
+        { title: '试验指标小类', key: 'smallType', width: 120 },
+        { title: '状态', key: 'status', width: 120 },
+        { title: '检测值', key: 'testValue', width: 120 },
+        { title: '单位', key: 'unit', width: 120 }
+      ],
+      getPage: {},
+      iconMsg: [{ type: 'md-create', id: '', name: '编辑' }],
+      selectIds: [],
+      formObj: {
+        name: ''
+      },
+      // 资质信息
+      aptitudeItemInfo: {}
+    }
+  },
+  methods: {
+    _open(data) {
+      console.log(data)
+      this.aptitudeItemInfo = data
+      this.formObj = this.$resetFields(this.formObj)
+      this.id = data.id
+      this.modalTitle = data.name + ' 指标管理'
+      this.showModal = true
+      this._page()
+    },
+    _page: async function() {
+      Object.assign(this.formObj, this.$refs.pageTable._searchParams())
+      this.formObj.experimentId = this.id
+      const result = await soilTest.itemPage(this.$serializeForm(this.formObj))
+      if (result) {
+        console.log(result)
+        this.getPage = result
+        this.$refs.pageTable._hideLoading()
+      }
+    },
+    _formSearch() {
+      this.$refs.pageTable._pageChange(1)
+    },
+    _tableResultChange(msg, data) {
+      switch (msg) {
+        case 'page':
+          break
+        case 'selectIds':
+          this.selectIds = data
+          break
+        case 'iconClick':
+          this._iconClick(data.name, data.rowData)
+          break
+        case 'changeSize':
+          this._page()
+          break
+      }
+    },
+    _iconClick(res, data) {
+      switch (res) {
+        case '编辑':
+          this._editModal(true, data)
+          break
+      }
+    },
+    _editModal(edit, data) {
+      if (edit) {
+        this._getById(data)
+      } else {
+        this.$refs.indexEdit._open(this.id, '')
+      }
+    },
+    _getById: async function(data) {
+      const result = await soilTest.itemGetById(data.id)
+      console.log(result)
+      if (result) {
+        this.$refs.indexEdit._open('', result)
+      }
+    },
+    _btnClick(msg) {
+      switch (msg) {
+        case '添加指标':
+          this._editModal(false)
+          break
+        case '删除':
+          this._deleteByIds()
+          break
+      }
+    },
+    _deleteByIds() {
+      if (this.selectIds.length === 0) {
+        // this.$msgTip('warning')
+        this.$message.warning('请至少选择一条记录')
+      } else {
+        this.$Modal.confirm({
+          title: '提示',
+          content: '确定删除 ' + this.selectIds.length + ' 条记录？',
+          onOk: () => {
+            this._delOk(this.selectIds)
+          }
+        })
+      }
+    },
+    _delOk: async function(ids) {
+      const result = await soilAptitude.expItemDeleteByIds(ids)
+      if (result) {
+        this.$message.success('删除成功')
+        this._page()
+      }
+    }
+  }
+}
+</script>

pages/soil-test-manage/test-data-audit/item-tabs/ItemLeftList.vue

+<template>
+  <div>
+    <Row>
+      <!--查询-->
+      <Col span="24">
+        <Form id="task-assign-item-left" :label-width="70" inline onsubmit="return false">
+        <label class="label-sign"></label>
+        <Form-item class="search-item" label="检测项目:">
+          <Input v-model="formObj.name" @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 @on-result-change="_btnClick" class="contHide" style="margin-bottom: 6px;"></btn-list>
+      </Col>
+      <!-- 表格 -->
+      <Col span="24">
+      <PTVXETable ref="pageTable" :isRadio="true" :pageColumns="pageColumns" :table-name="tableName"
+                  :tableHeight="tableHeight"
+                    @on-result-change="_tableResultChange" :getPage="getPage" :hide-checkbox="true" :rows="100" select-data>
+        <vxe-table-column
+          v-for="item in userColumns.length > 0 ?userColumns:pageColumns"
+          :key="item.key"
+          :field="item.key"
+          :title="item.title"
+          :min-width="item.width"
+          :fixed="item.fixed?item.fixed:undefined"
+          sortable>
+          <template slot-scope="scope">
+            <a v-if="item.detail" @click.stop="_detailModal(scope.row)">{{scope.row[item.key]}}</a>
+            <span v-else-if="item.date">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):''}}</span>
+            <span v-else>{{scope.row[item.key]}}</span>
+          </template>
+        </vxe-table-column>
+        <VXESettingCol slot="setting" :pageColumns="pageColumns" :userColumns="userColumns"
+                       @on-result-change="_resetColumn" :table-name="tableName"></VXESettingCol>
+      </PTVXETable>
+      </Col>
+    </Row>
+  </div>
+</template>
+<script>
+import { soilTest } from '../../../../api'
+export default {
+  components: {},
+  data() {
+    return {
+      currentComponent: '',
+      formObj: {
+        name: undefined
+      },
+      tableName: 'food-task-assign-item-left',
+      // 用户自己选中的列
+      userColumns: [],
+      optionList: [
+        { key: 'name', name: '检测项目', placeholder: '请输入检测项目' },
+        { key: 'testBasis', name: '检测依据', placeholder: '请输入检测依据' }
+      ],
+      getPage: {},
+      id: '',
+      pageColumns: [
+        { title: '检测项目', key: 'name', width: 120 },
+        { title: '检测方法', key: 'testMethod', width: 140 },
+        { title: '检测依据名称', key: 'testBasisName', width: 200 }
+      ]
+    }
+  },
+  computed: {
+    tableHeight: function() {
+      return this.$tableHeight('tabSearch')
+    }
+  },
+  methods: {
+    // 重置column
+    _resetColumn(colList) {
+      this.userColumns = colList
+      this.$refs.pageTable._loadColumn(colList)
+    },
+    _modalResult() {
+      if (this.currentComponent === 'AutoAssignModal') {
+        this._formSearch()
+      }
+    },
+    _selInputResult1(msg, data) {
+      switch (msg) {
+        case 'search':
+          this._formSearch()
+          break
+      }
+    },
+    _open(id) {
+      this.id = id
+      this._page()
+    },
+    _searchParams() {
+      const obj = {}
+      const obj1 = this.$refs.selInput1._getFormObj()
+      Object.assign(obj, obj1)
+      return obj
+    },
+    _page: async function() {
+      Object.assign(this.formObj, this.$refs.pageTable._searchParams())
+      this.formObj.entrustId = this.id
+      const result = await soilTest.pageTestByExp(
+        this.$serializeForm(this.formObj)
+      )
+      if (result) {
+        this.$refs.pageTable._hideLoading()
+        this.getPage = result
+      }
+    },
+    _tableResultChange(msg, data) {
+      console.log(msg, data)
+      switch (msg) {
+        case 'page':
+          this.getPage = this.$store.state.FoodItem.page
+          break
+        case 'selectData':
+          this.$emit('on-result-change', data)
+          break
+        case 'singleSelect':
+          this.$emit('on-result-change', data)
+          break
+        case 'changeSize':
+          this._page()
+          break
+        case 'table-col':
+          // 用户选中的表格列
+          this.userColumns = data
+          break
+      }
+    },
+    _formSearch() {
+      this.$refs.pageTable._pageChange(1)
+    },
+    _btnClick(msg) {
+      switch (msg) {
+        case '自动分配':
+          this._autoAssign()
+          break
+      }
+    },
+    _autoAssign() {
+      console.log('自动分配')
+      // this.$refs.autoAssignModal._open()
+      // this.$store.dispatch('FoodItem/autoAllotNum').then(() => {
+      //   const num = this.$store.state.FoodItem.count
+      //   if (num !== undefined) {
+      //     this.$refs.refModal._open(num)
+      //   }
+      // })
+    }
+  }
+}
+</script>

pages/soil-test-manage/test-data-audit/item-tabs/ItemTabs.vue

+<template>
+  <div>
+    <TwoColumnPage>
+      <template slot="left">
+        <ItemLeftList ref="leftModal" @on-result-change="_leftResult"></ItemLeftList>
+      </template>
+      <template slot="right">
+        <ItemRightList ref="rightModal" @on-result-change="_rightResult"></ItemRightList>
+      </template>
+    </TwoColumnPage>
+  </div>
+</template>
+
+<script>
+import TwoColumnPage from '../../../../components/base/TwoColumnPage'
+import ItemLeftList from './ItemLeftList'
+import ItemRightList from './ItemRightList'
+
+export default {
+  components: {
+    TwoColumnPage,
+    ItemLeftList,
+    ItemRightList
+  },
+  data() {
+    return {
+      id: ''
+    }
+  },
+  methods: {
+    _leftResult(data) {
+      console.log('ItemTabs', data)
+      this.$refs.rightModal._open(this.id, data)
+    },
+    _rightResult() {
+      this.$refs.leftModal._page()
+    },
+    _open(id) {
+      this.id = id
+      console.log(id)
+      this.$refs.leftModal._open(this.id)
+      // this.$refs.rightModal._getColumn()
+    },
+    _clearTable() {
+      this.$refs.rightModal._clearAll()
+    }
+  }
+}
+</script>

pages/soil-test-manage/test-data-audit/sample-tabs/SampleLeftList.vue

+<template>
+  <div>
+    <Row>
+      <!--查询-->
+      <Col span="24">
+        <Form id="task-assign-sample-left" :label-width="70" inline onsubmit="return false">
+        <label class="label-sign"></label>
+        <Form-item class="search-item" label="委托编号:">
+          <Input v-model="formObj.client" @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 @on-result-change="_btnClick" class="contHide" style="margin-bottom: 6px;"></btn-list>
+      </Col>
+      <!-- 表格 -->
+      <Col span="24">
+      <PTVXETable ref="pageTable" :pageColumns="pageColumns" :table-name="tableName"
+                  :tableHeight="tableHeight"
+                    @on-result-change="_tableResultChange" :getPage="getPage" :rows="100">
+        <vxe-table-column
+          v-for="item in userColumns.length > 0 ?userColumns:pageColumns"
+          :key="item.key"
+          :field="item.key"
+          :title="item.title"
+          :min-width="item.width"
+          :fixed="item.fixed?item.fixed:undefined"
+          sortable>
+          <template slot-scope="scope">
+            <a v-if="item.detail" @click.stop="_detailModal(scope.row)">{{scope.row[item.key]}}</a>
+            <span v-else-if="item.date">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):''}}</span>
+            <span v-else>{{scope.row[item.key]}}</span>
+          </template>
+        </vxe-table-column>
+        <VXESettingCol slot="setting" :pageColumns="pageColumns" :userColumns="userColumns"
+                       @on-result-change="_resetColumn" :table-name="tableName"></VXESettingCol>
+      </PTVXETable>
+      </Col>
+    </Row>
+  </div>
+</template>
+<script>
+import { soilTest } from '../../../../api'
+
+export default {
+  components: {},
+  data() {
+    return {
+      currentComponent: '',
+      formObj: {
+        entrustId: undefined
+      },
+      entrustId: '',
+      tableName: 'food-task-assign-item-left',
+      // 用户自己选中的列
+      userColumns: [],
+      selectIds: [],
+      optionList: [
+        { key: 'name', name: '检测项目', placeholder: '请输入检测项目' },
+        { key: 'testBasis', name: '检测依据', placeholder: '请输入检测依据' }
+      ],
+      getPage: {},
+      pageColumns: [
+        { title: '试样编号', key: 'sampleCode', width: 120 },
+        { title: '委托编号', key: 'entrustCode', width: 140 },
+        { title: '委托商', key: 'client', width: 200 }
+      ]
+    }
+  },
+  computed: {
+    tableHeight: function() {
+      return this.$tableHeight('tabSearch')
+    }
+  },
+  methods: {
+    // 重置column
+    _resetColumn(colList) {
+      this.userColumns = colList
+      this.$refs.pageTable._loadColumn(colList)
+    },
+    _modalResult() {
+      if (this.currentComponent === 'AutoAssignModal') {
+        this._formSearch()
+      }
+    },
+    _selInputResult1(msg, data) {
+      switch (msg) {
+        case 'search':
+          this._formSearch()
+          break
+      }
+    },
+    _open(id) {
+      this.entrustId = id
+      this._page()
+    },
+    _searchParams() {
+      const obj = {}
+      const obj1 = this.$refs.selInput1._getFormObj()
+      Object.assign(obj, obj1)
+      return obj
+    },
+    _page: async function() {
+      Object.assign(this.formObj, this.$refs.pageTable._searchParams())
+      this.formObj.entrustId = this.entrustId
+      const result = await soilTest.pageExpTestSample(
+        this.$serializeForm(this.formObj)
+      )
+      if (result) {
+        this.$refs.pageTable._hideLoading()
+        this.getPage = result
+      }
+    },
+    _tableResultChange(msg, data) {
+      switch (msg) {
+        case 'page':
+          this._page()
+          break
+        // case 'selectData':
+        //   this.$emit('on-result-change', data)
+        //   break
+        case 'selectIds':
+          this.selectIds = data
+          this.$emit('on-result-change', this.selectIds.join(','))
+          break
+        case 'changeSize':
+          this._page()
+          break
+        case 'table-col':
+          // 用户选中的表格列
+          this.userColumns = data
+          break
+      }
+    },
+    _formSearch() {
+      this.$refs.pageTable._pageChange(1)
+    },
+    _btnClick(msg) {
+      switch (msg) {
+        case '自动分配':
+          this.currentComponent = 'AutoAssignModal'
+          this.$nextTick(function() {
+            this._autoAssign()
+          })
+          break
+      }
+    },
+    _autoAssign() {
+      this.$store.dispatch('FoodItem/autoAllotNum').then(() => {
+        const num = this.$store.state.FoodItem.count
+        if (num !== undefined) {
+          this.$refs.refModal._open(num)
+        }
+      })
+    }
+  }
+}
+</script>

pages/soil-test-manage/test-data-audit/sample-tabs/SampleTabs.vue

+<template>
+  <div>
+    <TwoColumnPage>
+      <template slot="left">
+        <ItemLeftList  ref="SampleleftModal" @on-result-change="_leftResult"></ItemLeftList>
+      </template>
+      <template slot="right">
+        <ItemRightList ref="SamplerightModal" @on-result-change="_rightResult"></ItemRightList>
+      </template>
+    </TwoColumnPage>
+  </div>
+</template>
+
+<script>
+import TwoColumnPage from '../../../../components/base/TwoColumnPage'
+import ItemLeftList from './SampleLeftList'
+import ItemRightList from './SampleRightList'
+
+export default {
+  components: {
+    TwoColumnPage,
+    ItemLeftList,
+    ItemRightList
+  },
+  data() {
+    return {
+      id: ''
+    }
+  },
+  methods: {
+    _leftResult(data) {
+      this.$refs.SamplerightModal._open(this.id, data)
+    },
+    _rightResult() {
+      this.$refs.SampleleftModal._page()
+    },
+    _open(id) {
+      this.id = id
+      this.$refs.SampleleftModal._open(id)
+      // this.$refs.rightModal._getColumn()
+    },
+    _clearTable() {
+      this.$refs.SamplerightModal._clearAll()
+    }
+  }
+}
+</script>

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

+<template>
+  <div>
+    <Modal v-model="showSampleModal" @on-visible-change="_visibleChange" width="1200"
+           class="zIndex-900 modal-footer-none">
+      <p slot="header">数据复核</p>
+      <div>
+        <el-tabs v-model="activeName" @tab-click="_changeTabs">
+          <el-tab-pane label="按项目复核" name="waitReceive">
+            <WaitReceive ref="waitReceiveModal"></WaitReceive>
+          </el-tab-pane>
+          <el-tab-pane label="按样品复核" name="waitScan">
+            <WaitScan ref="waitScanModal"></WaitScan>
+          </el-tab-pane>
+<!--          <el-tab-pane label="查看原始记录" name="viewRecord">-->
+<!--            <OriginalRecordView ref="recordModal"></OriginalRecordView>-->
+<!--          </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>
+</template>
+<script>
+import WaitReceive from './item-tabs/ItemTabs'
+import WaitScan from './sample-tabs/SampleTabs'
+// import OriginalRecordView from './OriginalRecordView'
+
+export default {
+  components: {
+    WaitReceive,
+    WaitScan
+    // OriginalRecordView
+  },
+  data() {
+    return {
+      type: '',
+      contractId: '', // 合同id
+      entrustId: '',
+      showSampleModal: false,
+      modalTitle: '',
+      selectIds: [],
+      activeName: 'waitReceive',
+      name: '',
+      currentComponent: ''
+    }
+  },
+  mounted() {
+    // this.currentComponent = 'waitScan'
+  },
+  methods: {
+    _open(contractId, type, name) {
+      this.type = type // 类型（采样或送样）
+      this.name = name
+      this.showSampleModal = true
+      this.entrustId = contractId // 合同id
+      this.activeName = 'waitReceive'
+      // this.currentComponent = 'waitScan'
+      this.selectIds = []
+      this._waitPage()
+    },
+    // 待接收
+    _waitPage() {
+      this.$refs.waitReceiveModal._open(this.entrustId)
+    },
+    // 待发放
+    _waitSend() {
+      this.$refs.waitScanModal._open(this.entrustId)
+    },
+    // 已接收
+    _issuedPage() {
+      this.$refs.alreadyIssuedModal._open(this.contractId, this.type)
+    },
+    _changeTabs(tab, event) {
+      if (tab.name === 'viewRecord') {
+        // this._issuedPage()
+        this.$refs.recordModal._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()
+      }
+    },
+    _search() {
+      this.$refs.waitReceiveModal._clearTable()
+      this.$refs.waitScanModal._clearTable()
+      this.$emit('on-result-change')
+    },
+    // 关闭弹框的时候刷新上个界面
+    _visibleChange(data) {
+      if (data === false) {
+        this._search()
+      }
+    }
+  }
+}
+</script>

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

+<template>
+  <div>
+    <div class="layout-content-padding">
+      <div class="layout-content-main">
+        <el-tabs v-model="activeName" @tab-click="_changeTabs">
+          <el-tab-pane label="数据复核" name="check">
+            <SampleBackupsManage ref="checkTabs"></SampleBackupsManage>
+          </el-tab-pane>
+          <el-tab-pane label="历史任务" name="checkHis">
+            <SampleBackupsQuery ref="checkHisTabs"></SampleBackupsQuery>
+          </el-tab-pane>
+        </el-tabs>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import SampleBackupsManage from './DataCheck'
+import SampleBackupsQuery from './DataCheckHis'
+
+export default {
+  components: {
+    SampleBackupsManage,
+    SampleBackupsQuery
+  },
+  data() {
+    return {
+      activeName: 'check'
+    }
+  },
+  mounted() {
+    this.activeName = 'check'
+    this.$refs.checkTabs._page()
+  },
+  methods: {
+    _changeTabs(tab, event) {
+      if (tab.name === 'check') {
+        this.$refs.checkTabs._page()
+      } else if (tab.name === 'applyRecord') {
+        // this.$refs.applyRecordTabs._page()
+      } else {
+        this.$refs.checkHisTabs._page()
+      }
+    }
+  }
+}
+</script>

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

+<template>
+  <div>
+    <Modal v-model="showModal" width="100" class="modal-footer-none full-screen">
+      <div slot="header">{{modalTitle}}</div>
+      <div>
+        <Form id="index-right-form" :label-width="80" inline onsubmit="return false">
+          <label class="label-sign"></label>
+          <Form-item class="search-item" label="指标名称:">
+            <Input v-model="formObj.name" @on-enter="_formSearch" placeholder="请输入类别" clearable/>
+          </Form-item>
+          <Form-item class="search-btn">
+            <Button @click="_formSearch" type="primary">搜索</Button>
+          </Form-item>
+        </Form>
+          <btn-list :msg="btn" @on-result-change="_btnClick" class="contHide" style="margin-bottom: 10px;"/>
+        <PTVXETable ref="pageTable" :tableHeight="tableHeight"
+                    @on-result-change="_tableResultChange" :getPage="getPage" :iconMsg="iconMsg">
+          <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">
+            <template slot-scope="scope">
+              <span v-if="item.key==='defaulted'">{{scope.row[item.key]?'是':'否'}}</span>
+              <span v-else>{{scope.row[item.key]}}</span>
+            </template>
+          </vxe-table-column>
+        </PTVXETable>
+      </div>
+    </Modal>
+    <IndexManageEdit ref="indexEdit" @on-result-change="_page"></IndexManageEdit>
+  </div>
+</template>
+
+<script>
+import { soilAptitude, soilTest } from '../../../api'
+import IndexManageEdit from './IndexManageEdit'
+
+export default {
+  components: { IndexManageEdit },
+  data() {
+    return {
+      id: '',
+      modalTitle: '',
+      showModal: false,
+      btn: [
+        { type: 'success', id: '', name: '添加指标' },
+        { type: 'error', id: '', name: '删除' }
+      ],
+      tableHeight: document.documentElement.clientHeight - 180,
+      pageColumns: [
+        { title: '试验指标名称', key: 'name' },
+        { title: '试验指标大类', key: 'mainType', width: 120 },
+        { title: '试验指标小类', key: 'smallType', width: 120 },
+        { title: '状态', key: 'status', width: 120 },
+        { title: '检测值', key: 'testValue', width: 120 },
+        { title: '单位', key: 'unit', width: 120 }
+      ],
+      getPage: {},
+      iconMsg: [{ type: 'md-create', id: '', name: '编辑' }],
+      selectIds: [],
+      formObj: {
+        name: ''
+      },
+      // 资质信息
+      aptitudeItemInfo: {}
+    }
+  },
+  methods: {
+    _open(data) {
+      console.log(data)
+      this.aptitudeItemInfo = data
+      this.formObj = this.$resetFields(this.formObj)
+      this.id = data.id
+      this.modalTitle = data.name + ' 指标管理'
+      this.showModal = true
+      this._page()
+    },
+    _page: async function() {
+      Object.assign(this.formObj, this.$refs.pageTable._searchParams())
+      this.formObj.experimentId = this.id
+      const result = await soilTest.itemPage(this.$serializeForm(this.formObj))
+      if (result) {
+        console.log(result)
+        this.getPage = result
+        this.$refs.pageTable._hideLoading()
+      }
+    },
+    _formSearch() {
+      this.$refs.pageTable._pageChange(1)
+    },
+    _tableResultChange(msg, data) {
+      switch (msg) {
+        case 'page':
+          break
+        case 'selectIds':
+          this.selectIds = data
+          break
+        case 'iconClick':
+          this._iconClick(data.name, data.rowData)
+          break
+        case 'changeSize':
+          this._page()
+          break
+      }
+    },
+    _iconClick(res, data) {
+      switch (res) {
+        case '编辑':
+          this._editModal(true, data)
+          break
+      }
+    },
+    _editModal(edit, data) {
+      if (edit) {
+        this._getById(data)
+      } else {
+        this.$refs.indexEdit._open(this.id, '')
+      }
+    },
+    _getById: async function(data) {
+      const result = await soilTest.itemGetById(data.id)
+      console.log(result)
+      if (result) {
+        this.$refs.indexEdit._open('', result)
+      }
+    },
+    _btnClick(msg) {
+      switch (msg) {
+        case '添加指标':
+          this._editModal(false)
+          break
+        case '删除':
+          this._deleteByIds()
+          break
+      }
+    },
+    _deleteByIds() {
+      if (this.selectIds.length === 0) {
+        // this.$msgTip('warning')
+        this.$message.warning('请至少选择一条记录')
+      } else {
+        this.$Modal.confirm({
+          title: '提示',
+          content: '确定删除 ' + this.selectIds.length + ' 条记录？',
+          onOk: () => {
+            this._delOk(this.selectIds)
+          }
+        })
+      }
+    },
+    _delOk: async function(ids) {
+      const result = await soilAptitude.expItemDeleteByIds(ids)
+      if (result) {
+        this.$message.success('删除成功')
+        this._page()
+      }
+    }
+  }
+}
+</script>

pages/soil-test-manage/test-data-check/item-tabs/ItemLeftList.vue

+<template>
+  <div>
+    <Row>
+      <!--查询-->
+      <Col span="24">
+        <Form id="task-assign-item-left" :label-width="70" inline onsubmit="return false">
+        <label class="label-sign"></label>
+        <Form-item class="search-item" label="检测项目:">
+          <Input v-model="formObj.name" @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 @on-result-change="_btnClick" class="contHide" style="margin-bottom: 6px;"></btn-list>
+      </Col>
+      <!-- 表格 -->
+      <Col span="24">
+      <PTVXETable ref="pageTable" :isRadio="true" :pageColumns="pageColumns" :table-name="tableName"
+                  :tableHeight="tableHeight"
+                    @on-result-change="_tableResultChange" :getPage="getPage" :hide-checkbox="true" :rows="100" select-data>
+        <vxe-table-column
+          v-for="item in userColumns.length > 0 ?userColumns:pageColumns"
+          :key="item.key"
+          :field="item.key"
+          :title="item.title"
+          :min-width="item.width"
+          :fixed="item.fixed?item.fixed:undefined"
+          sortable>
+          <template slot-scope="scope">
+            <a v-if="item.detail" @click.stop="_detailModal(scope.row)">{{scope.row[item.key]}}</a>
+            <span v-else-if="item.date">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):''}}</span>
+            <span v-else>{{scope.row[item.key]}}</span>
+          </template>
+        </vxe-table-column>
+        <VXESettingCol slot="setting" :pageColumns="pageColumns" :userColumns="userColumns"
+                       @on-result-change="_resetColumn" :table-name="tableName"></VXESettingCol>
+      </PTVXETable>
+      </Col>
+    </Row>
+  </div>
+</template>
+<script>
+import { soilTest } from '../../../../api'
+export default {
+  components: {},
+  data() {
+    return {
+      currentComponent: '',
+      formObj: {
+        name: undefined
+      },
+      tableName: 'food-task-assign-item-left',
+      // 用户自己选中的列
+      userColumns: [],
+      optionList: [
+        { key: 'name', name: '检测项目', placeholder: '请输入检测项目' },
+        { key: 'testBasis', name: '检测依据', placeholder: '请输入检测依据' }
+      ],
+      getPage: {},
+      id: '',
+      pageColumns: [
+        { title: '检测项目', key: 'name', width: 120 },
+        { title: '检测方法', key: 'testMethod', width: 140 },
+        { title: '检测依据名称', key: 'testBasisName', width: 200 }
+      ]
+    }
+  },
+  computed: {
+    tableHeight: function() {
+      return this.$tableHeight('tabSearch')
+    }
+  },
+  methods: {
+    // 重置column
+    _resetColumn(colList) {
+      this.userColumns = colList
+      this.$refs.pageTable._loadColumn(colList)
+    },
+    _modalResult() {
+      if (this.currentComponent === 'AutoAssignModal') {
+        this._formSearch()
+      }
+    },
+    _selInputResult1(msg, data) {
+      switch (msg) {
+        case 'search':
+          this._formSearch()
+          break
+      }
+    },
+    _open(id) {
+      this.id = id
+      this._page()
+    },
+    _searchParams() {
+      const obj = {}
+      const obj1 = this.$refs.selInput1._getFormObj()
+      Object.assign(obj, obj1)
+      return obj
+    },
+    _page: async function() {
+      Object.assign(this.formObj, this.$refs.pageTable._searchParams())
+      this.formObj.entrustId = this.id
+      const result = await soilTest.pageTestByExp(
+        this.$serializeForm(this.formObj)
+      )
+      if (result) {
+        this.$refs.pageTable._hideLoading()
+        this.getPage = result
+      }
+    },
+    _tableResultChange(msg, data) {
+      console.log(msg, data)
+      switch (msg) {
+        case 'page':
+          this.getPage = this.$store.state.FoodItem.page
+          break
+        case 'selectData':
+          this.$emit('on-result-change', data)
+          break
+        case 'singleSelect':
+          this.$emit('on-result-change', data)
+          break
+        case 'changeSize':
+          this._page()
+          break
+        case 'table-col':
+          // 用户选中的表格列
+          this.userColumns = data
+          break
+      }
+    },
+    _formSearch() {
+      this.$refs.pageTable._pageChange(1)
+    },
+    _btnClick(msg) {
+      switch (msg) {
+        case '自动分配':
+          this._autoAssign()
+          break
+      }
+    },
+    _autoAssign() {
+      console.log('自动分配')
+      // this.$refs.autoAssignModal._open()
+      // this.$store.dispatch('FoodItem/autoAllotNum').then(() => {
+      //   const num = this.$store.state.FoodItem.count
+      //   if (num !== undefined) {
+      //     this.$refs.refModal._open(num)
+      //   }
+      // })
+    }
+  }
+}
+</script>

pages/soil-test-manage/test-data-check/item-tabs/ItemTabs.vue

+<template>
+  <div>
+    <TwoColumnPage>
+      <template slot="left">
+        <ItemLeftList ref="leftModal" @on-result-change="_leftResult"></ItemLeftList>
+      </template>
+      <template slot="right">
+        <ItemRightList ref="rightModal" @on-result-change="_rightResult"></ItemRightList>
+      </template>
+    </TwoColumnPage>
+  </div>
+</template>
+
+<script>
+import TwoColumnPage from '../../../../components/base/TwoColumnPage'
+import ItemLeftList from './ItemLeftList'
+import ItemRightList from './ItemRightList'
+
+export default {
+  components: {
+    TwoColumnPage,
+    ItemLeftList,
+    ItemRightList
+  },
+  data() {
+    return {
+      id: ''
+    }
+  },
+  methods: {
+    _leftResult(data) {
+      console.log('ItemTabs', data)
+      this.$refs.rightModal._open(this.id, data)
+    },
+    _rightResult() {
+      this.$refs.leftModal._page()
+    },
+    _open(id) {
+      this.id = id
+      console.log(id)
+      this.$refs.leftModal._open(this.id)
+      // this.$refs.rightModal._getColumn()
+    },
+    _clearTable() {
+      this.$refs.rightModal._clearAll()
+    }
+  }
+}
+</script>

pages/soil-test-manage/test-data-check/sample-tabs/SampleLeftList.vue

+<template>
+  <div>
+    <Row>
+      <!--查询-->
+      <Col span="24">
+        <Form id="task-assign-sample-left" :label-width="70" inline onsubmit="return false">
+        <label class="label-sign"></label>
+        <Form-item class="search-item" label="委托编号:">
+          <Input v-model="formObj.client" @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 @on-result-change="_btnClick" class="contHide" style="margin-bottom: 6px;"></btn-list>
+      </Col>
+      <!-- 表格 -->
+      <Col span="24">
+      <PTVXETable ref="pageTable" :pageColumns="pageColumns" :table-name="tableName"
+                  :tableHeight="tableHeight"
+                    @on-result-change="_tableResultChange" :getPage="getPage" :rows="100">
+        <vxe-table-column
+          v-for="item in userColumns.length > 0 ?userColumns:pageColumns"
+          :key="item.key"
+          :field="item.key"
+          :title="item.title"
+          :min-width="item.width"
+          :fixed="item.fixed?item.fixed:undefined"
+          sortable>
+          <template slot-scope="scope">
+            <a v-if="item.detail" @click.stop="_detailModal(scope.row)">{{scope.row[item.key]}}</a>
+            <span v-else-if="item.date">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):''}}</span>
+            <span v-else>{{scope.row[item.key]}}</span>
+          </template>
+        </vxe-table-column>
+        <VXESettingCol slot="setting" :pageColumns="pageColumns" :userColumns="userColumns"
+                       @on-result-change="_resetColumn" :table-name="tableName"></VXESettingCol>
+      </PTVXETable>
+      </Col>
+    </Row>
+  </div>
+</template>
+<script>
+import { soilTest } from '../../../../api'
+
+export default {
+  components: {},
+  data() {
+    return {
+      currentComponent: '',
+      formObj: {
+        entrustId: undefined
+      },
+      entrustId: '',
+      tableName: 'food-task-assign-item-left',
+      // 用户自己选中的列
+      userColumns: [],
+      selectIds: [],
+      optionList: [
+        { key: 'name', name: '检测项目', placeholder: '请输入检测项目' },
+        { key: 'testBasis', name: '检测依据', placeholder: '请输入检测依据' }
+      ],
+      getPage: {},
+      pageColumns: [
+        { title: '试样编号', key: 'sampleCode', width: 120 },
+        { title: '委托编号', key: 'entrustCode', width: 140 },
+        { title: '委托商', key: 'client', width: 200 }
+      ]
+    }
+  },
+  computed: {
+    tableHeight: function() {
+      return this.$tableHeight('tabSearch')
+    }
+  },
+  methods: {
+    // 重置column
+    _resetColumn(colList) {
+      this.userColumns = colList
+      this.$refs.pageTable._loadColumn(colList)
+    },
+    _modalResult() {
+      if (this.currentComponent === 'AutoAssignModal') {
+        this._formSearch()
+      }
+    },
+    _selInputResult1(msg, data) {
+      switch (msg) {
+        case 'search':
+          this._formSearch()
+          break
+      }
+    },
+    _open(id) {
+      this.entrustId = id
+      this._page()
+    },
+    _searchParams() {
+      const obj = {}
+      const obj1 = this.$refs.selInput1._getFormObj()
+      Object.assign(obj, obj1)
+      return obj
+    },
+    _page: async function() {
+      Object.assign(this.formObj, this.$refs.pageTable._searchParams())
+      this.formObj.entrustId = this.entrustId
+      const result = await soilTest.pageExpTestSample(
+        this.$serializeForm(this.formObj)
+      )
+      if (result) {
+        this.$refs.pageTable._hideLoading()
+        this.getPage = result
+      }
+    },
+    _tableResultChange(msg, data) {
+      switch (msg) {
+        case 'page':
+          this._page()
+          break
+        // case 'selectData':
+        //   this.$emit('on-result-change', data)
+        //   break
+        case 'selectIds':
+          this.selectIds = data
+          this.$emit('on-result-change', this.selectIds.join(','))
+          break
+        case 'changeSize':
+          this._page()
+          break
+        case 'table-col':
+          // 用户选中的表格列
+          this.userColumns = data
+          break
+      }
+    },
+    _formSearch() {
+      this.$refs.pageTable._pageChange(1)
+    },
+    _btnClick(msg) {
+      switch (msg) {
+        case '自动分配':
+          this.currentComponent = 'AutoAssignModal'
+          this.$nextTick(function() {
+            this._autoAssign()
+          })
+          break
+      }
+    },
+    _autoAssign() {
+      this.$store.dispatch('FoodItem/autoAllotNum').then(() => {
+        const num = this.$store.state.FoodItem.count
+        if (num !== undefined) {
+          this.$refs.refModal._open(num)
+        }
+      })
+    }
+  }
+}
+</script>

pages/soil-test-manage/test-data-check/sample-tabs/SampleTabs.vue

+<template>
+  <div>
+    <TwoColumnPage>
+      <template slot="left">
+        <ItemLeftList  ref="SampleleftModal" @on-result-change="_leftResult"></ItemLeftList>
+      </template>
+      <template slot="right">
+        <ItemRightList ref="SamplerightModal" @on-result-change="_rightResult"></ItemRightList>
+      </template>
+    </TwoColumnPage>
+  </div>
+</template>
+
+<script>
+import TwoColumnPage from '../../../../components/base/TwoColumnPage'
+import ItemLeftList from './SampleLeftList'
+import ItemRightList from './SampleRightList'
+
+export default {
+  components: {
+    TwoColumnPage,
+    ItemLeftList,
+    ItemRightList
+  },
+  data() {
+    return {
+      id: ''
+    }
+  },
+  methods: {
+    _leftResult(data) {
+      this.$refs.SamplerightModal._open(this.id, data)
+    },
+    _rightResult() {
+      this.$refs.SampleleftModal._page()
+    },
+    _open(id) {
+      this.id = id
+      this.$refs.SampleleftModal._open(id)
+      // this.$refs.rightModal._getColumn()
+    },
+    _clearTable() {
+      this.$refs.SamplerightModal._clearAll()
+    }
+  }
+}
+</script>

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

+<template>
+  <div>
+    <Modal v-model="showModal" width="100" class="modal-footer-none full-screen">
+      <div slot="header">{{modalTitle}}</div>
+      <div>
+        <Form id="index-right-form" :label-width="80" inline onsubmit="return false">
+          <label class="label-sign"></label>
+          <Form-item class="search-item" label="指标名称:">
+            <Input v-model="formObj.name" @on-enter="_formSearch" placeholder="请输入类别" clearable/>
+          </Form-item>
+          <Form-item class="search-btn">
+            <Button @click="_formSearch" type="primary">搜索</Button>
+          </Form-item>
+        </Form>
+          <btn-list :msg="btn" @on-result-change="_btnClick" class="contHide" style="margin-bottom: 10px;"/>
+        <PTVXETable ref="pageTable" :tableHeight="tableHeight"
+                    @on-result-change="_tableResultChange" :getPage="getPage" :iconMsg="iconMsg">
+          <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">
+            <template slot-scope="scope">
+              <span v-if="item.key==='defaulted'">{{scope.row[item.key]?'是':'否'}}</span>
+              <span v-else>{{scope.row[item.key]}}</span>
+            </template>
+          </vxe-table-column>
+        </PTVXETable>
+      </div>
+    </Modal>
+    <IndexManageEdit ref="indexEdit" @on-result-change="_page"></IndexManageEdit>
+  </div>
+</template>
+
+<script>
+import { soilAptitude, soilTest } from '../../../api'
+import IndexManageEdit from './IndexManageEdit'
+
+export default {
+  components: { IndexManageEdit },
+  data() {
+    return {
+      id: '',
+      modalTitle: '',
+      showModal: false,
+      btn: [
+        { type: 'success', id: '', name: '添加指标' },
+        { type: 'error', id: '', name: '删除' }
+      ],
+      tableHeight: document.documentElement.clientHeight - 180,
+      pageColumns: [
+        { title: '试验指标名称', key: 'name' },
+        { title: '试验指标大类', key: 'mainType', width: 120 },
+        { title: '试验指标小类', key: 'smallType', width: 120 },
+        { title: '状态', key: 'status', width: 120 },
+        { title: '检测值', key: 'testValue', width: 120 },
+        { title: '单位', key: 'unit', width: 120 }
+      ],
+      getPage: {},
+      iconMsg: [{ type: 'md-create', id: '', name: '编辑' }],
+      selectIds: [],
+      formObj: {
+        name: ''
+      },
+      // 资质信息
+      aptitudeItemInfo: {}
+    }
+  },
+  methods: {
+    _open(data) {
+      console.log(data)
+      this.aptitudeItemInfo = data
+      this.formObj = this.$resetFields(this.formObj)
+      this.id = data.id
+      this.modalTitle = data.name + ' 指标管理'
+      this.showModal = true
+      this._page()
+    },
+    _page: async function() {
+      Object.assign(this.formObj, this.$refs.pageTable._searchParams())
+      this.formObj.experimentId = this.id
+      const result = await soilTest.itemPage(this.$serializeForm(this.formObj))
+      if (result) {
+        console.log(result)
+        this.getPage = result
+        this.$refs.pageTable._hideLoading()
+      }
+    },
+    _formSearch() {
+      this.$refs.pageTable._pageChange(1)
+    },
+    _tableResultChange(msg, data) {
+      switch (msg) {
+        case 'page':
+          break
+        case 'selectIds':
+          this.selectIds = data
+          break
+        case 'iconClick':
+          this._iconClick(data.name, data.rowData)
+          break
+        case 'changeSize':
+          this._page()
+          break
+      }
+    },
+    _iconClick(res, data) {
+      switch (res) {
+        case '编辑':
+          this._editModal(true, data)
+          break
+      }
+    },
+    _editModal(edit, data) {
+      if (edit) {
+        this._getById(data)
+      } else {
+        this.$refs.indexEdit._open(this.id, '')
+      }
+    },
+    _getById: async function(data) {
+      const result = await soilTest.itemGetById(data.id)
+      console.log(result)
+      if (result) {
+        this.$refs.indexEdit._open('', result)
+      }
+    },
+    _btnClick(msg) {
+      switch (msg) {
+        case '添加指标':
+          this._editModal(false)
+          break
+        case '删除':
+          this._deleteByIds()
+          break
+      }
+    },
+    _deleteByIds() {
+      if (this.selectIds.length === 0) {
+        // this.$msgTip('warning')
+        this.$message.warning('请至少选择一条记录')
+      } else {
+        this.$Modal.confirm({
+          title: '提示',
+          content: '确定删除 ' + this.selectIds.length + ' 条记录？',
+          onOk: () => {
+            this._delOk(this.selectIds)
+          }
+        })
+      }
+    },
+    _delOk: async function(ids) {
+      const result = await soilAptitude.expItemDeleteByIds(ids)
+      if (result) {
+        this.$message.success('删除成功')
+        this._page()
+      }
+    }
+  }
+}
+</script>

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

@@ -8,6 +8,7 @@
 </template>
 <script>
 import Global from '../../../api/config'
+import { soilTest } from '../../../api'
 
 /**
  * 编辑原始记录详情
@@ -74,6 +75,7 @@ export default {
       this.$layx(this.formIdTemp, '编辑原始记录', url)
     },
     _saveOriginal(data) {
+      console.log('修改的数据', data)
       if (this.again) {
         if (data.data.msg === true) {
           this._editSaveRecord(data)
@@ -89,6 +91,15 @@ export default {
       // eslint-disable-next-line no-undef
       layx.destroyAll(this.formIdTemp)
     },
+    _updateRecord: async function(param) {
+      const result = await soilTest.updateItem(param)
+      console.log(result)
+      if (result) {
+        this.$Message.success('保存成功')
+        this._cancel()
+        this.$emit('on-result-change')
+      }
+    },
     // 保存后解析项目的检测值
     _editSaveRecord(data) {
       const param = {
@@ -113,14 +124,15 @@ export default {
           param.copyMap = JSON.stringify(copyMapTemp)
         })
       }
-      this.$store.dispatch('EnvItem/updateFormForItem', param).then(() => {
-        if (this.$store.state.EnvItem.success) {
-          this.$Message.success('保存成功')
-          // this.showModal = false;
-          this.$emit('on-result-change')
-          this._cancel()
-        }
-      })
+      this._updateRecord(param)
+      // this.$store.dispatch('EnvItem/updateFormForItem', param).then(() => {
+      //   if (this.$store.state.EnvItem.success) {
+      //     this.$Message.success('保存成功')
+      //     // this.showModal = false;
+      //     this.$emit('on-result-change')
+      //     this._cancel()
+      //   }
+      // })
     }
   }
 }

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

@@ -11,6 +11,9 @@
           <el-tab-pane label="按样品录入" name="waitScan">
             <WaitScan ref="waitScanModal"></WaitScan>
           </el-tab-pane>
+          <el-tab-pane label="查看原始记录" name="viewRecord">
+            <OriginalRecordView ref="recordModal"></OriginalRecordView>
+          </el-tab-pane>
         </el-tabs>
 <!--        <keep-alive>-->
 <!--          &lt;!&ndash; eslint-disable-next-line vue/require-component-is &ndash;&gt;-->
@@ -23,11 +26,13 @@
 <script>
 import WaitReceive from './item-tabs/ItemTabs'
 import WaitScan from './sample-tabs/SampleTabs'
+import OriginalRecordView from './OriginalRecordView'
 
 export default {
   components: {
     WaitReceive,
-    WaitScan
+    WaitScan,
+    OriginalRecordView
   },
   data() {
     return {
@@ -69,8 +74,9 @@ export default {
       this.$refs.alreadyIssuedModal._open(this.contractId, this.type)
     },
     _changeTabs(tab, event) {
-      if (tab.name === 'alreadyIssued') {
+      if (tab.name === 'viewRecord') {
         // this._issuedPage()
+        this.$refs.recordModal._open(this.entrustId)
       } else if (tab.name === 'waitReceive') {
         // this._waitPage()
         this.$refs.waitScanModal._clearTable()

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

@@ -80,6 +80,7 @@ export default {
         title: '',
         businessTypeList: 0
       },
+      entrustId: '',
       selectData: [],
       itemIds: [],
       footerList: [
@@ -139,8 +140,9 @@ export default {
     _hideLoading() {
       this.$refs.footerModal._hideLoading()
     },
-    _open(ids) {
+    _open(ids, entrustId) {
       this.formObj = this.$resetFields(this.formObj)
+      this.entrustId = entrustId
       this._classTree()
       this.showModal = true
       this.itemIds = ids
@@ -221,9 +223,9 @@ export default {
       const result = await soilTest.checkLimit(param)
       console.log(result)
     },
-    _createOriginalRecord: async function() {
-      const result = await soilTest.searchItem({ ids: this.itemIds.join(',') })
-      console.log(result)
+    _createOriginalRecord() {
+      // const result = await soilTest.searchItem({ ids: this.itemIds.join(',') })
+      // console.log(result)
       this.showModal = false
       const url =
         Global.recordURL + '/print/v1/eln/template_YT_' + this.selectData[0].id
@@ -331,6 +333,7 @@ export default {
             }
             console.log('保存的数据', tempData)
             if (tempData.formId !== undefined) {
+              tempData.entrustId = this.entrustId
               this._save(tempData)
             }
             // this.$store

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

@@ -93,7 +93,6 @@ export default {
           name: '管理样品'
         },
         { type: 'md-cloud', id: '', name: '附件' },
-        { type: 'md-trash', id: '', name: '删除' },
         {
           type: 'ios-clock',
           id: '',
@@ -109,12 +108,12 @@ 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: '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: 'approveDate', width: 120, date: true },
+        // { title: '批准人', key: 'approver', width: 120 },
         { title: '检验类别', key: 'testType', width: 120 }
       ],
       searchOpen: false,

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

@@ -6,7 +6,7 @@
         <Form id="task-assign-item-left" :label-width="70" inline onsubmit="return false">
         <label class="label-sign"></label>
         <Form-item class="search-item" label="检测项目:">
-          <Input v-model="formObj.client" @on-enter="_formSearch" placeholder="请输入检测项目" clearable></Input>
+          <Input v-model="formObj.name" @on-enter="_formSearch" placeholder="请输入检测项目" clearable></Input>
         </Form-item>
         <Form-item class="search-btn">
           <Button @click="_formSearch" type="primary">搜索</Button>
@@ -49,7 +49,9 @@ export default {
   data() {
     return {
       currentComponent: '',
-      formObj: {},
+      formObj: {
+        name: undefined
+      },
       tableName: 'food-task-assign-item-left',
       // 用户自己选中的列
       userColumns: [],

pages/soil-test-manage/test-input/item-tabs/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.client" @on-enter="_formSearch" placeholder="请输入检测项目" clearable></Input>
+            <Input @on-enter="_formSearch" name="name" placeholder="请输入检测项目" clearable></Input>
           </Form-item>
           <Form-item class="search-btn">
             <Button @click="_formSearch" type="primary">搜索</Button>
@@ -20,7 +20,7 @@
       <!-- 表格 -->
       <Col span="24">
         <PTVXETable ref="pageTable" :pageColumns="pageColumns" :tableHeight="tableHeight"
-                    @on-result-change="_tableResultChange" :icon-msg="iconMsg" :getPage="getPage" :table-name="tableName" :rows="100" is-task select-data>
+                    @on-result-change="_tableResultChange" :getPage="getPage" :icon-msg="iconMsg" :table-name="tableName" :rows="100" is-task select-data>
           <vxe-table-column
             v-for="item in userColumns.length > 0 ?userColumns:pageColumns"
             :key="item.key"
@@ -49,6 +49,7 @@
     <AssignPerson ref="personModal" @on-result-change="_assignBackData"></AssignPerson>
     <SelectOriTempRecord ref="recordModal" @on-result-change="_page"></SelectOriTempRecord>
     <OriginalRecordEdit ref="editModal"></OriginalRecordEdit>
+    <IndexManage ref="indexModal" @on-result-change="_page"></IndexManage>
   </div>
 </template>
 <script>
@@ -57,8 +58,14 @@ import { soilTest } from '../../../../api'
 import AssignPerson from '../../../../components/user-info-single/AssignPerson'
 import SelectOriTempRecord from '../SelectOriTempRecord'
 import OriginalRecordEdit from '../OriginalRecordEdit'
+import IndexManage from '../IndexManage'
 export default {
-  components: { AssignPerson, SelectOriTempRecord, OriginalRecordEdit },
+  components: {
+    AssignPerson,
+    SelectOriTempRecord,
+    OriginalRecordEdit,
+    IndexManage
+  },
   data() {
     return {
       // 定义表格名称----英文
@@ -104,7 +111,10 @@ export default {
         },
         { type: '', id: 'food-task-assign-maintain-info', name: '信息维护' }
       ],
-      iconMsg: [{ type: 'md-create', id: '', name: '编辑原始记录' }],
+      iconMsg: [
+        { type: 'ios-book', id: '', name: '查看原始记录' },
+        { type: 'md-apps', id: '', name: '查看指标' }
+      ],
       getPage: {},
       pageColumns: [
         { title: '试验项目', key: 'name', width: 120, fixed: 'left' },
@@ -114,6 +124,7 @@ export default {
         { title: '是否填写原始记录', key: 'recorded', width: 180 },
         { title: '大类', key: 'mainType', width: 140 },
         { title: '小类', key: 'smallType', width: 140 },
+        { title: '原始记录是否填写', key: 'recorded', width: 140 },
         { title: '检测方法', key: 'testMethod', width: 260 },
         { title: '检测依据', key: 'testBasis', width: 140 },
         { title: '检测科室', key: 'groupName', width: 150 }
@@ -149,18 +160,40 @@ export default {
     _iconClick(res, data, currentComponent) {
       this.$nextTick(() => {
         switch (res) {
-          case '编辑原始记录':
-            this._recordEdit(data)
+          case '查看原始记录':
+            console.log(data)
+            this._viewRecord('1309434759937146882')
+            break
+          case '查看指标':
+            this._indexManage(data)
             break
         }
       })
     },
-    _recordEdit(data) {
-      console.log(data)
-      // this.$refs.editModal._openWithType(
-      //   data.originalRecordId,
-      //   'ENVTESTAUDITEDIT'
-      // )
+    _indexManage(data) {
+      this.$refs.indexModal._open(data)
+    },
+    _viewRecord(originalRecordId) {
+      // layx.iframe('labRecordWriteOriView', '原始记录预览', Global.recordURL + '/print/v1/form/' + originalRecordId, {
+      // eslint-disable-next-line no-undef
+      layx.iframe(
+        'labRecordWriteOriView',
+        '原始记录预览',
+        Global.recordURL +
+          '/print/v1/form/' +
+          originalRecordId +
+          '?type=ENVTESTMAKE',
+        {
+          event: {
+            onload: {
+              after: function(layxWindow, winform) {
+                // eslint-disable-next-line no-undef
+                layx.max(winform.id)
+              }
+            }
+          }
+        }
+      )
     },
     // 获取column
     _getColumn() {
@@ -325,7 +358,7 @@ export default {
         this.$message.warning('请至少选择一条数据')
       } else {
         console.log('打开填写原始记录界面')
-        this.$refs.recordModal._open(this.selectIds)
+        this.$refs.recordModal._open(this.selectIds, this.entrustId)
       }
     },
     _allotByPerson() {
@@ -389,6 +422,8 @@ export default {
       //   saveName.push(this.leftSelectData[i].name)
       //   saveMethod.push(this.leftSelectData[i].testMethod)
       // }
+      // const data = this.$serialize('task-assign-item-right')
+      // console.log(data)
       Object.assign(this.formObj, this.$refs.pageTable._searchParams())
       this.formObj.entrustId = this.entrustId
       this.formObj.name = this.leftSelectData.name

pages/soil-test-manage/test-input/sample-tabs/SampleRightList.vue

@@ -306,8 +306,9 @@ export default {
         this.$refs.refModal._open(tempData, 'planDate')
       }
     },
-    _open(data) {
+    _open(id, data) {
       this.getPage.records = []
+      console.log(id)
       this.sampleIds = data
       if (data.length === 0) {
         this.$set(this.getPage, 'records', [])
@@ -338,7 +339,7 @@ export default {
     _page: async function() {
       Object.assign(this.formObj, this.$refs.pageTable._searchParams())
       this.formObj.sampleIds = this.sampleIds
-      const result = await soilTest.pageAllot(this.$serializeForm(this.formObj))
+      const result = await soilTest.pageTest(this.$serializeForm(this.formObj))
       if (result) {
         this.$refs.pageTable._hideLoading()
         this.$refs.pageTable._checkAll()

pages/soil-test-manage/test-input/sample-tabs/SampleTabs.vue

@@ -23,16 +23,19 @@ export default {
     ItemRightList
   },
   data() {
-    return {}
+    return {
+      id: ''
+    }
   },
   methods: {
     _leftResult(data) {
-      this.$refs.SamplerightModal._open(data)
+      this.$refs.SamplerightModal._open(this.id, data)
     },
     _rightResult() {
       this.$refs.SampleleftModal._page()
     },
     _open(id) {
+      this.id = id
       this.$refs.SampleleftModal._open(id)
       // this.$refs.rightModal._getColumn()
     },

pages/soil-test-manage/test-task-manage/AllotByEntrust.vue

@@ -95,7 +95,6 @@ export default {
           name: '管理样品'
         },
         { type: 'md-cloud', id: '', name: '附件' },
-        { type: 'md-trash', id: '', name: '删除' },
         {
           type: 'ios-clock',
           id: '',

pages/soil-test-manage/test-task-manage/AllotBySample.vue

@@ -86,7 +86,6 @@ export default {
           name: '编辑'
         },
         { type: 'md-cloud', id: '', name: '附件' },
-        { type: 'md-trash', id: '', name: '删除' },
         {
           type: 'ios-clock',
           id: '',

plugins/common.js

@@ -483,10 +483,15 @@ Vue.prototype.$resetFields = function(formObj) {
   }
   return formObj
 }
+Vue.prototype.$layx = function(id, title, url, option) {
+  // eslint-disable-next-line no-undef
+  layx.iframe(id, title, url, option || { width: '100%', height: '100%' })
+}
 /**
  *搜索条件清空缓存处理方式(form表单 查询)
  *
  */
+
 Vue.prototype.$serializeForm = function(formObj) {
   const newFormObj = {}
   for (const key in formObj) {

router/soil-routes.js

@@ -15,6 +15,14 @@ import SampleTakeIndex from '../pages/soil-sample-manage/sample-take/SampleTakeI
 import SurplusManage from '../pages/soil-sample-manage/surplus-manage/SampleSurplusIndex'
 import TestTaskIndex from '../pages/soil-test-manage/test-task-manage/TestTaskIndex'
 import TestInputIndex from '../pages/soil-test-manage/test-input/TestInputIndex'
+import CheckIndex from '../pages/soil-test-manage/test-data-check/CheckIndex'
+import AuditIndex from '../pages/soil-test-manage/test-data-audit/AuditIndex'
+import ReportMakeIndex from '../pages/soil-report-manage/report-make/ReportMakeIndex'
+import failItem from '../pages/soil-statistics/failItem'
+import yearDeclara from '../pages/soil-statistics/yearDeclara'
+import MeterCustomerEntrust from '../pages/soil-statistics/customer-entrust/MeterCustomerEntrust'
+import MeterPersonalTask from '../pages/soil-statistics/personal-task/MeterPersonalTask'
+import MeterAnnualEntrust from '../pages/soil-statistics/annual-entrust/MeterAnnualEntrust'
 import Blank from '~/pages/blank'
 export default [
   {
@@ -87,6 +95,27 @@ export default [
         path: 'do_test',
         component: TestInputIndex,
         meta: { title: '试样检测' }
+      },
+      {
+        path: 'check',
+        component: CheckIndex,
+        meta: { title: '数据复核' }
+      },
+      {
+        path: 'audit',
+        component: AuditIndex,
+        meta: { title: '数据审核' }
+      }
+    ]
+  },
+  {
+    path: 'report',
+    component: Blank,
+    children: [
+      {
+        path: 'make_report',
+        component: ReportMakeIndex,
+        meta: { title: '报告编制' }
       }
     ]
   },
@@ -105,5 +134,36 @@ export default [
         meta: { title: '试验项目' }
       }
     ]
+  },
+  {
+    path: 'statistics',
+    component: Blank,
+    children: [
+      {
+        path: 'fail_item_statistics',
+        component: failItem,
+        meta: { title: '不合格项目查询' }
+      },
+      {
+        path: 'year_declara_count',
+        component: yearDeclara,
+        meta: { title: '年度报检量统计' }
+      },
+      {
+        path: 'customer_entrust',
+        component: MeterCustomerEntrust,
+        meta: { title: '客户委托量统计' }
+      },
+      {
+        path: 'annual_entrust',
+        component: MeterAnnualEntrust,
+        meta: { title: '年度委托量统计' }
+      },
+      {
+        path: 'personal_task',
+        component: MeterPersonalTask,
+        meta: { title: '个人检测任务查询' }
+      }
+    ]
   }
 ]