审批记录

src/api/sys/member.ts

@@ -16,12 +16,16 @@ import {
   UserIdParams,
   AddUserParams,
   EditUserParams,
+  GetCheckRecordkListModel,
+  ChecRecordIdParams,
+  GetCheckRecordModel,
 } from './model/memberModel';
 
 enum Api {
   UserUrl = '/member/user',
   UnitUrl = '/member/unit',
   PersonUrl = '/member/person',
+  CheckUrl = '/member/check',
 }
 
 /**
@@ -206,3 +210,43 @@ export function deleteUser(params: UserIdParams) {
     method: 'DELETE',
   });
 }
+
+/**
+ * @description: GetChecRecordkList -----------------------------------------------审批记录
+ */
+export function GetChecRecordkList(params) {
+  return defHttp.request<GetCheckRecordkListModel>({
+    url: Api.CheckUrl,
+    method: 'GET',
+    params,
+  });
+}
+/**
+ * @description: 批量删除审批记录
+ */
+export function deleteBatchesCheckRecord(params: DeleteBatchesParams) {
+  return defHttp.request({
+    url: Api.CheckUrl,
+    method: 'DELETE',
+    params,
+  });
+}
+
+/**
+ * @description: 获取单个审批记录
+ */
+export function GetChecRecord(params: ChecRecordIdParams) {
+  return defHttp.request<GetCheckRecordModel>({
+    url: Api.CheckUrl + '/' + params.id,
+    method: 'GET',
+  });
+}
+/**
+ * @description: 删除单个会员
+ */
+export function deleteChecRecord(params: ChecRecordIdParams) {
+  return defHttp.request({
+    url: Api.CheckUrl + '/' + params.id,
+    method: 'DELETE',
+  });
+}

src/api/sys/model/memberModel.ts

