优化

src/api/article/index.ts

@@ -0,0 +1,63 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { ArticleVO, ArticleForm, ArticleQuery } from '@/api/system/article/types';
+
+/**
+ * 查询文章列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listArticle = (query?: ArticleQuery): AxiosPromise<ArticleVO[]> => {
+  return request({
+    url: '/system/Article/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询文章详细
+ * @param id
+ */
+export const getArticle = (id: string | number): AxiosPromise<ArticleVO> => {
+  return request({
+    url: '/system/Article/' + id,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增文章
+ * @param data
+ */
+export const addArticle = (data: ArticleForm) => {
+  return request({
+    url: '/system/Article',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改文章
+ * @param data
+ */
+export const updateArticle = (data: ArticleForm) => {
+  return request({
+    url: '/system/Article',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除文章
+ * @param id
+ */
+export const delArticle = (id: string | number | Array<string | number>) => {
+  return request({
+    url: '/system/Article/' + id,
+    method: 'delete'
+  });
+};

src/api/article/types.ts

@@ -0,0 +1,116 @@
+export interface ArticleVO {
+  /**
+   * 编号
+   */
+  id: string | number;
+
+  /**
+   * 标题
+   */
+  title: string;
+
+  /**
+   * 副标题
+   */
+  subTitle: string;
+
+  /**
+   * 内容
+   */
+  content: string;
+
+  /**
+   * 状态
+   */
+  status: number;
+
+  /**
+   * 扩展1
+   */
+  ext1: string;
+
+  /**
+   * 扩展2
+   */
+  ext2: string;
+
+}
+
+export interface ArticleForm extends BaseEntity {
+  /**
+   * 编号
+   */
+  id?: string | number;
+
+  /**
+   * 标题
+   */
+  title?: string;
+
+  /**
+   * 副标题
+   */
+  subTitle?: string;
+
+  /**
+   * 内容
+   */
+  content?: string;
+
+  /**
+   * 状态
+   */
+  status?: number;
+
+  /**
+   * 扩展1
+   */
+  ext1?: string;
+
+  /**
+   * 扩展2
+   */
+  ext2?: string;
+
+}
+
+export interface ArticleQuery extends PageQuery {
+
+  /**
+   * 标题
+   */
+  title?: string;
+
+  /**
+   * 副标题
+   */
+  subTitle?: string;
+
+  /**
+   * 内容
+   */
+  content?: string;
+
+  /**
+   * 状态
+   */
+  status?: number;
+
+  /**
+   * 扩展1
+   */
+  ext1?: string;
+
+  /**
+   * 扩展2
+   */
+  ext2?: string;
+
+    /**
+     * 日期范围参数
+     */
+    params?: any;
+}
+
+
+

src/api/data.ts

@@ -0,0 +1,10 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+
+export const getpassenger = () => {
+    return request({
+      url: '/statistic/passenger/flow',
+      method: 'get'
+    });
+  };
+

src/components/HomeComponents/lineEcharts.vue

@@ -11,10 +11,11 @@
 </template>
 <script setup name="Index" lang="ts">
 import * as echarts from 'echarts';
+import { getpassenger } from "@/api/data"
 
 const linechart = ref();
 
-const drawEchart = () => {
+const drawEchart = (kldata,hldata) => {
   let echartsObj = echarts.init(linechart.value, "macarons");
   var dateArray = getRecentDays();
   var option = {
@@ -82,7 +83,7 @@ const drawEchart = () => {
       {
         name: "客流趋势",
         type: "line",
-        data: [10, 20, 30, 40, 50, 40, 60],
+        data: kldata,
         smooth: false,
         symbol: 'none',
         lineStyle: {
@@ -93,7 +94,7 @@ const drawEchart = () => {
       {
         name: "货流趋势",
         type: "line",
-        data: [30, 10, 40, 20, 40, 30, 70],
+        data: hldata,
         smooth: false,
         symbol: 'none',
         lineStyle: {
@@ -120,9 +121,25 @@ const getRecentDays = () => {
   return resultArray;
 }
 
+const getpassengerData = () =>{
+  getpassenger().then(res=>{
+      console.log(res)
+      var date = [];
+      var kldata = [];
+      var hldata = [];
+      for(var index in res.data){
+           if(index > 0){
+            date.push(res.data[index].end);
+            kldata.push(res.data[index].flowCount.incount + res.data[index].flowCount.outcount)
+            hldata.push(res.data[index].goodsOrderCount.ordercount)
+           }
+      }
+      drawEchart(kldata,hldata)
+  })
+}
 
 onMounted(() => {
-  drawEchart();
+  getpassengerData();
 })
 </script>
 <style scoped lang="scss">

src/components/HomeStatics/lineEcharts.vue

@@ -8,8 +8,9 @@
 import * as echarts from 'echarts';
 
 const linechart = ref();
+import { getpassenger } from "@/api/data"
 
-const drawEchart = () => {
+const drawEchart = (kldata,hldata) => {
   let echartsObj = echarts.init(linechart.value, "macarons");
   var dateArray = getRecentDays();
   var option = {
@@ -81,7 +82,7 @@ const drawEchart = () => {
       {
         name: "客流趋势",
         type: "line",
-        data: [10, 20, 30, 40, 50, 40, 60],
+        data: kldata,
         smooth: false,
         symbol: 'circle',
         itemStyle: {
@@ -117,7 +118,7 @@ const drawEchart = () => {
       {
         name: "货流趋势",
         type: "line",
-        data: [30, 10, 40, 20, 40, 30, 70],
+        data: hldata,
         smooth: false,
         symbol: 'circle',
         itemStyle: {
@@ -170,8 +171,25 @@ const getRecentDays = () => {
 }
 
 
+const getpassengerData = () =>{
+  getpassenger().then(res=>{
+      console.log(res)
+      var date = [];
+      var kldata = [];
+      var hldata = [];
+      for(var index in res.data){
+           if(index > 0){
+            date.push(res.data[index].end);
+            kldata.push(res.data[index].flowCount.incount + res.data[index].flowCount.outcount)
+            hldata.push(res.data[index].goodsOrderCount.ordercount)
+           }
+      }
+      drawEchart(kldata,hldata)
+  })
+}
+
 onMounted(() => {
-  drawEchart();
+  getpassengerData();
 })
 </script>
 <style>

src/components/Public/table.vue

@@ -125,8 +125,8 @@ const getJsonDataFormat = (str, data, prop, pprop) =>{
 const getObjectData = (data, prop) => {
     var obj = JSON.parse(data);
     if(obj != null){
-      console.log(prop)
-      console.log(obj[prop])
+      // console.log(prop)
+      // console.log(obj[prop])
         return obj[prop];
     }
   // return eval("obj." + prop)

src/views/article/index.vue

@@ -0,0 +1,257 @@
+<template>
+  <div class="p-2">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <div class="search" v-show="showSearch">
+        <el-form :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
+          <el-form-item label="标题" prop="title">
+            <el-input v-model="queryParams.title" placeholder="请输入标题" clearable style="width: 240px" @keyup.enter="handleQuery" />
+          </el-form-item>
+          <el-form-item label="副标题" prop="subTitle">
+            <el-input v-model="queryParams.subTitle" placeholder="请输入副标题" clearable style="width: 240px" @keyup.enter="handleQuery" />
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+    </transition>
+
+    <el-card shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:article:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['system:article:edit']">修改</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['system:article:remove']">删除</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['system:article:export']">导出</el-button>
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table v-loading="loading" :data="articleList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="编号" align="center" prop="id" v-if="true" />
+        <el-table-column label="标题" align="center" prop="title" />
+        <el-table-column label="副标题" align="center" prop="subTitle" />
+        <el-table-column label="内容" align="center" prop="content" />
+        <el-table-column label="状态" align="center" prop="status" />
+        <el-table-column label="扩展1" align="center" prop="ext1" />
+        <el-table-column label="扩展2" align="center" prop="ext2" />
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-tooltip content="修改" placement="top">
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:article:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:article:remove']"></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination
+          v-show="total>0"
+          :total="total"
+          v-model:page="queryParams.pageNum"
+          v-model:limit="queryParams.pageSize"
+          @pagination="getList"
+      />
+    </el-card>
+    <!-- 添加或修改文章对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+      <el-form ref="articleFormRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="标题" prop="title">
+            <el-input v-model="form.title" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="副标题" prop="subTitle">
+            <el-input v-model="form.subTitle" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="内容">
+          <editor v-model="form.content" :min-height="192"/>
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="Article" lang="ts">
+import { listArticle, getArticle, delArticle, addArticle, updateArticle } from '@/api/article';
+import { ArticleVO, ArticleQuery, ArticleForm } from '@/api/article/types';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+
+const articleList = ref<ArticleVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+
+const queryFormRef = ref<ElFormInstance>();
+const articleFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+const initFormData: ArticleForm = {
+  id: undefined,
+  title: undefined,
+  subTitle: undefined,
+  content: undefined,
+  status: undefined,
+  ext1: undefined,
+  ext2: undefined
+}
+const data = reactive<PageData<ArticleForm, ArticleQuery>>({
+  form: {...initFormData},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    title: undefined,
+    subTitle: undefined,
+    content: undefined,
+    status: undefined,
+    ext1: undefined,
+    ext2: undefined,
+    params: {
+    }
+  },
+  rules: {
+    id: [
+      { required: true, message: "编号不能为空", trigger: "blur" }
+    ],
+    title: [
+      { required: true, message: "标题不能为空", trigger: "blur" }
+    ],
+    subTitle: [
+      { required: true, message: "副标题不能为空", trigger: "blur" }
+    ],
+    content: [
+      { required: true, message: "内容不能为空", trigger: "blur" }
+    ],
+    status: [
+      { required: true, message: "状态不能为空", trigger: "change" }
+    ],
+    ext1: [
+      { required: true, message: "扩展1不能为空", trigger: "blur" }
+    ],
+    ext2: [
+      { required: true, message: "扩展2不能为空", trigger: "blur" }
+    ]
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询文章列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listArticle(queryParams.value);
+  articleList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+}
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+}
+
+/** 表单重置 */
+const reset = () => {
+  form.value = {...initFormData};
+  articleFormRef.value?.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+}
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: ArticleVO[]) => {
+  ids.value = selection.map(item => item.id);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = "添加文章";
+}
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: ArticleVO) => {
+  reset();
+  const _id = row?.id || ids.value[0]
+  const res = await getArticle(_id);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = "修改文章";
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+  articleFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.id) {
+        await updateArticle(form.value).finally(() =>  buttonLoading.value = false);
+      } else {
+        await addArticle(form.value).finally(() =>  buttonLoading.value = false);
+      }
+      proxy?.$modal.msgSuccess("修改成功");
+      dialog.visible = false;
+      await getList();
+    }
+  });
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: ArticleVO) => {
+  const _ids = row?.id || ids.value;
+  await proxy?.$modal.confirm('是否确认删除文章编号为"' + _ids + '"的数据项？').finally(() => loading.value = false);
+  await delArticle(_ids);
+  proxy?.$modal.msgSuccess("删除成功");
+  await getList();
+}
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download('system/article/export', {
+    ...queryParams.value
+  }, `article_${new Date().getTime()}.xlsx`)
+}
+
+onMounted(() => {
+  getList();
+});
+</script>

src/views/car/people/index.vue

@@ -373,7 +373,7 @@
       status: '',
       deptId: '',
       params:{
-        roleNames:'司机,乘客'
+        roleNames:'司机'
       }
     },
     rules: {

src/views/car/people/yonghu.vue

@@ -0,0 +1,615 @@
+<template>
+    <div class="p-2">
+      <el-row :gutter="20">
+        <!-- 部门树 -->
+        <el-col :lg="24" :xs="24">
+          <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+            <div class="mb-[10px]" v-show="showSearch">
+              <el-card shadow="hover">
+                <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="68px">
+                  <el-form-item label="用户名称" prop="userName">
+                    <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable style="width: 240px" @keyup.enter="handleQuery" />
+                  </el-form-item>
+                  <el-form-item label="手机号码" prop="phonenumber">
+                    <el-input
+                      v-model="queryParams.phonenumber"
+                      placeholder="请输入手机号码"
+                      clearable
+                      style="width: 240px"
+                      @keyup.enter="handleQuery"
+                    />
+                  </el-form-item>
+  
+                  <el-form-item label="状态" prop="status">
+                    <el-select v-model="queryParams.status" placeholder="用户状态" clearable style="width: 240px">
+                      <el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label" :value="dict.value" />
+                    </el-select>
+                  </el-form-item>
+                  <el-form-item label="创建时间" style="width: 308px;">
+                    <el-date-picker
+                      v-model="dateRange"
+                      value-format="YYYY-MM-DD"
+                      type="daterange"
+                      range-separator="-"
+                      start-placeholder="开始日期"
+                      end-placeholder="结束日期"
+                    ></el-date-picker>
+                  </el-form-item>
+                  <el-form-item>
+                    <el-button type="primary" @click="handleQuery" icon="Search">搜索</el-button>
+                    <el-button @click="resetQuery" icon="Refresh">重置</el-button>
+                  </el-form-item>
+                </el-form>
+              </el-card>
+            </div>
+          </transition>
+  
+          <el-card shadow="hover">
+            <template #header>
+              <el-row :gutter="10">
+                <el-col :span="1.5">
+                  <el-button type="primary" plain @click="handleAdd()" v-has-permi="['system:user:add']" icon="Plus">新增</el-button>
+                </el-col>
+                <el-col :span="1.5">
+                  <el-button type="success" plain @click="handleUpdate()" :disabled="single" v-has-permi="['system:user:add']" icon="Edit">
+                    修改
+                  </el-button>
+                </el-col>
+                <el-col :span="1.5">
+                  <el-button type="danger" plain @click="handleDelete()" :disabled="multiple" v-has-permi="['system:user:delete']" icon="Delete">
+                    删除
+                  </el-button>
+                </el-col>
+                <el-col :span="1.5">
+                  <el-dropdown class="mt-[1px]">
+                    <el-button plain type="info">
+                      更多
+                      <el-icon class="el-icon--right"><arrow-down /></el-icon
+                    ></el-button>
+                    <template #dropdown>
+                      <el-dropdown-menu>
+                        <el-dropdown-item @click="importTemplate" icon="Download">下载模板</el-dropdown-item>
+                        <el-dropdown-item @click="handleImport" icon="Top"> 导入数据</el-dropdown-item>
+                        <el-dropdown-item @click="handleExport" icon="Download"> 导出数据</el-dropdown-item>
+                      </el-dropdown-menu>
+                    </template>
+                  </el-dropdown>
+                </el-col>
+                <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" :columns="columns" :search="true"></right-toolbar>
+              </el-row>
+            </template>
+  
+            <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
+              <el-table-column type="selection" width="50" align="center" />
+              <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
+              <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
+              <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
+              <el-table-column
+                label="部门"
+                align="center"
+                key="deptName"
+                prop="dept.deptName"
+                v-if="columns[3].visible"
+                :show-overflow-tooltip="true"
+              />
+              <el-table-column label="角色" align="center" key="phonenumber" prop="roleNames" width="120" />
+              <el-table-column label="身份证" align="center" key="remark" prop="remark" width="120" />
+              <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
+              <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
+                <template #default="scope">
+                  <el-switch v-model="scope.row.status" active-value="0" inactive-value="1" @change="handleStatusChange(scope.row)"></el-switch>
+                </template>
+              </el-table-column>
+  
+              <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
+                <template #default="scope">
+                  <span>{{ scope.row.createTime }}</span>
+                </template>
+              </el-table-column>
+  
+              <el-table-column label="操作" fixed="right" width="180" class-name="small-padding fixed-width">
+                <template #default="scope">
+                  <el-tooltip content="修改" placement="top" v-if="scope.row.userId !== 1">
+                    <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:user:edit']"></el-button>
+                  </el-tooltip>
+                  <el-tooltip content="删除" placement="top" v-if="scope.row.userId !== 1">
+                    <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:user:remove']"></el-button>
+                  </el-tooltip>
+  
+                  <el-tooltip content="重置密码" placement="top" v-if="scope.row.userId !== 1">
+                    <el-button link type="primary" icon="Key" @click="handleResetPwd(scope.row)" v-hasPermi="['system:user:resetPwd']"></el-button>
+                  </el-tooltip>
+  
+                  <el-tooltip content="分配角色" placement="top" v-if="scope.row.userId !== 1">
+                    <el-button link type="primary" icon="CircleCheck" @click="handleAuthRole(scope.row)" v-hasPermi="['system:user:edit']"></el-button>
+                  </el-tooltip>
+                </template>
+              </el-table-column>
+            </el-table>
+  
+            <pagination
+              v-show="total > 0"
+              :total="total"
+              v-model:page="queryParams.pageNum"
+              v-model:limit="queryParams.pageSize"
+              @pagination="getList"
+            />
+          </el-card>
+        </el-col>
+      </el-row>
+  
+      <!-- 添加或修改用户配置对话框 -->
+      <el-dialog ref="formDialogRef" :title="dialog.title" v-model="dialog.visible" width="600px" append-to-body @close="closeDialog">
+        <el-form :model="form" :rules="rules" ref="userFormRef" label-width="80px">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="用户昵称" prop="nickName">
+                <el-input v-model="form.nickName" placeholder="请输入用户昵称" maxlength="30" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="归属部门" prop="deptId">
+                <el-tree-select
+                  v-model="form.deptId"
+                  :data="deptOptions"
+                  :props="{ value: 'id', label: 'label', children: 'children' }"
+                  value-key="id"
+                  placeholder="请选择归属部门"
+                  check-strictly
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="手机号码" prop="phonenumber">
+                <el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="邮箱" prop="email">
+                <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item v-if="form.userId == undefined" label="用户名称" prop="userName">
+                <el-input v-model="form.userName" placeholder="请输入用户名称" maxlength="30" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item v-if="form.userId == undefined" label="用户密码" prop="password">
+                <el-input v-model="form.password" placeholder="请输入用户密码" type="password" maxlength="20" show-password />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="用户性别">
+                <el-select v-model="form.sex" placeholder="请选择">
+                  <el-option v-for="dict in sys_user_sex" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="状态">
+                <el-radio-group v-model="form.status">
+                  <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.value">{{
+                    dict.label }}</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="岗位">
+                <el-select v-model="form.postIds" multiple placeholder="请选择">
+                  <el-option
+                    v-for="item in postOptions"
+                    :key="item.postId"
+                    :label="item.postName"
+                    :value="item.postId"
+                    :disabled="item.status == '1'"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="角色">
+                <el-select v-model="form.roleIds" multiple placeholder="请选择">
+                  <el-option
+                    v-for="item in roleOptions"
+                    :key="item.roleId"
+                    :label="item.roleName"
+                    :value="item.roleId"
+                    :disabled="item.status == '1'"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="身份证" prop="email">
+                <el-input v-model="form.remark" placeholder="请输入身份证" maxlength="50" />
+              </el-form-item>
+              <!-- <el-form-item label="身份证">
+                <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
+              </el-form-item> -->
+            </el-col>
+          </el-row>
+        </el-form>
+        <template #footer>
+          <div class="dialog-footer">
+            <el-button type="primary" @click="submitForm">确 定</el-button>
+            <el-button @click="cancel()">取 消</el-button>
+          </div>
+        </template>
+      </el-dialog>
+  
+      <!-- 用户导入对话框 -->
+      <el-dialog :title="upload.title" v-model="upload.open" width="400px" append-to-body>
+        <el-upload
+          ref="uploadRef"
+          :limit="1"
+          accept=".xlsx, .xls"
+          :headers="upload.headers"
+          :action="upload.url + '?updateSupport=' + upload.updateSupport"
+          :disabled="upload.isUploading"
+          :on-progress="handleFileUploadProgress"
+          :on-success="handleFileSuccess"
+          :auto-upload="false"
+          drag
+        >
+          <el-icon class="el-icon--upload">
+            <i-ep-upload-filled />
+          </el-icon>
+          <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+          <template #tip>
+            <div class="text-center el-upload__tip">
+              <div class="el-upload__tip"><el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据</div>
+              <span>仅允许导入xls、xlsx格式文件。</span>
+              <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
+            </div>
+          </template>
+        </el-upload>
+        <template #footer>
+          <div class="dialog-footer">
+            <el-button type="primary" @click="submitFileForm">确 定</el-button>
+            <el-button @click="upload.open = false">取 消</el-button>
+          </div>
+        </template>
+      </el-dialog>
+    </div>
+  </template>
+  
+  <script setup name="User" lang="ts">
+  import api from "@/api/system/user"
+  import { UserForm, UserQuery, UserVO } from '@/api/system/user/types';
+  import { treeselect } from "@/api/system/dept";
+  import { DeptVO } from "@/api/system/dept/types";
+  import { RoleVO } from "@/api/system/role/types";
+  import { PostVO } from "@/api/system/post/types";
+  import { to } from "await-to-js";
+  import { globalHeaders } from "@/utils/request";
+  
+  const router = useRouter();
+  const { proxy } = getCurrentInstance() as ComponentInternalInstance
+  const { sys_normal_disable, sys_user_sex } = toRefs<any>(proxy?.useDict('sys_normal_disable', 'sys_user_sex'));
+  
+  const userList = ref<UserVO[]>();
+  const loading = ref(true);
+  const showSearch = ref(true)
+  const ids = ref<Array<number | string>>([]);
+  const single = ref(true);
+  const multiple = ref(true);
+  const total = ref(0);
+  const dateRange = ref<[DateModelType, DateModelType]>(['', '']);
+  const deptName = ref('');
+  const deptOptions = ref<DeptVO[]>([]);
+  const initPassword = ref<String>('');
+  const postOptions = ref<PostVO[]>([]);
+  const roleOptions = ref<RoleVO[]>([]);
+  /*** 用户导入参数 */
+  const upload = reactive<ImportOption>({
+    // 是否显示弹出层（用户导入）
+    open: false,
+    // 弹出层标题（用户导入）
+    title: "",
+    // 是否禁用上传
+    isUploading: false,
+    // 是否更新已经存在的用户数据
+    updateSupport: 0,
+    // 设置上传的请求头部
+    headers: globalHeaders(),
+    // 上传的地址
+    url: import.meta.env.VITE_APP_BASE_API + "/system/user/importData"
+  })
+  // 列显隐信息
+  const columns = ref<FieldOption[]>([
+    { key: 0, label: `用户编号`, visible: false,children: [] },
+    { key: 1, label: `用户名称`, visible: true,children: [] },
+    { key: 2, label: `用户昵称`, visible: true,children: [] },
+    { key: 3, label: `部门`, visible: true,children: [] },
+    { key: 4, label: `手机号码`, visible: true,children: [] },
+    { key: 5, label: `状态`, visible: true,children: [] },
+    { key: 6, label: `创建时间`, visible: true,children: [] }
+  ])
+  
+  
+  const deptTreeRef = ref<ElTreeInstance>();
+  const queryFormRef = ref<ElFormInstance>();
+  const userFormRef = ref<ElFormInstance>();
+  const uploadRef = ref<ElUploadInstance>();
+  const formDialogRef = ref<ElDialogInstance>();
+  
+  const dialog = reactive<DialogOption>({
+    visible: false,
+    title: ''
+  });
+  
+  const initFormData: UserForm = {
+    userId: undefined,
+    deptId: undefined,
+    userName: '',
+    nickName: undefined,
+    password: '',
+    phonenumber: undefined,
+    email: undefined,
+    sex: undefined,
+    status: "0",
+    remark: '',
+    postIds: [],
+    roleIds: []
+  }
+  const data = reactive<PageData<UserForm, UserQuery>>({
+    form: { ...initFormData },
+    queryParams: {
+      pageNum: 1,
+      pageSize: 10,
+      userName: '',
+      phonenumber: '',
+      status: '',
+      deptId: '',
+      params:{
+        roleNames:'乘客'
+      }
+    },
+    rules: {
+      userName: [{ required: true, message: "用户名称不能为空", trigger: "blur" }, { min: 2, max: 20, message: "用户名称长度必须介于 2 和 20 之间", trigger: "blur" }],
+      nickName: [{ required: true, message: "用户昵称不能为空", trigger: "blur" }],
+      password: [{ required: true, message: "用户密码不能为空", trigger: "blur" }, { min: 5, max: 20, message: "用户密码长度必须介于 5 和 20 之间", trigger: "blur" }],
+      // email: [{ type: "email", message: "请输入正确的邮箱地址", trigger: ["blur", "change"] }],
+      phonenumber: [{ pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }]
+    }
+  })
+  
+  const { queryParams, form, rules } = toRefs<PageData<UserForm, UserQuery>>(data)
+  
+  /** 通过条件过滤节点  */
+  const filterNode = (value: string, data: any) => {
+    if (!value) return true
+    return data.label.indexOf(value) !== -1
+  }
+  /** 根据名称筛选部门树 */
+  watchEffect(
+    () => { deptTreeRef.value?.filter(deptName.value); },
+    {
+      flush: 'post' // watchEffect会在DOM挂载或者更新之前就会触发，此属性控制在DOM元素更新后运行
+    }
+  );
+  
+  /** 查询部门下拉树结构 */
+  const getTreeSelect = async () => {
+    const res = await api.deptTreeSelect();
+    deptOptions.value = res.data;
+  };
+  
+  /** 查询用户列表 */
+  const getList = async () => {
+    loading.value = true;
+    const res = await api.listUser(proxy?.addDateRange(queryParams.value, dateRange.value));
+    console.log(res)
+    loading.value = false;
+    userList.value = res.rows;
+    total.value = res.total;
+  }
+  
+  /** 节点单击事件 */
+  const handleNodeClick = (data: DeptVO) => {
+    queryParams.value.deptId = data.id;
+    handleQuery()
+  }
+  
+  
+  /** 搜索按钮操作 */
+  const handleQuery = () => {
+    queryParams.value.pageNum = 1
+    getList()
+  }
+  /** 重置按钮操作 */
+  const resetQuery = () => {
+    dateRange.value = ['', '']
+    queryFormRef.value?.resetFields();
+    queryParams.value.pageNum = 1;
+    queryParams.value.deptId = undefined;
+    deptTreeRef.value?.setCurrentKey(undefined);
+    handleQuery();
+  }
+  
+  /** 删除按钮操作 */
+  const handleDelete = async (row?: UserVO) => {
+    const userIds = row?.userId || ids.value;
+    const [err] = await to(proxy?.$modal.confirm('是否确认删除用户编号为"' + userIds + '"的数据项？') as any);
+    if (!err) {
+      await api.delUser(userIds);
+      await getList();
+      proxy?.$modal.msgSuccess("删除成功");
+    }
+  }
+  
+  /** 用户状态修改  */
+  const handleStatusChange = async (row: UserVO) => {
+    let text = row.status === "0" ? "启用" : "停用"
+    try {
+      await proxy?.$modal.confirm('确认要"' + text + '""' + row.userName + '"用户吗?');
+      await api.changeUserStatus(row.userId, row.status);
+      proxy?.$modal.msgSuccess(text + "成功");
+    } catch (err) {
+      row.status = row.status === "0" ? "1" : "0";
+    }
+  }
+  /** 跳转角色分配 */
+  const handleAuthRole = (row: UserVO) => {
+    const userId = row.userId;
+    router.push("/system/user-auth/role/" + userId);
+  }
+  
+  /** 重置密码按钮操作 */
+  const handleResetPwd = async (row: UserVO) => {
+    const [err, res] = await to(ElMessageBox.prompt('请输入"' + row.userName + '"的新密码', "提示", {
+      confirmButtonText: "确定",
+      cancelButtonText: "取消",
+      closeOnClickModal: false,
+      inputPattern: /^.{5,20}$/,
+      inputErrorMessage: "用户密码长度必须介于 5 和 20 之间",
+    }))
+    if (!err) {
+      await api.resetUserPwd(row.userId, res.value);
+      proxy?.$modal.msgSuccess("修改成功，新密码是：" + res.value);
+    }
+  }
+  
+  /** 选择条数  */
+  const handleSelectionChange = (selection: UserVO[]) => {
+    ids.value = selection.map((item) => item.userId);
+    single.value = selection.length != 1;
+    multiple.value = !selection.length;
+  }
+  
+  /** 导入按钮操作 */
+  const handleImport = () => {
+    upload.title = "用户导入";
+    upload.open = true;
+  }
+  /** 导出按钮操作 */
+  const handleExport = () => {
+    proxy?.download("system/user/export", {
+      ...queryParams.value,
+    }, `user_${new Date().getTime()}.xlsx`);
+  };
+  /** 下载模板操作 */
+  const importTemplate = () => {
+    proxy?.download("system/user/importTemplate", {
+    }, `user_template_${new Date().getTime()}.xlsx`);
+  }
+  
+  /**文件上传中处理 */
+  const handleFileUploadProgress = () => {
+    upload.isUploading = true;
+  }
+  /** 文件上传成功处理 */
+  const handleFileSuccess = (response: any, file: UploadFile) => {
+    upload.open = false;
+    upload.isUploading = false;
+    uploadRef.value?.handleRemove(file);
+    ElMessageBox.alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
+    getList();
+  }
+  
+  /** 提交上传文件 */
+  function submitFileForm() {
+    uploadRef.value?.submit();
+  }
+  
+  /** 初始化部门数据 */
+  const initTreeData = async () => {
+    // 判断部门的数据是否存在，存在不获取，不存在则获取
+    if (deptOptions.value === undefined) {
+      const { data } = await treeselect();
+      deptOptions.value = data;
+    }
+  }
+  
+  
+  /** 重置操作表单 */
+  const reset = () => {
+    form.value = { ...initFormData };
+    userFormRef.value?.resetFields();
+  }
+  /** 取消按钮 */
+  const cancel = () => {
+    dialog.visible = false;
+    reset();
+  }
+  
+  /** 新增按钮操作 */
+  const handleAdd = async () => {
+    reset();
+    const { data } = await api.getUser();
+    dialog.visible = true;
+    dialog.title = "新增用户";
+    await initTreeData();
+    postOptions.value = data.posts;
+    roleOptions.value = data.roles;
+    form.value.password = initPassword.value.toString();
+  }
+  /** 修改按钮操作 */
+  const handleUpdate = async (row?: UserForm) => {
+    reset();
+    const userId = row?.userId || ids.value[0]
+    const { data } = await api.getUser(userId)
+    dialog.visible = true;
+    dialog.title = "修改用户";
+    await initTreeData();
+    Object.assign(form.value, data.user);
+    postOptions.value = data.posts;
+    roleOptions.value = data.roles;
+    form.value.postIds = data.postIds;
+    form.value.roleIds = data.roleIds;
+    form.value.password = "";
+  }
+  
+  /** 提交按钮 */
+  const submitForm = () => {
+    userFormRef.value?.validate(async (valid: boolean) => {
+      if (valid) {
+        form.value.userId ? await api.updateUser(form.value) : await api.addUser(form.value);
+        proxy?.$modal.msgSuccess("操作成功");
+        dialog.visible = false;
+        await getList();
+      }
+    })
+  }
+  
+  
+  /**
+   * 关闭用户弹窗
+   */
+  const closeDialog = () => {
+    dialog.visible = false;
+    resetForm();
+  }
+  
+  /**
+   * 重置表单
+   */
+  const resetForm = () => {
+    userFormRef.value?.resetFields();
+    userFormRef.value?.clearValidate();
+  
+    form.value.id = undefined;
+    form.value.status = '1';
+  }
+  onMounted(() => {
+    getTreeSelect() // 初始化部门数据
+    getList() // 初始化列表数据
+    proxy?.getConfigKey("sys.user.initPassword").then(response => {
+      initPassword.value = response.data;
+    });
+  });
+  </script>
+  
+  <style lang="scss" scoped></style>
+  

src/views/car/work/schedule.vue

@@ -7,6 +7,8 @@
             <p :class="data.isSelected ? 'is-selected' : ''">
               {{ data.day.split('-').slice(1)[1] }}
               <!-- {{ data.isSelected ? '✔️' : '' }} -->
+              <div v-show="!scheduleStatus(data.day)" style="width: 8px;height: 8px;border-radius: 9.5px;opacity: 1;background: #FF8784;"></div>
+              <div v-show="scheduleStatus(data.day)" style="width: 8px;height: 8px;border-radius: 9.5px;opacity: 1;background: #538FFF;"></div>
             </p>
             <div></div>
           </div>
@@ -125,6 +127,12 @@ const dialog = reactive<DialogOption>({
   title: ''
 });
 
+const scheduleList = ref([])
+
+const getScheduleList = () => {
+
+}
+
 const initFormData: CarScheduleForm = {
   id: undefined,
   pathInfo: undefined,
@@ -193,6 +201,33 @@ const getcarInfoList = async () => {
   carInfoList.value = carList.rows
 }
 
+const getScheduleData = () => {
+  console.log(1111111111111111111111)
+  var year = new Date().getFullYear();
+  var obj = {
+    starttime: year + "-01-01",
+    endtime: year + "-12-31"
+  }
+  listCarSchedule({ pageSize: 1000, params: obj }).then(res => {
+    console.log(res)
+    scheduleList.value = res.rows
+    proxy?.$forceUpdate
+
+  })
+}
+
+const scheduleStatus = (data) => {
+  console.log(data)
+  for (var index in scheduleList.value) {
+    var date = moment(new Date(scheduleList.value[index].scheduleDate)).format('YYYY-MM-DD')
+    console.log(data)
+    if (data == date) {
+      return true
+    }
+  }
+  return false
+}
+
 const getCarNum = (value) => {
   for (var index in carInfoList.value) {
     if (carInfoList.value[index].id == value) {
@@ -226,10 +261,10 @@ const getattend = (value) => {
   }
 }
 
-const getPathName = (value) =>{
+const getPathName = (value) => {
   for (var index in carPathList.value) {
     if (carPathList.value[index].id == value) {
-     return carPathList.value[index].name
+      return carPathList.value[index].name
     }
   }
 }
@@ -253,8 +288,8 @@ const childrenClick = (data) => {
 }
 
 const childFormat = ({ data, fn }) => {
-  console.log(data);
-  console.log(fn)
+  // console.log(data);
+  // console.log(fn)
   if (data.pprop != null) {
     var ext = data.data[data.prop]
     if (ext != null) {
@@ -485,6 +520,7 @@ const timeDateFormat = (date) => {
 
 onMounted(() => {
   initData()
+  getScheduleData()
 });
 </script>
 <style lang="scss" scoped>

src/views/order/goodsOrder.vue

@@ -0,0 +1,399 @@
+<template>
+    <div class="p-2">
+        <transition :enter-active-class="proxy?.animate.searchAnimate.enter"
+            :leave-active-class="proxy?.animate.searchAnimate.leave">
+            <div class="search" v-show="showSearch">
+                <el-form :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
+                    <el-form-item label="订单号" prop="orderId">
+                        <el-input v-model="queryParams.orderId" placeholder="请输入订单号" clearable style="width: 240px"
+                            @keyup.enter="handleQuery" />
+                    </el-form-item>
+                    <el-form-item label="货主" prop="fromUserId">
+                        <el-input v-model="queryParams.fromUserId" placeholder="请输入货主" clearable style="width: 240px"
+                            @keyup.enter="handleQuery" />
+                    </el-form-item>
+                    <el-form-item label="出发地" prop="fromAddr">
+                        <el-input v-model="queryParams.fromAddr" placeholder="请输入出发地" clearable style="width: 240px"
+                            @keyup.enter="handleQuery" />
+                    </el-form-item>
+                    <el-form-item label="出发时间" prop="gotime">
+                        <el-date-picker clearable v-model="queryParams.gotime" type="date" value-format="YYYY-MM-DD"
+                            placeholder="请选择出发时间" />
+                    </el-form-item>
+                    <el-form-item label="货物重量" prop="goodsWeight">
+                        <el-input v-model="queryParams.goodsWeight" placeholder="请输入货物重量" clearable style="width: 240px"
+                            @keyup.enter="handleQuery" />
+                    </el-form-item>
+                    <el-form-item label="目的地" prop="toAddr">
+                        <el-input v-model="queryParams.toAddr" placeholder="请输入目的地" clearable style="width: 240px"
+                            @keyup.enter="handleQuery" />
+                    </el-form-item>
+                    <el-form-item label="货物描述" prop="goodsDes">
+                        <el-input v-model="queryParams.goodsDes" placeholder="请输入货物描述" clearable style="width: 240px"
+                            @keyup.enter="handleQuery" />
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+                        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+                    </el-form-item>
+                </el-form>
+            </div>
+        </transition>
+
+        <el-card shadow="never">
+            <template #header>
+                <el-row :gutter="10" class="mb8">
+                    <el-col :span="1.5">
+                        <el-button type="primary" plain icon="Plus" @click="handleAdd"
+                            v-hasPermi="['system:goodsOrder:add']">新增</el-button>
+                    </el-col>
+                    <el-col :span="1.5">
+                        <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()"
+                            v-hasPermi="['system:goodsOrder:edit']">修改</el-button>
+                    </el-col>
+                    <el-col :span="1.5">
+                        <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()"
+                            v-hasPermi="['system:goodsOrder:remove']">删除</el-button>
+                    </el-col>
+                    <el-col :span="1.5">
+                        <el-button type="warning" plain icon="Download" @click="handleExport"
+                            v-hasPermi="['system:goodsOrder:export']">导出</el-button>
+                    </el-col>
+                    <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+                </el-row>
+            </template>
+
+            <el-table v-loading="loading" :data="goodsOrderList" @selection-change="handleSelectionChange">
+                <el-table-column label="订单号" align="center" prop="orderId" />
+                <!-- <el-table-column label="货主" align="center" prop="fromUserId" /> -->
+                <el-table-column label="用户" align="center" prop="gotime" width="180">
+                    <template #default="scope">
+                        <span>{{ getUserName(scope.row.fromUserId) }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="电话" align="center" prop="gotime" width="180">
+                    <template #default="scope">
+                        <span>{{ getUserPhone(scope.row.fromUserId) }}</span>
+                    </template>
+                </el-table-column>
+                <!-- <el-table-column label="0-待支付 1-待上车 2-运输中 3-完成 4-取消" align="center" prop="status" /> -->
+                <el-table-column label="出发地" align="center" prop="fromAddr" />
+                <el-table-column label="出发时间" align="center" prop="gotime" width="180">
+                    <template #default="scope">
+                        <span>{{ parseTime(scope.row.gotime, '{y}-{m}-{d}') }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="司机" align="center" prop="gotime" width="180">
+                    <template #default="scope">
+                        <span>{{ getDriver(scope.row.ext1) }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="目的地" align="center" prop="toAddr" />
+                <el-table-column label="状态" align="center" prop="gotime" width="180">
+                    <template #default="scope">
+                        <span>{{ getStatusName(scope.row.status) }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+                    <template #default="scope">
+                        <el-tooltip content="修改" placement="top">
+                            <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+                                v-hasPermi="['system:goodsOrder:edit']"></el-button>
+                        </el-tooltip>
+                        <el-tooltip content="删除" placement="top">
+                            <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+                                v-hasPermi="['system:goodsOrder:remove']"></el-button>
+                        </el-tooltip>
+                    </template>
+                </el-table-column>
+            </el-table>
+
+            <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+                v-model:limit="queryParams.pageSize" @pagination="getList" />
+        </el-card>
+        <!-- 添加或修改寄货订单对话框 -->
+        <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+            <el-form ref="goodsOrderFormRef" :model="form" :rules="rules" label-width="80px">
+                <el-form-item label="订单号" prop="orderId">
+                    <el-input v-model="form.orderId" placeholder="请输入订单号" />
+                </el-form-item>
+                <el-form-item label="货主" prop="fromUserId">
+                    <el-input v-model="form.fromUserId" placeholder="请输入货主" />
+                </el-form-item>
+                <el-form-item label="出发地" prop="fromAddr">
+                    <el-input v-model="form.fromAddr" placeholder="请输入出发地" />
+                </el-form-item>
+                <el-form-item label="出发时间" prop="gotime">
+                    <el-date-picker clearable v-model="form.gotime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss"
+                        placeholder="请选择出发时间">
+                    </el-date-picker>
+                </el-form-item>
+                <el-form-item label="货物重量" prop="goodsWeight">
+                    <el-input v-model="form.goodsWeight" placeholder="请输入货物重量" />
+                </el-form-item>
+                <el-form-item label="目的地" prop="toAddr">
+                    <el-input v-model="form.toAddr" placeholder="请输入目的地" />
+                </el-form-item>
+                <el-form-item label="货物描述" prop="goodsDes">
+                    <el-input v-model="form.goodsDes" placeholder="请输入货物描述" />
+                </el-form-item>
+            </el-form>
+            <template #footer>
+                <div class="dialog-footer">
+                    <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+                    <el-button @click="cancel">取 消</el-button>
+                </div>
+            </template>
+        </el-dialog>
+    </div>
+</template>
+
+<script setup name="GoodsOrder" lang="ts">
+import api from "@/api/system/user"
+import { listGoodsOrder, getGoodsOrder, delGoodsOrder, addGoodsOrder, updateGoodsOrder } from '@/api/goodsOrder';
+import { listCarPath, getCarPath, delCarPath, addCarPath, updateCarPath } from '@/api/carPath';
+import { GoodsOrderVO, GoodsOrderQuery, GoodsOrderForm } from '@/api/goodsOrder/types';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+
+const goodsOrderList = ref<GoodsOrderVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const userList = ref([])
+const pathList = ref([])
+
+const queryFormRef = ref<ElFormInstance>();
+const goodsOrderFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+    visible: false,
+    title: ''
+});
+
+const initFormData: GoodsOrderForm = {
+    id: undefined,
+    orderId: undefined,
+    fromUserId: undefined,
+    goodsType: undefined,
+    status: undefined,
+    fromAddr: undefined,
+    gotime: undefined,
+    goodsWeight: undefined,
+    toAddr: undefined,
+    payType: undefined,
+    goodsDes: undefined,
+    ext1: undefined,
+    ext2: undefined,
+}
+const data = reactive<PageData<GoodsOrderForm, GoodsOrderQuery>>({
+    form: { ...initFormData },
+    queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        orderId: undefined,
+        fromUserId: undefined,
+        goodsType: undefined,
+        status: undefined,
+        fromAddr: undefined,
+        gotime: undefined,
+        goodsWeight: undefined,
+        toAddr: undefined,
+        payType: undefined,
+        goodsDes: undefined,
+        ext1: undefined,
+        ext2: undefined,
+        params: {
+        }
+    },
+    rules: {
+        id: [
+            { required: true, message: "编号不能为空", trigger: "blur" }
+        ],
+        orderId: [
+            { required: true, message: "订单号不能为空", trigger: "blur" }
+        ],
+        fromUserId: [
+            { required: true, message: "货主不能为空", trigger: "blur" }
+        ],
+        goodsType: [
+            { required: true, message: "货物类型不能为空", trigger: "change" }
+        ],
+        status: [
+            { required: true, message: "0-待支付 1-待上车 2-运输中 3-完成 4-取消不能为空", trigger: "change" }
+        ],
+        fromAddr: [
+            { required: true, message: "出发地不能为空", trigger: "blur" }
+        ],
+        gotime: [
+            { required: true, message: "出发时间不能为空", trigger: "blur" }
+        ],
+        goodsWeight: [
+            { required: true, message: "货物重量不能为空", trigger: "blur" }
+        ],
+        toAddr: [
+            { required: true, message: "目的地不能为空", trigger: "blur" }
+        ],
+        payType: [
+            { required: true, message: "1-线下支付 2-微信支付不能为空", trigger: "change" }
+        ],
+        goodsDes: [
+            { required: true, message: "货物描述不能为空", trigger: "blur" }
+        ],
+        ext1: [
+            { required: true, message: "扩展1不能为空", trigger: "blur" }
+        ],
+        ext2: [
+            { required: true, message: "扩展2不能为空", trigger: "blur" }
+        ],
+    }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询寄货订单列表 */
+const getList = async () => {
+    const userRes = await api.listUser({ pageSize: 1000 });
+    const carPathRes = await listCarPath({ pageSize: 1000 });
+    userList.value = userRes.rows
+    pathList.value = carPathRes.rows
+    console.log(userRes)
+    console.log(carPathRes)
+    loading.value = true;
+    const res = await listGoodsOrder(queryParams.value);
+    goodsOrderList.value = res.rows;
+    total.value = res.total;
+    loading.value = false;
+}
+
+const getDriver = (data) => {
+    const id = JSON.parse(data).schedule_id
+    console.log(id)
+    for (var index in pathList.value) {
+        console.log(pathList.value[index].id)
+        if (pathList.value[index].id == id) {
+            return getUserName(pathList.value[index].driverInfo)
+        }
+
+    }
+}
+
+const getUserName = (id) => {
+    for (var index in userList.value) {
+        if (userList.value[index].userId == id) {
+            return userList.value[index].nickName
+        }
+    }
+}
+
+const getUserPhone = (id) => {
+    for (var index in userList.value) {
+        if (userList.value[index].userId == id) {
+            return userList.value[index].phonenumber
+        }
+    }
+}
+
+/** 取消按钮 */
+const cancel = () => {
+    reset();
+    dialog.visible = false;
+}
+
+/** 表单重置 */
+const reset = () => {
+    form.value = { ...initFormData };
+    goodsOrderFormRef.value?.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+    queryParams.value.pageNum = 1;
+    getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+    queryFormRef.value?.resetFields();
+    handleQuery();
+}
+
+const getStatusName = (index) => {
+    if (index == 0) {
+        return '待支付'
+    } else if (index == 1) {
+        return '待上车'
+    } else if (index == 2) {
+        return '运输中'
+    } else if (index == 3) {
+        return '完成'
+    } else if (index == 4) {
+        return '取消'
+    }
+}
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: GoodsOrderVO[]) => {
+    ids.value = selection.map(item => item.id);
+    single.value = selection.length != 1;
+    multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+    reset();
+    dialog.visible = true;
+    dialog.title = "添加寄货订单";
+}
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: GoodsOrderVO) => {
+    reset();
+    const _id = row?.id || ids.value[0]
+    const res = await getGoodsOrder(_id);
+    Object.assign(form.value, res.data);
+    dialog.visible = true;
+    dialog.title = "修改寄货订单";
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+    goodsOrderFormRef.value?.validate(async (valid: boolean) => {
+        if (valid) {
+            buttonLoading.value = true;
+            if (form.value.id) {
+                await updateGoodsOrder(form.value).finally(() => buttonLoading.value = false);
+            } else {
+                await addGoodsOrder(form.value).finally(() => buttonLoading.value = false);
+            }
+            proxy?.$modal.msgSuccess("修改成功");
+            dialog.visible = false;
+            await getList();
+        }
+    });
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: GoodsOrderVO) => {
+    const _ids = row?.id || ids.value;
+    await proxy?.$modal.confirm('是否确认删除寄货订单编号为"' + _ids + '"的数据项？').finally(() => loading.value = false);
+    await delGoodsOrder(_ids);
+    proxy?.$modal.msgSuccess("删除成功");
+    await getList();
+}
+
+/** 导出按钮操作 */
+const handleExport = () => {
+    proxy?.download('system/goodsOrder/export', {
+        ...queryParams.value
+    }, `goodsOrder_${new Date().getTime()}.xlsx`)
+}
+
+onMounted(() => {
+    getList();
+});
+</script>

src/views/yunying/kdg/index.vue

@@ -506,6 +506,8 @@ const treeclick = (data: TreeNodeData, node: TreeNode) => {
     var cabinets = tableData.value.filter(i => i.type == 'cabinet');
     if (cabinets.length > 0) {
       type.value = cabinets[0].cabinetType
+    }else {
+      type.value = 4
     }
   }