更新

src/views/cost/deep/costDeepRatioHis/index.vue

@@ -52,7 +52,7 @@
 				:page.sync="listQuery.pageNo"
 				:limit.sync="listQuery.pageSize"
 				:total="listQuery.total"
-				@pagination="getDataList" />
+				@pagination="getNavDataList" />
 			<base-dialog
 				:dialogTitle="addOrEditTitle"
 				:dialogVisible="addOrUpdateVisible"
@@ -89,6 +89,10 @@ const tableProps = [
 		label: '日期',
 		filter: (val) => parseTime(val, '{y}年{m}月{d}日'),
 	},
+	{
+		prop: 'remark',
+		label: '备注',
+	},
 	{
 		prop: 'productionLineName',
 		label: '产线',
@@ -117,6 +121,10 @@ const tableProps2 = [
 		label: '日期',
 		filter: (val) => parseTime(val, '{y}年{m}月{d}日'),
 	},
+	{
+		prop: 'remark',
+		label: '备注',
+	},
 	{
 		prop: 'productionLineName',
 		label: '产线',
@@ -309,6 +317,13 @@ export default {
 				this.otherMethods(val);
 			}
 		},
+    getNavDataList(){
+			if (this.activeName === 'his') {
+				this.getDataList();
+			} else {
+				this.getDataList2();
+			}
+    },
 		successSubmit() {
 			this.handleCancel();
 			const val = this.activeName === 'his' ? '产线良品率' : 'now';