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

pages/resourceManagement/productionResources/index.vue

@@ -43,7 +43,7 @@
       </template>
     </DataGrid>
 
-    <Modal v-model="editModal" title="编辑" footer-hide>
+    <Modal v-model="editModal" title="设置日历" footer-hide>
       <Set :eid="curId" @on-close="cancel" @on-ok="addOk" />
     </Modal>
 

pages/resourceManagement/productionResources/set.vue

@@ -97,8 +97,8 @@ export default {
       Api.get({ id: v }).then(r => {
         this.formItem.equip_name = r.result.title;
         this.formItem.equip_id = r.result.code;
-        this.formItem1.equip_pk = r.result.id;
-        this.formItem2.equip_pk = r.result.id;
+        this.formItem1.calendarwork_pk = r.result.calKey;
+        this.formItem2.calendarovertime_pk = r.result.holidayKey;
       });
     },
     handleSubmit() {