Skip to content

M
mes-ui
Commit d1d89641 authored by renjintao's avatar renjintao
Browse files
Options

Merge branch 'product' of git.mes123.com:zhouyx/mes-ui into product-rjt

parents 30379f72 8b279314
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
pages/resourceManagement/productionResources/index.vue
View file @ d1d89641
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
</template> </template>
</DataGrid> </DataGrid>
<Modal v-model="editModal" title="编辑" footer-hide> <Modal v-model="editModal" title="设置日历" footer-hide>
<Set :eid="curId" @on-close="cancel" @on-ok="addOk" /> <Set :eid="curId" @on-close="cancel" @on-ok="addOk" />
</Modal> </Modal>
......
pages/resourceManagement/productionResources/set.vue
View file @ d1d89641
...@@ -97,8 +97,8 @@ export default { ...@@ -97,8 +97,8 @@ export default {
Api.get({ id: v }).then(r => { Api.get({ id: v }).then(r => {
this.formItem.equip_name = r.result.title; this.formItem.equip_name = r.result.title;
this.formItem.equip_id = r.result.code; this.formItem.equip_id = r.result.code;
this.formItem1.equip_pk = r.result.id; this.formItem1.calendarwork_pk = r.result.calKey;
this.formItem2.equip_pk = r.result.id; this.formItem2.calendarovertime_pk = r.result.holidayKey;
}); });
}, },
handleSubmit() { handleSubmit() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment