留样修改

src/views/tentative/detect/test.vue

@@ -332,7 +332,7 @@
         </hc-new-dialog>
 
         <!-- 排序弹窗 -->
-        <hc-new-dialog v-model="sortDialog" title="排序" widths="38rem" :loading="sortLoading" @close="closeSort" @save="sortClick">
+        <hc-new-dialog v-model="sortDialog" title="排序" widths="38rem" @close="closeSort" @save="sortClick">
             <div>
                 <el-radio-group v-model="sortType">
                     <el-radio :value="1">记录/报告编号(升序)</el-radio>
@@ -1138,8 +1138,11 @@ const onmousedown = () => {
 
 //关联查阅
 const isRelatedSearch = ref(false)
+const relatedId = ref('')
 const relatedSearchClick = (row) => {
     isRelatedSearch.value = true
+    relatedId.value = row.id
+
     //获取样品信息
     getSampleList(row.id)
     //获取委托单
@@ -1161,7 +1164,7 @@ const relatedColumn1 = [
     { key: 'userName', name: '取样人' },
     { key: 'carryTime', name: '入库时间', align: 'center' },
     { key: 'createTime', name: '试验时间', align: 'center' },
-    { key: 'sampleProcessing', name: '样品处理' },
+     { key: 'sampleProcessing', name: '样品处理' },
     { key: 'sampleProcessingResult', name: '时间(或处理原因)' },
 ]
 const relatedData1 = ref([])
@@ -1348,6 +1351,7 @@ const setRelatedColumn3 = (type) => {
 
 //关闭关联查阅
 const relatedSearchModalClose = () => {
+         getTableData().then()
     isRelatedSearch.value = false
     relatedData1.value = []
     relatedData2.value = []
@@ -1379,11 +1383,26 @@ const formRules = {
 const disposeModal = ref(false)
 const rowDispose = () => {
     disposeModal.value = true
+    formTime.value = []
+
     const rows = relatedData1.value
-    formModel.value = {
-        id: arrToId(rows),
-        repealType: 1,
-    }
+    const { sampleProcessing, sampleProcessingResult } = rows[0]
+ 
+  console.log(sampleProcessing, 'sampleProcessing')
+  if (sampleProcessing === '留样') {
+    formModel.value.repealType = 2
+     formTime.value = [sampleProcessingResult.split('至')[0], sampleProcessingResult.split('至')[1]]
+     formModel.value.resamStartTime = sampleProcessingResult.split('至')[0]
+     formModel.value.resamEndTime = sampleProcessingResult.split('至')[1]
+  } else {
+    formModel.value.repealType = 1
+     formModel.value.repealReason = sampleProcessingResult
+
+  }
+
+  
+ 
+    
 }
 
 //日期时间被选择
@@ -1409,7 +1428,9 @@ const disposeSave = async () => {
     if (!error && code === 200) {
         window.$message.success('提交成功')
         disposeClose()
-        getTableData().then()
+         //获取样品信息
+        getSampleList(relatedId.value)
+   
     } else {
         window.$message.error(msg || '操作失败')
     }
@@ -1475,23 +1496,9 @@ const closeSort = ()=>{
     sortDialog.value = false
     sortType.value = ''
 }
-const sortLoading = ref(false)
-const sortClick = async ()=>{
-    sortLoading.value = true
-    const { error, code, data } = await dataApi.updateSort({
-    
-        nodeId:searchForm.value.nodeId,
-        type:searchForm.value.type,
-        sortType:sortType.value,
-        contractId: contractId.value,
-    })
-    //处理数据
-    sortLoading.value = false
-    if (!error && code === 200) {
-           sortDialog.value = false
-       getTableData()
-
-    } 
+const sortClick = ()=>{
+    getTableData().then()
+    sortDialog.value = false
 
 
 }