更新移动端用车审批、已办任务、项目列表

oa-ui-app/api/system/dept.js

@@ -0,0 +1,60 @@
+import request from '@/utils/request'
+
+// 查询部门列表
+export function listDept(query) {
+  return request({
+    url: '/system/dept/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询部门下拉树结构
+export function treeselect() {
+  return request({
+    url: '/system/dept/treeselect',
+    method: 'get'
+  })
+}
+
+// 查询部门列表（排除节点）
+export function listDeptExcludeChild(deptId) {
+  return request({
+    url: '/system/dept/list/exclude/' + deptId,
+    method: 'get'
+  })
+}
+
+// 查询部门详细
+export function getDept(deptId) {
+  return request({
+    url: '/system/dept/' + deptId,
+    method: 'get'
+  })
+}
+
+// 新增部门
+export function addDept(data) {
+  return request({
+    url: '/system/dept',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改部门
+export function updateDept(data) {
+  return request({
+    url: '/system/dept',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除部门
+export function delDept(deptId) {
+  return request({
+    url: '/system/dept/' + deptId,
+    method: 'delete'
+  })
+}

oa-ui-app/api/system/user.js

@@ -2,6 +2,51 @@ import upload from '@/utils/upload'
 import request from '@/utils/request'
 import { parseStrEmpty } from '@/utils/common.js'
 
+
+// 查询用户列表
+export function listUser(query) {
+  return request({
+    url: '/system/user/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询用户变更信息
+export function getUserChangeInfo(query) {
+  return request({
+    url: '/system/user/change',
+    method: 'get',
+    params: query
+  })
+}
+
+// 新增用户
+export function addUser(data) {
+  return request({
+    url: '/system/user',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改用户
+export function updateUser(data) {
+  return request({
+    url: '/system/user',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除用户
+export function delUser(userId) {
+  return request({
+    url: '/system/user/' + userId,
+    method: 'delete'
+  })
+}
+
 // 用户密码重置
 export function updateUserPwd(oldPassword, newPassword) {
   const data = {

oa-ui-app/pages.json

@@ -13,7 +13,7 @@
 		}, {
 			"path": "pages/index",
 			"style": {
-				"navigationBarTitleText": "CMC综合办公系统移动端",
+				"navigationBarTitleText": "CMC智联云枢办公系统移动端",
 				"navigationStyle": "custom"
 			}
 		}, {

oa-ui-app/pages/components/ChoosePeople.vue

@@ -0,0 +1,252 @@
+<template>
+  <view class="choose-people">
+    <view class="search-form">
+      <view class="search-item">
+        <text class="label">姓名：</text>
+        <uv-input v-model="queryParams.nickName" placeholder="请输入姓名" />
+      </view>
+      <view class="search-item">
+        <text class="label">部门：</text>
+        <uni-data-select style="width:270rpx;margin-right:30rpx;" v-model="queryParams.deptId" :localdata="deptList"
+          @change="getList" clearable />
+      </view>
+      <view class="search-item">
+        <u-button type="primary" @click="getList">搜索</u-button>
+      </view>
+    </view>
+
+    <!-- 选择人员 -->
+    <scroll-view scroll-y class="user-list" :style="{ height: '35vh' }">
+      <uv-checkbox-group v-model="selectedIds" iconPlacement="right" placement="column"
+        @change="(value) => handleCheckboxChange(value)">
+        <uv-checkbox v-for="item in userList" :label="item.nickName" :name="item.userId" :disabled="item.status == 1" />
+      </uv-checkbox-group>
+    </scroll-view>
+    
+    <view class="selected-users" v-if="multiple">
+      <text class="label">已选人员：</text>
+      <view class="tags">
+        <u-tag v-for="item in chooseUser" :key="item.userId" :text="item.nickName" style="margin: 5px;" />
+      </view>
+    </view>
+
+    <view class="selected-users" v-else>
+      <text class="label">已选人员：</text>
+      <u-tag v-if="chooseUser.nickName" :text="chooseUser.nickName" style="margin: 5px;" />
+    </view>
+
+    <view class="action-buttons">
+      <u-button type="primary" @click="confirmChoose">确认选择</u-button>
+      <u-button @click="clearChoose">清空选择</u-button>
+    </view>
+  </view>
+</template>
+
+<script>
+import { listUser } from "@/api/system/user";
+import { listDept } from "@/api/system/dept";
+
+export default {
+  name: 'ChoosePeople',
+  props: {
+    deptId: {
+      type: Number
+    },
+    multiple: {
+      type: Boolean,
+      default: true
+    },
+    selected: {
+      type: Array,
+      default: () => []
+    }
+  },
+  data() {
+    return {
+      queryParams: {
+        pageNum: 1,
+        pageSize: 100,
+        nickName: '',
+        deptId: undefined
+      },
+      userList: [],
+      deptList: [],
+      chooseUser: this.selected,
+      total: 0,
+      selectedIds: [],
+      allSelectedUsers: []
+    }
+  },
+  created() {
+    this.queryParams.deptId = this.deptId;
+    this.getList();
+    this.getDeptList();
+    this.selectedIds = this.selected.map(user => user.userId);
+    this.allSelectedUsers = [...this.selected];
+  },
+  methods: {
+    getList() {
+      listUser(this.queryParams).then(response => {
+        this.userList = response.rows.filter(item => item.status != '1' && item.status != '2');
+        this.total = response.total;
+        // 更新当前页面的选中状态，保持所有已选用户
+        this.selectedIds = this.userList
+          .filter(item => this.allSelectedUsers.some(selected => selected.userId === item.userId))
+          .map(item => item.userId);
+        this.updateSelectedUsers();
+      });
+    },
+    getDeptList() {
+      listDept().then(res => {
+        this.deptList = res.data
+          .filter(item => item.deptName != '四川中水成勘院测绘工程有限责任公司')
+          .map(item => ({
+            text: item.deptName,
+            value: item.deptId
+          }));
+      });
+    },
+    updateSelectedUsers() {
+      // 合并当前页面选中的用户和其他页面的已选用户
+      const currentPageUsers = this.userList.filter(item => this.selectedIds.includes(item.userId));
+      const otherPageUsers = this.allSelectedUsers.filter(user =>
+        !this.userList.some(item => item.userId === user.userId)
+      );
+      this.chooseUser = [...currentPageUsers, ...otherPageUsers];
+    },
+    isSelected(user) {
+      return this.selectedIds.includes(user.userId);
+    },
+    confirmChoose() {
+      this.$emit('chooseUser', this.chooseUser);
+    },
+    clearChoose() {
+      this.selectedIds = [];
+      this.allSelectedUsers = [];
+      this.chooseUser = this.multiple ? [] : {};
+      this.$emit('clear');
+    },
+    getAgeByIdCard(idCard) {
+      if (!idCard) return '';
+      const yearBirth = idCard.substring(6, 10);
+      const monthBirth = idCard.substring(10, 12);
+      const dayBirth = idCard.substring(12, 14);
+      const now = new Date();
+      const monthNow = now.getMonth() + 1;
+      const dayNow = now.getDate();
+      let age = now.getFullYear() - yearBirth;
+      if (monthNow < monthBirth || (monthNow == monthBirth && dayNow < dayBirth)) {
+        age--;
+      }
+      return age;
+    },
+    handleCheckboxChange(selectedNames) {
+      if (this.multiple) {
+        this.selectedIds = selectedNames;
+        // 更新当前页面的选中用户
+        const currentPageSelectedUsers = this.userList.filter(user => selectedNames.includes(user.userId));
+        // 获取其他页面的已选用户
+        const otherPageUsers = this.allSelectedUsers.filter(user =>
+          !this.userList.some(item => item.userId === user.userId)
+        );
+        // 更新所有已选用户列表
+        this.allSelectedUsers = [...currentPageSelectedUsers, ...otherPageUsers];
+        this.updateSelectedUsers();
+      } else {
+        const lastSelectedId = selectedNames[selectedNames.length - 1];
+        this.selectedIds = lastSelectedId ? [lastSelectedId] : [];
+        this.allSelectedUsers = lastSelectedId ? [this.userList.find(user => user.userId === lastSelectedId)] : [];
+        this.updateSelectedUsers();
+        if (lastSelectedId) {
+          this.confirmChoose();
+        }
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.choose-people {
+  padding: 20rpx;
+
+  .search-form {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 20rpx;
+
+    .search-item {
+      display: flex;
+      align-items: center;
+      gap: 10rpx;
+
+      .label {
+        font-size: 28rpx;
+        color: #333;
+      }
+    }
+  }
+
+  .user-list {
+    margin-bottom: 30rpx;
+    background-color: #fff;
+    border-radius: 12rpx;
+    padding: 20rpx;
+
+    ::v-deep .uv-checkbox {
+      margin: 20rpx 0;
+      padding: 20rpx;
+      border-radius: 8rpx;
+      background-color: #f8f8f8;
+      transition: all 0.3s;
+
+      &:active {
+        background-color: #f0f0f0;
+      }
+
+      &.uv-checkbox--checked {
+        background-color: #e6f7ff;
+        border-color: #1890ff;
+        box-shadow: 0 2rpx 8rpx rgba(24, 144, 255, 0.15);
+      }
+
+      .uv-checkbox__label {
+        font-size: 28rpx;
+        color: #333;
+      }
+    }
+  }
+
+  .pagination {
+    display: flex;
+    justify-content: center;
+    margin: 20rpx 0;
+  }
+
+  .selected-users {
+    margin: 20rpx 0;
+    display: flex;
+    align-items: center;
+    flex-wrap: wrap;
+    gap: 10rpx;
+
+    .label {
+      font-size: 28rpx;
+      color: #333;
+    }
+
+    .tags {
+      display: flex;
+      flex-wrap: wrap;
+      gap: 10rpx;
+    }
+  }
+
+  .action-buttons {
+    display: flex;
+    justify-content: center;
+    gap: 20rpx;
+    margin-top: 30rpx;
+  }
+}
+</style>

oa-ui-app/pages/form/car/car.vue

@@ -34,7 +34,145 @@
         <ProjectPicker :visible.sync="openProject" :selected.sync="selectedProject" @confirm="handleConfirm" />
         <ProjectInfo :project="projectObj"></ProjectInfo>
       </uni-forms-item>
+
+      <!-- 用车事由 -->
+      <uni-forms-item label="用车事由" required class="form-item" name="applyReason">
+        <uv-textarea v-model="form.applyReason" placeholder="请输入用车事由" :disabled="taskName != '用车申请'"></uv-textarea>
+      </uni-forms-item>
+
+      <!-- 用车时间 -->
+      <view class="date-range">
+        <uni-forms-item label="使用日期" required class="form-item" name="dateRange">
+          <uni-datetime-picker v-model="form.dateRange" type="daterange" rangeSeparator="至" :clearIcon="false"
+            v-if="taskName == '用车申请'" @change="handleDateRangeChange" />
+          <view class="date-display" v-else>
+            <uni-icons type="calendar" size="16"></uni-icons>
+            <text class="date-text">{{ form.beginDate }}</text>
+            <text class="date-separator">至</text>
+            <text class="date-text">{{ form.endDate }}</text>
+          </view>
+        </uni-forms-item>
+        <uni-forms-item label="共计" class="form-item">
+          <text>{{ form.days + '天' }}</text>
+        </uni-forms-item>
+      </view>
+
+      <!-- 乘车人数 -->
+      <uni-forms-item label="乘车人数" required class="form-item" name="passengers">
+        <uni-number-box v-model="form.passengers" :min="1" :disabled="taskName != '用车申请'" />
+      </uni-forms-item>
+
+      <view v-if="taskName != '用车申请'">
+        <!-- 部门审核意见 -->
+        <uni-forms-item label="部门审核意见" required class="form-item" v-if="showFormItem('部门审核')" name="deptComment">
+          <uv-textarea v-model="form.deptComment" placeholder="请输入部门审核意见" :disabled="taskName != '部门审核'"></uv-textarea>
+          <auditor :name="form.deptUser ? form.deptUser.nickName : ''" :time="form.deptTime"></auditor>
+        </uni-forms-item>
+
+        <!-- 分管审核意见 -->
+        <uni-forms-item label="分管审核意见" required class="form-item" v-if="showFormItem('分管审核')" name="managerComment">
+          <uv-textarea v-model="form.managerComment" placeholder="请输入分管审核意见"
+            :disabled="taskName != '分管审核'"></uv-textarea>
+          <auditor :name="form.managerUser ? form.managerUser.nickName : ''" :time="form.managerTime"></auditor>
+        </uni-forms-item>
+
+        <!-- 党工团审核意见 -->
+        <uni-forms-item :label="dgtAdvice" required class="form-item" v-if="showFormItem('党工团审核')" name="unionComment">
+          <uv-textarea v-model="form.unionComment" placeholder="请输入审核意见" :disabled="taskName != '党工团审核'"></uv-textarea>
+          <auditor :name="form.unionUser ? form.unionUser.nickName : ''" :time="form.unionTime"></auditor>
+        </uni-forms-item>
+
+        <!-- 总经理审核意见 -->
+        <uni-forms-item label="总经理审核意见" required class="form-item" v-if="showFormItem('总经理审核')" name="gmComment">
+          <uv-textarea v-model="form.gmComment" placeholder="请输入总经理审核意见" :disabled="taskName != '总经理审核'"></uv-textarea>
+          <auditor :name="form.gmUser ? form.gmUser.nickName : ''" :time="form.gmTime"></auditor>
+        </uni-forms-item>
+
+        <!-- 董事长审核意见 -->
+        <uni-forms-item label="董事长审核意见" required class="form-item" v-if="showFormItem('董事长审核')" name="dszComment">
+          <uv-textarea v-model="form.dszComment" placeholder="请输入董事长审核意见" :disabled="taskName != '董事长审核'"></uv-textarea>
+          <auditor :name="form.dszUser ? form.dszUser.nickName : ''" :time="form.dszTime"></auditor>
+        </uni-forms-item>
+      </view>
+      <view v-if="taskName == '' || taskName == '安排用车'">
+        <!-- 安排用车意见 -->
+        <uni-forms-item label="安排用车意见" required class="form-item" name="dispatchComment">
+          <uv-textarea v-model="form.dispatchComment" placeholder="请输入安排用车意见"
+            :disabled="taskName != '安排用车'"></uv-textarea>
+          <auditor :name="form.dispatchUser ? form.dispatchUser.nickName : ''" :time="form.dispatchTime"></auditor>
+        </uni-forms-item>
+
+        <!-- 车牌号选择 -->
+        <uni-forms-item label="车牌号" class="form-item" name="cars">
+          <view class="car-list">
+            <uv-checkbox-group v-model="form.cars" v-if="taskName == '安排用车'">
+              <view class="car-row" v-for="(row, index) in Math.ceil(carList.length / 2)" :key="index">
+                <view class="car-item" v-for="item in carList.slice(index * 2, (index + 1) * 2)" :key="item.carId"
+                  :class="{ 'is-checked': form.cars.includes(item.carId) }">
+                  <uv-checkbox :name="item.carId" :disabled="item.status != 1">
+                    <view class="car-info">
+                      <text class="car-license">{{ item.licensePlate }}</text>
+                      <text class="car-model">{{ item.brand || '' }}{{ item.series || '' }}</text>
+                    </view>
+                  </uv-checkbox>
+                </view>
+              </view>
+            </uv-checkbox-group>
+            <view class="car-row" v-for="(row, index) in Math.ceil(carList.length / 2)" :key="index" v-else>
+              <view class="car-item" v-for="item in carList.slice(index * 2, (index + 1) * 2)" :key="item.carId"
+                :class="{ 'is-checked': form.cars.includes(item.carId) }">
+                <text class="car-license">{{ item.licensePlate }}</text>
+                <text class="car-model">{{ item.brand || '' }}{{ item.series || '' }}</text>
+              </view>
+            </view>
+          </view>
+        </uni-forms-item>
+
+        <!-- 驾驶员选择 -->
+        <uni-forms-item label="驾驶员" class="form-item" name="drivers">
+          <u-button type="primary" v-if="taskName == '安排用车'" @click="openCar = true">+ 选择人员</u-button>
+          <view class="driver-list" v-if="chooseDriver.length > 0">
+            <u-tag v-for="(item, index) in chooseDriver" :plain="true" :key="index" :text="item.nickName"
+              style="margin: 5px;" />
+          </view>
+        </uni-forms-item>
+
+        <!-- 返回日期和行驶公里 -->
+        <uni-forms-item label="返回日期" required class="form-item" name="returnDate">
+          <uni-datetime-picker v-model="form.returnDate" type="datetime" :disabled="taskName != '安排用车'" />
+        </uni-forms-item>
+
+        <uni-forms-item label="行驶公里" class="form-item" name="kilometers">
+          <uv-input v-model="form.kilometers" placeholder="请输入行驶公里" :disabled="taskName != '安排用车'"
+            @input="handleKilometersInput">
+            <template v-slot:suffix>
+              <text>公里</text>
+            </template>
+          </uv-input>
+        </uni-forms-item>
+      </view>
+
+      <!-- 提交按钮 -->
+      <view class="submit-btn" v-if="taskName == '用车申请'">
+        <u-button type="primary" @click="submit">提交申请</u-button>
+      </view>
+      <view v-else>
+        <u-button style="margin-bottom:5px;" type="warning" @click="saves" v-if="taskName == '安排用车'">保存</u-button>
+        <u-button type="primary" @click="completeApply"
+          :disabled="taskName == '安排用车' && !form.returnDate" v-if="taskName">完成审批</u-button>
+      </view>
     </uni-forms>
+
+    <!-- 选择人员弹窗 -->
+    <u-popup :show="openCar" mode="center" round="10" @close="openCar = false">
+      <view class="popup-content">
+        <view class="popup-header">
+          <text class="title">选择驾驶员</text>
+          <u-icon name="close" @click="openCar = false"></u-icon>
+        </view>
+        <choose-people :multiple="true" @chooseUser="getChooseDriver" :deptId="200" @clear="clearChooseDriver" :selected="chooseDriver"></choose-people>
+      </view>
+    </u-popup>
   </view>
 </template>
 
@@ -45,17 +183,21 @@ import { listCar, getCar } from "@/api/oa/car/car";
 import { listCarApproval, getCarApproval, updateCarApproval, addCarApproval, modifyCarApproval } from '@/api/oa/car/carApproval'
 import { listProject, getProject } from "@/api/oa/project/project";
 import { getUserByRole } from "@/api/system/role";
-import { getUsersManageLeader } from '@/api/system/post.js'
+import { getUsersManageLeader, getUserByPost, getUsersDeptLeader } from '@/api/system/post.js'
+import { getUser } from '@/api/system/user';
 import FlowNote from '@/pages/components/flowNote.vue';
 import ProjectPicker from '@/pages/components/ProjectPicker.vue';
 import ProjectInfo from '@/pages/components/ProjectInfo.vue';
 import Auditor from "@/pages/components/auditor.vue";
+import ChoosePeople from "@/pages/components/ChoosePeople.vue";
+
 export default {
   components: {
     FlowNote,
     ProjectPicker,
     ProjectInfo,
-    Auditor
+    Auditor,
+    ChoosePeople,
   },
   props: {
     taskForm: Object,
@@ -67,7 +209,30 @@ export default {
       form: {
         applyDate: '',
         projectId: '',
-        carUsage:'0',
+        carUsage: '0',
+        applyReason: '',
+        beginDate: '',
+        endDate: '',
+        days: 0,
+        passengers: 1,
+        deptComment: null,
+        managerComment: null,
+        unionComment: null,
+        gmComment: null,
+        dszComment: null,
+        dispatchComment: null,
+        cars: [],
+        drivers: [],
+        returnDate: '',
+        kilometers: '',
+        user: {
+          nickName: '',
+        },
+        dept: {
+          deptId: '',
+          deptName: '',
+        },
+        applier: '',
       },
       rules: {},
       openProject: false,
@@ -95,21 +260,192 @@ export default {
         disable: false
       }],
       dept: 0,
+      deptUser: '',
+      managerUser: '',
+      unionUser: '',
+      gmUser: '',
+      dszUser: '',
+      dispatchUser: '',
+      deptTime: undefined,
+      managerTime: undefined,
+      unionTime: undefined,
+      gmTime: undefined,
+      dszTime: undefined,
+      dispatchTime: undefined,
+      carList: [],
+      chooseDriver: [],
+      openCar: false,
+      dgtAdvice: '审核意见',
+    }
+  },
+  computed: {
+    formRules() {
+      return {
+        carUsage: {
+          rules: [{
+            required: this.taskName == '用车申请',
+            errorMessage: '请选择申请用途'
+          }]
+        },
+        projectId: {
+          rules: [{
+            required: this.taskName == '用车申请' && this.form.carUsage == '0',
+            errorMessage: '请选择项目'
+          }]
+        },
+        applyReason: {
+          rules: [{
+            required: this.taskName == '用车申请',
+            errorMessage: '请输入用车事由'
+          }]
+        },
+        dateRange: {
+          rules: [{
+            required: this.taskName == '用车申请',
+            errorMessage: '请选择用车时间'
+          }]
+        },
+        passengers: {
+          rules: [{
+            required: this.taskName == '用车申请',
+            errorMessage: '请输入乘车人数'
+          }]
+        },
+        deptComment: {
+          rules: [{
+            required: this.taskName == '部门审核',
+            errorMessage: '请输入部门审核意见'
+          }]
+        },
+        managerComment: {
+          rules: [{
+            required: this.taskName == '分管审核',
+            errorMessage: '请输入分管审核意见'
+          }]
+        },
+        unionComment: {
+          rules: [{
+            required: this.taskName == '党工团审核',
+            errorMessage: '请输入审核意见'
+          }]
+        },
+        gmComment: {
+          rules: [{
+            required: this.taskName == '总经理审核',
+            errorMessage: '请输入总经理审核意见'
+          }]
+        },
+        dszComment: {
+          rules: [{
+            required: this.taskName == '董事长审核',
+            errorMessage: '请输入董事长审核意见'
+          }]
+        },
+        dispatchComment: {
+          rules: [{
+            required: this.taskName == '安排用车',
+            errorMessage: '请输入安排用车意见'
+          }]
+        },
+        cars: {
+          rules: [{
+            required: this.taskName == '安排用车',
+            errorMessage: '请选择车牌号'
+          }]
+        },
+        drivers: {
+          rules: [{
+            required: this.taskName == '安排用车',
+            errorMessage: '请选择驾驶员'
+          }]
+        },
+        returnDate: {
+          rules: [{
+            required: true,
+            errorMessage: '请选择归还日期',
+            validateFunction: (rule, value, data, callback) => {
+              if (this.taskName === '安排用车' && !value) {
+                callback('请选择归还日期');
+              } else {
+                callback();
+              }
+            }
+          }]
+        },
+        kilometers: {
+          rules: [{
+            required: this.taskName == '安排用车',
+            errorMessage: '请输入行驶公里'
+          }]
+        }
+      }
+    }
+  },
+  watch: {
+    formRules: {
+      handler(newVal) {
+        this.rules = newVal;
+      },
+      immediate: true
     }
   },
   created() {
     this.applierUserName = this.startUserName;
     this.initForm();
+    this.getCarList();
+    this.getDriverList();
   },
   methods: {
     initForm() {
       getCarApproval(this.taskForm.formId).then(res => {
         if (res.data) {
-
+          let data = res.data;
+          if (data.carUsage == '2') {
+            this.dept = 0;
+            this.dgtAdvice = '工会审核意见'
+          } else if (data.carUsage == '3') {
+            this.dept = 0;
+            this.dgtAdvice = '党委审核意见'
+          } else if (data.carUsage == '4') {
+            this.dept = 0;
+            this.dgtAdvice = '团委审核意见'
+          }
+          if (res.data.drivers) {
+            data.drivers = data.drivers.split(',').map(Number);
+            this.chooseDriver = [];
+            for (let d of data.drivers) {
+              getUser(Number(d)).then(res => {
+                this.chooseDriver.push(res.data)
+              })
+            }
+          } else {
+            data.drivers = []
+          }
+          if (res.data.cars) {
+            data.cars = data.cars.split(',').map(Number);
+          } else {
+            data.cars = []
+          }
+          this.form = data;
+          if (data.projectId) {
+            getProject(data.projectId).then(response => {
+              this.projectObj = response.data;
+            })
+          }
+          this.calculateDay();
+          this.initAuditor();
         } else {
           this.form.applyDate = parseTime(new Date(), "{y}-{m}-{d}");
+          this.form.user.nickName = this.$store.getters.name;
+          this.form.applier = this.$store.getters.userId;
+          this.form.useDept = this.$store.getters.deptId;
+          this.dept = this.$store.getters.deptId;
+          this.form.dept.deptName = this.$store.getters.deptName;
         }
       })
+    },
+    initAuditor() {
+
     },
     handleConfirm(project) {
       this.selectedProject = project;
@@ -117,15 +453,400 @@ export default {
       this.form.projectId = project.projectId;
     },
     hanldeChangeType(val) {
-      if (val == '2' || val == '3' || val == '4') {
+      let value = val.detail.value
+      if (value == '2' || value == '3' || value == '4') {
         this.dept = 0;
+        this.form.projectId = '';
       }
       else
         this.dept = this.$store.getters.deptId;
-    }
+    },
+    handleDateRangeChange(e) {
+      if (Array.isArray(e) && e.length === 2) {
+        const [start, end] = e;
+        this.form.beginDate = start;
+        this.form.endDate = end;
+        this.form.dateRange = [start, end];
+        this.calculateDay();
+      }
+    },
+    calculateDay() {
+      if (this.form.beginDate && this.form.endDate) {
+        const begin = new Date(this.form.beginDate);
+        const end = new Date(this.form.endDate);
+        if (!isNaN(begin.getTime()) && !isNaN(end.getTime())) {
+          this.form.days = Math.ceil((end - begin) / (1000 * 60 * 60 * 24)) + 1;
+        }
+      }
+    },
+    getCarList() {
+      listCar({
+        pageNum: 1,
+        pageSize: 99999999,
+      }).then(response => {
+        this.carList = response.rows;
+      })
+    },
+    getDriverList() {
+      getUserByPost({ postName: '驾驶员' }).then(response => {
+        this.driverList = response.data;
+      })
+    },
+    getChooseDriver(val) {
+      this.chooseDriver = val;
+      if (val.length != 0) {
+        let drivers = []
+        for (let d of this.chooseDriver) {
+          drivers.push(d.userId)
+        }
+        this.form.drivers = drivers;
+      }
+      this.openCar = false;
+    },
+    clearChooseDriver() {
+      this.chooseDriver = [];
+      this.form.drivers = [];
+    },
+    submit() {
+      this.$refs.form.validate().then(() => {
+        this.$modal.confirm('是否提交用车申请？').then(() => {
+          this.form.carApplyId = this.taskForm.formId;
+          let jsonForm = JSON.stringify(this.form);
+          this.form.cars = '';
+          this.form.drivers = '';
+          addCarApproval(this.form).then((res) => {
+            if (res.code == 200) {
+              getNextFlowNode({ taskId: this.taskForm.taskId }).then(res => {
+                this.getNextFlowNodeApproval().then(() => {
+                  uni.showToast({
+                    title: '提交成功',
+                    icon: 'success'
+                  });
+                  setTimeout(() => {
+                    uni.switchTab({
+                      url: '/pages/message/index'
+                    });
+                  }, 500);
+                });
+              })
+            }
+          })
+        })
+      }).catch(error => {
+        console.log(error)
+      })
+    },
+    saves() {
+      if (this.taskName == '安排用车') {
+        if (!this.form.dispatchComment) {
+          uni.showToast({
+            title: '请填写安排用车意见',
+            icon: 'none'
+          });
+          return
+        }
+      }
+      let jsonForm = JSON.stringify(this.form);
+      modifyCarApproval(jsonForm).then(res => {
+        uni.showToast({
+          title: '保存成功',
+          icon: 'success'
+        });
+      });
+    },
+    completeApply() {
+      this.$refs.form.validate().then(() => {
+        if (this.form.deptComment === '') this.form.deptComment = null;
+        if (this.form.managerComment === '') this.form.managerComment = null;
+        if (this.form.unionComment === '') this.form.unionComment = null;
+        if (this.form.gmComment === '') this.form.gmComment = null;
+        if (this.form.dszComment === '') this.form.dszComment = null;
+        if (this.form.dispatchComment === '') this.form.dispatchComment = null;
+        this.form.formId = this.taskForm.formId;
+        this.form.carApplyId = this.taskForm.formId;
+        let jsonForm = JSON.stringify(this.form);
+        modifyCarApproval(jsonForm).then(res => {
+          if (res.code == 200) {
+            uni.showModal({
+              title: '提示',
+              content: '是否提交审批？',
+              success: (res) => {
+                if (res.confirm) {
+                  getNextFlowNode({ taskId: this.taskForm.taskId }).then(res => {
+                    const data = res.data;
+                    this.getNextFlowNodeApproval().then(() => {
+                      uni.showToast({
+                        title: '提交成功',
+                        icon: 'success'
+                      });
+                      setTimeout(() => {
+                        uni.switchTab({
+                          url: '/pages/message/index'
+                        });
+                      }, 500);
+                    });
+                  })
+                } else {
+                  reject(new Error('用户取消提交'));
+                }
+              }
+            });
+          }
+        })
+
+      }).catch(() => {
+        uni.showToast({
+          title: '必填项未填写完毕',
+          icon: 'none'
+        });
+      })
+    },
+    getNextFlowNodeApproval() {
+      return new Promise((resolve, reject) => {
+        const handleComplete = () => {
+          complete(this.taskForm).then(response => {
+            uni.showToast({
+              title: response.msg,
+              icon: 'success'
+            });
+            resolve();
+          }).catch(error => {
+            reject(error);
+          });
+        };
+
+        const setApprovalAndComplete = (approval) => {
+          this.$set(this.taskForm.variables, "approval", approval);
+          handleComplete();
+        };
+
+        const setApprovalListAndComplete = (approvalList) => {
+          this.$set(this.taskForm.variables, "approvalList", approvalList);
+          handleComplete();
+        };
+
+        if (this.taskName == '用车申请') {
+          this.$set(this.taskForm.variables, "dept", this.dept);
+
+          if (this.dept == 101) {
+            getUserByPost({ postName: '董事长' }).then(result => {
+              setApprovalAndComplete(result.data[0].userId);
+            }).catch(error => {
+              reject(error);
+            });
+          } else if (this.dept == 102) {
+            getUserByPost({ postName: '总经理' }).then(result => {
+              setApprovalAndComplete(result.data[0].userId);
+            }).catch(error => {
+              reject(error);
+            });
+          } else if (this.dept == 0) {
+            const postName = this.getChooseType();
+            getUserByPost({ postName }).then(result => {
+              setApprovalAndComplete(result.data[0].userId);
+            }).catch(error => {
+              reject(error);
+            });
+          } else {
+            getUsersDeptLeader({ userId: this.$store.getters.userId }).then(res => {
+              if (res.data) {
+                setApprovalAndComplete(res.data.userId);
+              } else {
+                reject(new Error('未找到部门领导'));
+              }
+            }).catch(error => {
+              reject(error);
+            });
+          }
+        } else if (this.taskName == '部门审核') {
+          getUsersManageLeader({ userId: this.$store.getters.userId }).then(res => {
+            const userId = res.data.map(user => user.userId);
+            setApprovalListAndComplete(userId);
+          }).catch(error => {
+            reject(error);
+          });
+        } else if (['分管审核', '党工团审核', '总经理审核', '董事长审核'].includes(this.taskName)) {
+          getUserByRole({ roleId: 5 }).then(result => {
+            setApprovalListAndComplete(result.data);
+          }).catch(error => {
+            reject(error);
+          });
+        } else if (this.taskName == '安排用车') {
+          uni.showModal({
+            title: '提示',
+            content: '最后一个节点，提交将结束流程，是否提交？',
+            success: (res) => {
+              if (res.confirm) {
+                handleComplete();
+              } else {
+                reject(new Error('用户取消提交'));
+              }
+            }
+          });
+        }
+      });
+    },
+    getChooseType() {
+      if (this.form.carUsage == '2') {
+        return '党总支书记'
+      }
+      else if (this.form.carUsage == '3') {
+        return '工会主席'
+      }
+      else
+        return '团委书记'
+    },
+    showFormItem(name) {
+      let isShow = false;
+      if (name == '部门审核')
+        isShow = (this.dept > 102 && this.taskName == '用车申请') || (this.taskName == '部门审核' || this.taskName == '分管审核') || ((this.taskName == '安排用车' || this.taskName == '') && this.form.deptUserId != null);
+      else if (name == '分管审核')
+        isShow = (this.dept > 102 && this.taskName == '用车申请') || (this.taskName == '部门审核' || this.taskName == '分管审核') || ((this.taskName == '安排用车' || this.taskName == '') && this.form.managerUserId != null);
+      else if (name == '党工团审核')
+        isShow = (this.dept == 0 && this.taskName == '用车申请') || this.taskName == '党工团审核' || ((this.taskName == '安排用车' || this.taskName == '') && this.form.unionUserId != null);
+      else if (name == '总经理审核')
+        isShow = (this.dept == 102 && this.taskName == '用车申请') || this.taskName == '总经理审核' || ((this.taskName == '安排用车' || this.taskName == '') && this.form.gmUserId != null);
+      else if (name == '董事长审核')
+        isShow = (this.dept == 101 && this.taskName == '用车申请') || this.taskName == '董事长审核' || ((this.taskName == '安排用车' || this.taskName == '') && this.form.dszUserId != null);
+      else if (name == '部门审核签名')
+        isShow = (this.taskName == '部门审核' || this.taskName == '分管审核') || ((this.taskName == '安排用车' || this.taskName == '') && this.form.deptUserId != null);
+      else if (name == '分管审核签名')
+        isShow = this.taskName == '分管审核' || ((this.taskName == '安排用车' || this.taskName == '') && this.form.managerUserId != null);
+      else if (name == '党工团审核签名')
+        isShow = this.taskName == '党工团审核' || ((this.taskName == '安排用车' || this.taskName == '') && this.form.unionUserId != null);
+      else if (name == '总经理审核签名')
+        isShow = this.taskName == '总经理审核' || ((this.taskName == '安排用车' || this.taskName == '') && this.form.gmUserId != null);
+      else if (name == '董事长审核签名')
+        isShow = this.taskName == '董事长审核' || ((this.taskName == '安排用车' || this.taskName == '') && this.form.dszUserId != null);
+      return isShow;
+    },
+    handleKilometersInput(val) {
+      // 只允许输入数字
+      this.form.kilometers = val.replace(/[^\d]/g, '');
+    },
   },
 }
-
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.form-container {
+  padding: 20rpx;
+}
+
+.form-title {
+  text-align: center;
+  margin-bottom: 30rpx;
+
+  .title-text {
+    font-size: 36rpx;
+    font-weight: bold;
+  }
+
+  .title-line {
+    height: 2rpx;
+    background-color: #eee;
+    margin-top: 20rpx;
+  }
+}
+
+.custom-form {
+  .form-item {
+    // margin-bottom: 30rpx;
+  }
+}
+
+.date-range {
+  align-items: center;
+  gap: 20rpx;
+}
+
+.date-text {
+  margin: 0 10px;
+  font-weight: bold;
+}
+
+.car-list {
+  padding: 20rpx 0;
+
+  .car-row {
+    display: flex;
+    justify-content: space-between;
+    margin-bottom: 20rpx;
+  }
+
+  .car-item {
+    width: calc(50vw - 50rpx);
+    background-color: #f8f8f8;
+    border-radius: 12rpx;
+    padding: 20rpx;
+    transition: all 0.3s;
+    margin: 0 3px;
+    border: 2rpx solid transparent;
+
+    &:active {
+      background-color: #f0f0f0;
+    }
+
+    // 选中状态的样式
+    &.is-checked {
+      background-color: #e6f7ff;
+      border-color: #1890ff;
+      box-shadow: 0 2rpx 8rpx rgba(24, 144, 255, 0.15);
+    }
+
+    .car-info {
+      display: flex;
+      flex-direction: column;
+      gap: 8rpx;
+
+      .car-license {
+        font-size: 32rpx;
+        font-weight: bold;
+        color: #333;
+      }
+
+      .car-model {
+        font-size: 24rpx;
+        color: #666;
+      }
+    }
+  }
+}
+
+.driver-list {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 20rpx;
+  margin-top: 20rpx;
+}
+
+.auditor-info {
+  margin-top: 20rpx;
+  display: flex;
+  justify-content: space-between;
+  color: #666;
+  font-size: 24rpx;
+}
+
+.popup-content {
+  width: 90vw;
+  max-height: 80vh;
+  background-color: #fff;
+  border-radius: 20rpx;
+  overflow: hidden;
+
+  .popup-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 30rpx;
+    border-bottom: 2rpx solid #f5f5f5;
+
+    .title {
+      font-size: 32rpx;
+      font-weight: bold;
+      color: #333;
+    }
+  }
+}
+</style>

oa-ui-app/pages/form/declare/declare.vue

@@ -222,7 +222,6 @@ export default {
 	},
 	methods: {
 		handleConfirm(project) {
-			console.log('选中的项目:', project);
 			this.selectedProject = project;
 			this.projectObj = project;
 		},
@@ -235,8 +234,6 @@ export default {
 				if (res.data) {
 					this.hasForm = true;
 					this.formData = res.data;
-					console.log(this.formData);
-
 					if (!this.applierUserName) {
 						this.applierUserName = this.formData.user.nickName;
 					}
@@ -296,9 +293,7 @@ export default {
 			})
 		},
 		countMoney() {
-			console.log(this.formData);
 			let result = Number(this.formData.price) * Number(this.formData.workLoad) * Number(this.formData.coefficient)
-			console.log(result);
 			this.money = result.toFixed(2)
 		},
 		async save() {

oa-ui-app/pages/index.vue

@@ -1,43 +1,576 @@
 <template>
-  <view class="content">
-    <image class="logo" src="@/static/logo.png"></image>
-    <view class="text-area">
-      <text class="title">Hello RuoYi</text>
+  <view class="container">
+    <!-- 搜索栏 -->
+    <view class="search-box">
+      <view class="search-header" @tap="toggleSearch">
+        <text class="search-title">搜索条件</text>
+        <text class="search-icon">{{ isSearchExpanded ? '收起' : '展开' }}</text>
+      </view>
+      
+      <view class="search-content" v-if="isSearchExpanded">
+        <view class="search-item">
+          <text>项目编号</text>
+          <input v-model="queryParams.projectNumber" placeholder="请输入项目编号" @confirm="handleQuery" />
+        </view>
+        <view class="search-item">
+          <text>项目名称</text>
+          <input v-model="queryParams.projectName" placeholder="请输入项目名称" @confirm="handleQuery" />
+        </view>
+        <view class="search-item">
+          <text>项目负责人</text>
+          <picker mode="selector" :range="userList" range-key="text" @change="handleLeaderChange">
+            <view class="picker">
+              <text>{{ selectedLeader || '请选择项目负责人' }}</text>
+            </view>
+          </picker>
+        </view>
+        <view class="search-item">
+          <text>承担部门</text>
+          <picker mode="selector" :range="deptList" range-key="text" @change="handleDeptChange">
+            <view class="picker">
+              <text>{{ selectedDept || '请选择承担部门' }}</text>
+            </view>
+          </picker>
+        </view>
+        <view class="search-item">
+          <text>其他关键字</text>
+          <input v-model="queryParams.queryString" placeholder="请输入关键字" @confirm="handleQuery" />
+        </view>
+        <view class="search-buttons">
+          <button type="primary" size="mini" @tap="handleQuery">搜索</button>
+          <button type="default" size="mini" @tap="resetQuery">重置</button>
+        </view>
+      </view>
+    </view>
+
+    <!-- 项目列表 -->
+    <view class="list-box">
+      <view class="list-header">
+        <text class="title">测绘项目列表</text>
+        <view class="header-btns">
+          <button type="primary" size="mini" @tap="handleRegister">登记项目</button>
+          <button type="default" size="mini" @tap="handleExport">导出项目</button>
+        </view>
+      </view>
+
+      <scroll-view 
+        scroll-y 
+        class="list-scroll"
+        @scrolltolower="loadMore"
+        :refresher-enabled="true"
+        :refresher-triggered="isRefreshing"
+        @refresherrefresh="onRefresh"
+      >
+        <view class="list-content">
+          <view class="project-card" v-for="(item, index) in projectList" :key="index">
+            <!-- 卡片头部 -->
+            <view class="card-header">
+              <view class="header-left">
+                <text class="project-name">{{ item.projectName }}</text>
+                <text class="status-tag" :class="item.isFinished === '0' ? 'success' : 'warning'">
+                  {{ item.isFinished === '0' ? '进行中' : '已结束' }}
+                </text>
+              </view>
+              <text class="level-tag" :class="item.projectLevel === '0' ? 'info' : 'error'">
+                {{ item.projectLevel === '0' ? '一般项目' : '重大项目' }}
+              </text>
+            </view>
+
+            <!-- 卡片内容 -->
+            <view class="card-content">
+              <view class="info-row">
+                <text class="label">项目编号：</text>
+                <text class="value">{{ item.projectNumber }}</text>
+              </view>
+              <view class="info-row">
+                <text class="label">合同编码：</text>
+                <text class="value">{{ item.contract ? item.contract.contractCode : '未关联' }}</text>
+              </view>
+              <view class="info-row">
+                <text class="label">承担部门：</text>
+                <text class="value">{{ item.undertakingDeptName }}</text>
+              </view>
+              <view class="info-row">
+                <text class="label">项目负责人：</text>
+                <text class="value">{{ item.projectLeaderUser ? item.projectLeaderUser.nickName : '' }}</text>
+              </view>
+              <view class="info-row">
+                <text class="label">项目类型：</text>
+                <text class="value">{{ item.projectType }}</text>
+              </view>
+              <view class="info-row">
+                <text class="label">项目进度：</text>
+                <view class="progress-box">
+                  <progress :percent="item.percentage" :activeColor="getProgressColor(item.percentage)" />
+                  <text class="progress-text">{{ item.percentage }}%</text>
+                </view>
+              </view>
+            </view>
+
+            <!-- 卡片底部 -->
+            <view class="card-footer">
+              <button type="primary" size="mini" @tap="handleView(item)">查看</button>
+              <button type="warn" size="mini" @tap="handleDelete(item)">删除</button>
+              <button type="default" size="mini" @tap="handleRelate(item)">关联合同</button>
+            </view>
+          </view>
+        </view>
+      </scroll-view>
+
+      <!-- 加载更多 -->
+      <view class="load-more" v-if="projectList.length > 0">
+        <text v-if="hasMore">上拉加载更多</text>
+        <text v-else>没有更多数据了</text>
+      </view>
     </view>
   </view>
 </template>
 
 <script>
-  export default {
-    onLoad: function() {
+import { listProject, listProjectFuzzy, delProject } from "@/api/oa/project/project";
+import { getProjectProgress } from "@/api/oa/project/projectProgress";
+import { listDept } from '@/api/system/dept';
+import { listUser } from '@/api/system/user';
+
+export default {
+  data() {
+    return {
+      isSearchExpanded: false,
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        projectNumber: '',
+        projectLeader: '',
+        projectName: '',
+        queryString: '',
+        undertakingDept: ''
+      },
+      projectList: [],
+      total: 0,
+      loading: false,
+      userList: [],
+      deptList: [],
+      selectedLeader: '',
+      selectedDept: '',
+      hasMore: true,
+      isRefreshing: false
+    }
+  },
+  onLoad() {
+    this.getList();
+    this.getDeptList();
+    this.getUserList();
+  },
+  methods: {
+    toggleSearch() {
+      this.isSearchExpanded = !this.isSearchExpanded;
+    },
+    
+    resetQuery() {
+      this.queryParams = {
+        pageNum: 1,
+        pageSize: 10,
+        projectNumber: '',
+        projectLeader: '',
+        projectName: '',
+        queryString: '',
+        undertakingDept: ''
+      };
+      this.selectedLeader = '';
+      this.selectedDept = '';
+      this.handleQuery();
+    },
+    
+    async getList() {
+      this.loading = true;
+      try {
+        const response = this.queryParams.queryString ? 
+          await listProjectFuzzy(this.queryParams) : 
+          await listProject(this.queryParams);
+        
+        if (this.queryParams.pageNum === 1) {
+          this.projectList = response.rows;
+        } else {
+          this.projectList = [...this.projectList, ...response.rows];
+        }
+        
+        this.total = response.total;
+        this.hasMore = this.projectList.length < this.total;
+        
+        for (let project of this.projectList) {
+          const res = await getProjectProgress(project.projectId);
+          if (res.data && res.data.length > 0) {
+            project.percentage = Number(res.data[res.data.length - 1].percentage);
+          } else {
+            project.percentage = 0;
+          }
+          if (project.isFinished === '1') {
+            project.percentage = 100;
+          }
+        }
+      } catch (error) {
+        uni.showToast({
+          title: '获取数据失败',
+          icon: 'none'
+        });
+      } finally {
+        this.loading = false;
+        this.isRefreshing = false;
+      }
+    },
+    
+    async getDeptList() {
+      try {
+        const res = await listDept({});
+        this.deptList = res.data.map(item => ({
+          value: item.deptId,
+          text: item.deptName
+        }));
+      } catch (error) {
+        uni.showToast({
+          title: '获取部门列表失败',
+          icon: 'none'
+        });
+      }
+    },
+    
+    async getUserList() {
+      try {
+        const res = await listUser({ pageNum: 1, pageSize: 9999 });
+        this.userList = res.rows.map(item => ({
+          value: item.userId,
+          text: item.nickName
+        }));
+      } catch (error) {
+        uni.showToast({
+          title: '获取用户列表失败',
+          icon: 'none'
+        });
+      }
+    },
+    
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    
+    handleLeaderChange(e) {
+      const index = e.detail.value;
+      this.queryParams.projectLeader = this.userList[index].value;
+      this.selectedLeader = this.userList[index].text;
+      this.handleQuery();
+    },
+    
+    handleDeptChange(e) {
+      const index = e.detail.value;
+      this.queryParams.undertakingDept = this.deptList[index].value;
+      this.selectedDept = this.deptList[index].text;
+      this.handleQuery();
+    },
+    
+    handleView(row) {
+      uni.navigateTo({
+        url: `/pages/project/info?id=${row.projectId}&projectName=${encodeURIComponent(row.projectName)}`
+      });
+    },
+    
+    handleDelete(row) {
+      uni.showModal({
+        title: '提示',
+        content: `是否确认删除项目编号为"${row.projectNumber}"的数据项？`,
+        success: async (res) => {
+          if (res.confirm) {
+            try {
+              await delProject(row.projectId);
+              this.getList();
+              uni.showToast({
+                title: '删除成功',
+                icon: 'success'
+              });
+            } catch (error) {
+              uni.showToast({
+                title: '删除失败',
+                icon: 'none'
+              });
+            }
+          }
+        }
+      });
+    },
+    
+    handleRegister() {
+      uni.navigateTo({
+        url: '/pages/project/register'
+      });
+    },
+    
+    handleExport() {
+      uni.showToast({
+        title: '导出功能开发中',
+        icon: 'none'
+      });
+    },
+    
+    handleRelate(row) {
+      uni.showToast({
+        title: '关联合同功能开发中',
+        icon: 'none'
+      });
+    },
+    
+    loadMore() {
+      if (this.hasMore) {
+        this.queryParams.pageNum++;
+        this.getList();
+      }
+    },
+    
+    onRefresh() {
+      this.isRefreshing = true;
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    
+    getProgressColor(percentage) {
+      if (!percentage) return '#ff4d4f';
+      if (percentage <= 20) return '#ff4d4f';
+      if (percentage <= 50) return '#faad14';
+      if (percentage <= 80) return '#1890ff';
+      return '#52c41a';
     }
   }
+}
 </script>
 
 <style>
-  .content {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-  }
+.container {
+  padding: 20rpx;
+  background-color: #f5f5f5;
+  height: 100vh;
+  display: flex;
+  flex-direction: column;
+}
 
-  .logo {
-    height: 200rpx;
-    width: 200rpx;
-    margin-top: 200rpx;
-    margin-left: auto;
-    margin-right: auto;
-    margin-bottom: 50rpx;
-  }
+.search-box {
+  background-color: #fff;
+  border-radius: 8rpx;
+  margin-bottom: 20rpx;
+  overflow: hidden;
+}
 
-  .text-area {
-    display: flex;
-    justify-content: center;
-  }
+.search-header {
+  padding: 20rpx;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  border-bottom: 1px solid #ebeef5;
+}
 
-  .title {
-    font-size: 36rpx;
-    color: #8f8f94;
-  }
+.search-title {
+  font-size: 32rpx;
+  font-weight: bold;
+  color: #333;
+}
+
+.search-icon {
+  font-size: 28rpx;
+  color: #909399;
+}
+
+.search-content {
+  padding: 20rpx;
+}
+
+.search-item {
+  margin-bottom: 20rpx;
+}
+
+.search-item text {
+  display: block;
+  margin-bottom: 10rpx;
+  font-size: 28rpx;
+  color: #333;
+}
+
+.search-item input,
+.search-item .picker {
+  width: 100%;
+  height: 80rpx;
+  padding: 0 20rpx;
+  border: 1px solid #dcdfe6;
+  border-radius: 4rpx;
+  box-sizing: border-box;
+}
+
+.search-item .picker {
+  line-height: 80rpx;
+  color: #606266;
+}
+
+.search-buttons {
+  display: flex;
+  gap: 20rpx;
+  margin-top: 20rpx;
+}
+
+.search-buttons button {
+  flex: 1;
+}
+
+.list-box {
+  flex: 1;
+  background-color: #fff;
+  border-radius: 8rpx;
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+}
+
+.list-header {
+  padding: 20rpx;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  border-bottom: 1px solid #ebeef5;
+}
+
+.title {
+  font-size: 32rpx;
+  font-weight: bold;
+}
+
+.header-btns {
+  display: flex;
+  gap: 20rpx;
+}
+
+.list-scroll {
+  flex: 1;
+  height: 0;
+}
+
+.list-content {
+  padding: 20rpx;
+}
+
+.project-card {
+  background-color: #fff;
+  border-radius: 8rpx;
+  margin-bottom: 20rpx;
+  box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.1);
+  overflow: hidden;
+}
+
+.card-header {
+  padding: 20rpx;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  border-bottom: 1px solid #ebeef5;
+  background-color: #fafafa;
+}
+
+.header-left {
+  display: flex;
+  align-items: center;
+  gap: 20rpx;
+}
+
+.project-name {
+  font-size: 32rpx;
+  font-weight: bold;
+  color: #333;
+}
+
+.status-tag,
+.level-tag {
+  padding: 4rpx 12rpx;
+  border-radius: 4rpx;
+  font-size: 24rpx;
+}
+
+.success {
+  background-color: #f0f9eb;
+  color: #67c23a;
+}
+
+.warning {
+  background-color: #fdf6ec;
+  color: #e6a23c;
+}
+
+.info {
+  background-color: #f4f4f5;
+  color: #909399;
+}
+
+.error {
+  background-color: #fef0f0;
+  color: #f56c6c;
+}
+
+.card-content {
+  padding: 20rpx;
+}
+
+.info-row {
+  display: flex;
+  align-items: center;
+  margin-bottom: 16rpx;
+}
+
+.info-row:last-child {
+  margin-bottom: 0;
+}
+
+.info-row .label {
+  width: 160rpx;
+  color: #909399;
+  font-size: 28rpx;
+}
+
+.info-row .value {
+  flex: 1;
+  color: #333;
+  font-size: 28rpx;
+}
+
+.progress-box {
+  flex: 1;
+  display: flex;
+  align-items: center;
+  gap: 20rpx;
+}
+
+.progress-box progress {
+  flex: 1;
+}
+
+.progress-text {
+  width: 80rpx;
+  text-align: right;
+  color: #333;
+  font-size: 28rpx;
+}
+
+.card-footer {
+  display: flex;
+  justify-content: flex-end;
+  gap: 20rpx;
+  padding: 20rpx;
+  border-top: 1px solid #ebeef5;
+  background-color: #fafafa;
+}
+
+.card-footer button {
+  margin: 0;
+  padding: 0 30rpx;
+}
+
+.load-more {
+  text-align: center;
+  padding: 20rpx;
+  color: #909399;
+  font-size: 28rpx;
+}
 </style>

oa-ui-app/pages/message/completed/index.vue

@@ -1,21 +1,342 @@
 <!--
  * @Author: ysh
  * @Date: 2025-02-19 15:30:13
- * @LastEditors: 
- * @LastEditTime: 2025-02-19 15:30:40
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2025-05-23 16:00:38
 -->
 <template>
-  <view>
+  <view class="page-container">
+    <!-- 搜索框 -->
+    <view class="search-box">
+      <uni-search-bar radius="34" placeholder="请输入流程名称" @input="inputChange" v-model="queryParams.name" />
+    </view>
+    <!-- 流程列表 -->
+    <mescroll-uni ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback" :down="downOption"
+      :up="upOption" :fixed="false" :top="10" style="padding: 30rpx;">
+      <view>
+        <view v-for="(item, index) in finishedList" :key="index">
+          <view class="list-item">
+            <!-- 状态与标题行 -->
+            <view class="header-line">
+              <text class="proc-name" style="font-weight: bold; font-size: 30rpx; color: #FF5733;">{{ item.procDefName }}</text>
+            </view>
 
+            <!-- 主要内容 -->
+            <view class="content-box">
+              <!-- 标题 -->
+              <view class="title-box">
+                <uni-icons type="info" size="16" color="#666" class="title-icon"></uni-icons>
+                <text class="title-text">{{ item.title }}</text>
+              </view>
+
+              <!-- 信息分割线 -->
+              <uv-divider :dashed="true" margin="10rpx 0"></uv-divider>
+
+              <!-- 详细信息 -->
+              <view class="detail-grid">
+                <view class="detail-item">
+                  <uni-icons type="person" size="14" color="#999"></uni-icons>
+                  <text class="detail-text">{{ item.startUserName }}</text>
+                  <uni-tag style="margin-left: 10rpx;" :text="item.startDeptName" type="info" size="mini" />
+                </view>
+
+                <view class="detail-item">
+                  <uni-icons type="calendar" size="14" color="#999"></uni-icons>
+                  <text class="detail-text">{{ item.createTime }}</text>
+                </view>
+
+                <view class="detail-item">
+                  <uni-icons type="clock" size="14" color="#999"></uni-icons>
+                  <text class="detail-text">{{ item.duration }}</text>
+                </view>
+
+                <view class="detail-item">
+                  <uni-icons type="location" size="14" color="#999"></uni-icons>
+                  <text class="detail-text">{{ item.taskName }}</text>
+                </view>
+              </view>
+            </view>
+
+            <!-- 操作按钮 -->
+            <view class="action-box">
+              <text class="view-detail" @click="handleFlowRecord(item)">办理进度</text>
+              <text class="view-detail" @click="handleFlowNote(item)">表单信息</text>
+              <text class="view-detail" @click="handleRevoke(item)" :class="{ disabled: beDisabled(item) }">撤回</text>
+            </view>
+          </view>
+        </view>
+      </view>
+    </mescroll-uni>
+
+    <!-- 菜单抽屉 -->
+    <uni-drawer ref="drawer" mode="right" :width="300">
+      <flow-record :rows="selectedItem" v-if="active == 'record'"></flow-record>
+    </uni-drawer>
   </view>
 </template>
 
 <script>
-  export default {
-    
+import { debounce } from 'lodash-es';
+import MescrollMixin from '@/uni_modules/mescroll/components/mescroll-uni/mescroll-mixins.js'
+import { finishedList, revokeProcess } from "@/api/flowable/finished";
+import { getProcessVariables } from "@/api/flowable/definition";
+import FlowRecord from '@/pages/components/flowable/FlowRecord.vue';
+
+export default {
+  components: { FlowRecord },
+  mixins: [MescrollMixin],
+  data() {
+    return {
+      mescroll: null, // mescroll实例
+      // 已办任务列表数据
+      finishedList: [],
+      total: 0,
+      queryParams: {
+        name: '',
+        pageNum: 1,
+        pageSize: 10
+      },
+      selectedItem: null, // 当前选中项
+      active: 'record',
+      downOption: {
+        auto: true,
+        textOutOffset: '下拉刷新',
+        textLoading: '加载中...'
+      },
+      upOption: {
+        auto: false,
+        page: { num: 1, size: 10 },
+        noMoreSize: 5,
+        empty: { tip: '暂无已办任务' },
+        textNoMore: '~ 没有更多任务了 ~'
+      }
+    }
+  },
+  onLoad: function (options) {
+    uni.startPullDownRefresh();
+  },
+  methods: {
+    // 初始化mescroll
+    mescrollInit(mescroll) {
+      this.mescroll = mescroll;
+    },
+    // mescroll下拉刷新回调
+    async downCallback() {
+      this.finishedList = []; // 清空列表
+      this.queryParams.pageNum = 1
+      const res = await this.loadData()
+      this.finishedList = res.data.list;
+      this.mescroll.endSuccess(res.data.length)
+      this.mescroll.endErr()
+      uni.stopPullDownRefresh();
+    },
+    // mescroll上拉加载回调
+    async upCallback(page) {
+      this.queryParams.pageNum = page.num
+      const res = await this.loadData()
+      this.finishedList = this.finishedList.concat(res.data.list)
+      this.mescroll.endSuccess(res.data.list.length, res.data.hasNextPage)
+    },
+    // 加载数据
+    async loadData() {
+      try {
+        const res = await finishedList(this.queryParams)
+        return {
+          data: {
+            list: res.data.records,
+          }
+        }
+      } catch (e) {
+        this.mescroll.endErr()
+        return { data: { list: [] } }
+      }
+    },
+    // 输入变化处理
+    inputChange(res) {
+      this.queryParams.name = res;
+      this.search();
+    },
+    // 执行搜索
+    search() {
+      this.loadData()
+      this.downCallback()
+    },
+    // 办理进度
+    handleFlowRecord(row) {
+      this.active = 'record';
+      this.selectedItem = row;
+      this.$refs.drawer.open();
+    },
+    // 表单信息
+    handleFlowNote(row) {
+      getProcessVariables(row.taskId).then(res => {
+        if (res.data) {
+          const query = {
+            procInsId: row.procInsId,
+            executionId: row.executionId,
+            deployId: row.deployId,
+            taskId: row.taskId,
+            taskName: '',
+            startUserName: row.startUserName,
+            procDefName: row.procDefName,
+            formId: res.data.formId
+          }
+          const encodedParams = encodeURIComponent(JSON.stringify(query));
+          uni.navigateTo({
+            url: `/pages/message/apply/detail?params=${encodedParams}`
+          })
+        }
+      })
+    },
+    // 撤回任务
+    handleRevoke(row) {
+      if (this.beDisabled(row)) return;
+
+      uni.showModal({
+        title: '提示',
+        content: '确定撤回任务吗？',
+        success: (res) => {
+          if (res.confirm) {
+            const params = {
+              instanceId: row.procInsId,
+              taskId: row.taskId
+            }
+            revokeProcess(params).then(res => {
+              this.$modal.msgSuccess(res.msg);
+              this.upCallback();
+            });
+          }
+        }
+      });
+    },
+    // 判断是否禁用撤回
+    beDisabled(row) {
+      if (row.procDefName == '项目流转' && row.taskName == '项目安排') {
+        return true
+      }
+      return false
+    }
   }
+}
 </script>
 
 <style lang="scss" scoped>
+.list-item {
+  padding: 24rpx;
+  background: #fff;
+  border-radius: 16rpx;
+  margin-bottom: 20rpx;
+  box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.08);
+  width: 100%;
+}
+
+/* 头部状态行 */
+.header-line {
+  display: flex;
+  align-items: center;
+  margin-bottom: 20rpx;
+}
+
+.proc-name {
+  font-size: 30rpx;
+  color: #333;
+  font-weight: 500;
+  margin-left: 16rpx;
+}
+
+.status-tag {
+  transform: translateY(-2rpx);
+}
+
+/* 内容区域 */
+.content-box {
+  padding: 12rpx 0;
+}
+
+.title-box {
+  display: flex;
+  align-items: center;
+  margin-bottom: 16rpx;
+}
+
+.title-icon {
+  margin-right: 8rpx;
+}
+
+.title-text {
+  font-size: 28rpx;
+  color: #333;
+  font-weight: 600;
+}
+
+/* 详细信息网格 */
+.detail-grid {
+  display: grid;
+  grid-template-columns: repeat(2, 1fr);
+  gap: 16rpx 24rpx;
+  margin-top: 20rpx;
+}
+
+.detail-item {
+  display: flex;
+  align-items: center;
+}
+
+.detail-text {
+  font-size: 24rpx;
+  color: #666;
+  margin-left: 8rpx;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+/* 操作区域 */
+.action-box {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-top: 24rpx;
+  padding-top: 16rpx;
+  border-top: 1rpx solid #eee;
+}
+
+.view-detail {
+  color: #2979FF;
+  font-size: 26rpx;
+  padding: 8rpx 16rpx;
+  border-radius: 8rpx;
+  background: #f5f7fa;
+}
+
+.view-detail.disabled {
+  color: #c0c4cc;
+  pointer-events: none;
+}
+
+/* 添加点击态效果 */
+.action-box:active {
+  background: #f8f8f8;
+  transform: scale(0.98);
+  transition: all 0.2s;
+}
+
+/* 状态标签增强 */
+.status-tag {
+  padding: 4rpx 12rpx !important;
+  border-radius: 8rpx !important;
+}
+
+/* 颜色增强 */
+.proc-name {
+  color: #1a1a1a;
+}
+
+.title-text {
+  color: #2d2d2d;
+}
 
+/* 图标颜色统一 */
+.detail-item uni-icons {
+  color: #909399 !important;
+}
 </style>

oa-ui-app/pages/message/index.vue

@@ -2,14 +2,10 @@
  * @Author: ysh
  * @Date: 2025-01-21 10:01:39
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-03-19 16:21:31
+ * @LastEditTime: 2025-05-23 16:08:41
 -->
 <template>
 	<view class="u-page container">
-		<view class="send" @click="openSendFlow">
-			<!-- <uv-icon name="bell-fill" color="#2979ff" size="50"></uv-icon> -->
-			<uni-icons type="paperplane-filled" size="50" color="#2979ff"></uni-icons>
-		</view>
 		<scroll-view class="scroll-list" scroll-y="true">
 			<view class="uni-list">
 				<view class="uni-list-cell">
@@ -30,6 +26,20 @@
 						</view>
 					</view>
 				</view>
+				<view class="uni-list-cell">
+					<view class="uni-media-list" @click="openSendFlow">
+						<view style="margin-right: 20rpx;">
+							<u-image :fade="false" src="@/static/images/message/sendFlow.png" width="40px" height="40px"></u-image>
+						</view>
+						<view class="uni-media-list-body">
+							<view class="uni-media-list-text-top"><span>发起流程</span>
+							</view>
+							<view class="uni-media-list-text-bottom">
+								<uni-text><span>发起新流程</span></uni-text>
+							</view>
+						</view>
+					</view>
+				</view>
 				<view class="uni-list-cell">
 					<view class="uni-media-list" @click="$tab.navigateTo('/pages/message/completed/index')">
 						<view style="margin-right: 20rpx;">
@@ -143,7 +153,7 @@ export default {
 		sendFlow(row) {
 			uni.showModal({
 				title: '提示',
-				content: '是否发起《'+row.name+'》流程？',
+				content: '是否发起《' + row.name + '》流程？',
 				success: (res) => {
 					if (!res.confirm) {
 						return;
@@ -215,16 +225,6 @@ export default {
 	// position: relative;
 }
 
-.send {
-	position: absolute;
-	right: 0px;
-	bottom: 10px;
-	width: 50px;
-	height: 50px;
-	background-color: #fff;
-	border-radius: 4px;
-}
-
 .bottom-popup {
 	max-height: 50vh;
 	margin-bottom: 65px;

oa-ui-app/pages/message/myProcess/index.vue

@@ -2,79 +2,71 @@
  * @Author: ysh
  * @Date: 2025-02-19 15:36:34
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-04-11 15:33:30
+ * @LastEditTime: 2025-05-23 15:42:14
 -->
 <template>
   <view class="page-container">
     <!-- 搜索框 -->
     <view class="search-box">
-      <uni-search-bar radius="34" placeholder="请输入流程名称" @confirm="search" @input="inputChange"
-        v-model="queryParams.procDefName" />
-    </view>
-    <view>
-      <!-- <uv-sticky bgColor="#fff">
-        <uv-tabs :list="[{ name: '进行中' }, { name: '已完成' }]" :current="activeTabs" @click="switchTabs"></uv-tabs>
-      </uv-sticky> -->
+      <uni-search-bar radius="34" placeholder="请输入流程名称" @input="inputChange" v-model="queryParams.name" />
     </view>
     <!-- 流程列表 -->
     <mescroll-uni ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback" :down="downOption"
-      :up="upOption" :fixed="false" :top="10">
-      <uni-list>
-        <uni-list-item v-for="(item, index) in myProcessList" :key="index">
-          <template v-slot:body>
-            <view class="list-item">
-              <!-- 状态与标题行 -->
-              <view class="header-line">
-                <uni-tag :text="item.finishTime ? '已完成' : '进行中'" :type="item.finishTime ? 'success' : 'warning'"
-                  size="small" class="status-tag" />
-                <text class="proc-name">{{ item.procDefName }}</text>
+      :up="upOption" :fixed="false" :top="10" style="padding: 30rpx;">
+      <view>
+        <view v-for="(item, index) in myProcessList" :key="index">
+          <view class="list-item">
+            <!-- 状态与标题行 -->
+            <view class="header-line">
+              <uni-tag :text="item.finishTime ? '已完成' : '进行中'" :type="item.finishTime ? 'success' : 'warning'"
+                size="small" class="status-tag" />
+              <text class="proc-name">{{ item.procDefName }}</text>
+            </view>
+
+            <!-- 主要内容 -->
+            <view class="content-box">
+              <!-- 标题 -->
+              <view class="title-box">
+                <uni-icons type="info" size="16" color="#666" class="title-icon"></uni-icons>
+                <text class="title-text">{{ item.title }}</text>
               </view>
 
-              <!-- 主要内容 -->
-              <view class="content-box">
-                <!-- 标题 -->
-                <view class="title-box">
-                  <uni-icons type="info" size="16" color="#666" class="title-icon"></uni-icons>
-                  <text class="title-text">{{ item.title }}</text>
+              <!-- 信息分割线 -->
+              <uv-divider :dashed="true" margin="10rpx 0"></uv-divider>
+
+              <!-- 详细信息 -->
+              <view class="detail-grid">
+                <view class="detail-item">
+                  <uni-icons type="calendar" size="14" color="#999"></uni-icons>
+                  <text class="detail-text">{{ item.createTime }}</text>
                 </view>
 
-                <!-- 信息分割线 -->
-                <uv-divider :dashed="true" margin="10rpx 0"></uv-divider>
-
-                <!-- 详细信息 -->
-                <view class="detail-grid">
-                  <view class="detail-item">
-                    <uni-icons type="calendar" size="14" color="#999"></uni-icons>
-                    <text class="detail-text">{{ item.createTime }}</text>
-                  </view>
-
-                  <view class="detail-item">
-                    <uni-icons type="clock" size="14" color="#999"></uni-icons>
-                    <text class="detail-text">{{ item.duration }}</text>
-                  </view>
-
-                  <view class="detail-item">
-                    <uni-icons type="location" size="14" color="#999"></uni-icons>
-                    <text class="detail-text">{{ item.taskName }}</text>
-                  </view>
-
-                  <view class="detail-item">
-                    <uni-icons type="person" size="14" color="#999"></uni-icons>
-                    <text class="detail-text">{{ item.assigneeName || '暂无待办人' }}</text>
-                  </view>
+                <view class="detail-item">
+                  <uni-icons type="clock" size="14" color="#999"></uni-icons>
+                  <text class="detail-text">{{ item.duration }}</text>
+                </view>
+
+                <view class="detail-item">
+                  <uni-icons type="location" size="14" color="#999"></uni-icons>
+                  <text class="detail-text">{{ item.taskName }}</text>
                 </view>
-              </view>
 
-              <!-- 操作按钮 -->
-              <view class="action-box">
-                <text class="view-detail">查看详情</text>
-                <uni-icons type="more-filled" size="20" color="#666" @click="showAction(item)"
-                  class="action-icon"></uni-icons>
+                <view class="detail-item">
+                  <uni-icons type="person" size="14" color="#999"></uni-icons>
+                  <text class="detail-text">{{ item.assigneeName || '暂无待办人' }}</text>
+                </view>
               </view>
             </view>
-          </template>
-        </uni-list-item>
-      </uni-list>
+
+            <!-- 操作按钮 -->
+            <view class="action-box">
+              <text class="view-detail">查看详情</text>
+              <uni-icons type="more-filled" size="20" color="#666" @click="showAction(item)"
+                class="action-icon"></uni-icons>
+            </view>
+          </view>
+        </view>
+      </view>
     </mescroll-uni>
 
     <!-- 操作菜单 -->
@@ -119,7 +111,7 @@ export default {
       myProcessList: [],
       total: 0,
       queryParams: {
-        keyword: '',
+        name: '',
         pageNum: 1,
         pageSize: 10
       },
@@ -128,12 +120,12 @@ export default {
       clickRow: {},
       active: 'record',
       downOption: {
-        auto: false, // 手动初始化后需要关闭自动加载
+        auto: true, // 手动初始化后需要关闭自动加载
         textOutOffset: '下拉刷新',
         textLoading: '加载中...'
       },
       upOption: {
-        auto: true, // 自动加载初始页
+        auto: false, // 自动加载初始页
         page: { num: 1, size: 10 }, // 初始页码和每页数量
         noMoreSize: 5, // 数据不足时显示"没有更多"
         empty: { tip: '暂无待审任务' },
@@ -142,11 +134,7 @@ export default {
     }
   },
   created() {
-    // 在生命周期中创建防抖方法
-    // this.debounceSearch = debounce(() => {
-    //   this.search()
-    // }, 500)
-    // this.getMyprogressList();
+
   },
   onLoad: function (options) {
     uni.startPullDownRefresh();
@@ -185,12 +173,11 @@ export default {
         return {
           data: {
             list: res.data.records,
-            hasNextPage: res.hasNextPage
           }
         }
       } catch (e) {
         this.mescroll.endErr()
-        return { data: { list: [], hasNextPage: false } }
+        return { data: { list: [] } }
       }
     },
     getMyprogressList() {
@@ -209,14 +196,15 @@ export default {
       this.$refs.actionPopup.open()
     },
     // 输入变化处理
-    inputChange() {
-      this.debounceSearch()
+    inputChange(res) {
+      this.queryParams.name = res;
+      this.search();
     },
 
     // 执行搜索
     search() {
       this.loadData()
-      this.mescroll.resetUpScroll()
+      this.downCallback()
     },
 
     handleFlowRecord(row) {
@@ -281,7 +269,7 @@ export default {
   padding: 24rpx;
   background: #fff;
   border-radius: 16rpx;
-  margin: 16rpx 24rpx;
+  margin-bottom: 20rpx;
   box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.08);
   width: 100%;
 }

oa-ui-app/pages/mine/about/index.vue

@@ -1,9 +1,15 @@
+<!--
+ * @Author: ysh
+ * @Date: 2025-01-16 11:17:08
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2025-05-23 16:11:40
+-->
 <template>
   <view class="about-container">
     <view class="header-section text-center">
       <image style="width: 150rpx;height: 150rpx;" src="/static/logo.png" mode="widthFix">
       </image>
-      <uni-title type="h2" title="CMC综合办公移动端"></uni-title>
+      <uni-title type="h2" title="CMC智联云枢办公系统移动端"></uni-title>
     </view>
 
     <view class="content-section">
@@ -14,19 +20,19 @@
             <view class="text-right">v{{version}}</view>
           </view>
         </view>
-        <view class="list-cell list-cell-arrow">
+        <!-- <view class="list-cell list-cell-arrow">
           <view class="menu-item-box">
             <view>公司网站</view>
             <view class="text-right">
               <uni-link :href="url" :text="url" showUnderLine="false"></uni-link>
             </view>
           </view>
-        </view>
+        </view> -->
       </view>
     </view>
 
     <view class="copyright">
-      <view>Copyright &copy; 2025 cmc All Rights Reserved.</view>
+      <view>Copyright &copy; 2025 CMC All Rights Reserved.</view>
     </view>
   </view>
 </template>
@@ -35,7 +41,7 @@
   export default {
     data() {
       return {
-        url: getApp().globalData.config.appInfo.site_url,
+        // url: getApp().globalData.config.appInfo.site_url,
         version: getApp().globalData.config.appInfo.version
       }
     }

oa-ui-app/pages/mine/index.vue

@@ -26,7 +26,7 @@
     </view>
 
     <view class="content-section">
-      <view class="mine-actions grid col-4 text-center">
+      <!-- <view class="mine-actions grid col-4 text-center">
         <view class="action-item" @click="handleJiaoLiuQun">
           <view class="iconfont icon-friendfill text-pink icon"></view>
           <text class="text">交流群</text>
@@ -43,21 +43,21 @@
           <view class="iconfont icon-dianzan text-green icon"></view>
           <text class="text">点赞我们</text>
         </view>
-      </view>
+      </view> -->
 
       <view class="menu-list">
-        <view class="list-cell list-cell-arrow" @click="handleToEditInfo">
+        <!-- <view class="list-cell list-cell-arrow" @click="handleToEditInfo">
           <view class="menu-item-box">
             <view class="iconfont icon-user menu-icon"></view>
             <view>编辑资料</view>
           </view>
-        </view>
-        <view class="list-cell list-cell-arrow" @click="handleHelp">
+        </view> -->
+        <!-- <view class="list-cell list-cell-arrow" @click="handleHelp">
           <view class="menu-item-box">
             <view class="iconfont icon-help menu-icon"></view>
             <view>常见问题</view>
           </view>
-        </view>
+        </view> -->
         <view class="list-cell list-cell-arrow" @click="handleAbout">
           <view class="menu-item-box">
             <view class="iconfont icon-aixin menu-icon"></view>