农产品

src/page/sampling-list/SamplingList.vue

@@ -178,11 +178,15 @@
                 this.$refs.shelvesSelect._open(this.planId)
             },
             _shelvesResult({testedType, shelfId}) {
-                console.log(testedType, 'testedType')
                 if (testedType === 1) {
                     this.$router.push({path: '/sampling_list/sampling_list_add_net', query: {testedType, shelfId}})
-                } else {
+                } else if (testedType === 0) {
                     this.$router.push({path: '/sampling_list/sampling_list_add', query: {testedType, shelfId}})
+                } else {
+                    this.$router.push({
+                        path: '/sampling_list/sampling_list_add_agriculture',
+                        query: {testedType, shelfId}
+                    })
                 }
             },
             _longtapHandler() {
@@ -209,34 +213,41 @@
                 } else {
                     if (item.testedType === 1) {
                         this.$router.push({path: '/sampling_list/sampling_list_detail_net', query: {id: item.id}})
-                    } else {
+                    } else if (item.testedType === 0) {
                         this.$router.push({path: '/sampling_list/sampling_list_detail', query: {id: item.id}})
+                    } else {
+                        this.$router.push({
+                            path: '/sampling_list/sampling_list_detail_agriculture',
+                            query: {id: item.id}
+                        })
                     }
                 }
             },
             _edit(item) {
                 if (item.testedType === 1) {
                     this.$router.push({path: '/sampling_list/sampling_list_add_net', query: {id: item.id}})
-                } else {
+                } else if (item.testedType === 0) {
                     this.$router.push({path: '/sampling_list/sampling_list_add', query: {id: item.id}})
+                } else {
+                    this.$router.push({path: '/sampling_list/sampling_list_add_agriculture', query: {id: item.id}})
                 }
             },
             _print(item) {
-                    //调用第三放程序打开指定文件（必须是本地路径）
-                    this.$toast.loading({
-                        message: '加载中...',
-                        forbidClick: true,
+                //调用第三放程序打开指定文件（必须是本地路径）
+                this.$toast.loading({
+                    message: '加载中...',
+                    forbidClick: true,
+                });
+                var dtask = plus.downloader.createDownload(
+                    this.$global.baseURL + '/drs/v1/sampling_summary/export_sampling?id=' + item.id, {}, (d, status) => {
+                        if (status == 200) {
+                            plus.runtime.openFile(d.filename);//cn.wps.moffice_eng-----wps的包名
+                        }
+                        this.$toast.clear();
                     });
-                    var dtask = plus.downloader.createDownload(
-                        this.$global.baseURL + '/drs/v1/sampling_summary/export_sampling?id=' + item.id, {}, (d, status) => {
-                            if (status == 200) {
-                                plus.runtime.openFile(d.filename);//cn.wps.moffice_eng-----wps的包名
-                            }
-                            this.$toast.clear();
-                        });
-                    dtask.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
-                    dtask.setRequestHeader('accessToken', localStorage.getItem('accessToken'));
-                    dtask.start();
+                dtask.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
+                dtask.setRequestHeader('accessToken', localStorage.getItem('accessToken'));
+                dtask.start();
             },
             _del(ids) {
                 if (ids.length === 0) {

src/page/sampling-list/components/SelectShelves.vue

@@ -15,6 +15,7 @@
                     <van-radio-group v-model="radio" direction="horizontal">
                         <van-radio :name="1">网络</van-radio>
                         <van-radio :name="0">非网络</van-radio>
+                        <van-radio :name="2">农产品</van-radio>
                     </van-radio-group>
                 </div>
                 <div>

src/router/sampling-list-routes.js

@@ -8,16 +8,20 @@ import File from '@/page/sampling-list/file/File.vue'
 import FileUpload from '@/page/sampling-list/file/FileUpload.vue'
 import FileDownLoad from '@/page/sampling-list/file/FileDownLoad.vue'
 import ScanBar from '@/page/sampling-list/ScanBar.vue'
+import SamplingListAddAgriculture from '@/page/sampling-list/SamplingListAddAgriculture.vue'
+import SamplingListDetailAgriculture from '@/page/sampling-list/SamplingListDetailAgriculture.vue'
 
 export default [
     {path: 'sampling_task', component: SamplingTask, meta: {title: '抽样任务'}},
     {path: 'sampling_list', component: SamplingList, meta: {title: '抽样单', hideNavBar: true}},
     {path: 'sampling_list_add', component: SamplingListAdd, meta: {title: '抽样单添加-非网络'}},
+    {path: 'sampling_list_add_agriculture', component: SamplingListAddAgriculture, meta: {title: '抽样单添加-农场品'}},
     {path: 'sampling_list_add_net', component: SamplingListAddNet, meta: {title: '抽样单添加-网络'}},
     {path: 'sampling_list_detail', component: SamplingListDetail, meta: {title: '抽样单详情-非网络'}},
+    {path: 'sampling_list_detail_agriculture', component: SamplingListDetailAgriculture, meta: {title: '抽样单详情-农产品'}},
     {path: 'sampling_list_detail_net', component: SamplingListDetailNet, meta: {title: '抽样单详情-网络'}},
     {path: 'file', component: File, meta: {title: '附件'}},
     {path: 'file_upload', component: FileUpload, meta: {title: '添加附件'}},
     {path: 'file_download', component: FileDownLoad, meta: {title: '预览附件'}},
-    {path: 'scan_bar', component: ScanBar, meta: {title: '扫码',hideNavBar:true}},
+    {path: 'scan_bar', component: ScanBar, meta: {title: '扫码', hideNavBar: true}},
 ]