修改了客户在线委托单和出检委托单的按钮id

pages/meter-entrust/client-online/MeterClientOnlineEntrust.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">
@@ -80,26 +80,35 @@ export default {
       btn: [
         {
           type: 'success',
-          id: '',
+          id: 'client-online-meter-client-online-entrust-submit',
           name: '提交'
         }
       ],
       iconMsg: [
         {
           type: 'md-create',
-          id: '',
+          id: 'client-online-meter-client-online-entrust-edit-operation',
           name: '编辑'
         },
         {
           type: 'ios-beaker',
-          id: '',
+          id:
+            'client-online-meter-client-online-entrust-sample-manage-operation',
           name: '管理样品'
         },
-        { type: 'md-cloud', id: '', name: '附件' },
-        { type: 'md-remove-circle', id: '', name: '删除' },
+        {
+          type: 'md-cloud',
+          id: 'client-online-meter-client-online-entrust-accessory-operation',
+          name: '附件'
+        },
+        {
+          type: 'md-remove-circle',
+          id: 'client-online-meter-client-online-entrust-remove-operation',
+          name: '删除'
+        },
         {
           type: 'ios-clock',
-          id: '',
+          id: 'client-online-meter-client-online-entrust-record-operation',
           name: '操作日志'
         }
       ],

pages/meter-entrust/client-online/MeterClientOnlineEntrustHis.vue

@@ -12,7 +12,7 @@
                 <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 @click="_formSearch" type="primary">搜索</Button>
@@ -67,24 +67,25 @@ export default {
       btn: [
         {
           type: 'success',
-          id: 'meter-go-out-entrust-add-btn',
+          id: 'client-online-meter-client-online-entrust-his-add',
           name: '添加'
         },
         {
           type: 'success',
-          id: 'meter-go-out-entrust-submit-btn',
+          id: 'client-online-meter-client-online-entrust-his-submit',
           name: '提交'
         }
       ],
       iconMsg: [
         {
           type: 'md-flask',
-          id: '',
+          id:
+            'client-online-meter-client-online-entrust-his-view-sample-operation',
           name: '查看样品'
         },
         {
           type: 'ios-clock',
-          id: '',
+          id: 'client-online-meter-client-online-entrust-his-record-operation',
           name: '操作日志'
         }
       ],

pages/meter-entrust/client-online/MeterGoOutTestEdit.vue

@@ -55,7 +55,7 @@
         <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 id="client-online-meter-go-out-test-edit-add" @click="_add()" type="success">添加</Button>
         </Col>
         <Col span="24">
           <PTVXETable
@@ -172,7 +172,13 @@ export default {
       testedCityData: [],
       customerData: [],
       judgeType: [{ value: 1, name: '是' }, { value: 0, name: '否' }],
-      iconMsg: [{ type: 'md-trash', id: '', name: '删除' }],
+      iconMsg: [
+        {
+          type: 'md-trash',
+          id: 'client-online-meter-go-out-test-edit-remove-operation',
+          name: '删除'
+        }
+      ],
       pageColumns: [
         { title: '样品名称', key: 'name', width: 160 },
         { title: '型号规格', key: 'spec' },

pages/meter-entrust/client-online/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: 'client-online-meter-item-manage-edit-operation',
+          name: '编辑'
+        },
+        {
+          type: 'ios-copy',
+          id: 'client-online-meter-item-manage-copy-operation',
+          name: '复制',
+          componentName: 'CopyModal'
+        },
+        {
+          type: 'trash-a',
+          id: 'client-online-meter-item-manage-remove-operation',
+          name: '删除'
+        }
       ],
       btn: [],
       options: [

pages/meter-entrust/client-online/MeterSampleManage.vue

@@ -10,24 +10,24 @@
             <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 label="样品编号:" class="search-item">
-                <Input v-model="formObj.code" placeholder="请输入样品编号" clearable @on-enter="_formSearch"/>
+                <Input v-model="formObj.code" @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"
-                        :icon-msg="iconMsg" select-data @on-result-change="_tableResultChange">
+                        :icon-msg="iconMsg" @on-result-change="_tableResultChange" select-data>
               <vxe-table-column
                 v-for="item in pageColumns"
                 :key="item.key"
@@ -78,29 +78,41 @@ export default {
       currentComponent: '',
       searchOpen: false,
       iconMsg: [
-        { type: 'compose', id: '', name: '编辑' },
-        { type: 'ios-flask-outline', id: '', name: '管理检测项目' },
-        { type: 'trash-a', id: '', name: '删除' }
+        {
+          type: 'compose',
+          id: 'client-online-meter-sample-manage-edit-operation',
+          name: '编辑'
+        },
+        {
+          type: 'ios-flask-outline',
+          id: 'client-online-meter-sample-manage-test-item-manage-operation',
+          name: '管理检测项目'
+        },
+        {
+          type: 'trash-a',
+          id: 'client-online-meter-sample-manage-remove-operation',
+          name: '删除'
+        }
       ],
       btn: [
         {
           type: 'success',
-          id: '',
+          id: 'client-online-meter-sample-manage-add',
           name: '新增'
         },
         {
           type: 'success',
-          id: '',
+          id: 'client-online-meter-sample-manage-subpackage',
           name: '分包'
         },
         {
           type: 'success',
-          id: '',
+          id: 'client-online-meter-sample-manage-subpackage-cancel',
           name: '取消分包'
         },
         {
           type: 'success',
-          id: '',
+          id: 'client-online-meter-sample-manage-import-test-item',
           name: '导入检测项目'
         }
       ],

pages/meter-entrust/go-out-test/MeterGoOutEntrust.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">
@@ -90,20 +90,32 @@ export default {
       iconMsg: [
         {
           type: 'md-create',
-          id: '',
+          id: 'go-out-test-meter-go-out-entrust-edit-operation',
           name: '编辑'
         },
         {
           type: 'ios-beaker',
-          id: '',
+          id: 'go-out-test-meter-go-out-entrust-sample-manage-operation',
           name: '管理样品'
         },
-        { type: 'md-cloud', id: '', name: '附件' },
-        { type: 'md-document', id: '', name: '导出委托单' },
-        { type: 'md-remove-circle', id: '', name: '删除' },
+        {
+          type: 'md-cloud',
+          id: 'go-out-test-meter-go-out-entrust-accessory-operation',
+          name: '附件'
+        },
+        {
+          type: 'md-document',
+          id: 'go-out-test-meter-go-out-entrust-export-entrust-operation',
+          name: '导出委托单'
+        },
+        {
+          type: 'md-remove-circle',
+          id: 'go-out-test-meter-go-out-entrust-remove-operation',
+          name: '删除'
+        },
         {
           type: 'ios-clock',
-          id: '',
+          id: 'go-out-test-meter-go-out-entrust-record-operation',
           name: '操作日志'
         }
       ],

pages/meter-entrust/go-out-test/MeterGoOutEntrustHis.vue

@@ -67,24 +67,24 @@ export default {
       btn: [
         {
           type: 'success',
-          id: 'meter-go-out-entrust-add-btn',
+          id: 'go-out-test-meter-go-out-entrust-his-add',
           name: '添加'
         },
         {
           type: 'success',
-          id: 'meter-go-out-entrust-submit-btn',
+          id: 'go-out-test-meter-go-out-entrust-his-submit',
           name: '提交'
         }
       ],
       iconMsg: [
         {
           type: 'md-flask',
-          id: '',
+          id: 'go-out-test-meter-go-out-entrust-his-view-sample-operation',
           name: '查看样品'
         },
         {
           type: 'ios-clock',
-          id: '',
+          id: 'go-out-test-meter-go-out-entrust-his-record-operation',
           name: '操作日志'
         }
       ],

pages/meter-entrust/go-out-test/MeterGoOutTestEdit.vue

@@ -10,8 +10,8 @@
             </Radio-group>
           </Form-item>
           <Form-item label="委托单位" prop="client" class="width-48">
-            <AutoComplete :value="formObj.client" :down-data="customerData" name="client"
-                          placeholder="请输入或选择委托单位" @on-result-change="_cusNameChange"
+            <AutoComplete :value="formObj.client" :down-data="customerData" @on-result-change="_cusNameChange"
+                          name="client" placeholder="请输入或选择委托单位"
             ></AutoComplete>
           </Form-item>
           <Form-item label="联系人" prop="operation.person" class="width-48">
@@ -24,7 +24,7 @@
             <Input v-model="formObj.operation.fax" name="operation.fax" placeholder="请输入传真"/>
           </Form-item>
           <Form-item label="省、市、区" prop="testedCityData" class="width-48">
-            <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">
@@ -38,15 +38,15 @@
             <Input v-model="formObj.operation.email" name="operation.email" placeholder="请输入E-mail"/>
           </Form-item>
           <Form-item label="委托日期：" prop="edate" class="width-48">
-            <Date-picker v-model="formObj.edate" type="date" split-panels style="width:100%;" placeholder="请选择委托日期"
-                         @on-change="_ctimeChange"></Date-picker>
+            <Date-picker v-model="formObj.edate" @on-change="_ctimeChange" type="date" split-panels style="width:100%;"
+                         placeholder="请选择委托日期"></Date-picker>
           </Form-item>
           <Form-item label="委托费用：" prop="operation.fee" class="width-48">
-            <Input v-model="formObj.operation.fee" type="number" name="operation.fee" placeholder="请输入委托费用" @keydown.native="channelInputLimit"/>
+            <Input v-model="formObj.operation.fee" @keydown.native="channelInputLimit" type="number" name="operation.fee" placeholder="请输入委托费用"/>
           </Form-item>
           <Form-item label="要求完成日期：" prop="odate" class="width-48">
-            <Date-picker v-model="formObj.odate" type="date" split-panels style="width:100%;" placeholder="请选择要求完成"
-                         @on-change="_odateChange"></Date-picker>
+            <Date-picker v-model="formObj.odate" @on-change="_odateChange" type="date" split-panels style="width:100%;"
+                         placeholder="请选择要求完成"></Date-picker>
           </Form-item>
           <Form-item label="合同号：" prop="contractCode" class="width-48">
             <Input v-model="formObj.contractCode" name="contractCode" placeholder="请输入合同号"/>
@@ -59,8 +59,8 @@
         <Col span="24">
           <!--          <btn-list :msg="btn" :open="searchOpen" :showSearchBtn="false" @on-result-change="_btnClick"-->
           <!--                    class="contHide"></btn-list>-->
-          <btn-list :msg="btn" :open="searchOpen" :show-search-btn="false" class="contHide"
-                    @on-result-change="_btnClick"></btn-list>
+          <btn-list :msg="btn" :open="searchOpen" :show-search-btn="false" @on-result-change="_btnClick"
+                    class="contHide"></btn-list>
 <!--          <Button @click="_add()" type="success">添加</Button>-->
         </Col>
         <Col span="24">
@@ -83,7 +83,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)">
@@ -116,34 +116,34 @@
                 <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>
 
                 <div v-if="item.key==='testFee'" @click.stop="_handleRow(scope)">
                   <el-input
                     v-model="scope.row.testFee"
+                    @keydown.native="channelInputLimit"
                     type="number"
                     placeholder="请输入检定/校准费"
-                    @keydown.native="channelInputLimit"
                   />
                 </div>
                 <div v-if="item.key==='repairFee'" @click.stop="_handleRow(scope)">
                   <el-input
                     v-model="scope.row.repairFee"
+                    @keydown.native="channelInputLimit"
                     type="number"
                     placeholder="请输入调修费"
-                    @keydown.native="channelInputLimit"
                   />
                 </div>
                 <div v-if="item.key==='elseFee'" @click.stop="_handleRow(scope)">
                   <el-input
                     v-model="scope.row.elseFee"
+                    @keydown.native="channelInputLimit"
                     type="number"
                     placeholder="请输入其他费用"
-                    @keydown.native="channelInputLimit"
                   />
                 </div>
                 <span v-else>{{scope.row[item.key]}}</span>
@@ -155,8 +155,8 @@
       <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" />
-      <importModal ref="importModal" aptitude-item   @on-result-change="_inputBack"></importModal>
+      <EditModal ref="EditModal" @on-result-change="_backData" is-change />
+      <importModal ref="importModal" @on-result-change="_inputBack"   aptitude-item></importModal>
     </Modal>
   </div>
 </template>
@@ -217,7 +217,13 @@ export default {
       customerData: [],
       searchOpen: true,
       judgeType: [{ value: 1, name: '是' }, { value: 0, name: '否' }],
-      iconMsg: [{ type: 'md-trash', id: '', name: '删除' }],
+      iconMsg: [
+        {
+          type: 'md-trash',
+          id: 'go-out-test-meter-go-out-test-edit-remove-operation',
+          name: '删除'
+        }
+      ],
       pageColumns: [
         { title: '样品名称', key: 'name', width: 160 },
         { title: '型号规格', key: 'spec' },
@@ -234,12 +240,12 @@ export default {
       btn: [
         {
           type: 'success',
-          id: '',
+          id: 'go-out-test-meter-go-out-test-edit-add',
           name: '添加'
         },
         {
           type: 'success',
-          id: '',
+          id: 'go-out-test-meter-go-out-test-edit-import',
           name: '导入'
         }
       ],