bug修复

src/views/cdt/menus/index.vue

@@ -43,7 +43,7 @@
                         <!-- 序号 -->
                         <vxe-column type="seq" fixed="left" width="60" title="序号" align="center" />
                         <vxe-column title="套餐名称" fixed="left" align="center" field="name" min-width="100" :formatter="colNoData" />
-                        <vxe-column title="适用对象" field="applyType" min-width="100">
+                        <vxe-column title="适用对象" field="applyType" min-width="210">
                             <template #default="{ row }">
                                 <view class="d-flex flex-cln" v-if="row?.permitType == '1'">
                                     <template v-for="(item, index) in row?.priceDetail" :key="index">
@@ -63,7 +63,7 @@
                                 </view>
                             </template>
                         </vxe-column>
-                        <vxe-column title="检测项目" min-width="140">
+                        <vxe-column title="检测项目" min-width="240">
                             <template #default="{ row }">
                                 <view v-if="row?.items">
                                     {{ row?.items }}
@@ -77,10 +77,10 @@
                         </vxe-column>
                         <vxe-column title="上架数量" field="totalCount" width="80" :formatter="colNoData"></vxe-column>
                         <vxe-column title="销量" field="orderedCount" width="80" :formatter="colNoData"></vxe-column>
-                        <vxe-column title="开始时间" field="validFrom" width="160">
+                        <vxe-column title="开始时间" field="validFrom" width="120">
                             <template #default="{ row }">{{ row?.validFrom }}</template>
                         </vxe-column>
-                        <vxe-column title="结束时间" field="validUntil" width="160">
+                        <vxe-column title="结束时间" field="validUntil" width="120">
                             <template #default="{ row }">{{ row?.validUntil }}</template>
                         </vxe-column>
                         <vxe-column title="剩余时间" field="restDay" width="100">

src/views/dgtmedicine/check/index.vue

@@ -2,7 +2,7 @@
     <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>
+                <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" />

src/views/price/models/priceRepordCheck.vue

@@ -3,12 +3,13 @@
         <div class="pb-16 d-flex j-sb">
             <div>
                 <div>
-                    <searchTabs v-model="queryParams.auditStatus" @change="handleQuery" :list="tabs" key-label="name" key-value="type" key-count="num"></searchTabs>
+                    <searchTabs v-model="queryParams.auditStatus" @change="handleQuery" :list="tabs" key-label="name"
+                        key-value="type" key-count="num"></searchTabs>
                 </div>
             </div>
             <div>
-                <el-button @click="allPass" type="primary">全部通过</el-button>
-                <el-button @click="allNoPass" type="danger">全部不通过</el-button>
+                <el-button @click="allPass" type="primary" :disabled="nodataHandle">全部通过</el-button>
+                <el-button @click="allNoPass" type="danger" :disabled="nodataHandle">全部不通过</el-button>
             </div>
         </div>
         <vxe-table :loading="loading" border :data="list">
@@ -42,7 +43,8 @@
             </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" />
 </template>
 <script setup name="priceRepordCheck" lang="ts">
 import { colNoData } from '@/utils/noData';
@@ -87,7 +89,10 @@ const resetQuery = () => {
     handleQuery();
 };
 // tabs count获取
-const tabs = ref<any>([]);
+const tabs = ref<any[]>([]);
+const nodataHandle = computed(() => {
+    return tabs.value.filter(o => o.type === '0').map(o => o.num).reduce((a, b) => a + b, 0) == 0;
+});
 const getTabs = async () => {
     const res = await priceDetailCount({ originPriceId: query?.id, cpyid: query?.cpyid });
     if (!res || res.code !== 200) return;
@@ -122,8 +127,8 @@ const allNoPass = async () => {
                 priceId: query?.id,
                 auditStatus: '2',
                 msg: value
-        }
-        auditSubmit(params);
+            }
+            auditSubmit(params);
         })
         .catch(() => {
             console.log('取消');

src/views/price/report/detail/index.vue

@@ -15,8 +15,9 @@
                 <el-descriptions :column="4">
                     <el-descriptions-item label="上报品种:">{{ form?.varietyName || '-' }}</el-descriptions-item>
                     <el-descriptions-item label="上报企业:">{{ form?.cpyName || '-' }}</el-descriptions-item>
-                    <el-descriptions-item label="所在区域:">{{ form?.regionCodeName }}{{ form?.address || '-' }}</el-descriptions-item>
-                    <el-descriptions-item label="联系方式:">{{ form?.tel || '-' }}</el-descriptions-item>
+                    <el-descriptions-item label="区域:">{{ form?.province }}{{ form?.city}}{{ form?.district}}</el-descriptions-item>
+                    <el-descriptions-item label="是否公开联系方式:">{{ form?.isPub=='1'?'是':'否' }}</el-descriptions-item>
+                    <el-descriptions-item label="联系方式:">{{ form?.createByPhone }}</el-descriptions-item>
                     <el-descriptions-item label="上报说明:">{{ form?.remark || '-' }}</el-descriptions-item>
                     <el-descriptions-item label="上报人:">{{ form?.createByName || '-' }}</el-descriptions-item>
                     <el-descriptions-item label="上报时间:">{{ form?.createTime || '-' }}</el-descriptions-item>

src/views/price/report/index.vue

@@ -6,13 +6,13 @@
                 <div class="d-flex j-ed">
                     <div class="d-flex pl-20">
                         <el-form :model="queryParams" ref="queryFormRef" :inline="true" label-width="auto">
-                            <el-form-item label="品种名称">
+                            <el-form-item label="品种名称" prop="varietyName">
                                 <el-input v-model="queryParams.varietyName" placeholder="搜品种名称" clearable />
                             </el-form-item>
-                            <el-form-item label="企业名称">
+                            <el-form-item label="企业名称" prop="cpyName">
                                 <el-input v-model="queryParams.cpyName" placeholder="搜企业名称" clearable />
                             </el-form-item>
-                            <el-form-item label="审核状态">
+                            <el-form-item label="审核状态" prop="auditStatus">
                                 <el-select v-model="queryParams.auditStatus" @change="handleQuery" placeholder="请选择审核状态" clearable>
                                     <el-option v-for="item in check_status" :key="item.value" :label="item.label" :value="item.value" />
                                 </el-select>
@@ -68,7 +68,7 @@ const { check_status } = toRefs<any>(proxy?.useDict('check_status'));
 const queryParams = ref<any>({
     pageNum: 1,
     pageSize: 10,
-    auditStatus: '0'
+    auditStatus: ''
 });
 const loading = ref(false);
 const total = ref(0);