后台需求更新

houtai/src/apis/tab2.js

@@ -60,3 +60,10 @@ export const goodsReport = (data) => {
     data
   })
 }
+
+// 切换显示详情的开关
+export const goodsIsDetail = (id, display) => {
+  return axios({
+    url: `/api/cms/goods/isDetail/${id}/${display}`
+  })
+}

houtai/src/assets/css/base.css

@@ -73,11 +73,12 @@ input[type="number"] {
   border-top: 1px solid #EBEEF5;
 }
 .table_img{
-  width: 100px;
-  height: 80px;
+  width: 80px;
+  height: 60px;
   object-fit: cover;
   border: 1px solid #ccc;
 }
+
 .table_name{
   cursor: pointer;
   overflow: hidden;

houtai/src/views/tab2/index.vue

@@ -105,7 +105,12 @@
         </div>
         <!-- 表格 -->
         <div class="table">
-          <el-table :data="tableData" style="width: 100%">
+          <el-table
+            ref="tableList"
+            :data="tableData"
+            style="width: 100%"
+            size="mini"
+          >
             <el-table-column label="编号" width="80">
               <template slot-scope="scope">
                 {{
@@ -114,7 +119,7 @@
               </template>
             </el-table-column>
             <el-table-column label="名称" prop="name"> </el-table-column>
-            <el-table-column label="总登记号">
+            <el-table-column label="总登记号" sortable prop="registerNum">
               <template #default="{ row }">
                 <span
                   style="cursor: pointer"
@@ -129,7 +134,7 @@
                 <span v-else>(空)</span>
               </template>
             </el-table-column>
-            <el-table-column label="类别">
+            <el-table-column label="类别" sortable prop="dictTextureName">
               <template #default="{ row }">
                 <span v-if="row.dictTextureName">{{
                   row.dictTextureName
@@ -143,7 +148,7 @@
                 <span v-else>(空)</span>
               </template>
             </el-table-column>
-            <el-table-column label="级别">
+            <el-table-column label="级别" sortable prop="dictLevelName">
               <template #default="{ row }">
                 <span v-if="row.dictLevelName">{{ row.dictLevelName }}</span>
                 <span v-else>(空)</span>
@@ -175,30 +180,38 @@
               </template>
             </el-table-column>
             <el-table-column prop="day" label="录入日期"> </el-table-column>
-            <el-table-column label="操作">
+            <el-table-column label="显示详情">
               <template #default="{ row }">
-
-                                <el-button
-                  type="text"
-                  @click="openQrCode(row.id)"
+                <el-switch
+                  @change="isShowfFu($event, row.id)"
+                  v-model="row.isDetail"
+                  :active-value="1"
+                  :inactive-value="0"
+                >
+                </el-switch>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" width="190">
+              <template #default="{ row }">
+                <el-button type="text" size="mini" @click="openQrCode(row.id)"
                   >预览</el-button
                 >
 
                 <el-button
                   type="text"
+                  size="mini"
                   @click="lookQrCode(row.qrPath, row.fileName)"
                   >二维码</el-button
                 >
 
-                <el-button type="text" @click="editGood(row.id)"
+                <el-button type="text" size="mini" @click="editGood(row.id)"
                   >编辑</el-button
                 >
                 <el-button
                   type="text"
+                  size="mini"
                   style="color: #d9001b"
-                  :disabled="!!row.display"
                   @click="delGoods(row.id)"
-                  :class="{ disNo: row.display }"
                   >删除</el-button
                 >
               </template>
@@ -242,10 +255,11 @@
 
 <script>
 import axios from '@/utils/request'
-import { goodsList, goodsRemove, goodsDisplay, dictGetTree } from '@/apis/tab2'
+import { goodsList, goodsRemove, goodsDisplay, dictGetTree, goodsIsDetail } from '@/apis/tab2'
 import dayjs from 'dayjs'
 import relativeTime from 'dayjs/plugin/relativeTime'
 import 'dayjs/locale/zh-cn'
+
 dayjs.extend(relativeTime)
 
 export default {
@@ -316,6 +330,12 @@ export default {
   },
   // 方法集合
   methods: {
+    // 显示详情开关的切换
+    async isShowfFu (val, id) {
+      await goodsIsDetail(id, val)
+      console.log(123, val, id)
+    },
+
     // 点击预览
     openQrCode (id) {
       window.open(`/web/index.html#/Model?m=${id}`)
@@ -379,6 +399,8 @@ export default {
         this.formData.dictAgeId =
           ''
       this.goodsList(this.formData)
+      // 清除排序
+      this.$refs.tableList.clearSort()
     },
     // 点击查询
     searchBtn () {
@@ -603,7 +625,7 @@ export default {
       }
     }
     .con_right {
-      padding: 15px 30px 0;
+      padding: 10px 30px 0;
       width: 100%;
       .classify {
         text-align: center;
@@ -615,9 +637,8 @@ export default {
       .search {
         display: flex;
         align-items: center;
-        margin-bottom: 20px;
+        margin-bottom: 10px;
         position: relative;
-        margin-top: 12px;
         height: 40px;
         /deep/.el-input__inner {
           padding-right: 50px;
@@ -641,7 +662,7 @@ export default {
   //   max-width: 1370px;
   // }
   /deep/.el-table__body-wrapper {
-    max-height: 440px;
+    max-height: 480px;
     overflow-y: auto;
   }
   .paging {
@@ -658,5 +679,8 @@ export default {
   .disNo {
     color: #ccc !important;
   }
+  /deep/.el-table__row > td {
+    padding: 3px 0 !important;
+  }
 }
 </style>

webNew/src/index.tsx

@@ -1,28 +1,30 @@
-import App from './App'
-import AppM from './AppM'
-import store from './store/index'
-import { Provider } from 'react-redux'
+import App from "./App";
+import AppM from "./AppM";
+import store from "./store/index";
+import zhCN from "antd/es/locale/zh_CN";
+import { ConfigProvider } from "antd";
+import { Provider } from "react-redux";
 
-import { createRoot } from 'react-dom/client';
-import { isMobiileFu } from './utils/storage';
+import { createRoot } from "react-dom/client";
+import { isMobiileFu } from "./utils/storage";
 
-
-const container = document.getElementById('root') as HTMLElement;
+const container = document.getElementById("root") as HTMLElement;
 const root = createRoot(container);
 
-
 if (isMobiileFu()) {
   root.render(
-    <Provider store={store}>
-      <AppM />
-    </Provider>
+    <ConfigProvider locale={zhCN}>
+      <Provider store={store}>
+        <AppM />
+      </Provider>
+    </ConfigProvider>
   );
 } else {
   root.render(
+    <ConfigProvider locale={zhCN}>
     <Provider store={store}>
       <App />
     </Provider>
+    </ConfigProvider>
   );
 }
-
-

webNew/src/pages/Home/index.tsx

@@ -218,6 +218,7 @@ export default function Home() {
         {/* 分页器 */}
         <div className="page">
           <Pagination
+            showQuickJumper 
             size="small"
             current={pageNum}
             total={total}

webNew/src/types/declaration.d.ts

@@ -1,4 +1,5 @@
 declare module 'history'
 declare module '*.scss';
 declare module '*.png';
-declare module 'react-lazy-load-image-component'
+declare module 'react-lazy-load-image-component';
+declare module 'antd/locale/zh_CN'