duy 1 рік тому
батько
коміт
45a147b869

+ 4 - 0
src/views/transfer/components/conclusion/table-opinion.vue

@@ -93,6 +93,10 @@ const delClick = (row) => {
 const opinionClick = (row) => {
     emit('opinionTap', row)
 }
+
+defineExpose({
+    getTableData,
+})
 </script>
 
 <style lang="scss" scoped>

+ 9 - 4
src/views/transfer/writing-conclusion.vue

@@ -44,7 +44,7 @@
                 </el-container>
                 <el-aside id="hc_table_aside" class="hc-table-aside">
                     <HcCardItem title="抽检意见记录汇总:">
-                        <TableOpinion :contract-id="contractId" :project-id="projectId" @opinion-tap="tableOpinionTap" />
+                        <TableOpinion ref="tableOpinionRef" :contract-id="contractId" :project-id="projectId" @opinion-tap="tableOpinionTap" />
                     </HcCardItem>
                 </el-aside>
             </el-container>
@@ -84,6 +84,7 @@ import TableOpinion from './components/conclusion/table-opinion.vue'
 import TableScore from './components/conclusion/table-score.vue'
 import initialgApi from '~api/initial/initial'
 import writeApi from '~api/transfer/write-conclusion'
+import { isNullES } from 'js-fast-way'
 
 //变量
 const router = useRouter()
@@ -153,10 +154,11 @@ const tableOpinionTap = (row) => {
 }
 const onOpinionModalClose = () => {
     isOpinionModal.value = false
+    tableOpinionRef.value.getTableData()
 }
-
+const tableOpinionRef = ref(null)
 //抽检记录意见
-const opinionText = ref('水保方案未加盖公章XXXXX')
+const opinionText = ref('')
 const opinionTextEdit = ref(false)
 
 const opinionTextEditShow = () => {
@@ -176,8 +178,11 @@ const opinionTextEditHihe = async () => {
       
 
     }
-
+    if (isNullES(opinionText.value)) {
+        onOpinionModalClose()
+    }
     opinionTextEdit.value = false
+  
 }
 
 //编写报告