From ef4c4b7cca063f77344fb3e8a83cf501527f7f0c Mon Sep 17 00:00:00 2001
From: "1378012178@qq.com" <1378012178@qq.com>
Date: Fri, 11 Jul 2025 09:42:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=AE=A1=E6=A0=B8=E5=8A=A0?=
 =?UTF-8?q?=E7=9B=9F=E6=B5=81=E7=A8=8B=EF=BC=9A=E5=AE=A1=E6=89=B9=E9=80=9A?=
 =?UTF-8?q?=E8=BF=87-=E4=B8=8A=E4=BC=A0=E5=90=88=E5=90=8C=E7=8E=AF?=
 =?UTF-8?q?=E8=8A=82=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E6=9C=89=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/OrgApplyInfoForm.vue           |  2 +-
 .../components/OrgUpContractForm.vue          | 19 ++++++++++---------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/views/admin/orgapplyinfo/components/OrgApplyInfoForm.vue b/src/views/admin/orgapplyinfo/components/OrgApplyInfoForm.vue
index 14736cc..7556168 100644
--- a/src/views/admin/orgapplyinfo/components/OrgApplyInfoForm.vue
+++ b/src/views/admin/orgapplyinfo/components/OrgApplyInfoForm.vue
@@ -396,7 +396,7 @@ async function submitForm() {
     }
   }
   if(model.status == '2'){
-    model.buildStatus = '3'
+    model.buildStatus = 'approvalPass'//代表加盟审批通过
   }
   await saveOrUpdate(model, isUpdate.value)
     .then((res) => {
diff --git a/src/views/admin/orgapplyinfo/components/OrgUpContractForm.vue b/src/views/admin/orgapplyinfo/components/OrgUpContractForm.vue
index 68d4bff..13bdc3d 100644
--- a/src/views/admin/orgapplyinfo/components/OrgUpContractForm.vue
+++ b/src/views/admin/orgapplyinfo/components/OrgUpContractForm.vue
@@ -10,42 +10,42 @@
             </a-col>
             <a-col :span="12">
               <a-form-item label="机构名称" v-bind="validateInfos.comName" id="OrgApplyInfoForm-comName" name="comName">
-                {{formData.comName}}
+                {{ formData.comName }}
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="机构所在地">
-                {{cityViewValue}}
+                {{ cityViewValue }}
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="机构负责人" v-bind="validateInfos.orgLeader" id="OrgApplyInfoForm-orgLeader"
                 name="orgLeader">
-                {{formData.orgLeader}}
+                {{ formData.orgLeader }}
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="机构负责人电话" v-bind="validateInfos.orgLeaderPhone" id="OrgApplyInfoForm-orgLeaderPhone"
                 name="orgLeaderPhone">
-                {{formData.orgLeaderPhone}}
+                {{ formData.orgLeaderPhone }}
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="机构房屋性质" v-bind="validateInfos.orgPropertyType" id="OrgApplyInfoForm-orgPropertyType"
                 name="orgPropertyType">
-                {{formData.orgPropertyType}}
+                {{ formData.orgPropertyType }}
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="机构建筑面积" v-bind="validateInfos.orgBuildingArea" id="OrgApplyInfoForm-orgBuildingArea"
                 name="orgBuildingArea">
-                {{formData.orgBuildingArea}}㎡
+                {{ formData.orgBuildingArea }}㎡
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="机构地址" v-bind="validateInfos.orgAddress" id="OrgApplyInfoForm-orgAddress"
                 name="orgAddress">
-                {{formData.orgAddress}}
+                {{ formData.orgAddress }}
               </a-form-item>
             </a-col>
           </a-row>
@@ -57,9 +57,9 @@
           <a-row v-if="formData.buildStatus == '3'">
             <a-col :span="12">
               <a-form-item label="加盟合同" v-bind="validateInfos.contract" id="OrgApplyInfoForm-contract">
-                <JUpload v-model:value="formData.contract" :maxCount="1"  accept=".pdf"></JUpload>
+                <JUpload v-model:value="formData.contract" :maxCount="1" accept=".pdf"></JUpload>
               </a-form-item>
-                <div style="margin-top: 15px;margin-left:20%;color:#8e8e8e;font-size:12px;">说明：请上传pdf文件，并且只能上传一份文件</div>
+              <div style="margin-top: 15px;margin-left:20%;color:#8e8e8e;font-size:12px;">说明：请上传pdf文件，并且只能上传一份文件</div>
             </a-col>
             <a-col :span="12">
               <a-form-item label="备注信息" v-bind="validateInfos.contractNote" id="OrgApplyInfoForm-contractNote"
@@ -274,6 +274,7 @@ async function submitForm() {
     }
   }
   model.workOrderStatus = '1'
+  model.buildStatus = 'contractSubmit'//给后端判断是否为合同上传并提交状态
   await submitContract(model)
     .then((res) => {
       emit('ok');