From 137ced05f42213b5a68850403e332cedbed9fb14 Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Fri, 10 May 2024 18:13:10 +0800
Subject: [PATCH] add

---
 .env.development                              |  4 +-
 .../dialogTable/dialogTableConfig.ts          | 13 ++--
 src/views/data/merchant/merchant/index.vue    | 15 ++--
 src/views/data/user/user/edit.vue             |  2 +-
 src/views/data/user/user/index.vue            |  2 +-
 src/views/goods/brand/edit.vue                | 23 +++---
 src/views/goods/brand/index.vue               | 32 ++-------
 src/views/goods/code/edit.vue                 | 37 ++++------
 src/views/goods/code/index.vue                | 55 ++++----------
 src/views/goods/goods/index.vue               | 50 ++++---------
 src/views/goods/goods_label/index.vue         |  2 +-
 src/views/goods/goodsclass/index.vue          | 72 ++++---------------
 src/views/goods/unit/edit.vue                 | 27 +++----
 src/views/goods/unit/index.vue                | 36 +++-------
 src/views/opurchase/opurchaseclass/index.vue  | 20 ++----
 src/views/retail/cashierclass/index.vue       | 20 +++---
 16 files changed, 120 insertions(+), 290 deletions(-)

diff --git a/.env.development b/.env.development
index b7b7e07..e8f6926 100644
--- a/.env.development
+++ b/.env.development
@@ -1,5 +1,5 @@
 NODE_ENV = 'development'
 VITE_NOW_TYPE = 'dist'
 # Base API
