ソースを参照

格式化代码

huangxw 10 ヶ月 前
コミット
17929d35f7

+ 75 - 74
src/views/dgtmedicine/check/detail.vue

@@ -1,79 +1,80 @@
 <template>
-   <div class="p-3">
-      <div class="bg-fff flex1 ov-hd d-flex flex-cln">
-         <div class="d-flex a-c pd-16 border-bottom">
-            <div class="f-s-20 c-333 f-w-7 mr-10">会员审核</div>
-            <el-button @click="router.go(-1)" type="primary" text><el-icon>
-                  <Back />
-               </el-icon>返回上一级</el-button>
-         </div>
-         <div class="flex1 over-auto">
-            <div class="pd-16">
-               <div class="info-title f-s-16 c-333 f-w-7 mb-10">企业基本信息</div>
-               <el-descriptions :column="4">
-                  <el-descriptions-item label="企业名称:">{{ form?.cpyName || '-' }}</el-descriptions-item>
-                  <el-descriptions-item label="统一社会信用代码:">{{ form?.creditCode || '-' }}</el-descriptions-item>
-                  <el-descriptions-item label="会员级别:">{{ form?.vipLevelName || '-' }}</el-descriptions-item>
-                  <el-descriptions-item label="法人姓名:">{{ form?.legalPersonName || '-' }}</el-descriptions-item>
-                  <el-descriptions-item label="法人职务:">{{ form?.legalPersonPosition || '-' }}</el-descriptions-item>
-                  <el-descriptions-item label="法人电话:">{{ form?.legalPersonPhone || '-' }}</el-descriptions-item>
-                  <el-descriptions-item label="注册类型:">{{ form?.regType || '-' }}</el-descriptions-item>
-                  <el-descriptions-item label="主管部门:">{{ form?.department || '-' }}</el-descriptions-item>
-                  <el-descriptions-item label="总资产:">{{ form?.totalAssets || '-' }}</el-descriptions-item>
-                  <el-descriptions-item label="单位负责人:">{{ form?.contact || '-' }}</el-descriptions-item>
-                  <el-descriptions-item label="单位负责人联系电话:">{{ form?.contactTel || '-' }}</el-descriptions-item>
-                  <el-descriptions-item label="邮箱">{{ form?.email || '-' }}</el-descriptions-item>
-                  <el-descriptions-item label="单位简介:" :span="2">{{ form?.introduction || '-' }}</el-descriptions-item>
-                  <el-descriptions-item label="入会主要目的:" :span="2">{{ form?.membershipPurpose || '-'
-                  }}</el-descriptions-item>
-               </el-descriptions>
-               <el-divider />
-               <el-descriptions :column="3" direction="vertical">
-                  <el-descriptions-item label="营业执照:">
-                     <el-image class="bg-ccc" style="width: 100px; height: 100px" :src="form?.license" :zoom-rate="1.2" :max-scale="7" :min-scale="0.2"
-                     :preview-src-list="[form?.license]" fit="contain" />
-                  </el-descriptions-item>
-                  <el-descriptions-item label="法人身份证:">
-                     <el-image :zoom-rate="1.2" :max-scale="7" :min-scale="0.2"
-                        :preview-src-list="[form?.legalPersonIdFront]" class="mr-10 bg-ccc" style="width: 180px; height: 100px"
-                        :src="form?.legalPersonIdFront" fit="contain" />
-                     <el-image style="width: 180px; height: 100px" class="bg-ccc" :zoom-rate="1.2" :max-scale="7" :min-scale="0.2"
-                        :preview-src-list="[form?.legalPersonIdBack]" :src="form?.legalPersonIdBack" fit="contain" />
-                  </el-descriptions-item>
-                  <el-descriptions-item label="公司荣誉证书等资料:">
-                     <template v-for="(item, index) in form?.companyCertificate" :key="index">
-                        <el-image  class="bg-ccc mr-10" :initial-index="index" :preview-src-list="form?.companyCertificate" style="width: 100px; height: 100px" :src="item" fit="contain" />
-                     </template>
-                  </el-descriptions-item>
-               </el-descriptions>
-               <el-divider />
-               <div class="info-title f-s-16 c-333 f-w-7 mb-10">药材种植信息</div>
-               <vxe-table border :data="form?.plantingInfo" min-height="0" max-height="100%">
-                  <!-- 序号 -->
-                  <vxe-column title="序号" align="center" type="seq" width="60" />
-                  <vxe-column title="种植药材品种" align="center" field="variety" :formatter="colNoData" />
-                  <vxe-column title="种植地点" align="center" field="plantingPlace" :formatter="colNoData" />
-                  <vxe-column title="种植面积" align="center" field="plantingArea" :formatter="colNoData" />
-               </vxe-table>
-               <el-divider />
-               <div class="info-title f-s-16 c-333 f-w-7 mb-10">缴费信息</div>
-               <el-descriptions :column="4">
-                  <el-descriptions-item label="缴费类型:">{{ form?.vipLevelName || '-' }}</el-descriptions-item>
-                  <el-descriptions-item label="缴费金额:">{{ form?.paymentAmount || '-' }}元</el-descriptions-item>
-                  <el-descriptions-item label="缴费人:">{{ form?.payManName || '-' }}</el-descriptions-item>
-                  <el-descriptions-item label="缴费时间:">{{ form?.payDate || '-' }}</el-descriptions-item>
-               </el-descriptions>
+    <div class="p-3">
+        <div class="bg-fff flex1 ov-hd d-flex flex-cln">
+            <div class="d-flex a-c pd-16 border-bottom">
+                <div class="f-s-20 c-333 f-w-7 mr-10">会员审核</div>
+                <el-button @click="router.go(-1)" type="primary" text>
+                    <el-icon>
+                        <Back />
+                    </el-icon>
+                    返回上一级
+                </el-button>
             </div>
