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

pages/meter-entrust/MeterSampleManageRead.vue

@@ -166,6 +166,9 @@ export default {
       this.currentComponent = componentName
       this.$nextTick(function() {
         switch (msg) {
+          case '追加样品':
+            this._addSample(this.formObj.entrustId)
+            break
           case '取消分包':
             this._subpackageCancelBtn()
             break
@@ -193,7 +196,6 @@ export default {
         }
       })
     },
-
     _addSample(entrustId) {
       this.$refs.meterSampleEditModal._open(entrustId)
     },