修改

src/views/cdt/items/index.vue

@@ -3,8 +3,7 @@
         <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">
@@ -20,9 +19,7 @@
             <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 }}
@@ -32,9 +29,7 @@
                         </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 }}
@@ -50,14 +45,11 @@
                             <!-- 序号 -->
                             <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>
@@ -151,4 +143,5 @@ onMounted(() => {
 
 .content-border {
     border: 1px solid var(--border-color);
-}</style>
+}
+</style>

src/views/cdt/menus/index.vue

@@ -10,27 +10,22 @@
                     <div class="flex1 ov-hd d-flex j-ed">
                         <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" @keyup.enter="handleQuery" />
                             </el-form-item>
                             <el-form-item label="套餐状态" prop="status">
-                                <el-select style="width: 160px" v-model="queryParams.status" clearable placeholder="请选择套餐状态"
-                                    @change="handleQuery">
+                                <el-select style="width: 160px" v-model="queryParams.status" clearable placeholder="请选择套餐状态" @change="handleQuery">
                                     <el-option label="未上架" value="0"></el-option>
                                     <el-option label="在售" value="1"></el-option>
                                     <el-option label="已下架" value="2"></el-option>
                                 </el-select>
                             </el-form-item>
                             <el-form-item label="制定规则" prop="permitType">
-                                <el-select style="width: 160px" v-model="queryParams.permitType" clearable
-                                    placeholder="请选择制定规则" @change="handleQuery">
-                                    <el-option v-for="item in dm_permit_type" :key="item.value" :label="item.label"
-                                        :value="item.value"></el-option>
+                                <el-select style="width: 160px" v-model="queryParams.permitType" clearable placeholder="请选择制定规则" @change="handleQuery">
+                                    <el-option v-for="item in dm_permit_type" :key="item.value" :label="item.label" :value="item.value"></el-option>
                                 </el-select>
                             </el-form-item>
                             <el-form-item label="创建人" prop="createByName">
-                                <el-input v-model="queryParams.createByName" placeholder="请输入创建人关键字" clearable
-                                    style="width: 160px" @keyup.enter="handleQuery" />
+                                <el-input v-model="queryParams.createByName" placeholder="请输入创建人关键字" clearable style="width: 160px" @keyup.enter="handleQuery" />
                             </el-form-item>
                             <el-form-item>
                                 <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -41,15 +36,13 @@
                 </div>
             </div>
             <div class="flex1 ov-hd pd-16 d-flex flex-cln">
-                <searchTabs v-model="queryParams.publicFlag" @change="handleQuery" :list="tabs" key-label="name"
-                    key-value="type" key-count="num"></searchTabs>
+                <searchTabs v-model="queryParams.publicFlag" @change="handleQuery" :list="tabs" key-label="name" key-value="type" key-count="num"></searchTabs>
                 <div class="pd-8"></div>
                 <div class="flex1 ov-hd">
                     <vxe-table :loading="loading" border :data="list" min-height="0" max-height="100%">
                         <!-- 序号 -->
                         <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="套餐名称" fixed="left" align="center" field="name" min-width="100" :formatter="colNoData" />
                         <vxe-column title="适用对象" field="applyType" min-width="100">
                             <template #default="{ row }">
                                 <view class="d-flex flex-cln" v-if="row?.permitType == '1'">
@@ -63,7 +56,8 @@
                                 <view class="d-flex flex-cln" v-if="row?.permitType == '2'">
                                     <view>
                                         {{ row?.permitCpyNames?.join(',') }}-{{
-                                            NP.times(row?.priceDetail[0]?.memberDiscount, 10) }}折
+                                            NP.times(row?.priceDetail[0]?.memberDiscount, 10)
+                                        }}折
                                         <span class="c-333 f-w-5">（{{ row?.priceDetail[0]?.price }}）</span>
                                     </view>
                                 </view>
@@ -93,8 +87,7 @@
                             <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-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>
@@ -112,8 +105,7 @@
                                 <template v-if="+row?.status === 0">
                                     <el-button @click="putaway(row)" text type="primary">上架</el-button>
                                     <span></span>
-                                    <el-button @click="router.push({ path: 'menus-form', query: { id: row?.id } })" text
-                                        type="primary">编辑</el-button>
+                                    <el-button @click="router.push({ path: 'menus-form', query: { id: row?.id } })" text type="primary">编辑</el-button>
                                 </template>
                                 <template v-if="+row?.status === 1">
                                     <el-button @click="soldOut(row)" text type="danger">下架</el-button>
@@ -128,16 +120,13 @@
                                 <span></span>
                                 <el-button @click="copyItem(row)" text type="primary">复制</el-button>
                                 <span></span>
-                                <el-button @click="router.push({ path: 'menus-detail', query: { id: row?.id } })" text
-                                    type="primary">详情</el-button>
+                                <el-button @click="router.push({ path: 'menus-detail', query: { id: row?.id } })" text type="primary">详情</el-button>
                             </template>
                         </vxe-column>
                     </vxe-table>
                 </div>
             </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 title="套餐分享" v-model="shareDialog" width="350px">

src/views/cdt/models/rowItems.vue

@@ -3,7 +3,7 @@
         <template #default>
             <div class="d-flex flex-cln" style="height: 60vh;">
                 <div class="flex1 ov-hd" style="height:50vh">
-                    <vxe-table :loading="loading" border :data="list" height="auto" >
+                    <vxe-table :loading="loading" border :data="list" height="auto">
                         <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" />