diff --git a/src/views/modules/yieldReport/com_process_inspection.vue b/src/views/modules/yieldReport/com_process_inspection.vue
index ac7f0fa..4b4ebdf 100644
--- a/src/views/modules/yieldReport/com_process_inspection.vue
+++ b/src/views/modules/yieldReport/com_process_inspection.vue
@@ -343,6 +343,10 @@ export default {
visible: {
type: Boolean,
default: false
+ },
+ orderNo: {
+ type: String,
+ default: ''
}
},
data() {
@@ -515,25 +519,6 @@ export default {
columnWidth: 100,
showOverflowTooltip: true
},
- {
- userId: this.$store.state.user.name,
- functionId: 301014,
- serialNumber: '301014Table1OrderNo',
- tableId: "301014Table1",
- tableName: "IPQC检验记录表",
- columnProp: 'orderNo',
- headerAlign: "center",
- align: "left",
- columnLabel: '工单号',
- columnHidden: false,
- columnImage: false,
- columnSortable: false,
- sortLv: 0,
- status: true,
- fixed: '',
- columnWidth: 150,
- showOverflowTooltip: true
- },
{
userId: this.$store.state.user.name,
functionId: 301014,
@@ -553,44 +538,6 @@ export default {
columnWidth: 200,
showOverflowTooltip: true
},
- {
- userId: this.$store.state.user.name,
- functionId: 301014,
- serialNumber: '301014Table1OperationDesc',
- tableId: "301014Table1",
- tableName: "IPQC检验记录表",
- columnProp: 'operationDesc',
- headerAlign: "center",
- align: "left",
- columnLabel: '工序',
- columnHidden: false,
- columnImage: false,
- columnSortable: false,
- sortLv: 0,
- status: true,
- fixed: '',
- columnWidth: 120,
- showOverflowTooltip: true
- },
- {
- userId: this.$store.state.user.name,
- functionId: 301014,
- serialNumber: '301014Table1ResourceDesc',
- tableId: "301014Table1",
- tableName: "IPQC检验记录表",
- columnProp: 'resourceDesc',
- headerAlign: "center",
- align: "left",
- columnLabel: '机台',
- columnHidden: false,
- columnImage: false,
- columnSortable: false,
- sortLv: 0,
- status: true,
- fixed: '',
- columnWidth: 120,
- showOverflowTooltip: true
- },
{
userId: this.$store.state.user.name,
functionId: 301014,
@@ -905,6 +852,10 @@ export default {
methods: {
// 初始化
init() {
+ // 设置订单号参数
+ if (this.orderNo) {
+ this.searchData.orderNo = this.orderNo
+ }
this.getDataList()
this.getSiteAndBuByUserName2()
this.getUmList()
diff --git a/src/views/modules/yieldReport/com_produce_report_normal.vue b/src/views/modules/yieldReport/com_produce_report_normal.vue
index d309299..bb2603d 100644
--- a/src/views/modules/yieldReport/com_produce_report_normal.vue
+++ b/src/views/modules/yieldReport/com_produce_report_normal.vue
@@ -728,7 +728,7 @@
@refreshPageData="refreshPageData">
-
+