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

api/meter/meter-sample.js

@@ -307,6 +307,10 @@ export default {
     http
       .post('meter/v1/sample/page_sample_quantity_statistics', data)
       .then(res => res),
+  pageAnnualEntrustDetail: data =>
+    http
+      .post('meter/v1/entrust/page_annual_entrust_detail', data)
+      .then(res => res),
   makeCode: data =>
     http
       .post(

pages/meter-send/sample-flow/MeterSampleFlowHis.vue

@@ -37,7 +37,9 @@
                 :min-width="item.width?item.width:200"
                 :fixed="item.fixed?item.fixed:undefined" sortable>
                 <template slot-scope="scope">
-                  <span>{{scope.row[item.key]}}</span>
+                  <span v-if="item.key==='edate'">{{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>
             </PTVXETable>

pages/meter-statistics/annual-entrust/YearContractNumDetail.vue

@@ -9,17 +9,10 @@
                 inline onsubmit="return false">
             <label class="label-sign"></label>
             <Form-item class="search-item" label="委托单位:" prop="cname">
-              <Input v-model="formObj.cname" @on-enter="_formSearch" placeholder="请输入委托单位" clearable/>
+              <Input v-model="formObj.client" @on-enter="_formSearch" placeholder="请输入委托单位" clearable/>
             </Form-item>
             <Form-item class="search-item" label="委托编号:" prop="code">
-              <Input v-model="formObj.code" @on-enter="_formSearch" placeholder="请输入委托编号" clearable/>
-            </Form-item>
-            <Form-item class="search-item" label="业务员:" prop="salesman">
-              <Input v-model="formObj.salesman" @on-enter="_formSearch" placeholder="请输入业务员" clearable/>
-            </Form-item>
-            <Form-item class="search-item" label="制单日期:">
-              <Date-picker @on-change="_signDateChange" v-model="dateList" type="daterange" split-panels
-                           style="width:100%;" placeholder="请选择制单日期"/>
+              <Input v-model="formObj.entrustCode" @on-enter="_formSearch" placeholder="请输入委托编号" clearable/>
             </Form-item>
             <Form-item class="search-btn">
               <Button @click="_formSearch" type="primary">搜索</Button>
@@ -28,7 +21,7 @@
         </Col>
         <Col span="24">
           <btn-list :msg="btn" :open="searchOpen" :showSearchBtn="true" @on-result-change="_btnClick"
-                   class="contHide"></btn-list>
+                   class="contHide" style="height: 30px;"></btn-list>
         </Col>
         <Col span="24">
           <PTVXETable ref="pageTable" :tableHeight="tableHeight"
@@ -53,6 +46,7 @@
 </template>
 
 <script>
+import { meterSample } from '../../../api'
 export default {
   data() {
     return {
@@ -60,25 +54,22 @@ export default {
       showModal: false,
       getPage: {},
       pageColumns: [
-        { title: '委托单位', key: 'cname' },
-        { title: '委托名称', key: 'name' },
-        { title: '委托编号', key: 'code' },
-        { title: '委托金额', key: 'contractAmount', width: 90 },
-        { title: '已收金额', key: 'bereturnedAmount', width: 90 },
-        { title: '业务员', key: 'salesman', width: 120 },
-        { title: '制单日期', key: 'ctime', width: 120, date: true },
-        { title: '制单人', key: 'uname', width: 120 }
+        { title: '委托单位', key: 'client' },
+        { title: '委托编号', key: 'entrustCode' },
+        { title: '委托金额', key: 'fee', width: 90 },
+        { title: '联系人', key: 'person', width: 120 },
+        { title: '联系电话', key: 'tel', width: 120 },
+        { title: '委托日期', key: 'edate', width: 120, date: true }
       ],
       formObj: {
-        yearMonth: '',
-        ctimeBegin: '',
-        ctimeEnd: '',
-        cname: '',
-        code: '',
-        salesman: ''
+        entrustDate: undefined,
+        client: undefined,
+        entrustCode: undefined
       },
       dateList: [],
-      btn: [{ type: '', id: '', name: '导出' }],
+      btn: [
+        // { type: '', id: '', name: '导出' }
+      ],
       searchOpen: true,
       selectData: []
     }
@@ -156,21 +147,28 @@ export default {
     },
     /** *********************************导出合同-end*********************************************/
     _open(data) {
-      this.modalTitle = data.yearMonth + ' -- 委托列表 '
+      this.modalTitle = data.entrustDate + ' -- 委托列表 '
       this.showModal = true
       this.$refs.formObj.resetFields()
-      this.formObj.yearMonth = data.yearMonth
-      this.formObj.ctimeBegin = ''
-      this.formObj.ctimeEnd = ''
+      this.formObj.entrustDate = data.entrustDate
+      this.formObj.ctimeBegin = undefined
+      this.formObj.ctimeEnd = undefined
       this.dateList = []
-      // this._page()
+      this._page()
     },
-    _page() {
-      this.$refs.pageTable._page(
-        'search-form-details',
-        'FoodContract/barYearContract',
-        this.$serializeFormSearch(this.formObj)
-      )
+    _page: async function() {
+      // this.$refs.pageTable._page(
+      //   'search-form-details',
+      //   'FoodContract/barYearContract',
+      //   this.$serializeFormSearch(this.formObj)
+      // )
+      Object.assign(this.formObj, this.$refs.pageTable._searchParams())
+      console.log('this.formObj', this.formObj)
+      const result = await meterSample.pageAnnualEntrustDetail(this.formObj)
+      if (result) {
+        this.$refs.pageTable._hideLoading()
+        this.getPage = result
+      }
     },
     _formSearch() {
       this.$refs.pageTable._pageChange(1)