diff --git a/src/views/modules/qc/qcPartAttribute.vue b/src/views/modules/qc/qcPartAttribute.vue index f8bfcaf..e164af3 100644 --- a/src/views/modules/qc/qcPartAttribute.vue +++ b/src/views/modules/qc/qcPartAttribute.vue @@ -21,9 +21,6 @@ - - - @@ -163,6 +160,23 @@ + + + + 启用物料活性期管理 + + + + + + + + + + + + + @@ -292,6 +306,8 @@ + + @@ -588,8 +604,6 @@ - - @@ -1253,7 +1267,10 @@ standardValue: '', defaultValue: '', maxValue: '', - minValue: '' + minValue: '', + adhesiveActivePeriodFlag: '', + thawingDuration: '', + accumulatedExposureDuration: '' }, detailData: { site: '', @@ -1369,24 +1386,6 @@ fixed: '', columnWidth: 300, }, - { - userId: this.$store.state.user.name, - functionId: 301003, - serialNumber: '301003Table1CinvSourceCode', - tableId: "301003Table1", - tableName: "物料属性设置表", - columnProp: 'cinvSourceCode', - headerAlign: "center", - align: "center", - columnLabel: 'PN', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 120, - }, { userId: this.$store.state.user.name, functionId: 301003, @@ -1426,10 +1425,10 @@ { userId: this.$store.state.user.name, functionId: 301003, - serialNumber: '301003Table1Umid', + serialNumber: '301003Table1UmName', tableId: "301003Table1", tableName: "物料属性设置表", - columnProp: 'umId', + columnProp: 'umName', headerAlign: "center", align: "left", columnLabel: '单位', @@ -1441,24 +1440,6 @@ fixed: '', columnWidth: 100, }, - { - userId: this.$store.state.user.name, - functionId: 301003, - serialNumber: '301003Table1ExemptInspection', - tableId: "301003Table1", - tableName: "物料属性设置表", - columnProp: 'exemptInspection', - 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: 301003, @@ -2089,7 +2070,10 @@ standardValue: row.standardValue, defaultValue: row.defaultValue, maxValue: row.maxValue, - minValue: row.minValue + minValue: row.minValue, + adhesiveActivePeriodFlag: row.adhesiveActivePeriodFlag, + thawingDuration: row.thawingDuration, + accumulatedExposureDuration: row.accumulatedExposureDuration } this.modalDisableFlag = false this.modalFlag = true @@ -2132,7 +2116,10 @@ standardValue: row.standardValue, defaultValue: row.defaultValue, maxValue: row.maxValue, - minValue: row.minValue + minValue: row.minValue, + adhesiveActivePeriodFlag: row.adhesiveActivePeriodFlag, + thawingDuration: row.thawingDuration, + accumulatedExposureDuration: row.accumulatedExposureDuration } this.modalDisableFlag = true this.modalFlag = true