修改了导入按钮

components/import/DownloadTemplateImport.vue

@@ -15,12 +15,12 @@
         </Spin>
       </div>
       <div>
-        <Button @click="_download" v-if="hideDownloadBtn===undefined" type="ghost" size="large">下载模板</Button>
+        <Button @click="_download" v-if="hideDownloadBtn===undefined" size="large">下载模板</Button>
       </div>
 
       <div slot="footer" class="btn-width">
-        <Button @click="_cancel" type="ghost">取消</Button>
-        <label style="margin-bottom: 0">
+        <Button @click="_cancel">取消</Button>
+        <label style="margin-bottom: 0;margin-left:15px; float: right">
           <Upload
             :action="importUrl"
             :on-success="_handelsuccess"

pages/meter-aptitude/manage/MeterAptitudeManage.vue

@@ -53,7 +53,9 @@
         </Row>
       </div>
     </div>
+<!--    导入-->
     <!-- 添加、编辑 -->
+    <importModal ref="importModal"></importModal>
     <MeterAptitudeManageEdit ref="editModal" @on-result-change="_page"></MeterAptitudeManageEdit>
     <sampleItemList ref="testItemModal" @on-result-change="_formSearch" />
   </div>
@@ -61,13 +63,15 @@
 
 <script>
 import { meterManage } from '../../../api'
+import importModal from '../../../components/import/DownloadTemplateImport'
 import MeterAptitudeManageEdit from './MeterAptitudeManageEdit.vue'
 import sampleItemList from './SampleItemList'
 export default {
   name: 'MeterAptitudeManage',
   components: {
     MeterAptitudeManageEdit,
-    sampleItemList
+    sampleItemList,
+    importModal
   },
   data() {
     return {
@@ -244,7 +248,7 @@ export default {
         downloadUrl: '/food/v1/excel/template/FoodAptitudeJudgeBasis',
         title: '导入检验方法管理'
       }
-      this.$refs.sampleModal._open(data)
+      this.$refs.importModal._open(data, '资质项目管理导入')
     },
     // 导出
     _export() {

pages/meter-send/sample-flow/MeterSampleFlow.vue

@@ -6,24 +6,24 @@
         <Row>
           <!--查询-->
           <Col span="24" style="margin-top: 10px">
-            <Form v-show="searchOpen" id="formId" :label-width="90" inline onsubmit="return false">
+            <Form id="formId" v-show="searchOpen" :label-width="90" inline onsubmit="return false">
               <label class="label-sign"></label>
               <Form-item class="search-item" label="实验室名称:">
-                <Input v-model="formObj.name" name="name" placeholder="请输入实验室名称" clearable @on-enter="_formSearch"/>
+                <Input v-model="formObj.name" @on-enter="_formSearch" name="name" placeholder="请输入实验室名称" clearable/>
               </Form-item>
               <Form-item class="search-item" label="资质:">
-                <Input v-model="formObj.aptitude" name="aptitude" placeholder="请输入资质" clearable @on-enter="_formSearch"/>
+                <Input v-model="formObj.aptitude" @on-enter="_formSearch" name="aptitude" placeholder="请输入资质" clearable/>
               </Form-item>
               <Form-item class="search-btn">
-                <Button type="primary" @click="_formSearch">搜索</Button>
+                <Button @click="_formSearch" type="primary">搜索</Button>
               </Form-item>
             </Form>
           </Col>
           <!--操作-->
           <Col span="24">
 
-            <btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" class="contHide"
-                     @on-result-change="_btnClick"></btn-list>
+            <btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" @on-result-change="_btnClick"
+                     class="contHide"></btn-list>
           </Col>
           <!--表格-->
           <Col span="24">
@@ -46,14 +46,17 @@
       </div>
     </div>
     <MeterPersonItemTaskManage ref="personModal"></MeterPersonItemTaskManage>
+    <personModal ref="personModal"></personModal>
   </div>
 </template>
 <script>
 import { meterDevice, meterSample } from '../../../api'
+import personModal from '../../../components/user-info-single/assignPerson'
 import MeterPersonItemTaskManage from './MeterPersonItemTaskManage'
 export default {
   components: {
-    MeterPersonItemTaskManage
+    MeterPersonItemTaskManage,
+    personModal
   },
   data() {
     return {
@@ -123,6 +126,9 @@ export default {
       this.currentComponent = componentName
       this.$nextTick(function() {
         switch (msg) {
+          case '任务转发':
+            this.$refs.personModal._open('salesman')
+            break
           case '仪器领用':
             this._receiveApparatus()
             break