From cdc37623b27b2fed066e100a6517747d38905bfa Mon Sep 17 00:00:00 2001
From: wxc <191104855@qq.com>
Date: Mon, 1 Dec 2025 16:40:42 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=AE=A1=E8=AE=A1?=
 =?UTF-8?q?=E6=8A=A5=E5=91=8A=E7=8E=AF=E8=8A=82=E6=97=A0=E6=B3=95=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E9=99=84=E4=BB=B6=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .DS_Store                              | Bin 8196 -> 0 bytes
 src/components/reportAudit/end.vue     |  10 +++-------
 src/views/report/edit/controlPrice.vue |  22 +++++++++++++++++++---
 3 files changed, 22 insertions(+), 10 deletions(-)
 delete mode 100644 .DS_Store

diff --git a/.DS_Store b/.DS_Store
deleted file mode 100644
index e09b9e025335d062b7b281e27141416b318c357f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8196
zcmeI1Pmj_-7{=dO5R1F6kZ8iiq={D+ad#szUJ%)X2QQ1!gBolpvfV8mLR&B)B%Jj-
z_!YeRN&GIJ^qD`qY0GjohMh@f-kJ7&W;(xVr@V!TSSRtG5Y>ptLKe2Ni{hFj&WpU3
zcJz@dEQ6ltfP5O$gg8ytyv+eazz{G53;{#H5cnSm;GHd!wc)+5&YIE?Fa&NS0kJ>W
z$ilX@T`4QK4iqv3fGy&%OsFFckQ!Utwzex}r4)Ut=z(b|(;)^^a-6q?J8WCqm9k1s
zOv#Dqk(rKAm>eBCTe=f#D{D$azz|p`AY%6_Ih0V0s68FO#}rY6JY>{f1$^KJ+=aJz
zz+NCX{>X$H(LEYKts?)Bh7=0TM)i-J`VPJtgcxZ^U!XaIc1%HbMD{SJDM`%?nuy}8
zuedt4pSrq?uRD(>dL}>JN#I9uv-ykd6pFV>w=K)swLbRF_`DZ8aT0Z$>3h+7!+GFd
z)*bh)Kb-d~_h0fbcKmQSl>*-z!sWv|KlJ##!;{d9q_(F{SmkoLU#Tq?hppqfebj0#
z>-OT=VY6-@A3a?z%hrQOkDs6RFM@H%zY3(7gWl@su4-SE-%!iUY1W&D0S`w)guDlu
zT=MLLq^Knn2vS*2O!Sjp#VWqsI9SOGlq2{bK*eRdLFeGiDa`foJJ-Wru7?e}9dV`U
zkxS4e<YGLZ2H7#>z4kq`nknC{S<Td(a;sUUQ#t{KF1?0rU`4$gA@Mw=2^Fwb(>zD{
z1YP5`B?R@HbL{qMhC3?8z1)yHR7juE9-+0ir^%-w%?D6TG6c4mKtau|CgT5-&ENmG
zn1Gp@Az%owVz<}rfWzev&O8zkYum`5kVO)HD`lkwg$&1GWjGFd^@kzqHe7|Kt?f!#
T96|c$9|Fw#Uvf9a%_i^{FK}%Y

diff --git a/src/components/reportAudit/end.vue b/src/components/reportAudit/end.vue
index b6f9b50..d9c1d6e 100644
--- a/src/components/reportAudit/end.vue
+++ b/src/components/reportAudit/end.vue
@@ -6,20 +6,16 @@ import {listPolice} from "@/api/system/police";
 import {getList,save,delCommon} from '@/api/commonOpinions';
 import useCatchStore from "@/stores/modules/catch";
 import useUserStore from "@/stores/modules/user";
-const userStore = useUserStore();
-const props = defineProps(['dialog','reportId','node','isAudit',"isWarning"])
+
+const props = defineProps(['reportId','node','isAudit',"isWarning"])
 const emits = defineEmits(['submitFeedback',"closeFun"])
 
 const catchSotre = useCatchStore();
-const departs = catchSotre.getDeparts() ;
 const formData = ref({
   isInform:false,
   nextNode:'end'
 })
 const auditForm= ref()
-const dialog = ref(false);
-
-
 
 // 获取常用意见
 const commonList =ref([])
@@ -82,7 +78,7 @@ watch(()=>props.dialog,(val)=>{
 </script>
 
 <template>
-  <el-dialog title="提交审核" v-model="props.dialog" @close="closeAdd">
+  <el-dialog title="提交审核" @close="closeAdd">
     <el-form ref="auditForm" :model="formData" :label-width="120">
       <el-form-item label="通知报审人" prop="isInform">
         <el-radio-group v-model="formData.isInform">
diff --git a/src/views/report/edit/controlPrice.vue b/src/views/report/edit/controlPrice.vue
index d3cc40a..adccc09 100644
--- a/src/views/report/edit/controlPrice.vue
+++ b/src/views/report/edit/controlPrice.vue
@@ -160,7 +160,7 @@ const getDetailFun = async (val) => {
       }
     }
     // 定案表审核
-    if (formData.value.project.node === 'original') {
+    if (formData.value.project.node === 'original' || formData.value.project.node === 'audit') {
       rulesData.value.referenceNumber = [
         {required: true, message: '请输入文号', trigger: 'blur'}
       ];
@@ -453,6 +453,12 @@ const approveFun = async () => {
 }
 //结束
 const endFun =async ()=>{
+  try {
+    await formDataRef.value.validate()
+  } catch (error) {
+    feedback.msgWarning("请输入必填项");
+    return
+  }
   endDialog.value = true
   isAudit.value = true
 }
@@ -497,6 +503,16 @@ function FileTabShowFun (){
 
   return show;
 }
+
+function showSjbg() {
+  if(!formData.value.project.node){
+    return false;
+  }
+  const node =  formData.value.project.node;
+  const nodes = ['original', 'audit', 'end'];
+  return nodes.indexOf(node) > -1
+}
+
 //打开文件上传界面，记录文件上传行index
 const  upFileDialog =ref(false)
 let fileIndex = ref(0);
@@ -1197,7 +1213,7 @@ watch(()=>formData.value.review.thirdlyMoney,(val)=>{
             <el-tab-pane v-if="FileTabShowFun()" label="审核附件" name="audit"></el-tab-pane>
             <el-tab-pane v-if="formData.review?.isExploration === '1'" label="勘察附件" name="exploration"></el-tab-pane>
             <el-tab-pane v-if="formData.review?.isCross === '1'" label="对审附件" name="cross"></el-tab-pane>
-            <el-tab-pane v-if="formData.review?.isCross === '1'" label="审计报告" name="sjbg"></el-tab-pane>
+            <el-tab-pane v-if="showSjbg()" label="审计报告" name="sjbg"></el-tab-pane>
           </el-tabs>
           <el-table :data="formData.files[activeName]" preserve-expanded-content    style="z-index:9">
             <el-table-column type="expand">
@@ -1341,7 +1357,7 @@ watch(()=>formData.value.review.thirdlyMoney,(val)=>{
   <report-audit-reject @submitFeedback="submitFeedback" @closeFun="closeAudit" :node="formData.project.node"
                        :reportId="formData.project.id" :dialog="rejectDialog" :isAudit="false"></report-audit-reject>
   <report-audit-end  @submitFeedback="submitFeedback" @closeFun="closeAudit" :node="formData.project.node"
-                     :reportId="formData.project.id" :dialog="endDialog" :isAudit="true"
+                     :reportId="formData.project.id" v-model="endDialog" :isAudit="true"
   ></report-audit-end>
 </template>