合并

@@ -904,6 +904,28 @@ class CustomButton extends StatefulWidget {
 class _ButtonState extends State<CustomButton> {
 class _ButtonState extends State<CustomButton> {
   FocusNode _cancelNode = FocusNode();
   FocusNode _cancelNode = FocusNode();
   @override
   @override
+  void initState() {
+    super.initState();
+    // 监听换行键盘
+    // WidgetsBinding.instance.addPostFrameCallback((_) async {
+    //   //添加listener监听
+    //   //对应的TextField失去或者获取焦点都会回调此监听
+    //   _cancelNode.addListener(() {
+    //     if (_cancelNode.hasFocus) {
+    //       print('得到焦点');
+    //     } else {
+    //       print('失去焦点');
+    //       int ddate = _getDdate(widget.model);
+    //       String ddateSolt = _getDdateSolt(widget.model);
+    //       String pnum = widget.model.numController.text;
+    //       widget.model.getNewTableList(
+    //           context, '${ddate}', ddateSolt, pnum, widget.model.tableList);
+    //     }
+    //   });
+    // });
+  }
+
+  @override
   Widget build(BuildContext context) {
   Widget build(BuildContext context) {
     String imgStrSelect = widget.isImage && !widget.isTextFiled
     String imgStrSelect = widget.isImage && !widget.isTextFiled
         ? 'assets/calender_select.png'
         ? 'assets/calender_select.png'
@@ -993,11 +1015,11 @@ class _ButtonState extends State<CustomButton> {
                         _cancelNode.unfocus();
                         _cancelNode.unfocus();
                         int ddate = _getDdate(widget.model);
                         int ddate = _getDdate(widget.model);
                         String ddateSolt = _getDdateSolt(widget.model);
                         String ddateSolt = _getDdateSolt(widget.model);
-                        String pnum = _getPnum(widget.model);
-
+                        String pnum = widget.model.numController.text;
                         widget.model.getNewTableList(context, '${ddate}',
                         widget.model.getNewTableList(context, '${ddate}',
                             ddateSolt, pnum, widget.model.tableList);
                             ddateSolt, pnum, widget.model.tableList);
                       },
                       },
+
                       keyboardType: TextInputType.number,
                       keyboardType: TextInputType.number,
                     ),
                     ),
                   )
                   )