新增加盟机构信息功能

src/components/OrgCard/OrgCardCom.vue

@@ -11,16 +11,16 @@
           <div>
             <span class="ellipsis-one-lines1" :title="orgInfo.departName" style="font-size: 17px; font-weight: bold;">{{
               orgInfo.departName
-              }}</span>
+            }}</span>
           </div>
         </a-col>
         <a-col :span="existTagFunc() ? 8 : 3" style="text-align: right;">
           <div style="display: flex; align-items: center; justify-content: flex-end; gap: 8px;">
-            <span v-if="isDirectiveMain"
+            <span v-if="isDirectiveMain && showMainTile"
               style="color: #909399; font-size: 12px; font-weight: bold; white-space: nowrap;">
               标准指令库
             </span>
-            <span v-if="isElderTagMain"
+            <span v-if="isElderTagMain && showMainTile"
               style="color: #909399; font-size: 12px; font-weight: bold; white-space: nowrap;">
               标准标签库
             </span>
@@ -32,7 +32,7 @@
       </a-row>
     </template>
 
-    
+
     <div style="position: relative;">
       <div>
         <div><span style="color: #909399;">机构负责人：</span>{{ orgInfo.orgLeader }}</div>
@@ -46,6 +46,8 @@
         <span style="color: #909399;">加盟时间：{{ orgInfo.franchiseTime?.substring(0, 10) }}</span>
         <a-button style="font-size: 12px;" v-show="showDetail" type="link" size="small"
           @click.stop="handleDetail">了解更多</a-button>
+        <a-button style="font-size: 12px;" v-show="showInfo" type="link" size="small"
+          @click.stop="handleInfo">查看详情</a-button>
       </div>
     </div>
   </a-card>
@@ -62,10 +64,12 @@ const props = defineProps({
   isDirectiveMain: { type: Boolean, default: false },//标准指令库
   isElderTagMain: { type: Boolean, default: false },//标准标签库
   showDetail: { type: Boolean, default: false },
-  clickable: { type: Boolean, default: false }
+  showInfo: { type: Boolean, default: false },
+  clickable: { type: Boolean, default: false },
+  showMainTile: { type: Boolean, default: true },//是否展示标准指令库/标签库
 })
 
