修改了任务分配的按钮id

pages/meter-send/MeterItemManage.vue

@@ -10,21 +10,21 @@
             <Form id="formId" :label-width="80" inline onsubmit="return false">
               <label class="label-sign"></label>
               <Form-item label="检定项目:" class="search-item">
-                <Input v-model="formObj.name" placeholder="请输入样品名称" clearable @on-enter="_formSearch"/>
+                <Input v-model="formObj.name" @on-enter="_formSearch" placeholder="请输入样品名称" clearable/>
               </Form-item>
               <Form-item class="search-btn" style="margin-left: -10px">
-                <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">
             <PTVXETable ref="pageTable" :table-height="tableHeight" :form-id="formId" :get-page="getPage"
-                         select-data @on-result-change="_tableResultChange">
+                         @on-result-change="_tableResultChange" select-data>
               <vxe-table-column
                 v-for="item in pageColumns"
                 :key="item.key"
@@ -75,9 +75,22 @@ export default {
     return {
       currentComponent: '',
       iconMsg: [
-        { type: 'compose', id: '', name: '编辑' },
-        { type: 'ios-copy', id: '', name: '复制', componentName: 'CopyModal' },
-        { type: 'trash-a', id: '', name: '删除' }
+        {
+          type: 'compose',
+          id: 'meter-send-meter-item-manage-edit',
+          name: '编辑'
+        },
+        {
+          type: 'ios-copy',
+          id: 'meter-send-meter-item-manage-copy',
+          name: '复制',
+          componentName: 'CopyModal'
+        },
+        {
+          type: 'trash-a',
+          id: 'meter-send-meter-item-manage-remove',
+          name: '删除'
+        }
       ],
       btn: [],
       options: [

pages/meter-send/task-distribute/MeterTaskAlloca.vue

@@ -96,10 +96,14 @@ export default {
       //   {id: '', name: '删除'},
       // ],
       iconMsg: [
-        { type: 'ios-beaker', id: '', name: '检测项目管理' },
+        {
+          type: 'ios-beaker',
+          id: 'task-distribute-meter-task-alloca-item-manage',
+          name: '检测项目管理'
+        },
         {
           type: 'ios-clock',
-          id: '',
+          id: 'task-distribute-meter-task-alloca-record',
           name: '操作日志'
         }
       ],
@@ -110,12 +114,12 @@ export default {
       btn: [
         {
           type: 'success',
-          id: '',
+          id: 'task-distribute-meter-task-alloca-allocation-btn',
           name: '分配任务'
         },
         {
           type: 'success',
-          id: '',
+          id: 'task-distribute-meter-task-alloca-import-item-btn',
           name: '导入检测项目'
         }
       ],

pages/meter-send/task-distribute/MeterTaskAllocaHis.vue

@@ -97,10 +97,14 @@ export default {
       //   {id: '', name: '删除'},
       // ],
       iconMsg: [
-        { type: 'ios-beaker', id: '', name: '检测项目管理' },
+        {
+          type: 'ios-beaker',
+          id: 'task-distribute-meter-task-alloca-his-item-manage',
+          name: '检测项目管理'
+        },
         {
           type: 'ios-clock',
-          id: '',
+          id: 'task-distribute-meter-task-alloca-his-record',
           name: '操作日志'
         }
       ],
@@ -111,12 +115,12 @@ export default {
       btn: [
         {
           type: 'success',
-          id: '',
+          id: 'task-distribute-meter-task-alloca-his-allocation-btn',
           name: '任务重新分配'
         },
         {
           type: 'success',
-          id: '',
+          id: 'task-distribute-meter-task-alloca-his-import-item-btn',
           name: '导入检测项目'
         }
       ],

pages/meter-send/task-distribute/MeterTaskDistribute.vue

@@ -89,14 +89,18 @@ export default {
         // },
         {
           type: 'ios-contact',
-          id: '',
+          id: 'task-distribute-meter-task-distribute-allocation',
           name: '任务分配'
         },
-        { type: 'md-cloud', id: '', name: '附件' },
+        {
+          type: 'md-cloud',
+          id: 'task-distribute-meter-task-distribute-accessory',
+          name: '附件'
+        },
         // { type: 'md-remove-circle', id: '', name: '删除' },
         {
           type: 'ios-clock',
-          id: '',
+          id: 'task-distribute-meter-task-distribute-record',
           name: '操作日志'
         }
       ],

pages/meter-send/task-distribute/MeterTaskDistributeHis.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.client" name="client" placeholder="请输入委托单位" clearable @on-enter="_formSearch"/>
+                <Input v-model="formObj.client" @on-enter="_formSearch" name="client" placeholder="请输入委托单位" clearable/>
               </Form-item>
               <Form-item class="search-item" label="委托编号:">
-                <Input v-model="formObj.entrustCode" name="entrustCode" placeholder="请输入委托编号" clearable @on-enter="_formSearch"/>
+                <Input v-model="formObj.entrustCode" @on-enter="_formSearch" name="entrustCode" 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">
@@ -89,14 +89,18 @@ export default {
         // },
         {
           type: 'ios-contact',
-          id: '',
+          id: 'task-distribute-meter-task-distribute-his-allocation-his',
           name: '任务分配历史'
         },
-        { type: 'md-cloud', id: '', name: '附件' },
+        {
+          type: 'md-cloud',
+          id: 'task-distribute-meter-task-distribute-his-accessory',
+          name: '附件'
+        },
         // { type: 'md-remove-circle', id: '', name: '删除' },
         {
           type: 'ios-clock',
-          id: '',
+          id: 'task-distribute-meter-task-distribute-his-record',
           name: '操作日志'
         }
       ],

pages/meter-send/task-distribute/MeterTestEdit.vue

@@ -27,7 +27,7 @@
           </Form-item>
           <Form-item label="省、市、区" prop="name" class="width-48">
 <!--            <Input v-model="formObj.client" name="name" placeholder="请输入委托单位"/>-->
-            <CityNameCascader :value="testedCityData.join(',')" name="tested" @on-result-change="_cascaderResult">
+            <CityNameCascader :value="testedCityData.join(',')" @on-result-change="_cascaderResult" name="tested">
             </CityNameCascader>
           </Form-item>
           <Form-item label="街道" prop="street" class="width-48">
@@ -54,7 +54,7 @@
         <Col span="24">
           <!--          <btn-list :msg="btn" :open="searchOpen" :showSearchBtn="false" @on-result-change="_btnClick"-->
           <!--                    class="contHide"></btn-list>-->
-          <Button type="success" @click="_add()">添加</Button>
+          <Button @click="_add()" type="success">添加</Button>
         </Col>
         <Col span="24">
           <PTVXETable
@@ -76,7 +76,7 @@
             >
               <template slot-scope="scope">
                 <div v-if="item.key==='name'" @click.stop="_handleRow(scope)">
-                  <el-input v-model="scope.row.name" blur placeholder="请输入或选择样品名称" @on-result-change="_judgeBasisChange"  @click.native="_selectjudgeBasis(scope.$rowIndex)"
+                  <el-input v-model="scope.row.name" @on-result-change="_judgeBasisChange" @click.native="_selectjudgeBasis(scope.$rowIndex)" blur  placeholder="请输入或选择样品名称"
                   ></el-input>
                 </div>
                 <div v-if="item.key==='spec'" @click.stop="_handleRow(scope)">
@@ -97,9 +97,9 @@
                 <div v-if="item.key==='quantity'" @click.stop="_handleRow(scope)">
                   <el-input
                     v-model="scope.row.quantity"
+                    @keydown.native="channelInputLimit"
                     type="number"
                     placeholder="请输入或选择数量"
-                    @keydown.native="channelInputLimit"
                   />
                 </div>
               </template>
@@ -110,7 +110,7 @@
       <div slot="footer">
         <modal-footer ref="footerModal" :footer="footerList" @on-result-change="_footerResult"></modal-footer>
       </div>
-      <EditModal ref="EditModal" is-change @on-result-change="_backData" />
+      <EditModal ref="EditModal" @on-result-change="_backData" is-change />
     </Modal>
   </div>
 </template>
@@ -143,8 +143,16 @@ export default {
       },
       judgeType: [{ value: 1, name: '是' }, { value: 0, name: '否' }],
       iconMsg: [
-        { type: 'ios-clock', id: '', name: '编辑' },
-        { type: 'ios-clock', id: '', name: '删除' }
+        {
+          type: 'ios-clock',
+          id: 'task-distribute-meter-test-edit-edit',
+          name: '编辑'
+        },
+        {
+          type: 'ios-clock',
+          id: 'task-distribute-meter-test-edit-remove',
+          name: '删除'
+        }
       ],
       pageColumns: [
         { title: '样品名称', key: 'name', width: 160 },