From 021fb763c07cb68efda56da2636ed916f9cd3a01 Mon Sep 17 00:00:00 2001
From: tianyi <13521030702@163.com>
Date: Mon, 20 Apr 2026 18:01:12 +0800
Subject: [PATCH] 11

---
 src/api/index.js                              |    6 +-
 src/views/app/business/courier/addEdit.vue    |  564 +++---
 src/views/app/business/courier/courier.vue    | 1634 +++++++----------
 .../app/business/logistics/logistics.vue      |  258 +--
 src/views/sys/order-manage/orderManage.vue    |  515 ++----
 5 files changed, 1085 insertions(+), 1892 deletions(-)

diff --git a/src/api/index.js b/src/api/index.js
index 3e69b7e..94ee873 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -681,7 +681,7 @@ export const deleteOrder = (params) => {
 
 // 获取配送员
 export const getWorkerListData = (params) => {
-    return postBodyRequest('/worker/getMatchingWorkerList', params)
+    return postBodyRequest('/worker/getByCondition', params)
 }
 
 // 创建订单
@@ -735,6 +735,10 @@ export const getOwListData = (params) => {
 export const getOrderList = (params) => {
     return postBodyRequest('/mall/order/page', params)
 }
+// 订单调度
+export const orderScheduling = (params) => {
+    return postBodyRequest('/mall/delivery/pagebyworker', params)
+}
 //取消订单
 export const returnOrder = (params) => {
     return postRequest('/mall/order/cancel', params)
diff --git a/src/views/app/business/courier/addEdit.vue b/src/views/app/business/courier/addEdit.vue
index e6031cc..d7c0720 100644
--- a/src/views/app/business/courier/addEdit.vue
+++ b/src/views/app/business/courier/addEdit.vue
@@ -1,310 +1,268 @@
 <template>
-  <div class="worker-edit">
-    <!-- Drawer抽屉 -->
-    <Drawer
-      :title="title"
-      v-model="visible"
-      width="720"
-      draggable
-      :mask-closable="type == '0'"
-    >
-      <div :style="{ maxHeight: maxHeight }" class="drawer-content">
-        <div class="drawer-header">
-          <div style="margin-right: 16px">基本信息</div>
-        </div>
-        <Form label-colon v-show="type != '2'">
-          <Row :gutter="32">
-            <Col span="12">
-              <FormItem label="快递员ID">
-                {{ form.workerId }}
-                <Tooltip trigger="hover" placement="right" content="账户已禁用">
-                  <Icon
-                    v-show="form.workerStatus == 3"
-                    type="md-lock"
-                    size="18"
-                    style="margin-left: 10px; cursor: pointer"
-                  />
-                </Tooltip>
-              </FormItem>
-            </Col>
-            <Col span="12">
-              <FormItem label="快递员状态">
-                {{ this.statusName }}
-                  <Icon
-                    v-show="form.workerStatus"
-                    type="md-key"
-                    :color="passColor"
-                    size="18"
-                    style="margin-left: 10px; cursor: pointer"
-                  />
-              </FormItem>
-            </Col>
-          </Row>
-        </Form>
-        <Form
-          ref="form"
-          :model="form"
-          :rules="formValidate"
-          label-position="top"
-        >
-          <Row :gutter="32">
-            <Col span="12">
-              <FormItem label="登录账号" prop="username">
-                <Input v-model="form.username" />
-              </FormItem>
-            </Col>
-            <Col span="12">
-              <FormItem label="登录密码" prop="password">
-                <SetPassword v-model="form.password" @on-change="changePass" />
-              </FormItem>
-            </Col>
-          </Row>
-          <Row :gutter="32">
-            <Col span="12">
-              <FormItem label="快递员名称" prop="workerName">
-                <Input v-model="form.workerName" />
-              </FormItem>
-            </Col>
-            <Col span="12">
-              <FormItem label="归属商圈" prop="region">
-                  <region-tree-choose
-                          @on-change="handleSelectRegion"
-                          ref="regionTree"
-                  ></region-tree-choose>
-              </FormItem>
-            </Col>
-          </Row>
-          <Row :gutter="32">
-            <Col span="12">
-              <FormItem label="当次应缴" prop="depoNum">
-                <Input v-model="form.depoNum" />
-              </FormItem>
-            </Col>
-            <Col span="12">
-              <FormItem label="押金余额" prop="depoBal">
-                <Input v-model="form.depoBal" :disabled="true"/>
-              </FormItem>
-            </Col>
-          </Row>
-          <Row :gutter="32">
-            <Col span="12">
-              <FormItem label="电话" prop="mobile">
-                <Input v-model="form.mobile" />
-              </FormItem>
-            </Col>
-            <Col span="24">
-              <FormItem label="快递员简介">
-                <Input type="textarea" v-model="form.workerDescribe" :rows="4" />
-              </FormItem>
-            </Col>
-          </Row>
-          <Row :gutter="32">
-            <Col span="12">
-                <FormItem label="所属公司" prop="ownerCompany">
-                  <Select v-model="form.ownerCompany" multiple transfer>
-                    <Option
-                      v-for="item in companyList"
-                      :value="item.id"
-                      :key="item.id"
-                      :label="item.companyName"
-                    >
-                      <span style="margin-right: 10px">{{ item.companyName }}</span>
-                    </Option>
-                  </Select>
-                </FormItem>
-              </Col>
-          </Row>
-          <Row :gutter="32">
-            <Col span="24">
-              <FormItem label="快递员收费标准说明">
-                <Input type="textarea" v-model="form.remark" :rows="4" />
-              </FormItem>
-            </Col>
-          </Row>
-        </Form>
-      </div>
-      <div class="drawer-footer br" v-show="type != '0'">
-        <Button type="primary" :loading="submitLoading" @click="submit"
-          >提交</Button
-        >
-        <Button @click="visible = false">取消</Button>
-      </div>
-    </Drawer>
-  </div>
+	<div class="worker-edit">
+		<!-- Drawer抽屉 -->
+		<Drawer :title="title" v-model="visible" width="720" draggable :mask-closable="type == '0'">
+			<div :style="{ maxHeight: maxHeight }" class="drawer-content">
+				<div class="drawer-header">
+					<div style="margin-right: 16px">基本信息</div>
+				</div>
+				<Form label-colon v-show="type != '2'">
+					<Row :gutter="32">
+						<Col span="12">
+						<FormItem label="配送员ID">
+							{{ form.workerId }}
+							<Tooltip trigger="hover" placement="right" content="账户已禁用">
+								<Icon v-show="form.workerStatus == 3" type="md-lock" size="18"
+									style="margin-left: 10px; cursor: pointer" />
+							</Tooltip>
+						</FormItem>
+						</Col>
+						<Col span="12">
+						<FormItem label="配送员状态">
+							{{ this.statusName }}
+							<Icon v-show="form.workerStatus" type="md-key" :color="passColor" size="18"
+								style="margin-left: 10px; cursor: pointer" />
+						</FormItem>
+						</Col>
+					</Row>
+				</Form>
+				<Form ref="form" :model="form" :rules="formValidate" label-position="top">
+					<Row :gutter="32">
+						<Col span="12">
+						<FormItem label="登录账号" prop="username">
+							<Input v-model="form.username" />
+						</FormItem>
+						</Col>
+						<Col span="12">
+						<FormItem label="登录密码" prop="password">
+							<SetPassword v-model="form.password" @on-change="changePass" />
+						</FormItem>
+						</Col>
+					</Row>
+					<Row :gutter="32">
+						<Col span="12">
+						<FormItem label="配送员名称" prop="workerName">
+							<Input v-model="form.workerName" />
+						</FormItem>
+						</Col>
+						<Col span="12">
+						<FormItem label="所属学校" prop="region">
+							<Input v-model="form.regionTitle" disabled />
+						</FormItem>
+						</Col>
+					</Row>
+					<Row :gutter="32">
+						<Col span="12">
+						<FormItem label="佣金余额" prop="depoBal">
+							<Input v-model="form.depoBal" />
+						</FormItem>
+						</Col>
+						<Col span="12">
+						<FormItem label="交易保障金" prop="rebateAmount">
+							<Input v-model="form.rebateAmount" :disabled="true" />
+						</FormItem>
+						</Col>
+					</Row>
+					<Row :gutter="32">
+						<Col span="12">
+						<FormItem label="电话" prop="mobile">
+							<Input v-model="form.mobile" />
+						</FormItem>
+						</Col>
+						<Col span="24">
+						<FormItem label="配送员简介">
+							<Input type="textarea" v-model="form.workerDescribe" :rows="4" />
+						</FormItem>
+						</Col>
+					</Row>
+					<Row :gutter="32">
+						<Col span="24">
+						<FormItem label="配送员收费标准说明">
+							<Input type="textarea" v-model="form.remark" :rows="4" />
+						</FormItem>
+						</Col>
+					</Row>
+				</Form>
+			</div>
+			<div class="drawer-footer br" v-show="type != '0'">
+				<Button type="primary" :loading="submitLoading" @click="submit">提交</Button>
+				<Button @click="visible = false">取消</Button>
+			</div>
+		</Drawer>
+	</div>
 </template>
 
 <script>
-import { getAllRoleList, addWorker, editWorker } from "@/api/index";
-import { getLogiticsCompanyList }  from "@/api/app";
-import {
-  validateUsername,
-  validateMobile,
-  validatePassword,
-} from "@/libs/validate";
-import departmentTreeChoose from "@/views/my-components/hiver/department-tree-choose";
-import uploadPicInput from "@/views/my-components/hiver/upload-pic-input";
-import SetPassword from "@/views/my-components/hiver/set-password";
-import dict from "@/views/my-components/hiver/dict";
-import regionTreeChoose from "@/views/my-components/hiver/region-tree-choose";
-export default {
-  name: "addEdit",
-  components: {
-    regionTreeChoose,
-    departmentTreeChoose,
-    uploadPicInput,
-    SetPassword,
-    dict,
-  },
-  props: {
-    value: {
-      type: Boolean,
-      default: false,
-    },
-    data: {
-      type: Object,
-    },
-    type: {
-      type: String,
-      default: "0",
-    },
-  },
-  data() {
-    return {
-      roleList: [],
-      visible: this.value,
-      title: "",
-      passColor: "",
-      statusName: "",
-      submitLoading: false,
-      maxHeight: 510,
-      form: {
-        signPerson: "2",
-      },
-      formValidate: {},
-      companyList: [],
-      companyForm: {
-        signCompany: "1",
-      },
-    };
-  },
-  methods: {
-    init() {
-      this.getRoleList();
-      this.getCompanyList();
-    },
-    getRoleList() {
-      getAllRoleList().then((res) => {
-        if (res.success) {
-          this.roleList = res.result;
-        }
-      });
-    },
-    getCompanyList() {
-      getLogiticsCompanyList(this.companyForm).then((res) => {
-        if (res.success) {
-          this.companyList = res.result;
-        }
-      });
-    },
-    handleSelectRegion(v) {
-        this.form.region = v;
-    },
-    changePass(v, grade, strength) {
-      this.form.passStrength = strength;
-    },
-    submit() {
-      this.$refs.form.validate((valid) => {
-        if (valid) {
-          if (this.type == "1") {
-            // 编辑
-            this.submitLoading = true;
-            editWorker(this.form).then((res) => {
-              this.submitLoading = false;
-              if (res.success) {
-                this.$Message.success("操作成功");
-                this.$emit("on-submit", true);
-                this.visible = false;
-              }
-            });
-          } else {
-            // 添加
-            this.submitLoading = true;
-            addWorker(this.form).then((res) => {
-              this.submitLoading = false;
-              if (res.success) {
-                this.$Message.success("操作成功");
-                this.$emit("on-submit", true);
-                this.visible = false;
-              }
-            });
-          }
-        }
-      });
-    },
-    setCurrentValue(value) {
-      if (value === this.visible) {
-        return;
-      }
-      if (this.type == "1") {
-        this.title = "修改信息";
-        this.maxHeight =
-          Number(document.documentElement.clientHeight - 121) + "px";
-      } else if (this.type == "2") {
-        this.title = "新建信息";
-        this.maxHeight =
-          Number(document.documentElement.clientHeight - 121) + "px";
-      } else {
-        this.title = "信息详情";
-        this.maxHeight = "100%";
-      }
-      // 清空数据
-      this.$refs.form.resetFields();
-      if (this.type == "0" || this.type == "1") {
-          // 密码强度
-          // 回显数据
-          let data = this.data;
-          if (data.workerStatus == "1") {
-            this.passColor = "#52c41a";
-            this.statusName = "可抢单";
-          } else if (data.workerStatus == "2") {
-            this.passColor = "#faad14";
-            this.statusName = "不可接单";
-          } else if (data.workerStatus == "3") {
-            this.passColor = "#ed3f14";
-            this.statusName = "已禁用";
-          }
-        // 角色
-        let selectCompanyIds = [];
-        selectCompanyIds = data.ownerCompany.split(",");
-        data.ownerCompany = selectCompanyIds;
-          // 商圈
-          this.$refs.regionTree.setData(data.region, data.regionTitle);
-        // 回显
-        this.form = data;
-      } else {
-        this.form = {
-          type: 0,
-          signPerson: "2",
-        };
-      }
-      this.visible = value;
-    },
-  },
-  watch: {
-    value(val) {
-      this.setCurrentValue(val);
-    },
-    visible(value) {
-      this.$emit("input", value);
-    },
-  },
-  mounted() {
-    this.init();
-  },
-};
+	import {
+		getAllRoleList,
+		addWorker,
+		editWorker
+	} from "@/api/index";
+	import {
+		getLogiticsCompanyList
+	} from "@/api/app";
+	import {
+		validateUsername,
+		validateMobile,
+		validatePassword,
+	} from "@/libs/validate";
+	import departmentTreeChoose from "@/views/my-components/hiver/department-tree-choose";
+	import uploadPicInput from "@/views/my-components/hiver/upload-pic-input";
+	import SetPassword from "@/views/my-components/hiver/set-password";
+	import dict from "@/views/my-components/hiver/dict";
+	import regionTreeChoose from "@/views/my-components/hiver/region-tree-choose";
+	export default {
+		name: "addEdit",
+		components: {
+			regionTreeChoose,
+			departmentTreeChoose,
+			uploadPicInput,
+			SetPassword,
+			dict,
+		},
+		props: {
+			value: {
+				type: Boolean,
+				default: false,
+			},
+			data: {
+				type: Object,
+			},
+			type: {
+				type: String,
+				default: "0",
+			},
+		},
+		data() {
+			return {
+				roleList: [],
+				visible: this.value,
+				title: "",
+				passColor: "",
+				statusName: "",
+				submitLoading: false,
+				maxHeight: 510,
+				form: {
+					signPerson: "2",
+				},
+				formValidate: {},
+				companyList: [],
+				companyForm: {
+					signCompany: "1",
+				},
+			};
+		},
+		methods: {
+			init() {
+				this.getRoleList();
+				this.getCompanyList();
+			},
+			getRoleList() {
+				getAllRoleList().then((res) => {
+					if (res.success) {
+						this.roleList = res.result;
+					}
+				});
+			},
+			getCompanyList() {
+				getLogiticsCompanyList(this.companyForm).then((res) => {
+					if (res.success) {
+						this.companyList = res.result;
+					}
+				});
+			},
+			handleSelectRegion(v) {
+				this.form.region = v;
+			},
+			changePass(v, grade, strength) {
+				this.form.passStrength = strength;
+			},
+			submit() {
+				this.$refs.form.validate((valid) => {
+					if (valid) {
+						if (this.type == "1") {
+							// 编辑
+							this.submitLoading = true;
+							editWorker(this.form).then((res) => {
+								this.submitLoading = false;
+								if (res.success) {
+									this.$Message.success("操作成功");
+									this.$emit("on-submit", true);
+									this.visible = false;
+								}
+							});
+						} else {
+							// 添加
+							this.submitLoading = true;
+							addWorker(this.form).then((res) => {
+								this.submitLoading = false;
+								if (res.success) {
+									this.$Message.success("操作成功");
+									this.$emit("on-submit", true);
+									this.visible = false;
+								}
+							});
+						}
+					}
+				});
+			},
+			setCurrentValue(value) {
+				if (value === this.visible) {
+					return;
+				}
+				if (this.type == "1") {
+					this.title = "修改信息";
+					this.maxHeight =
+						Number(document.documentElement.clientHeight - 121) + "px";
+				} else if (this.type == "2") {
+					this.title = "新建信息";
+					this.maxHeight =
+						Number(document.documentElement.clientHeight - 121) + "px";
+				} else {
+					this.title = "信息详情";
+					this.maxHeight = "100%";
+				}
+				// 清空数据
+				this.$refs.form.resetFields();
+				if (this.type == "0" || this.type == "1") {
+					// 密码强度
+					// 回显数据
+					let data = this.data;
+					if (data.workerStatus == "1") {
+						this.passColor = "#52c41a";
+						this.statusName = "可抢单";
+					} else if (data.workerStatus == "2") {
+						this.passColor = "#faad14";
+						this.statusName = "不可接单";
+					} else if (data.workerStatus == "3") {
+						this.passColor = "#ed3f14";
+						this.statusName = "已禁用";
+					}
+					// 回显
+					this.form = data;
+				} else {
+					this.form = {
+						type: 0,
+						signPerson: "2",
+					};
+				}
+				this.visible = value;
+			},
+		},
+		watch: {
+			value(val) {
+				this.setCurrentValue(val);
+			},
+			visible(value) {
+				this.$emit("input", value);
+			},
+		},
+		mounted() {
+			this.init();
+		},
+	};
 </script>
 
 <style lang="less">
-@import "@/styles/drawer-common.less";
-</style>
-
+	@import "@/styles/drawer-common.less";
+</style>
\ No newline at end of file
diff --git a/src/views/app/business/courier/courier.vue b/src/views/app/business/courier/courier.vue
index c31e2e5..3bf4fa6 100644
--- a/src/views/app/business/courier/courier.vue
+++ b/src/views/app/business/courier/courier.vue
@@ -1,960 +1,688 @@
 <style lang="less">
-@import "@/styles/table-common.less";
-@import "./courier.less";
+	@import "@/styles/table-common.less";
+	@import "./courier.less";
 </style>
 <template>
-  <div class="search">
-    <Card>
-      <Row v-show="openSearch" @keydown.enter.native="handleSearch">
-        <Form ref="searchForm" :model="searchForm" inline :label-width="70">
-          <FormItem label="快递员编号" prop="WorkerId">
-            <Input
-              type="text"
-              v-model="searchForm.WorkerId"
-              clearable
-              placeholder="请输入快递员编号"
-              style="width: 200px"
-            />
-          </FormItem>
-          <FormItem label="快递员名称" prop="WorkerName">
-            <Input
-              type="text"
-              v-model="searchForm.WorkerName"
-              clearable
-              placeholder="请输入快递员名称"
-              style="width: 200px"
-            />
-          </FormItem>
-          <span v-if="drop">
-            <FormItem label="接单状态" prop="WorkerStatus">
-              <dict dict="WorkerStatus" v-model="searchForm.WorkerStatus" style="width: 200px" />
-            </FormItem>
-            <FormItem label="电话" prop="mobile">
-              <Input
-                type="text"
-                v-model="searchForm.mobile"
-                clearable
-                placeholder="请输入电话"
-                style="width: 200px"
-              />
-            </FormItem>
-            <FormItem label="创建时间">
-              <DatePicker
-                :options="options"
-                v-model="selectDate"
-                type="daterange"
-                format="yyyy-MM-dd"
-                clearable
-                @on-change="selectDateRange"
-                placeholder="选择起始时间"
-                style="width: 200px"
-              ></DatePicker>
-            </FormItem>
-          </span>
-          <FormItem style="margin-left: -35px" class="br">
-            <Button @click="handleSearch" type="primary" icon="ios-search"
-              >搜索</Button
-            >
-            <Button @click="handleReset">重置</Button>
-            <a class="drop-down" @click="dropDown">
-              {{ dropDownContent }}
-              <Icon :type="dropDownIcon"></Icon>
-            </a>
-          </FormItem>
-        </Form>
-      </Row>
-      <Row align="middle" justify="space-between" class="operation">
-        <div>
-          <Button @click="add" type="primary" icon="md-add">创建快递员</Button>
-          <Button @click="delAll" icon="md-trash">批量删除</Button>
-          <Dropdown @on-click="handleDropdown">
-            <Button>
-              更多操作
-              <Icon type="md-arrow-dropdown" />
-            </Button>
-            <DropdownMenu slot="list">
-              <!-- <DropdownItem name="reset">重置用户密码</DropdownItem> -->
-              <DropdownItem name="exportData">导出所选数据</DropdownItem>
-              <DropdownItem name="exportAll">导出全部数据</DropdownItem>
-              <DropdownItem name="importData">导入数据</DropdownItem>
-            </DropdownMenu>
-          </Dropdown>
-        </div>
-        <div class="icons">
-          <Tooltip content="刷新" placement="top" transfer>
-            <Icon
-              type="md-refresh"
-              size="18"
-              class="item"
-              @click="getDataList"
-            />
-          </Tooltip>
-          <Tooltip
-            :content="openSearch ? '关闭搜索' : '开启搜索'"
-            placement="top"
-            transfer
-          >
-            <Icon
-              type="ios-search"
-              size="18"
-              class="item tip"
-              @click="openSearch = !openSearch"
-            />
-          </Tooltip>
-          <Tooltip
-            :content="openTip ? '关闭提示' : '开启提示'"
-            placement="top"
-            transfer
-          >
-            <Icon
-              type="md-bulb"
-              size="18"
-              class="item tip"
-              @click="openTip = !openTip"
-            />
-          </Tooltip>
-          <Tooltip content="表格密度" placement="top" transfer>
-            <Dropdown @on-click="changeTableSize" trigger="click">
-              <Icon type="md-list" size="18" class="item" />
-              <DropdownMenu slot="list">
-                <DropdownItem :selected="tableSize == 'default'" name="default"
-                  >默认</DropdownItem
-                >
-                <DropdownItem :selected="tableSize == 'large'" name="large"
-                  >宽松</DropdownItem
-                >
-                <DropdownItem :selected="tableSize == 'small'" name="small"
-                  >紧密</DropdownItem
-                >
-              </DropdownMenu>
-            </Dropdown>
-          </Tooltip>
-        </div>
-      </Row>
-      <Alert show-icon v-show="openTip">
-        已选择
-        <span class="select-count">{{ selectList.length }}</span> 项
-        <a class="select-clear" @click="clearSelectAll">清空</a>
-      </Alert>
-      <Table
-        :loading="loading"
-        border
-        :columns="colHidden"
-        :data="data"
-        :size="tableSize"
-        sortable="custom"
-        @on-sort-change="changeSort"
-        @on-selection-change="showSelect"
-        ref="table"
-      ></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>
-      </Row>
-    </Card>
-
-    <!-- 自定义导出数据 -->
-    <Modal
-      v-model="exportModalVisible"
-      :title="exportTitle"
-      :loading="loadingExport"
-      @on-ok="exportCustomData"
-    >
-      <Form ref="exportForm" :label-width="100">
-        <FormItem label="导出文件名">
-          <Input v-model="filename" />
-        </FormItem>
-        <FormItem label="自定义导出列">
-          <CheckboxGroup v-model="chooseColumns">
-            <Checkbox
-              v-for="(item, i) in exportColumns"
-              :label="item.title"
-              :key="i"
-              :value="item.checked"
-              :disabled="item.disabled"
-            ></Checkbox>
-          </CheckboxGroup>
-        </FormItem>
-      </Form>
-    </Modal>
-    <!-- 导入数据 -->
-    <Drawer
-      title="导入数据"
-      closable
-      v-model="importModalVisible"
-      width="800"
-      draggable
-    >
-      <div
-        style="
-          display: flex;
-          justify-content: space-between;
-          align-items: center;
-        "
-      >
-        <Upload action :before-upload="beforeUploadImport" accept=".xls, .xlsx">
-          <Button
-            :loading="reading"
-            icon="ios-cloud-upload-outline"
-            style="margin-right: 10px"
-            >上传Excel文件</Button
-          >
-          <span v-if="uploadfile.name"
-            >当前选择文件：{{ uploadfile.name }}</span
-          >
-        </Upload>
-        <Button @click="clearImportData" icon="md-trash">清空数据</Button>
-      </div>
-      <Alert type="warning" show-icon
-        >导入前请下载查看导入模版数据文件查看所需字段及说明，确保数据格式正确，不得修改列英文名称</Alert
-      >
-      <Table
-        :columns="importColumns"
-        border
-        :height="height"
-        :data="importTableData"
-        ref="importTable"
-      ></Table>
-      <div class="drawer-footer">
-        <Button @click="downloadTemple" type="info">下载导入模板</Button>
-        <div style="position: absolute; right: 15px; display: inline-block">
-          <Button @click="importModalVisible = false">关闭</Button>
-          <Button
-            :loading="importLoading"
-            :disabled="importTableData.length <= 0"
-            @click="importData"
-            style="margin-left: 8px"
-            type="primary"
-          >
-            确认导入
-            <span v-if="importTableData.length > 0"
-              >{{ importTableData.length }} 条数据</span
-            >
-          </Button>
-        </div>
-      </div>
-    </Drawer>
-
-    <addEdit
-      :data="form"
-      :type="showType"
-      v-model="showWorker"
-      @on-submit="getDataList"
-    />
-  </div>
+	<div class="search">
+		<Card>
+			<Row v-show="openSearch" @keydown.enter.native="handleSearch">
+				<Form ref="searchForm" :model="searchForm" inline :label-width="90">
+					<FormItem label="配送员名称" prop="WorkerName">
+						<Input type="text" v-model="searchForm.workerName" clearable placeholder="请输入配送员名称"
+							style="width: 200px" />
+					</FormItem>
+					<FormItem label="上线状态" prop="isOnLine">
+						<Select ref="dep" @on-change="checkStatusLine" style="width:200px">
+							<Option v-for="(item, i) in dictDataLine" :key="i" :value="item.value">{{
+						    item.title
+						  }}</Option>
+						</Select>
+					</FormItem>
+					<FormItem label="是否接指派单" prop="getPushOrder">
+						<Select ref="dep" @on-change="checkStatus" style="width:200px">
+							<Option v-for="(item, i) in dictData" :key="i" :value="item.value">{{
+						    item.title
+						  }}</Option>
+						</Select>
+					</FormItem>
+					<FormItem style="margin-left: -35px" class="br">
+						<Button @click="handleSearch" type="primary" icon="ios-search">搜索</Button>
+						<Button @click="handleReset">重置</Button>
+					</FormItem>
+				</Form>
+			</Row>
+			<Row align="middle" justify="space-between" class="operation">
+				<div class="icons">
+					<Tooltip content="刷新" placement="top" transfer>
+						<Icon type="md-refresh" size="18" class="item" @click="getDataList" />
+					</Tooltip>
+					<Tooltip :content="openSearch ? '关闭搜索' : '开启搜索'" placement="top" transfer>
+						<Icon type="ios-search" size="18" class="item tip" @click="openSearch = !openSearch" />
+					</Tooltip>
+					<Tooltip :content="openTip ? '关闭提示' : '开启提示'" placement="top" transfer>
+						<Icon type="md-bulb" size="18" class="item tip" @click="openTip = !openTip" />
+					</Tooltip>
+					<Tooltip content="表格密度" placement="top" transfer>
+						<Dropdown @on-click="changeTableSize" trigger="click">
+							<Icon type="md-list" size="18" class="item" />
+							<DropdownMenu slot="list">
+								<DropdownItem :selected="tableSize == 'default'" name="default">默认</DropdownItem>
+								<DropdownItem :selected="tableSize == 'large'" name="large">宽松</DropdownItem>
+								<DropdownItem :selected="tableSize == 'small'" name="small">紧密</DropdownItem>
+							</DropdownMenu>
+						</Dropdown>
+					</Tooltip>
+				</div>
+			</Row>
+			<Alert show-icon v-show="openTip">
+				已选择
+				<span class="select-count">{{ selectList.length }}</span> 项
+				<a class="select-clear" @click="clearSelectAll">清空</a>
+			</Alert>
+			<Table :loading="loading" border :columns="colHidden" :data="data" :size="tableSize" sortable="custom"
+				@on-sort-change="changeSort" @on-selection-change="showSelect" ref="table"></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>
+			</Row>
+		</Card>
+		<addEdit :data="form" :type="showType" v-model="showWorker" @on-submit="getDataList" />
+	</div>
 </template>
 
 <script>
-import {
-    getWorkerListData,
-    enableWorker,
-    disableWorker,
-    deleteWorker,
-    getAllUserData,
-    importUserData,
-    resetUserPass,
-    getDictDataByType,
-    offLineWorker,
-    onLineWorker,
-} from "@/api/index";
-import { shortcuts } from "@/libs/shortcuts";
-// 模版导入文件表数据
-import { userColumns, userData } from "./importTemplate";
-// 指定导出列数据
-import { exportColumn } from "./exportColumn";
-import excel from "@/libs/excel";
-import addEdit from "./addEdit.vue";
-import dict from "@/views/my-components/hiver/dict";
-export default {
-  name: "Courier",
-  components: {
-    addEdit,
-    dict,
-  },
-  data() {
-    return {
-      tableSize: "default",
-      height: 510,
-      showWorker: false,
-      showType: "0",
-      openSearch: true,
-      openTip: true,
-      loading: true,
-      reading: false,
-      importLoading: false,
-      loadingExport: true,
-      exportModalVisible: false,
-      importModalVisible: false,
-      drop: false,
-      dropDownContent: "展开",
-      dropDownIcon: "ios-arrow-down",
-      selectList: [],
-      searchForm: {
-        workerId: "",
-        workerName: "",
-        workerStatus: "",
-        mobile: "",
-        pageNumber: 1,
-        pageSize: 10,
-        sort: "createTime",
-        order: "desc",
-        startDate: "",
-        endDate: "",
-        signPerson: "2",
-        adminFlag: "1",
-      },
-      selectDate: null,
-      options: {
-        shortcuts: shortcuts,
-      },
-      form: {},
-      columns: [
-        {
-          type: "selection",
-          width: 60,
-          align: "center",
-          fixed: "left",
-        },
-        {
-          type: "index",
-          width: 60,
-          align: "center",
-          fixed: "left",
-        },
-        {
-          title: "快递员编号",
-          key: "workerId",
-          minWidth: 125,
-          sortable: true,
-          fixed: "left",
-          render: (h, params) => {
-            return h(
-              "a",
-              {
-                on: {
-                  click: () => {
-                    this.showDetail(params.row);
-                  },
-                },
-              },
-              params.row.workerId
-            );
-          },
-        },
-        {
-          title: "快递员名称",
-          key: "workerName",
-          minWidth: 125,
-          sortable: true,
-          fixed: "left",
-        },
-        {
-          title: "接单状态",
-          key: "workerStatus",
-          minWidth: 160,
-          sortable: true,
-          //fixed: "left",
-          render: (h, params) => {
-            let re = "",
-              color = "";
-            if (params.row.workerStatus == 1) {
-              re = "可抢单";
-              color = "blue";
-            } else if (params.row.workerStatus == 2) {
-              re = "不可接单";
-              color = "yellow";
-            } else if (params.row.workerStatus == 3) {
-              re = "已禁用";
-              color = "red";
-            }
-            return h("div", [
-              h(
-                "Tag",
-                {
-                  props: {
-                    color: color,
-                  },
-                },
-                re
-              ),
-            ]);
-          },
-          filters: [
-            {
-              label: "可抢单",
-              value: 1,
-            },
-            {
-              label: "不可接单",
-              value: 2,
-            },
-            {
-              label: "已禁用",
-              value: 3,
-            },
-          ],
-          filterMultiple: false,
-          filterRemote: (e) => {
-            let v = "";
-            if (e.length > 0) {
-              v = e[0];
-            }
-            this.searchForm.workerStatus = v;
-            this.searchForm.pageNumber = 1;
-            this.getDataList();
-          },
-        },
-          {
-              title: "上线状态",
-              key: "isOnLine",
-              minWidth: 160,
-              sortable: true,
-              //fixed: "left",
-              render: (h, params) => {
-                  let re = "",
-                      color = "";
-                  if (params.row.isOnLine == 1) {
-                      re = "上线";
-                      color = "green";
-                  } else if (params.row.isOnLine == 0) {
-                      re = "下线";
-                      color = "#D3D3D3";
-                  }
-                  return h("div", [
-                      h(
-                          "Tag",
-                          {
-                              props: {
-                                  color: color,
-                              },
-                          },
-                          re
-                      ),
-                  ]);
-              },
-              filters: [
-                  {
-                      label: "上线",
-                      value: 1,
-                  },
-                  {
-                      label: "下线",
-                      value: 0,
-                  }
-              ],
-              filterMultiple: false,
-              filterRemote: (e) => {
-                  let v = "";
-                  if (e.length > 0) {
-                      v = e[0];
-                  }
-                  this.searchForm.isOnLine = v;
-                  this.searchForm.pageNumber = 1;
-                  this.getDataList();
-              },
-          },
-        {
-          title: "当次缴纳",
-          key: "depoNum",
-          width: 200,
-          align: "center",
-          hidden: true
-        },
-        {
-          title: "押金余额",
-          key: "depoBal",
-          width: 200,
-          align: "center",
-        },
-        {
-          title: "联系方式",
-          key: "mobile",
-          width: 200,
-          align: "center",
-        },
-        {
-          title: "创建时间",
-          key: "createTime",
-          sortable: true,
-          sortType: "desc",
-          width: 180,
-        },
-        {
-          title: "操作",
-          key: "action",
-          width: 170,
-          align: "center",
-          fixed: "right",
-          render: (h, params) => {
-            let enableOrDisable = "";
-            if (params.row.workerStatus == 1) {
-              enableOrDisable = h(
-                "a",
-                {
-                  on: {
-                    click: () => {
-                      this.disable(params.row);
-                    },
-                  },
-                },
-                "禁用"
-              );
-            } else {
-              enableOrDisable = h(
-                "a",
-                {
-                  on: {
-                    click: () => {
-                      this.enable(params.row);
-                    },
-                  },
-                },
-                "恢复"
-              );
-            }
-              let onOrOffLine = "";
-              if (params.row.isOnLine == 1) {
-                  onOrOffLine = h(
-                      "a",
-                      {
-                          on: {
-                              click: () => {
-                                  this.offLine(params.row);
-                              },
-                          },
-                      },
-                      "下线"
-                  );
-              } else {
-                  onOrOffLine = h(
-                      "a",
-                      {
-                          on: {
-                              click: () => {
-                                  this.onLine(params.row);
-                              },
-                          },
-                      },
-                      "上线"
-                  );
-              }
-            return h("div", [
-              h(
-                "a",
-                {
-                  on: {
-                    click: () => {
-                      this.edit(params.row);
-                    },
-                  },
-                },
-                "编辑"
-              ),
-              h("Divider", {
-                props: {
-                  type: "vertical",
-                },
-              }),
-              onOrOffLine,
-              h("Divider", {
-                  props: {
-                      type: "vertical",
-                  },
-              }),
-              enableOrDisable,
-              h("Divider", {
-                props: {
-                  type: "vertical",
-                },
-              }),
-              h(
-                "a",
-                {
-                  on: {
-                    click: () => {
-                      this.remove(params.row);
-                    },
-                  },
-                },
-                "删除"
-              ),
-            ]);
-          },
-        },
-      ],
-      exportColumns: exportColumn,
-      chooseColumns: [],
-      filename: "快递员数据",
-      exportTitle: "确认导出",
-      exportType: "",
-      importTableData: [],
-      importColumns: [],
-      uploadfile: {
-        name: "",
-      },
-      tempColumns: userColumns,
-      tempData: userData,
-      data: [],
-      exportData: [],
-      total: 0,
-      dictData: [],
-    };
-  },
-  methods: {
-    init() {
-      this.getDataList();
-      // 初始化导出列数据
-      let array = [];
-      this.exportColumns.forEach((e) => {
-        // 指定列限制权限
-        //e.disabled = false;
-        array.push(e.title);
-      });
-      this.chooseColumns = array;
-      
-    },
-    handleSelectDep(v) {
-      this.searchForm.departmentId = v;
-    },
-    changePage(v) {
-      this.searchForm.pageNumber = v;
-      this.getDataList();
-      this.clearSelectAll();
-    },
-    changePageSize(v) {
-      this.searchForm.pageSize = v;
-      this.getDataList();
-    },
-    selectDateRange(v) {
-      if (v) {
-        this.searchForm.startDate = v[0];
-        this.searchForm.endDate = v[1];
-      }
-    },
-    changeTableSize(v) {
-      this.tableSize = v;
-    },
-    getDataList() {
-      // 多条件搜索用户列表
-      this.loading = true;
-      getWorkerListData(this.searchForm).then((res) => {
-        this.loading = false;
-        if (res.success) {
-          this.data = res.result.content;
-          this.total = res.result.totalElements;
-          if (this.data.length == 0 && this.searchForm.pageNumber > 1) {
-            this.searchForm.pageNumber -= 1;
-            this.getDataList();
-          }
-        }
-      });
-    },
-    handleSearch() {
-      this.searchForm.pageNumber = 1;
-      this.searchForm.pageSize = 10;
-      this.getDataList();
-    },
-    handleReset() {
-      this.$refs.searchForm.resetFields();
-      this.searchForm.pageNumber = 1;
-      this.searchForm.pageSize = 10;
-      this.selectDate = null;
-      this.searchForm.startDate = "";
-      this.searchForm.endDate = "";
-      this.$refs.dep.clearSelect();
-      this.searchForm.departmentId = "";
-      // 重新加载数据
-      this.getDataList();
-    },
-    changeSort(e) {
-      this.searchForm.sort = e.key;
-      this.searchForm.order = e.order;
-      if (e.order == "normal") {
-        this.searchForm.order = "";
-      }
-      this.getDataList();
-    },
-    exportCustomData() {
-      if (this.filename == "") {
-        this.filename = "用户数据";
-      }
-      // 判断勾选导出列
-      let exportColumns = [];
-      this.exportColumns.forEach((e) => {
-        this.chooseColumns.forEach((c) => {
-          if (e.title == c && !e.disabled) {
-            exportColumns.push(e);
-          }
-        });
-      });
-      this.exportModalVisible = false;
-      let title = [];
-      let key = [];
-      exportColumns.forEach((e) => {
-        title.push(e.title);
-        key.push(e.key);
-      });
-      const params = {
-        title: title,
-        key: key,
-        data: this.exportData,
-        autoWidth: true,
-        filename: this.filename,
-      };
-      excel.export_array_to_excel(params);
-    },
-    beforeUploadImport(file) {
-      this.uploadfile = file;
-      const fileExt = file.name.split(".").pop().toLocaleLowerCase();
-      if (fileExt == "xlsx" || fileExt == "xls") {
-        this.readFile(file);
-        this.file = file;
-      } else {
-        this.$Notice.warning({
-          title: "文件类型错误",
-          desc:
-            "所选文件‘ " +
-            file.name +
-            " ’不是EXCEL文件，请选择后缀为.xlsx或者.xls的EXCEL文件。",
-        });
-      }
-      return false;
-    },
-    // 读取文件
-    readFile(file) {
-      this.reading = true;
-      const reader = new FileReader();
-      reader.readAsArrayBuffer(file);
-      reader.onerror = (e) => {
-        this.reading = false;
-        this.$Message.error("文件读取出错");
-      };
-      reader.onload = (e) => {
-        const data = e.target.result;
-        const { header, results } = excel.read(data, "array");
-        const tableTitle = header.map((item) => {
-          return { title: item, key: item, minWidth: 130, align: "center" };
-        });
-        this.importTableData = results;
-        this.importColumns = tableTitle;
-        this.reading = false;
-        this.$Message.success("读取数据成功");
-      };
-    },
-    clearImportData() {
-      this.importTableData = [];
-      this.importColumns = [];
-      this.uploadfile = {};
-    },
-    downloadTemple() {
-      let title = [];
-      let key = [];
-      userColumns.forEach((e) => {
-        title.push(e.title);
-        key.push(e.key);
-      });
-      const params = {
-        title: title,
-        key: key,
-        data: userData,
-        autoWidth: true,
-        filename: "导入用户数据模版",
-      };
-      excel.export_array_to_excel(params);
-    },
-    importData() {
-      this.importLoading = true;
-      importUserData(this.importTableData).then((res) => {
-        this.importLoading = false;
-        if (res.success) {
-          this.importModalVisible = false;
-          this.getDataList();
-          this.$Modal.info({
-            title: "导入结果",
-            content: res.message,
-          });
-        }
-      });
-    },
-    showDetail(v) {
-      // 转换null为""
-      for (let attr in v) {
-        if (v[attr] == null) {
-          v[attr] = "";
-        }
-      }
-      let str = JSON.stringify(v);
-      let data = JSON.parse(str);
-      this.form = data;
-      this.showType = "0";
-      this.showWorker = true;
-    },
-    add() {
-      this.showType = "2";
-      this.showWorker = true;
-    },
-    edit(v) {
-      // 转换null为""
-      for (let attr in v) {
-        if (v[attr] == null) {
-          v[attr] = "";
-        }
-      }
-      let str = JSON.stringify(v);
-      let data = JSON.parse(str);
-      this.form = data;
-      this.showType = "1";
-      this.showWorker = true;
-    },
-    enable(v) {
-      this.$Modal.confirm({
-        title: "确认恢复",
-        content: "您确认要恢复快递员 " + v.workerName + " ?",
-        loading: true,
-        onOk: () => {
-          enableWorker(v.workerId).then((res) => {
-            this.$Modal.remove();
-            if (res.success) {
-              this.$Message.success("操作成功");
-              this.getDataList();
-            }
-          });
-        },
-      });
-    },
-    disable(v) {
-      this.$Modal.confirm({
-        title: "确认禁用",
-        content: "您确认要禁用快递员 " + v.workerName + " ?",
-        loading: true,
-        onOk: () => {
-          disableWorker(v.workerId).then((res) => {
-            this.$Modal.remove();
-            if (res.success) {
-              this.$Message.success("操作成功");
-              this.getDataList();
-            }
-          });
-        },
-      });
-    },
-      offLine(v) {
-          this.$Modal.confirm({
-              title: "确认下线",
-              content: "您确认要使抢单工 " + v.workerName + " 下线吗?",
-              loading: true,
-              onOk: () => {
-                  offLineWorker({
-                      id: v.workerId
-                  }).then((res) => {
-                      this.$Modal.remove();
-                      if (res.success) {
-                          this.$Message.success("操作成功");
-                          this.getDataList();
-                      }
-                  });
-              },
-          });
-      },
-      onLine(v) {
-          this.$Modal.confirm({
-              title: "确认上线",
-              content: "您确认要使抢单工 " + v.workerName + " 上线吗?",
-              loading: true,
-              onOk: () => {
-                  onLineWorker({
-                      id: v.workerId
-                  }).then((res) => {
-                      this.$Modal.remove();
-                      if (res.success) {
-                          this.$Message.success("操作成功");
-                          this.getDataList();
-                      }
-                  });
-              },
-          });
-      },
-    remove(v) {
-      this.$Modal.confirm({
-        title: "确认删除",
-        content: "您确认要删除快递员 " + v.workerId + " ?",
-        loading: true,
-        onOk: () => {
-          deleteWorker(v.workerId).then((res) => {
-            this.$Modal.remove();
-            if (res.success) {
-              this.clearSelectAll();
-              this.$Message.success("删除成功");
-              this.getDataList();
-            }
-          });
-        },
-      });
-    },
-    dropDown() {
-      if (this.drop) {
-        this.dropDownContent = "展开";
-        this.dropDownIcon = "ios-arrow-down";
-      } else {
-        this.dropDownContent = "收起";
-        this.dropDownIcon = "ios-arrow-up";
-      }
-      this.drop = !this.drop;
-    },
-    showSelect(e) {
-      this.exportData = e;
-      this.selectList = e;
-    },
-    clearSelectAll() {
-      this.$refs.table.selectAll(false);
-    },
-    delAll() {
-      if (this.selectList.length <= 0) {
-        this.$Message.warning("您还未选择要删除的数据");
-        return;
-      }
-      this.$Modal.confirm({
-        title: "确认删除",
-        content: "您确认要删除所选的 " + this.selectList.length + " 条数据?",
-        loading: true,
-        onOk: () => {
-          let ids = "";
-          this.selectList.forEach(function (e) {
-            ids += e.id + ",";
-          });
-          ids = ids.substring(0, ids.length - 1);
-          deleteWorker({ ids: ids }).then((res) => {
-            this.$Modal.remove();
-            if (res.success) {
-              this.$Message.success("删除成功");
-              this.clearSelectAll();
-              this.getDataList();
-            }
-          });
-        },
-      });
-    },
-  },computed:{
-      colHidden:function (){
-        return this.columns.filter(function(e){
-          return !e.hidden;
-        })
-      }
-  },
-  mounted() {
-    // 计算高度
-    this.height = Number(document.documentElement.clientHeight - 230);
-    this.init();
-  },
-};
+	import {
+		getWorkerListData,
+		enableWorker,
+		disableWorker,
+		deleteWorker,
+		offLineWorker,
+		onLineWorker,
+	} from "@/api/index";
+	import {
+		shortcuts
+	} from "@/libs/shortcuts";
+	// 模版导入文件表数据
+	import {
+		userColumns,
+		userData
+	} from "./importTemplate";
+	// 指定导出列数据
+	import {
+		exportColumn
+	} from "./exportColumn";
+	import excel from "@/libs/excel";
+	import addEdit from "./addEdit.vue";
+	import dict from "@/views/my-components/hiver/dict";
+	export default {
+		name: "Courier",
+		components: {
+			addEdit,
+			dict,
+		},
+		data() {
+			return {
+				tableSize: "default",
+				height: 510,
+				showWorker: false,
+				showType: "0",
+				openSearch: true,
+				openTip: true,
+				loading: true,
+				reading: false,
+				importLoading: false,
+				loadingExport: true,
+				exportModalVisible: false,
+				importModalVisible: false,
+				drop: false,
+				dropDownIcon: "ios-arrow-down",
+				selectList: [],
+				dictDataLine: [{
+					title: "下线",
+					value: 0
+				}, {
+					title: "上线",
+					value: 1
+				}],
+				dictData: [{
+					title: "不接指派",
+					value: 0
+				}, {
+					title: "接指派",
+					value: 1
+				}],
+				searchForm: {
+					region:JSON.parse(this.getStore("user")).departmentId,
+					workerName:'',
+					isOnLine:'', //0：下线；1：上线
+					getPushOrder:'', //0不接指派 1接收
+					pageNum: 1,
+					pageSize: 10
+				},
+				selectDate: null,
+				options: {
+					shortcuts: shortcuts,
+				},
+				form: {},
+				columns: [{
+						type: "selection",
+						width: 60,
+						align: "center",
+						fixed: "left",
+					},
+					{
+						type: "index",
+						width: 60,
+						align: "center",
+						fixed: "left",
+					},
+					{
+						title: "配送员编号",
+						key: "workerId",
+						minWidth: 125,
+					}, 
+					{
+						title: "配送员名称",
+						key: "workerName",
+						minWidth: 125,
+					},
+					{
+						title: "佣金余额",
+						key: "depoBal",
+						minWidth: 125,
+					},
+					{
+						title: "配送员创建时间",
+						key: "createTime",
+						minWidth: 125,
+					},
+					{
+						title: "联系方式",
+						key: "mobile",
+						minWidth: 125,
+					},
+					{
+						title: "接单区域",
+						key: "regionTitle",
+						minWidth: 125,
+					},
+					{
+						title: "描述",
+						key: "remark",
+						minWidth: 125,
+					},
+					{
+						title: "接单状态",
+						key: "workerStatus",
+						minWidth: 160,
+						render: (h, params) => {
+							let re = "",
+								color = "";
+							if (params.row.workerStatus == 1) {
+								re = "可抢单";
+								color = "blue";
+							} else if (params.row.workerStatus == 2) {
+								re = "不可接单";
+								color = "yellow";
+							} else if (params.row.workerStatus == 3) {
+								re = "已禁用";
+								color = "red";
+							}
+							return h("div", [
+								h(
+									"Tag", {
+										props: {
+											color: color,
+										},
+									},
+									re
+								),
+							]);
+						}
+					},
+					{
+						title: "上线状态",
+						key: "isOnLine",
+						minWidth: 160,
+						render: (h, params) => {
+							let re = "",
+								color = "";
+							if (params.row.isOnLine == 1) {
+								re = "上线";
+								color = "green";
+							} else if (params.row.isOnLine == 0) {
+								re = "下线";
+								color = "#D3D3D3";
+							}
+							return h("div", [
+								h(
+									"Tag", {
+										props: {
+											color: color,
+										},
+									},
+									re
+								),
+							]);
+						}
+					},
+					{
+						title: "交易保障金",
+						key: "rebateAmount",
+						width: 200,
+						align: "center"
+					},
+					{
+						title: "手上的待接单订单数",
+						key: "orderWaitCount",
+						width: 200,
+						align: "center",
+					},
+					{
+						title: "手上的待取货订单数",
+						key: "orderGetCount",
+						width: 200,
+						align: "center",
+					},
+					{
+						title: "手上的待送达订单数",
+						key: "orderPutCount",
+						width: 180,
+					},
+					{
+						title: "学生/身份证",
+						key: "cardPicture",
+						width: 180,
+					},
+					{
+						title: "是否接指派",
+						key: "getPushOrder",
+						width: 180,
+					},
+					{
+						title: "评分",
+						key: "score",
+						width: 180,
+					},
+					{
+						title: "平均时长",
+						key: "avgTime",
+						width: 180,
+					},
+					{
+						title: "超出3楼额外费用",
+						key: "highFloorFee",
+						width: 180,
+					},
+					{
+						title: "操作",
+						key: "action",
+						width: 170,
+						align: "center",
+						fixed: "right",
+						render: (h, params) => {
+							let enableOrDisable = "";
+							if (params.row.workerStatus == 1) {
+								enableOrDisable = h(
+									"a", {
+										on: {
+											click: () => {
+												this.disable(params.row);
+											},
+										},
+									},
+									"禁用"
+								);
+							} else {
+								enableOrDisable = h(
+									"a", {
+										on: {
+											click: () => {
+												this.enable(params.row);
+											},
+										},
+									},
+									"恢复"
+								);
+							}
+							let onOrOffLine = "";
+							if (params.row.isOnLine == 1) {
+								onOrOffLine = h(
+									"a", {
+										on: {
+											click: () => {
+												this.offLine(params.row);
+											},
+										},
+									},
+									"下线"
+								);
+							} else {
+								onOrOffLine = h(
+									"a", {
+										on: {
+											click: () => {
+												this.onLine(params.row);
+											},
+										},
+									},
+									"上线"
+								);
+							}
+							return h("div", [
+								h(
+									"a", {
+										on: {
+											click: () => {
+												this.edit(params.row);
+											},
+										},
+									},
+									"编辑"
+								),
+								h("Divider", {
+									props: {
+										type: "vertical",
+									},
+								}),
+								onOrOffLine,
+								h("Divider", {
+									props: {
+										type: "vertical",
+									},
+								}),
+								enableOrDisable,
+								h("Divider", {
+									props: {
+										type: "vertical",
+									},
+								}),
+								h(
+									"a", {
+										on: {
+											click: () => {
+												this.remove(params.row);
+											},
+										},
+									},
+									"查看接单规则"
+								),
+							]);
+						},
+					},
+				],
+				exportColumns: exportColumn,
+				chooseColumns: [],
+				filename: "配送员数据",
+				exportTitle: "确认导出",
+				exportType: "",
+				importTableData: [],
+				importColumns: [],
+				uploadfile: {
+					name: "",
+				},
+				tempColumns: userColumns,
+				tempData: userData,
+				data: [],
+				exportData: [],
+				total: 0,
+			};
+		},
+		methods: {
+			init() {
+				this.getDataList();
+				// 初始化导出列数据
+				let array = [];
+				this.exportColumns.forEach((e) => {
+					// 指定列限制权限
+					//e.disabled = false;
+					array.push(e.title);
+				});
+				this.chooseColumns = array;
+
+			},
+			handleSelectDep(v) {
+				this.searchForm.departmentId = v;
+			},
+			changePage(v) {
+				this.searchForm.pageNumber = v;
+				this.getDataList();
+				this.clearSelectAll();
+			},
+			changePageSize(v) {
+				this.searchForm.pageSize = v;
+				this.getDataList();
+			},
+			checkStatusLine(v){
+				this.searchForm.isOnLine = v
+				console.log(v)
+			},
+			checkStatus(v){
+				this.searchForm.getPushOrder = v
+				console.log(v)
+			},
+			selectDateRange(v) {
+				if (v) {
+					this.searchForm.startDate = v[0];
+					this.searchForm.endDate = v[1];
+				}
+			},
+			changeTableSize(v) {
+				this.tableSize = v;
+			},
+			getDataList() {
+				// 多条件搜索用户列表
+				this.loading = true;
+				getWorkerListData(this.searchForm).then((res) => {
+					this.loading = false;
+					if (res.success) {
+						this.data = res.result.content;
+						this.total = res.result.totalElements;
+						if (this.data.length == 0 && this.searchForm.pageNumber > 1) {
+							this.searchForm.pageNumber -= 1;
+							this.getDataList();
+						}
+					}
+				});
+			},
+			handleSearch() {
+				this.searchForm.pageNumber = 1;
+				this.searchForm.pageSize = 10;
+				this.getDataList();
+			},
+			handleReset() {
+				this.$refs.searchForm.resetFields();
+				this.searchForm.pageNumber = 1;
+				this.searchForm.pageSize = 10;
+				this.selectDate = null;
+				this.searchForm.startDate = "";
+				this.searchForm.endDate = "";
+				this.$refs.dep.clearSelect();
+				this.searchForm.departmentId = "";
+				// 重新加载数据
+				this.getDataList();
+			},
+			changeSort(e) {
+				this.searchForm.sort = e.key;
+				this.searchForm.order = e.order;
+				if (e.order == "normal") {
+					this.searchForm.order = "";
+				}
+				this.getDataList();
+			},
+			exportCustomData() {
+				if (this.filename == "") {
+					this.filename = "用户数据";
+				}
+				// 判断勾选导出列
+				let exportColumns = [];
+				this.exportColumns.forEach((e) => {
+					this.chooseColumns.forEach((c) => {
+						if (e.title == c && !e.disabled) {
+							exportColumns.push(e);
+						}
+					});
+				});
+				this.exportModalVisible = false;
+				let title = [];
+				let key = [];
+				exportColumns.forEach((e) => {
+					title.push(e.title);
+					key.push(e.key);
+				});
+				const params = {
+					title: title,
+					key: key,
+					data: this.exportData,
+					autoWidth: true,
+					filename: this.filename,
+				};
+				excel.export_array_to_excel(params);
+			},
+			
+			showDetail(v) {
+				// 转换null为""
+				for (let attr in v) {
+					if (v[attr] == null) {
+						v[attr] = "";
+					}
+				}
+				let str = JSON.stringify(v);
+				let data = JSON.parse(str);
+				this.form = data;
+				this.showType = "0";
+				this.showWorker = true;
+			},
+			add() {
+				this.showType = "2";
+				this.showWorker = true;
+			},
+			edit(v) {
+				// 转换null为""
+				for (let attr in v) {
+					if (v[attr] == null) {
+						v[attr] = "";
+					}
+				}
+				let str = JSON.stringify(v);
+				let data = JSON.parse(str);
+				this.form = data;
+				this.showType = "1";
+				this.showWorker = true;
+			},
+			enable(v) {
+				this.$Modal.confirm({
+					title: "确认恢复",
+					content: "您确认要恢复配送员 " + v.workerName + " ?",
+					loading: true,
+					onOk: () => {
+						enableWorker(v.workerId).then((res) => {
+							this.$Modal.remove();
+							if (res.success) {
+								this.$Message.success("操作成功");
+								this.getDataList();
+							}
+						});
+					},
+				});
+			},
+			disable(v) {
+				this.$Modal.confirm({
+					title: "确认禁用",
+					content: "您确认要禁用配送员 " + v.workerName + " ?",
+					loading: true,
+					onOk: () => {
+						disableWorker(v.workerId).then((res) => {
+							this.$Modal.remove();
+							if (res.success) {
+								this.$Message.success("操作成功");
+								this.getDataList();
+							}
+						});
+					},
+				});
+			},
+			offLine(v) {
+				this.$Modal.confirm({
+					title: "确认下线",
+					content: "您确认要使配送员 " + v.workerName + " 下线吗?",
+					loading: true,
+					onOk: () => {
+						offLineWorker({
+							id: v.workerId
+						}).then((res) => {
+							this.$Modal.remove();
+							if (res.success) {
+								this.$Message.success("操作成功");
+								this.getDataList();
+							}
+						});
+					},
+				});
+			},
+			onLine(v) {
+				this.$Modal.confirm({
+					title: "确认上线",
+					content: "您确认要使配送员 " + v.workerName + " 上线吗?",
+					loading: true,
+					onOk: () => {
+						onLineWorker({
+							id: v.workerId
+						}).then((res) => {
+							this.$Modal.remove();
+							if (res.success) {
+								this.$Message.success("操作成功");
+								this.getDataList();
+							}
+						});
+					},
+				});
+			},
+			remove(v) {
+				this.$Modal.confirm({
+					title: "确认删除",
+					content: "您确认要删除配送员 " + v.workerId + " ?",
+					loading: true,
+					onOk: () => {
+						deleteWorker(v.workerId).then((res) => {
+							this.$Modal.remove();
+							if (res.success) {
+								this.clearSelectAll();
+								this.$Message.success("删除成功");
+								this.getDataList();
+							}
+						});
+					},
+				});
+			},
+			showSelect(e) {
+				this.exportData = e;
+				this.selectList = e;
+			},
+			clearSelectAll() {
+				this.$refs.table.selectAll(false);
+			},
+			delAll() {
+				if (this.selectList.length <= 0) {
+					this.$Message.warning("您还未选择要删除的数据");
+					return;
+				}
+				this.$Modal.confirm({
+					title: "确认删除",
+					content: "您确认要删除所选的 " + this.selectList.length + " 条数据?",
+					loading: true,
+					onOk: () => {
+						let ids = "";
+						this.selectList.forEach(function(e) {
+							ids += e.id + ",";
+						});
+						ids = ids.substring(0, ids.length - 1);
+						deleteWorker({
+							ids: ids
+						}).then((res) => {
+							this.$Modal.remove();
+							if (res.success) {
+								this.$Message.success("删除成功");
+								this.clearSelectAll();
+								this.getDataList();
+							}
+						});
+					},
+				});
+			},
+		},
+		computed: {
+			colHidden: function() {
+				return this.columns.filter(function(e) {
+					return !e.hidden;
+				})
+			}
+		},
+		mounted() {
+			// 计算高度
+			this.height = Number(document.documentElement.clientHeight - 230);
+			this.init();
+		},
+	};
 </script>
\ No newline at end of file
diff --git a/src/views/app/business/logistics/logistics.vue b/src/views/app/business/logistics/logistics.vue
index 8989bf7..a050896 100644
--- a/src/views/app/business/logistics/logistics.vue
+++ b/src/views/app/business/logistics/logistics.vue
@@ -10,15 +10,20 @@
 				<TabPane label="快递订单" name="2"></TabPane>
 				<TabPane label="跑腿订单" name="3"></TabPane>
 			</Tabs>
-			<Tabs v-model="tabName" :animated="false" @on-click="changeTab">
-				<TabPane label="指派单" name="7"></TabPane>
+			<Tabs v-model="tabName1" :animated="false" @on-click="changeTab">
+				<TabPane label="全部" name="10"></TabPane>
+				<TabPane label="待支付" name=""></TabPane>
+				<TabPane label="待成团" name=""></TabPane>
+				<TabPane label="待消费" name=""></TabPane>
 				<TabPane label="待接单" name="0"></TabPane>
 				<TabPane label="待取货" name="1"></TabPane>
 				<TabPane label="待送达" name="2"></TabPane>
-				<TabPane label="已完成" name="3"></TabPane>
-				<TabPane label="已取消" name="4"></TabPane>
-				<TabPane label="已退款" name="5"></TabPane>
-				<TabPane label="预订单" name="6"></TabPane>
+				<TabPane label="已完成" name=""></TabPane>
+				<TabPane label="待退款" name=""></TabPane>
+				<TabPane label="已退款" name=""></TabPane>
+				<TabPane label="已取消" name=""></TabPane>
+				<TabPane label="售后中" name=""></TabPane>
+				<TabPane label="已售后" name=""></TabPane>
 			</Tabs>
 			<Row v-show="openSearch" @keydown.enter.native="handleSearch">
 				<Form ref="searchForm" :model="searchForm" inline :label-width="70">
@@ -39,7 +44,7 @@
 			<Row align="middle" justify="space-between" class="operation">
 				<div class="icons">
 					<Tooltip content="刷新" placement="top" transfer>
-						<Icon type="md-refresh" size="18" class="item" @click="getDataList" />
+						<Icon type="md-refresh" size="18" class="item" @click="getLogisticsInfo" />
 					</Tooltip>
 					<Tooltip :content="openSearch ? '关闭搜索' : '开启搜索'" placement="top" transfer>
 						<Icon type="ios-search" size="18" class="item tip" @click="openSearch = !openSearch" />
@@ -72,21 +77,6 @@
 					size="small" show-total show-elevator show-sizer></Page>
 			</Row>
 		</Card>
-
-		<!-- 自定义导出数据 -->
-		<Modal v-model="exportModalVisible" :title="exportTitle" :loading="loadingExport" @on-ok="exportCustomData">
-			<Form ref="exportForm" :label-width="100">
-				<FormItem label="导出文件名">
-					<Input v-model="filename" />
-				</FormItem>
-				<FormItem label="自定义导出列">
-					<CheckboxGroup v-model="chooseColumns">
-						<Checkbox v-for="(item, i) in exportColumns" :label="item.title" :key="i" :value="item.checked"
-							:disabled="item.disabled"></Checkbox>
-					</CheckboxGroup>
-				</FormItem>
-			</Form>
-		</Modal>
 		<!-- 转单弹窗 -->
 		<Modal v-model="transferOrder" @on-ok="transferClose" :width="1065">
 			<Table :loading="loading" border :columns="workerList" :data="transferList" :size="tableSize"
@@ -104,68 +94,20 @@
 				<Button type="text" @click="Visiable = false">关闭</Button>
 			</div>
 		</Modal>
-		<!-- 导入数据 -->
-		<Drawer title="导入数据" closable v-model="importModalVisible" width="800" draggable>
-			<div style="
-          display: flex;
-          justify-content: space-between;
-          align-items: center;
-        ">
-				<Upload action :before-upload="beforeUploadImport" accept=".xls, .xlsx">
-					<Button :loading="reading" icon="ios-cloud-upload-outline"
-						style="margin-right: 10px">上传Excel文件</Button>
-					<span v-if="uploadfile.name">当前选择文件：{{ uploadfile.name }}</span>
-				</Upload>
-				<Button @click="clearImportData" icon="md-trash">清空数据</Button>
-			</div>
-			<Alert type="warning" show-icon>导入前请下载查看导入模版数据文件查看所需字段及说明，确保数据格式正确，不得修改列英文名称</Alert>
-			<Table :columns="importColumns" border :height="height" :data="importTableData" ref="importTable"></Table>
-			<div class="drawer-footer">
-				<Button @click="downloadTemple" type="info">下载导入模板</Button>
-				<div style="position: absolute; right: 15px; display: inline-block">
-					<Button @click="importModalVisible = false">关闭</Button>
-					<Button :loading="importLoading" :disabled="importTableData.length <= 0" @click="importData"
-						style="margin-left: 8px" type="primary">
-						确认导入
-						<span v-if="importTableData.length > 0">{{ importTableData.length }} 条数据</span>
-					</Button>
-				</div>
-			</div>
-		</Drawer>
-
-		<addEdit :data="form" :type="showType" v-model="showOrder" @on-submit="getDataList" />
+		<addEdit :data="form" :type="showType" v-model="showOrder" @on-submit="getLogisticsInfo" />
 	</div>
 </template>
 
 <script>
 	import {
-		getOwListData,
-		getConditionList,
+		orderScheduling,
 		getWorkerListData,
 		transferOrder,
 		runshOrder,
 		enableUser,
-		getSaleByCompanyId,
 		disableUser,
 		deleteOrder,
-		getAllUserData,
-		importUserData,
-		resetUserPass,
-		getDictDataByType,
-		unbindOrder,
 	} from "@/api/index";
-	import {
-		shortcuts
-	} from "@/libs/shortcuts";
-	// 模版导入文件表数据
-	import {
-		userColumns,
-		userData
-	} from "./importTemplate";
-	// 指定导出列数据
-	import {
-		exportColumn
-	} from "./exportColumn";
 	import excel from "@/libs/excel";
 	import addEdit from "./addEdit.vue";
 	import dict from "@/views/my-components/hiver/dict";
@@ -208,25 +150,14 @@
 				},
 				searchForm: {
 					deliveryType: 1,
-					getAreaId: "",
-					hallOnly: true,
-					kuaidiData: [],
 					order: "",
 					pageNum: 1,
-					pageSize: '10',
-					putAreaId: "",
-					regionId: "",
-					status: 0,
-					waimaiData: [],
-					workerId: ""
+					pageSize: 10,
+					regionId: JSON.parse(this.getStore("user")).departmentId,
+					status: 0
 				},
 				selectDate: null,
-				options: {
-					shortcuts: shortcuts,
-				},
 				form: {},
-				// {{item.isOnLine==0?'离线':'在线'}}
-				// {{item.signPerson==1?'拉包工':'快递员'}}
 				workerList: [{
 					type: "index",
 					width: 60,
@@ -422,7 +353,6 @@
 						},
 					},
 				],
-				exportColumns: exportColumn,
 				chooseColumns: [],
 				filename: "订单数据",
 				exportTitle: "确认导出",
@@ -432,8 +362,6 @@
 				uploadfile: {
 					name: "",
 				},
-				tempColumns: userColumns,
-				tempData: userData,
 				data: [],
 				exportData: [],
 				total: 0,
@@ -444,16 +372,7 @@
 		},
 		methods: {
 			init() {
-				this.getDataList();
-				// 初始化导出列数据
-				let array = [];
-				this.exportColumns.forEach((e) => {
-					// 指定列限制权限
-					//e.disabled = false;
-					array.push(e.title);
-				});
-				this.chooseColumns = array;
-
+				this.getLogisticsInfo();
 			},
 			//点击页面转单-->点击弹窗转单
 			goTransferOrder(item) {
@@ -474,7 +393,7 @@
 							if (res.success) {
 								this.$Message.success("转单成功");
 								this.transferOrder = false
-								this.getDataList()
+								this.getLogisticsInfo()
 							}
 						});
 					}
