Merge remote-tracking branch 'origin/dev' into dev

pages/meter-out/personal-task/MeterOutPersonalTask.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">
@@ -45,15 +45,16 @@
         </Row>
       </div>
     </div>
-
+    <MeterPersonSampleManage ref="personModal"></MeterPersonSampleManage>
     <MeterSubcontractorEdit ref="editSubcontractorModal" @on-result-change="_formSearch"></MeterSubcontractorEdit>
   </div>
 </template>
 <script>
 import { meterSample } from '../../../api'
 import MeterSubcontractorEdit from './MeterGoOutTestEdit'
+import MeterPersonSampleManage from './MeterPersonSampleManage'
 export default {
-  components: { MeterSubcontractorEdit },
+  components: { MeterSubcontractorEdit, MeterPersonSampleManage },
   data() {
     return {
       currentComponent: '',
@@ -169,7 +170,8 @@ export default {
       this.$nextTick(function() {
         switch (res) {
           case '编辑':
-            this._editModal(true, data.id)
+            // this._editModal(true, data.id)
+            this._personModal(data)
             break
           case '资质项目':
             this._itemModal(data.id)
@@ -186,6 +188,10 @@ export default {
         }
       })
     },
+    _personModal(data) {
+      console.log(data)
+      this.$refs.personModal._open(data.id)
+    },
     _record(id) {
       this.$refs.refModal._open(id)
     },