diff --git a/src/views/data/supplier/supplier/edit.vue b/src/views/data/supplier/supplier/edit.vue
index dc3a1ea..c4a4e26 100644
--- a/src/views/data/supplier/supplier/edit.vue
+++ b/src/views/data/supplier/supplier/edit.vue
@@ -135,7 +135,7 @@
                                 :readonly="false" />
                         </el-form-item>
                     </el-col>
-                    <el-col :span="8">
+                    <!-- <el-col :span="8">
                         <el-form-item label="银行卡转账信息" prop="financial_bank">
                             <el-input v-model="formData.financial_bank" clearable placeholder="请输入银行卡转账信息"
                                 :readonly="false" />
@@ -169,13 +169,13 @@
                             </el-tag>
                             <el-button type="primary" @click="showDialog = true">添加标签</el-button>
                         </el-form-item>
-                    </el-col>
+                    </el-col> -->
                 </el-row>
             </el-form>
-            <el-dialog v-model="showDialog" title="选择标签" width="70%">
+            <!-- <el-dialog v-model="showDialog" title="选择标签" width="70%">
                 <dialogTable multipleChoice :config="goods_label" @customEvent="customEvent">
                 </dialogTable>
-            </el-dialog>
+            </el-dialog> -->
         </popup>
     </div>
 </template>
diff --git a/src/views/data/supplier/supplier/index.vue b/src/views/data/supplier/supplier/index.vue
index c7f490b..a12542b 100644
--- a/src/views/data/supplier/supplier/index.vue
+++ b/src/views/data/supplier/supplier/index.vue
@@ -4,11 +4,11 @@
       <el-form class="mb-[-16px]" :model="queryParams" label-width="120px">
         <el-row>
           <el-col :span="6">
-            <el-form-item label="商户分类" prop="category_id">
+            <el-form-item label="供应商分类" prop="category_id">
               <el-select
                 v-model="queryParams.category_id"
                 clearable
-                placeholder="请选择店铺类型"
+                placeholder="请选择供应商类型"
               >
                 <el-option
                   v-for="(item, index) in dictData.mer_category_type"
@@ -20,11 +20,11 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="店铺类型" prop="type_id">
+            <el-form-item label="供应商类型" prop="type_id">
               <el-select
                 v-model="queryParams.type_id"
                 clearable
-                placeholder="请选择店铺类型"
+                placeholder="请选择供应商类型"
               >
                 <el-option
                   v-for="(item, index) in dictData.merchat_type"
@@ -36,11 +36,11 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="商户名称" prop="mer_name">
+            <el-form-item label="供应商名称" prop="mer_name">
               <el-input
                 v-model="queryParams.mer_name"
                 clearable
-                placeholder="请输入商户名称"
+                placeholder="请输入供应商名称"
               />
             </el-form-item>
           </el-col>
@@ -75,8 +75,8 @@
         <el-table :data="pager.lists" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="55" />
           <el-table-column label="ID" prop="id" width="55" />
-          <el-table-column
-            label="商户分类"
+          <!-- <el-table-column
+            label="供应商分类"
             prop="category_id"
             show-overflow-tooltip
           >
@@ -86,9 +86,9 @@
                 :value="row.category_id"
               />
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column
-            label="店铺类型"
+            label="供应商类型"
             prop="type_id"
             show-overflow-tooltip
           >
@@ -100,7 +100,7 @@
             </template>
           </el-table-column>
           <el-table-column
-            label="商户名称"
+            label="供应商名称"
             prop="mer_name"
             show-overflow-tooltip
           />
@@ -114,7 +114,7 @@
             prop="interest_rate"
             show-overflow-tooltip
           />
-          <el-table-column
+          <!-- <el-table-column
             label="标签"
             prop="sys_labels_arr"
             show-overflow-tooltip
@@ -124,13 +124,13 @@
                 row.sys_labels_arr.map((t: any) => t.name).join(",")
               }}</span>
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column
-            label="商户地址"
+            label="供应商地址"
             prop="mer_address"
             show-overflow-tooltip
           />
-          <el-table-column label="商户是否禁用" prop="status">
+          <el-table-column label="供应商是否禁用" prop="status">
             <template #default="{ row }">
               <dict-value :options="dictData.show_status" :value="row.status" />
             </template>
@@ -141,7 +141,7 @@
             show-overflow-tooltip
           />
           <el-table-column
-            label="商户手续费单独设置"
+            label="供应商手续费单独设置"
             width="200"
             prop="commission_switch"
           >
@@ -151,7 +151,7 @@
             </template>
           </el-table-column>
           <el-table-column
-            label="商户余额"
+            label="供应商余额"
             prop="mer_money"
             show-overflow-tooltip
           />
diff --git a/src/views/goods/goods/edit.vue b/src/views/goods/goods/edit.vue
index 8ebcaa0..6102d6e 100644
--- a/src/views/goods/goods/edit.vue
+++ b/src/views/goods/goods/edit.vue
@@ -91,11 +91,11 @@
                             }" placeholder="请选择仓库" />
                         </el-form-item>
                     </el-col>
-                    <el-col :span="8">
+                    <!-- <el-col :span="8">
                         <el-form-item label="商品货位" prop="location">
                             <el-input v-model="formData.location" clearable placeholder="请输入商品货位" />
                         </el-form-item>
-                    </el-col>
+                    </el-col> -->
                     <el-col :span="8">
                         <el-form-item label="库存阈值" prop="stocktip">
                             <el-input v-model="formData.stocktip" clearable placeholder="请输入库存阈值" />