-            <div v-if="!+form?.reviewStatus" class="btn-wrap pd-30 d-flex a-c j-c">
-                <el-button @click="router.go(-1)">取消</el-button>
-                <el-button @click="showNoPass = true" type="danger">不通过</el-button>
-                <el-button @click="showPass = true" type="primary">通过</el-button>
+            <div class="flex1 over-auto">
+                <div class="pd-16">
+                    <div class="info-title f-s-16 c-333 f-w-7 mb-10">企业基本信息</div>
+                    <el-descriptions :column="4">
+                        <el-descriptions-item label="企业名称:">{{ form?.cpyName || '-' }}</el-descriptions-item>
+                        <el-descriptions-item label="统一社会信用代码:">{{ form?.creditCode || '-' }}</el-descriptions-item>
+                        <el-descriptions-item label="会员级别:">{{ form?.vipLevelName || '-' }}</el-descriptions-item>
+                        <el-descriptions-item label="法人姓名:">{{ form?.legalPersonName || '-' }}</el-descriptions-item>
+                        <el-descriptions-item label="法人职务:">{{ form?.legalPersonPosition || '-' }}</el-descriptions-item>
+                        <el-descriptions-item label="法人电话:">{{ form?.legalPersonPhone || '-' }}</el-descriptions-item>
+                        <el-descriptions-item label="注册类型:">{{ form?.regType || '-' }}</el-descriptions-item>
+                        <el-descriptions-item label="主管部门:">{{ form?.department || '-' }}</el-descriptions-item>
+                        <el-descriptions-item label="总资产:">{{ form?.totalAssets || '-' }}</el-descriptions-item>
+                        <el-descriptions-item label="单位负责人:">{{ form?.contact || '-' }}</el-descriptions-item>
+                        <el-descriptions-item label="单位负责人联系电话:">{{ form?.contactTel || '-' }}</el-descriptions-item>
+                        <el-descriptions-item label="邮箱">{{ form?.email || '-' }}</el-descriptions-item>
+                        <el-descriptions-item label="单位简介:" :span="2">{{ form?.introduction || '-' }}</el-descriptions-item>
+                        <el-descriptions-item label="入会主要目的:" :span="2">
+                            {{ form?.membershipPurpose || '-'
+                            }}
+                        </el-descriptions-item>
+                    </el-descriptions>
+                    <el-divider />
+                    <el-descriptions :column="3" direction="vertical">
+                        <el-descriptions-item label="营业执照:">
+                            <el-image class="bg-ccc" style="width: 100px; height: 100px" :src="form?.license" :zoom-rate="1.2" :max-scale="7" :min-scale="0.2" :preview-src-list="[form?.license]" fit="contain" />
+                        </el-descriptions-item>
+                        <el-descriptions-item label="法人身份证:">
+                            <el-image :zoom-rate="1.2" :max-scale="7" :min-scale="0.2" :preview-src-list="[form?.legalPersonIdFront]" class="mr-10 bg-ccc" style="width: 180px; height: 100px" :src="form?.legalPersonIdFront" fit="contain" />
+                            <el-image style="width: 180px; height: 100px" class="bg-ccc" :zoom-rate="1.2" :max-scale="7" :min-scale="0.2" :preview-src-list="[form?.legalPersonIdBack]" :src="form?.legalPersonIdBack" fit="contain" />
+                        </el-descriptions-item>
+                        <el-descriptions-item label="公司荣誉证书等资料:">
+                            <template v-for="(item, index) in form?.companyCertificate" :key="index">
+                                <el-image class="bg-ccc mr-10" :initial-index="index" :preview-src-list="form?.companyCertificate" style="width: 100px; height: 100px" :src="item" fit="contain" />
+                            </template>
+                        </el-descriptions-item>
+                    </el-descriptions>
+                    <el-divider />
+                    <div class="info-title f-s-16 c-333 f-w-7 mb-10">药材种植信息</div>
+                    <vxe-table border :data="form?.plantingInfo" min-height="0" max-height="100%">
+                        <!-- 序号 -->
+                        <vxe-column title="序号" align="center" type="seq" width="60" />
+                        <vxe-column title="种植药材品种" align="center" field="variety" :formatter="colNoData" />
+                        <vxe-column title="种植地点" align="center" field="plantingPlace" :formatter="colNoData" />
+                        <vxe-column title="种植面积" align="center" field="plantingArea" :formatter="colNoData" />
+                    </vxe-table>
+                    <el-divider />
+                    <div class="info-title f-s-16 c-333 f-w-7 mb-10">缴费信息</div>
+                    <el-descriptions :column="4">
+                        <el-descriptions-item label="缴费类型:">{{ form?.vipLevelName || '-' }}</el-descriptions-item>
+                        <el-descriptions-item label="缴费金额:">{{ form?.paymentAmount || '-' }}元</el-descriptions-item>
+                        <el-descriptions-item label="缴费人:">{{ form?.payManName || '-' }}</el-descriptions-item>
+                        <el-descriptions-item label="缴费时间:">{{ form?.payDate || '-' }}</el-descriptions-item>
+                    </el-descriptions>
+                </div>
+                <div v-if="!+form?.reviewStatus" class="btn-wrap pd-30 d-flex a-c j-c">
+                    <el-button @click="router.go(-1)">取消</el-button>
+                    <el-button @click="showNoPass = true" type="danger">不通过</el-button>
+                    <el-button @click="showPass = true" type="primary">通过</el-button>
+                </div>
             </div>
-         </div>
-      </div>
-   </div>
-   <CheckPass v-if="showPass" v-model:show="showPass" :info="form" @success="router.go(-1)"></CheckPass>
-   <CheckNoPass v-if="showNoPass" v-model:show="showNoPass" :info="form" @success="router.go(-1)"></CheckNoPass>
+        </div>
+    </div>
+    <CheckPass v-if="showPass" v-model:show="showPass" :info="form" @success="router.go(-1)"></CheckPass>
+    <CheckNoPass v-if="showNoPass" v-model:show="showNoPass" :info="form" @success="router.go(-1)"></CheckNoPass>
 </template>
 
 <script setup name="Check-detail" lang="ts">
