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

pages/meter-out/task-distribute/MeterOutTaskDistribute.vue

@@ -45,15 +45,16 @@
         </Row>
       </div>
     </div>
-
+    <MeterOutTaskAlloca ref="taskAllocaModal"></MeterOutTaskAlloca>
     <MeterSubcontractorEdit ref="editSubcontractorModal" @on-result-change="_formSearch"></MeterSubcontractorEdit>
   </div>
 </template>
 <script>
 import { meterEntrust } from '../../../api'
 import MeterSubcontractorEdit from './MeterGoOutTestEdit'
+import MeterOutTaskAlloca from './MeterOutTaskAlloca'
 export default {
-  components: { MeterSubcontractorEdit },
+  components: { MeterSubcontractorEdit, MeterOutTaskAlloca },
   data() {
     return {
       currentComponent: '',
@@ -169,6 +170,9 @@ export default {
       this.currentComponent = componentName
       this.$nextTick(function() {
         switch (res) {
+          case '任务分配':
+            this._taskAllocaModal(data)
+            break
           case '编辑':
             this._editModal(true, data.id)
             break
@@ -187,6 +191,10 @@ export default {
         }
       })
     },
+    _taskAllocaModal(data) {
+      // 管理样品
+      this.$refs.taskAllocaModal._open(data.id)
+    },
     _record(id) {
       this.$refs.refModal._open(id)
     },