-VITE_APP_BASE_URL='http://192.168.1.14:8546'
-# VITE_APP_BASE_URL='https://erp.lihaink.cn'
\ No newline at end of file
+# VITE_APP_BASE_URL='http://192.168.1.14:8546'
+VITE_APP_BASE_URL='https://erp.lihaink.cn'
\ No newline at end of file
diff --git a/src/components/dialogTable/dialogTableConfig.ts b/src/components/dialogTable/dialogTableConfig.ts
index 65dd418..47dda0e 100644
--- a/src/components/dialogTable/dialogTableConfig.ts
+++ b/src/components/dialogTable/dialogTableConfig.ts
@@ -22,14 +22,11 @@ import { apiGoodsLabelLists } from '@/api/goods_label'
 export const goods_label: Iconfig = {
   fetchFn: apiGoodsLabelLists,
   serchList: [
-    // {
-    //   label: "项目名称",
-    //   value: "project_name",
-    // },
-    // {
-    //   label: "项目编号",
-    //   value: "project_code",
-    // },
+    {
+      label: "标签名",
+      value: "name",
+    },
+   
   ],
   tableList: [
     { id: "ID" },
diff --git a/src/views/data/merchant/merchant/index.vue b/src/views/data/merchant/merchant/index.vue
index fc6d1dc..48cb01f 100644
--- a/src/views/data/merchant/merchant/index.vue
+++ b/src/views/data/merchant/merchant/index.vue
@@ -21,7 +21,7 @@
                             </el-select>
                         </el-form-item>
                     </el-col>
-                    <el-col :span="6">
+                    <!-- <el-col :span="6">
                         <el-form-item label="商户名称" prop="mer_name">
                             <el-input class="w-[280px]" v-model="queryParams.mer_name" clearable placeholder="请输入商户名称" />
                         </el-form-item>
@@ -35,8 +35,8 @@
                                     :value="item.value" />
                             </el-select>
                         </el-form-item>
-                    </el-col>
-                    <el-col :span="6">
+                    </el-col> -->
+                    <!-- <el-col :span="6">
                         <el-form-item label="商户是否禁用" prop="status">
                             <el-select class="w-[280px]" v-model="queryParams.status" clearable placeholder="请选择商户是否禁用">
                                 <el-option label="全部" value=""></el-option>
@@ -44,8 +44,8 @@
                                     :value="item.value" />
                             </el-select>
                         </el-form-item>
-                    </el-col>
-                    <el-col :span="6">
+                    </el-col> -->
+                    <!-- <el-col :span="6">
                         <el-form-item label="提成比例" prop="commission_rate">
                             <el-input class="w-[280px]" v-model="queryParams.commission_rate" clearable
                                 placeholder="请输入提成比例" />
@@ -79,17 +79,14 @@
                             <el-input class="w-[280px]" v-model="queryParams.financial_alipay" clearable
                                 placeholder="请输入支付宝转账信息" />
                         </el-form-item>
-                    </el-col>
+                    </el-col> -->
                     <el-col :span="6">
                         <el-form-item>
                             <el-button type="primary" @click="resetPage">查询</el-button>
                             <el-button @click="resetParams">重置</el-button>
                         </el-form-item>
-
                     </el-col>
                 </el-row>
-
-
             </el-form>
         </el-card>
         <el-card class="!border-none" v-loading="pager.loading" shadow="never">
diff --git a/src/views/data/user/user/edit.vue b/src/views/data/user/user/edit.vue
index fabe0cf..d192dac 100644
--- a/src/views/data/user/user/edit.vue
+++ b/src/views/data/user/user/edit.vue
@@ -15,7 +15,7 @@
                 <el-form-item label="用户账号" prop="account">
                     <el-input v-model="formData.account" clearable placeholder="请输入用户账号" :readonly="false" />
                 </el-form-item>
-                <el-form-item label="用户密码" prop="password">
+                <el-form-item label="用户密码">
                     <el-input v-model="formData.password" clearable placeholder="请输入用户密码" :readonly="false" />
                 </el-form-item>
                 <el-form-item label="用户电话" prop="mobile">
diff --git a/src/views/data/user/user/index.vue b/src/views/data/user/user/index.vue
index bb0ad86..48b9621 100644
--- a/src/views/data/user/user/index.vue
+++ b/src/views/data/user/user/index.vue
@@ -37,7 +37,7 @@
             <div class="mt-4">
                 <el-table :data="pager.lists" @selection-change="handleSelectionChange">
                     <el-table-column type="selection" width="55" />
-                    <el-table-column label="主键" prop="id" show-overflow-tooltip />
+                    <!-- <el-table-column label="主键" prop="id" show-overflow-tooltip /> -->
                     <el-table-column label="头像" prop="avatar" show-overflow-tooltip>
                         <template #default="{ row }">
                             <el-image :src="row.avatar" style="width: 50px;height: 50px" />
diff --git a/src/views/goods/brand/edit.vue b/src/views/goods/brand/edit.vue
index 279193a..222d76b 100644
--- a/src/views/goods/brand/edit.vue
+++ b/src/views/goods/brand/edit.vue
@@ -1,20 +1,13 @@
 <template>
     <div class="edit-popup">
-        <popup
-            ref="popupRef"
-            :title="popupTitle"
-            :async="true"
-            width="550px"
-            @confirm="handleSubmit"
-            @close="handleClose"
-        >
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit" @close="handleClose">
             <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
                 <el-form-item label="品牌名称" prop="name">
                     <el-input v-model="formData.name" clearable placeholder="请输入品牌名称" />
                 </el-form-item>
-                <el-form-item label="拼音信息" prop="py">
+                <!-- <el-form-item label="拼音信息" prop="py">
                     <el-input v-model="formData.py" clearable placeholder="请输入拼音信息" />
-                </el-form-item>
+                </el-form-item> -->
                 <el-form-item label="品牌编号" prop="number">
                     <el-input v-model="formData.number" clearable placeholder="请输入品牌编号" />
                 </el-form-item>
@@ -89,8 +82,8 @@ const setFormData = async (data: Record<any, any>) => {
             formData[key] = data[key]
         }
     }
-    
-    
+
+
 }
 
 const getDetail = async (row: Record<string, any>) => {
@@ -104,9 +97,9 @@ const getDetail = async (row: Record<string, any>) => {
 // 提交按钮
 const handleSubmit = async () => {
     await formRef.value?.validate()
-    const data = { ...formData,  }
-    mode.value == 'edit' 
-        ? await apiBrandEdit(data) 
+    const data = { ...formData, }
+    mode.value == 'edit'
+        ? await apiBrandEdit(data)
         : await apiBrandAdd(data)
     popupRef.value?.close()
     emit('success')
diff --git a/src/views/goods/brand/index.vue b/src/views/goods/brand/index.vue
index 5b1220f..b84609e 100644
--- a/src/views/goods/brand/index.vue
+++ b/src/views/goods/brand/index.vue
@@ -1,15 +1,11 @@
 <template>
     <div>
         <el-card class="!border-none mb-4" shadow="never">
-            <el-form
-                class="mb-[-16px]"
-                :model="queryParams"
-                inline
-            >
+            <el-form class="mb-[-16px]" :model="queryParams" inline>
                 <el-form-item label="品牌名称" prop="name">
                     <el-input class="w-[280px]" v-model="queryParams.name" clearable placeholder="请输入品牌名称" />
                 </el-form-item>
-                <el-form-item label="拼音信息" prop="py">
+                <!-- <el-form-item label="拼音信息" prop="py">
                     <el-input class="w-[280px]" v-model="queryParams.py" clearable placeholder="请输入拼音信息" />
                 </el-form-item>
                 <el-form-item label="品牌编号" prop="number">
@@ -23,7 +19,7 @@
                 </el-form-item>
                 <el-form-item label="排序" prop="sort">
                     <el-input class="w-[280px]" v-model="queryParams.sort" clearable placeholder="请输入排序" />
-                </el-form-item>
+                </el-form-item> -->
                 <el-form-item>
                     <el-button type="primary" @click="resetPage">查询</el-button>
                     <el-button @click="resetParams">重置</el-button>
@@ -37,11 +33,7 @@
                 </template>
                 新增
             </el-button>
-            <el-button
-                v-perms="['goods.brand/delete']"
-                :disabled="!selectData.length"
-                @click="handleDelete(selectData)"
-            >
+            <el-button v-perms="['goods.brand/delete']" :disabled="!selectData.length" @click="handleDelete(selectData)">
                 删除
             </el-button>
             <div class="mt-4">
@@ -49,7 +41,7 @@
                     <el-table-column type="selection" width="55" />
                     <el-table-column label="ID" prop="id" width="55" />
                     <el-table-column label="品牌名称" prop="name" show-overflow-tooltip />
-                    <el-table-column label="拼音信息" prop="py" show-overflow-tooltip />
+                    <!-- <el-table-column label="拼音信息" prop="py" show-overflow-tooltip /> -->
                     <el-table-column label="品牌编号" prop="number" show-overflow-tooltip />
                     <el-table-column label="备注信息" prop="data" show-overflow-tooltip />
                     <el-table-column label="扩展信息" prop="more" show-overflow-tooltip />
@@ -61,20 +53,10 @@
                     <el-table-column label="排序" prop="sort" show-overflow-tooltip />
                     <el-table-column label="操作" width="120" fixed="right">
                         <template #default="{ row }">
-                             <el-button
-                                v-perms="['goods.brand/edit']"
-                                type="primary"
-                                link
-                                @click="handleEdit(row)"
-                            >
+                            <el-button v-perms="['goods.brand/edit']" type="primary" link @click="handleEdit(row)">
                                 编辑
                             </el-button>
-                            <el-button
-                                v-perms="['goods.brand/delete']"
-                                type="danger"
-                                link
-                                @click="handleDelete(row.id)"
-                            >
+                            <el-button v-perms="['goods.brand/delete']" type="danger" link @click="handleDelete(row.id)">
                                 删除
                             </el-button>
                         </template>
diff --git a/src/views/goods/code/edit.vue b/src/views/goods/code/edit.vue
index 9f256c8..888a2f0 100644
--- a/src/views/goods/code/edit.vue
+++ b/src/views/goods/code/edit.vue
@@ -1,38 +1,27 @@
 <template>
     <div class="edit-popup">
-        <popup
-            ref="popupRef"
-            :title="popupTitle"
-            :async="true"
-            width="550px"
-            @confirm="handleSubmit"
-            @close="handleClose"
-        >
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit" @close="handleClose">
             <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
                 <el-form-item label="条码名称" prop="name">
                     <el-input v-model="formData.name" clearable placeholder="请输入条码名称" />
                 </el-form-item>
-                <el-form-item label="拼音信息" prop="py">
+                <!-- <el-form-item label="拼音信息" prop="py">
                     <el-input v-model="formData.py" clearable placeholder="请输入拼音信息" />
-                </el-form-item>
+                </el-form-item> -->
                 <el-form-item label="条码内容" prop="code">
                     <el-input v-model="formData.code" clearable placeholder="请输入条码内容" />
                 </el-form-item>
                 <el-form-item label="条码类型" prop="type">
-                    <el-select class="flex-1" v-model="formData.type" clearable placeholder="请选择条码类型0:条形码 | 1:二维码">
-                        <el-option 
-                            v-for="(item, index) in dictData.code_type"
-                            :key="index" 
-                            :label="item.name"
-                            :value="parseInt(item.value)"
-                        />
+                    <el-select class="flex-1" v-model="formData.type" clearable placeholder="请选择条码类型">
+                        <el-option v-for="(item, index) in dictData.code_type" :key="index" :label="item.name"
+                            :value="parseInt(item.value)" />
                     </el-select>
                 </el-form-item>
                 <el-form-item label="备注信息" prop="data">
-                    <el-input v-model="formData.data" clearable placeholder="请输入备注信息" />
+                    <el-input v-model="formData.data" type="textarea" clearable placeholder="请输入备注信息" />
                 </el-form-item>
                 <el-form-item label="扩展信息" prop="more">
-                    <el-input v-model="formData.more" clearable placeholder="请输入扩展信息" />
+                    <el-input v-model="formData.more" type="textarea" clearable placeholder="请输入扩展信息" />
                 </el-form-item>
                 <el-form-item label="排序" prop="sort">
                     <el-input v-model="formData.sort" clearable placeholder="请输入排序" />
@@ -111,8 +100,8 @@ const setFormData = async (data: Record<any, any>) => {
             formData[key] = data[key]
         }
     }
-    
-    
+
+
 }
 
 const getDetail = async (row: Record<string, any>) => {
@@ -126,9 +115,9 @@ const getDetail = async (row: Record<string, any>) => {
 // 提交按钮
 const handleSubmit = async () => {
     await formRef.value?.validate()
-    const data = { ...formData,  }
-    mode.value == 'edit' 
-        ? await apiCodeEdit(data) 
+    const data = { ...formData, }
+    mode.value == 'edit'
+        ? await apiCodeEdit(data)
         : await apiCodeAdd(data)
     popupRef.value?.close()
     emit('success')
diff --git a/src/views/goods/code/index.vue b/src/views/goods/code/index.vue
index 1df9b81..4467145 100644
--- a/src/views/goods/code/index.vue
+++ b/src/views/goods/code/index.vue
@@ -1,40 +1,32 @@
 <template>
     <div>
         <el-card class="!border-none mb-4" shadow="never">
-            <el-form
-                class="mb-[-16px]"
-                :model="queryParams"
-                inline
-            >
+            <el-form class="mb-[-16px]" :model="queryParams" inline>
                 <el-form-item label="条码名称" prop="name">
                     <el-input class="w-[280px]" v-model="queryParams.name" clearable placeholder="请输入条码名称" />
                 </el-form-item>
-                <el-form-item label="拼音信息" prop="py">
+                <!-- <el-form-item label="拼音信息" prop="py">
                     <el-input class="w-[280px]" v-model="queryParams.py" clearable placeholder="请输入拼音信息" />
                 </el-form-item>
                 <el-form-item label="条码内容" prop="code">
                     <el-input class="w-[280px]" v-model="queryParams.code" clearable placeholder="请输入条码内容" />
-                </el-form-item>
+                </el-form-item> -->
                 <el-form-item label="条码类型" prop="type">
                     <el-select class="w-[280px]" v-model="queryParams.type" clearable placeholder="请选择条码类型">
                         <el-option label="全部" value=""></el-option>
-                        <el-option 
-                            v-for="(item, index) in dictData.code_type"
-                            :key="index" 
-                            :label="item.name"
-                            :value="item.value"
-                        />
+                        <el-option v-for="(item, index) in dictData.code_type" :key="index" :label="item.name"
+                            :value="item.value" />
                     </el-select>
                 </el-form-item>
-                <el-form-item label="备注信息" prop="data">
+                <!-- <el-form-item label="备注信息" prop="data">
                     <el-input class="w-[280px]" v-model="queryParams.data" clearable placeholder="请输入备注信息" />
                 </el-form-item>
                 <el-form-item label="扩展信息" prop="more">
                     <el-input class="w-[280px]" v-model="queryParams.more" clearable placeholder="请输入扩展信息" />
-                </el-form-item>
-                <el-form-item label="排序" prop="sort">
+                </el-form-item> -->
+                <!-- <el-form-item label="排序" prop="sort">
                     <el-input class="w-[280px]" v-model="queryParams.sort" clearable placeholder="请输入排序" />
-                </el-form-item>
+                </el-form-item> -->
                 <el-form-item>
                     <el-button type="primary" @click="resetPage">查询</el-button>
                     <el-button @click="resetParams">重置</el-button>
@@ -48,11 +40,7 @@
                 </template>
                 新增
             </el-button>
-            <el-button
-                v-perms="['goods.code/delete']"
-                :disabled="!selectData.length"
-                @click="handleDelete(selectData)"
-            >
+            <el-button v-perms="['goods.code/delete']" :disabled="!selectData.length" @click="handleDelete(selectData)">
                 删除
             </el-button>
             <div class="mt-4">
@@ -72,27 +60,13 @@
                     <el-table-column label="排序" prop="sort" show-overflow-tooltip />
                     <el-table-column label="操作" width="120" fixed="right">
                         <template #default="{ row }">
-                             <el-button
-                                v-perms="['goods.code/edit']"
-                                type="primary"
-                                link
-                                @click="handleEdit(row)"
-                            >
+                            <el-button v-perms="['goods.code/edit']" type="primary" link @click="handleEdit(row)">
                                 编辑
                             </el-button>
-                            <el-button
-                                type="primary"
-                                link
-                                @click="handleDetails(row)"
-                            >
+                            <el-button type="primary" link @click="handleDetails(row)">
                                 详情
                             </el-button>
-                            <el-button
-                                v-perms="['goods.code/delete']"
-                                type="danger"
-                                link
-                                @click="handleDelete(row.id)"
-                            >
+                            <el-button v-perms="['goods.code/delete']" type="danger" link @click="handleDelete(row.id)">
                                 删除
                             </el-button>
                         </template>
@@ -104,7 +78,8 @@
             </div>
         </el-card>
         <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
-        <detail-popup v-if="detailEdit" ref="detailRef" :dict-data="dictData" @success="getLists" @close="detailEdit = false" />
+        <detail-popup v-if="detailEdit" ref="detailRef" :dict-data="dictData" @success="getLists"
+            @close="detailEdit = false" />
     </div>
 </template>
 
diff --git a/src/views/goods/goods/index.vue b/src/views/goods/goods/index.vue
index 88340fc..e938e08 100644
--- a/src/views/goods/goods/index.vue
+++ b/src/views/goods/goods/index.vue
@@ -1,35 +1,31 @@
 <template>
     <div>
         <el-card class="!border-none mb-4" shadow="never">
-            <el-form
-                class="mb-[-16px]"
-                :model="queryParams"
-                inline
-            >
+            <el-form class="mb-[-16px]" :model="queryParams" inline>
                 <el-form-item label="商品名称" prop="name">
                     <el-input class="w-[280px]" v-model="queryParams.name" clearable placeholder="请输入商品名称" />
                 </el-form-item>
-                <el-form-item label="商品分类" prop="class">
+                <!-- <el-form-item label="商品分类" prop="class">
                     <el-input class="w-[280px]" v-model="queryParams.class" clearable placeholder="请输入商品分类" />
-                </el-form-item>
+                </el-form-item> -->
                 <el-form-item label="商品品牌" prop="brand">
                     <el-input class="w-[280px]" v-model="queryParams.brand" clearable placeholder="请输入商品品牌" />
                 </el-form-item>
                 <el-form-item label="商品单位" prop="unit">
                     <el-input class="w-[280px]" v-model="queryParams.unit" clearable placeholder="请输入商品单位" />
                 </el-form-item>
-                <el-form-item label="条形码" prop="code">
+                <!-- <el-form-item label="条形码" prop="code">
                     <el-input class="w-[280px]" v-model="queryParams.code" clearable placeholder="请输入条形码" />
-                </el-form-item>
-                <el-form-item label="默认仓库" prop="warehouse">
+                </el-form-item> -->
+                <!-- <el-form-item label="默认仓库" prop="warehouse">
                     <el-input class="w-[280px]" v-model="queryParams.warehouse" clearable placeholder="请输入默认仓库" />
-                </el-form-item>
-                <el-form-item label="零售名称" prop="retail_name">
+                </el-form-item> -->
+                <!-- <el-form-item label="零售名称" prop="retail_name">
                     <el-input class="w-[280px]" v-model="queryParams.retail_name" clearable placeholder="请输入零售名称" />
                 </el-form-item>
                 <el-form-item label="排序" prop="sort">
                     <el-input class="w-[280px]" v-model="queryParams.sort" clearable placeholder="请输入排序" />
-                </el-form-item>
+                </el-form-item> -->
                 <el-form-item>
                     <el-button type="primary" @click="resetPage">查询</el-button>
                     <el-button @click="resetParams">重置</el-button>
@@ -43,11 +39,7 @@
                 </template>
                 新增
             </el-button>
-            <el-button
-                v-perms="['goods.goods/delete']"
-                :disabled="!selectData.length"
-                @click="handleDelete(selectData)"
-            >
+            <el-button v-perms="['goods.goods/delete']" :disabled="!selectData.length" @click="handleDelete(selectData)">
                 删除
             </el-button>
             <div class="mt-4">
@@ -58,7 +50,7 @@
                         <template #default="{ row }">
                             <el-image style="width:50px;height:50px;" :src="row.imgs" />
                         </template>
-                    </el-table-column>  
+                    </el-table-column>
                     <el-table-column label="商品名称" prop="name" show-overflow-tooltip />
                     <el-table-column label="首拼字母" prop="py" show-overflow-tooltip />
                     <el-table-column label="商品编号" prop="number" show-overflow-tooltip />
@@ -78,27 +70,13 @@
                     <el-table-column label="排序" prop="sort" show-overflow-tooltip />
                     <el-table-column label="操作" width="120" fixed="right">
                         <template #default="{ row }">
-                             <el-button
-                                v-perms="['goods.goods/edit']"
-                                type="primary"
-                                link
-                                @click="handleEdit(row)"
-                            >
+                            <el-button v-perms="['goods.goods/edit']" type="primary" link @click="handleEdit(row)">
                                 编辑
                             </el-button>
-                            <el-button
-                                type="primary"
-                                link
-                                @click="handleDetail(row)"
-                            >
+                            <el-button type="primary" link @click="handleDetail(row)">
                                 详情
                             </el-button>
-                            <el-button
-                                v-perms="['goods.goods/delete']"
-                                type="danger"
-                                link
-                                @click="handleDelete(row.id)"
-                            >
+                            <el-button v-perms="['goods.goods/delete']" type="danger" link @click="handleDelete(row.id)">
                                 删除
                             </el-button>
                         </template>
diff --git a/src/views/goods/goods_label/index.vue b/src/views/goods/goods_label/index.vue
index 70d0620..0fce568 100644
--- a/src/views/goods/goods_label/index.vue
+++ b/src/views/goods/goods_label/index.vue
@@ -2,7 +2,7 @@
     <div>
         <el-card class="!border-none mb-4" shadow="never">
             <el-form class="mb-[-16px]" :model="queryParams" inline>
-                <el-form-item label="" prop="name">
+                <el-form-item label="标签名" prop="name">
                     <el-input class="w-[280px]" v-model="queryParams.name" clearable placeholder="请输入" />
                 </el-form-item>
                 <el-form-item>
diff --git a/src/views/goods/goodsclass/index.vue b/src/views/goods/goodsclass/index.vue
index 57c872c..c1348b0 100644
--- a/src/views/goods/goodsclass/index.vue
+++ b/src/views/goods/goodsclass/index.vue
@@ -2,37 +2,17 @@
   <div>
     <el-card class="!border-none mb-4" shadow="never">
       <el-form class="mb-[-16px] disabledEdit" :model="queryParams" inline>
-        <el-form-item label="所属ID" prop="pid">
-          <el-input
-            class="w-[280px]"
-            v-model="queryParams.pid"
-            clearable
-            placeholder="请输入所属ID"
-          />
-        </el-form-item>
+        <!-- <el-form-item label="所属ID" prop="pid">
+          <el-input class="w-[280px]" v-model="queryParams.pid" clearable placeholder="请输入所属ID" />
+        </el-form-item> -->
         <el-form-item label="分类名称" prop="name">
-          <el-input
-            class="w-[280px]"
-            v-model="queryParams.name"
-            clearable
-            placeholder="请输入分类名称"
-          />
+          <el-input class="w-[280px]" v-model="queryParams.name" clearable placeholder="请输入分类名称" />
         </el-form-item>
         <el-form-item label="备注信息" prop="data">
-          <el-input
-            class="w-[280px]"
-            v-model="queryParams.data"
-            clearable
-            placeholder="请输入备注信息"
-          />
+          <el-input class="w-[280px]" v-model="queryParams.data" clearable placeholder="请输入备注信息" />
         </el-form-item>
         <el-form-item label="排序" prop="sort">
-          <el-input
-            class="w-[280px]"
-            v-model="queryParams.sort"
-            clearable
-            placeholder="请输入排序"
-          />
+          <el-input class="w-[280px]" v-model="queryParams.sort" clearable placeholder="请输入排序" />
         </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="resetPage">查询</el-button>
@@ -41,29 +21,17 @@
       </el-form>
     </el-card>
     <el-card class="!border-none" v-loading="pager.loading" shadow="never">
-      <el-button
-        v-perms="['goods.goodsclass/add']"
-        type="primary"
-        @click="handleAdd"
-      >
+      <el-button v-perms="['goods.goodsclass/add']" type="primary" @click="handleAdd">
         <template #icon>
           <icon name="el-icon-Plus" />
         </template>
         新增
       </el-button>
-      <el-button
-        v-perms="['goods.goodsclass/delete']"
-        :disabled="!selectData.length"
-        @click="handleDelete(selectData)"
-      >
+      <el-button v-perms="['goods.goodsclass/delete']" :disabled="!selectData.length" @click="handleDelete(selectData)">
         删除
       </el-button>
       <div class="mt-4">
-        <el-table
-          :data="pager.lists"
-          @selection-change="handleSelectionChange"
-          @cell-click="cellClick"
-        >
+        <el-table :data="pager.lists" @selection-change="handleSelectionChange" @cell-click="cellClick">
           <el-table-column type="selection" width="55" />
           <el-table-column label="ID" prop="id" width="120" />
           <el-table-column label="所属ID" prop="pid" show-overflow-tooltip />
@@ -77,20 +45,10 @@
           <el-table-column label="排序" prop="sort" show-overflow-tooltip />
           <el-table-column label="操作" width="120" fixed="right">
             <template #default="{ row }">
-              <el-button
-                v-perms="['goods.goodsclass/edit']"
-                type="primary"
-                link
-                @click.stop="handleEdit(row)"
-              >
+              <el-button v-perms="['goods.goodsclass/edit']" type="primary" link @click.stop="handleEdit(row)">
                 编辑
               </el-button>
-              <el-button
-                v-perms="['goods.goodsclass/delete']"
-                type="danger"
-                link
-                @click.stop="handleDelete(row.id)"
-              >
+              <el-button v-perms="['goods.goodsclass/delete']" type="danger" link @click.stop="handleDelete(row.id)">
                 删除
               </el-button>
             </template>
@@ -101,13 +59,7 @@
         <pagination v-model="pager" @change="getLists" />
       </div>
     </el-card>
-    <edit-popup
-      v-if="showEdit"
-      ref="editRef"
-      :dict-data="dictData"
-      @success="getLists"
-      @close="showEdit = false"
-    />
+    <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
   </div>
 </template>
 
diff --git a/src/views/goods/unit/edit.vue b/src/views/goods/unit/edit.vue
index a18b36b..e019421 100644
--- a/src/views/goods/unit/edit.vue
+++ b/src/views/goods/unit/edit.vue
@@ -1,28 +1,21 @@
 <template>
     <div class="edit-popup">
-        <popup
-            ref="popupRef"
-            :title="popupTitle"
-            :async="true"
-            width="550px"
-            @confirm="handleSubmit"
-            @close="handleClose"
-        >
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit" @close="handleClose">
             <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
                 <el-form-item label="单位名称" prop="name">
                     <el-input v-model="formData.name" clearable placeholder="请输入单位名称" />
                 </el-form-item>
-                <el-form-item label="拼音信息" prop="py">
+                <!-- <el-form-item label="拼音信息" prop="py">
                     <el-input v-model="formData.py" clearable placeholder="请输入拼音信息" />
-                </el-form-item>
+                </el-form-item> -->
                 <el-form-item label="单位编号" prop="number">
                     <el-input v-model="formData.number" clearable placeholder="请输入单位编号" />
                 </el-form-item>
                 <el-form-item label="备注信息" prop="data">
-                    <el-input v-model="formData.data" clearable placeholder="请输入备注信息" />
+                    <el-input v-model="formData.data" type="textarea" clearable placeholder="请输入备注信息" />
                 </el-form-item>
                 <el-form-item label="扩展信息" prop="more">
-                    <el-input v-model="formData.more" clearable placeholder="请输入扩展信息" />
+                    <el-input v-model="formData.more" type="textarea" clearable placeholder="请输入扩展信息" />
                 </el-form-item>
             </el-form>
         </popup>
@@ -81,8 +74,8 @@ const setFormData = async (data: Record<any, any>) => {
             formData[key] = data[key]
         }
     }
-    
-    
+
+
 }
 
 const getDetail = async (row: Record<string, any>) => {
@@ -96,9 +89,9 @@ const getDetail = async (row: Record<string, any>) => {
 // 提交按钮
 const handleSubmit = async () => {
     await formRef.value?.validate()
-    const data = { ...formData,  }
-    mode.value == 'edit' 
-        ? await apiUnitEdit(data) 
+    const data = { ...formData, }
+    mode.value == 'edit'
+        ? await apiUnitEdit(data)
         : await apiUnitAdd(data)
     popupRef.value?.close()
     emit('success')
diff --git a/src/views/goods/unit/index.vue b/src/views/goods/unit/index.vue
index 4e3fad5..2f38e68 100644
--- a/src/views/goods/unit/index.vue
+++ b/src/views/goods/unit/index.vue
@@ -1,26 +1,22 @@
 <template>
     <div>
         <el-card class="!border-none mb-4" shadow="never">
-            <el-form
-                class="mb-[-16px]"
-                :model="queryParams"
-                inline
-            >
+            <el-form class="mb-[-16px]" :model="queryParams" inline>
                 <el-form-item label="单位名称" prop="name">
                     <el-input class="w-[280px]" v-model="queryParams.name" clearable placeholder="请输入单位名称" />
                 </el-form-item>
-                <el-form-item label="拼音信息" prop="py">
+                <!-- <el-form-item label="拼音信息" prop="py">
                     <el-input class="w-[280px]" v-model="queryParams.py" clearable placeholder="请输入拼音信息" />
-                </el-form-item>
+                </el-form-item> -->
                 <el-form-item label="单位编号" prop="number">
                     <el-input class="w-[280px]" v-model="queryParams.number" clearable placeholder="请输入单位编号" />
                 </el-form-item>
-                <el-form-item label="备注信息" prop="data">
+                <!-- <el-form-item label="备注信息" prop="data">
                     <el-input class="w-[280px]" v-model="queryParams.data" clearable placeholder="请输入备注信息" />
                 </el-form-item>
                 <el-form-item label="扩展信息" prop="more">
                     <el-input class="w-[280px]" v-model="queryParams.more" clearable placeholder="请输入扩展信息" />
-                </el-form-item>
+                </el-form-item> -->
                 <el-form-item>
                     <el-button type="primary" @click="resetPage">查询</el-button>
                     <el-button @click="resetParams">重置</el-button>
@@ -34,11 +30,7 @@
                 </template>
                 新增
             </el-button>
-            <el-button
-                v-perms="['goods.unit/delete']"
-                :disabled="!selectData.length"
-                @click="handleDelete(selectData)"
-            >
+            <el-button v-perms="['goods.unit/delete']" :disabled="!selectData.length" @click="handleDelete(selectData)">
                 删除
             </el-button>
             <div class="mt-4">
@@ -46,26 +38,16 @@
                     <el-table-column type="selection" width="55" />
                     <el-table-column label="ID" prop="id" width="55" />
                     <el-table-column label="单位名称" prop="name" show-overflow-tooltip />
-                    <el-table-column label="拼音信息" prop="py" show-overflow-tooltip />
+                    <!-- <el-table-column label="拼音信息" prop="py" show-overflow-tooltip /> -->
                     <el-table-column label="单位编号" prop="number" show-overflow-tooltip />
                     <el-table-column label="备注信息" prop="data" show-overflow-tooltip />
                     <el-table-column label="扩展信息" prop="more" show-overflow-tooltip />
                     <el-table-column label="操作" width="120" fixed="right">
                         <template #default="{ row }">
-                             <el-button
-                                v-perms="['goods.unit/edit']"
-                                type="primary"
-                                link
-                                @click="handleEdit(row)"
-                            >
+                            <el-button v-perms="['goods.unit/edit']" type="primary" link @click="handleEdit(row)">
                                 编辑
                             </el-button>
-                            <el-button
-                                v-perms="['goods.unit/delete']"
-                                type="danger"
-                                link
-                                @click="handleDelete(row.id)"
-                            >
+                            <el-button v-perms="['goods.unit/delete']" type="danger" link @click="handleDelete(row.id)">
                                 删除
                             </el-button>
                         </template>
diff --git a/src/views/opurchase/opurchaseclass/index.vue b/src/views/opurchase/opurchaseclass/index.vue
index 45d9e47..2a33109 100644
--- a/src/views/opurchase/opurchaseclass/index.vue
+++ b/src/views/opurchase/opurchaseclass/index.vue
@@ -1,20 +1,16 @@
 <template>
     <div>
         <el-card class="!border-none mb-4" shadow="never">
-            <el-form
-                class="mb-[-16px]"
-                :model="queryParams"
-                inline
-            >
+            <el-form class="mb-[-16px]" :model="queryParams" inline>
                 <el-form-item label="所属商户" prop="merchant">
                     <el-input class="w-[280px]" v-model="queryParams.merchant" clearable placeholder="请输入所属商户" />
                 </el-form-item>
                 <el-form-item label="零售订单id" prop="order_arr">
                     <el-input class="w-[280px]" v-model="queryParams.order_arr" clearable placeholder="请输入零售订单id" />
                 </el-form-item>
-                <el-form-item label="单据编号" prop="number">
+                <!-- <el-form-item label="单据编号" prop="number">
                     <el-input class="w-[280px]" v-model="queryParams.number" clearable placeholder="请输入单据编号" />
-                </el-form-item>
+                </el-form-item> -->
                 <el-form-item>
                     <el-button type="primary" @click="resetPage">查询</el-button>
                     <el-button @click="resetParams">重置</el-button>
@@ -50,14 +46,10 @@
                     <el-table-column label="是否支付" prop="paid" show-overflow-tooltip />
                     <el-table-column label="操作" width="120" fixed="right">
                         <template #default="{ row }">
-                            <el-button
-                                type="primary"
-                                link
-                                @click="handleDetail(row)"
-                            >
+                            <el-button type="primary" link @click="handleDetail(row)">
                                 详情
                             </el-button>
-                             <!-- <el-button
+                            <!-- <el-button
                                 v-perms="['operation.opurchaseclass/edit']"
                                 type="primary"
                                 link
@@ -137,7 +129,7 @@ const handleDetail = async (data: any) => {
     console.log(data);
     router.push({
         path: 'detail',
-        query:{
+        query: {
             id: data.id
         }
     })
diff --git a/src/views/retail/cashierclass/index.vue b/src/views/retail/cashierclass/index.vue
index 7f42044..000c530 100644
--- a/src/views/retail/cashierclass/index.vue
+++ b/src/views/retail/cashierclass/index.vue
@@ -5,21 +5,21 @@
                 <el-form-item label="所属商户" prop="merchant">
                     <el-input class="w-[280px]" v-model="queryParams.merchant" clearable placeholder="请输入所属商户" />
                 </el-form-item>
-                <el-form-item label="归属门店" prop="store_id">
+                <!-- <el-form-item label="归属门店" prop="store_id">
                     <el-input class="w-[280px]" v-model="queryParams.store_id" clearable placeholder="请输入归属门店" />
-                </el-form-item>
-                <el-form-item label="客户ID" prop="customer">
+                </el-form-item> -->
+                <!-- <el-form-item label="客户ID" prop="customer">
                     <el-input class="w-[280px]" v-model="queryParams.customer" clearable placeholder="请输入客户ID" />
-                </el-form-item>
-                <el-form-item label="单据时间" prop="time">
+                </el-form-item> -->
+                <!-- <el-form-item label="单据时间" prop="time">
                     <el-input class="w-[280px]" v-model="queryParams.time" clearable placeholder="请输入单据时间" />
-                </el-form-item>
+                </el-form-item> -->
                 <el-form-item label="单据编号" prop="number">
                     <el-input class="w-[280px]" v-model="queryParams.number" clearable placeholder="请输入单据编号" />
                 </el-form-item>
-                <el-form-item label="制单人" prop="user">
+                <!-- <el-form-item label="制单人" prop="user">
                     <el-input class="w-[280px]" v-model="queryParams.user" clearable placeholder="请输入制单人" />
-                </el-form-item>
+                </el-form-item> -->
                 <el-form-item label="支付方式" prop="pay_type">
                     <el-select class="w-[280px]" v-model="queryParams.pay_type" clearable placeholder="请选择支付方式">
                         <el-option label="全部" value=""></el-option>
@@ -34,9 +34,9 @@
                             :value="item.value" />
                     </el-select>
                 </el-form-item>
-                <el-form-item label="审核人" prop="auditinguser">
+                <!-- <el-form-item label="审核人" prop="auditinguser">
                     <el-input class="w-[280px]" v-model="queryParams.auditinguser" clearable placeholder="请输入审核人" />
-                </el-form-item>
+                </el-form-item> -->
                 <el-form-item>
                     <el-button type="primary" @click="resetPage">查询</el-button>
                     <el-button @click="resetParams">重置</el-button>