一人一码订单页面调整测试提交

192dd7be · 陈浩建 · 42bf7311 · 192dd7be · 192dd7be · 192dd7be
Commit 192dd7be authored Dec 23, 2020 by 陈浩建
10 changed files
--- a/.gradle/6.7/executionHistory/executionHistory.lock
+++ b/.gradle/6.7/executionHistory/executionHistory.lock
--- a/.gradle/6.7/fileChanges/last-build.bin
+++ b/.gradle/6.7/fileChanges/last-build.bin
--- a/.gradle/6.7/fileHashes/fileHashes.lock
+++ b/.gradle/6.7/fileHashes/fileHashes.lock
--- a/.gradle/6.7/gc.properties
+++ b/.gradle/6.7/gc.properties
--- a/.gradle/buildOutputCleanup/buildOutputCleanup.lock
+++ b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
--- a/.gradle/buildOutputCleanup/cache.properties
+++ b/.gradle/buildOutputCleanup/cache.properties
+#Wed Dec 23 15:15:35 CST 2020
+gradle.version=6.7
--- a/.gradle/checksums/checksums.lock
+++ b/.gradle/checksums/checksums.lock
--- a/.gradle/configuration-cache/gc.properties
+++ b/.gradle/configuration-cache/gc.properties
--- a/.gradle/vcs-1/gc.properties
+++ b/.gradle/vcs-1/gc.properties
--- a/src/views/school-center/order/order.vue
+++ b/src/views/school-center/order/order.vue
@@ -10,7 +10,7 @@
                            <a-range-picker @change="onChange" format="YYYY-MM-DD HH:mm:ss"/>
                        </a-form-item>
                    </a-col>
-                    <a-col :md="3" :sm="6">
+                    <a-col :md="4" :sm="6">
                        <a-form-item label="客户类型：">
                            <a-select v-model="queryParam.userType" style="width: 120px">
                                <a-select-option value>全部客户</a-select-option>
@@ -449,9 +449,22 @@
                },
                orderInfo: {},
                columns: [
-                    {dataIndex: "customerName", width: 100, title: "客户姓名", fixed: "left"},
+                    {dataIndex: "customerName", width: 90, title: "客户姓名", fixed: "left"},
-                    {dataIndex: "orderNumber", width: 200, title: "订单编号", fixed: "left"},
+                    {dataIndex: "orderStatus", width: 80, title: "订单状态", fixed: "left"},
-                    {dataIndex: "orderStatus", width: 100, title: "订单状态"},
+                    {
+                      dataIndex: "userType",
+                      width: 100,
+                      title: "订单类型",
+                      scopedSlots: {customRender: "userType"}
+                      , fixed: "left"
+                    },
+                    {dataIndex: "businessNumber", width: 120, title: "办理号码"},
+                    {dataIndex: "contactNumber", width: 120, title: "联系号码"},
+                    {dataIndex: "kapin", width: 160, title: "办理套餐"},
+                    {dataIndex: "hehuorenSchool", width: 200, title: "合伙人学校"},
+                  {dataIndex: "hehuorenName", width: 90, title: "合伙人姓名"},
+                    {dataIndex: "hehuorenPhone", width: 120, title: "合伙人手机"},
                    {
                        dataIndex: "studentCardCheckStatus",
                        width: 100,
@@ -459,18 +472,7 @@
                        scopedSlots: {customRender: "studentCardCheckStatus"}
                    },
                    {dataIndex: "businessPackage", width: 120, title: "升级套餐"},
-                    {
+                    {dataIndex: "orderNumber", width: 200, title: "订单编号"},
-                        dataIndex: "userType",
-                        width: 100,
-                        title: "订单类型",
-                        scopedSlots: {customRender: "userType"}
-                    },
-                    {dataIndex: "contactNumber", width: 160, title: "联系号码"},
-                    {dataIndex: "businessNumber", width: 160, title: "办理号码"},
-                    {dataIndex: "kapin", width: 200, title: "办理套餐"},
-                    {dataIndex: "hehuorenSchool", width: 220, title: "合伙人学校"},
-                    {dataIndex: "hehuorenName", width: 150, title: "合伙人姓名"},
-                    {dataIndex: "hehuorenPhone", width: 150, title: "合伙人手机"},
                    {
                        dataIndex: "operation",
                        width: 180,
@@ -809,7 +811,9 @@
                    }
                });
            },
            abnormal(orderId) {
+              if (confirm("是否设为异常单！")) {
                  abnormal({orderId}).then(res => {
                      if (res.state == "success") {
                          this.search();
@@ -820,6 +824,7 @@
                  });
              }
            }
+        }
    };
 </script>