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

pages/meter-contract/contract-register/MeterContractRegisterEdit.vue

@@ -620,6 +620,9 @@ export default {
           result[0].city,
           result[0].area
         ]
+        this.formObj.province = result[0].province
+        this.formObj.city = result[0].city
+        this.formObj.county = result[0].county
       }
     },
     _getAptitudeList: async function() {

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

@@ -84,22 +84,22 @@ export default {
       iconMsg: [
         {
           type: 'md-create',
-          id: 'send-test-meter-send-entrust-edit-operation',
+          id: 'send-test-meter-send-entrust-edit-o',
           name: '编辑'
         },
         {
           type: 'ios-beaker',
-          id: 'send-test-meter-send-entrust-sample-manage-operation',
+          id: 'send-test-meter-send-entrust-sample-manage-o',
           name: '管理样品'
         },
         {
           type: 'md-cloud',
-          id: 'send-test-meter-send-entrust-accessory-operation',
+          id: 'send-test-meter-send-entrust-accessory-o',
           name: '附件'
         },
         {
           type: 'md-document',
-          id: 'send-test-meter-send-entrust-export-entrust-operation',
+          id: 'send-test-meter-send-entrust-export-entrust-o',
           name: '导出委托单'
         },
         {

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

@@ -205,7 +205,7 @@ export default {
       iconMsg: [
         {
           type: 'md-trash',
-          id: 'send-test-meter-send-test-edit-remove-operation',
+          id: 'send-test-meter-send-test-edit-remove-o',
           name: '删除'
         }
       ],