|
@@ -392,9 +392,9 @@ const linksRelateModalSave = () => {
|
|
})
|
|
})
|
|
checkrelationString.value=idarr.toString()
|
|
checkrelationString.value=idarr.toString()
|
|
linksRelateModal.value = false
|
|
linksRelateModal.value = false
|
|
- }else{
|
|
|
|
- window.$message?.warning('请选择你要关联的数据')
|
|
|
|
}
|
|
}
|
|
|
|
+ linksRelateModal.value = false
|
|
|
|
+
|
|
|
|
|
|
|
|
|
|
}
|
|
}
|
|
@@ -440,7 +440,6 @@ const linksRawTableSelection = (rows) => {
|
|
}
|
|
}
|
|
|
|
|
|
const linksRawModalSave =async () => {
|
|
const linksRawModalSave =async () => {
|
|
- if(tableRawCheckedKeysid.value.length>0){
|
|
|
|
const { error, code, data } = await dataApi.rawMaterialSubmit({
|
|
const { error, code, data } = await dataApi.rawMaterialSubmit({
|
|
id: dataId,
|
|
id: dataId,
|
|
ids:tableRawCheckedKeysid.value,
|
|
ids:tableRawCheckedKeysid.value,
|
|
@@ -458,9 +457,6 @@ const linksRawModalSave =async () => {
|
|
else {
|
|
else {
|
|
window.$message?.warning(error)
|
|
window.$message?.warning(error)
|
|
}
|
|
}
|
|
- }else{
|
|
|
|
- window.$message?.warning('请选择要关联的报告')
|
|
|
|
- }
|
|
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
@@ -565,14 +561,12 @@ const linksSampleTableSelection = (rows) => {
|
|
//保存关联
|
|
//保存关联
|
|
const linksSampleModalSave = () => {
|
|
const linksSampleModalSave = () => {
|
|
const rows = tableSampleCheckedKeys.value
|
|
const rows = tableSampleCheckedKeys.value
|
|
- if (rows.length > 0) {
|
|
|
|
|
|
+
|
|
listItemBaseData.value.sampleIds = rowsToId(rows) || '';
|
|
listItemBaseData.value.sampleIds = rowsToId(rows) || '';
|
|
tableSampleRef.value?.clearSelection();
|
|
tableSampleRef.value?.clearSelection();
|
|
tableSampleCheckedKeys.value = [];
|
|
tableSampleCheckedKeys.value = [];
|
|
linksSampleModal.value = false
|
|
linksSampleModal.value = false
|
|
- } else {
|
|
|
|
- window.$message?.warning('请先勾选需要关联的记录')
|
|
|
|
- }
|
|
|
|
|
|
+
|
|
}
|
|
}
|
|
|
|
|
|
//关闭关联取样
|
|
//关闭关联取样
|