修改

src/api/product/base/types.ts

@@ -54,7 +54,12 @@ export interface BaseVO {
   isSelf: string;
 
   /**
-   * 产品审核状态 0=待提交,1=待审核,2=审核通过,3=审核驳回
+   * 商品类型 1=默认类型,2精选商品,3=停售商品
+   * */
+  productCategory?: number;
+
+  /**
+   * 产品审核状态 0=待采购审核,1=审核通过,2=驳回,3=待营销审核
    */
   productReviewStatus: string;
 
@@ -89,7 +94,7 @@ export interface BaseVO {
   isNew: string;
 
   /**
-   * 商品状态：1=上架，0=下架等
+   * 商品状态：1=已上架，0=下架，2=上架中
    */
   productStatus: string;
 
@@ -228,6 +233,11 @@ export interface BaseVO {
    */
   minOrderQuantity?: number;
 
+  /**
+   * 审核意见
+   */
+  reviewComments?: string;
+
   /**
    * 商品属性值（JSON字符串）
    */
@@ -283,27 +293,32 @@ export interface BaseForm extends BaseEntity {
   /**
    * 是否自营（1=是，0=否）
    */
-  isSelf?: string;
+  isSelf?: number;
 
   /**
-   * 产品审核状态 0=待提交,1=待审核,2=审核通过,3=审核驳回
+   * 商品类型 1=默认类型,2精选商品,3=停售商品
+   * */
+  productCategory?: number;
+
+  /**
+   * 产品审核状态 0=待采购审核,1=审核通过,2=驳回,3=待营销审核
    */
-  productReviewStatus?: string;
+  productReviewStatus?: number;
 
   /**
    * 首页推荐：1=推荐，0=不推荐
    */
-  homeRecommended?: string;
+  homeRecommended?: number;
 
   /**
    * 分类推荐：1=推荐，0=不推荐
    */
-  categoryRecommendation?: string;
+  categoryRecommendation?: number;
 
   /**
    * 购物车推荐：1=推荐，0=不推荐
    */
-  cartRecommendation?: string;
+  cartRecommendation?: number;
 
   /**
    * 推荐产品顺序
@@ -313,15 +328,15 @@ export interface BaseForm extends BaseEntity {
   /**
    * 是否热门：1=是，0=否
    */
-  isPopular?: string;
+  isPopular?: number;
 
   /**
    * 是否新品：1=是，0=否
    */
-  isNew?: string;
+  isNew?: number;
 
   /**
-   * 商品状态：1=上架，0=下架等
+   * 商品状态：1=已上架，0=下架，2=上架中
    */
   productStatus?: string;
 
@@ -549,9 +564,24 @@ export interface BaseForm extends BaseEntity {
    * 商品属性值（JSON字符串）
    */
   attributesList?: string;
+
+  /**
+   * 审核意见
+   */
+  reviewComments?: string;
+
+  /**
+   * 上下架审核意见
+   */
+  shelfComments?: string;
 }
 
 export interface BaseQuery extends PageQuery {
+  /**
+   * 搜索文本（商品名称/商品编号）
+   */
+  searchText?: string;
+
   /**
    * 产品编号
    */
@@ -567,6 +597,11 @@ export interface BaseQuery extends PageQuery {
    */
   brandId?: string | number;
 
+  /**
+   * 商品品牌名称
+   */
+  brandName?: string;
+
   /**
    * 顶级分类id
    */
@@ -595,27 +630,32 @@ export interface BaseQuery extends PageQuery {
   /**
    * 是否自营（1=是，0=否）
    */
-  isSelf?: string;
+  isSelf?: number;
 
   /**
-   * 产品审核状态 0=待提交,1=待审核,2=审核通过,3=审核驳回
+   * 商品类型 1=默认类型,2精选商品,3=停售商品
+   * */
+  productCategory?: number;
+
+  /**
+   * 产品审核状态 0=待采购审核,1=审核通过,2=驳回,3=待营销审核
    */
-  productReviewStatus?: string;
+  productReviewStatus?: number;
 
   /**
    * 首页推荐：1=推荐，0=不推荐
    */
-  homeRecommended?: string;
+  homeRecommended?: number;
 
   /**
    * 分类推荐：1=推荐，0=不推荐
    */
-  categoryRecommendation?: string;
+  categoryRecommendation?: number;
 
   /**
    * 购物车推荐：1=推荐，0=不推荐
    */
-  cartRecommendation?: string;
+  cartRecommendation?: number;
 
   /**
    * 推荐产品顺序
@@ -625,17 +665,17 @@ export interface BaseQuery extends PageQuery {
   /**
    * 是否热门：1=是，0=否
    */
-  isPopular?: string;
+  isPopular?: number;
 
   /**
    * 是否新品：1=是，0=否
    */
-  isNew?: string;
+  isNew?: number;
 
   /**
-   * 商品状态：1=上架，0=下架等
+   * 商品状态：1=已上架，0=下架，2=上架中
    */
-  productStatus?: string | number;
+  productStatus?: number;
 
   /**
    * 平台标识
@@ -672,3 +712,37 @@ export interface BaseQuery extends PageQuery {
    */
   params?: any;
 }
+/**
+ * 状态数量统计视图对象
+ */
+export class StatusCountVo {
+  /**
+   * 总数
+   */
+  total: number | null = null;
+
+  /**
+   * 上架数
+   */
+  onSale: number | null = null;
+
+  /**
+   * 下架数
+   */
+  offSale: number | null = null;
+
+  /**
+   * 待审核数量
+   */
+  waitAudit: number | null = null;
+
+  /**
+   * 通过数量
+   */
+  auditPass: number | null = null;
+
+  /**
+   * 驳回数量
+   */
+  auditReject: number | null = null;
+}

src/components/Pagination/index.vue

@@ -1,6 +1,18 @@
 <template>
   <div :class="{ hidden: hidden }" class="pagination-container">
+    <!-- 游标分页模式 -->
+    <div v-if="cursorMode" class="cursor-pagination">
+      <el-button :disabled="currentPage === 1" @click="handlePrevPage"> 上一页 </el-button>
+      <span class="page-info">第 {{ currentPage }} 页</span>
+      <el-button :disabled="!hasMore" @click="handleNextPage"> 下一页 </el-button>
+      <el-select v-model="pageSize" @change="handleSizeChange" style="width: 100px" class="ml-2">
+        <el-option v-for="size in pageSizes" :key="size" :label="`${size}条/页`" :value="size" />
+      </el-select>
+    </div>
+
+    <!-- 传统分页模式 -->
     <el-pagination
+      v-else
       v-model:current-page="currentPage"
       v-model:page-size="pageSize"
       :background="background"
@@ -22,6 +34,7 @@ const props = defineProps({
   total: propTypes.number,
   page: propTypes.number.def(1),
   limit: propTypes.number.def(20),
+  way: propTypes.number.def(1),
   pageSizes: { type: Array<number>, default: () => [10, 20, 30, 50] },
   // 移动端页码按钮的数量端默认值5
   pagerCount: propTypes.number.def(document.body.clientWidth < 992 ? 5 : 7),
@@ -29,10 +42,14 @@ const props = defineProps({
   background: propTypes.bool.def(true),
   autoScroll: propTypes.bool.def(true),
   hidden: propTypes.bool.def(false),
-  float: propTypes.string.def('right')
+  float: propTypes.string.def('right'),
+  // 游标分页模式
+  cursorMode: propTypes.bool.def(false),
+  // 是否还有更多数据（游标分页使用）
+  hasMore: propTypes.bool.def(true)
 });
 
-const emit = defineEmits(['update:page', 'update:limit', 'pagination']);
+const emit = defineEmits(['update:page', 'update:limit', 'update:way', 'pagination']);
 const currentPage = computed({
   get() {
     return props.page;
@@ -50,7 +67,7 @@ const pageSize = computed({
   }
 });
 function handleSizeChange(val: number) {
-  if (currentPage.value * val > props.total) {
+  if (!props.cursorMode && currentPage.value * val > props.total) {
     currentPage.value = 1;
   }
   emit('pagination', { page: currentPage.value, limit: val });
@@ -64,6 +81,28 @@ function handleCurrentChange(val: number) {
     scrollTo(0, 800);
   }
 }
+// 游标分页：下一页
+function handleNextPage() {
+  if (props.hasMore) {
+    currentPage.value += 1;
+    emit('update:way', 1);
+    emit('pagination', { page: currentPage.value, limit: pageSize.value, way: 1 });
+    if (props.autoScroll) {
+      scrollTo(0, 800);
+    }
+  }
+}
+// 游标分页：上一页
+function handlePrevPage() {
+  if (currentPage.value > 1) {
+    currentPage.value -= 1;
+    emit('update:way', 0);
+    emit('pagination', { page: currentPage.value, limit: pageSize.value, way: 0 });
+    if (props.autoScroll) {
+      scrollTo(0, 800);
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>
@@ -71,6 +110,23 @@ function handleCurrentChange(val: number) {
   .el-pagination {
     float: v-bind(float);
   }
+
+  .cursor-pagination {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    gap: 16px;
+    float: v-bind(float);
+
+    .page-info {
+      font-size: 14px;
+      color: #606266;
+    }
+
+    .ml-2 {
+      margin-left: 8px;
+    }
+  }
 }
 .pagination-container.hidden {
   display: none;

src/views/order/assignmentLog/index.vue

@@ -32,21 +32,21 @@
       </template>
 
       <el-table v-loading="loading" border :data="orderAssignmentList" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="订单编号" align="center" prop="orderNo" />
-        <el-table-column label="分配前平台" align="center" prop="platformBefore" />
-        <el-table-column label="分配后平台" align="center" prop="platformAfter" />
-        <el-table-column label="分配时间" align="center" prop="assignTime" width="180">
+        <el-table-column type="selection" width="55" align="center" :resizable="false" />
+        <el-table-column label="订单编号" align="center" prop="orderNo" :resizable="false" />
+        <el-table-column label="分配前平台" align="center" prop="platformBefore" :resizable="false" />
+        <el-table-column label="分配后平台" align="center" prop="platformAfter" :resizable="false" />
+        <el-table-column label="分配时间" align="center" prop="assignTime" width="180" :resizable="false">
           <template #default="scope">
             <span>{{ scope.row.assignTime }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="分配类型" align="center" prop="assignType">
+        <el-table-column label="分配类型" align="center" prop="assignType" :resizable="false">
           <template #default="scope">
             <dict-tag :options="order_assign_type" :value="scope.row.assignType" />
           </template>
         </el-table-column>
-        <el-table-column label="分配原因" align="center" prop="remark" />
+        <el-table-column label="分配原因" align="center" prop="remark" :resizable="false" />
       </el-table>
 
       <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />

src/views/order/expense/index.vue

@@ -30,22 +30,22 @@
       </template>
 
       <el-table v-loading="loading" border :data="revenueHeaderList" @selection-change="handleSelectionChange">
-        <el-table-column label="单据日期" align="center" prop="createTime">
+        <el-table-column label="单据日期" align="center" prop="createTime" :resizable="false">
           <template #default="scope">
             <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="单据编号" align="center" prop="orderRevenueCode" />
-        <el-table-column label="供应商" align="center" prop="supplierName" />
-        <el-table-column label="产品经理" align="center" prop="" />
-        <el-table-column label="采购员" align="center" prop="" />
-        <el-table-column label="含税金额" align="center" prop="totalAmount">
+        <el-table-column label="单据编号" align="center" prop="orderRevenueCode" :resizable="false" />
+        <el-table-column label="供应商" align="center" prop="supplierName" :resizable="false" />
+        <el-table-column label="产品经理" align="center" prop="" :resizable="false" />
+        <el-table-column label="采购员" align="center" prop="" :resizable="false" />
+        <el-table-column label="含税金额" align="center" prop="totalAmount" :resizable="false">
           <template #default="scope">
             <span>{{ Number(scope.row.totalAmount || 0).toFixed(2) }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="备注" align="center" prop="remark" />
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <el-table-column label="备注" align="center" prop="remark" :resizable="false" />
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" :resizable="false">
           <template #default="scope">
             <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['order:revenueHeader:edit']">编辑</el-button>
             <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['order:revenueHeader:remove']">删除</el-button>

src/views/order/orderAssignment/index.vue

@@ -57,25 +57,25 @@
       </template>
 
       <el-table v-loading="loading" border :data="orderMainList" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="订单时间" align="center" prop="orderTime" />
-        <el-table-column label="订单编号" align="center" prop="orderNo" />
-        <el-table-column label="客户编号" align="center" prop="customerCode" />
-        <el-table-column label="订单总金额" align="center" prop="totalAmount" />
-        <el-table-column label="支付方式" align="center" prop="payType">
+        <el-table-column type="selection" width="55" align="center" :resizable="false" />
+        <el-table-column label="订单时间" align="center" prop="orderTime" :resizable="false" />
+        <el-table-column label="订单编号" align="center" prop="orderNo" :resizable="false" />
+        <el-table-column label="客户编号" align="center" prop="customerCode" :resizable="false" />
+        <el-table-column label="订单总金额" align="center" prop="totalAmount" :resizable="false" />
+        <el-table-column label="支付方式" align="center" prop="payType" :resizable="false">
           <template #default="scope">
             <dict-tag :options="pay_method" :value="scope.row.payType" />
           </template>
         </el-table-column>
-        <el-table-column label="业务员" align="center" prop="businessStaff" />
-        <el-table-column label="客服" align="center" prop="customerService" />
-        <el-table-column label="归属部门" align="center" prop="businessDept" />
+        <el-table-column label="业务员" align="center" prop="businessStaff" :resizable="false" />
+        <el-table-column label="客服" align="center" prop="customerService" :resizable="false" />
+        <el-table-column label="归属部门" align="center" prop="businessDept" :resizable="false" />
         <el-table-column label="订单来源" align="center" prop="orderSource">
           <template #default="scope">
             <dict-tag :options="order_source" :value="scope.row.orderSource" />
           </template>
         </el-table-column>
-        <el-table-column label="分配状态" align="center" prop="assignmentStatus">
+        <el-table-column label="分配状态" align="center" prop="assignmentStatus" :resizable="false">
           <template #default="scope">
             <dict-tag :options="order_assignment_status" :value="scope.row.assignmentStatus" />
           </template>
@@ -86,7 +86,7 @@
           </template>
         </el-table-column> -->
 
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="180">
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="180" :resizable="false">
           <template #default="scope">
             <el-button link type="primary" @click="handleReview(scope.row)">详情</el-button>
             <el-button link type="primary" v-if="scope.row.assignmentStatus != '1'" @click="handleAssignment(scope.row)">分配</el-button>

src/views/order/orderMain/components/chooseProduct.vue

@@ -78,14 +78,14 @@
     </el-table>
 
     <!-- 分页 -->
-    <el-pagination
-      v-model:current-page="queryParams.pageNum"
-      v-model:page-size="queryParams.pageSize"
-      :page-sizes="[10, 20, 30, 50]"
+    <pagination
+      v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize"
+      v-model:way="queryParams.way"
+      :cursor-mode="true"
+      :has-more="hasMore"
       :total="total"
-      layout="prev, next"
-      @current-change="handleCurrentChange"
-      class="mt-4"
+      @pagination="getList"
     />
   </el-dialog>
 </template>
@@ -115,15 +115,34 @@ const brandOptions = ref<BrandVO[]>([]);
 const categoryList = ref<categoryTreeVO[]>([]);
 const total = ref(0);
 
-const queryParams = ref<BaseQuery>({
+const queryParams = ref<any>({
   pageNum: 1,
   pageSize: 10,
   productNo: undefined,
   itemName: undefined,
+  brandName: undefined,
   brandId: undefined,
-  topCategoryId: undefined
+  productTag: undefined,
+  purchaseNature: undefined,
+  supplierType: undefined,
+  supplierNature: undefined,
+  projectOrg: undefined,
+  topCategoryId: undefined,
+  mediumCategoryId: undefined,
+  bottomCategoryId: undefined,
+  isSelf: undefined,
+  productReviewStatus: undefined,
+  productStatus: undefined,
+  lastSeenId: undefined,
+  firstSeenId: undefined,
+  way: undefined,
+  params: {}
 });
 
+const hasMore = ref(true); // 是否还有更多数据
+// 页面历史记录，存储每页的第一个id和最后一个id，用于支持双向翻页
+const pageHistory = ref([]);
+
 // 对话框状态变化
 const handleDialogChange = (val: boolean) => {
   emit('update:modelValue', val);
@@ -139,27 +158,99 @@ const formatTaxRate = (taxRate: number | string | undefined): string => {
 
 // 对话框打开时触发
 const handleOpen = () => {
+  // 重置查询参数到第一页
+  queryParams.value.pageNum = 1;
+  queryParams.value.lastSeenId = undefined;
+  queryParams.value.firstSeenId = undefined;
+  queryParams.value.way = undefined;
+  pageHistory.value = [];
   loadProductList();
 };
 
 // 对话框关闭时触发
 const handleClose = () => {
-  // 可以在这里重置数据
+  // 重置查询参数
+  queryParams.value.pageNum = 1;
+  queryParams.value.productNo = undefined;
+  queryParams.value.itemName = undefined;
+  queryParams.value.brandId = undefined;
+  queryParams.value.bottomCategoryId = undefined;
+  queryParams.value.productStatus = undefined;
+  productList.value = [];
+  pageHistory.value = [];
 };
 
-// 加载商品列表
-const loadProductList = async () => {
-  if (loading.value) return;
+// // 加载商品列表
+// const loadProductList = async () => {
+//   if (loading.value) return;
 
+//   loading.value = true;
+//   try {
+//     const res = await listBase(queryParams.value);
+//     productList.value = res.rows || [];
+//     total.value = res.total || 0;
+//   } catch (error) {
+//     console.error('加载商品列表失败:', error);
+//     productList.value = [];
+//     total.value = 0;
+//   } finally {
+//     loading.value = false;
+//   }
+// };
+
+/** 查询产品基础信息列表 */
+const loadProductList = async () => {
   loading.value = true;
   try {
-    const res = await listBase(queryParams.value);
+    const params = { ...queryParams.value };
+    const currentPageNum = queryParams.value.pageNum;
+
+    // 第一页不需要游标参数
+    if (currentPageNum === 1) {
+      delete params.lastSeenId;
+      delete params.way;
+    } else {
+      // way参数：0=上一页，1=下一页
+      if (queryParams.value.way === 0) {
+        // 上一页：使用目标页（即当前显示页）的firstId
+        const nextPageHistory = pageHistory.value[currentPageNum];
+        if (nextPageHistory) {
+          params.firstSeenId = nextPageHistory.firstId;
+          params.way = 0;
+        }
+      } else {
+        // 下一页：使用前一页的lastId作为lastSeenId
+        const prevPageHistory = pageHistory.value[currentPageNum - 1];
+        if (prevPageHistory) {
+          params.lastSeenId = prevPageHistory.lastId;
+          params.way = 1;
+        }
+      }
+    }
+
+    const res = await listBase(params);
     productList.value = res.rows || [];
+
+    // 判断是否还有更多数据
+    hasMore.value = productList.value.length === queryParams.value.pageSize;
+
+    // 记录当前页的第一个id和最后一个id
+    if (productList.value.length > 0) {
+      const firstItem = productList.value[0];
+      const lastItem = productList.value[productList.value.length - 1];
+      //如果长度小于currentPageNum则创建
+
+      if (pageHistory.value.length <= currentPageNum) {
+        pageHistory.value[currentPageNum] = {
+          firstId: firstItem.id,
+          lastId: lastItem.id
+        };
+      }
+    }
+
     total.value = res.total || 0;
   } catch (error) {
-    console.error('加载商品列表失败:', error);
-    productList.value = [];
-    total.value = 0;
+    console.error('获取列表失败:', error);
   } finally {
     loading.value = false;
   }
@@ -211,9 +302,14 @@ const handleAddProduct = (product: BaseVO) => {
   emit('update:modelValue', false);
 };
 
+// 分页查询
+const getList = () => {
+  loadProductList();
+};
+
 // 初始化
 onMounted(() => {
-  // loadBrandList(); // 暂时注释掉
+  // loadBrandList();
   loadCategoryTree();
 });
 </script>

src/views/order/orderReturn/index.vue

@@ -44,27 +44,27 @@
 
       <el-table v-loading="loading" border :data="orderReturnList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="订单时间" align="center" prop="createTime" width="180">
+        <el-table-column label="订单时间" align="center" prop="createTime" width="180" :resizable="false">
           <template #default="scope">
             <span>{{ scope.row.createTime }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="售后单号" align="center" prop="returnNo" />
-        <el-table-column label="售后类型" align="center" prop="serviceType">
+        <el-table-column label="售后单号" align="center" prop="returnNo" :resizable="false" />
+        <el-table-column label="售后类型" align="center" prop="serviceType" :resizable="false">
           <template #default="scope">
             <dict-tag :options="return_type" :value="scope.row.serviceType" />
           </template>
         </el-table-column>
-        <el-table-column label="客户编号" align="center" prop="customerNo" />
-        <el-table-column label="客户姓名" align="center" prop="customerName" />
-        <el-table-column label="售后金额" align="center" prop="afterSaleAmount" />
-        <el-table-column label="订单状态" align="center" prop="returnStatus">
+        <el-table-column label="客户编号" align="center" prop="customerNo" :resizable="false" />
+        <el-table-column label="客户姓名" align="center" prop="customerName" :resizable="false" />
+        <el-table-column label="售后金额" align="center" prop="afterSaleAmount" :resizable="false" />
+        <el-table-column label="订单状态" align="center" prop="returnStatus" :resizable="false">
           <template #default="scope">
             <dict-tag :options="return_order_status" :value="scope.row.returnStatus" />
           </template>
         </el-table-column>
-        <el-table-column label="退货原因" align="center" prop="returnReason" />
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <el-table-column label="退货原因" align="center" prop="returnReason" :resizable="false" />
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" :resizable="false">
           <template #default="scope">
             <el-button link type="primary" icon="Edit" @click="handleReview(scope.row)" v-hasPermi="['order:orderReturn:edit']"
               >查看退货信息</el-button

src/views/order/revenueHeader/index.vue

@@ -45,27 +45,27 @@
 
       <el-table v-loading="loading" border :data="revenueHeaderList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="单据日期" align="center" prop="createTime">
+        <el-table-column label="单据日期" align="center" prop="createTime" :resizable="false">
           <template #default="scope">
             <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="单据编号" align="center" prop="orderRevenueCode" />
-        <el-table-column label="客户名称" align="center" prop="customerName" />
-        <el-table-column label="业务员" align="center" prop="businessStaff" />
-        <el-table-column label="客服" align="center" prop="customerService" />
-        <el-table-column label="备注" align="center" prop="remark" />
-        <el-table-column label="是否关联" align="center" prop="isPrwTax">
+        <el-table-column label="单据编号" align="center" prop="orderRevenueCode" :resizable="false" />
+        <el-table-column label="客户名称" align="center" prop="customerName" :resizable="false" />
+        <el-table-column label="业务员" align="center" prop="businessStaff" :resizable="false" />
+        <el-table-column label="客服" align="center" prop="customerService" :resizable="false" />
+        <el-table-column label="备注" align="center" prop="remark" :resizable="false" />
+        <el-table-column label="是否关联" align="center" prop="isPrwTax" :resizable="false">
           <template #default="scope">
             <dict-tag :options="sys_platform_yes_no" :value="scope.row.isPrwTax" />
           </template>
         </el-table-column>
-        <el-table-column label="审核状态" align="center" prop="status">
+        <el-table-column label="审核状态" align="center" prop="status" :resizable="false">
           <template #default="scope">
             <dict-tag :options="check_status" :value="scope.row.status" />
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" :resizable="false">
           <template #default="scope">
             <el-button
               link

src/views/order/saleOrder/index.vue

@@ -88,35 +88,35 @@
 
       <el-table v-loading="loading" border :data="orderMainList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="订单时间" align="center" prop="orderTime" />
-        <el-table-column label="订单编号" align="center" prop="orderNo" />
-        <el-table-column label="客户编号" align="center" prop="customerCode" />
-        <el-table-column label="订单总金额" align="center" prop="totalAmount" />
-        <el-table-column label="支付方式" align="center" prop="payType">
+        <el-table-column label="订单时间" align="center" prop="orderTime" :resizable="false" />
+        <el-table-column label="订单编号" align="center" prop="orderNo" :resizable="false" />
+        <el-table-column label="客户编号" align="center" prop="customerCode" :resizable="false" />
+        <el-table-column label="订单总金额" align="center" prop="totalAmount" :resizable="false" />
+        <el-table-column label="支付方式" align="center" prop="payType" :resizable="false">
           <template #default="scope">
             <dict-tag :options="pay_method" :value="scope.row.payType" />
           </template>
         </el-table-column>
-        <el-table-column label="业务员" align="center" prop="businessStaff" />
-        <el-table-column label="客服" align="center" prop="customerService" />
-        <el-table-column label="归属部门" align="center" prop="businessDept" />
-        <el-table-column label="订单来源" align="center" prop="orderSource">
+        <el-table-column label="业务员" align="center" prop="businessStaff" :resizable="false" />
+        <el-table-column label="客服" align="center" prop="customerService" :resizable="false" />
+        <el-table-column label="归属部门" align="center" prop="businessDept" :resizable="false" />
+        <el-table-column label="订单来源" align="center" prop="orderSource" :resizable="false">
           <template #default="scope">
-            <dict-tag :options="order_source" :value="scope.row.orderSource" />
+            <dict-tag :options="order_source" :value="scope.row.orderSource" :resizable="false" />
           </template>
         </el-table-column>
-        <el-table-column label="审核状态" align="center" prop="checkStatus">
+        <el-table-column label="审核状态" align="center" prop="checkStatus" :resizable="false">
           <template #default="scope">
             <dict-tag :options="order_check_status" :value="scope.row.checkStatus" />
           </template>
         </el-table-column>
-        <el-table-column label="订单状态" align="center" prop="orderStatus">
+        <el-table-column label="订单状态" align="center" prop="orderStatus" :resizable="false">
           <template #default="scope">
             <dict-tag :options="order_status" :value="scope.row.orderStatus" />
           </template>
         </el-table-column>
 
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" :resizable="false">
           <template #default="scope">
             <el-button link type="primary" v-if="scope.row.orderStatus === '0'" @click="handleReview(scope.row)">查看</el-button>
             <el-button link type="primary" v-if="scope.row.checkStatus === '0'" @click="handleCheck(scope.row)">审核</el-button>