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

api/soil/soil-statistics.js

@@ -12,5 +12,13 @@ export default {
   pageReportCheck: data =>
     http.post('soil/v1/entrust/page_report_check', data).then(res => res),
   pageReportIssue: data =>
-    http.post('soil/v1/entrust/page_report_issue', data).then(res => res)
+    http.post('soil/v1/entrust/page_report_issue', data).then(res => res),
+  pageAnnual: data =>
+    http
+      .post('soil/v1/statistics/page_annual_entrust_statistics', data)
+      .then(res => res),
+  pageCustomer: data =>
+    http
+      .post('soil/v1/statistics/page_customer_entrust_statistics', data)
+      .then(res => res)
 }

components/file/file-manage/FileManageCont.vue

@@ -102,13 +102,13 @@ export default {
           this.entrustId = id
           this.urlData = {
             msg: 'FoodContractAttachment',
-            pageUrl: '/soil/v1/sample_photo/page',
-            deleteUrl: '/meter/v1/entrust_attachment/?ids=',
-            uploadFileUrl: '/soil/v1/sample_photo/upload/',
-            downloadFileUrl: '/meter/v1/entrust_attachment/download/',
+            pageUrl: '/soil/v1/standard_annex/page',
+            deleteUrl: '/soil/v1/standard_annex/?ids=',
+            uploadFileUrl: '/soil/v1/standard_annex/upload/',
+            downloadFileUrl: '/soil/v1/standard_annex/download/',
             downloadBatch: '/food/v1/contract_attachment/download_batch',
             uri: 'FoodContractAttachment/getByContractId',
-            viewUri: '/meter/v1/entrust_attachment/preview/'
+            viewUri: '/soil/v1/standard_annex/preview/'
           }
           break
         case 'sampleId':

pages/soil-sample-manage/sample-dispose/SampleDisposeIndex.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="wait">
+            <SampleBackupsManage ref="waitTabs"></SampleBackupsManage>
+          </el-tab-pane>
+          <el-tab-pane label="已处理" name="query">
+            <SampleBackupsQuery ref="queryTabs"></SampleBackupsQuery>
+          </el-tab-pane>
+        </el-tabs>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import SampleBackupsManage from './tab/SampleDisposeManage'
+import SampleBackupsQuery from './tab/SampleDisposeQuery'
+
+export default {
+  components: {
+    SampleBackupsManage,
+    SampleBackupsQuery
+  },
+  data() {
+    return {
+      activeName: 'wait'
+    }
+  },
+  mounted() {
+    this.activeName = 'wait'
+    this.$refs.waitTabs._page()
+  },
+  methods: {
+    _changeTabs(tab, event) {
+      if (tab.name === 'wait') {
+        this.$refs.waitTabs._page()
+      } else if (tab.name === 'applyRecord') {
+        // this.$refs.applyRecordTabs._page()
+      } else {
+        this.$refs.queryTabs._page()
+      }
+    }
+  }
+}
+</script>

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

@@ -62,7 +62,7 @@
     <!--组件加载-->
     <!--选择领样人-->
     <UserInfo ref="userModal" @on-result-change="_userResult"></UserInfo>
-<!--    <SampleManage ref="sampleManageModal" @on-result-change="_page"></SampleManage>-->
+    <SampleManage ref="sampleManageModal" @on-result-change="_page"></SampleManage>
     <ItemManage ref="itemManageModal" @on-result-change="_page"></ItemManage>
     <Operation ref="operation"></Operation>
   </div>
@@ -71,12 +71,12 @@
 import UserInfo from '../../../components/user-info-single/AssignPerson'
 import { soilEntrust } from '../../../api'
 import Operation from '../../../components/operation/Operation'
-// import SampleManage from './SampleManage'
+import SampleManage from './TakeSampleManage'
 import ItemManage from './ItemManage'
 export default {
   components: {
     UserInfo,
-    // SampleManage,
+    SampleManage,
     ItemManage,
     Operation
   },
@@ -412,7 +412,6 @@ export default {
     },
     _page: async function() {
       Object.assign(this.formObj, this.$refs.pageTable._searchParams())
-      console.log('this.formObj', this.formObj)
       const result = await soilEntrust.pageSampleReceive(
         this.$serializeForm(this.formObj)
       )

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

@@ -65,14 +65,12 @@ export default {
     }
   },
   mounted() {
-    // this._getData(this.entrustDate.getFullYear())
+    this._getData(this.entrustDate.getFullYear())
   },
   methods: {
     _getData: async function(data) {
       this.formObj.entrustDate = data
-      const result = await soilStatistics.pageAnnualEntrustStatistics(
-        this.formObj
-      )
+      const result = await soilStatistics.pageAnnual(this.formObj)
       console.log('result', result)
       if (result) {
         this._open(result)

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

@@ -135,7 +135,7 @@ export default {
     // this._getUserGroup()
     this.formObj.edateBegin = this.tempData.beginDate
     this.formObj.edateEnd = this.$dateformat(lastday, 'yyyy-mm-dd HH:MM:ss')
-    // this._getData()
+    this._getData()
     // this._getServiceTypeList()
   },
   methods: {
@@ -145,11 +145,7 @@ export default {
     },
     // 服务类型
     _getData: async function() {
-      console.log('753951')
-      console.log('选择时间后的请求', this.formObj)
-      const result = await soilStatistics.pageCustomerEntrustStatistics(
-        this.formObj
-      )
+      const result = await soilStatistics.pageCustomer(this.formObj)
       if (result) {
         this.getPage.records = result
         this.$refs.testPieModal._openPie(this.getPage.records)

router/soil-routes.js

@@ -25,6 +25,7 @@ import MeterPersonalTask from '../pages/soil-statistics/personal-task/MeterPerso
 import MeterAnnualEntrust from '../pages/soil-statistics/annual-entrust/MeterAnnualEntrust'
 import ReportAuditIndex from '../pages/soil-report-manage/report-audit/ReportAuditIndex'
 import ReportIssueIndex from '../pages/soil-report-manage/report-issue/ReportIssueIndex'
+import SampleDisposeIndex from '../pages/soil-sample-manage/sample-dispose/SampleDisposeIndex'
 import Blank from '~/pages/blank'
 export default [
   {
@@ -78,6 +79,11 @@ export default [
         meta: { title: '余样管理' }
       },
       {
+        path: 'dispose',
+        component: SampleDisposeIndex,
+        meta: { title: '样品处理' }
+      },
+      {
         path: 'receive_location',
         component: AddressManage,
         meta: { title: '收样位置管理' }