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

# Conflicts:
#	pages/meter-statistics/annual-entrust/YearContractTable.vue

pages/meter-statistics/customer-entrust/CustomerTable.vue

+<template>
+  <div>
+    <form id="form-customer-table">
+      <input name="queryDateBegin" type="hidden"/>
+      <input name="queryDateEnd" type="hidden"/>
+    </form>
+    <PTVXETable id="customer-contract-table" ref="pageTable"
+                :tableHeight="tableHeight" @on-result-change="_tableResultChange" :getPage="getPage" hide-checkbox click-value>
+      <vxe-table-column
+        :field="item.key"
+        :title="item.title"
+        :min-width="item.width?item.width:200"
+        :fixed="item.fixed?item.fixed:undefined"
+        v-for="item in pageColumns"
+        :key="item.key" sortable>
+        <template slot-scope="scope">
+          <a v-if="item.detail" @click.stop="_detail(scope.row)">{{scope.row[item.key]}}</a>
+          <span v-else>{{scope.row[item.key]}}</span>
+        </template>
+      </vxe-table-column>
+    </PTVXETable>
+    <!--详情-->
+    <Detail ref="detailModal"/>
+  </div>
+</template>
+
+<script>
+import { meterContract } from '../../../api'
+import Detail from './Detail'
+export default {
+  components: { Detail },
+  data() {
+    return {
+      pageColumns: [
+        {
+          title: '客户名称',
+          key: 'client',
+          width: 120,
+          fixed: 'left'
+        },
+        { title: '委托数量', key: 'total' },
+        { title: '委托额度', key: 'price' },
+        { title: '已收额度', key: 'collectPrice' },
+        { title: '未收额度', key: 'noCollectPrice' }
+      ],
+      formObj: {
+        client: undefined
+      },
+      getPage: {},
+      customer: '',
+      queryDateBegin: '',
+      queryDateEnd: ''
+    }
+  },
+  computed: {
+    tableHeight: function() {
+      return this.$tableHeight('noBtn')
+    }
+  },
+  methods: {
+    // 查看所有委托
+    _detail(data) {
+      this.$refs.detailModal._open({
+        cname: data.customer,
+        queryDateBegin: this.queryDateBegin,
+        queryDateEnd: this.queryDateEnd
+      })
+    },
+    _openTable(data) {
+      this.customer = data.customer
+      $('input[name=queryDateBegin]').val(data.queryDateBegin)
+      $('input[name=queryDateEnd]').val(data.queryDateEnd)
+      this.queryDateBegin = data.queryDateBegin
+      this.queryDateEnd = data.queryDateEnd
+      this._page()
+    },
+    _page: async function() {
+      Object.assign(this.formObj, this.$refs.pageTable._searchParams())
+      const result = await meterContract.page(this.formObj)
+      if (result) {
+        this.$refs.pageTable._hideLoading()
+        this.getPage = result
+      }
+    },
+    // _page() {
+    //   const data = {}
+    //   if (this.customer) {
+    //     data.customer = this.customer
+    //   }
+    //   this.$refs.pageTable._page(
+    //     'form-customer-table',
+    //     'StatisticContract/pageCustomerContract',
+    //     data
+    //   )
+    // },
+    _tableResultChange(msg, data) {
+      switch (msg) {
+        case 'page':
+          this.getPage = this.$store.state.StatisticContract.page
+          break
+        case 'singleSelect':
+          // 单击
+          this.$emit('on-result-change', data)
+          break
+        case 'dbSelect':
+          // 双击
+          this.customer = ''
+          break
+        case 'changeSize':
+          // this._page()
+          break
+      }
+    },
+    /** *********************************导出客户委托分析表-begin*********************************************/
+    _exportSampleForm() {
+      let result = []
+      this.$store
+        .dispatch(
+          'StatisticContract/pageCustomerContract',
+          this._searchParams()
+        )
+        .then(() => {
+          result = this.$store.state.StatisticContract.page.records
+          if (result.length === 0) {
+            this.$Message.warning('暂无数据，不可导出！')
+          } else {
+            this.$Modal.confirm({
+              title: '提示',
+              content: '确定导出全部数据(最多导出5000条)？',
+              onOk: () => {
+                this.$exportExcel(
+                  'customer-contract-table',
+                  '客户委托分析表',
+                  this.pageColumns,
+                  result
+                )
+              }
+            })
+          }
+        })
+    },
+    // 参数
+    _searchParams() {
+      const data = this.$serialize('form-customer-table')
+      if (this.customer) {
+        data.customer = this.customer
+      }
+      return this.$extend(data, { page: 1, rows: 5000 })
+    }
+    /** *********************************导出客户委托分析表-end*********************************************/
+  }
+}
+</script>

pages/meter-statistics/customer-entrust/Detail.vue

+<template>
+  <div>
+    <Modal v-model="showModal" width="1000" class="modal-footer-none">
+      <p slot="header">详情</p>
+      <div>
+        <!--内容-->
+        <Row>
+          <Col span="24">
+            <PTVXETable ref="pageTable" :tableHeight="tableHeight"
+                        @on-result-change="_tableResultChange" :getPage="getPage" hide-checkbox>
+              <vxe-table-column
+                :field="item.key"
+                :title="item.title"
+                :min-width="item.width?item.width:200"
+                :fixed="item.fixed?item.fixed:undefined"
+                v-for="item in pageColumns"
+                :key="item.key" sortable>
+                <template slot-scope="scope">
+                  <span>{{scope.row[item.key]}}</span>
+                </template>
+              </vxe-table-column>
+            </PTVXETable>
+          </Col>
+        </Row>
+      </div>
+    </Modal>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      showModal: false,
+      getPage: {},
+      pageColumns: [
+        { title: '委托名称', key: 'name' },
+        { title: '委托编号', key: 'code', width: 180 },
+        { title: '委托金额（元）', key: 'contractAmount', width: 160 },
+        { title: '已收金额（元） ', key: 'bereturnedAmount', width: 160 },
+        { title: '未收金额（元）', key: 'noreturnedAmount', width: 160 }
+      ],
+      dateList: [],
+      formObj: {
+        cname: '',
+        queryDateBegin: '',
+        queryDateEnd: ''
+      }
+    }
+  },
+  computed: {
+    tableHeight: function() {
+      return this.$tableHeight('tableModal')
+    }
+  },
+  methods: {
+    _open(data) {
+      this.formObj = data
+      this.showModal = true
+      this.$nextTick(function() {
+        // this._page()
+      })
+    },
+    _page() {
+      this.$refs.pageTable._page(
+        'search-contract-detail',
+        'FoodContract/pageContractByCustomer',
+        this.$serializeFormSearch(this.formObj)
+      )
+    },
+    _formSearch() {
+      this.$refs.pageTable._pageChange(1)
+    },
+    _tableResultChange(msg, data) {
+      switch (msg) {
+        case 'page':
+          this.getPage = this.$store.state.FoodContract.page
+          break
+        // default :
+        //   this._page();
+        case 'changeSize':
+          // this._page()
+          break
+      }
+    }
+  }
+}
+</script>

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

@@ -106,8 +106,25 @@ export default {
         (document.documentElement.clientWidth - 200) / 2.6 + 'px'
     },
     _openPie(data) {
+      console.log('123456')
       // alert(this.option.series[0].data)
-      // this.option.series[0].data = 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() {