Merge branch 'dev' of http://git.patzn.com/root/patzn-cloud-service-metr-web into dev

pages/meter-entrust/send-test/MeterSendTestEdit.vue

@@ -47,15 +47,15 @@
         <Col span="24">
           <!--          <btn-list :msg="btn" :open="searchOpen" :showSearchBtn="false" @on-result-change="_btnClick"-->
           <!--                    class="contHide"></btn-list>-->
-          <Button @click="_add()" type="success">添加</Button>
+          <Button type="success" @click="_add()">添加</Button>
         </Col>
         <Col span="24">
           <PTVXETable
             ref="pageTable"
             :form-id="formId"
-            :tableHeight="500"
-            :getPage="getPage"
-            :iconMsg="iconMsg"
+            :table-height="500"
+            :get-page="getPage"
+            :icon-msg="iconMsg"
             @on-result-change="_tableResultChange">
             <vxe-table-column
               v-for="item in pageColumns"
@@ -69,7 +69,7 @@
             >
               <template slot-scope="scope">
                 <div v-if="item.key==='name'" @click.stop="_handleRow(scope)">
-                  <el-input v-model="scope.row.name" blur placeholder="请输入或选择样品名称"
+                  <el-input v-model="scope.row.name" blur placeholder="请输入或选择样品名称" @click.native="_selectAptitude(scope.$index)"
                   ></el-input>
                 </div>
                 <div v-if="item.key==='spec'" @click.stop="_handleRow(scope)">
@@ -94,9 +94,9 @@
 <!--                  ></el-input>-->
                   <el-input
                     v-model="scope.row.quantity"
-                    @keydown.native="channelInputLimit"
                     type="number"
                     placeholder="请输入或选择数量"
+                    @keydown.native="channelInputLimit"
                   />
                 </div>
               </template>
@@ -231,6 +231,10 @@ export default {
           break
       }
     },
+
+    _selectAptitude(data) {
+      console.log(data)
+    },
     _handleRow(data) {
       this.currentRow = data.row
       this.currentIndex = data.rowIndex