取消委托单修改

src/views/tentative/detect/components/basicInfo.vue

@@ -196,7 +196,7 @@
             </div>
         </hc-new-dialog>
         <!-- 关联委托单 -->
-        <LinkAssociation v-model="isLinksAssociation" :cid="contractId" :ids="ids" @change="commissionChange" @close="isLinksAssociation = false" />
+        <LinkAssociation v-model="isLinksAssociation" :cid="contractId" :ids="basicInfoData.entrustId" @change="commissionChange" @close="isLinksAssociation = false" />
 
         <!-- 引用设备仪器 -->
         <hc-new-dialog v-model="deviceModal" is-table save-text="确认引用" title="引用设备仪器" widths="84%" :loading="deviceLoad" @close="deviceModalClose" @save="deviceModalSave">
@@ -512,7 +512,11 @@ const isLinksAssociation = ref(false)
 //委托单确定选择
 const commissionChange = (id, data, entrustNo) => {
 console.log(id, data)
-
+if (!id) {
+    basicInfoData.value.entrustNo = ''
+     basicInfoData.value.entrustId = ''
+     return
+}
     basicInfoData.value.entrustNo = entrustNo
      basicInfoData.value.entrustId = id
      getYPbyCommission(id)

src/views/tentative/detect/components/linkAssociation.vue

@@ -32,9 +32,9 @@
                         <el-tag v-if="row.status === 4" type="success" effect="dark">委托完成</el-tag>
                     </template>
                     <template #action="{ row }">
-                        <el-link v-if="row.id === curId && isSelected" type="success" @click="rowCancel(row)">取消选择</el-link>
+                        <el-link v-if="row.id === curId" 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 " type="primary" :disabled="row.testId" @click="rowSelect(row)">选择</el-link>
                     </template>
                 </hc-table>
                 <template #action>
@@ -196,10 +196,13 @@ const rowSelect = async ({ id, entrustNo }) => {
 
 //取消选择
 const rowCancel = () => {
+    curId.value = null
+
     currentId.value = null
          entrustNoVal.value = ''
     formModel.value = {}
         isSelected.value = false // 清除选中状态
+            emit('change', curId.value, formModel.value, entrustNoVal.value)
 }
 const isSelected = ref(false) // 新增状态变量
 //确认关联取样材料