|
@@ -136,7 +136,7 @@
|
|
|
</HcDialog>
|
|
|
|
|
|
<!--关联试验数据-->
|
|
|
- <HcDialog :show="CTDModal" title="关联试验数据" widths="84%" :footer="false" >
|
|
|
+ <HcDialog :show="CTDModal" title="关联试验数据" widths="84%" :footer="false" @close="CTDModal = false">
|
|
|
<div class="adding-form-dialog-box">
|
|
|
<div class="dialog-tree-box">
|
|
|
<el-scrollbar>
|
|
@@ -307,12 +307,12 @@
|
|
|
<div class="dialog-table">
|
|
|
<HcTable ref="dialogTableRef" :loading="filedialogTableLoading" :column="filedialogTableColumn" :datas="filedialogTableData" isCheck @selection-change="filedialogTableSelection" v-if="fileModalradio==1">
|
|
|
<template #name="{row}">
|
|
|
- <span :class="[row.isSelectedStatus===0?'text-green':'']" @click="filetableRowName(row)">{{row?.recordNo}}</span>
|
|
|
+ <span :class="[row.isSelectedStatus===1?'text-green':'']" @click="filetableRowName(row)">{{row?.recordNo}}</span>
|
|
|
</template>
|
|
|
</HcTable>
|
|
|
<HcTable ref="dialogTableRef" :loading="filedialogTableLoading" :column="filedialogTableColumn1" :datas="filedialogTableData" isCheck @selection-change="filedialogTableSelection" v-else>
|
|
|
<template #name="{row}">
|
|
|
- <span :class="[row.isSelectedStatus===0?'':'text-green']" @click="filetableRowName(row)">{{row?.recordNo}}</span>
|
|
|
+ <span :class="[row.isSelectedStatus===1?'text-green':'']" @click="filetableRowName(row)">{{row?.recordNo}}</span>
|
|
|
</template>
|
|
|
</HcTable>
|
|
|
</div>
|
|
@@ -962,10 +962,13 @@ const handleMenuSelect = ({key}) => {
|
|
|
specialModalShow()
|
|
|
} else if (key === 'CTD') {
|
|
|
CTDModal.value = true
|
|
|
+ CTDbetweenTime.value=[]
|
|
|
+ CTDdialogTableData1.value=[]
|
|
|
}else if(key === 'file'){
|
|
|
fileModal.value=true;
|
|
|
fileModalradio.value=1
|
|
|
- // getTreeDatas()
|
|
|
+ filedialogTableData.value=[]
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -1094,9 +1097,12 @@ const ElTreeLoadNode = async (node, resolve) => {
|
|
|
defaultExpandedCids.value = defaultExpandedArr
|
|
|
if (node.level === 0) {
|
|
|
emit('nodeLoading')
|
|
|
+ if(resData.length<=0){
|
|
|
+ window?.$message?.warning('该项目未使用试验系统,无法获取数据')
|
|
|
+ }
|
|
|
}
|
|
|
resolve(resData)
|
|
|
- console.log(resData,'resData');
|
|
|
+
|
|
|
//最后一个,执行点击
|
|
|
if (clickKey) {
|
|
|
await nextTick(() => {
|
|
@@ -1197,6 +1203,7 @@ const getfileNodeData = async ()=>{
|
|
|
size: filesearchFormPage.value.size,
|
|
|
startTime:filesearchFormPage.value.startTime,
|
|
|
endTime:filesearchFormPage.value.lastTime,
|
|
|
+ qualityTestPKeyId:isPrimaryKeyId.value
|
|
|
})
|
|
|
//处理数据
|
|
|
if (!error && code === 200) {
|