修改部分页面ui以及bug

seller/src/views/order/order/orderList.vue

@@ -53,8 +53,8 @@ export default {
         // 搜索框初始化对象
         pageNumber: 1, // 当前页数
         pageSize: 10, // 页面大小
-        sort: "createTime", // 默认排序字段
-        order: "desc", // 默认排序方式
+        sort: "", // 默认排序字段
+        order: "", // 默认排序方式
         startDate: "", // 起始时间
         endDate: "", // 终止时间
         orderSn: "",
@@ -146,8 +146,7 @@ export default {
           title: "下单时间",
           key: "createTime",
           width: 170,
-          sortable: true,
-          sortType: "desc",
+
         },
 
         {

seller/src/views/order/order/virtualOrderList.vue

@@ -69,7 +69,7 @@ export default {
         orderSn: "",
         buyerName: "",
         orderStatus: "",
-        orderType:"VIRTUAL"
+        orderType: "VIRTUAL",
       },
       selectDate: null,
       form: {
@@ -200,8 +200,6 @@ export default {
       let result = await verificationCode(this.orderCode);
 
       if (result.success) {
-
-
         this.$router.push({
           name: "order-detail",
           query: { sn: result.result.sn || this.orderCode },
@@ -228,6 +226,7 @@ export default {
       this.searchForm = {};
       this.searchForm.pageNumber = 1;
       this.searchForm.pageSize = 10;
+      this.searchForm.orderType = "VIRTUAL";
       this.selectDate = null;
       this.searchForm.startDate = "";
       this.searchForm.endDate = "";

seller/src/views/order/receiptManager/receipt.vue

@@ -2,39 +2,15 @@
   <div class="search">
     <Card>
       <Row @keydown.enter.native="handleSearch">
-        <Form
-          ref="searchForm"
-          :model="searchForm"
-          inline
-          :label-width="70"
-          class="search-form"
-        >
+        <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
           <Form-item label="订单编号" prop="orderSn">
-            <Input
-              type="text"
-              v-model="searchForm.orderSn"
-              clearable
-              placeholder="请输入订单编号"
-              style="width: 200px"
-            />
+            <Input type="text" v-model="searchForm.orderSn" clearable placeholder="请输入订单编号" style="width: 200px" />
           </Form-item>
           <Form-item label="会员名称" prop="memberName">
-            <Input
-              type="text"
-              v-model="searchForm.memberName"
-              clearable
-              placeholder="请输入会员名称"
-              style="width: 200px"
-            />
+            <Input type="text" v-model="searchForm.memberName" clearable placeholder="请输入会员名称" style="width: 200px" />
           </Form-item>
           <Form-item label="发票抬头" prop="receiptTitle">
-            <Input
-              type="text"
-              v-model="searchForm.receiptTitle"
-              clearable
-              placeholder="请输入发票抬头"
-              style="width: 200px"
-            />
+            <Input type="text" v-model="searchForm.receiptTitle" clearable placeholder="请输入发票抬头" style="width: 200px" />
           </Form-item>
           <Form-item label="状态" prop="receiptStatus">
             <Select v-model="searchForm.receiptStatus" placeholder="请选择" clearable style="width: 200px">
@@ -46,275 +22,261 @@
           <Button @click="handleReset" class="search-btn">重置</Button>
         </Form>
       </Row>
-      <Table
-        :loading="loading"
-        border
-        :columns="columns"
-        :data="data"
-        ref="table"
-        sortable="custom"
-        @on-sort-change="changeSort"
-        @on-selection-change="changeSelect"
-      >
+      <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect">
         <!-- 订单详情格式化 -->
         <template slot="orderSlot" slot-scope="scope">
-          <a
-            @click="$router.push({name: 'order-detail',query: {sn: scope.row.orderSn}})">{{scope.row.orderSn}}</a>
+          <a @click="$router.push({name: 'order-detail',query: {sn: scope.row.orderSn}})">{{scope.row.orderSn}}</a>
         </template>
       </Table>
       <Row type="flex" justify="end" class="page">
-        <Page
-          :current="searchForm.pageNumber"
-          :total="total"
-          :page-size="searchForm.pageSize"
-          @on-change="changePage"
-          @on-page-size-change="changePageSize"
-          :page-size-opts="[10, 20, 50]"
-          size="small"
-          show-total
-          show-elevator
-          show-sizer
-        ></Page>
+        <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]" size="small"
+          show-total show-elevator show-sizer></Page>
       </Row>
     </Card>
   </div>
 </template>
 
 <script>
-  import * as API_Order from "@/api/order";
+import * as API_Order from "@/api/order";
 
-  export default {
-    name: "storeBill",
-    components: {},
-    data() {
-      return {
-        loading: true, // 表单加载状态
-        searchForm: {
-          // 搜索框初始化对象
-          pageNumber: 1, // 当前页数
-          pageSize: 10, // 页面大小
-          sort: "createTime", // 默认排序字段
-          order: "desc", // 默认排序方式
-          receiptStatus: "", // 起始时间
+export default {
+  name: "storeBill",
+  components: {},
+  data() {
+    return {
+      loading: true, // 表单加载状态
+      searchForm: {
+        // 搜索框初始化对象
+        pageNumber: 1, // 当前页数
+        pageSize: 10, // 页面大小
+        sort: "createTime", // 默认排序字段
+        order: "desc", // 默认排序方式
+        receiptStatus: "", // 起始时间
+      },
+      form: {
+        // 添加或编辑表单对象初始化数据
+        sn: "",
+        sellerName: "",
+        startTime: "",
+        endTime: "",
+        billPrice: "",
+      },
+      // 表单验证规则
+      formValidate: {},
+      submitLoading: false, // 添加或编辑提交状态
+      selectList: [], // 多选数据
+      selectCount: 0, // 多选计数
+      columns: [
+        {
+          title: "订单号",
+          key: "orderSn",
+          minWidth: 120,
+          slot: "orderSlot",
         },
-        form: {
-          // 添加或编辑表单对象初始化数据
-          sn: "",
-          sellerName: "",
-          startTime: "",
-          endTime: "",
-          billPrice: "",
+        {
+          title: "会员名称",
+          key: "memberName",
+          minWidth: 90,
+          tooltip: true,
         },
-        // 表单验证规则
-        formValidate: {},
-        submitLoading: false, // 添加或编辑提交状态
-        selectList: [], // 多选数据
-        selectCount: 0, // 多选计数
-        columns: [
-          {
-            title: "订单号",
-            key: "orderSn",
-            minWidth: 120,
-            slot: "orderSlot",
-          },
-          {
-            title: "会员名称",
-            key: "memberName",
-            minWidth: 90,
-            tooltip: true
-          },
 
-          {
-            title: "发票抬头",
-            key: "receiptTitle",
-            minWidth: 90,
-            tooltip: true
+        {
+          title: "发票抬头",
+          key: "receiptTitle",
+          minWidth: 90,
+          tooltip: true,
+          render: (h, params) => {
+            return h("div", params.row.receiptTitle || "暂未填写");
           },
-          {
-            title: "纳税人识别号",
-            key: "taxpayerId",
-            minWidth: 100,
-            tooltip: true
-
+        },
+        {
+          title: "纳税人识别号",
+          key: "taxpayerId",
+          minWidth: 100,
+          tooltip: true,
+          render: (h, params) => {
+            return h("div", params.row.taxpayerId || "暂未填写");
           },
-          {
-            title: "发票内容",
-            key: "receiptContent",
-            minWidth: 120,
-            tooltip: true
+        },
+        {
+          title: "发票内容",
+          key: "receiptContent",
+          minWidth: 120,
+          tooltip: true,
+          render: (h, params) => {
+            return h("div", params.row.receiptContent || "暂未填写");
           },
-          {
-            title: "发票金额",
-            key: "billPrice",
-            width: 90,
-            render: (h, params) => {
-              return h(
-                "div",
-                this.$options.filters.unitPrice(params.row.receiptPrice, "￥")
-              );
-            },
+        },
+        {
+          title: "发票金额",
+          key: "billPrice",
+          width: 150,
+          render: (h, params) => {
+            return h(
+              "div",
+              this.$options.filters.unitPrice(params.row.receiptPrice, "￥")
+            );
           },
-          {
-            title: "发票状态",
-            key: "receiptStatus",
-            width: 90,
-            tooltip: true,
-            render: (h, params) => {
-              if(params.row.receiptStatus == 0){
-                return h(
-                  "div",
-                  "未开票"
-                );
-              }else{
-                return h(
-                  "div",
-                  "已开票"
-                );
-              }
-
-            },
-          },
-          {
-            title: "订单状态",
-            key: "orderStatus",
-            width: 90,
-            render: (h, params) => {
-              if (params.row.orderStatus == "UNPAID") {
-                return h('div', [h('span', { }, '未付款'),]);
-              } else if (params.row.orderStatus == "PAID") {
-                return h('div', [h('span', { }, '已付款'),]);
-              } else if (params.row.orderStatus == "UNDELIVERED") {
-                return h('div', [h('span', { }, '待发货'),]);
-              }else if (params.row.orderStatus == "DELIVERED") {
-                return h('div', [h('span', { }, '已发货'),]);
-              }else if (params.row.orderStatus == "COMPLETED") {
-                return h('div', [h('span', { }, '已完成'),]);
-              }else if (params.row.orderStatus == "TAKE") {
-                return h('div', [h('span', { }, '待核验'),]);
-              }else if (params.row.orderStatus == "CANCELLED") {
-                return h('div', [h('span', { }, '已取消'),]);
-              }
+        },
+        {
+          title: "发票状态",
+          key: "receiptStatus",
+          width: 90,
+          tooltip: true,
+          render: (h, params) => {
+            if (params.row.receiptStatus == 0) {
+              return h("div", "未开票");
+            } else {
+              return h("div", "已开票");
             }
           },
-          {
-            title: "操作",
-            key: "action",
-            align: "center",
-            width: 80,
-            render: (h, params) => {
-              return h("div", [
-                h(
-                  "Button",
-                  {
-                    props: {
-                      type: "info",
-                      size: "small",
-                    },
-                    attrs: {
-                      disabled: params.row.orderStatus == "COMPLETED"  && params.row.receiptStatus == 0? false : true,
-                    },
-                    style: {
-                      marginRight: "5px",
-                    },
-                    on: {
-                      click: () => {
-                        this.invoicing(params.row);
-                      },
+        },
+        {
+          title: "订单状态",
+          key: "orderStatus",
+          width: 90,
+          render: (h, params) => {
+            if (params.row.orderStatus == "UNPAID") {
+              return h("div", [h("span", {}, "未付款")]);
+            } else if (params.row.orderStatus == "PAID") {
+              return h("div", [h("span", {}, "已付款")]);
+            } else if (params.row.orderStatus == "UNDELIVERED") {
+              return h("div", [h("span", {}, "待发货")]);
+            } else if (params.row.orderStatus == "DELIVERED") {
+              return h("div", [h("span", {}, "已发货")]);
+            } else if (params.row.orderStatus == "COMPLETED") {
+              return h("div", [h("span", {}, "已完成")]);
+            } else if (params.row.orderStatus == "TAKE") {
+              return h("div", [h("span", {}, "待核验")]);
+            } else if (params.row.orderStatus == "CANCELLED") {
+              return h("div", [h("span", {}, "已取消")]);
+            }
+          },
+        },
+        {
+          title: "操作",
+          key: "action",
+          align: "center",
+          width: 80,
+          render: (h, params) => {
+            return h("div", [
+              h(
+                "Button",
+                {
+                  props: {
+                    type: "info",
+                    size: "small",
+                  },
+                  attrs: {
+                    disabled:
+                      params.row.orderStatus == "COMPLETED" &&
+                      params.row.receiptStatus == 0
+                        ? false
+                        : true,
+                  },
+                  style: {
+                    marginRight: "5px",
+                  },
+                  on: {
+                    click: () => {
+                      this.invoicing(params.row);
                     },
                   },
-                  "开票"
-                ),
-              ]);
-            },
+                },
+                "开票"
+              ),
+            ]);
           },
-        ],
-        data: [], // 表单数据
-        total: 0, // 表单数据总数
-      };
+        },
+      ],
+      data: [], // 表单数据
+      total: 0, // 表单数据总数
+    };
+  },
+  methods: {
+    init() {
+      this.getData();
     },
-    methods: {
-      init() {
-        this.getData();
-      },
-      changePage(v) {
-        this.searchForm.pageNumber = v;
-        this.getData();
-        this.clearSelectAll();
-      },
-      changePageSize(v) {
-        this.searchForm.pageSize = v;
-        this.getData();
-      },
-      handleSearch() {
-        this.searchForm.pageNumber = 1;
-        this.searchForm.pageSize = 10;
-        this.getData();
-      },
-      handleReset() {
-        this.searchForm = {}
-        this.searchForm.pageNumber = 1;
-        this.searchForm.pageSize = 10;
-        this.getData();
-      },
-      changeSort(e) {
-        this.searchForm.sort = e.key;
-        this.searchForm.order = e.order;
-        if (e.order === "normal") {
-          this.searchForm.order = "";
-        }
-        this.getData();
-      },
-      clearSelectAll() {
-        this.$refs.table.selectAll(false);
-      },
-      changeSelect(e) {
-        this.selectList = e;
-        this.selectCount = e.length;
-      },
-      selectDateRange(v) {
-        if (v) {
-          this.searchForm.startDate = v[0];
-          this.searchForm.endDate = v[1];
-        }
-      },
-      getData() {
-        this.loading = true;
-        API_Order.getReceiptPage(this.searchForm).then((res) => {
-          this.loading = false;
-          if (res.success) {
-            this.data = res.result.records;
-            this.total = res.result.total;
-          }
-        });
-        this.total = this.data.length;
+    changePage(v) {
+      this.searchForm.pageNumber = v;
+      this.getData();
+      this.clearSelectAll();
+    },
+    changePageSize(v) {
+      this.searchForm.pageSize = v;
+      this.getData();
+    },
+    handleSearch() {
+      this.searchForm.pageNumber = 1;
+      this.searchForm.pageSize = 10;
+      this.getData();
+    },
+    handleReset() {
+      this.searchForm = {};
+      this.searchForm.pageNumber = 1;
+      this.searchForm.pageSize = 10;
+      this.getData();
+    },
+    changeSort(e) {
+      this.searchForm.sort = e.key;
+      this.searchForm.order = e.order;
+      if (e.order === "normal") {
+        this.searchForm.order = "";
+      }
+      this.getData();
+    },
+    clearSelectAll() {
+      this.$refs.table.selectAll(false);
+    },
+    changeSelect(e) {
+      this.selectList = e;
+      this.selectCount = e.length;
+    },
+    selectDateRange(v) {
+      if (v) {
+        this.searchForm.startDate = v[0];
+        this.searchForm.endDate = v[1];
+      }
+    },
+    getData() {
+      this.loading = true;
+      API_Order.getReceiptPage(this.searchForm).then((res) => {
         this.loading = false;
-      },
-      //开发票
-      invoicing(params){
-        this.$Modal.confirm({
-          title: "确认开票",
-          content: "您确认已经开具发票 ?",
-          loading: true,
-          onOk: () => {
-            API_Order.invoicing(params.id).then((res) => {
-              if (res.success) {
-                this.$Message.success("开票成功");
-              }
-              this.$Modal.remove();
-              this.getData();
-            });
-
-
-          }
-        });
-      },
+        if (res.success) {
+          this.data = res.result.records;
+          this.total = res.result.total;
+        }
+      });
+      this.total = this.data.length;
+      this.loading = false;
     },
-    activated() {
-      this.init();
+    //开发票
+    invoicing(params) {
+      this.$Modal.confirm({
+        title: "确认开票",
+        content: "您确认已经开具发票 ?",
+        loading: true,
+        onOk: () => {
+          API_Order.invoicing(params.id).then((res) => {
+            if (res.success) {
+              this.$Message.success("开票成功");
+            }
+            this.$Modal.remove();
+            this.getData();
+          });
+        },
+      });
     },
-  };
+  },
+  mounted() {
+    this.init();
+  },
+  activated() {
+    this.init();
+  },
+};
 </script>
 <style lang="scss">
-  // 建议引入通用样式 可删除下面样式代码
-   @import "@/styles/table-common.scss";
+// 建议引入通用样式 可删除下面样式代码
+@import "@/styles/table-common.scss";
 </style>