细节修改

2026-07-08 08:37:05 +08:00
parent fa7be38e7f
commit 2de0a12d44
4 changed files with 104 additions and 39 deletions
@@ -707,15 +707,15 @@
                    <a-radio-group
                      v-model:value="detailState.isInvolveHongKongMacaoTaiwan"
                    >
-                      <a-radio :value="true">是</a-radio>
-                      <a-radio :value="false">否</a-radio>
+                      <a-radio value="1">是</a-radio>
+                      <a-radio value="0">否</a-radio>
                    </a-radio-group>
                  </div>
                  <div class="boolean-row">
                    <span>是否公开招标</span>
                    <a-radio-group v-model:value="detailState.isPublicTender">
-                      <a-radio :value="true">是</a-radio>
-                      <a-radio :value="false">否</a-radio>
+                      <a-radio value="1">是</a-radio>
+                      <a-radio value="0">否</a-radio>
                    </a-radio-group>
                  </div>
                  <div class="boolean-row">
@@ -723,8 +723,8 @@
                    <a-radio-group
                      v-model:value="detailState.isForeignRelatedSubject"
                    >
-                      <a-radio :value="true">是</a-radio>
-                      <a-radio :value="false">否</a-radio>
+                      <a-radio value="1">是</a-radio>
+                      <a-radio value="0">否</a-radio>
                    </a-radio-group>
                  </div>
                  <div
@@ -735,22 +735,22 @@
                    <a-radio-group
                      v-model:value="detailState.isIncludedInCurrentYearBudget"
                    >
-                      <a-radio :value="true">是</a-radio>
-                      <a-radio :value="false">否</a-radio>
+                      <a-radio value="1">是</a-radio>
+                      <a-radio value="0">否</a-radio>
                    </a-radio-group>
                  </div>
                  <div class="boolean-row">
                    <span>是否共享</span>
                    <a-radio-group v-model:value="detailState.isShared">
-                      <a-radio :value="true">是</a-radio>
-                      <a-radio :value="false">否</a-radio>
+                      <a-radio value="1">是</a-radio>
+                      <a-radio value="0">否</a-radio>
                    </a-radio-group>
                  </div>
                  <div class="boolean-row">
                    <span>是否重大合同</span>
                    <a-radio-group v-model:value="detailState.isMajorContract">
-                      <a-radio :value="true">是</a-radio>
-                      <a-radio :value="false">否</a-radio>
+                      <a-radio value="1">是</a-radio>
+                      <a-radio value="0">否</a-radio>
                    </a-radio-group>
                  </div>
                  <div class="boolean-row">
@@ -1043,12 +1043,9 @@ function normalizeFileItem(item = {}) {
 }

 function normalizeBooleanValue(value) {
-  if (value === true || value === false) return value;
-  if (value === 1 || value === "1" || value === "Y" || value === "true")
-    return true;
-  if (value === 0 || value === "0" || value === "N" || value === "false")
-    return false;
-  return false;
+  if (value === 1 || value === "1" || value === true || value === "Y" || value === "true")
+    return "1";
+  return "0";
 }

 function pickBooleanSource(source = {}, key) {
@@ -1405,12 +1402,12 @@ function createContractFormData() {
      counterpartyList: [],
    },
    isSingleAgreement: "0",
-    isInvolveHongKongMacaoTaiwan: false,
-    isPublicTender: false,
-    isForeignRelatedSubject: false,
-    isIncludedInCurrentYearBudget: false,
-    isShared: false,
-    isMajorContract: false,
+    isInvolveHongKongMacaoTaiwan: "0",
+    isPublicTender: "0",
+    isForeignRelatedSubject: "0",
+    isIncludedInCurrentYearBudget: "0",
+    isShared: "0",
+    isMajorContract: "0",
    needAmendments: "0",
    extraAmounts: {
      depositEnabled: false,
@@ -2172,9 +2169,9 @@ function validateSubmit() {
  // 以下为 pushContract 必填项补充校验（接口文档要求）
  if (detailState.value.isMajorContract === undefined || detailState.value.isMajorContract === null || detailState.value.isMajorContract === "")
    return "请选择是否重大合同";
-  if (detailState.value.isPublicTender === undefined || detailState.value.isPublicTender === null)
+  if (detailState.value.isPublicTender === undefined || detailState.value.isPublicTender === null || detailState.value.isPublicTender === "")
    return "请选择是否公开招标";
-  if (detailState.value.isInvolveHongKongMacaoTaiwan === undefined || detailState.value.isInvolveHongKongMacaoTaiwan === null)
+  if (detailState.value.isInvolveHongKongMacaoTaiwan === undefined || detailState.value.isInvolveHongKongMacaoTaiwan === null || detailState.value.isInvolveHongKongMacaoTaiwan === "")
    return "请选择是否涉及港澳台";
  if (!detailState.value.paymentDirection) return "请选择收支方向";
  if (!detailState.value.contractTypeCode) return "请选择合同类型编码";
@@ -2376,12 +2373,12 @@ function buildLaunchRecord() {
    isElectron: detailState.value.isElectron || "1",
    isSingleAgreement: detailState.value.isSingleAgreement || "0",
    paymentDirection: detailState.value.paymentDirection || "0",
-    isMajorContract: detailState.value.isMajorContract ? 1 : 0,
-    isOpenBidding: detailState.value.isPublicTender ? 1 : 0,
-    isYearBudget: detailState.value.isIncludedInCurrentYearBudget ? 1 : 0,
-    isShare: detailState.value.isShared ? "1" : "0",
-    contractNature: detailState.value.isForeignRelatedSubject ? "1" : "0",
-    isSgat: detailState.value.isInvolveHongKongMacaoTaiwan ? "1" : "0",
+    isMajorContract: detailState.value.isMajorContract,
+    isOpenBidding: detailState.value.isPublicTender,
+    isYearBudget: detailState.value.isIncludedInCurrentYearBudget,
+    isShare: detailState.value.isShared,
+    contractNature: detailState.value.isForeignRelatedSubject,
+    isSgat: detailState.value.isInvolveHongKongMacaoTaiwan,
    biddingNo: detailState.value.isPublicTender
      ? detailState.value.biddingNo || ""
      : "",