2024-08-28

检验明细导出

src/views/modules/qc/FAIResultEntry.vue

@@ -589,6 +589,8 @@
           :height="400"
           :data="templateTableData"
           border
+          v-loading="subDetailLoading"
+          element-loading-text="拼命加载中"
           :row-class-name="rowClassName"
           @selection-change="handleDetailSelectionChange"
           style="width: 100%;">
@@ -2379,7 +2381,8 @@
           buNo: '',
           inspectionNo: ''
         },
-        fileLoading: false
+        fileLoading: false,
+        subDetailLoading: false
       }
     },
 
@@ -3531,12 +3534,16 @@
 
       // 子明细记录信息查询
       subDetailModal (row) {
+        this.subDetailLoading = true
         this.subDetailData = row
         this.pageIndex2 = 1
         selectFAISubDetailedRecord(this.subDetailData).then(({data}) => {
           if (data.code === 0) {
             this.tableData = data.rows
           }
+          this.subDetailLoading = false
+        }).catch(()=>{
+          this.subDetailLoading = false
         })
         this.batchAddData = {
           samplingLocation: '',

src/views/modules/qc/FQCResultEntry.vue

@@ -517,6 +517,8 @@
           :height="400"
           :data="templateTableData"
           border
+          v-loading="subDetailLoading"
+          element-loading-text="拼命加载中"
           :row-class-name="rowClassName"
           @selection-change="handleDetailSelectionChange"
           style="width: 100%;">
@@ -2353,7 +2355,8 @@
           buNo: '',
           inspectionNo: ''
         },
-        fileLoading: false
+        fileLoading: false,
+        subDetailLoading: false
       }
     },
 
@@ -3504,12 +3507,16 @@
 
       // 子明细记录信息查询
       subDetailModal (row) {
+        this.subDetailLoading = true
         this.subDetailData = row
         this.pageIndex2 = 1
         selectFQCSubDetailedRecord(this.subDetailData).then(({data}) => {
           if (data.code === 0) {
             this.tableData = data.rows
           }
+          this.subDetailLoading = false
+        }).catch(()=>{
+          this.subDetailLoading = false
         })
         this.batchAddData = {
           samplingLocation: '',

src/views/modules/qc/IPQCResultEntry.vue

@@ -531,6 +531,8 @@
           :height="400"
           :data="templateTableData"
           border
+          v-loading="subDetailLoading"
+          element-loading-text="拼命加载中"
           :row-class-name="rowClassName"
           @selection-change="handleDetailSelectionChange"
           style="width: 100%;">
@@ -2426,7 +2428,8 @@
           buNo: '',
           inspectionNo: ''
         },
-        fileLoading: false
+        fileLoading: false,
+        subDetailLoading: false
       }
     },
 
@@ -3368,13 +3371,11 @@
       // 子明细每页数
       sizeChangeHandle2 (val) {
         this.pageSize2 = val
-        //this.subDetailModal2()
       },
 
       // 子明细当前页
       currentChangeHandle2 (val) {
         this.pageIndex2 = val
-        //this.subDetailModal2()
       },
 
       // 多选
@@ -3587,12 +3588,16 @@
 
       // 子明细记录信息查询
       subDetailModal (row) {
+        this.subDetailLoading = true
         this.subDetailData = row
         this.pageIndex2 = 1
         selectIPQCSubDetailedRecord(this.subDetailData).then(({data}) => {
           if (data.code === 0) {
             this.tableData = data.rows
           }
+          this.subDetailLoading = false
+        }).catch(()=>{
+          this.subDetailLoading = false
         })
         this.batchAddData = {
           samplingLocation: '',
@@ -3805,12 +3810,6 @@
                   if (action === "confirm") {
                     let val = this.checkedDetail
                     val.forEach((val, index) => {
-                      // this.tableData.forEach((v, i) => {
-                      //   if (val.xh === v.xh) {
-                      //     this.tableData.splice(i, 1);
-                      //   }
-                      // })
-                      // console.log(this.tableData.indexOf(val))
                       this.tableData.splice(this.tableData.indexOf(val), 1)
                       if (this.templateTableData.length === 0) {
                         this.pageIndex2--

src/views/modules/qc/IQCResultEntry.vue

@@ -434,6 +434,8 @@
           :height="400"
           :data="templateTableData"
           border
+          v-loading="subDetailLoading"
+          element-loading-text="拼命加载中"
           :row-class-name="rowClassName"
           @selection-change="handleDetailSelectionChange"
           style="width: 100%;">
@@ -1775,7 +1777,8 @@
           buNo: '',
           inspectionNo: ''
         },
-        fileLoading: false
+        fileLoading: false,
+        subDetailLoading: false
       }
     },
 
@@ -2454,12 +2457,16 @@
 
       // 子明细记录信息查询
       subDetailModal (row) {
+        this.subDetailLoading = true
         this.subDetailData = row
         this.pageIndex2 = 1
         selectIQCSubDetailedRecord(this.subDetailData).then(({data}) => {
           if (data.code === 0) {
             this.tableData = data.rows
           }
+          this.subDetailLoading = false
+        }).catch(()=>{
+          this.subDetailLoading = false
         })
         this.batchAddData = {
           samplingLocation: '',

src/views/modules/report/IPQC_detail_report.vue

@@ -529,10 +529,10 @@ export default {
           {
             userId: this.$store.state.user.name,
             functionId: 107001004,
-            serialNumber: '107001004Table1UmId',
+            serialNumber: '107001004Table1UmName',
             tableId: "107001004Table1",
             tableName: "IPQC明细报表",
-            columnProp: 'umId',
+            columnProp: 'umName',
             headerAlign: "center",
             align: "left",
             columnLabel: '计量单位',
@@ -652,6 +652,24 @@ export default {
             fixed: '',
             columnWidth: 170,
           },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 107001004,
+            serialNumber: '107001004Table1InspectorName',
+            tableId: "107001004Table1",
+            tableName: "IPQC明细报表",
+            columnProp: 'inspectorName',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '质检员',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100,
+          },
           {
             userId: this.$store.state.user.name,
             functionId: 107001004,