bug修复

src/views/cdt/items/index.vue

@@ -3,12 +3,13 @@
         <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-20">检测项查询</div>
-                <searchTabs v-model="tabActive" :list="[ { label: '按检测项目', value: '1' }, { label: '按执行标准', value: '2' } ]" :is-num="false"></searchTabs>
+                <searchTabs v-model="tabActive" :list="[{ label: '按检测项目', value: '1' }, { label: '按执行标准', value: '2' }]"
+                    :is-num="false"></searchTabs>
             </div>
             <div class="pd-16">
                 <el-form :model="queryParams" ref="queryFormRef" :inline="true" label-width="auto">
                     <el-form-item label="检测项名称：" prop="name">
-                        <el-input v-model="queryParams.name" placeholder="请输入检测项名称关键字" clearable style="width: 180px" @keyup.enter="handleQuery" />
+                        <el-input v-model="queryParams.name" placeholder="请输入检测项名称关键字" clearable style="width: 180px" />
                     </el-form-item>
                     <el-form-item>
                         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -19,7 +20,9 @@
             <div class="flex1 ov-hd d-flex content-border">
                 <div class="tree-wrap">
                     <div v-show="tabActive === '1'">
-                        <el-tree ref="treeItemsRef" class="base-tree-tabs" auto-expand-parent default-expand-all node-key="id" :data="itemsData" :props="{ label: 'name' }" highlight-current @node-click="itemsClick" accordion>
+                        <el-tree ref="treeItemsRef" class="base-tree-tabs" auto-expand-parent default-expand-all
+                            node-key="id" :data="itemsData" :props="{ label: 'name' }" highlight-current
+                            @node-click="itemsClick" accordion>
                             <template #default="{ node, data }">
                                 <span>
                                     {{ node.label }}
@@ -29,7 +32,9 @@
                         </el-tree>
                     </div>
                     <div v-show="tabActive === '2'">
-                        <el-tree ref="treeStandardsRef" class="base-tree-tabs" auto-expand-parent :data="standards" node-key="id" :props="{ label: 'name' }" highlight-current @node-click="standardsClick" accordion>
+                        <el-tree ref="treeStandardsRef" class="base-tree-tabs" auto-expand-parent :data="standards"
+                            node-key="id" :props="{ label: 'name' }" highlight-current @node-click="standardsClick"
+                            accordion>
                             <template #default="{ node, data }">
                                 <span>
                                     {{ node.label }}
@@ -45,11 +50,14 @@
                             <!-- 序号 -->
                             <vxe-column type="seq" width="60" title="序号" align="center" />
                             <vxe-column title="检测项目" align="center" field="name" min-width="100" :formatter="colNoData" />
-                            <vxe-column title="单价（元、批次）" align="center" field="price" min-width="100" :formatter="colNoData" />
-                            <vxe-column title="备注" align="center" field="description" min-width="100" :formatter="colNoData" />
+                            <vxe-column title="单价（元、批次）" align="center" field="price" min-width="100"
+                                :formatter="colNoData" />
+                            <vxe-column title="备注" align="center" field="description" min-width="100"
+                                :formatter="colNoData" />
                         </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 class="pd-5"></div>
                 </div>
             </div>
@@ -98,7 +106,7 @@ const resetQuery = () => {
     };
     // 重置树高亮
     treeItemsRef.value?.setCurrentKey(null, true);
-    treeStandardsRef.value?.setCurrentKey(null, true);
+    treeStandardsRef.value?.setCurrentKey(null, false);
     handleQuery()
 };
 const getTabsTree = async () => {
@@ -140,7 +148,7 @@ onMounted(() => {
     border-right: 1px solid #ebeef5;
     padding: 16px;
 }
+
 .content-border {
     border: 1px solid var(--border-color);
-}
-</style>
+}</style>

src/views/cdt/menus/index.vue

@@ -52,7 +52,7 @@
                             :formatter="colNoData" />
                         <vxe-column title="适用对象" field="applyType" min-width="100">
                             <template #default="{ row }">
-                                <view class="d-flex flex-cln">
+                                <view class="d-flex flex-cln" v-if="row?.permitType == '1'">
                                     <template v-for="(item, index) in row?.priceDetail" :key="index">
                                         <view>
                                             {{ item?.memberLevelName }}-{{ NP.times(item?.memberDiscount, 10) }}折
@@ -60,6 +60,13 @@
                                         </view>
                                     </template>
                                 </view>
+                                <view class="d-flex flex-cln" v-if="row?.permitType == '2'">
+                                    <view>
+                                        {{ row?.permitCpyNames?.join(',') }}-{{
+                                            NP.times(row?.priceDetail[0]?.memberDiscount, 10) }}折
+                                        <span class="c-333 f-w-5">（{{ row?.priceDetail[0]?.price }}）</span>
+                                    </view>
+                                </view>
                             </template>
                         </vxe-column>
                         <vxe-column title="检测项目" min-width="140">
@@ -76,6 +83,23 @@
                         </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">
+                            <template #default="{ row }">{{ row?.validFrom }}</template>
+                        </vxe-column>
+                        <vxe-column title="结束时间" field="validUntil" width="160">
+                            <template #default="{ row }">{{ row?.validUntil }}</template>
+                        </vxe-column>
+                        <vxe-column title="剩余时间" field="restDay" width="100">
+                            <template #default="{ row }">
+                                <span v-if="row.status == 0">未上架</span>
+                                <span v-if="row.status == 2"></span>
+                                <span v-if="row.status == 1 && new Date(row?.validUntil ) > new Date()">
+                                    {{Math.floor((new Date(row?.validUntil).getTime()-new Date().getTime())/(3600*24*1000))+1 }}天</span>
+                                <span v-else>已过期</span>
+                            </template>
+                        </vxe-column>
+                        <vxe-column title="创建人" field="createName" width="100"></vxe-column>
+                        <vxe-column title="创建时间" field="createTime" width="160"></vxe-column>
                         <vxe-column title="套餐状态" align="center" width="90" fixed="right">
                             <template #default="{ row }">
                                 <span v-if="+row?.status === 0" class="c-danger">未上架</span>
@@ -235,9 +259,9 @@ const showShareImg = (row) => {
     sharePkgName.value = row?.name;
     shareDialog.value = true;
 }
-const qrCode=ref<any>(null)
+const qrCode = ref<any>(null)
 const download = () => {
-    const a:any = document.createElement('a')
+    const a: any = document.createElement('a')
     // 下载的文件名
     a.download = `${sharePkgName.value}.png`
     // url