diff --git a/src/views/admin/orgapplyinfo/OrgApplyInfo.data.ts b/src/views/admin/orgapplyinfo/OrgApplyInfo.data.ts
index 3113376..a3794e9 100644
--- a/src/views/admin/orgapplyinfo/OrgApplyInfo.data.ts
+++ b/src/views/admin/orgapplyinfo/OrgApplyInfo.data.ts
@@ -40,6 +40,11 @@ export const columns: BasicColumn[] = [
     align: 'center',
     dataIndex: 'status_dictText',
   },
+  {
+    title: '工单状态',
+    align: 'center',
+    dataIndex: 'workOrderStatus_dictText',
+  },
 ];
 
 // 高级查询数据
diff --git a/src/views/admin/orgapplyinfo/components/OrgApplyInfoForm.vue b/src/views/admin/orgapplyinfo/components/OrgApplyInfoForm.vue
index 6a317d8..14736cc 100644
--- a/src/views/admin/orgapplyinfo/components/OrgApplyInfoForm.vue
+++ b/src/views/admin/orgapplyinfo/components/OrgApplyInfoForm.vue
@@ -4,96 +4,11 @@
       <template #detail>
         <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol"
           name="OrgApplyInfoForm">
-          <a-row v-if="formData.buildStatus == '3'">
-            <a-col :span="24">
-              <SectionDivider :title="'加盟合同'" />
-            </a-col>
-          </a-row>
-          <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"></JUpload>
-              </a-form-item>
-            </a-col>
-          </a-row>
+
           <a-row>
             <a-col :span="24">
-              <SectionDivider :title="'身份证'" />
+              <SectionDivider :title="'机构信息'" />
             </a-col>
-          </a-row>
-          <a-row>
-            <a-col :span="12">
-              <a-form-item label="身份证正面" v-bind="validateInfos.cardZmPath" id="OrgApplyInfoForm-cardZmPath"
-                name="cardZmPath">
-                <JImageUpload :fileMax="1" v-model:value="formData.cardZmPath" :disabled="true"></JImageUpload>
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row>
-            <a-col :span="12">
-              <a-form-item label="姓名" v-bind="validateInfos.name" id="OrgApplyInfoForm-name" name="name">
-                <a-input v-model:value="formData.name" :readOnly="true"></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="性别" v-bind="validateInfos.sex" id="OrgApplyInfoForm-sex" name="sex">
-                <a-input v-model:value="formData.sex" :readOnly="true"></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="民族" v-bind="validateInfos.national" id="OrgApplyInfoForm-national" name="national">
-                <a-input v-model:value="formData.national" :readOnly="true"></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="出生日期" v-bind="validateInfos.birthDate" id="OrgApplyInfoForm-birthDate"
-                name="birthDate">
-                <a-input placeholder="申请日期" v-model:value="formData.birthDate" style="width: 100%" readOnly />
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="住址" v-bind="validateInfos.idCardAddress" id="OrgApplyInfoForm-idCardAddress"
-                name="idCardAddress">
-                <a-input v-model:value="formData.idCardAddress" :readOnly="true"></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="身份证号" v-bind="validateInfos.idCard" id="OrgApplyInfoForm-idCard" name="idCard">
-                <a-input v-model:value="formData.idCard" :readOnly="true"></a-input>
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row>
-            <a-col :span="12">
-              <a-form-item label="身份证反面" v-bind="validateInfos.cardFmPath" id="OrgApplyInfoForm-cardFmPath"
-                name="cardFmPath">
-                <JImageUpload :fileMax="1" v-model:value="formData.cardFmPath" :disabled="true"></JImageUpload>
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row>
-            <a-col :span="12">
-              <a-form-item label="签发机关" v-bind="validateInfos.issuingAuthority" id="OrgApplyInfoForm-issuingAuthority"
-                name="issuingAuthority">
-                <a-input v-model:value="formData.issuingAuthority" :readOnly="true"></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="有效开始日期" v-bind="validateInfos.startTime" id="OrgApplyInfoForm-startTime"
-                name="startTime">
-                <a-input placeholder="申请日期" v-model:value="formData.startTime" style="width: 100%" readOnly />
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="有效结束日期" v-bind="validateInfos.endTime" id="OrgApplyInfoForm-endTime" name="endTime">
-                <a-input placeholder="申请日期" v-model:value="formData.endTime" style="width: 100%" readOnly />
-              </a-form-item>
-            </a-col>
-            <a-col :span="24">
-              <SectionDivider :title="'营业执照'" />
-            </a-col>
-          </a-row>
-          <a-row>
             <a-col :span="12">
               <a-form-item label="营业执照照片" v-bind="validateInfos.comBusinessLicense"
                 id="OrgApplyInfoForm-comBusinessLicense" name="comBusinessLicense">
