diff --git a/src/views/modules/qc/FAIResultEntry.vue b/src/views/modules/qc/FAIResultEntry.vue
index 4f1ff70..b545935 100644
--- a/src/views/modules/qc/FAIResultEntry.vue
+++ b/src/views/modules/qc/FAIResultEntry.vue
@@ -585,29 +585,29 @@
-
+
-
-
+
+
-
-
+
+
-
-
+
+
@@ -618,7 +618,7 @@
:current-page="pageIndex2"
:page-sizes="[20, 50, 100, 200, 500]"
:page-size="pageSize2"
- :total="totalPage2"
+ :total="tableData.length"
layout="total, sizes, prev, pager, next, jumper">
@@ -962,6 +962,16 @@
comQcItemImageUploadFile,
subDetailUpload
},
+ computed: {
+ templateTableData () {
+ let start = (this.pageIndex2 - 1) * this.pageSize2
+ let end = start + this.pageSize2
+ if (end > this.tableData.length){
+ end = this.tableData.length
+ }
+ return this.tableData.slice(start,end)
+ }
+ },
watch: {
detailList: {
deep: true,
@@ -3327,14 +3337,11 @@
// 子明细每页数
sizeChangeHandle2 (val) {
this.pageSize2 = val
- this.pageIndex2 = 1
- this.subDetailModal2()
},
// 子明细当前页
currentChangeHandle2 (val) {
this.pageIndex2 = val
- this.subDetailModal2()
},
// 多选
@@ -3543,14 +3550,10 @@
// 子明细记录信息查询
subDetailModal (row) {
this.subDetailData = row
- this.subDetailData.limit = this.pageSize2
- this.subDetailData.page = this.pageIndex2
+ this.pageIndex2 = 1
selectFAISubDetailedRecord(this.subDetailData).then(({data}) => {
if (data.code === 0) {
- this.tableData = data.page.list
- this.pageIndex2 = data.page.currPage
- this.pageSize2 = data.page.pageSize
- this.totalPage2 = data.page.totalCount
+ this.tableData = data.rows
}
})
this.batchAddData = {
@@ -3563,14 +3566,9 @@
// 子明细分页查询
subDetailModal2 () {
- this.subDetailData.limit = this.pageSize2
- this.subDetailData.page = this.pageIndex2
selectFAISubDetailedRecord(this.subDetailData).then(({data}) => {
if (data.code === 0) {
- this.tableData = data.page.list
- this.pageIndex2 = data.page.currPage
- this.pageSize2 = data.page.pageSize
- this.totalPage2 = data.page.totalCount
+ this.tableData = data.rows
}
})
},
@@ -3637,6 +3635,7 @@
//表格的新增
rowClassName ({ row, rowIndex }) {
row.xh = rowIndex + 1
+ row.rowI = this.tableData.indexOf(row) + 1
},
//单选框选中数据
@@ -3733,11 +3732,10 @@
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)
- }
- })
+ this.tableData.splice(this.tableData.indexOf(val), 1)
+ if (this.templateTableData.length === 0) {
+ this.pageIndex2--
+ }
})
this.$message({
message: "删除成功！",
diff --git a/src/views/modules/qc/FQCResultEntry.vue b/src/views/modules/qc/FQCResultEntry.vue
index 5cfe271..3e99850 100644
--- a/src/views/modules/qc/FQCResultEntry.vue
+++ b/src/views/modules/qc/FQCResultEntry.vue
@@ -514,29 +514,29 @@
-
+
-
-
+
+
-
-
+
+
-
-
+
+
@@ -547,7 +547,7 @@
:current-page="pageIndex2"
:page-sizes="[20, 50, 100, 200, 500]"
:page-size="pageSize2"
- :total="totalPage2"
+ :total="tableData.length"
layout="total, sizes, prev, pager, next, jumper">
@@ -939,6 +939,16 @@
comQcItemImageUploadFile,
subDetailUpload
},
+ computed: {
+ templateTableData () {
+ let start = (this.pageIndex2 - 1) * this.pageSize2
+ let end = start + this.pageSize2
+ if (end > this.tableData.length){
+ end = this.tableData.length
+ }
+ return this.tableData.slice(start,end)
+ }
+ },
watch: {
detailList: {
deep: true,
@@ -3301,14 +3311,11 @@
// 子明细每页数
sizeChangeHandle2 (val) {
this.pageSize2 = val
- this.pageIndex2 = 1
- this.subDetailModal2()
},
// 子明细当前页
currentChangeHandle2 (val) {
this.pageIndex2 = val
- this.subDetailModal2()
},
// 多选
@@ -3517,14 +3524,10 @@
// 子明细记录信息查询
subDetailModal (row) {
this.subDetailData = row
- this.subDetailData.limit = this.pageSize2
- this.subDetailData.page = this.pageIndex2
+ this.pageIndex2 = 1
selectFQCSubDetailedRecord(this.subDetailData).then(({data}) => {
if (data.code === 0) {
- this.tableData = data.page.list
- this.pageIndex2 = data.page.currPage
- this.pageSize2 = data.page.pageSize
- this.totalPage2 = data.page.totalCount
+ this.tableData = data.rows
}
})
this.batchAddData = {
@@ -3537,14 +3540,9 @@
// 子明细分页查询
subDetailModal2 () {
- this.subDetailData.limit = this.pageSize2
- this.subDetailData.page = this.pageIndex2
selectFQCSubDetailedRecord(this.subDetailData).then(({data}) => {
if (data.code === 0) {
- this.tableData = data.page.list
- this.pageIndex2 = data.page.currPage
- this.pageSize2 = data.page.pageSize
- this.totalPage2 = data.page.totalCount
+ this.tableData = data.rows
}
})
},
@@ -3612,6 +3610,7 @@
//表格的新增
rowClassName ({ row, rowIndex }) {
row.xh = rowIndex + 1
+ row.rowI = this.tableData.indexOf(row) + 1
},
//单选框选中数据
@@ -3708,17 +3707,15 @@
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);
- }
- })
+ this.tableData.splice(this.tableData.indexOf(val), 1)
+ if (this.templateTableData.length === 0) {
+ this.pageIndex2--
+ }
})
this.$message({
message: "删除成功！",
type: "success",
})
- //this.$refs.tb.clearSelection();
return
} else {
this.$message({
diff --git a/src/views/modules/qc/IPQCResultEntry.vue b/src/views/modules/qc/IPQCResultEntry.vue
index 41f1cbd..691d4a3 100644
--- a/src/views/modules/qc/IPQCResultEntry.vue
+++ b/src/views/modules/qc/IPQCResultEntry.vue
@@ -527,35 +527,35 @@
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
@@ -566,7 +566,7 @@
:current-page="pageIndex2"
:page-sizes="[20, 50, 100, 200, 500]"
:page-size="pageSize2"
- :total="totalPage2"
+ :total="tableData.length"
layout="total, sizes, prev, pager, next, jumper">
@@ -965,6 +965,16 @@
comQcItemImageUploadFile,
subDetailUpload
},
+ computed: {
+ templateTableData () {
+ let start = (this.pageIndex2 - 1) * this.pageSize2
+ let end = start + this.pageSize2
+ if (end > this.tableData.length){
+ end = this.tableData.length
+ }
+ return this.tableData.slice(start,end)
+ }
+ },
watch: {
detailList: {
deep: true,
@@ -3366,14 +3376,13 @@
// 子明细每页数
sizeChangeHandle2 (val) {
this.pageSize2 = val
- this.pageIndex2 = 1
- this.subDetailModal2()
+ //this.subDetailModal2()
},
// 子明细当前页
currentChangeHandle2 (val) {
this.pageIndex2 = val
- this.subDetailModal2()
+ //this.subDetailModal2()
},
// 多选
@@ -3589,14 +3598,10 @@
// 子明细记录信息查询
subDetailModal (row) {
this.subDetailData = row
- this.subDetailData.limit = this.pageSize2
- this.subDetailData.page = this.pageIndex2
+ this.pageIndex2 = 1
selectIPQCSubDetailedRecord(this.subDetailData).then(({data}) => {
if (data.code === 0) {
- this.tableData = data.page.list
- this.pageIndex2 = data.page.currPage
- this.pageSize2 = data.page.pageSize
- this.totalPage2 = data.page.totalCount
+ this.tableData = data.rows
}
})
this.batchAddData = {
@@ -3609,14 +3614,9 @@
// 子明细分页查询
subDetailModal2 () {
- this.subDetailData.limit = this.pageSize2
- this.subDetailData.page = this.pageIndex2
selectIPQCSubDetailedRecord(this.subDetailData).then(({data}) => {
if (data.code === 0) {
- this.tableData = data.page.list
- this.pageIndex2 = data.page.currPage
- this.pageSize2 = data.page.pageSize
- this.totalPage2 = data.page.totalCount
+ this.tableData = data.rows
}
})
},
@@ -3682,7 +3682,8 @@
// 子明细方法
// 表格的新增
rowClassName ({ row, rowIndex }) {
- row.xh = rowIndex + 1;
+ row.xh = rowIndex + 1
+ row.rowI = this.tableData.indexOf(row) + 1
},
// 单选框选中数据
@@ -3790,11 +3791,16 @@
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);
- }
- })
+ // 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--
+ }
})
this.$message({
message: "删除成功!",
diff --git a/src/views/modules/qc/IQCResultEntry.vue b/src/views/modules/qc/IQCResultEntry.vue
index edb2684..fbda773 100644
--- a/src/views/modules/qc/IQCResultEntry.vue
+++ b/src/views/modules/qc/IQCResultEntry.vue
@@ -447,29 +447,29 @@
-
+
-
-
+
+
-
-
+
+
-
-
+
+
@@ -480,7 +480,7 @@
:current-page="pageIndex2"
:page-sizes="[20, 50, 100, 200, 500]"
:page-size="pageSize2"
- :total="totalPage2"
+ :total="tableData.length"
layout="total, sizes, prev, pager, next, jumper">
@@ -670,6 +670,16 @@
comQcItemImageUploadFile,
subDetailUpload
},
+ computed: {
+ templateTableData () {
+ let start = (this.pageIndex2 - 1) * this.pageSize2
+ let end = start + this.pageSize2
+ if (end > this.tableData.length){
+ end = this.tableData.length
+ }
+ return this.tableData.slice(start,end)
+ }
+ },
watch: {
detailList: {
deep: true,
@@ -2246,14 +2256,11 @@
// 子明细每页数
sizeChangeHandle2 (val) {
this.pageSize2 = val
- this.pageIndex2 = 1
- this.subDetailModal2()
},
// 子明细当前页
currentChangeHandle2 (val) {
this.pageIndex2 = val
- this.subDetailModal2()
},
// 多选
@@ -2437,16 +2444,11 @@
// 子明细记录信息查询
subDetailModal (row) {
this.subDetailData = row
- this.subDetailData.limit = this.pageSize2
- this.subDetailData.page = this.pageIndex2
+ this.pageIndex2 = 1
selectIQCSubDetailedRecord(this.subDetailData).then(({data}) => {
if (data.code === 0) {
- this.tableData = data.page.list
- this.pageIndex2 = data.page.currPage
- this.pageSize2 = data.page.pageSize
- this.totalPage2 = data.page.totalCount
+ this.tableData = data.rows
}
- // this.tableData = data.rows
})
this.batchAddData = {
samplingLocation: '',
@@ -2458,14 +2460,9 @@
// 子明细分页查询
subDetailModal2 () {
- this.subDetailData.limit = this.pageSize2
- this.subDetailData.page = this.pageIndex2
selectIQCSubDetailedRecord(this.subDetailData).then(({data}) => {
if (data.code === 0) {
- this.tableData = data.page.list
- this.pageIndex2 = data.page.currPage
- this.pageSize2 = data.page.pageSize
- this.totalPage2 = data.page.totalCount
+ this.tableData = data.rows
}
})
},
@@ -2611,6 +2608,7 @@
// 表格的新增
rowClassName ({ row, rowIndex }) {
row.xh = rowIndex + 1
+ row.rowI = this.tableData.indexOf(row) + 1
},
// 单选框选中数据
@@ -2710,11 +2708,10 @@
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)
- }
- })
+ this.tableData.splice(this.tableData.indexOf(val), 1)
+ if (this.templateTableData.length === 0) {
+ this.pageIndex2--
+ }
})
this.$message({
message: "删除成功！",