peng
2025-10-16 593b3453dbf8bb34546ad1b8c6f4b568d1d4ab39
seller/src/views/order/order/orderList.vue
@@ -17,10 +17,10 @@
            style="width: 160px"
          />
        </Form-item>
        <Form-item label="会员名称" prop="buyerName">
        <Form-item label="会员名称" prop="nickName">
          <Input
            type="text"
            v-model="searchForm.buyerName"
            v-model="searchForm.nickName"
            clearable
            placeholder="请输入会员名称"
            style="width: 160px"
@@ -42,6 +42,16 @@
            <Option value="STAY_PICKED_UP">待自提</Option>
          </Select>
        </Form-item>
        <Form-item label="定制商品" prop="customizeFlag">
          <Select
            v-model="searchForm.customizeFlag"
            placeholder="请选择"
            clearable
            style="width: 160px"
          >
            <Option value="CUSTOMIZE">定制商品</Option>
          </Select>
        </Form-item>
        <Form-item label="订单类型" prop="orderType">
          <Select
            v-model="searchForm.orderPromotionType"
@@ -60,7 +70,7 @@
          <DatePicker
            v-model="selectDate"
            type="datetimerange"
            format="yyyy-MM-dd"
            format="yyyy-MM-dd HH:mm:ss"
            clearable
            @on-change="selectDateRange"
            placeholder="选择起始时间"
@@ -94,7 +104,22 @@
        :columns="columns"
        :data="data"
        ref="table"
      ></Table>
      >
        <template slot="sn" slot-scope="{ row }">
          <div
            style="width: 100%; cursor: pointer;"
            @click="detail(row)"
          >
            <!-- 保留原来的 sellerRemark 判断逻辑 -->
            <span v-if="row.sellerRemark">
        {{ row.sellerRemark }} ({{ row.sn }})
      </span>
            <span v-else>
        {{ row.sn }}
      </span>
          </div>
        </template>
      </Table>
      <Row type="flex" justify="end" class="mt_10">
        <Page
          :current="searchForm.pageNumber"
@@ -135,7 +160,7 @@
        startDate: "", // 起始时间
        endDate: "", // 终止时间
        orderSn: "",
        buyerName: "",
        nickNam: "",
        orderStatus: "",
        orderType: "NORMAL",
      },
@@ -146,13 +171,14 @@
          key: "sn",
          minWidth: 200,
          tooltip: true,
          render: (h, params) => {
            if (params.row.sellerRemark) {
              return h("div", {}, params.row.sellerRemark + " ("+params.row.sn+")");
            } else {
              return h("div", {}, params.row.sn);
            }
          },
          slot: 'sn',
          // render: (h, params) => {
          //   if (params.row.sellerRemark) {
          //     return h("div", {}, params.row.sellerRemark + " ("+params.row.sn+")");
          //   } else {
          //     return h("div", {}, params.row.sn);
          //   }
          // },
        },
        {
          title: "订单来源",
@@ -202,7 +228,7 @@
        },
        {
          title: "买家名称",
          key: "memberName",
          key: "nickName",
          minWidth: 130,
          tooltip: true,
        },
@@ -213,6 +239,23 @@
          tooltip: true,
          render: (h, params) => {
            return h("priceColorScheme", {props:{value:params.row.flowPrice,color:this.$mainColor}} );
          },
        },
        {
          title: "定制商品",
          key: "customizeFlag",
          minWidth: 120,
          tooltip: true,
          render: (h, params) => {
            if (params.row.customizeFlag == "CUSTOMIZE") {
              return h("div", [
                h("tag", { props: { color: "blue" } }, "定制商品"),
              ]);
            } else  {
              return h("div", [
                h("tag", { props: { color: "volcano" } }, "普通商品"),
              ]);
            }
          },
        },
@@ -262,10 +305,21 @@
          width: 170,
        },
        {
          title:"收货人",
          key:"consigneeName",
          width: 170,
        },
        {
          title:"手机号",
          key:"consigneeMobile",
          width: 170,
        },
        {
          title: "操作",
          key: "action",
          align: "center",
          width: 100,
          fixed: "right",
          render: (h, params) => {
            return h("div", [
              h(
@@ -427,7 +481,7 @@
  },
  // 页面缓存处理,从该页面离开时,修改KeepAlive为false,保证进入该页面是刷新
  beforeRouteLeave(to, from, next) {
    from.meta.keepAlive = false;
    from.meta.keepAlive = true;
    next();
  },
};