diff --git a/src/views/modules/rohs/rohsRecord.vue b/src/views/modules/rohs/rohsRecord.vue
index cb3b114..7bd2a0b 100644
--- a/src/views/modules/rohs/rohsRecord.vue
+++ b/src/views/modules/rohs/rohsRecord.vue
@@ -6,29 +6,35 @@
-
+
-
-
-
-
-
+
+
+
-
-
-
-
-
+
+
+
-
+
-
+
+
+ Waiting for HSF update
+
+
+
查询
新增
@@ -111,6 +122,7 @@
{{ normalizeDateOnly(scope.row.expiryDate) }}
+
编辑
@@ -1292,10 +1304,10 @@
-
+
-
+
-
+
+
+
+
+
+
+
@@ -1653,8 +1671,9 @@ export default {
site: this.$store.state.user.site,
referenceNo: '',
status: '',
- rohsStatus: '',
isExpiring: '',
+ expiryStartDate: '',
+ expiryEndDate: '',
currentApprover: '',
nodeId: '',
ifsPartNo: '',
@@ -2173,6 +2192,7 @@ export default {
expiredDate: '',
validUntilValue: null,
validUntil: '',
+ rohsStatus: '',
expiryDate: ''
},
hsfStandardDefaultText: 'With the follow environmental specification: Macallan regulated Substances specification(069-0135) /Macallan sustainable fiber specification(099-00532)',
@@ -2260,9 +2280,9 @@ export default {
this.handleRouteQuery()
}
this.$nextTick(() => {
- this.height = window.innerHeight / 2 - 30
+ this.height = window.innerHeight / 2 - 60
/*第二个表格高度的动态调整*/
- this.secondHeight = window.innerHeight / 2 - 186
+ this.secondHeight = window.innerHeight / 2 - 188
})
},
activated () {
@@ -3122,6 +3142,7 @@ export default {
expiredDate: this.normalizeDateOnly(this.modalData.expiredDate),
validUntilValue: validUntilValue,
validUntil: String(this.modalData.validUntil || '').trim(),
+ rohsStatus: String(this.modalData.rohsStatus || 'Active').trim() || 'Active',
expiryDate: ''
}
this.syncUpdateExpiryDateByRule()
@@ -3143,12 +3164,14 @@ export default {
: this.updateExpiryForm.validUntilValue
)
const validUntil = String(latestData.validUntil || this.updateExpiryForm.validUntil || '').trim()
+ const rohsStatus = String(latestData.rohsStatus || this.updateExpiryForm.rohsStatus || this.modalData.rohsStatus || 'Active').trim() || 'Active'
const expiryDate = this.normalizeDateOnly(latestData.expiryDate || this.updateExpiryForm.expiryDate)
const isExpiring = String(latestData.isExpiring || this.modalData.isExpiring || 'N').trim().toUpperCase() === 'Y' ? 'Y' : 'N'
this.$set(this.modalData, 'expiredDate', expiredDate)
this.$set(this.modalData, 'validUntilValue', validUntilValue)
this.$set(this.modalData, 'validUntil', validUntil)
+ this.$set(this.modalData, 'rohsStatus', rohsStatus)
this.$set(this.modalData, 'expiryDate', expiryDate)
this.$set(this.modalData, 'isExpiring', isExpiring)
@@ -3156,6 +3179,7 @@ export default {
this.$set(this.currentRow, 'expiredDate', expiredDate)
this.$set(this.currentRow, 'validUntilValue', validUntilValue)
this.$set(this.currentRow, 'validUntil', validUntil)
+ this.$set(this.currentRow, 'rohsStatus', rohsStatus)
this.$set(this.currentRow, 'expiryDate', expiryDate)
this.$set(this.currentRow, 'isExpiring', isExpiring)
}
@@ -3164,6 +3188,7 @@ export default {
this.$set(target, 'expiredDate', expiredDate)
this.$set(target, 'validUntilValue', validUntilValue)
this.$set(target, 'validUntil', validUntil)
+ this.$set(target, 'rohsStatus', rohsStatus)
this.$set(target, 'expiryDate', expiryDate)
this.$set(target, 'isExpiring', isExpiring)
}
@@ -3176,6 +3201,7 @@ export default {
const expiredDate = this.normalizeDateOnly(this.updateExpiryForm.expiredDate)
const validUntilValue = this.normalizeValidUntilValue(this.updateExpiryForm.validUntilValue)
const validUntil = String(this.updateExpiryForm.validUntil || '').trim()
+ const rohsStatus = String(this.updateExpiryForm.rohsStatus || '').trim()
if (!expiredDate) {
this.$message.warning('报告日期不能为空')
return
@@ -3188,6 +3214,10 @@ export default {
this.$message.warning('有效期单位不能为空')
return
}
+ if (!rohsStatus) {
+ this.$message.warning('状态不能为空')
+ return
+ }
const expiryDate = this.calculateExpiryDateByRule(expiredDate, validUntilValue, validUntil)
if (!expiryDate) {
this.$message.warning('有效期信息不完整，无法计算失效日期')
@@ -3196,6 +3226,7 @@ export default {
this.$set(this.updateExpiryForm, 'expiredDate', expiredDate)
this.$set(this.updateExpiryForm, 'validUntilValue', validUntilValue)
this.$set(this.updateExpiryForm, 'validUntil', validUntil)
+ this.$set(this.updateExpiryForm, 'rohsStatus', rohsStatus)
this.$set(this.updateExpiryForm, 'expiryDate', expiryDate)
const params = {
@@ -3203,7 +3234,8 @@ export default {
referenceNo: this.modalData.referenceNo,
expiredDate: expiredDate,
validUntilValue: validUntilValue,
- validUntil: validUntil
+ validUntil: validUntil,
+ rohsStatus: rohsStatus
}
this.updateExpiryLoading = true
api.updateRohsExpiryInfo(params).then(({data}) => {
@@ -3579,8 +3611,9 @@ export default {
menuId: this.menuId,
referenceNo: this.searchData.referenceNo,
status: this.searchData.status,
- rohsStatus: this.searchData.rohsStatus,
isExpiring: this.searchData.isExpiring,
+ expiryStartDate: this.searchData.expiryStartDate,
+ expiryEndDate: this.searchData.expiryEndDate,
currentApprover: this.searchData.currentApprover,
nodeId: this.searchData.nodeId,
ifsPartNo: this.searchData.ifsPartNo,
@@ -3747,9 +3780,17 @@ export default {
},
async createExportData () {
const params = {
- ...this.searchData,
site: this.$store.state.user.site,
menuId: this.menuId,
+ referenceNo: this.searchData.referenceNo,
+ status: this.searchData.status,
+ isExpiring: this.searchData.isExpiring,
+ expiryStartDate: this.searchData.expiryStartDate,
+ expiryEndDate: this.searchData.expiryEndDate,
+ currentApprover: this.searchData.currentApprover,
+ nodeId: this.searchData.nodeId,
+ ifsPartNo: this.searchData.ifsPartNo,
+ materialDesc: this.searchData.materialDesc,
page: 1,
limit: -1
}
@@ -3862,6 +3903,7 @@ export default {
expiredDate: '',
validUntilValue: null,
validUntil: '',
+ rohsStatus: '',
expiryDate: ''
}
this.rejectOpinion = ''