@@ -487,16 +406,16 @@
 			changeOrderTab() {
 				this.searchForm.pageNum = 1;
 				this.searchForm.deliveryType = v;
-				this.getDataList();
+				this.getLogisticsInfo();
 			},
 			changeTab(v) {
 				this.searchForm.pageNum = 1;
 				this.searchForm.status = v;
-				this.getDataList();
+				this.getLogisticsInfo();
 			},
 			changePage(v) {
 				this.searchForm.pageNum = v;
-				this.getDataList();
+				this.getLogisticsInfo();
 				this.clearSelectAll();
 			},
 			changeWorkerPage(v) {
@@ -505,7 +424,7 @@
 			},
 			changePageSize(v) {
 				this.searchForm.pageSize = v;
-				this.getDataList();
+				this.getLogisticsInfo();
 			},
 			changeWorkerPageSize(v) {
 				this.searchWorker.pageSize = v;
@@ -526,17 +445,15 @@
 
 				return diffInMinutes;
 			},
-			getDataList() {
-				this.loading = true;
-				// 多条件搜索订单列表
-				getOwListData(this.searchForm).then((res) => {
+			//查询订单
+			getLogisticsInfo() {
+				orderScheduling(this.searchForm).then((res) => {
 					this.loading = false;
 					if (res.success) {
-						this.data = res.result.records;
+						this.data = res.result.records
 						this.total = res.result.total;
 					}
 				});
-
 			},
 			transferClose() {
 				this.transferOrder = false
@@ -544,7 +461,7 @@
 			handleSearch() {
 				this.searchForm.pageNum = 1;
 				this.searchForm.pageSize = 10;
-				this.getDataList();
+				this.getLogisticsInfo();
 			},
 			handleReset() {
 				this.$refs.searchForm.resetFields();
@@ -556,7 +473,7 @@
 				this.$refs.dep.clearSelect();
 				this.searchForm.departmentId = "";
 				// 重新加载数据
-				this.getDataList();
+				this.getLogisticsInfo();
 			},
 			changeSort(e) {
 				this.searchForm.sort = e.key;
@@ -564,117 +481,14 @@
 				if (e.order == "normal") {
 					this.searchForm.order = "";
 				}
-				this.getDataList();
-			},
-			exportCustomData() {
-				if (this.filename == "") {
-					this.filename = "用户数据";
-				}
-				// 判断勾选导出列
-				let exportColumns = [];
-				this.exportColumns.forEach((e) => {
-					this.chooseColumns.forEach((c) => {
-						if (e.title == c && !e.disabled) {
-							exportColumns.push(e);
-						}
-					});
-				});
-				this.exportModalVisible = false;
-				let title = [];
-				let key = [];
-				exportColumns.forEach((e) => {
-					title.push(e.title);
-					key.push(e.key);
-				});
-				const params = {
-					title: title,
-					key: key,
-					data: this.exportData,
-					autoWidth: true,
-					filename: this.filename,
-				};
-				excel.export_array_to_excel(params);
-			},
-			beforeUploadImport(file) {
-				this.uploadfile = file;
-				const fileExt = file.name.split(".").pop().toLocaleLowerCase();
-				if (fileExt == "xlsx" || fileExt == "xls") {
-					this.readFile(file);
-					this.file = file;
-				} else {
-					this.$Notice.warning({
-						title: "文件类型错误",
-						desc: "所选文件‘ " +
-							file.name +
-							" ’不是EXCEL文件，请选择后缀为.xlsx或者.xls的EXCEL文件。",
-					});
-				}
-				return false;
-			},
-			// 读取文件
-			readFile(file) {
-				this.reading = true;
-				const reader = new FileReader();
-				reader.readAsArrayBuffer(file);
-				reader.onerror = (e) => {
-					this.reading = false;
-					this.$Message.error("文件读取出错");
-				};
-				reader.onload = (e) => {
-					const data = e.target.result;
-					const {
-						header,
-						results
-					} = excel.read(data, "array");
-					const tableTitle = header.map((item) => {
-						return {
-							title: item,
-							key: item,
-							minWidth: 130,
-							align: "center"
-						};
-					});
-					this.importTableData = results;
-					this.importColumns = tableTitle;
-					this.reading = false;
-					this.$Message.success("读取数据成功");
-				};
+				this.getLogisticsInfo();
 			},
 			clearImportData() {
 				this.importTableData = [];
 				this.importColumns = [];
 				this.uploadfile = {};
 			},
-			downloadTemple() {
-				let title = [];
-				let key = [];
-				userColumns.forEach((e) => {
-					title.push(e.title);
-					key.push(e.key);
-				});
-				const params = {
-					title: title,
-					key: key,
-					data: userData,
-					autoWidth: true,
-					filename: "导入用户数据模版",
-				};
-				excel.export_array_to_excel(params);
-			},
-			importData() {
-				this.importLoading = true;
-				importUserData(this.importTableData).then((res) => {
-					this.importLoading = false;
-					if (res.success) {
-						this.importModalVisible = false;
-						this.getDataList();
-						this.$Modal.info({
-							title: "导入结果",
-							content: res.message,
-						});
-					}
-				});
-			},
+			
 			showDetail(v) {
 				// 转换null为""
 				for (let attr in v) {
@@ -715,7 +529,7 @@
 							this.$Modal.remove();
 							if (res.success) {
 								this.$Message.success("操作成功");
-								this.getDataList();
+								this.getLogisticsInfo();
 							}
 						});
 					},
@@ -731,7 +545,7 @@
 							this.$Modal.remove();
 							if (res.success) {
 								this.$Message.success("操作成功");
-								this.getDataList();
+								this.getLogisticsInfo();
 							}
 						});
 					},
@@ -750,7 +564,7 @@
 							if (res.success) {
 								this.clearSelectAll();
 								this.$Message.success("删除成功");
-								this.getDataList();
+								this.getLogisticsInfo();
 							}
 						});
 					},
@@ -825,7 +639,7 @@
 							if (res.success) {
 								this.$Message.success("删除成功");
 								this.clearSelectAll();
-								this.getDataList();
+								this.getLogisticsInfo();
 							}
 						});
 					},
@@ -833,8 +647,6 @@
 			},
 		},
 		mounted() {
-			// 计算高度
-			this.height = Number(document.documentElement.clientHeight - 230);
 			this.init();
 		},
 	};
diff --git a/src/views/sys/order-manage/orderManage.vue b/src/views/sys/order-manage/orderManage.vue
index 4a35610..86bbeec 100644
--- a/src/views/sys/order-manage/orderManage.vue
+++ b/src/views/sys/order-manage/orderManage.vue
@@ -6,49 +6,35 @@
 	<div class="search">
 		<Card>
 			<Tabs v-model="tabName" :animated="false" @on-click="changeOrderTab">
-				<TabPane label="指派单" name="7"></TabPane>
-				<TabPane label="待接单" name="0"></TabPane>
-				<TabPane label="待取货" name="1"></TabPane>
-				<TabPane label="待送达" name="2"></TabPane>
-				<TabPane label="已完成" name="3"></TabPane>
-				<TabPane label="已取消" name="4"></TabPane>
-				<TabPane label="已退款" name="5"></TabPane>
-				<TabPane label="预订单" name="6"></TabPane>
+				<TabPane label="饭团订单" name="1"></TabPane>
+				<TabPane label="快递订单" name="2"></TabPane>
+				<TabPane label="跑腿订单" name="3"></TabPane>
+			</Tabs>
+			<Tabs v-model="tabName1" :animated="false" @on-click="changeTab">
+				<TabPane label="全部" name="10"></TabPane>
+				<TabPane label="待支付" name="0"></TabPane>
+				<TabPane label="待成团" name="1"></TabPane>
+				<TabPane label="待消费" name="2"></TabPane>
+				<TabPane label="待接单" name="3"></TabPane>
+				<TabPane label="待取货" name="4"></TabPane>
+				<TabPane label="待送达" name="5"></TabPane>
+				<TabPane label="已完成" name="6"></TabPane>
+				<TabPane label="待退款" name="7"></TabPane>
+				<TabPane label="已退款" name="8"></TabPane>
+				<TabPane label="已取消" name="9"></TabPane>
+				<TabPane label="售后中" name="11"></TabPane>
+				<TabPane label="已售后" name="12"></TabPane>
 			</Tabs>
 			<Row v-show="openSearch" @keydown.enter.native="handleSearch">
