修改了开土制备历史记录

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

@@ -47,13 +47,17 @@
       </div>
     </div>
     <MeterEntrustRecord ref="entrustRecordModal"  @on-result-change="_page"></MeterEntrustRecord>
+    <SoilSampleManageHis ref="sampleManageModal" @on-result-change="_page"></SoilSampleManageHis>
+    <PhotoManage ref="photoManage"></PhotoManage>
+    <FileManage ref="fileManage"></FileManage>
   </div>
 </template>
 <script>
 import { soilAptitude, soilEntrust } from '../../../api'
 import MeterEntrustRecord from '../../../components/operation/Operation'
+import SoilSampleManageHis from '../SoilSampleManageHis'
 export default {
-  components: { MeterEntrustRecord },
+  components: { SoilSampleManageHis, MeterEntrustRecord },
   data() {
     return {
       currentComponent: '',
@@ -68,6 +72,21 @@ export default {
       ],
       iconMsg: [
         {
+          type: 'ios-list',
+          id: '',
+          name: '试样列表'
+        },
+        {
+          type: 'ios-camera-outline',
+          id: '',
+          name: '试样照片'
+        },
+        {
+          type: 'md-cloud',
+          id: '',
+          name: '附件'
+        },
+        {
           type: 'ios-clock',
           id: '',
           name: '操作日志'
@@ -136,6 +155,9 @@ export default {
           case '附件':
             this._upload(data.id)
             break
+          case '试样照片':
+            this._upLoadPhoto(data.id)
+            break
           case '删除':
             this._deleteByIds([data.id])
             break
@@ -145,12 +167,15 @@ export default {
           case '查看样品':
             this._sampleManage(data.id)
             break
+          case '试样列表':
+            this._sampleManage(data.id)
+            break
         }
       })
     },
     _sampleManage(data) {
       // 管理样品
-      this.$refs.meterSampleManageModal._open(data)
+      this.$refs.sampleManageModal._open(data)
     },
     _record(id) {
       this.$refs.entrustRecordModal._open(id)
@@ -168,7 +193,7 @@ export default {
     _page: async function() {
       Object.assign(this.formObj, this.$refs.pageTable._searchParams())
       console.log('this.formObj', this.formObj)
-      const result = await soilEntrust.page(this.formObj)
+      const result = await soilEntrust.pageSamplePrepare(this.formObj)
       if (result) {
         this.$refs.pageTable._hideLoading()
         this.getPage = result
@@ -202,10 +227,12 @@ export default {
     _itemModal(data) {
       this.$refs.refModal._open(data)
     },
-
+    _upLoadPhoto(id) {
+      this.$refs.photoManage._open(id, 'entrustId')
+    },
     _upload(id) {
       // 上传文件
-      this.$refs.refModal._open(id, 'subcontractorId')
+      this.$refs.fileManage._open(id, 'entrustId')
     },
     _getById: async function(id) {
       const result = await soilAptitude.getById(id)