From 9b9d0348c26c05e061403a1f2c211ac595c1d84b Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Fri, 9 Aug 2024 16:59:25 +0800
Subject: [PATCH] =?UTF-8?q?2024-08-09=20=E5=8A=9F=E8=83=BD=E4=BC=98?=
=?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/common/login-token.vue | 1 +
src/views/modules/qc/FAIResultEntry.vue | 10 +--
src/views/modules/qc/FQCResultEntry.vue | 10 +--
src/views/modules/qc/IPQCResultEntry.vue | 10 +--
src/views/modules/qc/IQCResultEntry.vue | 10 +--
src/views/modules/qc/sub_detail_upload.vue | 2 +-
src/views/modules/report/FAI_report.vue | 86 ++++++++++++++++++++--
src/views/modules/report/FQC_report.vue | 86 ++++++++++++++++++++--
src/views/modules/report/IPQC_report.vue | 86 ++++++++++++++++++++--
src/views/modules/report/IQC_report.vue | 76 ++++++++++++++++++-
10 files changed, 329 insertions(+), 48 deletions(-)
diff --git a/src/views/common/login-token.vue b/src/views/common/login-token.vue
index 4530e49..0910a04 100644
--- a/src/views/common/login-token.vue
+++ b/src/views/common/login-token.vue
@@ -110,6 +110,7 @@
site: this.urlParam.site,
buNo: this.urlParam.buNo,
docNo: this.urlParam.docNo,
+ itemResult: this.urlParam.itemResult,
type: "tokenLogin",
}
})
diff --git a/src/views/modules/qc/FAIResultEntry.vue b/src/views/modules/qc/FAIResultEntry.vue
index f39a76a..f4aaf97 100644
--- a/src/views/modules/qc/FAIResultEntry.vue
+++ b/src/views/modules/qc/FAIResultEntry.vue
@@ -593,7 +593,7 @@
@selection-change="handleDetailSelectionChange"
style="width: 100%;">
-
+
@@ -985,13 +985,13 @@
detailList: {
deep: true,
handler: function (newV, oldV) {
- let num = 0
+ let num2 = 0
for (let i = 0; i < this.detailList.length; i++) {
if (this.detailList[i].itemResult === 'N') {
- num++
+ num2++
}
}
- this.detailData.unqualifiedQty = num
+ this.detailData.unqualifiedQty = num2
}
},
},
@@ -3679,7 +3679,7 @@
//表格的新增
rowClassName ({ row, rowIndex }) {
row.xh = rowIndex + 1
- row.rowI = this.tableData.indexOf(row) + 1
+ row.num = this.tableData.indexOf(row) + 1
},
//单选框选中数据
diff --git a/src/views/modules/qc/FQCResultEntry.vue b/src/views/modules/qc/FQCResultEntry.vue
index 1bf0d2a..d0af3d2 100644
--- a/src/views/modules/qc/FQCResultEntry.vue
+++ b/src/views/modules/qc/FQCResultEntry.vue
@@ -521,7 +521,7 @@
@selection-change="handleDetailSelectionChange"
style="width: 100%;">
-
+
@@ -961,13 +961,13 @@
detailList: {
deep: true,
handler: function (newV, oldV) {
- let num = 0
+ let num2 = 0
for (let i = 0; i < this.detailList.length; i++) {
if (this.detailList[i].itemResult === 'N') {
- num++
+ num2++
}
}
- this.detailData.unqualifiedQty = num
+ this.detailData.unqualifiedQty = num2
}
},
},
@@ -3653,7 +3653,7 @@
//表格的新增
rowClassName ({ row, rowIndex }) {
row.xh = rowIndex + 1
- row.rowI = this.tableData.indexOf(row) + 1
+ row.num = this.tableData.indexOf(row) + 1
},
//单选框选中数据
diff --git a/src/views/modules/qc/IPQCResultEntry.vue b/src/views/modules/qc/IPQCResultEntry.vue
index 90d86b3..878f1b6 100644
--- a/src/views/modules/qc/IPQCResultEntry.vue
+++ b/src/views/modules/qc/IPQCResultEntry.vue
@@ -535,7 +535,7 @@
@selection-change="handleDetailSelectionChange"
style="width: 100%;">
-
+
@@ -988,13 +988,13 @@
detailList: {
deep: true,
handler: function (newV, oldV) {
- let num = 0
+ let num2 = 0
for (let i = 0; i < this.detailList.length; i++) {
if (this.detailList[i].itemResult === 'N') {
- num++
+ num2++
}
}
- this.detailData.unqualifiedQty = num
+ this.detailData.unqualifiedQty = num2
}
},
},
@@ -3740,7 +3740,7 @@
// 表格的新增
rowClassName ({ row, rowIndex }) {
row.xh = rowIndex + 1
- row.rowI = this.tableData.indexOf(row) + 1
+ row.num = this.tableData.indexOf(row) + 1
},
// 单选框选中数据
diff --git a/src/views/modules/qc/IQCResultEntry.vue b/src/views/modules/qc/IQCResultEntry.vue
index 37b39b1..ad08666 100644
--- a/src/views/modules/qc/IQCResultEntry.vue
+++ b/src/views/modules/qc/IQCResultEntry.vue
@@ -466,7 +466,7 @@
@selection-change="handleDetailSelectionChange"
style="width: 100%;">
-
+
@@ -704,13 +704,13 @@
detailList: {
deep: true,
handler: function (newV, oldV) {
- let num = 0
+ let num2 = 0
for (let i = 0; i < this.detailList.length; i++) {
if (this.detailList[i].itemResult === 'N') {
- num++
+ num2++
}
}
- this.detailData.unqualifiedQty = num
+ this.detailData.unqualifiedQty = num2
}
},
},
@@ -2682,7 +2682,7 @@
// 表格的新增
rowClassName ({ row, rowIndex }) {
row.xh = rowIndex + 1
- row.rowI = this.tableData.indexOf(row) + 1
+ row.num = this.tableData.indexOf(row) + 1
},
// 单选框选中数据
diff --git a/src/views/modules/qc/sub_detail_upload.vue b/src/views/modules/qc/sub_detail_upload.vue
index 80c8e06..d0c3750 100644
--- a/src/views/modules/qc/sub_detail_upload.vue
+++ b/src/views/modules/qc/sub_detail_upload.vue
@@ -98,6 +98,7 @@ export default {
this.$refs.uploadFile.clearFiles()
// 关闭窗口并刷新页面
//this.closeDialog()
+ this.fileList = []
this.visible = false
} else {
let message = data.msg.split(';')
@@ -106,7 +107,6 @@ export default {
dangerouslyUseHTMLString: true
})
}
- this.fileList = []
})
},
diff --git a/src/views/modules/report/FAI_report.vue b/src/views/modules/report/FAI_report.vue
index 6fd87cc..4edbfa0 100644
--- a/src/views/modules/report/FAI_report.vue
+++ b/src/views/modules/report/FAI_report.vue
@@ -26,18 +26,29 @@
+
+
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
@@ -72,6 +78,12 @@
+
+
+
+
+
+
-
@@ -243,6 +255,9 @@
limit: 10,
seqNo: '',
states: [],
+ operatorName: '',
+ responsiblePersonName: '',
+ itemResult: ''
},
pageIndex: 1,
pageSize: 20,
@@ -704,6 +719,42 @@
fixed: '',
columnWidth: 100,
},
+ {
+ userId: this.$store.state.user.name,
+ functionId: 107001003,
+ serialNumber: '107001003Table1OperatorName',
+ tableId: "107001003Table1",
+ tableName: "FAI报表",
+ columnProp: 'operatorName',
+ headerAlign: "center",
+ align: "left",
+ columnLabel: '协同人员',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: '',
+ columnWidth: 200,
+ },
+ {
+ userId: this.$store.state.user.name,
+ functionId: 107001003,
+ serialNumber: '107001003Table1ResponsiblePersonName',
+ tableId: "107001003Table1",
+ tableName: "FAI报表",
+ columnProp: 'responsiblePersonName',
+ headerAlign: "center",
+ align: "left",
+ columnLabel: '责任人',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: '',
+ columnWidth: 200,
+ },
{
userId: this.$store.state.user.name,
functionId: 107001003,
@@ -866,6 +917,24 @@
fixed: '',
columnWidth: 100,
},
+ {
+ userId: this.$store.state.user.name,
+ functionId: 107001003,
+ serialNumber: '107001003Table1ItemResultDesc',
+ tableId: "107001003Table1",
+ tableName: "FAI报表",
+ columnProp: 'itemResultDesc',
+ headerAlign: "center",
+ align: "center",
+ columnLabel: '项目检验结论',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: '',
+ columnWidth: 100,
+ },
],
SubDetailColumnList: [
{
@@ -944,6 +1013,7 @@
if (this.$route.params.type === 'tokenLogin') {
this.searchData.buNo = this.$route.params.buNo
this.searchData.inspectionNo = this.$route.params.docNo
+ this.searchData.itemResult = this.$route.params.itemResult
}
this.getDataList()
},
diff --git a/src/views/modules/report/FQC_report.vue b/src/views/modules/report/FQC_report.vue
index 2d3311a..618260e 100644
--- a/src/views/modules/report/FQC_report.vue
+++ b/src/views/modules/report/FQC_report.vue
@@ -26,18 +26,29 @@
+
+
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
@@ -72,6 +78,12 @@
+
+
+
+
+
+
-
@@ -243,6 +255,9 @@
limit: 10,
seqNo: '',
states: [],
+ operatorName: '',
+ responsiblePersonName: '',
+ itemResult: ''
},
pageIndex: 1,
pageSize: 20,
@@ -704,6 +719,42 @@
fixed: '',
columnWidth: 100,
},
+ {
+ userId: this.$store.state.user.name,
+ functionId: 107001004,
+ serialNumber: '107001004Table1OperatorName',
+ tableId: "107001004Table1",
+ tableName: "FQC报表",
+ columnProp: 'operatorName',
+ headerAlign: "center",
+ align: "left",
+ columnLabel: '协同人员',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: '',
+ columnWidth: 200,
+ },
+ {
+ userId: this.$store.state.user.name,
+ functionId: 107001004,
+ serialNumber: '107001004Table1ResponsiblePersonName',
+ tableId: "107001004Table1",
+ tableName: "FQC报表",
+ columnProp: 'responsiblePersonName',
+ headerAlign: "center",
+ align: "left",
+ columnLabel: '责任人',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: '',
+ columnWidth: 200,
+ },
{
userId: this.$store.state.user.name,
functionId: 107001004,
@@ -866,6 +917,24 @@
fixed: '',
columnWidth: 100,
},
+ {
+ userId: this.$store.state.user.name,
+ functionId: 107001004,
+ serialNumber: '107001004Table1ItemResultDesc',
+ tableId: "107001004Table1",
+ tableName: "FQC报表",
+ columnProp: 'itemResultDesc',
+ headerAlign: "center",
+ align: "center",
+ columnLabel: '项目检验结论',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: '',
+ columnWidth: 100,
+ },
],
SubDetailColumnList: [
{
@@ -944,6 +1013,7 @@
if (this.$route.params.type === 'tokenLogin') {
this.searchData.buNo = this.$route.params.buNo
this.searchData.inspectionNo = this.$route.params.docNo
+ this.searchData.itemResult = this.$route.params.itemResult
}
this.getDataList()
},
diff --git a/src/views/modules/report/IPQC_report.vue b/src/views/modules/report/IPQC_report.vue
index d6056c4..e40ceee 100644
--- a/src/views/modules/report/IPQC_report.vue
+++ b/src/views/modules/report/IPQC_report.vue
@@ -26,11 +26,14 @@
+
+
+
-
+
-
-
+
+
@@ -38,6 +41,14 @@
+
+
+
+
+
+
+
+
@@ -56,11 +67,6 @@
-
-
-
-
-
@@ -80,6 +86,12 @@
+
+
+
+
+
+
-
@@ -248,6 +260,9 @@
limit: 10,
seqNo: '',
states: [],
+ operatorName: '',
+ responsiblePersonName: '',
+ itemResult: ''
},
pageIndex: 1,
pageSize: 20,
@@ -709,6 +724,42 @@
fixed: '',
columnWidth: 170,
},
+ {
+ userId: this.$store.state.user.name,
+ functionId: 107001002,
+ serialNumber: '107001002Table1OperatorName',
+ tableId: "107001002Table1",
+ tableName: "IPQC报表",
+ columnProp: 'operatorName',
+ headerAlign: "center",
+ align: "left",
+ columnLabel: '协同人员',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: '',
+ columnWidth: 200,
+ },
+ {
+ userId: this.$store.state.user.name,
+ functionId: 107001002,
+ serialNumber: '107001002Table1ResponsiblePersonName',
+ tableId: "107001002Table1",
+ tableName: "IPQC报表",
+ columnProp: 'responsiblePersonName',
+ headerAlign: "center",
+ align: "left",
+ columnLabel: '责任人',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: '',
+ columnWidth: 200,
+ },
{
userId: this.$store.state.user.name,
functionId: 107001002,
@@ -871,6 +922,24 @@
fixed: '',
columnWidth: 100,
},
+ {
+ userId: this.$store.state.user.name,
+ functionId: 107001002,
+ serialNumber: '107001002Table1ItemResultDesc',
+ tableId: "107001002Table1",
+ tableName: "IPQC报表",
+ columnProp: 'itemResultDesc',
+ headerAlign: "center",
+ align: "center",
+ columnLabel: '项目检验结论',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: '',
+ columnWidth: 100,
+ },
],
SubDetailColumnList: [
{
@@ -967,6 +1036,7 @@
if (this.$route.params.type === 'tokenLogin') {
this.searchData.buNo = this.$route.params.buNo
this.searchData.inspectionNo = this.$route.params.docNo
+ this.searchData.itemResult = this.$route.params.itemResult
}
this.getDataList()
},
diff --git a/src/views/modules/report/IQC_report.vue b/src/views/modules/report/IQC_report.vue
index ae972ec..b6246cc 100644
--- a/src/views/modules/report/IQC_report.vue
+++ b/src/views/modules/report/IQC_report.vue
@@ -44,10 +44,10 @@
-
+
-
+
@@ -64,6 +64,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
-
@@ -271,7 +283,10 @@
poItemNo: '',
orderType: '',
states: [],
- submissionType: ''
+ submissionType: '',
+ operatorName: '',
+ responsiblePersonName: '',
+ itemResult: ''
},
pageIndex: 1,
pageSize: 20,
@@ -769,6 +784,42 @@
fixed: '',
columnWidth: 100,
},
+ {
+ userId: this.$store.state.user.name,
+ functionId: 107001001,
+ serialNumber: '107001001Table1OperatorName',
+ tableId: "107001001Table1",
+ tableName: "IQC报表",
+ columnProp: 'operatorName',
+ headerAlign: "center",
+ align: "left",
+ columnLabel: '协同人员',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: '',
+ columnWidth: 200,
+ },
+ {
+ userId: this.$store.state.user.name,
+ functionId: 107001001,
+ serialNumber: '107001001Table1ResponsiblePersonName',
+ tableId: "107001001Table1",
+ tableName: "IQC报表",
+ columnProp: 'responsiblePersonName',
+ headerAlign: "center",
+ align: "left",
+ columnLabel: '责任人',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: '',
+ columnWidth: 200,
+ },
{
userId: this.$store.state.user.name,
functionId: 107001001,
@@ -931,6 +982,24 @@
fixed: '',
columnWidth: 100,
},
+ {
+ userId: this.$store.state.user.name,
+ functionId: 107001001,
+ serialNumber: '107001001Table1ItemResultDesc',
+ tableId: "107001001Table1",
+ tableName: "IQC报表",
+ columnProp: 'itemResultDesc',
+ headerAlign: "center",
+ align: "center",
+ columnLabel: '项目检验结论',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: '',
+ columnWidth: 100,
+ },
],
SubDetailColumnList: [
{
@@ -1010,6 +1079,7 @@
if (this.$route.params.type === 'tokenLogin') {
this.searchData.buNo = this.$route.params.buNo
this.searchData.inspectionNo = this.$route.params.docNo
+ this.searchData.itemResult = this.$route.params.itemResult
}
this.getDataList()
},