|
@@ -588,7 +588,7 @@ export default {
|
|
|
this.ruleForm.createTime = row.createTime
|
|
|
this.ruleForm.assayConfigId = row.assayConfigId
|
|
|
// this.tableData = row.assayResultDetails
|
|
|
- this.getAssayData(row.assayConfigId, row.assayResultDetails)
|
|
|
+ this.getAssayData(row.assayConfigId, row.assayResultDetails, row.createTime)
|
|
|
},
|
|
|
|
|
|
// 修改弹窗
|
|
@@ -616,7 +616,7 @@ export default {
|
|
|
this.ruleForm.createTime = row.createTime
|
|
|
// this.tableData = row.assayResultDetails
|
|
|
this.ruleForm.assayConfigId = row.assayConfigId
|
|
|
- this.getAssayData(row.assayConfigId, row.assayResultDetails)
|
|
|
+ this.getAssayData(row.assayConfigId, row.assayResultDetails, row.createTime)
|
|
|
},
|
|
|
|
|
|
// 提交修改数据
|
|
@@ -832,7 +832,7 @@ export default {
|
|
|
},
|
|
|
|
|
|
// 通过id查询化验想配置数据
|
|
|
- getAssayData(val, tableData) {
|
|
|
+ getAssayData(val, tableData, createTime) {
|
|
|
let tableDataObj = {}
|
|
|
if (tableData && tableData.length) {
|
|
|
tableDataObj = tableData.reduce((current, next) => {
|
|
@@ -854,9 +854,9 @@ export default {
|
|
|
})
|
|
|
valueObj[`value${item.id}`] = ''
|
|
|
})
|
|
|
- const end = +(moment().endOf('month').format('DD'))
|
|
|
+ const end = +(moment(createTime).endOf('month').format('DD'))
|
|
|
for (let i = 1; i <= end; i++) {
|
|
|
- const dateTime = moment().format('YYYY-MM') + '-' + String(i).padStart(2, '0')
|
|
|
+ const dateTime = moment(createTime).format('YYYY-MM') + '-' + String(i).padStart(2, '0')
|
|
|
this.tableData.push({
|
|
|
assayTime: dateTime,
|
|
|
isEdit: false,
|