-const emit = defineEmits(['click', 'detail'])
+const emit = defineEmits(['click', 'detail', 'info'])
 
 const existTagFunc = () => {
   return props.isDirectiveMain || props.isElderTagMain
@@ -78,6 +82,10 @@ const handleClick = () => {
 const handleDetail = () => {
   emit('detail', props.orgInfo)
 }
+
+const handleInfo = () => {
+  emit('info', props.orgInfo)
+}
 </script>
 
 <style lang="less" scoped>

src/views/admin/orgInfo/OrgApplyInfo.api.ts

@@ -0,0 +1,96 @@
+import { defHttp } from '/@/utils/http/axios';
+import { useMessage } from "/@/hooks/web/useMessage";
+
+const { createConfirm } = useMessage();
+
+enum Api {
+  list = '/admin/orgapplyinfo/orgApplyInfo/list',
+  save='/admin/orgapplyinfo/orgApplyInfo/add',
+  edit='/admin/orgapplyinfo/orgApplyInfo/edit',
+  editCg='/admin/orgapplyinfo/orgApplyInfo/editCg',
+  submitContract='/admin/orgapplyinfo/orgApplyInfo/submitContract',
+  deleteOne = '/admin/orgapplyinfo/orgApplyInfo/delete',
+  deleteBatch = '/admin/orgapplyinfo/orgApplyInfo/deleteBatch',
+  importExcel = '/admin/orgapplyinfo/orgApplyInfo/importExcel',
+  exportXls = '/admin/orgapplyinfo/orgApplyInfo/exportXls',
+  getOrgInfo = '/admin/orgapplyinfo/orgApplyInfo/getOrgInfo',
+}
+
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) => defHttp.get({ url: Api.list, params });
+
+/**
+ * 获取机构详细信息（包含sys_depart信息）
+ * @param params orgCode部门编码 不传查所有
+ * @returns 
+ */
+export const getOrgInfo = (params) => defHttp.get({ url: Api.getOrgInfo, params });
+
+/**
+ * 删除单个
+ * @param params
+ * @param handleSuccess
+ */
+export const deleteOne = (params,handleSuccess) => {
+  return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
+    handleSuccess();
+  });
+}
+
+/**
+ * 批量删除
+ * @param params
+ * @param handleSuccess
+ */
+export const batchDelete = (params, handleSuccess) => {
+  createConfirm({
+    iconType: 'warning',
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}
+
+/**
+ * 保存或者更新
+ * @param params
+ * @param isUpdate
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+  let url = isUpdate ? Api.edit : Api.save;
+  return defHttp.post({ url: url, params }, { isTransformResponse: false });
+}
+
+
+export const editCg = (params, isUpdate) => {
+  return defHttp.post({ url: Api.editCg, params }, { isTransformResponse: false });
+}
+
+/**
+ * 保存并提交
+ * @param params
+ * @param isUpdate
+ */
+export const submitContract = (params) => {
+  return defHttp.post({ url: Api.submitContract, params });
+}

src/views/admin/orgInfo/OrgInfoList.vue

@@ -0,0 +1,188 @@
+<template>
+    <div class="p-2">
+        <!--查询区域-->
+        <div class="jeecg-basic-table-form-container">
+            <a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol"
+                :wrapper-col="wrapperCol">
+                <a-row :gutter="24">
+                    <a-col :lg="6">
+                        <a-form-item name="title">
+                            <template #label><span title="机构名称">机构名称</span></template>
+                            <a-input placeholder="请输入机构名称" v-model:value="queryParam.title" allow-clear></a-input>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :lg="6">
+                        <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
+                        <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset"
+                            style="margin-left: 8px">重置</a-button>
+                    </a-col>
+                    <a-col :lg="12" style="text-align: right;">
+                    </a-col>
+                </a-row>
+            </a-form>
+        </div>
+
+        <OrgListCom ref="orgListComRef" :title="queryParam.title" @handleOrgInfo="handleDetail" :showMainTile="false"
+            :showInfo="true">
+        </OrgListCom>
+
+        <!-- 表单区域 -->
+        <OrgApplyInfoModal ref="registerModal"></OrgApplyInfoModal>
+    </div>
+</template>
+
+<script setup name="synchronization-directive2" lang="ts">
+import { ref, reactive, computed, onMounted, watch } from 'vue'
+import { getOrgInfo } from '/@/views/admin/orgapplyinfo/OrgApplyInfo.api';
+import OrgListCom from '/@/views/synchronization/directive/orgCom/OrgListCom.vue'
+import OrgApplyInfoModal from './components/OrgApplyInfoModal.vue'
+
+const formRef = ref();
+const registerModal = ref();
+const orgTableList = ref<any>([]);
+const queryParam = reactive<any>({});
+const pageParams = ref({ pageNo: 1, pageSize: 8 })
+const orgListComRef = ref()
+
+const labelCol = reactive({
+    xs: 24,
+    sm: 4,
+    xl: 6,
+    xxl: 4
+});
+const wrapperCol = reactive({
+    xs: 24,
+    sm: 20,
+});
+
+/**
+ * 详情
+ * @param record
+ */
+function handleDetail(record) {
+    registerModal.value.disableSubmit = true;
+    registerModal.value.edit(record);
+}
+/**
+ * 查询
+ */
+function searchQuery() {
+    orgListComRef.value?.reload();
+}
+
+function reload() {
+    //刷新数据
+    queryParam.pageSize = pageParams.value.pageSize;
+    queryParam.pageNo = pageParams.value.pageNo;
+    getOrgInfo(queryParam).then(res => {
+        orgTableList.value = res;
+    });
+}
+
+/**
+ * 重置
+ */
+function searchReset() {
+    queryParam.title = null
+    orgListComRef.value?.searchReset()
+}
+
+
+// 自动请求并暴露内部方法
+onMounted(() => {
+    reload();
+    orgListComRef.value?.reload();
+});
+
+</script>
+
+<style lang="less" scoped>
+.jeecg-basic-table-form-container {
+    padding: 0;
+    margin-bottom: 14px;
+
+    .table-page-search-submitButtons {
+        display: block;
+        margin-bottom: 0px;
+        white-space: nowrap;
+    }
+
+    .query-group-cust {
+        min-width: 100px !important;
+    }
+
+    .query-group-split-cust {
+        width: 30px;
+        display: inline-block;
+        text-align: center
+    }
+
+    .ant-form-item:not(.ant-form-item-with-help) {
+        margin-bottom: 14px;
+        height: 32px;
+    }
+
+    :deep(.ant-picker),
+    :deep(.ant-input-number) {
+        width: 100%;
+    }
+}
+
+.cardTitle {
+    background: #1ea0fa;
+    width: 100%;
+    margin: -28px -24px;
+    padding-top: 15px;
+    border-radius: 5px 5px 0px 0px;
+    color: white;
+    height: 55px;
+    display: block;
+    position: absolute;
+}
+
+.zxClass {
+    font-size: 12px;
+    background: linear-gradient(to right, #1ea0fa, #017de9);
+    border-radius: 8px;
+    height: 25px;
+    color: white;
+    line-height: 25px;
+}
+
+.lxClass {
+    font-size: 14px;
+    background: linear-gradient(to right, #cccccc, #cccccc);
+    border-radius: 8px;
+    height: 35px;
+    color: white;
+    line-height: 35px;
+}
+
+.tbClass {
+    background: #f6f6f6;
+    padding: 8px;
+    border-radius: 5px;
+}
+
+.antTitle {
+    margin-top: 10px;
+    display: block;
+    font-size: 12px;
+}
+
+.ellipsis-one-lines {
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 1;
+    /* 限制文本为2行 */
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+
+.content-refresh-btn {
+    position: absolute;
+    top: 60px;
+    right: 20px;
+    z-index: 1;
+}
+</style>

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

@@ -0,0 +1,408 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <JFormContainer>
+      <template #detail>
+        <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol"
+          name="OrgApplyInfoForm">
+
+          <a-row>
+            <a-col :span="24">
+              <SectionDivider :title="'机构信息'" />
+            </a-col>
+
+          </a-row>
+          <a-row>
+            <a-col :span="12">
+              <a-row>
+                <a-col :span="24">
+                  <a-form-item label="营业执照照片" v-bind="validateInfos.comBusinessLicense"
+                    id="OrgApplyInfoForm-comBusinessLicense" name="comBusinessLicense">
+                    <JImageUpload :fileMax="1" v-model:value="formData.comBusinessLicense" :disabled="true">
+                    </JImageUpload>
+                  </a-form-item>
+                </a-col>
+                <a-col :span="24">
+                  <a-form-item label="信用代码" v-bind="validateInfos.comCreditCode" id="OrgApplyInfoForm-comCreditCode"
+                    name="comCreditCode">
+                    {{ formData.comCreditCode }}
+                  </a-form-item>
+                </a-col>
+                <a-col :span="24">
+                  <a-form-item label="企业名称" v-bind="validateInfos.comName" id="OrgApplyInfoForm-comName" name="comName">
+                    {{ formData.comName }}
+                  </a-form-item>
+                </a-col>
+                <a-col :span="24">
+                  <a-form-item label="企业法人" v-bind="validateInfos.comLegalPerson" id="OrgApplyInfoForm-comLegalPerson"
+                    name="comLegalPerson">
+                    {{ formData.comLegalPerson }}
+                  </a-form-item>
+                </a-col>
+                <a-col :span="24">
+                  <a-form-item label="注册地址" v-bind="validateInfos.comRegisterAddress"
+                    id="OrgApplyInfoForm-comRegisterAddress" name="comRegisterAddress">
+                    {{ formData.comRegisterAddress }}
+                  </a-form-item>
+                </a-col>
+
+              </a-row>
+            </a-col>
+            <a-col :span="12">
+              <a-row>
+                <a-col :span="24">
+                  <a-form-item label="机构所在地" v-bind="validateInfos.cityViewValue" id="OrgApplyInfoForm-cityViewValue"
+                    name="cityViewValue">
+                    {{ cityViewValue }}
+                  </a-form-item>
+                </a-col>
+                <a-col :span="24">
+                  <a-form-item label="机构负责人" v-bind="validateInfos.orgLeader" id="OrgApplyInfoForm-orgLeader"
+                    name="orgLeader">
+                    {{ formData.orgLeader }}
+                  </a-form-item>
+                </a-col>
+                <a-col :span="24">
+                  <a-form-item label="负责人电话" v-bind="validateInfos.orgLeaderPhone" id="OrgApplyInfoForm-orgLeaderPhone"
+                    name="orgLeaderPhone">
+                    {{ formData.orgLeaderPhone }}
+                  </a-form-item>
+                </a-col>
+                <a-col :span="24">
+                  <a-form-item label="房屋性质" v-bind="validateInfos.orgPropertyType" id="OrgApplyInfoForm-orgPropertyType"
+                    name="orgPropertyType">
+                    {{ formData.orgPropertyType }}
+                  </a-form-item>
+                </a-col>
+                <a-col :span="24">
+                  <a-form-item label="建筑面积" v-bind="validateInfos.orgBuildingArea" id="OrgApplyInfoForm-orgBuildingArea"
+                    name="orgBuildingArea">
+                    {{ formData.orgBuildingArea }} ㎡
+                  </a-form-item>
+                </a-col>
+                <a-col :span="24">
+                  <a-form-item label="机构地址" v-bind="validateInfos.orgAddress" id="OrgApplyInfoForm-orgAddress"
+                    name="orgAddress">
+                    {{ formData.orgAddress }}
+                  </a-form-item>
+                </a-col>
+              </a-row>
+            </a-col>
+          </a-row>
+
+          <a-row>
+            <a-col :span="24">
+              <SectionDivider :title="'申请人身份证'" />
+            </a-col>
+          </a-row>
+          <a-row>
+            <a-col :span="12">
+              <a-row>
+                <a-col :span="24">
+                  <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="24">
+                  <a-form-item label="姓名" v-bind="validateInfos.name" id="OrgApplyInfoForm-name" name="name">
+                    {{ formData.name }}
+                  </a-form-item>
+                </a-col>
+                <a-col :span="24">
+                  <a-form-item label="性别" v-bind="validateInfos.sex" id="OrgApplyInfoForm-sex" name="sex">
+                    {{ formData.sex }}
+                  </a-form-item>
+                </a-col>
+                <a-col :span="24">
+                  <a-form-item label="民族" v-bind="validateInfos.national" id="OrgApplyInfoForm-national"
+                    name="national">
+                    {{ formData.national }}
+                  </a-form-item>
+                </a-col>
+                <a-col :span="24">
+                  <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="24">
+                  <a-form-item label="身份证号" v-bind="validateInfos.idCard" id="OrgApplyInfoForm-idCard" name="idCard">
+                    {{ formData.idCard }}
+                  </a-form-item>
+                </a-col>
+                <a-col :span="24">
+                  <a-form-item label="住址" v-bind="validateInfos.idCardAddress" id="OrgApplyInfoForm-idCardAddress"
+                    name="idCardAddress">
+                    {{ formData.idCardAddress }}
+                  </a-form-item>
+                </a-col>
+              </a-row>
+            </a-col>
+            <a-col :span="12">
+              <a-row>
+                <a-col :span="24">
+                  <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="24">
+                  <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="24">
+                  <a-form-item label="有效结束日期" v-bind="validateInfos.endTime" id="OrgApplyInfoForm-endTime"
+                    name="endTime">
+                    {{ formData.endTime
+                      ? (formData.endTime.substring(0, 10) == '9999-12-31' ? '长期' : formData.endTime.substring(0, 10))
+                      : "" }}
+                  </a-form-item>
+                </a-col>
+                <a-col :span="24">
+                  <a-form-item label="签发机关" v-bind="validateInfos.issuingAuthority"
+                    id="OrgApplyInfoForm-issuingAuthority" name="issuingAuthority">
+                    {{ formData.issuingAuthority }}
+                  </a-form-item>
+                </a-col>
+              </a-row>
+            </a-col>
+          </a-row>
+        </a-form>
+      </template>
+    </JFormContainer>
+    <!-- <a-col :span="24" v-if="!!formData.orgCoordinateLa && !!formData.orgCoordinateLo">
+      <TencentMap :latitude="formData.orgCoordinateLa" :longitude="formData.orgCoordinateLo" />
+    </a-col> -->
+  </a-spin>
+</template>
+
+<script lang="ts" setup>
+import { ref, reactive, defineExpose, nextTick, defineProps, computed, onMounted } from 'vue';
+import { defHttp } from '/@/utils/http/axios';
+import { useMessage } from '/@/hooks/web/useMessage';
+import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+import { getValueType } from '/@/utils';
+import { saveOrUpdate } from '../OrgApplyInfo.api';
+import { Form } from 'ant-design-vue';
+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';
+import { encryptByBase64 } from "@/utils/cipher";
+import { useGlobSetting } from '/@/hooks/setting';
+const glob = useGlobSetting();
+
+const cityViewValue = ref('')
+const props = defineProps({
+  formDisabled: { type: Boolean, default: false },
+  formData: { type: Object, default: () => ({}) },
+  formBpm: { type: Boolean, default: true }
+});
+const formRef = ref();
+const useForm = Form.useForm;
+const emit = defineEmits(['register', 'ok']);
+const formData = reactive<Record<string, any>>({
+  id: '',
+  openId: '',
+  wechatName: '',
+  tel: '',
+  status: '',
+  buildStatus: '',
+  content: '',
+  createTime: '',
+  updateTime: '',
+  izEntry: '',
+  name: '',
+  sex: '',
+  national: '',
+  birthDate: '',
+  idCardAddress: '',
+  idCard: '',
+  issuingAuthority: '',
+  startTime: '',
+  endTime: '',
+  cardZmPath: '',
+  cardFmPath: '',
+  comBusinessLicense: '',
+  comName: '',
+  comRegisterAddress: '',
+  comCreditCode: '',
+  comLegalPerson: '',
+  orgAddress: '',
+  orgCoordinateLo: '',
+  orgCoordinateLa: '',
+  orgLeader: '',
+  orgLeaderPhone: '',
+  orgBuildingNumber: '',
+  orgPropertyType: '',
+  orgBuildingArea: undefined,
+  orgProvince: '',
+  orgCity: '',
+  orgDistrict: '',
+  orgProvince_dictText: '',
+  orgCity_dictText: '',
+  orgDistrict_dictText: '',
+  franchiseTime: null,
+  contract: null,
+  contractNote: null,
+  replyContent: '',
+  replyFile: '',
+  replyTime: '',
+  handleBy: '',
+  workOrderStatus: '',
+  workOrderStatus_dictText: '',
+  auditBy: '',
+  auditTime: '',
+
+});
+const tempNullVal = ref('');
+const sfsh = ref<string>('0');
+const { createMessage } = useMessage();
+const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 8 } });
+const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 16 } });
+const confirmLoading = ref<boolean>(false);
+//表单验证
+const validatorRules = reactive({
+  status: [{ required: true, message: '请选择审核结果!' },],
+  content: [
+    {
+      validator: async (_rule, value) => {
+        if (formData.status === '3' && !value) {
+          return Promise.reject('请输入驳回原因!');
+        }
+        return Promise.resolve();
+      },
+    },
+  ],
+});
+const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });
+
+// 表单禁用
+const disabled = computed(() => {
+  if (props.formBpm === true) {
+    if (props.formData.disabled === false) {
+      return false;
+    } else {
+      return true;
+    }
+  }
+  return props.formDisabled;
+});
+
+
+/**
+ * 预览
+ */
+function handleView(record) {
+  if (record && record.url) {
+    console.log('glob.onlineUrl', glob.viewUrl);
+    let url = encodeURIComponent(encryptByBase64(record.url));
+    let previewUrl = `${glob.viewUrl}?url=` + url;
+    window.open(previewUrl, '_blank');
+  }
+}
+/**
+ * 新增
+ */
+function add() {
+  edit({});
+}
+
+/**
+ * 编辑
+ */
+function edit(record) {
+  console.log("🌊 ~ edit ~ record:", record)
+  nextTick(() => {
+    resetFields();
+    let tmpData = {};
+    Object.keys(formData).forEach((key) => {
+      if (record.hasOwnProperty(key)) {
+        tmpData[key] = record[key]
+      }
+    })
+    var lsbl = tmpData.status;
+    console.log("🚀 ~ edit ~ lsbl:", lsbl)
+    if (tmpData.status != '2' && tmpData.status != '3') {
+      tmpData.status = null
+    }
+    cityViewValue.value = record.orgProvince_dictText
+      + (!!record.orgCity_dictText ? record.orgCity_dictText : '')
+      + (!!record.orgDistrict_dictText ? record.orgDistrict_dictText : '')
+    //赋值
+    Object.assign(formData, tmpData);
+    if (lsbl == '1') {
+      sfsh.value = '1'
+    } else {
+      sfsh.value = '0'
+    }
+  });
+}
+
+/**
+ * 提交数据
+ */
+async function submitForm() {
+  try {
+    // 触发表单验证
+    await validate();
+  } catch ({ errorFields }) {
+    if (errorFields) {
+      const firstField = errorFields[0];
+      if (firstField) {
+        formRef.value.scrollToField(firstField.name, { behavior: 'smooth', block: 'center' });
+      }
+    }
+    return Promise.reject(errorFields);
+  }
+  confirmLoading.value = true;
+  const isUpdate = ref<boolean>(false);
+  //时间格式化
+  let model = formData;
+  if (model.id) {
+    isUpdate.value = true;
+  }
+  //循环数据
+  for (let data in model) {
+    //如果该数据是数组并且是字符串类型
+    if (model[data] instanceof Array) {
+      let valueType = getValueType(formRef.value.getProps, data);
+      //如果是字符串类型的需要变成以逗号分割的字符串
+      if (valueType === 'string') {
+        model[data] = model[data].join(',');
+      }
+    }
+  }
+  if (model.status == '2') {
+    model.buildStatus = 'approvalPass'//代表加盟审核通过
+  }
+  await saveOrUpdate(model, isUpdate.value)
+    .then((res) => {
+      if (res.success) {
+        createMessage.success(res.message);
+        emit('ok');
+      } else {
+        createMessage.warning(res.message);
+      }
+    })
+    .finally(() => {
+      confirmLoading.value = false;
+    });
+}
+
+
+defineExpose({
+  add,
+  edit,
+  submitForm,
+});
+</script>
+
+<style lang="less" scoped>
+.antd-modal-form {
+  padding: 14px;
+}
+</style>

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

