1、pc-机构-解决审核历史列表页缺少数据问题

2、pc-机构-机构审核-审核历史：新增“入驻”类型的详情查看功能，可查看当次申请的内容
3、pc-机构-机构审核-审核历史：新增“变更”类型的详情查看功能，内容为“当次变更信息”和“其上一次使用的信息”做对比
4、pc-机构-机构审核-各界面中审核意见改为审核状态
5、pc-机构-机构审核-调整详情页和审核历史中入驻详情页样式
6、pc-机构-机构审核-所有企业XX 改为机构XX
7、pc-机构-机构审核-去掉加盟审核界面中的工单回执相关内容
8、pc-机构-机构审核-pc-机构-机构审核-调整上传合同界面内容，操作按钮只保留关闭和提交
9、pc-机构-机构审核-列表页工单回执只保留待回执、已回执两种状态，其余节点展示为空

src/views/admin/orgapplyinfo/OrgApplyInfo.data.ts

@@ -41,7 +41,7 @@ export const columns: BasicColumn[] = [
     width: '8%',
   },
   {
-    title: '审核意见',
+    title: '审核状态',
     align: 'center',
     dataIndex: 'status_dictText',
     width: '8%',
@@ -57,6 +57,17 @@ export const columns: BasicColumn[] = [
     align: 'center',
     dataIndex: 'workOrderStatus_dictText',
     width: '8%',
+    customRender: ({ record }) => {
+      if (record.workOrderStatus == '0') {
+        return '';
+      } else if (record.workOrderStatus == '1') {
+        return '待回执';
+      } else if (record.workOrderStatus == '2') {
+        return '已回执';
+      } else {
+        return '';
+      }
+    },
   },
 ];
 
@@ -71,43 +82,43 @@ export const hisColumns: BasicColumn[] = [
     title: '机构负责人',
     align: 'center',
     dataIndex: 'orgLeader',
-    width:100
+    width: 100,
   },
   {
     title: '负责人电话',
     align: 'center',
     dataIndex: 'orgLeaderPhone',
-    width:120
+    width: 120,
   },
   {
     title: '申请日期',
     align: 'center',
     dataIndex: 'createTime',
-    width:150
+    width: 150,
   },
   {
     title: '房屋性质',
     align: 'center',
     dataIndex: 'orgPropertyType',
-    width:100
+    width: 100,
   },
   {
     title: '面积(㎡)',
     align: 'center',
     dataIndex: 'orgBuildingArea',
-    width:100
+    width: 100,
   },
   {
     title: '类型',
     align: 'center',
     dataIndex: 'optTypeName',
-    width:100
+    width: 100,
   },
   {
-    title: '审核意见',
+    title: '审核状态',
     align: 'center',
     dataIndex: 'status_dictText',
-    width:100
+    width: 100,
   },
 ];
 

src/views/admin/orgapplyinfo/OrgInfoAuditList.vue

@@ -26,8 +26,8 @@
           </a-col>
           <a-col :lg="6">
             <a-form-item name="status">
-              <template #label><span title="审核意见">审核意见</span></template>
+              <template #label><span title="审核状态">审核状态</span></template>
-              <a-select v-model:value="queryParam.status" style="width: 200px" placeholder="请选择审核意见">
+              <a-select v-model:value="queryParam.status" style="width: 200px" placeholder="请选择审核状态">
                 <a-select-option value="1,4">待审核</a-select-option>
                 <a-select-option value="2">审核通过</a-select-option>
                 <a-select-option value="3,5">审核驳回</a-select-option>

src/views/admin/orgapplyinfo/OrgModifyInfo.api.ts

@@ -12,6 +12,7 @@ enum Api {
   importExcel = '/admin/orgapplyinfo/orgApplyInfo/importExcel',
   exportXls = '/admin/orgapplyinfo/orgApplyInfo/exportXls',
   getModifyInfo = '/admin/orgapplyinfo/orgApplyInfo/getModifyInfo',
+  getHisModifyInfo = '/admin/orgapplyinfo/orgApplyInfo/getHisModifyInfo',
   upInfoAudit = '/admin/orgapplyinfo/orgApplyInfo/upInfoAudit',
 }
 
