Merge branch 'product' of 39.98.128.195:zhouyx/mes-ui into product

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>
@@ -106,37 +106,26 @@ export default {
         },
             laodaction(){
           let parmse ={
-              pageIndex:0,
-              cont:0,
+              pageIndex:1,
               conditions: [],
-              pageSize: 0
+              pageSize: 10
           }
-            let url = `${systemUrl}/calendarwork/list`,
-                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.title,
-                        label: item.title,
-                        id: item.id,
-                    })
-                    // console.log(that.cityList)
-                });
+              if(res.success){
+                this.cityList = res.result;
+              }else{
+                this.$Message.error("获取数据失败...")
+              }
             });
-            let url1 = `${systemUrl}/calendarovertime/list`;
+            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.title,
-                        label: item.title,
-                        id: item.id,
-                    })
-                    // console.log(that.cityList)
-                });
+                if(res.success){
+                  this.cityList1 = res.result;
+                }else{
+                  this.$Message.error("获取数据失败...")
+                }
             });
         },
     preservation() {},
@@ -146,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) => {
 

pages/resourceManagement/EquipmentCalendar/index.vue

@@ -19,7 +19,7 @@
               clearable
               style="width:235px;flaot:left;"
             />
-            <Button type="primary" class @click="easySearch">查询</Button>
+            <Button type="primary" class="ml10" @click="easySearch">查询</Button>
             <!-- <Button @click="advancedSearch" type="success" style="margin-left:8px;">高级搜索</Button> -->
           </Col>
           <!-- <Col span="12" style=" text-align: right;">
@@ -46,7 +46,7 @@
           :total="this.total"
           :current="this.page"
           :page-size="this.pageSize"
-          show-elevator
+          show-elevator show-total
           show-sizer
           style="margin:10px 0;"
           @on-change="pageChange"
@@ -498,7 +498,7 @@ export default {
         },
         {
           title: "工作日历编号",
-          key: "calendarwork_pk"
+          key: "calId"
         },
         {
           title: "工作日历名称",
@@ -506,7 +506,7 @@ export default {
         },
         {
           title: "加班日历编号",
-          key: "calendarovertime_pk"
+          key: "holidayCalId"
         },
         {
           title: "加班日历名称",