设备日历ok

pages/resourceManagement/EquipmentCalendar/components/newEquipment.vue

@@ -20,7 +20,7 @@
           <Col span="20">
             <FormItem label="工作日历"  prop="work">
               <Select v-model="formItem1.calendarwork_pk" clearable placeholder="请选择...">
-               <Option v-for="item in cityList" :value="item.id" :key="item.value">{{ item.label }}</Option> 
+               <Option v-for="item in cityList" :value="item.id" :key="item.calName">{{ item.calName }}</Option> 
               </Select>
             </FormItem>
           </Col>
@@ -29,7 +29,7 @@
           <Col span="20" >
             <FormItem label="加班日历" prop="overtime">
               <Select v-model="formItem2.calendarovertime_pk" clearable placeholder="请选择...">
-              <Option v-for="item in cityList1" :value="item.id" :key="item.value">{{ item.label }}</Option> 
+              <Option v-for="item in cityList1" :value="item.id" :key="item.holidayCalName">{{ item.holidayCalName }}</Option> 
               </Select>
             </FormItem>
           </Col>
@@ -110,32 +110,22 @@ export default {
               conditions: [],
               pageSize: 10
           }
-            let url = `${systemUrl}/mesdailyworksched/list`,//paged
-                that = this;
+            let url = `${systemUrl}/mesdailyworksched/list`;//paged
+                // that = this;
             service.post(`${url}`, parmse).then(res => {
-                let selectdata = res.result;
-                //  console.log(selectdata)
-                selectdata.forEach(item => {
-                    that.cityList.push({
-                        value: item.calName,
-                        label: item.calName,
-                        id: item.id,
-                    })
-                    // console.log(that.cityList)
-                });
+              if(res.success){
+                this.cityList = res.result;
+              }else{
+                this.$Message.error("获取数据失败...")
+              }
             });
             let url1 = `${systemUrl}/mesholidaycal/list`;
             service.post(`${url1}`,parmse).then(res => {
-                let selectdata1 = res.result;
-                //  console.log(selectdata1)
-                selectdata1.forEach(item => {
-                    this.cityList1.push({
-                        value: item.holidayCalName,
-                        label: item.holidayCalName,
-                        id: item.id,
-                    })
-                    // console.log(that.cityList)
-                });
+                if(res.success){
+                  this.cityList1 = res.result;
+                }else{
+                  this.$Message.error("获取数据失败...")
+                }
             });
         },
     preservation() {},
@@ -145,9 +135,9 @@ export default {
     // 添加/编辑 弹框的保存
     saveOk() {
       var url = `${systemUrl}/equipcalendarwork/createorupdate`
-       console.log(this.formItem1)
-          console.log(this.formItem2)
-          console.log(this.editId)
+      //  console.log(this.formItem1)
+      //     console.log(this.formItem2)
+      //     console.log(this.editId)
       service.post(`${url}`,{ equipCalendarWork: this.formItem1,equipCalendarOverTime: this.formItem2 })
         .then((res) => {