修改了试样管理

pages/soil-sample-manage/backups-manage/tab/SampleBackupsManage.vue

@@ -135,30 +135,10 @@ export default {
           type: 'primary',
           id: '',
           name: '批量填写存放信息'
-        },
-        {
-          type: 'primary',
-          id: 'food-sample-preparation-his-all',
-          name: '制备'
-        },
-        {
-          type: 'primary',
-          id: 'food-sample-preparation-his-no-pre',
-          name: '无需制备'
-        },
-        {
-          type: 'primary',
-          id: 'food-sample-preparation-his-scan-pre',
-          name: '扫码制备'
-        },
+        }
         // { type: '', id: '', name: '填写存放信息' },
         // { type: '', id: '', name: '申请处理' },
         // { type: '', id: '', name: '导出' },
-        {
-          type: '',
-          id: 'food-sample-prepare-record-export',
-          name: '导出备样记录'
-        }
       ],
       iconMsg: [
         { type: 'md-create', id: '', name: '编辑' }, // food-sample-prepare-edit

pages/soil-sample-manage/backups-manage/tab/SampleBackupsQuery.vue

@@ -67,11 +67,6 @@ export default {
       },
       btn: [
         // { type: '', id: '', name: '导出' },
-        {
-          type: '',
-          id: 'food-sample-handle-already-export-sample-store',
-          name: '导出样品贮存表'
-        }
       ],
       iconMsg: [
         {

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

@@ -60,6 +60,7 @@
       </div>
     </div>
     <!--组件加载-->
+    <ViewSample ref="viewSample"></ViewSample>
     <StandardsManageEdit ref="editModal" @on-result-change="_page"></StandardsManageEdit>
     <DownloadTemplateImport ref="importModal" @on-result-change="_page"></DownloadTemplateImport>
 <!--    <component ref="refModal" :is="currentComponent" @on-result-change="_page"></component>-->
@@ -72,10 +73,12 @@ import { soilSample } from '../../../api'
 import global from '../../../api/config'
 import DownloadTemplateImport from '../../../components/import/DownloadTemplateImport' // 导入
 import StandardsManageEdit from './AddressManageEdit' // 添加、编辑
+import ViewSample from './ViewSample'
 export default {
   components: {
     StandardsManageEdit,
-    DownloadTemplateImport
+    DownloadTemplateImport,
+    ViewSample
   },
   data() {
     return {
@@ -116,6 +119,11 @@ export default {
           name: '编辑',
           componentName: 'StandardsManageEdit'
         },
+        {
+          type: 'md-apps',
+          id: '',
+          name: '查看试样'
+        },
         { type: 'md-remove-circle', id: '', name: '删除' }
       ],
       searchOpen: false,
@@ -190,6 +198,9 @@ export default {
           case '编辑':
             this._editModal(true, data.id)
             break
+          case '查看试样':
+            this._viewSample(data.id)
+            break
           case '上传':
             this._upload(data.id)
             break
@@ -214,7 +225,10 @@ export default {
       }
       this.$refs.uploadModal._open(obj)
     },
-
+    _viewSample(data) {
+      console.log(data)
+      this.$refs.viewSample._openHis()
+    },
     _editModal: async function(edit, id) {
       if (edit) {
         // 编辑

pages/soil-sample-manage/sample-dispose/tab/SampleDisposeManage.vue

@@ -103,30 +103,10 @@ export default {
           type: '',
           id: '',
           name: '驳回'
-        },
-        {
-          type: 'primary',
-          id: 'food-sample-preparation-his-all',
-          name: '制备'
-        },
-        {
-          type: 'primary',
-          id: 'food-sample-preparation-his-no-pre',
-          name: '无需制备'
-        },
-        {
-          type: 'primary',
-          id: 'food-sample-preparation-his-scan-pre',
-          name: '扫码制备'
-        },
+        }
         // { type: '', id: '', name: '填写存放信息' },
         // { type: '', id: '', name: '申请处理' },
         // { type: '', id: '', name: '导出' },
-        {
-          type: '',
-          id: 'food-sample-prepare-record-export',
-          name: '导出备样记录'
-        }
       ],
       iconMsg: [
         { type: 'md-create', id: '', name: '编辑' } // food-sample-prepare-edit

pages/soil-sample-manage/sample-dispose/tab/SampleDisposeQuery.vue

@@ -94,39 +94,19 @@ export default {
       selectSampleIds: [],
       getPage: {},
       btn: [
-        {
-          type: 'primary',
-          id: '',
-          name: '通过'
-        },
-        {
-          type: '',
-          id: '',
-          name: '驳回'
-        },
-        {
-          type: 'primary',
-          id: 'food-sample-preparation-his-all',
-          name: '制备'
-        },
-        {
-          type: 'primary',
-          id: 'food-sample-preparation-his-no-pre',
-          name: '无需制备'
-        },
-        {
-          type: 'primary',
-          id: 'food-sample-preparation-his-scan-pre',
-          name: '扫码制备'
-        },
+        // {
+        //   type: 'primary',
+        //   id: '',
+        //   name: '通过'
+        // },
+        // {
+        //   type: '',
+        //   id: '',
+        //   name: '驳回'
+        // }
         // { type: '', id: '', name: '填写存放信息' },
         // { type: '', id: '', name: '申请处理' },
         // { type: '', id: '', name: '导出' },
-        {
-          type: '',
-          id: 'food-sample-prepare-record-export',
-          name: '导出备样记录'
-        }
       ],
       iconMsg: [
         { type: 'md-create', id: '', name: '编辑' } // food-sample-prepare-edit

pages/soil-sample-manage/sample-surplus-dispose/tab/SurplusDisposeManage.vue

@@ -78,30 +78,10 @@ export default {
           type: '',
           id: '',
           name: '驳回'
-        },
-        {
-          type: 'primary',
-          id: 'food-sample-preparation-his-all',
-          name: '制备'
-        },
-        {
-          type: 'primary',
-          id: 'food-sample-preparation-his-no-pre',
-          name: '无需制备'
-        },
-        {
-          type: 'primary',
-          id: 'food-sample-preparation-his-scan-pre',
-          name: '扫码制备'
-        },
+        }
         // { type: '', id: '', name: '填写存放信息' },
         // { type: '', id: '', name: '申请处理' },
         // { type: '', id: '', name: '导出' },
-        {
-          type: '',
-          id: 'food-sample-prepare-record-export',
-          name: '导出备样记录'
-        }
       ],
       iconMsg: [
         { type: 'md-create', id: '', name: '编辑' } // food-sample-prepare-edit

pages/soil-sample-manage/sample-surplus-dispose/tab/SurplusDisposeQuery.vue

@@ -56,11 +56,6 @@ export default {
       formObj: {},
       btn: [
         // { type: '', id: '', name: '导出' },
-        {
-          type: '',
-          id: 'food-sample-handle-already-export-sample-store',
-          name: '导出样品贮存表'
-        }
       ],
       pageColumns: [
         { title: '试样编号', key: 'sampleCode', width: 150 },

pages/soil-sample-manage/surplus-manage/tab/SampleSurplusManage.vue

@@ -101,30 +101,10 @@ export default {
           type: 'primary',
           id: '',
           name: '完成处理'
-        },
-        {
-          type: 'primary',
-          id: 'food-sample-preparation-his-all',
-          name: '制备'
-        },
-        {
-          type: 'primary',
-          id: 'food-sample-preparation-his-no-pre',
-          name: '无需制备'
-        },
-        {
-          type: 'primary',
-          id: 'food-sample-preparation-his-scan-pre',
-          name: '扫码制备'
-        },
+        }
         // { type: '', id: '', name: '填写存放信息' },
         // { type: '', id: '', name: '申请处理' },
         // { type: '', id: '', name: '导出' },
-        {
-          type: '',
-          id: 'food-sample-prepare-record-export',
-          name: '导出备样记录'
-        }
       ],
       iconMsg: [
         { type: 'md-create', id: '', name: '编辑' }, // food-sample-prepare-edit

pages/soil-sample-manage/surplus-manage/tab/SampleSurplusQuery.vue

@@ -78,11 +78,6 @@ export default {
       ],
       btn: [
         // { type: '', id: '', name: '导出' },
-        {
-          type: '',
-          id: 'food-sample-handle-already-export-sample-store',
-          name: '导出样品贮存表'
-        }
       ],
       pageColumns: [
         { title: '试样编号', key: 'sampleCode', width: 150 },