-				<Form ref="searchForm" :model="searchForm" inline :label-width="70">
-					<FormItem label="状态" prop="orderId">
-						<Select ref="dep" @on-change="checkStatus" clearable="true">
-							<Option v-for="(item, i) in dictData" :key="i" :value="item.value">{{
-						    item.title
-						  }}</Option>
-						</Select>
-
-					</FormItem>
-					<FormItem label="名称" prop="orderLogistics">
-						<Input type="text" v-model="searchForm.searchStr" clearable placeholder="请输入收发货人名称"
+				<Form ref="searchForm" :model="searchForm" inline :label-width="100">
+					
+					<FormItem label="店铺名称" prop="orderLogistics">
+						<Input type="text" v-model="searchForm.shopName" clearable placeholder="请输入店铺名称"
 							style="width: 200px" />
 					</FormItem>
-					<FormItem label="收货人id" prop="kdOrderId1">
-
-						<Select v-model="shou" clearable='false' @on-clear="clearShou=true" filterable
-							:remote-method="getShouValue" :loading="loading1" placeholder="请选择或输入添加">
-							<Option v-for="item in shouList" :value="item.id" :key="item.username"
-								:label="item.shipperOrReceiverName" @on-change="checkShouValue(item)">
-								<span style="margin-right: 10px">{{ item.shipperOrReceiverName }}</span>
-								<span style="color: #ccc">{{ item.mobile }}</span>
-							</Option>
-						</Select>
-					</FormItem>
-					<FormItem label="发货人id" prop="kdOrderId">
-						<Select v-model="fa" clearable='false' filterable @on-clear="searchForm.shipperId =''"
-							:remote-method="getFaValue" :loading="loading2" placeholder="请选择或输入添加">
-							<Option v-for="item in faList" @on-change="checkFaValue(item)" :value="item.id"
-								:key="item.mobile" :label="item.shipperOrReceiverName">
-								<span style="margin-right: 10px">{{ item.shipperOrReceiverName }}</span>
-								<span style="color: #ccc">{{ item.mobile }}</span>
-							</Option>
-						</Select>
+					<FormItem label="收货人手机号" prop="kdOrderId1">
+						<Input type="text" v-model="searchForm.receiverPhone" clearable placeholder="请输入店铺名称"
+							style="width: 200px" />
 					</FormItem>
 					<FormItem style="margin-left: -35px" class="br">
 						<Button @click="handleSearch" type="primary" icon="ios-search">搜索</Button>