@@ -109,3 +109,5 @@ export interface AddUserParams {
 export interface EditUserParams {
   id: number;
 }
+
+// --------------审批记录----------------

src/views/admin/logs/index.vue

@@ -9,8 +9,8 @@
         <a-button color="error" @click="deleteA"> 删除 </a-button>
         <a-button type="primary" @click="openModal"> 导出 </a-button>
       </template>
-      <template #action="{ record, column }">
-        <TableAction :actions="createActions(record, column)" />
+      <template #action="{ record }">
+        <TableAction :actions="createActions(record)" />
       </template>
     </BasicTable>
     <ExpExcelModel @register="register" @success="defaultHeader" />

src/views/bill/account/index.vue

@@ -290,7 +290,7 @@
         return [
           {
             label: '详情',
-            icon: 'ant-design:info-outlined',
+            icon: 'ant-design:info-circle-outlined',
             onClick: handleInfo.bind(null, record),
           },
           {

src/views/member/apply/data.ts

@@ -0,0 +1,105 @@
+import { FormProps, BasicColumn } from '/@/components/Table';
+import { DescItem } from '/@/components/Description/index';
+// import { adapt } from '/@/utils/adapt';
+import moment from 'moment';
+
+// const adaptWidth = adapt();
+export const columns: BasicColumn[] = [
+  {
+    title: 'ID',
+    dataIndex: 'id',
+    editComponentProps: {
+      prefix: '$',
+    },
+    width: 100,
+    sorter: true,
+  },
+  {
+    title: '申请成员',
+    dataIndex: 'name',
+    width: 160,
+    sorter: true,
+  },
+  {
+    title: '审批信息',
+    dataIndex: 'reason',
+    width: 220,
+    sorter: true,
+  },
+  {
+    title: '审批时间',
+    dataIndex: 'createtime',
+    width: 150,
+    customRender({ record }) {
+      return moment(record.createtime * 1000).format('YYYY-MM-DD HH:mm:ss');
+    },
+    sorter: true,
+  },
+];
+
+export function getFormConfig(): Partial<FormProps> {
+  return {
+    labelWidth: 110,
+    schemas: [
+      {
+        field: `id`,
+        label: `ID`,
+        component: 'Input',
+        componentProps: {
+          placeholder: 'ID',
+        },
+        colProps: {
+          xl: 12,
+          xxl: 8,
+        },
+      },
+      {
+        field: `name`,
+        label: `申请成员`,
+        component: 'Input',
+        componentProps: {
+          placeholder: '申请成员',
+        },
+        colProps: {
+          xl: 12,
+          xxl: 8,
+        },
+      },
+      {
+        field: `createtime`,
+        label: `审批日期`,
+        component: 'RangePicker',
+        componentProps: {
+          showTime: true,
+        },
+        colProps: {
+          xl: 12,
+          xxl: 8,
+        },
+      },
+    ],
+  };
+}
+
+// =================popup================================
+export const schemas: DescItem[] = [
+  {
+    field: 'id',
+    label: 'ID',
+  },
+  {
+    field: 'name',
+    label: '申请成员',
+  },
+  {
+    field: 'createtime',
+    label: '审批时间',
+    render: (_, data) => {
+      return moment(data.createtime * 1000).format('YYYY-MM-DD HH:mm:ss');
+    },
+  },
+  {
+    field: 'reason',
+    label: '审批信息',
+  },
+];

src/views/member/applyRecord/index.vue → src/views/member/apply/index.vue

@@ -12,7 +12,7 @@
       :rowClassName="tableRowClass"
       @selectionChange="selectionChange"
       @rowClick="rowClick"
-      @rowDbClick="handleEdit"
+      @rowDbClick="handleDetail"
       :canResize="true"
       :pagination="{
         pageSize: 10,
@@ -22,7 +22,6 @@
     >
       <template #toolbar>
         <div class="tool-btn-wrap">
-          <a-button type="primary" @click="addRole"> 添加 </a-button>
           <a-button color="error" :disabled="disable_btn" @click="deleteBatches"> 删除 </a-button>
           <a-button @click="openModal"> 导出 </a-button>
         </div>
@@ -33,7 +32,7 @@
       </template>
     </BasicTable>
     <ExpExcelModel @register="register" @success="defaultHeader" />
-    <Popup @register="addRegister" :popupData="popupData" @saveData="saveData" />
+    <Popup @register="addRegister" />
   </CollapseContainer>
 </template>
 <script lang="ts">
@@ -48,12 +47,10 @@
   import { getFormConfig, columns } from './data';
   import moment from 'moment';
   import {
-    getUnitList,
-    addUnit,
-    deleteBatchesUnit,
-    getUnit,
-    editUnit,
-    deleteUnit,
+    GetChecRecordkList,
+    GetChecRecord,
+    deleteBatchesCheckRecord,
+    deleteChecRecord,
   } from '/@/api/sys/member';
   import {
     BasicTable,
@@ -64,34 +61,25 @@
     TableActionType,
   } from '/@/components/Table';
 
-  interface PopupData {
-    title: string;
-  }
   interface Btn {
     disable_btn: boolean;
   }
 
   export default defineComponent({
-    name: 'Unit',
+    name: 'ApplyRecord',
     components: { CollapseContainer, BasicTable, TableAction, Popup, ExpExcelModel },
     setup() {
       const { createMessage } = useMessage();
       const { success /*, error*/ } = createMessage;
       const tableRef = ref<Nullable<TableActionType>>(null);
       const currentEditKeyRef = ref('');
-      const popupData = reactive<PopupData>({
-        title: '添加',
-      });
-      // const state = reactive({
-      //   isSerach: false,
-      // });
       const btn = reactive<Btn>({
         disable_btn: true,
       });
       const [registerTable] = useTable({
         rowSelection: { type: 'checkbox' },
         columns: columns,
-        api: getUnitList,
+        api: GetChecRecordkList,
         useSearchForm: true,
         showTableSetting: true,
         tableSetting: {
@@ -101,7 +89,7 @@
         beforeFetch: beforeFetch,
         formConfig: getFormConfig(),
         actionColumn: {
-          width: 160,
+          width: 140,
           title: '操作',
           dataIndex: 'action',
           slots: { customRender: 'action' },
@@ -142,19 +130,10 @@
         delete params.page;
         delete params.pageSize;
       }
-      // function handleSearch() {
-      //   state.isSerach = !state.isSerach;
-      // }
 
-      function addRole() {
-        popupData.title = '添加';
-        openPopup(true, {});
-      }
-
-      function handleEdit(record: EditRecordRow) {
+      function handleDetail(record: EditRecordRow) {
         currentEditKeyRef.value = record.id; // record.key
-        popupData.title = '编辑';
-        getUnit({ id: record.id }).then((res) => {
+        GetChecRecord({ id: record.id }).then((res) => {
           const data = res.row;
           openPopup(true, data);
         });
@@ -162,7 +141,7 @@
 
       async function handleDelete(record: Recordable) {
         console.log(record);
-        await deleteUnit({ id: record.id }).then((res) => {
+        await deleteChecRecord({ id: record.id }).then((res) => {
           console.log(res);
           getTableAction().reload();
           success('删除成功!');
@@ -202,7 +181,7 @@
           cancelText: '取消',
           maskClosable: true,
           async onOk() {
-            await deleteBatchesUnit({ ids }).then((res) => {
+            await deleteBatchesCheckRecord({ ids }).then((res) => {
               console.log(res);
               getTableAction().reload();
               success('删除成功!');
@@ -215,67 +194,24 @@
         });
       }
 
-      async function saveData(params: any) {
-        const data = params.data;
-        const closeModel = params.closeModal;
-        if (!data.id) {
-          await addUnit(data).then((res) => {
-            console.log(res);
-            getTableAction().reload();
-            closeModel();
-            success('创建成功!');
-          });
-          console.log('----------add---');
-        } else {
-          await editUnit(data).then((res) => {
-            console.log(res);
-            getTableAction().reload();
-            closeModel();
-            success('修改成功!');
-          });
-          console.log('----------edit---');
-        }
-      }
-
       // 导出
       function defaultHeader({ filename, bookType }: ExportModalResult) {
         // 默认Object.keys(data[0])作为header
         const jsondata = getTableAction().getDataSource();
         const excelData: object[] = [];
-        const options = [
-          '机关事业单位',
-          '国有企业',
-          '集体所有制',
-          '私营企业',
-          '股份制企业',
-          '有限合伙企业',
-          '联营企业',
-          '外商投资企业',
-          '个人独资企业',
-        ];
         jsondata.map((item, i) => {
           let data = {
             No: 0,
             id: '',
             name: '',
-            legalman: '',
-            nature: '',
-            foundingtime: '',
-            businessNo: '',
-            job: '',
-            regMoney: '',
-            jobnum: '',
+            reason: '',
+            createtime: '',
           };
           data.No = i + 1;
           data.id = item.id;
           data.name = item.name;
-          data.legalman = item.legalman;
-          data.nature = options[item.nature];
-          data.foundingtime = moment(item.foundingtime).format('YYYY-MM-DD');
-          data.businessNo = item.businessNo;
-          data.job = item.job;
-          data.regMoney = item.regMoney.toFixed(2);
-          data.jobnum = item.jobnum;
+          data.reason = item.reason;
+          data.createtime = moment(item.createtime).format('YYYY-MM-DD');
           excelData.push(data);
         });
         jsonToSheetXlsx({
@@ -283,14 +219,9 @@
           header: {
             No: 'No.',
             id: 'ID',
-            name: '企业(单位)名称',
-            legalman: '法人代表',
-            nature: '单位性质',
-            foundingtime: '成立时间',
-            businessNo: '工商登记号',
-            job: '行业分类',
-            regMoney: '注册资金',
-            jobnum: '职工人数',
+            name: '申请成员',
+            reason: '审批信息',
+            createtime: '审批时间',
           },
           filename,
           write2excelOpts: {
@@ -302,10 +233,10 @@
       function createActions(record: EditRecordRow): ActionItem[] {
         return [
           {
-            label: '编辑',
-            icon: 'ant-design:edit-outlined',
-            color: 'warning',
-            onClick: handleEdit.bind(null, record),
+            label: '详情',
+            icon: 'ant-design:info-circle-outlined',
+            color: 'success',
+            onClick: handleDetail.bind(null, record),
           },
           {
             label: '删除',
@@ -326,18 +257,15 @@
         return '';
       }
       return {
-        popupData,
         tableRef,
         registerTable,
-        addRole,
-        handleEdit,
+        handleDetail,
         deleteBatches,
         createActions,
         getTableAction,
         rowClick,
         selectionChange,
         addRegister,
-        saveData,
         defaultHeader,
         openModal,
         register,

src/views/member/apply/popup.vue

@@ -0,0 +1,62 @@
+<template>
+  <BasicModal
+    width="800px"
+    :show-cancel-btn="false"
+    v-bind="$attrs"
+    @register="register"
+    @ok="closeModal"
+    title="审批详情"
+  >
+    <Description
+      :collapseOptions="{ canExpand: true, helpMessage: 'help me' }"
+      :column="3"
+      :data="descriptionData"
+      :schema="schemas"
+    />
+  </BasicModal>
+</template>
+<script lang="ts">
+  import { defineComponent, ref, reactive, toRefs } from 'vue';
+  import { BasicModal, useModalInner } from '/@/components/Modal';
+  import { Description } from '/@/components/Description/index';
+  import { schemas } from './data';
+  // import moment from 'moment';
+
+  export default defineComponent({
+    components: { BasicModal, Description },
+    emits: ['register'],
+    setup() {
+      const state = reactive({
+        descriptionData: [],
+      });
+      const modelRef = ref({});
+      const [register, { closeModal }] = useModalInner((data) => {
+        state.descriptionData = data;
+      });
+
+      return {
+        register,
+        schemas,
+        model: modelRef,
+        closeModal,
+        ...toRefs(state),
+      };
+    },
+  });
+</script>
+<style lang="less">
+  .ant-form-item-label {
+    overflow: hidden;
+    text-align: center !important;
+    // white-space: pre-wrap !important;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+
+  @media (max-width: 639px) {
+    .ant-form-item-label {
+      line-height: 2.5715 !important;
+      text-align: center !important;
+    }
+  }
+</style>

src/views/member/applyRecord/data.ts

@@ -1,959 +0,0 @@
-import { FormProps, BasicColumn } from '/@/components/Table';
-import { FormSchema } from '/@/components/Form/index';
-import { adapt } from '/@/utils/adapt';
-import { h } from 'vue';
-import moment from 'moment';
-
-const adaptWidth = adapt();
-export const columns: BasicColumn[] = [
-  {
-    title: 'ID',
-    dataIndex: 'id',
-    editComponentProps: {
-      prefix: '$',
-    },
-    width: 100,
-    sorter: true,
-  },
-  {
-    title: '企业(单位)名称',
-    dataIndex: 'name',
-    width: 200,
-    sorter: true,
-    customRender({ record }) {
-      const dom: object[] = [];
-      dom.push(h('span', {}, record.name));
-      if (record.nature === 0) {
-        dom.push(h('span', { style: { fontSize: '18px', fontWeight: 'bold', color: 'red' } }, '★'));
-      }
-      return dom;
-    },
-  },
-  {
-    title: '法人代表',
-    dataIndex: 'legalman',
-    width: 130,
-    sorter: true,
-  },
-  {
-    title: '成立时间',
-    dataIndex: 'foundingtime',
-    width: 150,
-    customRender({ record }) {
-      return moment(record.foundingtime).format('YYYY-MM-DD');
-    },
-    sorter: true,
-  },
-  {
-    title: '工商登记号',
-    dataIndex: 'businessNo',
-    width: 350,
-    sorter: true,
-  },
-  {
-    title: '单位性质',
-    dataIndex: 'nature',
-    width: 160,
-    customRender: ({ record }) => {
-      const options = [
-        '机关事业单位',
-        '国有企业',
-        '集体所有制',
-        '私营企业',
-        '股份制企业',
-        '有限合伙企业',
-        '联营企业',
-        '外商投资企业',
-        '个人独资企业',
-      ];
-      return options[record.nature];
-    },
-    sorter: true,
-  },
-  {
-    title: '行业分类',
-    dataIndex: 'job',
-    width: 160,
-    sorter: true,
-  },
-  {
-    title: '注册资金',
-    dataIndex: 'regMoney',
-    width: 160,
-    sorter: true,
-  },
-  {
-    title: '职工人数',
-    dataIndex: 'jobnum',
-    width: 160,
-    sorter: true,
-  },
-];
-
-export function getFormConfig(): Partial<FormProps> {
-  return {
-    labelWidth: 110,
-    schemas: [
-      {
-        field: `id`,
-        label: `ID`,
-        component: 'Input',
-        componentProps: {
-          placeholder: 'ID',
-        },
-        colProps: {
-          xl: 12,
-          xxl: 8,
-        },
-      },
-      {
-        field: `name`,
-        label: `企业(单位)名称`,
-        component: 'Input',
-        componentProps: {
-          placeholder: '企业或单位名称',
-        },
-        colProps: {
-          xl: 12,
-          xxl: 8,
-        },
-      },
-      {
-        field: `legalman`,
-        label: `法人代表`,
-        component: 'Input',
-        componentProps: {
-          placeholder: '法人代表',
-        },
-        colProps: {
-          xl: 12,
-          xxl: 8,
-        },
-      },
-      {
-        field: `foundingtime`,
-        label: `成立时间`,
-        component: 'RangePicker',
-        componentProps: {
-          valueFormat: 'YYYY-MM-DD',
-        },
-        colProps: {
-          xl: 12,
-          xxl: 8,
-        },
-      },
-      {
-        field: `businessNo`,
-        label: `工商登记号`,
-        component: 'Input',
-        componentProps: {
-          placeholder: '工商登记号',
-        },
-        colProps: {
-          xl: 12,
-          xxl: 8,
-        },
-      },
-      {
-        field: `nature`,
-        label: `单位性质`,
-        component: 'Select',
-        componentProps: {
-          placeholder: '单位性质',
-          options: [
-            {
-              label: '机关事业单位',
-              value: 0,
-            },
-            {
-              label: '国有企业',
-              value: 1,
-            },
-            {
-              label: '集体所有制',
-              value: 2,
-            },
-            {
-              label: '私营企业',
-              value: 3,
-            },
-            {
-              label: '股份制企业',
-              value: 4,
-            },
-            {
-              label: '有限合伙企业',
-              value: 5,
-            },
-            {
-              label: '联营企业',
-              value: 6,
-            },
-            {
-              label: '外商投资企业',
-              value: 7,
-            },
-            {
-              label: '个人独资企业',
-              value: 8,
-            },
-          ],
-        },
-        colProps: {
-          xl: 12,
-          xxl: 8,
-        },
-      },
-      {
-        field: `job`,
-        label: `行业分类`,
-        component: 'Input',
-        componentProps: {
-          placeholder: '行业分类',
-        },
-        colProps: {
-          xl: 12,
-          xxl: 8,
-        },
-      },
-      {
-        field: `regMoney`,
-        label: `注册资金`,
-        component: 'RangeNumber',
-        componentProps: {
-          placeholder: '注册资金',
-        },
-        defaultValue: '',
-        colProps: {
-          xl: 12,
-          xxl: 8,
-        },
-      },
-      {
-        field: `jobnum`,
-        label: `职工人数`,
-        component: 'RangeNumber',
-        componentProps: {
-          placeholder: '职工人数',
-        },
-        defaultValue: '',
-        colProps: {
-          xl: 12,
-          xxl: 8,
-        },
-      },
-    ],
-  };
-}
-
-// =================popup================================
-export const schemas: FormSchema[] = [
-  {
-    field: 'name',
-    component: 'Input',
-    label: '企业名称',
-    labelWidth: adaptWidth.labelWidth,
-    colProps: {
-      span: adaptWidth.elContainer,
-    },
-    componentProps: {
-      placeholder: '企业名称',
-    },
-    show: ({ values }) => {
-      if (values.nature !== 0) {
-        return true;
-      }
-      return false;
-    },
-    required: ({ values }) => {
-      if (values.nature !== 0) {
-        return true;
-      }
-      return false;
-    },
-  },
-  {
-    field: 'name',
-    component: 'Input',
-    label: '单位名称',
-    labelWidth: adaptWidth.labelWidth,
-    colProps: {
-      span: adaptWidth.elContainer,
-    },
-    componentProps: {
-      placeholder: '单位名称',
-    },
-    show: ({ values }) => {
-      if (values.nature === 0) {
-        return true;
-      }
-      return false;
-    },
-    required: ({ values }) => {
-      if (values.nature === 0) {
-        return true;
-      }
-      return false;
-    },
-  },
-  {
-    field: 'nature',
-    label: '单位性质',
-    component: 'Select',
-    componentProps: {
-      placeholder: '单位性质',
-      options: [
-        {
-          label: '机关事业单位',
-          value: 0,
-        },
-        {
-          label: '国有企业',
-          value: 1,
-        },
-        {
-          label: '集体所有制',
-          value: 2,
-        },
-        {
-          label: '私营企业',
-          value: 3,
-        },
-        {
-          label: '股份制企业',
-          value: 4,
-        },
-        {
-          label: '有限合伙企业',
-          value: 5,
-        },
-        {
-          label: '联营企业',
-          value: 6,
-        },
-        {
-          label: '外商投资企业',
-          value: 7,
-        },
-        {
-          label: '个人独资企业',
-          value: 8,
-        },
-      ],
-    },
-    labelWidth: adaptWidth.labelWidth,
-    colProps: {
-      span: adaptWidth.elContainer,
-    },
-    required: true,
-  },
-  {
-    field: 'legalman',
-    component: 'Input',
-    label: '法人代表',
-    labelWidth: adaptWidth.labelWidth,
-    colProps: {
-      span: adaptWidth.elContainer,
-    },
-    componentProps: {
-      placeholder: '法人代表',
-    },
-    show: ({ values }) => {
-      if (values.nature !== 0) {
-        return true;
-      }
-      return false;
-    },
-    required: ({ values }) => {
-      if (values.nature !== 0) {
-        return true;
-      }
-      return false;
-    },
-  },
-  {
-    field: 'level',
-    component: 'Input',
-    label: '行政级别',
-    labelWidth: adaptWidth.labelWidth,
-    colProps: {
-      span: adaptWidth.elContainer,
-    },
-    componentProps: {
-      placeholder: '行政级别',
-    },
-    show: ({ values }) => {
-      if (values.nature === 0) {
-        return true;
-      }
-      return false;
-    },
-  },
-  {
-    field: 'area',
-    component: 'Input',
-    label: '所属地区',
-    labelWidth: adaptWidth.labelWidth,
-    colProps: {
-      span: adaptWidth.elContainer,
-    },
-    componentProps: {
-      placeholder: '所属地区',
-    },
-    show: ({ values }) => {
-      if (values.nature === 0) {
-        return true;
-      }
-      return false;
-    },
-  },
-  {
-    field: 'parent',
-    component: 'Input',
-    label: '上级单位',
-    labelWidth: adaptWidth.labelWidth,
-    colProps: {
-      span: adaptWidth.elContainer,
-    },
-    componentProps: {
-      placeholder: '上级单位',
-    },
-    show: ({ values }) => {
-      if (values.nature === 0) {
-        return true;
-      }
-      return false;
-    },
-  },
-  {
-    field: 'businessNo',
-    component: 'Input',
-    label: '工商登记号',
-    labelWidth: adaptWidth.labelWidth,
-    colProps: {
-      span: adaptWidth.elContainer,
-    },
-    componentProps: {
-      placeholder: '工商登记号',
-    },
-    show: ({ values }) => {
-      if (values.nature !== 0) {
-        return true;
-      }
-      return false;
-    },
-    required: ({ values }) => {
-      if (values.nature !== 0) {
-        return true;
-      }
-      return false;
-    },
-  },
-  {
-    field: 'centralTax',
-    component: 'Input',
-    label: '国税税号',
-    labelWidth: adaptWidth.labelWidth,
-    colProps: {
-      span: adaptWidth.elContainer,
-    },
-    componentProps: {
-      placeholder: '国税税号',
-    },
-    show: ({ values }) => {
-      if (values.nature !== 0) {
-        return true;
-      }
-      return false;
-    },
-  },
-  {
-    field: 'landTax',
-    component: 'Input',
-    label: '地税税号',
-    labelWidth: adaptWidth.labelWidth,
-    colProps: {
-      span: adaptWidth.elContainer,
-    },
-    componentProps: {
-      placeholder: '地税税号',
-    },
-    show: ({ values }) => {
-      if (values.nature !== 0) {
-        return true;
-      }
-      return false;
-    },
-  },
-  {
-    field: 'foundingtime',
-    component: 'DatePicker',
-    label: '成立时间',
-    labelWidth: adaptWidth.labelWidth,
-    colProps: {
-      span: adaptWidth.elContainer,
-    },
-    componentProps: {
-      placeholder: '成立时间',
-    },
-    show: ({ values }) => {
-      if (values.nature !== 0) {
-        return true;
-      }
-      return false;
-    },
-    required: ({ values }) => {
-      if (values.nature !== 0) {
-        return true;
-      }
-      return false;
-    },
-  },
-  {
-    field: 'job',
-    component: 'Input',
-    label: '行业分类',
-    labelWidth: adaptWidth.labelWidth,
-    colProps: {
-      span: adaptWidth.elContainer,
-    },
-    componentProps: {
-      placeholder: '行业分类',
-    },
-    show: ({ values }) => {
-      if (values.nature !== 0) {
-        return true;
-      }
-      return false;
-    },
-    required: ({ values }) => {
-      if (values.nature !== 0) {
-        return true;
-      }
-      return false;
-    },
-  },
-  {
-    field: 'jobnum',
-    component: 'Input',
-    label: '职工人数',
-    labelWidth: adaptWidth.labelWidth,
-    colProps: {
-      span: adaptWidth.elContainer,
-    },
-    componentProps: {
-      type: 'number',
-      placeholder: '职工人数',
-    },
-  },
-  {
-    field: 'partynum',
-    component: 'Input',
-    label: '党员数',
-    labelWidth: adaptWidth.labelWidth,
-    colProps: {
-      span: adaptWidth.elContainer,
-    },
-    componentProps: {
-      type: 'number',
-      placeholder: '党员数',
-    },
-  },
-  {
-    field: 'tel',
-    component: 'Input',
-    label: '电话',
-    labelWidth: adaptWidth.labelWidth,
-    colProps: {
-      span: adaptWidth.elContainer,
-    },
-    componentProps: {
-      placeholder: '电话',
-    },
-  },
-  {
-    field: 'fax',
-    component: 'Input',
-    label: '传真',
-    labelWidth: adaptWidth.labelWidth,
-    colProps: {
-      span: adaptWidth.elContainer,
-    },
-    componentProps: {
-      placeholder: '传真',
-    },
-  },
-  {
-    field: 'zipcode',
-    component: 'Input',
-    label: '邮编',
-    labelWidth: adaptWidth.labelWidth,
-    colProps: {
-      span: adaptWidth.elContainer,
-    },
-    componentProps: {
-      placeholder: '邮箱',
-    },
-  },
-  {
-    field: 'address',
-    component: 'Input',
-    label: '地址',
-    labelWidth: adaptWidth.labelWidth,
-    colProps: {
-      span: adaptWidth.elContainer,
-    },
-    componentProps: {
-      placeholder: '地址',
-    },
-    required: true,
-  },
-  {
-    field: 'culturalnum',
-    component: 'Input',
-    label: '大专以上文化人数',
-    labelWidth: adaptWidth.labelWidth,
-    colProps: {
-      span: adaptWidth.elContainer,
-    },
-    componentProps: {
-      type: 'number',
-      placeholder: '大专以上文化人数',
-    },
-    show: ({ values }) => {
-      if (values.nature !== 0) {
-        return true;
-      }
-      return false;
-    },
-  },
-  {
-    field: 'laidnum',
-    component: 'Input',
-    label: '安置下岗人数',
-    labelWidth: adaptWidth.labelWidth,
-    colProps: {
-      span: adaptWidth.elContainer,
-    },
-    componentProps: {
-      type: 'number',
-      placeholder: '安置下岗人数',
-    },
-    show: ({ values }) => {
-      if (values.nature !== 0) {
-        return true;
-      }
-      return false;
-    },
-  },
-  {
-    field: 'partyCase',
-    component: 'Input',
-    label: '党、团工会情况',
-    labelWidth: adaptWidth.labelWidth,
-    colProps: {
-      span: adaptWidth.elContainer,
-    },
-    componentProps: {
-      placeholder: '党、团工会情况',
-    },
-    show: ({ values }) => {
-      if (values.nature !== 0) {
-        return true;
-      }
-      return false;
-    },
-  },
-  {
-    field: 'web',
-    component: 'Input',
-    label: '网址',
-    labelWidth: adaptWidth.labelWidth,
-    colProps: {
-      span: adaptWidth.elContainer,
-    },
-    componentProps: {
-      placeholder: '网址',
-    },
-    rules: [
-      {
-        validator: async (_, value: any) => {
-          const regex =
-            /(http|ftp|https):\/\/[\w\-_]+(\.[\w\-_]+)+([\w\-\.,@?^=%&:/~\+#]*[\w\-\@?^=%&/~\+#])?/;
-          if (value && !regex.test(value)) {
-            return Promise.reject('请填写有效的网址');
-          }
-        },
-        trigger: 'blur',
-      },
-    ],
-  },
-  {
-    field: 'email',
-    component: 'Input',
-    label: '电子邮箱',
-    labelWidth: adaptWidth.labelWidth,
-    colProps: {
-      span: adaptWidth.elContainer,
-    },
-    componentProps: {
-      placeholder: '电子邮箱',
-    },
-    show: ({ values }) => {
-      if (values.nature !== 0) {
-        return true;
-      }
-      return false;
-    },
-  },
-  {
-    field: 'technology',
-    label: '高新技术企业认证',
-    component: 'Switch',
-    labelWidth: adaptWidth.labelWidth,
-    colProps: {
-      span: adaptWidth.elContainer,
-    },
-    componentProps: {
-      placeholder: '高新技术企业认证',
-    },
-    show: ({ values }) => {
-      if (values.nature !== 0) {
-        return true;
-      }
-      return false;
-    },
-  },
-  {
-    field: 'technologyDept',
-    component: 'Input',
-    label: '高新技术企业认证部门',
-    labelWidth: adaptWidth.labelWidth,
-    colProps: {
-      span: adaptWidth.elContainer,
-    },
-    show: ({ values }) => {
-      if (values.technology && values.nature !== 0) {
-        return true;
-      }
-      return false;
-    },
-    componentProps: {
-      placeholder: '高新技术企业认证部门',
-    },
-    required: ({ values }) => {
-      if (values.technology && values.nature !== 0) {
-        return true;
-      }
-      return false;
-    },
-  },
-  {
-    field: 'foreignTrade',
-    label: '外贸自营进出口权',
-    component: 'Switch',
-    labelWidth: adaptWidth.labelWidth,
-    colProps: {
-      span: adaptWidth.elContainer,
-    },
-    componentProps: {
-      placeholder: '外贸自营进出口权',
-    },
-    show: ({ values }) => {
-      if (values.nature !== 0) {
-        return true;
-      }
-      return false;
-    },
-  },
-  {
-    field: 'foreignTradeDept',
-    component: 'Input',
-    label: '外贸自营进出口权批准部门',
-    labelWidth: adaptWidth.labelWidth,
-    colProps: {
-      span: adaptWidth.elContainer,
-    },
-    show: ({ values }) => {
-      if (values.foreignTrade && values.nature !== 0) {
-        return true;
-      }
-      return false;
-    },
-    componentProps: {
-      placeholder: '外贸自营进出口权批准部门',
-    },
-    required: ({ values }) => {
-      if (values.foreignTrade && values.nature !== 0) {
-        return true;
-      }
-      return false;
-    },
-  },
-  {
-    field: 'quality',
-    label: '质量管理、质量保证系列认证标准',
-    component: 'Switch',
-    labelWidth: adaptWidth.labelWidth,
-    colProps: {
-      span: adaptWidth.elContainer,
-    },
-    componentProps: {
-      placeholder: '质量管理、质量保证系列认证标准',
-    },
-    show: ({ values }) => {
-      if (values.nature !== 0) {
-        return true;
-      }
-      return false;
-    },
-  },
-  {
-    field: 'qualityDept',
-    component: 'Input',
-    label: '质量管理、质量保证系列认证标准认证部门',
-    labelWidth: adaptWidth.labelWidth,
-    colProps: {
-      span: adaptWidth.elContainer,
-    },
-    show: ({ values }) => {
-      if (values.quality && values.nature !== 0) {
-        return true;
-      }
-      return false;
-    },
-    componentProps: {
-      placeholder: '质量管理、质量保证系列认证标准认证部门',
-    },
-    required: ({ values }) => {
-      if (values.quality && values.nature !== 0) {
-        return true;
-      }
-      return false;
-    },
-  },
-  {
-    field: 'regMoney',
-    component: 'Input',
-    label: '注册资金(万元)',
-    labelWidth: adaptWidth.labelWidth,
-    colProps: {
-      span: adaptWidth.elContainer,
-    },
-    componentProps: {
-      type: 'number',
-      placeholder: '注册资金(万元)',
-    },
-    show: ({ values }) => {
-      if (values.nature !== 0) {
-        return true;
-      }
-      return false;
-    },
-    rules: [
-      {
-        required: true,
-        validator: async (_, value: any) => {
-          let dealValue = '';
-          if (value) {
-            dealValue = value.replace(/\s*/g, '');
-          }
-          if (dealValue === '') {
-            return Promise.reject('请输入注册资金');
-          }
-          if (value < 0) {
-            return Promise.reject('注册资金不能小于0');
-          }
-        },
-        trigger: 'blur',
-      },
-    ],
-    required: ({ values }) => {
-      if (values.nature !== 0) {
-        return true;
-      }
-      return false;
-    },
-  },
-  {
-    field: 'money',
-    component: 'Input',
-    label: '资产(万元)',
-    labelWidth: adaptWidth.labelWidth,
-    colProps: {
-      span: adaptWidth.elContainer,
-    },
-    componentProps: {
-      type: 'number',
-      placeholder: '资产(万元)',
-    },
-    show: ({ values }) => {
-      if (values.nature !== 0) {
-        return true;
-      }
-      return false;
-    },
-  },
-  {
-    field: 'ownerMoney',
-    component: 'Input',
-    label: '所有者权益(万元)',
-    labelWidth: adaptWidth.labelWidth,
-    colProps: {
-      span: adaptWidth.elContainer,
-    },
-    componentProps: {
-      type: 'number',
-      placeholder: '所有者权益(万元)',
-    },
-    show: ({ values }) => {
-      if (values.nature !== 0) {
-        return true;
-      }
-      return false;
-    },
-  },
-  {
-    field: 'sellMoney',
-    component: 'Input',
-    label: '销售收入(万元)',
-    labelWidth: adaptWidth.labelWidth,
-    colProps: {
-      span: adaptWidth.elContainer,
-    },
-    componentProps: {
-      type: 'number',
-      placeholder: '销售收入(万元)',
-    },
-    show: ({ values }) => {
-      if (values.nature !== 0) {
-        return true;
-      }
-      return false;
-    },
-  },
-  {
-    field: 'product',
-    component: 'InputTextArea',
-    label: '主要经营项目',
-    labelWidth: adaptWidth.labelWidth,
-    colProps: {
-      span: adaptWidth.elContainer,
-    },
-    componentProps: {
-      placeholder: '主要经营项目',
-    },
-    show: ({ values }) => {
-      if (values.nature !== 0) {
-        return true;
-      }
-      return false;
-    },
-    required: ({ values }) => {
-      if (values.nature !== 0) {
-        return true;
-      }
-      return false;
-    },
-  },
-];

src/views/member/applyRecord/popup.vue

@@ -1,130 +0,0 @@
-<template>
-  <BasicModal width="800px" v-bind="$attrs" @register="register" @ok="confirm" :title="title">
-    <BasicForm @register="registerForm" :model="model" />
-  </BasicModal>
-</template>
-<script lang="ts">
-  import { defineComponent, PropType, reactive, ref, toRefs } from 'vue';
-  import { BasicModal, useModalInner } from '/@/components/Modal';
-  import { BasicForm, useForm } from '/@/components/Form/index';
-  import { useMessage } from '/@/hooks/web/useMessage';
-  import { schemas } from './data';
-  import moment from 'moment';
-  interface PopupData {
-    title: string;
-  }
-  interface Role {
-    id: string | number;
-  }
-
-  export default defineComponent({
-    components: { BasicModal, BasicForm },
-    props: {
-      popupData: {
-        type: Object as PropType<PopupData>,
-        default: () => {},
-      },
-    },
-    emits: ['register', 'saveData'],
-    setup(props, { emit }) {
-      const { createMessage } = useMessage();
-      const { error } = createMessage;
-      const role = reactive<Role>({
-        id: 0,
-      });
-      const popupData = props.popupData as PopupData;
-      const modelRef = ref({});
-
-      const [registerForm, { setFieldsValue, resetFields, validate }] = useForm({
-        labelWidth: 120,
-        schemas,
-        showActionButtonGroup: false,
-        actionColOptions: {
-          span: 24,
-        },
-      });
-      //   const [register, { closeModal }] = useModalInner((data) => {
-      //     modelRef.value = data;
-
-      //
-      //   });
-      const [register, { closeModal }] = useModalInner((data) => {
-        resetFields();
-        if (data.technology === 1) {
-          data.technology = true;
-        } else {
-          data.technology = false;
-        }
-        if (data.quality === 1) {
-          data.quality = true;
-        } else {
-          data.quality = false;
-        }
-        if (data.foreignTrade === 1) {
-          data.foreignTrade = true;
-        } else {
-          data.foreignTrade = false;
-        }
-        setFieldsValue(data);
-        role.id = data.id;
-      });
-
-      async function confirm() {
-        try {
-          const data = await validate();
-          console.log(`确定`, data);
-          if (role.id) {
-            data.id = role.id;
-          } else {
-            role.id = 0;
-          }
-          if (data.technology) {
-            data.technology = 1;
-          } else {
-            data.technology = 0;
-          }
-          if (data.foreignTrade) {
-            data.foreignTrade = 1;
-          } else {
-            data.foreignTrade = 0;
-          }
-          if (data.quality) {
-            data.quality = 1;
-          } else {
-            data.quality = 0;
-          }
-          data.foundingtime = moment(data.foundingtime).format('YYYY-MM-DD');
-
-          const popupData = { closeModal, data };
-          emit('saveData', popupData);
-        } catch (err: any) {
-          error(err.errorFields[0].errors[0]);
-        }
-      }
-      return {
-        register,
-        schemas,
-        registerForm,
-        model: modelRef,
-        confirm,
-        ...toRefs(popupData),
-      };
-    },
-  });
-</script>
-<style lang="less">
-  .ant-form-item-label {
-    overflow: hidden;
-    text-align: center !important;
-    // white-space: pre-wrap !important;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-  }
-
-  @media (max-width: 639px) {
-    .ant-form-item-label {
-      line-height: 2.5715 !important;
-      text-align: center !important;
-    }
-  }
-</style>

src/views/member/member/CheckPopup.vue

@@ -9,7 +9,6 @@
   import { BasicForm, useForm } from '/@/components/Form/index';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { checkSchemas } from './data';
-  import moment from 'moment';
   interface Role {
     id: string | number;
   }
@@ -44,20 +43,6 @@
           const data = await validate();
           console.log(`确定`, data);
           data.id = role.id;
-          if (!role.id) {
-            // 添加申请
-            data.isCheck = 0;
-          }
-          if (data.name) {
-            data.fromId = data.name.id;
-          } else {
-            data.fromId = data.unitName.id;
-          }
-          data.jointime = moment(data.jointime).format('YYYY-MM-DD');
-          delete data.relation;
-          delete data.relationUnit;
-          delete data.unitName;
-          delete data.name;
           const popupData = { closeModal, data };
           emit('saveData', popupData);
         } catch (err: any) {

src/views/member/member/data.ts

@@ -365,7 +365,7 @@ export const schemas: FormSchema[] = [
 // =================check popup================================
 export const checkSchemas: FormSchema[] = [
   {
-    field: 'checkInfo',
+    field: 'reason',
     component: 'InputTextArea',
     label: '审批信息',
     labelWidth: adaptWidth.adminLabelWidth,

src/views/member/member/index.vue

@@ -206,7 +206,7 @@
 
       function handleCheck(record: Recordable) {
         console.log(record);
-        openCheckPopup(true, {});
+        openCheckPopup(true, record);
       }
 
       function selectionChange() {
@@ -283,9 +283,13 @@
         const closeModel = params.closeModal;
         await editUser(data).then((res) => {
           console.log(res);
-          getTableAction().reload();
+          // 如果审核通过切换到获取正式会员
+          if (data.isCheck) {
+            state.current_tab = { isCheck: 1, name: '会员列表' };
+            getTableAction().reload();
+          }
           closeModel();
-          success('修改成功!');
+          success('操作成功!');
         });
       }