diff --git a/src/views/modules/qc/qcPartAttribute.vue b/src/views/modules/qc/qcPartAttribute.vue index 33762b5..6357af2 100644 --- a/src/views/modules/qc/qcPartAttribute.vue +++ b/src/views/modules/qc/qcPartAttribute.vue @@ -1251,7 +1251,7 @@ - + 标签类型 @@ -1259,12 +1259,19 @@ - + + + + + + + + 保存 @@ -1450,6 +1457,7 @@ partNo: '', labelTypeTb: '', labelType: '', + operationDesc: '', defaultFlag: '', createBy: '', }, @@ -1936,6 +1944,19 @@ fixed: '', columnWidth: 120, }, + { + columnProp: 'operationDesc', + headerAlign: "center", + align: "left", + columnLabel: '工序', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 120, + }, { columnProp: 'defaultFlagDesc', headerAlign: "center", @@ -2170,7 +2191,7 @@ // 获取工序列表 loadOperationDescList() { const params = { - site: this.modalData.site + site: this.partCurrentRow.site || this.modalData.site } getAllOperationDescList(params).then(({data}) => { if (data && data.code === 0) { @@ -3065,9 +3086,11 @@ partNo: this.partCurrentRow.partNo, labelTypeTb: '', labelType: '', + operationDesc: '', defaultFlag: '', createdBy: this.$store.state.user.name, } + this.loadOperationDescList() this.labelTemplateModal = true this.labelTemplateDisableFlag = false }, @@ -3081,8 +3104,10 @@ partNo: row.partNo, labelTypeTb: row.labelTypeTb, labelType: row.labelType, + operationDesc: row.operationDesc || '', defaultFlag: row.defaultFlag, } + this.loadOperationDescList() this.labelTemplateModal = true this.labelTemplateDisableFlag = true },