@@ -104,82 +19,147 @@
           <a-row>
             <a-col :span="12">
               <a-form-item label="企业名称" v-bind="validateInfos.comName" id="OrgApplyInfoForm-comName" name="comName">
-                <a-input v-model:value="formData.comName" :readOnly="true"></a-input>
+                {{formData.comName}}
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="企业注册地址" v-bind="validateInfos.comRegisterAddress"
                 id="OrgApplyInfoForm-comRegisterAddress" name="comRegisterAddress">
-                <a-textarea v-model:value="formData.comRegisterAddress" :readOnly="true"></a-textarea>
+                {{formData.comRegisterAddress}}
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="企业信用代码" v-bind="validateInfos.comCreditCode" id="OrgApplyInfoForm-comCreditCode"
                 name="comCreditCode">
-                <a-input v-model:value="formData.comCreditCode" :readOnly="true"></a-input>
+                {{formData.comCreditCode}}
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="企业法人" v-bind="validateInfos.comLegalPerson" id="OrgApplyInfoForm-comLegalPerson"
                 name="comLegalPerson">
-                <a-input v-model:value="formData.comLegalPerson" :readOnly="true"></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :span="24">
-              <SectionDivider :title="'机构信息'" />
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="机构所在地">
-                <a-input v-model:value="cityViewValue" placeholder="请输入机构所在地" :readOnly="true"></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="机构地址" v-bind="validateInfos.orgAddress" id="OrgApplyInfoForm-orgAddress"
-                name="orgAddress">
-                <a-textarea v-model:value="formData.orgAddress" :readOnly="true"></a-textarea>
+                {{formData.comLegalPerson}}
               </a-form-item>
             </a-col>
+            
+          </a-row>
+
+          <a-row>
+
             <a-col :span="12">
               <a-form-item label="机构负责人" v-bind="validateInfos.orgLeader" id="OrgApplyInfoForm-orgLeader"
                 name="orgLeader">
-                <a-input v-model:value="formData.orgLeader" :readOnly="true"></a-input>
+                {{formData.orgLeader}}
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="机构负责人电话" v-bind="validateInfos.orgLeaderPhone" id="OrgApplyInfoForm-orgLeaderPhone"
                 name="orgLeaderPhone">
-                <a-input v-model:value="formData.orgLeaderPhone" :readOnly="true"></a-input>
+                {{formData.orgLeaderPhone}}
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="机构房屋性质" v-bind="validateInfos.orgPropertyType" id="OrgApplyInfoForm-orgPropertyType"
                 name="orgPropertyType">
-                <a-input v-model:value="formData.orgPropertyType" :readOnly="true"></a-input>
+                {{formData.orgPropertyType}}
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="机构建筑面积" v-bind="validateInfos.orgBuildingArea" id="OrgApplyInfoForm-orgBuildingArea"
                 name="orgBuildingArea">
-                <a-input v-model:value="formData.orgBuildingArea" addon-after="平方米" style="width: 100%" readOnly />
+                {{formData.orgBuildingArea}} ㎡
               </a-form-item>
             </a-col>
+            <!-- <a-col :span="12">
+              <a-form-item label="机构所在地">
+                {{cityViewValue}}
+              </a-form-item>
+            </a-col> -->
+            <a-col :span="12">
+              <a-form-item label="机构地址" v-bind="validateInfos.orgAddress" id="OrgApplyInfoForm-orgAddress"
+                name="orgAddress">
+                {{formData.orgAddress}}
+              </a-form-item>
+            </a-col>
+          </a-row>
+          
+          <a-row>
+            <a-col :span="24">
+              <SectionDivider :title="'申请人身份证'" />
+            </a-col>
+          </a-row>
+          <a-row>
+            <a-col :span="12">
+              <a-form-item label="身份证正面" v-bind="validateInfos.cardZmPath" id="OrgApplyInfoForm-cardZmPath"
+                name="cardZmPath">
+                <JImageUpload :fileMax="1" v-model:value="formData.cardZmPath" :disabled="true"></JImageUpload>
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="身份证反面" v-bind="validateInfos.cardFmPath" id="OrgApplyInfoForm-cardFmPath"
+                name="cardFmPath">
+                <JImageUpload :fileMax="1" v-model:value="formData.cardFmPath" :disabled="true"></JImageUpload>
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="姓名" v-bind="validateInfos.name" id="OrgApplyInfoForm-name" name="name">
+                {{formData.name}}
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="性别" v-bind="validateInfos.sex" id="OrgApplyInfoForm-sex" name="sex">
+                {{formData.sex}}
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="身份证号" v-bind="validateInfos.idCard" id="OrgApplyInfoForm-idCard" name="idCard">
+                {{formData.idCard}}
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="出生日期" v-bind="validateInfos.birthDate" id="OrgApplyInfoForm-birthDate"
+                name="birthDate">
+                {{formData.birthDate?formData.birthDate.substring(0,10):""}}
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="有效开始日期" v-bind="validateInfos.startTime" id="OrgApplyInfoForm-startTime"
+                name="startTime">
+                {{formData.startTime?formData.startTime.substring(0,10):""}}
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="有效结束日期" v-bind="validateInfos.endTime" id="OrgApplyInfoForm-endTime" name="endTime">
+                {{formData.endTime?formData.endTime.substring(0,10):""}}
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="民族" v-bind="validateInfos.national" id="OrgApplyInfoForm-national" name="national">
+                {{formData.national}}
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="住址" v-bind="validateInfos.idCardAddress" id="OrgApplyInfoForm-idCardAddress"
+                name="idCardAddress">
+                {{formData.idCardAddress}}
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="签发机关" v-bind="validateInfos.issuingAuthority" id="OrgApplyInfoForm-issuingAuthority"
+                name="issuingAuthority">
+                {{formData.issuingAuthority}}
+              </a-form-item>
+            </a-col>
+          </a-row>
+          
+          <a-row>
             <a-col :span="24">
               <SectionDivider :title="'加盟审核'" />
             </a-col>
-            <a-col :span="12">
-              <a-form-item label="联系电话" v-bind="validateInfos.tel" id="OrgApplyInfoForm-tel" name="tel">
-                <a-input v-model:value="formData.tel" placeholder="请输入联系电话" :readOnly="true"></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="申请日期" v-bind="validateInfos.createTime" id="OrgApplyInfoForm-createTime"
-                name="createTime">
-                <a-input placeholder="申请日期" v-model:value="formData.createTime" style="width: 100%" readOnly />
-              </a-form-item>
-            </a-col>
+          </a-row>
+          <a-row>
             <a-col :span="12">
               <a-form-item label="审批意见" v-bind="validateInfos.status" id="OrgApplyInfoForm-status" name="status">
-                <a-select v-model:value="formData.status" style="width: 200px" placeholder="请选择审批意见" :disabled="formData.status != '1' && formData.status != '3'">
+                <a-select v-model:value="formData.status" style="width: 200px" placeholder="请选择审批意见" :disabled="sfsh!='1'">
                   <a-select-option value="2">审核通过</a-select-option>
                   <a-select-option value="3">审核驳回</a-select-option>
                 </a-select>
@@ -191,6 +171,41 @@
                   allow-clear placeholder="请输入驳回原因"></a-textarea>
               </a-form-item>
             </a-col>
+            <a-col :span="12" v-show="formData.buildStatus == '3'">
+              <a-form-item label="加盟合同" v-bind="validateInfos.contract" id="OrgApplyInfoForm-contract">
+                <JUpload v-model:value="formData.contract" :maxCount="1"></JUpload>
+              </a-form-item>
+            </a-col>
+          </a-row>
+          <a-row v-show="formData.workOrderStatus != '0'">
+            <a-col :span="24">
+              <SectionDivider :title="'工单回执'" />
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="工单状态" >
+                {{formData.workOrderStatus_dictText}}
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="处理人" >
+                {{formData.handleBy}}
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="回复附件" >
+                <JUpload v-model:value="formData.replyFile" :maxCount="1" disabled></JUpload>
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="回复时间" >
+                {{formData.replyTime?formData.replyTime.substring(0,10):""}}
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="回复内容" >
+                {{formData.replyContent}}
+              </a-form-item>
+            </a-col>
           </a-row>
         </a-form>
       </template>
@@ -213,6 +228,7 @@ import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue'
 import TencentMap from '/@/components/TencentMap/TencentMap.vue';
 import JImageUpload from '/@/components/Form/src/jeecg/components/JImageUpload.vue';
 import JUpload from '/@/components/Form/src/jeecg/components/JUpload/JUpload.vue';
+import { t } from '/@/hooks/web/useI18n';
 
 const cityViewValue = ref('')
 const props = defineProps({
@@ -266,8 +282,16 @@ const formData = reactive<Record<string, any>>({
   orgDistrict_dictText: '',
   franchiseTime: null,
   contract:null,
+  replyContent: '',
+  replyFile: '',
+  replyTime: '',
+  handleBy: '',
+  workOrderStatus: '',
+  workOrderStatus_dictText: '',
+
 });
-const tempNullVal = ref('')
+const tempNullVal = ref('');
+const sfsh = ref<string>('0');
 const { createMessage } = useMessage();
 const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
 const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 17 } });
@@ -275,7 +299,6 @@ const confirmLoading = ref<boolean>(false);
 //表单验证
 const validatorRules = reactive({
   status: [{ required: true, message: '请选择审批结果!' },],
-  contract: [{ required: true, message: '请上传加盟合同!' },],
   content: [
     {
       validator: async (_rule, value) => {
@@ -321,6 +344,7 @@ function edit(record) {
         tmpData[key] = record[key]
       }
     })
+    var lsbl = tmpData.status;
     if (tmpData.status != '2' && tmpData.status != '3') {
       tmpData.status = null
     }
@@ -329,6 +353,11 @@ function edit(record) {
       + (!!record.orgDistrict_dictText ? record.orgDistrict_dictText : '')
     //赋值
     Object.assign(formData, tmpData);
+    if(lsbl == '1'){
+      sfsh.value = '1'
+    }else{
+      sfsh.value = '0'
+    }
   });
 }
 
@@ -366,6 +395,9 @@ async function submitForm() {
       }
     }
   }
+  if(model.status == '2'){
+    model.buildStatus = '3'
+  }
   await saveOrUpdate(model, isUpdate.value)
     .then((res) => {
       if (res.success) {
diff --git a/src/views/admin/orgapplyinfo/components/OrgUpContractForm.vue b/src/views/admin/orgapplyinfo/components/OrgUpContractForm.vue
index 86ca329..68d4bff 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">
-                <a-input v-model:value="formData.comName" :readOnly="true"></a-input>
+                {{formData.comName}}
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="机构所在地">
-                <a-input v-model:value="cityViewValue" placeholder="请输入机构所在地" :readOnly="true"></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="机构地址" v-bind="validateInfos.orgAddress" id="OrgApplyInfoForm-orgAddress"
-                name="orgAddress">
-                <a-textarea v-model:value="formData.orgAddress" :readOnly="true"></a-textarea>
+                {{cityViewValue}}
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="机构负责人" v-bind="validateInfos.orgLeader" id="OrgApplyInfoForm-orgLeader"
                 name="orgLeader">
-                <a-input v-model:value="formData.orgLeader" :readOnly="true"></a-input>
+                {{formData.orgLeader}}
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="机构负责人电话" v-bind="validateInfos.orgLeaderPhone" id="OrgApplyInfoForm-orgLeaderPhone"
                 name="orgLeaderPhone">
-                <a-input v-model:value="formData.orgLeaderPhone" :readOnly="true"></a-input>
+                {{formData.orgLeaderPhone}}
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="机构房屋性质" v-bind="validateInfos.orgPropertyType" id="OrgApplyInfoForm-orgPropertyType"
                 name="orgPropertyType">
-                <a-input v-model:value="formData.orgPropertyType" :readOnly="true"></a-input>
+                {{formData.orgPropertyType}}
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="机构建筑面积" v-bind="validateInfos.orgBuildingArea" id="OrgApplyInfoForm-orgBuildingArea"
                 name="orgBuildingArea">
-                <a-input v-model:value="formData.orgBuildingArea" addon-after="平方米" style="width: 100%" readOnly />
+                {{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}}
               </a-form-item>
             </a-col>
           </a-row>
@@ -57,8 +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"></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>
             </a-col>
             <a-col :span="12">
               <a-form-item label="备注信息" v-bind="validateInfos.contractNote" id="OrgApplyInfoForm-contractNote"
@@ -272,6 +273,7 @@ async function submitForm() {
       }
     }
   }
+  model.workOrderStatus = '1'
   await submitContract(model)
     .then((res) => {
       emit('ok');