@@ -0,0 +1,129 @@
+<template>
+  <a-drawer :title="title" :width="`70vw`"  v-model:visible="visible" :closable="true"
+    :footer-style="{ textAlign: 'right' }" @close="handleCancel">
+    <OrgApplyInfoForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false">
+    </OrgApplyInfoForm>
+    <template #footer>
+      <a-button type="primary" style="margin-right: 8px" @click="handleCancel">关闭</a-button>
+      <a-button type="primary" @click="handleOk" v-if="!disableSubmit">确认</a-button>
+    </template>
+  </a-drawer>
+
+
+</template>
+
+<script lang="ts" setup>
+import { ref, nextTick, defineExpose } from 'vue';
+import OrgApplyInfoForm from './OrgApplyInfoForm.vue'
+import JModal from '/@/components/Modal/src/JModal/JModal.vue';
+
+const title = ref<string>('');
+const visible = ref<boolean>(false);
+const disableSubmit = ref<boolean>(false);
+const registerForm = ref();
+const contractVisible = ref<boolean>(false);
+const upContractForm = ref();
+const emit = defineEmits(['register', 'success']);
+function handleExtraButton(){
+
+}
+/**
+ * 新增
+ */
+function add() {
+  title.value = '新增';
+  visible.value = true;
+  nextTick(() => {
+    registerForm.value.add();
+  });
+}
+
+/**
+ * 编辑
+ * @param record
+ */
+function edit(record) {
+  title.value = disableSubmit.value ? '详情' : '机构加盟申请审核';
+  visible.value = true;
+  nextTick(() => {
+    registerForm.value.edit(record);
+  });
+}
+
+/**
+ * 确定按钮点击事件
+ */
+function handleOk() {
+  registerForm.value.submitForm();
+}
+
+/**
+ * form保存回调事件
+ */
+function submitCallback() {
+  handleCancel();
+  emit('success');
+}
+
+/**
+ * 取消按钮回调事件
+ */
+function handleCancel() {
+  visible.value = false;
+}
+
+/**
+ * 关闭合同上传窗口
+ */
+function handleContractCancel() {
+  contractVisible.value = false
+}
+
+/**
+ * 打开上传合同编辑窗口
+ */
+function editContract(record) {
+  contractVisible.value = true
+  nextTick(() => {
+    upContractForm.value.edit(record);
+  });
+}
+
+/**
+ * 上传合同提交
+ */
+function submitContractCallback() {
+  console.log(99999)
+  handleContractCancel();
+  emit('success');
+}
+
+/**
+ * 保存为草稿
+ */
+function saveContract() {
+  upContractForm.value.saveForm();
+}
+
+/**
+ * 保存并提交
+ */
+function submitContract() {
+  upContractForm.value.submitForm();
+}
+
+defineExpose({
+  add,
+  edit,
+  disableSubmit,
+  editContract,
+});
+</script>
+
+<style lang="less">
+/**隐藏样式-modal确定按钮 */
+.jee-hidden {
+  display: none !important;
+}
+</style>
+<style lang="less" scoped></style>