@@ -84,3 +85,12 @@ export const upInfoAudit = (params) => {
 export const getModifyInfo = (params) => {
   return defHttp.post({ url: Api.getModifyInfo, params });
 };
+
+/**
+ * 返回当次审核信息和上一次使用的信息
+ * @param params 
+ * @returns 
+ */
+export const getHisModifyInfo = (params) => {
+  return defHttp.post({ url: Api.getHisModifyInfo, params });
+};

src/views/admin/orgapplyinfo/components/OrgApplyInfoForm.vue

@@ -5,14 +5,14 @@
         <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol"
           name="OrgApplyInfoForm">
 
-          <a-row class="card-class" :disabled="disabled">
+          <a-row class="card-class">
-            <a-col :span="24" style="border-bottom: 2px solid #f7f7f7; margin-bottom: 14px;">
-              <SectionDivider :title="'机构信息'" />
-            </a-col>
             <a-col :span="12">
               <a-row>
+                <a-col :span="24" style="border-bottom: 2px solid #f7f7f7; margin-bottom: 14px;">
+                  <SectionDivider :title="'营业执照'" />
+                </a-col>
                 <a-col :span="24">
-                  <a-form-item label="营业执照照片" v-bind="validateInfos.comBusinessLicense"
+                  <a-form-item label="营业执照" v-bind="validateInfos.comBusinessLicense"
                     id="OrgApplyInfoForm-comBusinessLicense" name="comBusinessLicense">
                     <JImageUpload :fileMax="1" v-model:value="formData.comBusinessLicense" :disabled="true">
                     </JImageUpload>
@@ -53,6 +53,9 @@
             </a-col>
             <a-col :span="12">
               <a-row>
+                <a-col :span="24" style="border-bottom: 2px solid #f7f7f7; margin-bottom: 14px;">
+                  <SectionDivider :title="'机构信息'" />
+                </a-col>
                 <a-col :span="24">
                   <a-form-item label="机构所在地" v-bind="validateInfos.cityViewValue" id="OrgApplyInfoForm-cityViewValue"
                     name="cityViewValue">
@@ -95,8 +98,7 @@
                 <a-col :span="24">
                   <a-form-item label="机构地址" v-bind="validateInfos.orgAddress" id="OrgApplyInfoForm-orgAddress"
                     name="orgAddress">
-                    <a-textarea :autosize="{ minRows: 1 }" maxlength="50" disabled v-model:value="formData.orgAddress"
+                    <a-input v-model:value="formData.orgAddress" placeholder="请输入机构地址" disabled allow-clear></a-input>
-                      allow-clear></a-textarea>
                     <!-- {{ formData.orgAddress }} -->
                   </a-form-item>
                 </a-col>
@@ -106,7 +108,7 @@
 
           <a-row class="card-class">
             <a-col :span="24" style="border-bottom: 2px solid #f7f7f7; margin-bottom: 14px;">
-              <SectionDivider :title="'申请人身份证'" />
+              <SectionDivider :title="'申请人'" />
             </a-col>
             <a-col :span="12">
               <a-row>
@@ -139,7 +141,9 @@
                   <a-form-item label="出生日期" v-bind="validateInfos.birthDate" id="OrgApplyInfoForm-birthDate"
                     name="birthDate">
                     <a-date-picker placeholder="请选择出生日期" v-model:value="formData.birthDate" disabled
-                      value-format="YYYY-MM-DD" style="width: 100%" allow-clear />
+                      value-format="YYYY-MM-DD" style="width: 100%" suffix-icon="" />
+                    <!-- <a-input placeholder="请选择出生日期" v-model:value="formData.birthDate" disabled
+                       style="width: 100%"></a-input> -->
                     <!-- {{ formData.birthDate ? formData.birthDate.substring(0, 10) : "" }} -->
                   </a-form-item>
                 </a-col>
@@ -171,16 +175,17 @@
                   <a-form-item label="有效开始日期" v-bind="validateInfos.startTime" id="OrgApplyInfoForm-startTime"
                     name="startTime">
                     <a-date-picker placeholder="请选择有效开始日期" v-model:value="formData.startTime" disabled
-                      value-format="YYYY-MM-DD" style="width: 100%" allow-clear />
+                      value-format="YYYY-MM-DD" style="width: 100%" suffix-icon="" />
                     <!-- {{ formData.startTime ? formData.startTime.substring(0, 10) : "" }} -->
                   </a-form-item>
                 </a-col>
                 <a-col :span="24">
                   <a-form-item label="有效结束日期" v-bind="validateInfos.endTime" id="OrgApplyInfoForm-endTime"
                     name="endTime">
-                    <a-input v-if="formData.endTime == '9999-12-31'" :value="'长期'" allow-clear></a-input>
+                    <a-input v-if="formData.endTime == '9999-12-31' || formData.endTime == '9999-12-31 00:00:00'"
+                      :value="'长期'" suffix-icon=""></a-input>
                     <a-date-picker v-else v-model:value="formData.endTime" value-format="YYYY-MM-DD" style="width: 100%"
-                      disabled allow-clear />
+                      suffix-icon="" />
                     <!-- {{ formData.endTime
                       ? (formData.endTime.substring(0, 10) == '9999-12-31' ? '长期' : formData.endTime.substring(0, 10))
                       : "" }} -->
@@ -203,8 +208,8 @@
               <SectionDivider :title="'加盟审核'" />
             </a-col>
             <a-col :span="12">
-              <a-form-item label="审核意见" v-bind="validateInfos.status" id="OrgApplyInfoForm-status" name="status">
+              <a-form-item label="审核状态" v-bind="validateInfos.status" id="OrgApplyInfoForm-status" name="status">
-                <a-select v-model:value="formData.status" style="width: 200px" placeholder="请选择审核意见"
+                <a-select v-model:value="formData.status" style="width: 200px" placeholder="请选择审核状态"
                   :disabled="sfsh != '1'">
                   <a-select-option value="0" v-if="disabled">历史数据</a-select-option>
                   <a-select-option value="1" v-if="disabled">待审核</a-select-option>
@@ -247,7 +252,7 @@
               </a-form-item>
             </a-col>
           </a-row>
-          <a-row v-show="formData.workOrderStatus != '0'" class="card-class">
+          <a-row v-show="formData.workOrderStatus != '0' && !izApplyAudit" class="card-class">
             <a-col :span="24" style="border-bottom: 2px solid #f7f7f7; margin-bottom: 14px;">
               <SectionDivider :title="'工单回执'" />
             </a-col>
@@ -426,11 +431,16 @@ function handleView(record) {
 function add() {
   edit({});
 }
-
+const izApplyAudit = ref(true)
 /**
  * 编辑
  */
 function edit(record) {
+  if (record.optType == 'rz' && record.status == '1') {
+    izApplyAudit.value = true;
+  } else {
+    izApplyAudit.value = false;
+  }
   nextTick(() => {
     resetFields();
     let tmpData = {};

src/views/admin/orgapplyinfo/components/OrgApplyInfoModal.vue

@@ -14,8 +14,8 @@
     <OrgUpContractForm ref="upContractForm" @ok="submitContractCallback" :formBpm="false"></OrgUpContractForm>
     <template #footer>
       <a-button @click="handleContractCancel" style="margin-right: 8px">关闭</a-button>
-      <a-button @click="saveContract" style="margin-right: 8px">保存为草稿</a-button>
+      <!-- <a-button @click="saveContract" style="margin-right: 8px">保存为草稿</a-button> -->
-      <a-button type="primary" @click="submitContract">保存并提交</a-button>
+      <a-button type="primary" @click="submitContract">提交</a-button>
     </template>
   </a-drawer>
 
@@ -27,7 +27,13 @@
     </template>
   </a-drawer>
 
-
+  <a-drawer :title="'机构信息变更审核'" width="70vw" v-model:visible="hisVisible" :closable="true"
+    :bodyStyle="{ padding: '14px' }" :footer-style="{ textAlign: 'right' }" @close="handleHisCancel">
+    <OrgHistoryForm ref="historyRef" @ok="submitCallback" v-if="hisVisible"></OrgHistoryForm>
+    <template #footer>
+      <a-button type="primary" style="margin-right: 8px" @click="handleHisCancel">关闭</a-button>
+    </template>
+  </a-drawer>
 </template>
 
 <script lang="ts" setup>
@@ -36,6 +42,7 @@ import OrgApplyInfoForm from './OrgApplyInfoForm.vue'
 import OrgUpContractForm from './OrgUpContractForm.vue'
 import JModal from '/@/components/Modal/src/JModal/JModal.vue';
 import OrgAuditHisList from './OrgAuditHisList.vue'
+import OrgHistoryForm from './OrgHistoryForm.vue'
 
 const title = ref<string>('');
 const visible = ref<boolean>(false);
@@ -46,9 +53,13 @@ const upContractForm = ref();
 const emit = defineEmits(['register', 'success']);
 const auditHisVisible = ref(false)
 const auditHisRef = ref()
+const hisVisible = ref()
+const historyRef = ref()
+
 function handleExtraButton() {
 
 }
+
 /**
  * 新增
  */
@@ -148,12 +159,28 @@ function handleAuditHisCancel() {
   auditHisVisible.value = false
 }
 
+/**
+ * 查看历史比对
+ * @param record 
+ */
+function showHis(record) {
+  hisVisible.value = true
+  nextTick(() => {
+    historyRef.value.hisShow(record);
+  });
+}
+
+function handleHisCancel() {
+  hisVisible.value = false
+}
+
 defineExpose({
   add,
   edit,
   disableSubmit,
   editContract,
   showAuditHis,
+  showHis,
 });
 </script>
 

src/views/admin/orgapplyinfo/components/OrgAuditHisList.vue

@@ -26,8 +26,8 @@
           </a-col>
           <a-col :lg="6">
             <a-form-item name="status">
-              <template #label><span title="审核意见">审核意见</span></template>
+              <template #label><span title="审核状态">审核状态</span></template>
-              <a-select v-model:value="queryParam.status" style="width: 200px" placeholder="请选择审核意见">
+              <a-select v-model:value="queryParam.status" style="width: 200px" placeholder="请选择审核状态">
                 <!-- <a-select-option value="1">待审核</a-select-option> -->
                 <a-select-option value="2">审核通过</a-select-option>
                 <a-select-option value="3">审核驳回</a-select-option>
@@ -145,51 +145,19 @@ const wrapperCol = reactive({
 });
 
 /**
- * 高级查询事件
+ * 详情
  */
-function handleSuperQuery(params) {
+function handleRzDetail(record: Recordable) {
-  Object.keys(params).map((k) => {
+  registerModal.value.disableSubmit = true;
-    queryParam[k] = params[k];
-  });
-  searchQuery();
-}
-
-/**
- * 新增事件
- */
-function handleAdd() {
-  registerModal.value.disableSubmit = false;
-  registerModal.value.add();
-}
-
-/**
- * 编辑事件
- */
-function handleEdit(record: Recordable) {
-  registerModal.value.disableSubmit = false;
   registerModal.value.edit(record);
 }
 
 /**
  * 详情
  */
-function handleDetail(record: Recordable) {
+function handleBgDetail(record: Recordable) {
   registerModal.value.disableSubmit = true;
-  registerModal.value.edit(record);
+  registerModal.value.showHis(record);
-}
-
-/**
- * 删除事件
- */
-async function handleDelete(record) {
-  await deleteOne({ id: record.id }, handleSuccess);
-}
-
-/**
- * 批量删除事件
- */
-async function batchHandleDelete() {
-  await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
 }
 
 /**
@@ -199,55 +167,11 @@ function handleSuccess() {
   (selectedRowKeys.value = []) && reload();
 }
 
-/**
- * 上传合同
- */
-function handleUpContract(record) {
-  registerModal.value.editContract(record);
-}
-
-/**
- * 通知运维平台搭建业务平台
- */
-function handleBuildPlat(record) {
-
-}
-
-/**
- * 账户初始化
- * @param record 
- */
-function handleInitAccount(record) {
-  var userInfo = { userName: record.tel, realname: record.name, orgCode: record.id }
-  console.log("🚀 ~ handleInitAccount ~ userInfo:", userInfo)
-  defHttp.post({ url: '/sys/user/initialization', params: userInfo }).then(res => {
-    console.log("🚀 ~ handleInitAccount ~ res:", res)
-    zhcshVisible.value = true;
-    zhcshMessage.value = res.message;
-    handleSuccess();
-  })
-
-}
-
 function handleCshCancel() {
   zhcshVisible.value = false;
   zhcshMessage.value = '';
 }
 
-/**
- * 信息推送
- * @param record 
- */
-function handlePushInfo(record) {
-  console.log("🚀 ~ handlePushInfo ~ record:", record)
-  var params = { openId: record.openId, id: record.id }
-  console.log("🚀 ~ handlePushInfo ~ params:", params)
-  defHttp.get({ url: '/weixinMini/sendOrgAuthInfo', params }).then(res => {
-    handleSuccess();
-  })
-}
-
-
 /**
  * 操作栏
  */
@@ -255,46 +179,14 @@ function getTableAction(record) {
   return [
     {
       label: '详情',
-      onClick: handleDetail.bind(null, record),
+      onClick: handleRzDetail.bind(null, record),
       ifShow: record.optType == 'rz'
     },
     {
       label: '详情',
-      onClick: handleDetail.bind(null, record),
+      onClick: handleBgDetail.bind(null, record),
       ifShow: record.optType == 'bg'
     },
-    {
-      label: '加盟审核',
-      onClick: handleEdit.bind(null, record),
-      auth: 'orgapplyinfo:nu_org_apply_info:edit',
-      ifShow: record.status == '1'
-    },
-    {
-      label: '上传合同',
-      onClick: handleUpContract.bind(null, record),
-      auth: 'orgapplyinfo:nu_org_apply_info:edit',
-      ifShow: record.buildStatus == '3'
-    },
-    // {
-    //   label: '运维平台进行搭建',
-    //   onClick: handleBuildPlat.bind(null, record),
-    //   auth: 'orgapplyinfo:nu_org_apply_info:edit',
-    //   ifShow: () => {
-    //     return record.buildStatus == '3' && !!record.contract
-    //   }
-    // },
-    {
-      label: '账号初始化',
-      onClick: handleInitAccount.bind(null, record),
-      auth: 'orgapplyinfo:nu_org_apply_info:edit',
-      ifShow: record.workOrderStatus == '2' && record.buildStatus == '4'
-    },
-    // {
-    //   label: '信息推送',
-    //   onClick: handlePushInfo.bind(null, record),
-    //   auth: 'orgapplyinfo:nu_org_apply_info:edit',
-    //   ifShow: record.buildStatus == '5'n
-    // },
   ];
 }
 

src/views/admin/orgapplyinfo/components/OrgHistoryForm.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="container2">
         <a-row>
-            <a-col :span="24" >
+            <a-col :span="24">
                 <a-table :dataSource="filteredTableData" :columns="columns" :pagination="false" bordered size="small"
                     :rowClassName="setRowClassName">
                     <template #bodyCell="{ column, record }">
@@ -42,8 +42,8 @@
             :label-col="labelCol" :wrapper-col="wrapperCol">
             <a-row :gutter="16">
                 <a-col :span="12">
-                    <a-form-item label="审核结果" name="status" v-bind="validateInfos.status">
+                    <a-form-item label="审核状态" name="status" v-bind="validateInfos.status">
-                        <a-select v-model:value="formData.status" style="width: 200px" placeholder="请选择审核结果">
+                        <a-select v-model:value="formData.status" style="width: 200px" placeholder="请选择审核状态">
                             <a-select-option value="2">审核通过</a-select-option>
                             <a-select-option value="3">审核驳回</a-select-option>
                         </a-select>
@@ -65,7 +65,7 @@ import { ref, reactive, computed, onMounted } from 'vue';
 import { Table as ATable, Input, Row, Col, Form } from 'ant-design-vue';
 import { applyObj } from '../OrgModifyInfo.data'
 import JImageUpload from '/@/components/Form/src/jeecg/components/JImageUpload.vue';
-import { upInfoAudit } from '../OrgModifyInfo.api';
+import { upInfoAudit, getHisModifyInfo } from '../OrgModifyInfo.api';
 import { useMessage } from '/@/hooks/web/useMessage';
 import { initDictOptions } from '/@/utils/dict';
 
@@ -170,7 +170,7 @@ const setRowClassName = (record) => {
 };
 
 function show(data) {
-console.log("🌊 ~ show ~ data:", data)
+    console.log("🌊 ~ show ~ data:", data)
 
     // 存储id和pkId到formData
     const idRecord = data.find(item => item.d1 === 'id');
@@ -193,6 +193,32 @@ console.log("🌊 ~ show ~ data:", data)
     }));
 }
 
+async function hisShow(record) {
+    let data = await getHisModifyInfo(record)
+    console.log("🌊 ~ show ~ data:", data)
+
+    // 存储id和pkId到formData
+    const idRecord = data.find(item => item.d1 === 'id');
+    const pkIdRecord = data.find(item => item.d1 === 'pkId');
+    const statusRecord = data.find(item => item.d1 === 'status');
+
+    if (idRecord) {
+        formData.id = idRecord.d3;
+    }
+    if (pkIdRecord) {
+        formData.pkId = pkIdRecord.d3;
+    }
+    formData.comName = data.find(item => item.d1 === 'comName').d2;
+    formData.openId = data.find(item => item.d1 === 'openId').d2;
+    tableData.value = data.map(item => ({
+        ...item,
+        // 处理null/undefined显示为空字符串
+        d2: item.d2 ?? '',
+        d3: item.d3 ?? ''
+    }));
+}
+
+
 async function submitForm() {
     try {
         // 触发表单验证
@@ -230,6 +256,7 @@ onMounted(async () => {
 
 defineExpose({
     show,
+    hisShow,
     submitForm
 });
 </script>

src/views/admin/orgapplyinfo/components/OrgUpContractForm.vue

@@ -8,13 +8,6 @@
             <a-col :span="24" style="border-bottom: 2px solid #f7f7f7; margin-bottom: 14px;">
               <SectionDivider :title="'机构信息'" />
             </a-col>
-            <a-col :span="12">
-              <a-form-item label="机构所在地">
-                <a-textarea :autosize="{ minRows: 1 }" maxlength="50" disabled v-model:value="cityViewValue"
-                  allow-clear></a-textarea>
-                <!-- {{ cityViewValue }} -->
-              </a-form-item>
-            </a-col>
             <a-col :span="12">
               <a-form-item label="机构名称" v-bind="validateInfos.comName" id="OrgApplyInfoForm-comName" name="comName">
                 <a-textarea :autosize="{ minRows: 1 }" maxlength="50" disabled v-model:value="formData.comName"
@@ -22,6 +15,13 @@
                 <!-- {{ formData.comName }} -->
               </a-form-item>
             </a-col>
+            <a-col :span="12">
+              <a-form-item label="机构所在地">
+                <a-textarea :autosize="{ minRows: 1 }" maxlength="50" disabled v-model:value="cityViewValue"
+                  allow-clear></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">
@@ -166,7 +166,7 @@ const confirmLoading = ref<boolean>(false);
 const validatorRules = reactive({
   status: [{ required: true, message: '请选择审核结果!' },],
   contract: [{ required: true, message: '请上传加盟合同!' },],
-  contractNote: [{ required: true, message: '请填写备注信息!' },],
+  // contractNote: [{ required: true, message: '请填写备注信息!' },],
 });
 const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });