|
@ -76,7 +76,14 @@ |
|
|
</el-col> |
|
|
</el-col> |
|
|
<el-col :span="12"> |
|
|
<el-col :span="12"> |
|
|
<el-form-item label="检验时间" prop="inspectionTime"> |
|
|
<el-form-item label="检验时间" prop="inspectionTime"> |
|
|
<el-input v-model="data.inspectionTime" placeholder="请填写检验时间" /> |
|
|
<!-- <el-input v-model="data.inspectionTime" placeholder="请填写检验时间" /> --> |
|
|
|
|
|
<el-date-picker |
|
|
|
|
|
v-model="data.inspectionTime" |
|
|
|
|
|
type="datetime" |
|
|
|
|
|
placeholder="请选择检验时间" |
|
|
|
|
|
style="width: 100%" |
|
|
|
|
|
value-format="x" |
|
|
|
|
|
/> |
|
|
</el-form-item> |
|
|
</el-form-item> |
|
|
</el-col> |
|
|
</el-col> |
|
|
<el-col :span="12"> |
|
|
<el-col :span="12"> |
|
@ -729,9 +736,6 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any |
|
|
allSamplePieceSize.value = 0 //打开时候归0 |
|
|
allSamplePieceSize.value = 0 //打开时候归0 |
|
|
if (row) { |
|
|
if (row) { |
|
|
data.value = JSON.parse(JSON.stringify(row)) |
|
|
data.value = JSON.parse(JSON.stringify(row)) |
|
|
// nextTick(() => { |
|
|
|
|
|
// formMainRef.value.setValues(row) |
|
|
|
|
|
// }) |
|
|
|
|
|
let list = await InspectionRecordDetail.getInspectionRecordDetailList(data.value.id) |
|
|
let list = await InspectionRecordDetail.getInspectionRecordDetailList(data.value.id) |
|
|
await processList( data.value,list) |
|
|
await processList( data.value,list) |
|
|
} else { |
|
|
} else { |
|
@ -758,7 +762,7 @@ const processList =async (InspectionSchemeObj,list) => { |
|
|
editableTabsValue.value = 1 |
|
|
editableTabsValue.value = 1 |
|
|
list.forEach((item, index) => { |
|
|
list.forEach((item, index) => { |
|
|
item.name = index + 1 |
|
|
item.name = index + 1 |
|
|
item.inspectionJobCharacteristicsUpdateReqVO = item.inspectionJobCharacteristicsRespVO |
|
|
item.inspectionJobCharacteristicsUpdateReqVO = item.inspectionRecordCharacteristicsRespVO |
|
|
item.isPass = '' //判断是否显示对号错误图标 |
|
|
item.isPass = '' //判断是否显示对号错误图标 |
|
|
// 总数量值是 样品份数 乘 每份样品量 |
|
|
// 总数量值是 样品份数 乘 每份样品量 |
|
|
allSamplePieceSize.value += parseFloat( |
|
|
allSamplePieceSize.value += parseFloat( |
|
@ -768,6 +772,8 @@ const processList =async (InspectionSchemeObj,list) => { |
|
|
).toFixed(6) |
|
|
).toFixed(6) |
|
|
) |
|
|
) |
|
|
rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true |
|
|
rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true |
|
|
|
|
|
item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = item.inspectionJobCharacteristicsUpdateReqVO.featureType == 1 ? item.inspectionJobCharacteristicsUpdateReqVO.qualitativeRespVOList : item.inspectionJobCharacteristicsUpdateReqVO.quantifyRespVOList |
|
|
|
|
|
|
|
|
if (!item?.inspectionJobCharacteristicsUpdateReqVO?.recordInspectionQuantifyList) { |
|
|
if (!item?.inspectionJobCharacteristicsUpdateReqVO?.recordInspectionQuantifyList) { |
|
|
// 单个录入时 |
|
|
// 单个录入时 |
|
|
if (item?.inspectionJobCharacteristicsUpdateReqVO?.resultEntryMethod == 2) { |
|
|
if (item?.inspectionJobCharacteristicsUpdateReqVO?.resultEntryMethod == 2) { |
|
@ -933,14 +939,13 @@ const validateForm = (formRef) => { |
|
|
} |
|
|
} |
|
|
const submitForm = async () => { |
|
|
const submitForm = async () => { |
|
|
try { |
|
|
try { |
|
|
|
|
|
|
|
|
await formMainRef.value.validate() |
|
|
await formMainRef.value.validate() |
|
|
|
|
|
|
|
|
const bol2 = await validateForm(formFeaturesRef.value) |
|
|
const bol2 = await validateForm(formFeaturesRef.value) |
|
|
if (!bol2) { |
|
|
if (!bol2) { |
|
|
message.error(`模板中有检验工序和检验特性未填写完全`) |
|
|
message.error(`模板中有检验工序和检验特性未填写完全`) |
|
|
return |
|
|
return |
|
|
} |
|
|
} |
|
|
|
|
|
debugger |
|
|
// 判断数组是否有未填的选项 |
|
|
// 判断数组是否有未填的选项 |
|
|
let arrBol = [] |
|
|
let arrBol = [] |
|
|
let isOutweigh = [] //结束时间是否大于开始时间 |
|
|
let isOutweigh = [] //结束时间是否大于开始时间 |
|
|