huangxw 10 tháng trước cách đây
mục cha
commit
d420869cde

+ 1 - 1
src/utils/dict.ts

@@ -22,7 +22,7 @@ export const useDict = (...args: string[]): { [key: string]: DictDataOption[] }
             );
             useDictStore().setDict(dictType, res.value[dictType]);
           });
-        }else{
+        } else{
           await getDicts(dictType).then((resp) => {
             res.value[dictType] = resp.data.map(
               (p): DictDataOption => ({ label: p.dictLabel, value: p.dictValue, elTagType: p.listClass, elTagClass: p.cssClass })

+ 9 - 37
src/views/dgtmedicine/member/index.vue

@@ -8,12 +8,12 @@
             <el-input v-model="queryParams.cpyName" placeholder="搜会员名称关键字" clearable style="width: 180px"
               @keyup.enter="handleQuery" />
           </el-form-item>
-          <el-form-item label="负责人" prop="cpyName">
-            <el-input v-model="queryParams.cpyName" placeholder="搜单位负责人" clearable style="width: 180px"
+          <el-form-item label="负责人" prop="contact">
+            <el-input v-model="queryParams.contact" placeholder="搜单位负责人" clearable style="width: 180px"
               @keyup.enter="handleQuery" />
           </el-form-item>
-          <el-form-item label="负责人电话" prop="cpyName">
-            <el-input v-model="queryParams.cpyName" placeholder="搜负责人联系电话" clearable style="width: 180px"
+          <el-form-item label="负责人电话" prop="contactTel">
+            <el-input v-model="queryParams.contactTel" placeholder="搜负责人联系电话" clearable style="width: 180px"
               @keyup.enter="handleQuery" />
           </el-form-item>
           <el-form-item label="入会时间段" prop="dateRange">
@@ -70,14 +70,12 @@
             </vxe-column>
           </vxe-table>
         </div>
-        <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
-          v-model:limit="queryParams.pageSize" @pagination="getList" />
+        <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
       </div>
     </div>
 
     <!--审核弹窗-->
-    <el-dialog :close-on-click-modal="false" :title="dialogApproval.title" v-model="dialogApproval.visible"
-      width="1200px" append-to-body>
+    <el-dialog :close-on-click-modal="false" :title="dialogApproval.title" v-model="dialogApproval.visible" width="1200px" append-to-body>
       <el-form ref="memberFormRef" :model="form" :rules="rules">
         <el-row :gutter="20">
           <el-col :span="8">
@@ -204,7 +202,7 @@
 </template>
 
 <script setup name="Member" lang="ts">
-import { listMember, getMember, delMember, addMember, updateMember, countLevelMember } from '@/api/dgtmedicine/member';
+import { listMember, getMember, delMember, addMember, updateMember, countLevelMember } from '@/api/dgtmedicine/member/index';
 import { approvalMember } from '@/api/dgtmedicine/approvalLog';
 import { MemberVO, MemberQuery, MemberForm, MemberLevelCountVO } from '@/api/dgtmedicine/member/types';
 import { ApprovalLogQuery, ApprovalLogForm } from '@/api/dgtmedicine/approvalLog/types';
@@ -214,7 +212,6 @@ const router = useRouter();
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
 const { cpy_res_status, vip_level } = toRefs<any>(proxy?.useDict('cpy_res_status', 'vip_level'));
-
 const memberList = ref<MemberVO[]>([]);
 const memberLevelCountList = ref<MemberLevelCountVO[]>([]);
 const buttonLoading = ref(false);
@@ -288,36 +285,11 @@ const initFormData: MemberForm = {
   cpyBusType: '',
   applyLevel: ''
 };
-const data = reactive<PageData<MemberForm, MemberQuery>>({
+const data = reactive<any>({
   form: { ...initFormData },
   queryParams: {
     pageNum: 1,
-    pageSize: 10,
-    cpyName: '',
-    legalPersonName: '',
-    legalPersonPhone: '',
-    legalPersonPosition: '',
-    legalPersonIdFront: '',
-    legalPersonIdBack: '',
-    companyCertificate: '',
-    email: '',
-    department: '',
-    totalAssets: '',
-    introduction: '',
-    regType: '',
-    membershipPurpose: '',
-    plantingInfo: '',
-    vipLevel: '',
-    startDate: '',
-    endDate: '',
-    reviewStatus: '',
-    reviewMsg: '',
-    reviewBy: '',
-    reviewTime: '',
-    partnerId: '',
-    cpyBusType: '',
-    applyLevel: '',
-    params: {}
+    pageSize: 10
   },
   rules: {}
 });

+ 382 - 0
src/views/dgtmedicine/pay-log/index.vue

@@ -0,0 +1,382 @@
+<template>
+  <div class="p-3">
+    <div class="bg-fff flex1 ov-hd d-flex flex-cln" v-show="showSearch">
+      <div class="pd-16 border-bottom">
+        <div class="f-s-20 c-333 f-w-7 mb-10">会费缴纳记录</div>
+        <el-form :model="queryParams" ref="queryFormRef" :inline="true" label-width="auto">
+          <el-form-item label="订单号" prop="cpyName">
+            <el-input v-model="queryParams.cpyName" placeholder="请输入订单号搜索" clearable style="width: 180px" @keyup.enter="handleQuery" />
+          </el-form-item>
+          <el-form-item label="会员名称" prop="cpyName">
+            <el-input v-model="queryParams.cpyName" placeholder="搜会员名称关键字" clearable style="width: 180px" @keyup.enter="handleQuery" />
+          </el-form-item>
+          <el-form-item label="缴费时间段" prop="dateRange">
+            <el-date-picker
+              style="width: 200px"
+              clearable
+              v-model="queryParams.dateRange"
+              type="daterange"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              value-format="YYYY-MM-DD"
+              @change="handleDateRangeChange"
+            />
+          </el-form-item>
+          <el-form-item label="是否已开发票" prop="cpyName">
+            <el-select style="width: 140px" v-model="queryParams.invoiceStatus" clearable placeholder="搜有效期状态">
+              <el-option label="全部" value=""></el-option>
+              <el-option label="已开票" value="1"></el-option>
+              <el-option label="待开票" value="0"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+
+      <!-- <template #header>
+          <el-row :gutter="20" class="mb8">
+            <el-col :span="2" v-for="level in memberLevelCountList" :key="level.type">
+              <el-button type="text" @click="handleQuery(level)"
+                :style="{ fontWeight: queryParams.vipLevel === level.type ? 'bold' : 'normal', color: queryParams.vipLevel === level.type ? 'black' : 'inherit' }">{{
+                  level.name }}({{ level.num }})</el-button>
+            </el-col>
+            <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+          </el-row>
+        </template> -->
+      <div class="d-flex flex1 ov-hd flex-cln pd-16">
+        <div class="flex1 ov-hd">
+          <vxe-table :loading="loading" border :data="list" min-height="0" max-height="100%">
+            <vxe-column title="订单号" field="cpyName" min-width="100" :formatter="colNoData" />
+            <vxe-column title="会员名称" field="cpyName" min-width="100" :formatter="colNoData" />
+            <vxe-column title="会员级别" field="vipLevelDesc" width="100" :formatter="colNoData" />
+            <vxe-column title="缴费金额" width="120" :formatter="colNoData">
+              <template #default="{ row }"> {{ row.paymentAmount }}元 </template>
+            </vxe-column>
+            <vxe-column title="邮箱" field="email" min-width="100" :formatter="colNoData" />
+            <vxe-column title="缴费人" field="createName" min-width="100" :formatter="colNoData" />
+            <vxe-column title="缴费时间" field="createTime" width="170" :formatter="colNoData" />
+            <vxe-column title="发票" width="100" :formatter="colNoData">
+              <template #default="{ row }"> {{ +row.invoiceStatus ? '已开票' : '待开票' }} </template>
+            </vxe-column>
+            <vxe-column title="操作" class-name="small-padding fixed-width">
+              <template #default="scope">
+                <el-button link type="primary" @click="showApp(scope.row)" v-if="scope.row.reviewStatus == '0'">审批</el-button>
+                <el-button link type="primary" @click="memberDetail(scope.row)" v-if="scope.row.reviewStatus != '0'">详情</el-button>
+              </template>
+            </vxe-column>
+          </vxe-table>
+        </div>
+        <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+      </div>
+    </div>
+
+    <!--审核弹窗-->
+    <el-dialog :close-on-click-modal="false" :title="dialogApproval.title" v-model="dialogApproval.visible" width="1200px" append-to-body>
+      <el-form ref="memberFormRef" :model="form" :rules="rules">
+        <el-row :gutter="20">
+          <el-col :span="8">
+            <el-form-item label="企业名称" prop="cpyName">
+              <el-text v-model="form.cpyName">{{ form.cpyName }}</el-text>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="法人姓名" prop="legalPersonName">
+              <el-text>{{ form.legalPersonName }}</el-text>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="法人电话" prop="legalPersonPhone">
+              <el-text>{{ form.legalPersonPhone }}</el-text>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="8">
+            <el-form-item label="法人职务" prop="legalPersonPosition">
+              <el-text>{{ form.legalPersonPosition }}</el-text>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="法人身份证正面图片" prop="legalPersonIdFront">
+              <el-image
+                :src="form.legalPersonIdFront"
+                style="width: 100px; height: 100px"
+                show-progress
+                :preview-src-list="[form.legalPersonIdFront]"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="法人身份证背面图片" prop="legalPersonIdBack">
+              <el-image
+                :src="form.legalPersonIdBack"
+                style="width: 100px; height: 100px"
+                show-progress
+                :preview-src-list="[form.legalPersonIdBack]"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="8">
+            <el-form-item label="申请会员等级" prop="applyLevel">
+              <dict-tag :value="form.applyLevel" :options="vip_level" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="邮箱" prop="email">
+              <el-text>{{ form.email }}</el-text>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="主管部门" prop="department">
+              <el-text>{{ form.department }}</el-text>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="8">
+            <el-form-item label="总资产" prop="totalAssets">
+              <el-text>{{ form.totalAssets }}</el-text>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="单位简介" prop="introduction">
+              <el-text>{{ form.introduction }}</el-text>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="入会目的" prop="membershipPurpose">
+              <el-text>{{ form.membershipPurpose }}</el-text>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="8">
+            <el-form-item label="当前会员等级" prop="vipLevel">
+              <dict-tag :value="form.vipLevel" :options="vip_level" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="开始时间" prop="startDate">
+              <el-text>{{ form.startDate }}</el-text>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="结束时间" prop="endDate">
+              <el-text>{{ form.endDate }}</el-text>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-table v-loading="loading" :data="form.plantingInfo">
+          <vxe-column label="品种名称" align="center" prop="variety" />
+          <vxe-column label="种植面积" align="center" prop="plantingArea" />
+          <vxe-column label="种植地点" align="center" prop="plantingPlace" />
+        </el-table>
+        <el-row :gutter="20">
+          <el-col>
+            <el-form-item label="荣誉证书" prop="companyCertificate">
+              <el-image
+                :src="form.companyCertificate"
+                style="width: 100px; height: 100px"
+                show-progress
+                :preview-src-list="form.companyCertificate"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-form ref="approvalLogFormRef" :model="approvalForm" :rules="approvalRules" label-width="80px">
+        <el-form-item label="审批类型" prop="reviewStatus">
+          <el-select v-model="approvalForm.reviewStatus" placeholder="请选择" clearable style="width: 100%" @change="showRefuse">
+            <template v-for="dict in cpy_res_status">
+              <el-option v-if="dict.value != '0'" :key="dict.value" :label="dict.label" :value="dict.value" />
+            </template>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="审批理由" prop="msg" v-if="refuseShow">
+          <el-input type="textarea" v-model="approvalForm.reviewMsg" placeholder="请输入拒绝理由" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="confirmApp">确 定</el-button>
+          <el-button @click="cancelApp">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+<script setup name="Member" lang="ts">
+import { getMember, countLevelMember } from '@/api/dgtmedicine/member/index';
+import { approvalMember } from '@/api/dgtmedicine/approvalLog/index';
+import { MemberLevelCountVO } from '@/api/dgtmedicine/member/types';
+import { ApprovalLogQuery, ApprovalLogForm } from '@/api/dgtmedicine/approvalLog/types';
+import { colNoData } from '@/utils/noData';
+import { listVipPayment } from '@/api/dgtmedicine/vipPayment/index';
+const router = useRouter();
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+
+const { cpy_res_status, vip_level } = toRefs<any>(proxy?.useDict('cpy_res_status', 'vip_level'));
+const list = ref<any[]>([]);
+const memberLevelCountList = ref<MemberLevelCountVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const refuseShow = ref(false);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const approvalLogFormRef = ref<ElFormInstance>();
+
+const queryFormRef = ref<ElFormInstance>();
+const memberFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+const initFormApprovalData: ApprovalLogForm = {
+  id: undefined,
+  targetType: undefined,
+  reviewStatus: '1',
+  reviewMsg: undefined
+};
+
+const dialogApproval = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+const approvalData = reactive<any>({
+  form: { ...initFormApprovalData },
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    targetType: undefined,
+    targetId: undefined,
+    res: undefined,
+    msg: undefined,
+    params: {}
+  },
+  rules: {}
+});
+
+const initFormData: any = {};
+const data = reactive<any>({
+  form: { ...initFormData },
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10
+  },
+  rules: {}
+});
+
+const { queryParams, form, rules } = toRefs(data);
+const { form: approvalForm, rules: approvalRules } = toRefs(approvalData);
+
+/**动态显示审批理由 */
+const showRefuse = (res: any) => {
+  if (res == '2') {
+    refuseShow.value = true;
+    return;
+  }
+  refuseShow.value = false;
+};
+
+/** 查询会员信息列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listVipPayment(queryParams.value);
+  list.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+};
+
+/** 表单重置 */
+const reset = () => {
+  form.value = { ...initFormData };
+  memberFormRef.value?.resetFields();
+};
+
+/** 搜索按钮操作 */
+const handleQuery = (level?: any) => {
+  queryParams.value.pageNum = 1;
+  if (level !== undefined && level !== null && level.type !== 'click') {
+    queryParams.value.vipLevel = level.type;
+  }
+  getList();
+};
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+};
+
+/**审批弹框 */
+const showApp = (row: any) => {
+  approvalReset();
+  dialogApproval.visible = true;
+  approvalForm.value.id = row.id;
+  getMemberInfo(row.id);
+};
+
+/** 修改按钮操作 */
+const getMemberInfo = async (memberId: string) => {
+  reset();
+  const res = await getMember(memberId);
+  Object.assign(form.value, res.data);
+};
+
+const memberDetail = (row: any) => {
+  router.push({ path: `/szyy/member-detail`, query: { memberId: row.id } });
+};
+
+/** 处理日期范围变化 */
+const handleDateRangeChange = (value: [string, string]) => {
+  if (value && value.length === 2) {
+    queryParams.value.startDate = value[0];
+    queryParams.value.endDate = value[1];
+  } else {
+    queryParams.value.startDate = undefined;
+    queryParams.value.endDate = undefined;
+  }
+  handleQuery();
+};
+
+/** 审批表单重置 */
+const approvalReset = () => {
+  refuseShow.value = false;
+  approvalForm.value = { ...initFormApprovalData };
+  approvalLogFormRef.value?.resetFields();
+};
+/**取消审批弹框 */
+const cancelApp = () => {
+  approvalReset();
+  dialogApproval.visible = false;
+};
+
+/**审批弹框 */
+const confirmApp = () => {
+  approvalLogFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      await approvalMember(approvalForm.value).finally(() => (buttonLoading.value = false));
+      proxy?.$modal.msgSuccess('操作成功');
+      dialogApproval.visible = false;
+      getList();
+    }
+  });
+};
+
+onMounted(() => {
+  getList();
+});
+</script>