@@ -93,4 +94,4 @@ const getDetail = async () => {
 onMounted(() => {
    getDetail()
 })
-</script>
+</script>

+ 106 - 115
src/views/dgtmedicine/check/index.vue

@@ -1,82 +1,76 @@
 <template>
-  <div class="p-3">
-    <div class="bg-fff flex1 ov-hd d-flex flex-cln">
-      <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="dateRange">
-            <div class="d-flex" style="width: 180px">
-              <DateRange v-model="queryParams.dateRange" v-model:start-date="queryParams.startDate"
-                v-model:end-date="queryParams.endDate"></DateRange>
+    <div class="p-3">
+        <div class="bg-fff flex1 ov-hd d-flex flex-cln">
+            <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="dateRange">
+                        <div class="d-flex" style="width: 180px">
+                            <DateRange v-model="queryParams.dateRange" v-model:start-date="queryParams.startDate" v-model:end-date="queryParams.endDate"></DateRange>
+                        </div>
+                    </el-form-item>
+                    <el-form-item label="缴费状态" prop="paymentStatus">
+                        <el-select style="width: 140px" v-model="queryParams.paymentStatus" 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>
-          </el-form-item>
-          <el-form-item label="缴费状态" prop="paymentStatus">
-            <el-select style="width: 140px" v-model="queryParams.paymentStatus" 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>
-      <div class="d-flex flex1 ov-hd flex-cln pd-16">
-        <searchTabs :list="memberLevelCountList" v-model="queryParams.reviewStatus" keyLabel="name"
-          @change="handleQuery" keyCount="num" keyValue="type"></searchTabs>
-        <div class="pd-8"></div>
-        <div class="flex1 ov-hd">
-          <vxe-table :loading="loading" border :data="memberList" min-height="0" max-height="100%">
-            <vxe-column title="企业名称" align="center" field="cpyName" width="220" :formatter="colNoData" />
+            <div class="d-flex flex1 ov-hd flex-cln pd-16">
+                <searchTabs :list="memberLevelCountList" v-model="queryParams.reviewStatus" keyLabel="name" @change="handleQuery" keyCount="num" keyValue="type"></searchTabs>
+                <div class="pd-8"></div>
+                <div class="flex1 ov-hd">
+                    <vxe-table :loading="loading" border :data="memberList" min-height="0" max-height="100%">
+                        <vxe-column title="企业名称" align="center" field="cpyName" width="220" :formatter="colNoData" />
 
-            <vxe-column title="单位负责人" align="center" field="contact" width="100" :formatter="colNoData" />
-            <vxe-column title="负责人联系电话" align="center" field="contactTel" wmin-width="100" :formatter="colNoData" />
-            <vxe-column title="会员级别" align="center" field="vipLevel" width="120">
-              <template #default="scope">
-                <dict-tag :value="scope.row.vipLevel" :options="vip_level" />
-              </template>
-            </vxe-column>
-            <vxe-column title="缴费金额" align="center" min-width="100" :formatter="colNoData" >
-              <template #default="{ row }">
-                {{ row.paymentAmount || '-' }}元
-              </template>
-            </vxe-column>
-            <vxe-column title="缴费状态" align="center" min-width="100" :formatter="colNoData" >
-              <template #default="{ row }">
-                {{ +row.paymentStatus ? '已缴费' : '未缴费' }}
-              </template>
-            </vxe-column>
-            <vxe-column title="申请时间" align="center" field="createTime" min-width="100" :formatter="colNoData" />
-            <vxe-column title="审核状态" align="center" width="100">
-              <template #default="{ row }">
-                <!-- <dict-tag :value="scope.row.reviewStatus" :options="cpy_res_status" /> -->
-                <span :class="{ ['c-res-' + row?.reviewStatus]: true }">{{ selectDictLabel(cpy_res_status, row?.reviewStatus) }}</span>
-              </template>
-            </vxe-column>
-            <vxe-column title="操作" align="center" width="100" fixed="right" class-name="small-padding fixed-width">
-              <template #default="{ row }">
-                <el-button v-if="!+row?.reviewStatus" text type="primary" @click="routeDetail(row)">审核</el-button>
-                <el-button v-else text style="color: #41C06D;"  @click="routeDetail(row)">查看</el-button>
-              </template>
-            </vxe-column>
-          </vxe-table>
+                        <vxe-column title="单位负责人" align="center" field="contact" width="100" :formatter="colNoData" />
+                        <vxe-column title="负责人联系电话" align="center" field="contactTel" wmin-width="100" :formatter="colNoData" />
+                        <vxe-column title="会员级别" align="center" field="vipLevel" width="120">
+                            <template #default="scope">
+                                <dict-tag :value="scope.row.vipLevel" :options="vip_level" />
+                            </template>
+                        </vxe-column>
+                        <vxe-column title="缴费金额" align="center" min-width="100" :formatter="colNoData">
+                            <template #default="{ row }">{{ row.paymentAmount || '-' }}元</template>
+                        </vxe-column>
+                        <vxe-column title="缴费状态" align="center" min-width="100" :formatter="colNoData">
+                            <template #default="{ row }">
+                                {{ +row.paymentStatus ? '已缴费' : '未缴费' }}
+                            </template>
+                        </vxe-column>
+                        <vxe-column title="申请时间" align="center" field="createTime" min-width="100" :formatter="colNoData" />
+                        <vxe-column title="审核状态" align="center" width="100">
+                            <template #default="{ row }">
+                                <!-- <dict-tag :value="scope.row.reviewStatus" :options="cpy_res_status" /> -->
+                                <span :class="{ ['c-res-' + row?.reviewStatus]: true }">{{ selectDictLabel(cpy_res_status, row?.reviewStatus) }}</span>
+                            </template>
+                        </vxe-column>
+                        <vxe-column title="操作" align="center" width="100" fixed="right" class-name="small-padding fixed-width">
+                            <template #default="{ row }">
+                                <el-button v-if="!+row?.reviewStatus" text type="primary" @click="routeDetail(row)">审核</el-button>
+                                <el-button v-else text style="color: #41C06D;" @click="routeDetail(row)">查看</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>
-        <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
-          v-model:limit="queryParams.pageSize" @pagination="getList" />
-      </div>
     </div>
-  </div>
 </template>
 
 <script setup name="Member" lang="ts">
 import { listMember, delMember, queryMemberApprovalCount } from '@/api/dgtmedicine/member/index';
-import { MemberVO,  MemberLevelCountVO } from '@/api/dgtmedicine/member/types';
+import { MemberVO, MemberLevelCountVO } from '@/api/dgtmedicine/member/types';
 import { colNoData } from '@/utils/noData';
 import { DateRange, searchTabs } from '@/views/models/index';
 const router = useRouter();
@@ -90,74 +84,71 @@ const total = ref(0);
 const queryFormRef = ref<ElFormInstance>();
 
 const data = reactive<any>({
-  queryParams: {
-    pageNum: 1,
-    pageSize: 10,
-    reviewStatus: '0',
-    paymentStatus: ''
-  },
-  rules: {}
+    queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        reviewStatus: '0',
+        paymentStatus: ''
+    },
+    rules: {}
 });
 
