修改了附件上传和照片管理

pages/soil-alone-sample-instock/EntrustRegisterHis.vue

@@ -53,11 +53,23 @@
 <script>
 import { soilAptitude, soilEntrust, soilSample } from '../../api'
 import MeterEntrustRecord from '../../components/operation/Operation'
+import SampleFileManage from '../../components/file/sample-file-manage/FileManage'
+import SamplePhotoManage from '../../components/file/instock-file-manage/FileManage'
 import ViewDetail from './ViewDetail'
 import CreateReport from './CreateReport'
 export default {
+  components: {
     // eslint-disable-next-line vue/no-unused-components
-  components: { MeterEntrustRecord, ViewDetail, CreateReport },
+    MeterEntrustRecord,
+    // eslint-disable-next-line vue/no-unused-components
+    ViewDetail,
+    // eslint-disable-next-line vue/no-unused-components
+    CreateReport,
+    // eslint-disable-next-line vue/no-unused-components
+    SampleFileManage,
+    // eslint-disable-next-line vue/no-unused-components
+    SamplePhotoManage
+  },
   data() {
     return {
       currentComponent: '',
@@ -82,6 +94,11 @@ export default {
           name: '导出入库资料'
         },
         {
+          type: 'ios-camera',
+          id: '',
+          name: '照片'
+        },
+        {
           type: 'ios-cloud',
           id: 'instock-his-upload',
           name: '附件'
@@ -152,6 +169,9 @@ export default {
           case '资质项目':
             this._itemModal(data.id)
             break
+          case '照片':
+            this._uploadPhoto(data.id)
+            break
           case '附件':
             this._upload(data.id)
             break
@@ -341,10 +361,17 @@ export default {
     _itemModal(data) {
       this.$refs.refModal._open(data)
     },
-
+    _uploadPhoto(data) {
+      // 上传照片文件
+      this.currentComponent = 'SamplePhotoManage'
+      this.$nextTick(() => {
+        this.$refs.refModal._open(data, 'aloneSampleId', '照片管理')
+      })
+      // this.$refs.PhotoManage._open(id, 'entrustId')
+    },
     _upload(id) {
       // 上传文件
-      this.currentComponent = 'FileManage'
+      this.currentComponent = 'SampleFileManage'
       this.$nextTick(() => {
         this.$refs.refModal._open(id, 'aloneSampleId')
       })

pages/soil-alone-sample-manage/soil-alone-sample-outstock/EntrustRegister.vue

@@ -60,6 +60,8 @@
 import { soilEntrust, soilSample } from '../../../api'
 import Operation from '../../../components/operation/Operation'
 import importModal from '../../../components/import/DownloadTemplateImport'
+import SampleFileManage from '../../../components/file/sample-file-manage/FileManage'
+import SamplePhotoManage from '../../../components/file/instock-file-manage/FileManage'
 import EntrustRegisterEdit from './EntrustRegisterEdit'
 import RegisterDetail from './RegisterDetail'
 import ViewDetail from './ViewDetail'
@@ -77,7 +79,11 @@ export default {
     // eslint-disable-next-line vue/no-unused-components
     ViewDetail,
     // eslint-disable-next-line vue/no-unused-components
-    Outstock
+    Outstock,
+    // eslint-disable-next-line vue/no-unused-components
+    SampleFileManage,
+    // eslint-disable-next-line vue/no-unused-components
+    SamplePhotoManage
   },
   data() {
     return {
@@ -108,6 +114,11 @@ export default {
           name: '附件'
         },
         {
+          type: 'ios-camera',
+          id: '',
+          name: '照片'
+        },
+        {
           type: 'md-remove-circle',
           id: 'outstock-delete',
           name: '删除'
@@ -235,6 +246,9 @@ export default {
           case '附件':
             this._upload(data.id)
             break
+          case '照片':
+            this._uploadPhoto(data.id)
+            break
           case '删除':
             this._deleteByIds([data.id])
             break
@@ -390,9 +404,17 @@ export default {
         this.$refs.pageTable._hideLoading()
       }
     },
+    _uploadPhoto(data) {
+      // 上传照片文件
+      this.currentComponent = 'SamplePhotoManage'
+      this.$nextTick(() => {
+        this.$refs.refModal._open(data, 'aloneSampleId', '照片管理')
+      })
+      // this.$refs.PhotoManage._open(id, 'entrustId')
+    },
     _upload(id) {
       // 上传文件
-      this.currentComponent = 'FileManage'
+      this.currentComponent = 'SampleFileManage'
       this.$nextTick(() => {
         this.$refs.refModal._open(id, 'aloneSampleId')
       })

pages/soil-alone-sample-manage/soil-alone-sample-outstock/EntrustRegisterHis.vue

@@ -53,11 +53,23 @@
 <script>
 import { soilAptitude, soilEntrust, soilSample } from '../../../api'
 import MeterEntrustRecord from '../../../components/operation/Operation'
+import SampleFileManage from '../../../components/file/sample-file-manage/FileManage'
+import SamplePhotoManage from '../../../components/file/instock-file-manage/FileManage'
 import ViewDetail from './ViewDetail'
 import CreateReport from './CreateReport'
 export default {
+  components: {
     // eslint-disable-next-line vue/no-unused-components
-  components: { MeterEntrustRecord, ViewDetail, CreateReport },
+    MeterEntrustRecord,
+    // eslint-disable-next-line vue/no-unused-components
+    ViewDetail,
+    // eslint-disable-next-line vue/no-unused-components
+    CreateReport,
+    // eslint-disable-next-line vue/no-unused-components
+    SampleFileManage,
+    // eslint-disable-next-line vue/no-unused-components
+    SamplePhotoManage
+  },
   data() {
     return {
       currentComponent: '',
@@ -87,6 +99,11 @@ export default {
           name: '附件'
         },
         {
+          type: 'ios-camera',
+          id: '',
+          name: '照片'
+        },
+        {
           type: 'ios-cloud-download',
           id: 'outstock-his-export',
           name: '导出出库资料'
@@ -162,6 +179,9 @@ export default {
           case '附件':
             this._upload(data.id)
             break
+          case '照片':
+            this._uploadPhoto(data.id)
+            break
           case '删除':
             this._deleteByIds([data.id])
             break
@@ -353,10 +373,17 @@ export default {
     _itemModal(data) {
       this.$refs.refModal._open(data)
     },
-
+    _uploadPhoto(data) {
+      // 上传照片文件
+      this.currentComponent = 'SamplePhotoManage'
+      this.$nextTick(() => {
+        this.$refs.refModal._open(data, 'aloneSampleId', '照片管理')
+      })
+      // this.$refs.PhotoManage._open(id, 'entrustId')
+    },
     _upload(id) {
       // 上传文件
-      this.currentComponent = 'FileManage'
+      this.currentComponent = 'SampleFileManage'
       this.$nextTick(() => {
         this.$refs.refModal._open(id, 'aloneSampleId')
       })

pages/soil-alone-sample-manage/storehouse-sample-manage/AddressManage.vue

@@ -71,6 +71,8 @@
     <FileManage ref="FileManage" @on-result-change="_page"></FileManage>
     <BatchModal ref="batchModal" @on-result-change="_page"></BatchModal>
     <stockSampleEdit ref="editModal" @on-result-change="_page"></stockSampleEdit>
+    <SampleFileManage ref="SampleFileManage" @on-result-change="_page"></SampleFileManage>
+    <SamplePhotoManage ref="SamplePhotoManage" @on-result-change="_page"></SamplePhotoManage>
   </div>
 </template>
 
@@ -78,6 +80,8 @@
 import { soilEntrust, soilSample } from '../../../api'
 import ViewDetail from '../../soil-alone-sample/ViewDetail'
 import Outstock from '../soil-alone-sample-outstock/Outstock'
+import SampleFileManage from '../../../components/file/sample-file-manage/FileManage'
+import SamplePhotoManage from '../../../components/file/instock-file-manage/FileManage'
 import ViewSample from './ViewLocationEntrust'
 import stockSampleEdit from './stockSampleEdit'
 import BatchModal from './BatchModal'
@@ -87,7 +91,9 @@ export default {
     ViewSample,
     ViewDetail,
     BatchModal,
-    Outstock
+    Outstock,
+    SampleFileManage,
+    SamplePhotoManage
   },
   data() {
     return {
@@ -133,6 +139,11 @@ export default {
           name: '查看'
         },
         {
+          type: 'ios-camera',
+          id: '',
+          name: '照片'
+        },
+        {
           type: 'md-cloud',
           id: 'storehouse-sample-upload',
           name: '附件'
@@ -236,6 +247,9 @@ export default {
           case '查看':
             this._viewModal(true, data.id)
             break
+          case '照片':
+            this._uploadPhoto(data.id)
+            break
           case '附件':
             this._upload(data.id)
             break
@@ -245,9 +259,14 @@ export default {
         }
       })
     },
+    _uploadPhoto(data) {
+      // 上传照片文件
+      this.$refs.SamplePhotoManage._open(data, 'aloneSampleId', '照片管理')
+      // this.$refs.PhotoManage._open(id, 'entrustId')
+    },
     _upload(id) {
       // 上传文件
-      this.$refs.FileManage._open(id, 'aloneSampleId')
+      this.$refs.SampleFileManage._open(id, 'aloneSampleId')
     },
     _viewModal(edit, id) {
       if (edit) {

pages/soil-alone-sample-manage/storehouse-sample-manage/AddressManageHis.vue

@@ -82,6 +82,8 @@
     <FileManage ref="FileManage" @on-result-change="_page"></FileManage>
     <BatchModal ref="batchModal" @on-result-change="_page"></BatchModal>
     <stockSampleEdit ref="editModal" @on-result-change="_page"></stockSampleEdit>
+    <SampleFileManage ref="SampleFileManage" @on-result-change="_page"></SampleFileManage>
+    <SamplePhotoManage ref="SamplePhotoManage" @on-result-change="_page"></SamplePhotoManage>
   </div>
 </template>
 
@@ -89,6 +91,8 @@
 import { soilEntrust, soilSample } from '../../../api'
 import ViewDetail from '../../soil-alone-sample/ViewDetail'
 import Outstock from '../soil-alone-sample-outstock/Outstock'
+import SampleFileManage from '../../../components/file/sample-file-manage/FileManage'
+import SamplePhotoManage from '../../../components/file/instock-file-manage/FileManage'
 import ViewSample from './ViewLocationEntrust'
 import stockSampleEdit from './stockSampleEdit'
 import BatchModal from './BatchModal'
@@ -98,7 +102,9 @@ export default {
     ViewSample,
     ViewDetail,
     BatchModal,
-    Outstock
+    Outstock,
+    SampleFileManage,
+    SamplePhotoManage
   },
   data() {
     return {
@@ -141,6 +147,11 @@ export default {
           name: '查看'
         },
         {
+          type: 'ios-camera',
+          id: '',
+          name: '照片'
+        },
+        {
           type: 'md-cloud',
           id: '',
           name: '附件'
@@ -259,6 +270,9 @@ export default {
           case '查看试样':
             this._viewSample(data.name)
             break
+          case '照片':
+            this._uploadPhoto(data.id)
+            break
           case '查看':
             this._viewModal(true, data.id)
             break
@@ -271,9 +285,14 @@ export default {
         }
       })
     },
+    _uploadPhoto(data) {
+      // 上传照片文件
+      this.$refs.SamplePhotoManage._open(data, 'aloneSampleId', '照片管理')
+      // this.$refs.PhotoManage._open(id, 'entrustId')
+    },
     _upload(id) {
       // 上传文件
-      this.$refs.FileManage._open(id, 'aloneSampleId')
+      this.$refs.SampleFileManage._open(id, 'aloneSampleId')
     },
     _viewModal(edit, id) {
       if (edit) {

pages/soil-alone-sample/EntrustRegister.vue

@@ -57,6 +57,8 @@
 import { soilEntrust, soilSample } from '../../api'
 import Operation from '../../components/operation/Operation'
 import importModal from '../../components/import/DownloadTemplateImport'
+import sampleFileManage from '../../components/file/sample-file-manage/FileManage'
+import SamplePhotoManage from '../../components/file/instock-file-manage/FileManage'
 import EntrustRegisterEdit from './EntrustRegisterEdit'
 import RegisterDetail from './RegisterDetail'
 import ViewDetail from './ViewDetail'
@@ -71,7 +73,11 @@ export default {
     // eslint-disable-next-line vue/no-unused-components
     RegisterDetail,
     // eslint-disable-next-line vue/no-unused-components
-    ViewDetail
+    ViewDetail,
+    // eslint-disable-next-line vue/no-unused-components
+    sampleFileManage,
+    // eslint-disable-next-line vue/no-unused-components
+    SamplePhotoManage
   },
   data() {
     return {
@@ -102,6 +108,11 @@ export default {
           name: '查看'
         },
         {
+          type: 'ios-camera',
+          id: '',
+          name: '照片管理'
+        },
+        {
           type: 'md-cloud',
           id: 'entrust-register-upload',
           name: '附件'
@@ -218,6 +229,9 @@ export default {
           case '试验项目列表':
             this._itemManage(data.id)
             break
+          case '照片管理':
+            this._uploadPhoto(data.id)
+            break
           case '附件':
             this._upload(data.id)
             break
@@ -230,7 +244,14 @@ export default {
         }
       })
     },
-
+    _uploadPhoto(data) {
+      // 上传照片文件
+      this.currentComponent = 'SamplePhotoManage'
+      this.$nextTick(() => {
+        this.$refs.refModal._open(data, 'aloneSampleId', '照片管理')
+      })
+      // this.$refs.PhotoManage._open(id, 'entrustId')
+    },
     _sampleManage(data) {
       // 管理样品
       this.currentComponent = 'SoilSampleManage'
@@ -378,7 +399,7 @@ export default {
     },
     _upload(id) {
       // 上传文件
-      this.currentComponent = 'FileManage'
+      this.currentComponent = 'sampleFileManage'
       this.$nextTick(() => {
         this.$refs.refModal._open(id, 'aloneSampleId')
       })

pages/soil-alone-sample/EntrustRegisterHis.vue

@@ -53,10 +53,20 @@
 <script>
 import { soilAptitude, soilEntrust } from '../../api'
 import MeterEntrustRecord from '../../components/operation/Operation'
+import SampleFileManage from '../../components/file/sample-file-manage/FileManage'
+import SamplePhotoManage from '../../components/file/instock-file-manage/FileManage'
 import ViewDetail from './ViewDetail'
 export default {
+  components: {
     // eslint-disable-next-line vue/no-unused-components
-  components: { MeterEntrustRecord, ViewDetail },
+    MeterEntrustRecord,
+    // eslint-disable-next-line vue/no-unused-components
+    ViewDetail,
+    // eslint-disable-next-line vue/no-unused-components
+    SampleFileManage,
+    // eslint-disable-next-line vue/no-unused-components
+    SamplePhotoManage
+  },
   data() {
     return {
       currentComponent: '',
@@ -76,6 +86,11 @@ export default {
           name: '查看'
         },
         {
+          type: 'ios-camera',
+          id: '',
+          name: '照片'
+        },
+        {
           type: 'ios-cloud',
           id: 'receive-sample-upload',
           name: '附件'
@@ -149,6 +164,9 @@ export default {
           case '资质项目':
             this._itemModal(data.id)
             break
+          case '照片':
+            this._uploadPhoto(data.id)
+            break
           case '附件':
             this._upload(data.id)
             break
@@ -167,6 +185,14 @@ export default {
         }
       })
     },
+    _uploadPhoto(data) {
+      // 上传照片文件
+      this.currentComponent = 'SamplePhotoManage'
+      this.$nextTick(() => {
+        this.$refs.refModal._open(data, 'aloneSampleId', '照片管理')
+      })
+      // this.$refs.PhotoManage._open(id, 'entrustId')
+    },
     _viewModal(edit, id) {
       this.currentComponent = 'ViewDetail'
       if (edit) {
@@ -256,7 +282,7 @@ export default {
 
     _upload(id) {
       // 上传文件
-      this.currentComponent = 'FileManage'
+      this.currentComponent = 'SampleFileManage'
       this.$nextTick(() => {
         this.$refs.refModal._open(id, 'aloneSampleId')
       })