src/views/synchronization/directive/orgCom/OrgListCom.vue

@@ -5,11 +5,12 @@
         :md="props.layout == 'full' ? 12 : 8" :lg="props.layout == 'full' ? 12 : 8" :xl="props.layout == 'full' ? 8 : 8"
         :xxl="props.layout == 'full' ? 6 : 8" :xxxl="props.layout == 'full' ? 4 : 8"
         :style="{ 'padding-right': ((index + 1) % 4 != 0) ? '14px' : '0px', 'padding-bottom': '14px' }">
-        <OrgCard :orgInfo="item" :layout="props.layout"
+        <OrgCard :orgInfo="item" :layout="props.layout" :showMainTile="props.showMainTile" :showInfo="props.showInfo"
           :is-selected="selectedOrgs.some(org => org.orgCode === item.orgCode)"
           :is-directive-selected="directiveMainSelectedOrg?.orgCode === item.orgCode"
           :is-directive-main="dmOrg?.orgCode === item.orgCode" :show-detail="props.showDetail"
-          :clickable="props.showChoose || props.showDirectiveChoose" @click="handleCardClick" @detail="handleDetail" />
+          :clickable="props.showChoose || props.showDirectiveChoose" @click="handleCardClick" @detail="handleDetail"
+          @info="handleInfo" />
       </a-col>
       <a-col v-if="orgTableList.length == 0">
         <div style="margin: 30px auto;">
