修改了收样位置查看样品

api/soil/soil-sample.js

@@ -141,5 +141,7 @@ export default {
   scanTakeSample: data =>
     http
       .post('soil/v1/sample/scan_take_sample?sampleCode=' + data)
-      .then(res => res)
+      .then(res => res),
+  pageLocationSample: data =>
+    http.post('soil/v1/sample/page_location_sample', data).then(res => res)
 }

pages/soil-sample-manage/sample-address/AddressManage.vue

@@ -199,7 +199,7 @@ export default {
             this._editModal(true, data.id)
             break
           case '查看试样':
-            this._viewSample(data.id)
+            this._viewSample(data.name)
             break
           case '上传':
             this._upload(data.id)
@@ -227,7 +227,7 @@ export default {
     },
     _viewSample(data) {
       console.log(data)
-      this.$refs.viewSample._openHis()
+      this.$refs.viewSample._openHis(data)
     },
     _editModal: async function(edit, id) {
       if (edit) {

pages/soil-sample-manage/sample-address/ViewSample.vue

 <template>
   <div>
-    <Modal v-model="showModal" width="980" class="modal-footer-none">
+    <Modal v-model="showModal" width="875" class="modal-footer-none">
       <p slot="header">
         {{ modalTitle }}
       </p>
@@ -63,7 +63,7 @@
 </template>
 <script>
 import http from '../../../api/http'
-import { soilEntrust } from '../../../api'
+import { soilEntrust, soilSample } from '../../../api'
 import { getLodop } from '../../../plugins/clodop/LodopFuncs'
 let LODOP
 export default {
@@ -104,7 +104,7 @@ export default {
       sampleId: '',
       dateList: [],
       formObj: {
-        entrustId: undefined,
+        receiveLocation: undefined,
         sampleCode: undefined
       }
     }
@@ -342,12 +342,11 @@ export default {
       this.$refs.pageTable._hideLoading()
       this._page()
     },
-    _openHis(id) {
+    _openHis(adress) {
       this.formObj = this.$resetFields(this.formObj)
       this.dateList = []
       this.showModal = true
-      this.formObj.entrustId = id // 委托id
-      console.log(this.entrustId)
+      this.formObj.receiveLocation = adress // 委托id
       this.$refs.pageTable._hideLoading()
       this.recordHis = true
       this._page()
@@ -356,7 +355,7 @@ export default {
       this.$refs.pageTable._pageChange(1)
     },
     _page: async function() {
-      const result = await soilEntrust.pagePrepareHis(this.formObj)
+      const result = await soilSample.pageLocationSample(this.formObj)
       if (result) {
         this.$refs.pageTable._hideLoading()
         this.getPage = result