diff --git a/src/views/opurchase/opurchaseclass/detail.vue b/src/views/opurchase/opurchaseclass/detail.vue
index 4169041..1f9bf4e 100644
--- a/src/views/opurchase/opurchaseclass/detail.vue
+++ b/src/views/opurchase/opurchaseclass/detail.vue
@@ -26,7 +26,7 @@
               {{ form.merchant_name }}
             </el-descriptions-item>
           </el-descriptions>
-          <el-table :data="form.goods_info" border style="width: 100%; margin-top: 20px">
+          <el-table :data="pager.lists" border style="width: 100%; margin-top: 20px">
             <el-table-column prop="id" label="ID" width="120" />
             <el-table-column prop="goods_name" label="商品名称" />
             <el-table-column prop="price" label="单价(元)" />
@@ -34,6 +34,12 @@
             <el-table-column prop="nums" label="数量" />
             <el-table-column prop="total" label="合计(元)" />
             <el-table-column prop="nums_count" label="已采纳数量" />
+            <el-table-column prop="is_push" label="推送状态">
+              <template #default="{ row }">
+                <span v-if="row.is_push == 0" style="color: #e6a23c;">未推送</span>
+                <span v-else>已推送</span>
+              </template>
+            </el-table-column>
           </el-table>
         </el-tab-pane>
         <el-tab-pane label="摊贩订单" name="order">
@@ -67,11 +73,11 @@ import {
   apiOpurchaseclassLists,
   apiOpurchaseclassDelete,
   apiOpurchaseclassDetail,
+  apiOpurchaseinfoListList,
 } from "@/api/opurchaseclass";
 import { useRoute } from "vue-router";
 import subOrder from "./component/subOrder.vue";
 import goodsOffer from "./component/goodsOffer.vue";
-import { apiOpurchaseinfoListList, apicreateSupplierGoods } from "@/api/opurchaseclass";
 
 const route = useRoute();
 const form = ref({});
@@ -104,18 +110,16 @@ const tabChange = (type: any) => {
 };
 
 
+// 查询条件
+const queryParams = reactive({
+    id: route.query.id,
+})
+
+// 分页相关
 const { pager, getLists, resetParams, resetPage } = usePaging({
-  fetchFun: apiOpurchaseinfoListList,
-  params: { is_push: 0, id: route.query.id },
-});
-
-// getLists()
-
-const rePush = async () => {
-  await apicreateSupplierGoods({ id: route.query.id })
-  getLists()
-
-}
-
+    fetchFun: apiOpurchaseinfoListList,
+    params: queryParams
+})
+getLists()
 
 </script>
diff --git a/src/views/translationOrder/component/noPush.vue b/src/views/translationOrder/component/noPush.vue
index 6227f3b..f581606 100644
--- a/src/views/translationOrder/component/noPush.vue
+++ b/src/views/translationOrder/component/noPush.vue
@@ -9,7 +9,7 @@
         prop="goods_name"
         show-overflow-tooltip
       />
-      <el-table-column
+      <!-- <el-table-column
         label="商品标签"
         prop="sys_labels_arr"
         show-overflow-tooltip
@@ -19,7 +19,7 @@
             row.sys_labels_arr.map((t: any) => t.name).join(",")
           }}</span>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="单位" prop="unit_name" show-overflow-tooltip />
       <el-table-column label="单价(元)" prop="price" show-overflow-tooltip />
       <el-table-column prop="nums" label="数量" />
diff --git a/src/views/translationOrder/detail.vue b/src/views/translationOrder/detail.vue
index 31ca734..cc64b40 100644
--- a/src/views/translationOrder/detail.vue
+++ b/src/views/translationOrder/detail.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-card class="!border-none mb-4" shadow="never">
-      <el-tabs v-model="activeName" class="demo-tabs" @tab-change="tabChange">
+      <el-tabs  v-model="activeName" class="demo-tabs" @tab-change="tabChange">
         <el-tab-pane label="概况" name="detail">
           <el-descriptions class="margin-top" :column="4" border>
             <el-descriptions-item :span="4" label="单据编号">
@@ -24,7 +24,7 @@
             </el-descriptions-item>
           </el-descriptions>
           <el-table
-            :data="form.goods_info"
+            :data="pager.lists"
             border
             style="width: 100%; margin-top: 20px"
           >
@@ -35,6 +35,12 @@
             <el-table-column prop="nums" label="数量" />
             <el-table-column prop="total" label="合计(元)" />
             <el-table-column prop="nums_count" label="已采纳数量" />
+            <el-table-column prop="is_push" label="推送状态">
+              <template #default="{ row }">
+                <span v-if="row.is_push == 0" style="color: #e6a23c;cursor: pointer;" @click="activeName='notPushedGoods';tabChange('notPushedGoods')">未推送</span>
+                <span v-else>已推送</span>
+              </template>
+            </el-table-column>
           </el-table>
         </el-tab-pane>
         <el-tab-pane label="商户订单" name="order">
@@ -58,6 +64,7 @@ import {
   apiOpurchaseclassLists,
   apiOpurchaseclassDelete,
   apiOpurchaseclassDetail,
+  apiOpurchaseinfoListList
 } from "@/api/opurchaseclass";
 import { useRoute } from "vue-router";
 import subOrder from "./component/subOrder.vue";
@@ -95,4 +102,16 @@ const tabChange = (type: any) => {
     if (type == "notPushedGoods") noPushRef.value?.getLists();
   }
 };
+
+// 查询条件
+const queryParams = reactive({
+    id: route.query.id,
+})
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: apiOpurchaseinfoListList,
+    params: queryParams
+})
+getLists()
 </script>