瀏覽代碼

💊 修复等级未提取

快乐的梦鱼 1 月之前
父節點
當前提交
b55f78989c
共有 1 個文件被更改,包括 8 次插入14 次删除
  1. 8 14
      src/pages/collect/assessment/argeement-sign.vue

+ 8 - 14
src/pages/collect/assessment/argeement-sign.vue

@@ -20,7 +20,7 @@
                 <H3>{{ agreementTitle }}</H3>
 
                 <AgreementBodyNational
-                  v-if="agreementLevel === 23"
+                  v-if="currentAgreement?.level === 23"
                   :detail="(currentAgreement as AgreementDetail)"
                   :agreement-year="agreementYear"
                   :party-a-stamp-date="partyAStampDate"
@@ -30,7 +30,7 @@
                   @update:party-b-sign-date="partyBSignDate = $event"
                 />
                 <AgreementBodyProvincial
-                  v-else-if="agreementLevel === 24"
+                  v-else-if="currentAgreement?.level === 24"
                   :detail="(currentAgreement as AgreementDetail)"
                   :agreement-year="agreementYear"
                   :party-a-stamp-date="partyAStampDate"
@@ -40,7 +40,7 @@
                   @update:party-b-sign-date="partyBSignDate = $event"
                 />
                 <AgreementBodyMunicipal
-                  v-else
+                  v-else-if="currentAgreement?.level === 25"
                   :detail="(currentAgreement as AgreementDetail)"
                   :agreement-year="agreementYear"
                   :party-a-stamp-date="partyAStampDate"
@@ -104,14 +104,6 @@ const formRef = ref<FormInstance | null>(null);
 const CN_MOBILE_RE = /^1\d{10}$/;
 const CN_ID_RE = /^(?:\d{15}|\d{17}[\dXx])$/;
 
-/** 23=国家级 24=省级 25=市级;缺省按国家级展示 */
-const agreementLevel = computed(() => {
-  const v = currentAgreement.value?.level;
-  if (v === 24) return 24;
-  if (v === 25) return 25;
-  return 23;
-});
-
 const formRules = computed<Rules>(() => {
   const rules: Rules = {
     partyB: [{ required: true, message: '请填写乙方(传承人)姓名' }],
@@ -176,7 +168,7 @@ const formRules = computed<Rules>(() => {
       },
     ],
   };
-  if (agreementLevel.value === 25)
+  if (currentAgreement.value?.level === 25)
     rules.partyA = [{ required: true, message: '请填写甲方单位全称' }];
   else
     rules.course = [
@@ -193,6 +185,7 @@ async function loadBasicInfo() {
   currentAgreement.value.mobile = basicInfo.mobile;
   currentAgreement.value.idCard = basicInfo.idCard;
   currentAgreement.value.ich = basicInfo.ichName;
+  currentAgreement.value.level = basicInfo.level;
 }
 
 const uploadAgreementSign = useImageSimpleUploadCo();
@@ -202,8 +195,8 @@ const agreementTitle = computed(
   () => `${agreementYear.value} 年度${levelTitle.value}非物质文化遗产代表性传承人传承协议`,
 );
 const levelTitle = computed(() => {
-  if (agreementLevel.value === 23) return '国家级';
-  if (agreementLevel.value === 24) return '省级';
+  if (currentAgreement.value?.level === 23) return '国家级';
+  if (currentAgreement.value?.level === 24) return '省级';
   return '市级';
 });
 const loader = useSimpleDataLoader(async () => {
@@ -245,6 +238,7 @@ function createAgreement() {
   partyBSignDate.value = { year: now.getFullYear().toString(), month: (now.getMonth() + 1).toString(), day: now.getDate().toString() };
   currentAgreement.value = detail;
   loadBasicInfo();
+
 }
 async function saveAgreement() {
   const detail = currentAgreement.value;