From d9f9c4ec823bfccdddfdcfb8b7a928819eff5abb Mon Sep 17 00:00:00 2001
From: wxc <191104855@qq.com>
Date: Wed, 15 Apr 2026 18:31:58 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=20=E4=BF=AE=E5=A4=8D=E6=B6=89=E8=AF=89?=
 =?UTF-8?q?=E6=B6=89=E8=AF=89=E5=88=9D=E6=A0=B8=E5=8A=9E=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/negative/dialog.vue            |  6 +--
 .../negative/verify-description.vue           |  3 +-
 src/components/negative/verify-sfss.vue       | 44 ++++++++-----------
 src/components/negative/verify.vue            |  8 +---
 4 files changed, 25 insertions(+), 36 deletions(-)

diff --git a/src/components/negative/dialog.vue b/src/components/negative/dialog.vue
index c120137..eb9cf44 100644
--- a/src/components/negative/dialog.vue
+++ b/src/components/negative/dialog.vue
@@ -487,7 +487,7 @@ const displayFlowActions = computed(() => {
     if (currentComplaintStage.value === STAGE_INITIAL) {
         return [
             {
-                actionKey: FlowActionEnum.SAVE,
+                actionKey: 'SAVE_INITIAL_REVIEW',
                 buttonLabel: "保存信息",
                 buttonType: "primary",
                 plain: true,
@@ -640,7 +640,7 @@ async function handleExecute(action, data) {
         return;
     }
     if (action.validateForm) {
-        if (action.actionKey !== FlowActionEnum.SAVE) {
+        if (action.actionKey !== FlowActionEnum.SAVE && action.actionKey !== 'SAVE_INITIAL_REVIEW') {
             try {
                 data = await componentRef.value.validate();
             } catch (e) {
@@ -682,7 +682,7 @@ async function handleExecute(action, data) {
         verifyEditFlag.value = false;
     }
     try {
-        if (isComplaintReport.value && action.actionKey === FlowActionEnum.SAVE) {
+        if (isComplaintReport.value && action.actionKey === 'SAVE_INITIAL_REVIEW') {
             const formData = componentRef.value.getData();
             await submitSaveInvolveJson(formData);
             feedback.msgSuccess("操作成功");
diff --git a/src/components/negative/verify-description.vue b/src/components/negative/verify-description.vue
index 208f4c9..9a1fcb5 100644
--- a/src/components/negative/verify-description.vue
+++ b/src/components/negative/verify-description.vue
@@ -393,7 +393,8 @@ const activeNames = ref([
     "involved_department",
     "completionAttachment",
     "completed",
-    "mail"
+    "mail",
+    "initialReview"
 ]);
 let negative = inject("negative");
 const COMPLAINT_REPORT_SOURCE_TYPE = "2";
diff --git a/src/components/negative/verify-sfss.vue b/src/components/negative/verify-sfss.vue
index dc6a47d..f08a60d 100644
--- a/src/components/negative/verify-sfss.vue
+++ b/src/components/negative/verify-sfss.vue
@@ -255,7 +255,11 @@ const createHandlePolice = (): HandlePolice => ({
   mobile: "",
 });
 
-const createForm = (): VerifySfssForm => ({
+const currentRow = computed(() => sourceNegative?.value?.currentRow || {});
+
+const createForm = (): VerifySfssForm => 
+ {
+ return {
   complaintId: "",
   processingStage: STAGE_INITIAL,
   caseNumber: "",
@@ -269,23 +273,23 @@ const createForm = (): VerifySfssForm => ({
   initWorkDes: "",
   initProblemPlan: "",
   initVerdict: "",
-  completionStatus: "",
-  publicRecognition: "",
+  completionStatus: currentRow.completionStatus,
+  publicRecognition: currentRow.publicRecognition,
   handlePolices: [createHandlePolice()],
   files: [],
   blames: [],
   blameLeaders: [],
-});
+}
+ }
+;
 
 const form = ref<VerifySfssForm>(createForm());
-const currentRow = computed(() => sourceNegative?.value?.currentRow || {});
-const isInitialStage = computed(() => form.value.processingStage === STAGE_INITIAL);
+
+const isInitialStage = computed(() => {
+  return form.value.processingStage === STAGE_INITIAL
+});
 const initialRemainingDuration = computed(() =>
-  Number(
-    sourceNegative?.value?.remainingDuration ??
-      currentRow.value?.remainingDuration ??
-      0
-  )
+  currentRow.value?.remainingDuration
 );
 const showPetitionFields = computed(() =>
   [
@@ -296,7 +300,6 @@ const showPetitionFields = computed(() =>
   ].includes(sourceNegative?.value?.problemSourcesCode)
 );
 
-debugger
 const negative = computed(() => ({
   ...(sourceNegative?.value || {}),
   ...clone(form.value),
@@ -328,18 +331,7 @@ function clone<T>(value: T): T {
 }
 
 function getStageBySource(row: Record<string, any>) {
-  const hasInitialReviewData =
-    Boolean(row?.gwf2) ||
-    Boolean(row?.initWorkDes) ||
-    Boolean(row?.initProblemPlan) ||
-    Boolean(row?.initVerdict);
-
-  return sourceNegative?.value?.checkStatusCode ||
-    sourceNegative?.value?.completionStatus ||
-    row?.completionStatus ||
-    sourceNegative?.value?.publicRecognition ||
-    row?.publicRecognition ||
-    hasInitialReviewData
+  return row?.gwf3 === '1'
     ? STAGE_COMPLETION
     : STAGE_INITIAL;
 }
@@ -418,10 +410,10 @@ function mergeVerifyForm(verifyForm: Record<string, any> = {}) {
     currentRow.value?.thirdDepartName ||
     currentRow.value?.secondDepartName ||
     "";
-
+  debugger
   return {
-    ...verifyForm,
     ...baseForm,
+    ...verifyForm,
     complaintId,
     involveDepartId,
     involveDepartName,
diff --git a/src/components/negative/verify.vue b/src/components/negative/verify.vue
index 1dcde98..75822e3 100644
--- a/src/components/negative/verify.vue
+++ b/src/components/negative/verify.vue
@@ -101,7 +101,7 @@
                 v-if="
                     problemIsTrue &&
                     form.isRectifyCode === IsRectify.NOT &&
-                    (form.checkStatusCode === '1' || form.checkStatusCode === '2' || form.checkStatusCode === '3')
+                    problemIsTrue
                 "
             >
                 <el-form-item
@@ -143,7 +143,7 @@
                 message: '请输入未整改原因',
                 trigger: ['blur'],
             }"
-            v-if="
+            v-if="problemIsTrue &&
                 (form.isRectifyCode === '0' || form.isRectifyCode === '2')
             "
         >
@@ -1663,10 +1663,6 @@ const problemIsTrue = computed(() => {
 
 getFormData();
 
-watch(negative, () => {
-    getFormData();
-});
-
 async function getFormData() {
     form.value = {
         involveDepartId: negative.value.involveDepartId,