Merge branch 'develop' of http://www.huahengrobot.com:90/wms/wms4 into develop

肖超群
2 parents daeab66c 636f27a7
Showing 1 changed file with 1 additions and 1 deletions
ant-design-vue-jeecg/src/views/system/task/TaskDetailList.vue
@@ -80,7 +80,6 @@
         <span slot="action" slot-scope="text, record">
           <adjustment-doc-modal ref="adjustmentModal" @ok="modalFormOk" :id="record.id" :taskHeaderId="record.taskHeaderId"/>
-          <quality-register-detail-modal ref="qualityRegisterModal" @ok="modalFormOk" :id="record.id" :taskHeaderId="record.taskHeaderId"/>
           <a v-if="record.taskType==700 && record.status!=100" @click="createMany(record)">实盘登记<a-divider type="vertical" /></a>
           <a v-if="record.taskType==1400 && record.status!=100" @click="qualityRegister(record)">质检登记<a-divider type="vertical" /></a>
           <a v-has="'taskDetail:edit'" @click="handleEdit(record)">编辑<a-divider type="vertical" /></a>
@@ -92,6 +91,7 @@
       </a-table>
     </div>
+    <quality-register-detail-modal ref="qualityRegisterModal" @ok="modalFormOk"></quality-register-detail-modal>
     <taskDetail-modal ref="modalForm" @ok="modalFormOk" :mainId="mainId"></taskDetail-modal>
   </a-card>
 </template>