合并冲突

src/components/Pagination/index.vue

@@ -3,7 +3,7 @@
     <el-pagination
       background
       layout="total, sizes, prev, pager, next, jumper"
-      :page-sizes="[10, 20, 30, 50]"
+      :page-sizes="pagination.pageSizes"
       :current-page="pagination.pageNumber"
       :page-size="pagination.pageSize"
       :total="pagination.total"
@@ -25,6 +25,7 @@ export default {
         pageNumber: 1,
         pageSize: 10,
         total: 0,
+        pageSizes:[10, 20, 30, 50]
       },
     },
   },

src/views/factoryModel/timeModel/dayModel/shiftCconfiguration.vue

@@ -173,7 +173,11 @@ export default {
   },
   watch: {
     formData(data, oldValue) {
-      console.log('%cshiftCconfiguration.vue line:175 object1', 'color: #007acc;', this.formData["DayModel-EnableS"+this.shiftIndex+"CrossDayToggle"]);
+      if(this.formData["DayModel-EnableS"+this.shiftIndex+"CrossDayToggle"]){
+        this.end= "47:59"
+      }
+    },
+    shiftIndex(data, oldValue) {
       if(this.formData["DayModel-EnableS"+this.shiftIndex+"CrossDayToggle"]){
         this.end= "47:59"
       }

src/views/plan/workbench/homePage/beta/predict/index.vue

@@ -82,6 +82,7 @@ export default {
 				pageNumber: 1,
 				pageSize: 10,
 				total: 0,
+        pageSizes:[10,50,100,200]
 			},
 			batchImport: [],
 			// isRefreshList: false,

src/views/plan/workbench/homePage/beta/predict/predictEdit.vue

@@ -79,7 +79,7 @@
 							<el-table
 								:data="formData['AP_CustDemandVerHead-CustomerItem']"
 								size="mini"
-								height="460px"
+								height="560px"
 								style="width: 100%; margin-top: 20px;"
 								border>
 								<el-table-column label="零件" width="180">