duy 2 months ago
parent
commit
3232f85490

+ 5 - 3
src/views/tentative/detect/components/basicInfo.vue

@@ -278,7 +278,7 @@ const ids = ref(props.ids)
 const type = ref(props.type)
 
 const handleRefresh = () => {
-     getInfoData()
+     getInfoData(true)
 }
 const isShow = defineModel('modelValue', {
     default: false,
@@ -352,7 +352,7 @@ const oldReportNumber = ref('')//旧报告编号
 
 
 const infoLoad = ref(false)
-const getInfoData = async () => {
+const getInfoData = async (isReacquire) => {
 infoLoad.value = true
 
     const { error, code, data } = await codeApi.getBaseInfo({
@@ -360,6 +360,8 @@ infoLoad.value = true
         id: dataId.value,
         projectId: projectId.value,
         contractId: contractId.value,
+        isReacquire: isReacquire,
+   
         
     })
     //处理数据
@@ -547,7 +549,7 @@ const handleSave = async () => {
             handleSaveLoad.value = false
             if (!error && code === 200) {
                 window.$message.success(msg)
-                isShow.value = false
+                // isShow.value = false
                 dataId.value = data
                 emit('change', dataId.value)
               

+ 1 - 1
src/views/tentative/detect/components/linkAssociation.vue

@@ -34,7 +34,7 @@
                     <template #action="{ row }">
                         <el-link v-if="row.id === curId && isSelected" type="success" @click="rowCancel(row)">取消选择</el-link>
                         <!-- el-link v-else type="primary" :disabled="row.status !== 4" @click="rowSelect(row)">选择</el-link -->
-                        <el-link v-if="row.id !== curId || !isSelected" type="primary" :disabled="!row.testId" @click="rowSelect(row)">选择</el-link>
+                        <el-link v-if="row.id !== curId || !isSelected" type="primary" :disabled="row.testId" @click="rowSelect(row)">选择</el-link>
                     </template>
                 </hc-table>
                 <template #action>