@@ -59,7 +45,7 @@
 			<Row align="middle" justify="space-between" class="operation">
 				<div class="icons">
 					<Tooltip content="刷新" placement="top" transfer>
-						<Icon type="md-refresh" size="18" class="item" @click="getDataList" />
+						<Icon type="md-refresh" size="18" class="item" @click="getLogisticsInfo" />
 					</Tooltip>
 					<Tooltip :content="openSearch ? '关闭搜索' : '开启搜索'" placement="top" transfer>
 						<Icon type="ios-search" size="18" class="item tip" @click="openSearch = !openSearch" />
@@ -99,119 +85,32 @@
 				<Button type="text" @click="Visiable = false">关闭</Button>
 			</div>
 		</Modal>
-		<!-- 自定义导出数据 -->
-		<Modal v-model="exportModalVisible" :title="exportTitle" :loading="loadingExport" @on-ok="exportCustomData">
-			<Form ref="exportForm" :label-width="100">
-				<FormItem label="导出文件名">
-					<Input v-model="filename" />
-				</FormItem>
-				<FormItem label="自定义导出列">
-					<CheckboxGroup v-model="chooseColumns">
-						<Checkbox v-for="(item, i) in exportColumns" :label="item.title" :key="i" :value="item.checked"
-							:disabled="item.disabled"></Checkbox>
-					</CheckboxGroup>
-				</FormItem>
-			</Form>
-		</Modal>
-		<!-- 导入数据 -->
-		<Drawer title="导入数据" closable v-model="importModalVisible" width="800" draggable>
-			<div style="
-          display: flex;
-          justify-content: space-between;
-          align-items: center;
-        ">
-				<Upload action :before-upload="beforeUploadImport" accept=".xls, .xlsx">
-					<Button :loading="reading" icon="ios-cloud-upload-outline"
-						style="margin-right: 10px">上传Excel文件</Button>
-					<span v-if="uploadfile.name">当前选择文件：{{ uploadfile.name }}</span>
-				</Upload>
-				<Button @click="clearImportData" icon="md-trash">清空数据</Button>
-			</div>
-			<Alert type="warning" show-icon>导入前请下载查看导入模版数据文件查看所需字段及说明，确保数据格式正确，不得修改列英文名称</Alert>
-			<Table :columns="importColumns" border :height="height" :data="importTableData" ref="importTable"></Table>
-			<div class="drawer-footer">
-				<Button @click="downloadTemple" type="info">下载导入模板</Button>
-				<div style="position: absolute; right: 15px; display: inline-block">
-					<Button @click="importModalVisible = false">关闭</Button>
-					<Button :loading="importLoading" :disabled="importTableData.length <= 0" @click="importData"
-						style="margin-left: 8px" type="primary">
-						确认导入
-						<span v-if="importTableData.length > 0">{{ importTableData.length }} 条数据</span>
-					</Button>
-				</div>
-			</div>
-		</Drawer>
 