-const { queryParams} = toRefs(data);
+const { queryParams } = toRefs(data);
 /** 查询会员信息列表 */
 const getList = async () => {
-  loading.value = true;
-  const res = await listMember(queryParams.value);
-  memberList.value = res.rows;
-  total.value = res.total;
-  loading.value = false;
+    loading.value = true;
+    const res = await listMember(queryParams.value);
+    memberList.value = res.rows;
+    total.value = res.total;
+    loading.value = false;
 };
 
 /** 查询会员信息列表 */
 const getMemberLevelList = async () => {
-  loading.value = true;
-  const res = await queryMemberApprovalCount();
-  memberLevelCountList.value = res.data;
-  loading.value = false;
+    loading.value = true;
+    const res = await queryMemberApprovalCount();
+    memberLevelCountList.value = res.data;
+    loading.value = false;
 };
 
 /** 搜索按钮操作 */
 const handleQuery = () => {
-  queryParams.value.pageNum = 1;
-  getList();
+    queryParams.value.pageNum = 1;
+    getList();
 };
 
 /** 重置按钮操作 */
 const resetQuery = () => {
-  queryFormRef.value?.resetFields();
-  queryParams.value.startDate = '';
-  queryParams.value.endDate = '';
-  handleQuery();
+    queryFormRef.value?.resetFields();
+    queryParams.value.startDate = '';
+    queryParams.value.endDate = '';
+    handleQuery();
 };
 
 const routeDetail = (row: any) => {
-  router.push({ path: `/szyy/check-detail`, query: { id: row.id } });
+    router.push({ path: `/szyy/check-detail`, query: { id: row.id } });
 };
 const deleteItem = async (row: any) => {
-  ElMessageBox({
-    title: '删除提示',
-    cancelButtonText: '取消',
-    confirmButtonText: '确认删除',
-    showCancelButton: true,
-    confirmButtonClass: 'el-button--danger',
-    message: h('p', null, [
-      h('div', null, `确认要删除企业:${row.cpyName} 吗?`),
-      h('div', null, [h('span', null, '注意:'), h('span', { style: 'color: #F56C6C' }, '删除后,该企业将不再是协会的会员单位,请谨慎操作!')])
-    ]),
-    callback: async (action: string) => {
-      if (action === 'confirm') {
-        const res = await delMember(row.id);
-        if (res) {
-          ElMessage.success('删除成功');
-          getList();
+    ElMessageBox({
+        title: '删除提示',
+        cancelButtonText: '取消',
+        confirmButtonText: '确认删除',
+        showCancelButton: true,
+        confirmButtonClass: 'el-button--danger',
+        message: h('p', null, [h('div', null, `确认要删除企业:${row.cpyName} 吗?`), h('div', null, [h('span', null, '注意:'), h('span', { style: 'color: #F56C6C' }, '删除后,该企业将不再是协会的会员单位,请谨慎操作!')])]),
+        callback: async (action: string) => {
+            if (action === 'confirm') {
+                const res = await delMember(row.id);
+                if (res) {
+                    ElMessage.success('删除成功');
+                    getList();
+                }
+            }
         }
-      }
-    }
-  });
+    });
 };
 onMounted(() => {
-  getList();
-  getMemberLevelList();
+    getList();
+    getMemberLevelList();
 });
 </script>

+ 23 - 22
src/views/dgtmedicine/member/detail.vue

@@ -1,31 +1,32 @@
 <template>
-  <div class="p-3">
-    <div class="bg-fff flex1 ov-hd d-flex flex-cln">
-      <div class="d-flex a-c pd-16">
-        <div class="f-s-20 c-333 f-w-7 mr-10">会员详情</div>
-        <el-button @click="router.go(-1)" type="primary" text><el-icon>
-            <Back />
-          </el-icon>返回上一级</el-button>
-      </div>
-      <div class="flex1 over-auto pl-16 pr-16 pb-16">
-        <el-tabs v-model="activeName" type="card" class="demo-tabs">
-          <el-tab-pane label="会员信息" name="info">
-            <MemberInfo></MemberInfo>
-          </el-tab-pane>
-          <el-tab-pane label="缴费记录" name="log">
-            <MemberPayLog></MemberPayLog>
-          </el-tab-pane>
-        </el-tabs>
-      </div>
+    <div class="p-3">
+        <div class="bg-fff flex1 ov-hd d-flex flex-cln">
+            <div class="d-flex a-c pd-16">
+                <div class="f-s-20 c-333 f-w-7 mr-10">会员详情</div>
+                <el-button @click="router.go(-1)" type="primary" text>
+                    <el-icon>
+                        <Back />
+                    </el-icon>
+                    返回上一级
+                </el-button>
+            </div>
+            <div class="flex1 over-auto pl-16 pr-16 pb-16">
+                <el-tabs v-model="activeName" type="card" class="demo-tabs">
+                    <el-tab-pane label="会员信息" name="info">
+                        <MemberInfo></MemberInfo>
+                    </el-tab-pane>
+                    <el-tab-pane label="缴费记录" name="log">
+                        <MemberPayLog></MemberPayLog>
+                    </el-tab-pane>
+                </el-tabs>
+            </div>
+        </div>
     </div>
-  </div>
-
 </template>
 
 <script setup name="Member-detail" lang="ts">
 import { MemberInfo, MemberPayLog } from '../model/index';
 
-const router = useRouter()
+const router = useRouter();
 const activeName = ref('info');
-
 </script>

+ 146 - 155
src/views/dgtmedicine/member/index.vue

@@ -1,87 +1,81 @@
 <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="contact">
-            <el-input v-model="queryParams.contact" placeholder="搜单位负责人" clearable style="width: 180px"
-              @keyup.enter="handleQuery" />
-          </el-form-item>
-          <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">
-            <div class="d-flex" style="width: 180px">
-              <DateRange v-model="queryParams.dateRange" v-model:start-date="queryParams.payStartDate"
-                v-model:end-date="queryParams.payEndDate"></DateRange>
+    <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="contact">
+                        <el-input v-model="queryParams.contact" placeholder="搜单位负责人" clearable style="width: 180px" @keyup.enter="handleQuery" />
+                    </el-form-item>
+                    <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">
+                        <div class="d-flex" style="width: 180px">
+                            <DateRange v-model="queryParams.dateRange" v-model:start-date="queryParams.payStartDate" v-model:end-date="queryParams.payEndDate"></DateRange>
+                        </div>
+                    </el-form-item>
+                    <el-form-item label="有效期状态" prop="vipEnable">
+                        <el-select style="width: 140px" v-model="queryParams.vipEnable" 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>
-          </el-form-item>
-          <el-form-item label="有效期状态" prop="vipEnable">
-            <el-select style="width: 140px" v-model="queryParams.vipEnable" 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>
 
-      <div class="d-flex flex1 ov-hd flex-cln pd-16">
-        <searchTabs :list="memberLevelCountList" v-model="queryParams.vipLevel" keyLabel="name" @change="handleQuery"
-          keyCount="num" keyValue="type"></searchTabs>
-        <div class="pd-8"></div>
-        <div class="flex1 ov-hd">
-          <vxe-table :loading="loading" border :data="memberList" min-height="0" max-height="100%">
-            <vxe-column title="会员名称" align="center" field="cpyName" width="220" :formatter="colNoData" />
-            <vxe-column title="会员级别" align="center" field="vipLevel" width="120">
-              <template #default="scope">
-                <dict-tag :value="scope.row.vipLevel" :options="vip_level" />
-              </template>
-            </vxe-column>
-            <vxe-column title="单位负责人" align="center" field="contact" width="100" :formatter="colNoData" />
-            <vxe-column title="负责人联系电话" align="center" field="contactTel" wmin-width="100" :formatter="colNoData" />
-            <vxe-column title="企业地址" wmin-width="100">
-              <template #default="{ row }">
-                {{ (row.adcdCodeName || '') + (row.address || '') || '-' }}
-              </template>
-            </vxe-column>
-            <vxe-column title="有效期状态" width="100" :formatter="colNoData">
-              <template #default="{ row }">
-                {{ +row?.vipEnable ? '有效' : '过期' }}
-              </template>
-            </vxe-column>
-            <vxe-column title="有效期至" align="center" field="endDate" width="140" :formatter="colNoData" />
-            <vxe-column title="入会时间" align="center" field="startDate" wmin-width="100" :formatter="colNoData" />
-            <vxe-column title="操作" width="330" align="center" fixed="right" class-name="small-padding fixed-width">
-              <template #default="{ row }">
-                <el-button text type="primary" @click="memberDetail(row)">详情</el-button>
-                <span></span>
-                <el-button text style="color: #0079fe" @click="editRowEndDate(row)">修改有效期</el-button>
-                <span></span>
-                <el-button text style="color: #0079fe" @click="editRowlevel(row)">修改级别</el-button>
-                <span></span>
-                <el-button text type="danger" @click="deleteItem(row)">删除</el-button>
-              </template>
-            </vxe-column>
-          </vxe-table>
+            <div class="d-flex flex1 ov-hd flex-cln pd-16">
+                <searchTabs :list="memberLevelCountList" v-model="queryParams.vipLevel" keyLabel="name" @change="handleQuery" keyCount="num" keyValue="type"></searchTabs>
+                <div class="pd-8"></div>
+                <div class="flex1 ov-hd">
+                    <vxe-table :loading="loading" border :data="memberList" min-height="0" max-height="100%">
+                        <vxe-column title="会员名称" align="center" field="cpyName" width="220" :formatter="colNoData" />
+                        <vxe-column title="会员级别" align="center" field="vipLevel" width="120">
+                            <template #default="scope">
+                                <dict-tag :value="scope.row.vipLevel" :options="vip_level" />
+                            </template>
+                        </vxe-column>
+                        <vxe-column title="单位负责人" align="center" field="contact" width="100" :formatter="colNoData" />
+                        <vxe-column title="负责人联系电话" align="center" field="contactTel" wmin-width="100" :formatter="colNoData" />
+                        <vxe-column title="企业地址" wmin-width="100">
+                            <template #default="{ row }">
+                                {{ (row.adcdCodeName || '') + (row.address || '') || '-' }}
+                            </template>
+                        </vxe-column>
+                        <vxe-column title="有效期状态" width="100" :formatter="colNoData">
+                            <template #default="{ row }">
+                                {{ +row?.vipEnable ? '有效' : '过期' }}
+                            </template>
+                        </vxe-column>
+                        <vxe-column title="有效期至" align="center" field="endDate" width="140" :formatter="colNoData" />
+                        <vxe-column title="入会时间" align="center" field="startDate" wmin-width="100" :formatter="colNoData" />
+                        <vxe-column title="操作" width="330" align="center" fixed="right" class-name="small-padding fixed-width">
+                            <template #default="{ row }">
+                                <el-button text type="primary" @click="memberDetail(row)">详情</el-button>
+                                <span></span>
+                                <el-button text style="color: #0079fe" @click="editRowEndDate(row)">修改有效期</el-button>
+                                <span></span>
+                                <el-button text style="color: #0079fe" @click="editRowlevel(row)">修改级别</el-button>
+                                <span></span>
+                                <el-button text type="danger" @click="deleteItem(row)">删除</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>
-        <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
-          v-model:limit="queryParams.pageSize" @pagination="getList" />
-      </div>
     </div>
-  </div>
-  <EditVipLevel v-if="showViplevel" v-model:show="showViplevel" :info="rowInfo" :dict="{ vip_level }" @success="getList"></EditVipLevel>
-  <EditVipEndDate v-if="showVipEndDate" v-model:show="showVipEndDate" :info="rowInfo"  @success="getList"></EditVipEndDate>
+    <EditVipLevel v-if="showViplevel" v-model:show="showViplevel" :info="rowInfo" :dict="{ vip_level }" @success="getList"></EditVipLevel>
+    <EditVipEndDate v-if="showVipEndDate" v-model:show="showVipEndDate" :info="rowInfo" @success="getList"></EditVipEndDate>
 </template>
 
 <script setup name="Member" lang="ts">
@@ -105,113 +99,110 @@ const total = ref(0);
 const queryFormRef = ref<ElFormInstance>();
 const rowInfo = ref<any>({});
 const initFormData: MemberForm = {
-  id: undefined,
-  cpyName: '',
-  legalPersonName: '',
-  legalPersonPhone: '',
-  legalPersonPosition: '',
-  legalPersonIdFront: '',
-  legalPersonIdBack: '',
-  companyCertificate: '',
-  email: '',
-  department: '',
-  totalAssets: '',
-  introduction: '',
-  regType: '',
-  membershipPurpose: '',
-  plantingInfo: [],
-  vipLevel: '',
-  startDate: '',
-  endDate: '',
-  reviewStatus: '',
-  reviewMsg: '',
-  reviewBy: '',
-  reviewTime: '',
-  partnerId: '',
-  cpyBusType: '',
-  applyLevel: ''
+    id: undefined,
+    cpyName: '',
+    legalPersonName: '',
+    legalPersonPhone: '',
+    legalPersonPosition: '',
+    legalPersonIdFront: '',
+    legalPersonIdBack: '',
+    companyCertificate: '',
+    email: '',
+    department: '',
+    totalAssets: '',
+    introduction: '',
+    regType: '',
+    membershipPurpose: '',
+    plantingInfo: [],
+    vipLevel: '',
+    startDate: '',
+    endDate: '',
+    reviewStatus: '',
+    reviewMsg: '',
+    reviewBy: '',
+    reviewTime: '',
+    partnerId: '',
+    cpyBusType: '',
+    applyLevel: ''
 };
 const data = reactive<any>({
-  form: { ...initFormData },
-  queryParams: {
-    pageNum: 1,
-    pageSize: 10,
-    vipLevel: '',
-    paymentStatus: '1',
-    reviewStatus: '1',
-    vipEnable: ''
-  },
-  rules: {}
+    form: { ...initFormData },
+    queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        vipLevel: '',
+        paymentStatus: '1',
+        reviewStatus: '1',
+        vipEnable: ''
+    },
+    rules: {}
 });
 // 修改级别
 const editRowlevel = (row: any) => {
-  rowInfo.value = { ...row };
-  showViplevel.value = true;
+    rowInfo.value = { ...row };
+    showViplevel.value = true;
 };
 // 修改有效期时间
 const editRowEndDate = (row: any) => {
-  rowInfo.value = { ...row };
-  showVipEndDate.value = true;
+    rowInfo.value = { ...row };
+    showVipEndDate.value = true;
 };
 const { queryParams, form } = toRefs(data);
 /** 查询会员信息列表 */
 const getList = async () => {
-  loading.value = true;
-  const res = await listMember(queryParams.value);
-  memberList.value = res.rows;
-  total.value = res.total;
-  loading.value = false;
+    loading.value = true;
+    const res = await listMember(queryParams.value);
+    memberList.value = res.rows;
+    total.value = res.total;
+    loading.value = false;
 };
 
 /** 查询会员信息列表 */
 const getMemberLevelList = async () => {
-  loading.value = true;
-  const res = await countLevelMember(queryParams.value);
-  memberLevelCountList.value = res.data;
-  loading.value = false;
+    loading.value = true;
+    const res = await countLevelMember(queryParams.value);
+    memberLevelCountList.value = res.data;
+    loading.value = false;
 };
 
 /** 搜索按钮操作 */
 const handleQuery = () => {
-  queryParams.value.pageNum = 1;
-  getList();
+    queryParams.value.pageNum = 1;
+    getList();
 };
 
 /** 重置按钮操作 */
 const resetQuery = () => {
-  queryFormRef.value?.resetFields();
-  queryParams.value.payStartDate = '';
-  queryParams.value.payEndDate = '';
-  handleQuery();
+    queryFormRef.value?.resetFields();
+    queryParams.value.payStartDate = '';
+    queryParams.value.payEndDate = '';
+    handleQuery();
 };
 
 const memberDetail = (row: any) => {
-  router.push({ path: `/szyy/member-detail`, query: { memberId: row.id } });
+    router.push({ path: `/szyy/member-detail`, query: { memberId: row.id } });
 };
 const deleteItem = async (row: any) => {
-  ElMessageBox({
-    title: '删除提示',
-    cancelButtonText: '取消',
-    confirmButtonText: '确认删除',
-    showCancelButton: true,
-    confirmButtonClass: 'el-button--danger',
-    message: h('p', null, [
-      h('div', null, `确认要删除企业:${row.cpyName} 吗?`),
-      h('div', null, [h('span', null, '注意:'), h('span', { style: 'color: #F56C6C' }, '删除后,该企业将不再是协会的会员单位,请谨慎操作!')])
-    ]),
-    callback: async (action: string) => {
-      if (action === 'confirm') {
-        const res = await delMember(row.id);
-        if (res) {
-          ElMessage.success('删除成功');
-          getList();
+    ElMessageBox({
+        title: '删除提示',
+        cancelButtonText: '取消',
+        confirmButtonText: '确认删除',
+        showCancelButton: true,
+        confirmButtonClass: 'el-button--danger',
+        message: h('p', null, [h('div', null, `确认要删除企业:${row.cpyName} 吗?`), h('div', null, [h('span', null, '注意:'), h('span', { style: 'color: #F56C6C' }, '删除后,该企业将不再是协会的会员单位,请谨慎操作!')])]),
+        callback: async (action: string) => {
+            if (action === 'confirm') {
+                const res = await delMember(row.id);
+                if (res) {
+                    ElMessage.success('删除成功');
+                    getList();
+                }
+            }
         }
-      }
-    }
-  });
+    });
 };
 onMounted(() => {
-  getList();
-  getMemberLevelList();
+    getList();
+    getMemberLevelList();
 });
 </script>

+ 11 - 10
src/views/dgtmedicine/model/CheckNoPass.vue

@@ -1,12 +1,13 @@
 <template>
     <vxe-modal v-model="dialogVisible" :title="title" show-zoom resize show-footer destroy-on-close transfer @hide="close" :width="width">
         <template #default>
-           <div>
-              是否确认将企业 <span class="c-primary">{{ props.info?.cpyName }}</span>
-           </div>
-           <div>审核为不通过!请填写不通过原因</div>
-           <el-form ref="formRef" :model="form" :rules="rules" label-width="auto" hide-required-asterisk>
-                <el-form-item  prop="reviewMsg">
+            <div>
+                是否确认将企业
+                <span class="c-primary">{{ props.info?.cpyName }}</span>
+            </div>
+            <div>审核为不通过!请填写不通过原因</div>
+            <el-form ref="formRef" :model="form" :rules="rules" label-width="auto" hide-required-asterisk>
+                <el-form-item prop="reviewMsg">
                     <el-input type="textarea" :rows="3" maxlength="50" v-model="form.reviewMsg" placeholder="请填写不通过原因…" clearable />
                 </el-form-item>
             </el-form>
@@ -28,7 +29,7 @@ const props = defineProps({
     show: propTypes.bool.def(false),
     title: propTypes.string.def('审核通过'),
     width: propTypes.number.def(400),
-    info: propTypes.any.def(null),
+    info: propTypes.any.def(null)
 });
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const dialogVisible = ref(false);
@@ -37,8 +38,8 @@ const form = ref<any>({
     reviewMsg: ''
 });
 const rules = reactive({
-    reviewMsg: [{ required: true, message: '请填写不通过原因', trigger: 'change' }],
-})
+    reviewMsg: [{ required: true, message: '请填写不通过原因', trigger: 'change' }]
+});
 const formRef = ref<FormInstance>();
 const close = () => {
     formRef.value?.resetFields();
@@ -50,7 +51,7 @@ const submitForm = async () => {
         await formRef.value?.validate();
         const res = await approvalMember({ ...form.value, id: props.info?.id });
         if (res) {
-            proxy.$modal.msgSuccess('审核不通过成功!')
+            proxy.$modal.msgSuccess('审核不通过成功!');
             close();
             emit('success', true);
         }

+ 3 - 5
src/views/dgtmedicine/model/CheckPass.vue

@@ -24,16 +24,14 @@ const props = defineProps({
     show: propTypes.bool.def(false),
     title: propTypes.string.def('审核通过'),
     width: propTypes.number.def(400),
-    info: propTypes.any.def(null),
+    info: propTypes.any.def(null)
 });
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const dialogVisible = ref(false);
 const form = ref<any>({
     reviewStatus: '1'
 });
-const rules = reactive({
-
-})
+const rules = reactive({});
 const formRef = ref<FormInstance>();
 const close = () => {
     // formRef.value?.resetFields();
@@ -45,7 +43,7 @@ const submitForm = async () => {
         // await formRef.value?.validate();
         const res = await approvalMember({ ...form.value, id: props.info?.id });
         if (res) {
-            proxy.$modal.msgSuccess('审核通过成功!')
+            proxy.$modal.msgSuccess('审核通过成功!');
             close();
             emit('success', true);
         }

+ 4 - 1
src/views/dgtmedicine/model/EditVipEndDate.vue

@@ -2,7 +2,10 @@
     <vxe-modal v-model="dialogVisible" :title="title" show-zoom resize show-footer destroy-on-close transfer @hide="close" :width="width" :z-index="100">
         <template #default>
             <el-form ref="formRef" :model="form" :rules="rules" label-width="auto">
-                <div class="mb-10 f-s-14 c-333 f-w-5">修改企业:<span class="c-primary">{{ info?.cpyName }}</span></div>
+                <div class="mb-10 f-s-14 c-333 f-w-5">
+                    修改企业:
+                    <span class="c-primary">{{ info?.cpyName }}</span>
+                </div>
                 <el-form-item label="有效期至:" prop="endDate">
                     <el-date-picker v-model="form.endDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择有效期" clearable style="width: 100%"></el-date-picker>
                 </el-form-item>

+ 4 - 1
src/views/dgtmedicine/model/EditVipLevel.vue

@@ -2,7 +2,10 @@
     <vxe-modal v-model="dialogVisible" :title="title" show-zoom resize show-footer destroy-on-close transfer @hide="close" :width="width" :z-index="100">
         <template #default>
             <el-form ref="formRef" :model="form" :rules="rules" label-width="auto">
-                <div class="mb-10 f-s-14 c-333 f-w-5">修改企业:<span class="c-primary">{{ info?.cpyName }}</span></div>
+                <div class="mb-10 f-s-14 c-333 f-w-5">
+                    修改企业:
+                    <span class="c-primary">{{ info?.cpyName }}</span>
+                </div>
                 <el-form-item label="选择会员级别:" prop="vipLevel">
                     <el-select v-model="form.vipLevel" placeholder="请选择会员级别" clearable style="width: 100%">
                         <el-option v-for="item in dict.vip_level" :key="item.value" :label="item.label" :value="item.value" />

+ 9 - 13
src/views/dgtmedicine/model/MemberInfo.vue

@@ -14,27 +14,23 @@
         <el-descriptions-item label="单位负责人联系电话:">{{ form?.contactTel || '-' }}</el-descriptions-item>
         <el-descriptions-item label="邮箱">{{ form?.email || '-' }}</el-descriptions-item>
         <el-descriptions-item label="单位简介:" :span="2">{{ form?.introduction || '-' }}</el-descriptions-item>
-        <el-descriptions-item label="入会主要目的:" :span="2">{{ form?.membershipPurpose || '-'
-        }}</el-descriptions-item>
+        <el-descriptions-item label="入会主要目的:" :span="2">
+            {{ form?.membershipPurpose || '-'
+            }}
+        </el-descriptions-item>
     </el-descriptions>
     <el-divider />
     <el-descriptions :column="3" direction="vertical">
         <el-descriptions-item label="营业执照:">
-            <el-image class="bg-ccc" style="width: 100px; height: 100px" :src="form?.license" :zoom-rate="1.2"
-                :max-scale="7" :min-scale="0.2" :preview-src-list="[form?.license]" fit="contain" />
+            <el-image class="bg-ccc" style="width: 100px; height: 100px" :src="form?.license" :zoom-rate="1.2" :max-scale="7" :min-scale="0.2" :preview-src-list="[form?.license]" fit="contain" />
         </el-descriptions-item>
         <el-descriptions-item label="法人身份证:">
-            <el-image :zoom-rate="1.2" :max-scale="7" :min-scale="0.2" :preview-src-list="[form?.legalPersonIdFront]"
-                class="mr-10 bg-ccc" style="width: 180px; height: 100px" :src="form?.legalPersonIdFront"
-                fit="contain" />
-            <el-image style="width: 180px; height: 100px" class="bg-ccc" :zoom-rate="1.2" :max-scale="7"
-                :min-scale="0.2" :preview-src-list="[form?.legalPersonIdBack]" :src="form?.legalPersonIdBack"
-                fit="contain" />
+            <el-image :zoom-rate="1.2" :max-scale="7" :min-scale="0.2" :preview-src-list="[form?.legalPersonIdFront]" class="mr-10 bg-ccc" style="width: 180px; height: 100px" :src="form?.legalPersonIdFront" fit="contain" />
+            <el-image style="width: 180px; height: 100px" class="bg-ccc" :zoom-rate="1.2" :max-scale="7" :min-scale="0.2" :preview-src-list="[form?.legalPersonIdBack]" :src="form?.legalPersonIdBack" fit="contain" />
         </el-descriptions-item>
         <el-descriptions-item label="公司荣誉证书等资料:">
             <template v-for="(item, index) in form?.companyCertificate" :key="index">
-                <el-image class="bg-ccc mr-10" :initial-index="index" :preview-src-list="form?.companyCertificate"
-                    style="width: 100px; height: 100px" :src="item" fit="contain" />
+                <el-image class="bg-ccc mr-10" :initial-index="index" :preview-src-list="form?.companyCertificate" style="width: 100px; height: 100px" :src="item" fit="contain" />
             </template>
         </el-descriptions-item>
     </el-descriptions>
@@ -66,4 +62,4 @@ const getDetail = async () => {
 onMounted(() => {
     getDetail()
 })
-</script>
+</script>

+ 22 - 24
src/views/dgtmedicine/model/MemberPayLog.vue

@@ -1,29 +1,27 @@
 <template>
     <div class="flex1 ov-hd">
-    <vxe-table :loading="loading" border :data="list">
-        <vxe-column title="订单号" field="id" 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="{ row }">
-                <el-button v-if="+row.invoiceStatus" style="color: #999;" tag="a" text :underline="false"
-                    type="primary" :href="row.invoiceUrlAddr" target="_blank">查看发票</el-button>
-                <el-button v-else type="primary" text @click="clickRowEdit(row)">上传发票</el-button>
-            </template>
-        </vxe-column>
-    </vxe-table>
+        <vxe-table :loading="loading" border :data="list">
+            <vxe-column title="订单号" field="id" 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="{ row }">
+                    <el-button v-if="+row.invoiceStatus" style="color: #999;" tag="a" text :underline="false" type="primary" :href="row.invoiceUrlAddr" target="_blank">查看发票</el-button>
+                    <el-button v-else type="primary" text @click="clickRowEdit(row)">上传发票</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" />
+    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
     <uploadInvoiceForm v-if="showInvoice" v-model:show="showInvoice" :info="rowInfo"></uploadInvoiceForm>
 </template>
 <script setup name="Pay-log" lang="ts">
@@ -84,4 +82,4 @@ const resetQuery = () => {
 onMounted(() => {
     getList();
 });
-</script>
+</script>

+ 1 - 1
src/views/dgtmedicine/model/uploadInvoiceForm.vue

@@ -3,7 +3,7 @@
         <template #default>
             <el-form ref="formRef" :model="form" :rules="rules" label-width="auto" hide-required-asterisk>
                 <el-form-item label="发票:" prop="invoiceUrl">
-                    <file-upload v-model="form.invoiceUrl" :limit="1" :isString="true" :fileType="['pdf']"/>
+                    <file-upload v-model="form.invoiceUrl" :limit="1" :isString="true" :fileType="['pdf']" />
                 </el-form-item>
             </el-form>
         </template>

+ 53 - 54
src/views/dgtmedicine/pay-log/index.vue

@@ -1,60 +1,59 @@
 <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="id">
-            <el-input v-model="queryParams.id" 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">
-            <DateRange v-model="queryParams.dateRange" v-model:start-date="queryParams.startDate"
-                v-model:end-date="queryParams.endDate" @change="handleQuery"></DateRange>
-          </el-form-item>
-          <el-form-item label="是否已开发票" prop="cpyName">
-            <el-select style="width: 140px" v-model="queryParams.invoiceStatus" clearable placeholder="搜有效期状态" @change="handleQuery">
-              <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>
-      <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="id" 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="{ row }">
-                <el-button v-if="+row.invoiceStatus" style="color: #999;"  tag="a" text :underline="false" type="primary" :href="row.invoiceUrlAddr" target="_blank">查看发票</el-button>
-                <el-button v-else type="primary" text @click="clickRowEdit(row)">上传发票</el-button>
-              </template>
-            </vxe-column>
-          </vxe-table>
+    <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="id">
+                        <el-input v-model="queryParams.id" 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">
+                        <DateRange v-model="queryParams.dateRange" v-model:start-date="queryParams.startDate" v-model:end-date="queryParams.endDate" @change="handleQuery"></DateRange>
+                    </el-form-item>
+                    <el-form-item label="是否已开发票" prop="cpyName">
+                        <el-select style="width: 140px" v-model="queryParams.invoiceStatus" clearable placeholder="搜有效期状态" @change="handleQuery">
+                            <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>
+            <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="id" 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="{ row }">
+                                <el-button v-if="+row.invoiceStatus" style="color: #999;" tag="a" text :underline="false" type="primary" :href="row.invoiceUrlAddr" target="_blank">查看发票</el-button>
+                                <el-button v-else type="primary" text @click="clickRowEdit(row)">上传发票</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>
-        <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
-      </div>
     </div>
-  </div>
-  <uploadInvoiceForm v-if="showInvoice" v-model:show="showInvoice" :info="rowInfo"></uploadInvoiceForm>
+    <uploadInvoiceForm v-if="showInvoice" v-model:show="showInvoice" :info="rowInfo"></uploadInvoiceForm>
 </template>
 <script setup name="Pay-log" lang="ts">
 import { colNoData } from '@/utils/noData';