数据补录更新

src/widgets/DataRerecords/css/style.scss

@@ -443,9 +443,9 @@
     top: 78px !important
 }
 
+
 //数据补录弹窗
 .sjblpopup {
-    overflow: auto;
     height: 100%;
     width: 100%;
 
@@ -484,6 +484,10 @@
             margin: 0 80px;
             font-size: 12px;
             color: #495057;
+
+            div {
+                padding: 5px 0;
+            }
         }
 
         .sjbl-infoSets {
@@ -503,7 +507,9 @@
     }
 
     .sjblpopup-djinfo {
-        height: 310px;
+        // height: 310px;
+        overflow: auto;
+        height: calc(100% - 190px);
         width: 100%;
         padding-left: 30px;
         padding-right: 20px;
@@ -567,7 +573,7 @@
         width: 100%;
 
         .dataTables_scroll {
-            height: 260px;
+            // height: 240px;
 
             .dataName {
                 max-width: 248px !important;
@@ -580,7 +586,7 @@
         }
 
         .dataTables_scrollBody {
-            height: calc(100% - 50px) !important;
+            height: calc(100% - 60px) !important;
 
             tr {
                 font-size: 14px;
@@ -603,6 +609,8 @@
             // position: absolute;
             display: flex;
             margin-left: 0;
+            position: absolute;
+            bottom: 92px;
         }
 
         .information {

src/widgets/DataRerecords/dataRerecords.ts

@@ -24,8 +24,9 @@ class dataRerecords {
             return
         }
         this.code = code
-        this.global.popup.setSize(800, 550);
+        this.global.popup.setSize(800, 600);
         const popup = this.global.popup.show("数据补录", this.initTemplat());
+        $('.content-btn').css('display', 'none')
         this.popup = popup
         this.initEvent(popup)
         this.pbsInfoInit(popup)
@@ -88,17 +89,18 @@ class dataRerecords {
     }
     rerecordData(id) {
         let data = {
-            isweb: true,
+            isWeb: true,
             dataType: this.popup.domObj.find("input[name='dataType']:checked").val(),//照片类型
             fileUIds: [id],
             tdCode: this.tdtechId,//工艺
             pdCode: this.pdtechId,//工序
             partCode: this.pipeId,//部件编码
-            pbsCode: this.pbsCode
+            pbsCode: this.pbsCode,//pbs编码
         }
         this.global.baseAjaxSend.sendAjax(this.global, data, this.nodeOrPipe === 'POINT' ? this.newpsnodeSupplementUrl : this.newpspipeSupplementUrl, "POST", result => {
             if (result.code !== -1) {
                 this.global.toast.show('补录数据成功')
+                this.global.showScanPhotos(true);//页面数据刷新
             } else {
                 this.global.toast.show('补录数据失败')
             }
@@ -331,8 +333,8 @@ class dataRerecords {
             },
             columns: columns,//表头
             ordering: false,//排序
-            paging: true,//分页
-            pageLength: 4,
+            paging: false,//分页
+            // pageLength: 5,
             info: true,//页面信息
             searching: true,//搜索           
             scrollCollapse: false,
@@ -351,8 +353,10 @@ class dataRerecords {
                     }
                     return {
                         tdtechId: that.tdtechId,
-                        current: that.dataTable != null ? that.dataTable.page.info().page + 1 : 1,
-                        size: that.dataTable != null ? that.dataTable.page.info().length : 4,
+                        // current: that.dataTable != null ? that.dataTable.page.info().page + 1 : 1,
+                        // size: that.dataTable != null ? that.dataTable.page.info().length : 5,
+                        current: 1,
+                        size: 999
                     }
                 },
                 url: that.global.apiRoot + '/tofly-sxgk/procedurenew/page',