-		<addEdit :data="form" :type="showType" v-model="showOrder" @on-submit="getDataList" />
+		<addEdit :data="form" :type="showType" v-model="showOrder" @on-submit="getLogisticsInfo" />
 	</div>
 </template>
 
 <script>
 	import {
-		getLogisticsOrderPageList,
-		getLogisticsOrderStatistics,
-		batchUpdateOrderStatus,
-		getOrderList,
-		enableUser,
-		getLogisticsAddressBookPageList,
-		disableUser,
-		deleteOrder,
-		getAllUserData,
-		importUserData,
-		resetUserPass,
-		getDictDataByType,
+		getOrderList
 	} from "@/api/index";
-	import {
-		getAllLogiticsCompanyData,
-		getLogiticsCompanyData,
-	} from "@/api/app";
-	import {
-		shortcuts
-	} from "@/libs/shortcuts";
-	// 模版导入文件表数据
-	import {
-		userColumns,
-		userData
-	} from "./importTemplate";
-	// 指定导出列数据
-	import {
-		exportColumn
-	} from "./exportColumn";
-	import excel from "@/libs/excel";
 	import addEdit from "./addEdit.vue";
-	import dict from "@/views/my-components/hiver/dict";
 	import logisticsAddress from "@/views/sys/order-manage/logisticsAddress";
 	export default {
 		name: "order-manage",
 		components: {
 			addEdit,
-			dict,
 			logisticsAddress,
 		},
 		data() {
 			return {
 				tableSize: "default",
 				Visiable: false,
-				height: 510,
-				loading1: false,
-				loading2: false,
 				showOrder: false,
-				clearShou: false,
-				clearFa: false,
-				shouList: [],
-				shou: '',
-				fa: '',
-				faList: [],
-				orderStatistics: {},
 				showType: "0",
 				openSearch: true,
 				openTip: true,
 				loading: true,
-				reading: false,
-				importLoading: false,
-				loadingExport: true,
-				exportModalVisible: false,
-				importModalVisible: false,
 				drop: false,
 				dropDownContent: "展开",
 				dropDownIcon: "ios-arrow-down",
@@ -219,15 +118,13 @@
 				searchForm: {
 					pageNum: 1,
 					pageSize: 10,
-					regionId: "",
+					regionId: JSON.parse(this.getStore("user")).departmentId,
 					searchType: 0,
+					searchStatus:0,
 					shopName: "",
+					mobile:'',
 					userId: ""
 				},
-				selectDate: null,
-				options: {
-					shortcuts: shortcuts,
-				},
 				form: {},
 				columns: [{
 						type: "index",
@@ -238,13 +135,13 @@
 					{
 						title: "订单编号",
 						key: "id",
-						width: 150,
+						width: 200,
 						align: "center",
 					},
 					{
 						title: "用户账号",
 						key: "receiverPhone",
-						width: 150,
+						width: 130,
 						align: "center",
 					},
 					{
@@ -262,7 +159,7 @@
 					{
 						title: "订单总金额",
 						key: "totalAmount",
-						width: 160,
+						width: 130,
 						align: "center",
 					},
 					{
@@ -280,14 +177,52 @@
 					{
 						title: "完成支付时间",
 						key: "createTime",
-						width: 150,
+						width: 170,
 						align: "center",
+						render: (h, params) => {
+							return h(
+								"div",
+								this.formatDateTime(params.row.createTime)
+							);
+						}
 					},
 					{
 						title: "订单状态",
 						key: "status",
-						width: 200,
+						width: 130,
 						align: "center",
+						render: (h, params) => {
+							let re = ""
+							if (params.row.status == 0) {
+								re = "待支付";
+							} else if (params.row.status == 1) {
+								re = "待成团";
+							} else if (params.row.status == 2) {
+								re = "待消费";
+							} else if (params.row.status == 3) {
+								re = "待接单";
+							} else if (params.row.status == 4) {
+								re = "待取货";
+							} else if (params.row.status == 5) {
+								re = "待送达";
+							} else if (params.row.status == 6) {
+								re = "已完成";
+							} else if (params.row.status == 7) {
+								re = "待退款";
+							} else if (params.row.status == 8) {
+								re = "已退款";
+							} else if (params.row.status == 9) {
+								re = "已取消";
+							} else if (params.row.status == 11) {
+								re = "售后中";
+							} else if (params.row.status == 12) {
+								re = "已售后";
+							}
+							return h(
+								"div",
+								re
+							);
+						}
 					},
 					{
 						title: "操作",
@@ -311,34 +246,8 @@
 						},
 					},
 				],
-				exportColumns: exportColumn,
-				chooseColumns: [],
-				filename: "订单数据",
-				exportTitle: "确认导出",
-				exportType: "",
-				importTableData: [],
-				importColumns: [],
-				uploadfile: {
-					name: "",
-				},
-				tempColumns: userColumns,
-				tempData: userData,
 				data: [],
-				exportData: [],
 				total: 0,
-				dictData: [{
-					title: "全部",
-					value: ""
-				}, {
-					title: "已付",
-					value: 0
-				}, {
-					title: "未付",
-					value: 1
-				}, {
-					title: "挂单",
-					value: 2
-				}],
 			};
 		},
 		computed: {
@@ -349,55 +258,22 @@
 			}
 		},
 		mounted() {
-			// 计算高度
-			this.height = Number(document.documentElement.clientHeight - 230);
-
 			this.init();
 		},
 		methods: {
 			init() {
 				this.getLogisticsInfo()
-				// 初始化导出列数据
-				let array = [];
-				this.exportColumns.forEach((e) => {
-					// 指定列限制权限
-					//e.disabled = false;
-					array.push(e.title);
-				});
-				this.chooseColumns = array;
-
 			},
-			checkOrderStatus(v, status) {
-				let listStr = ''
-				if (v == '') {
-
-					console.log('selectList', this.selectList)
-					for (let i = 0; i < this.selectList.length; i++) {
-						if (this.selectList.length != (i + 1)) {
-							listStr += this.selectList[i].id + ','
-						} else {
-							listStr += this.selectList[i].id
-						}
-					}
-				}
-
-				this.$Modal.confirm({
-					title: "确认更改",
-					content: "您确认要更改此条数据吗?",
-					loading: true,
-					onOk: () => {
-						batchUpdateOrderStatus({
-							orderIds: v == '' ? listStr : v.id,
-							status: status
-						}).then((res) => {
-							this.$Modal.remove();
-							if (res.success) {
-								this.$Message.success("修改成功");
-								this.getDataList();
-							}
-						});
-					},
-				});
+			formatDateTime(isoString) {
+				if (!isoString) return ''
+				const date = new Date(isoString)
+				const year = date.getFullYear()
+				const month = String(date.getMonth() + 1).padStart(2, '0')
+				const day = String(date.getDate()).padStart(2, '0')
+				const hours = String(date.getHours()).padStart(2, '0')
+				const minutes = String(date.getMinutes()).padStart(2, '0')
+				const seconds = String(date.getSeconds()).padStart(2, '0')
+				return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`
 			},
 			getMonth() {
 				let date = new Date()
@@ -408,96 +284,31 @@
 				let single = year + '-' + month + '-' + da //当天
 				return single
 			},
+			//订单状态切换2
+			changeTab(v) {
+				this.searchForm.pageNum = 1;
+				this.searchForm.searchStatus = v;
+				this.getLogisticsInfo();
+			},
+			//订单状态切换1
+			changeOrderTab(v){
+				console.log(v)
+				this.searchForm.pageNum = 1;
+				this.searchForm.searchType = v
+				this.getLogisticsInfo()
+			},
 			checkStatus(v) {
 				console.log('下拉框选择', v)
 				this.searchForm.orderStatus = v
 			},
-			handleDropdown(name) {
-				if (name == "exportData") {
-					if (this.selectList.length <= 0) {
-						this.$Message.warning("您还未选择要导出的数据");
-						return;
-					}
-					this.exportType = "part";
-					this.exportModalVisible = true;
-					for (let i = 0; i < this.selectList.length; i++) {
-						// this.selectList[i].orderStatus = this.selectList[i].orderStatus == 0 ? '已付' : this.selectList[i]
-						// 	.orderStatus == 1 ? '未付' : this.selectList[i].orderStatus == 2 ? '挂单' : ""
-						if (this.selectList[i].methodOfSettlement == 0) { //现金
-							this.selectList[i].xianjin = this.selectList[i].allCost
-							this.selectList[i].yuefu = ""
-						} else if (this.selectList[i].methodOfSettlement == 1) {
-							this.selectList[i].xianjin = ""
-							this.selectList[i].yuefu = this.selectList[i].allCost
-						}
-						// this.selectList[i].methodOfSettlement = this.selectList[i].methodOfSettlement == 0 ? '现金' : this
-						// 	.selectList[i].methodOfSettlement == 1 ? '月付' : this.selectList[i].methodOfSettlement == 2 ?
-						// 	'提付' : ""
-
-					}
-					this.exportTitle = "确认导出 " + this.selectList.length + " 条数据";
-				} else if (name == "exportAll") {
-					this.exportType = "all";
-					this.exportModalVisible = true;
-					this.exportTitle = "确认导出全部 " + this.total + " 条数据";
-					this.searchForm.pageSize = 10000
-					getLogisticsOrderPageList(this.searchForm).then((res) => {
-						this.loading = false;
-						if (res.success) {
-							for (let i = 0; i < res.result.records.length; i++) {
-								// res.result.records[i].orderStatus = res.result.records[i].orderStatus == 0 ? '已付' :
-								// 	res.result.records[i].orderStatus == 1 ? '未付' : res.result.records[i]
-								// 	.orderStatus == 2 ? '挂单' : ""
-								if (res.result.records[i].methodOfSettlement == 0) { //现金
-									res.result.records[i].xianjin = res.result.records[i].allCost
-									res.result.records[i].yuefu = ""
-								} else if (res.result.records[i].methodOfSettlement == 1) {
-									res.result.records[i].xianjin = ""
-									res.result.records[i].yuefu = res.result.records[i].allCost
-								}
-								// res.result.records[i].methodOfSettlement = res.result.records[i]
-								// 	.methodOfSettlement == 0 ? '现金' : res.result.records[i].methodOfSettlement ==
-								// 	1 ? '月付' : res.result.records[i].methodOfSettlement == 2 ? '提付' : ""
-
-							}
-							console.log(res.result.records)
-							this.exportData = res.result.records;
-						}
-					});
-
-
-				}
-			},
 			changePage(v) {
 				this.searchForm.pageNum = v;
-				this.getDataList();
+				this.getLogisticsInfo();
 				this.clearSelectAll();
 			},
 			changePageSize(v) {
 				this.searchForm.pageSize = v;
-				this.getDataList();
-			},
-			checkShouValue(v) {
-				if (this.clearShou == true) {
-					this.searchForm.receiverId = ""
-					this.searchForm.receiverName = ""
-					this.searchForm.receiverMobile = ""
-				} else {
-					console.log('shou', v)
-					this.searchForm.receiverId = v.id
-				}
-
-			},
-			checkFaValue(v) {
-				if (this.clearFa == true) {
-					this.searchForm.shipperId = ""
-					this.searchForm.shipperName = ""
-					this.searchForm.shipperMobile = ""
-				} else {
-					console.log('发', v)
-					this.searchForm.shipperId = v.id
-				}
-
+				this.getLogisticsInfo();
 			},
 			changeTableSize(v) {
 				this.tableSize = v;
@@ -516,25 +327,14 @@
 			handleSearch() {
 				this.searchForm.pageNum = 1;
 				this.searchForm.pageSize = 10;
-				this.getDataList();
+				this.getLogisticsInfo();
 			},
 			handleReset() {
 				this.$refs.searchForm.resetFields();
 				this.searchForm.pageNum = 1;
 				this.searchForm.pageSize = 10;
-				this.selectDate = null;
-				let dayTime = this.getMonth()
-				this.selectDate = [dayTime, dayTime]
-				this.searchForm.startDate = dayTime
-				this.searchForm.endDate = dayTime
-				this.searchForm.searchStr = "";
-
-				this.searchForm.companyId = "";
-				this.searchForm.companyName = "";
-				this.$refs.dep.clearSelect();
-				this.searchForm.departmentId = "";
 				// 重新加载数据
-				this.getDataList();
+				this.getLogisticsInfo();
 			},
 			changeSort(e) {
 				this.searchForm.sort = e.key;
@@ -542,117 +342,9 @@
 				if (e.order == "normal") {
 					this.searchForm.order = "";
 				}
-				this.getDataList();
-			},
-			exportCustomData() {
-				if (this.filename == "") {
-					this.filename = "用户数据";
-				}
-				// 判断勾选导出列
-				let exportColumns = [];
-				this.exportColumns.forEach((e) => {
-					this.chooseColumns.forEach((c) => {
-						if (e.title == c && !e.disabled) {
-							exportColumns.push(e);
-						}
-					});
-				});
-				this.exportModalVisible = false;
-				let title = [];
-				let key = [];
-				exportColumns.forEach((e) => {
-					title.push(e.title);
-					key.push(e.key);
-				});
-				const params = {
-					title: title,
-					key: key,
-					data: this.exportData,
-					autoWidth: true,
-					filename: this.filename,
-				};
-				excel.export_array_to_excel(params);
-			},
-			beforeUploadImport(file) {
-				this.uploadfile = file;
-				const fileExt = file.name.split(".").pop().toLocaleLowerCase();
-				if (fileExt == "xlsx" || fileExt == "xls") {
-					this.readFile(file);
-					this.file = file;
-				} else {
-					this.$Notice.warning({
-						title: "文件类型错误",
-						desc: "所选文件‘ " +
-							file.name +
-							" ’不是EXCEL文件，请选择后缀为.xlsx或者.xls的EXCEL文件。",
-					});
-				}
-				return false;
-			},
-			// 读取文件
-			readFile(file) {
-				this.reading = true;
-				const reader = new FileReader();
-				reader.readAsArrayBuffer(file);
-				reader.onerror = (e) => {
-					this.reading = false;
-					this.$Message.error("文件读取出错");
-				};
-				reader.onload = (e) => {
-					const data = e.target.result;
-					const {
-						header,
-						results
-					} = excel.read(data, "array");
-					const tableTitle = header.map((item) => {
-						return {
-							title: item,
-							key: item,
-							minWidth: 130,
-							align: "center"
-						};
-					});
-					this.importTableData = results;
-					this.importColumns = tableTitle;
-					this.reading = false;
-					this.$Message.success("读取数据成功");
-				};
-			},
-			clearImportData() {
-				this.importTableData = [];
-				this.importColumns = [];
-				this.uploadfile = {};
-			},
-			downloadTemple() {
-				let title = [];
-				let key = [];
-				userColumns.forEach((e) => {
-					title.push(e.title);
-					key.push(e.key);
-				});
-				const params = {
-					title: title,
-					key: key,
-					data: userData,
-					autoWidth: true,
-					filename: "导入用户数据模版",
-				};
-				excel.export_array_to_excel(params);
-			},
-			importData() {
-				this.importLoading = true;
-				importUserData(this.importTableData).then((res) => {
-					this.importLoading = false;
-					if (res.success) {
-						this.importModalVisible = false;
-						this.getDataList();
-						this.$Modal.info({
-							title: "导入结果",
-							content: res.message,
-						});
-					}
-				});
+				this.getLogisticsInfo();
 			},
+			
 			showDetail(v) {
 				// 转换null为""
 				for (let attr in v) {
@@ -678,7 +370,6 @@
 				this.drop = !this.drop;
 			},
 			showSelect(e) {
-				this.exportData = e;
 				this.selectList = e;
 			},
 			clearSelectAll() {