Commit c3c95f1c79491567b83e0ef07df757fb7a613937

Authored by 肖超群
2 parents daeab66c 636f27a7

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

ant-design-vue-jeecg/src/views/system/task/TaskDetailList.vue
... ... @@ -80,7 +80,6 @@
80 80  
81 81 <span slot="action" slot-scope="text, record">
82 82 <adjustment-doc-modal ref="adjustmentModal" @ok="modalFormOk" :id="record.id" :taskHeaderId="record.taskHeaderId"/>
83   - <quality-register-detail-modal ref="qualityRegisterModal" @ok="modalFormOk" :id="record.id" :taskHeaderId="record.taskHeaderId"/>
84 83 <a v-if="record.taskType==700 && record.status!=100" @click="createMany(record)">实盘登记<a-divider type="vertical" /></a>
85 84 <a v-if="record.taskType==1400 && record.status!=100" @click="qualityRegister(record)">质检登记<a-divider type="vertical" /></a>
86 85 <a v-has="'taskDetail:edit'" @click="handleEdit(record)">编辑<a-divider type="vertical" /></a>
... ... @@ -92,6 +91,7 @@
92 91 </a-table>
93 92 </div>
94 93  
  94 + <quality-register-detail-modal ref="qualityRegisterModal" @ok="modalFormOk"></quality-register-detail-modal>
95 95 <taskDetail-modal ref="modalForm" @ok="modalFormOk" :mainId="mainId"></taskDetail-modal>
96 96 </a-card>
97 97 </template>
... ...