@@ -38,6 +39,7 @@ const props = defineProps({
   showChoose: { type: Boolean, default: false },
   pageSize: { type: Number, default: 8 },
   showDetail: { type: Boolean, default: false },
+  showInfo: { type: Boolean, default: false },
   title: { type: String, default: '' },
   allowMultipleSelection: { type: Boolean, default: false },
   layout: { type: String, default: 'full' },
@@ -45,9 +47,10 @@ const props = defineProps({
   showDirectiveMain: { type: Boolean, default: false },
   showDirectiveChoose: { type: Boolean, default: false },
   showDMTip: { type: Boolean, default: false },
+  showMainTile: { type: Boolean, default: true },//是否展示标准指令库/标签库
 })
 
-const emit = defineEmits(['handleOrgDetail', 'handleOrgChoose'])
+const emit = defineEmits(['handleOrgDetail', 'handleOrgChoose', 'handleOrgInfo'])
 
 const orgTableList = ref<any>({ records: [], total: 0 })
 const queryParam = reactive<any>({})
@@ -82,6 +85,10 @@ function handleDetail(item: any) {
   emit('handleOrgDetail', item)
 }
 
+function handleInfo(item: any) {
+  emit('handleOrgInfo', item)
+}
+
 function reload() {
   directiveMainSelectedOrg.value = {}
   queryParam.pageSize = pageParams.value.pageSize

src/views/synchronization/directive/syncList.vue

@@ -34,7 +34,7 @@
       </a-form>
     </div>
 
-    <OrgListCom ref="orgListComRef" :title="queryParam.title" @handleOrgDetail="handleDetail" :showDetail=true
+    <OrgListCom ref="orgListComRef" :title="queryParam.title" @handleOrgDetail="handleDetail" :showDetail=true 
       :showDMTip="true">
     </OrgListCom>