更新

src/layout/modules/TopMenuBar.vue

@@ -58,8 +58,7 @@ watch(() => [
 //设置菜单数据
 const setBarMenuData = () => {
     const {key, path, title, noMenuBar} = barRoutes.value
-    console.log(noMenuBar)
-    if (['home'].indexOf(key) === -1) {
+    if (key !== 'home' && !noMenuBar) {
         const index = barMenuData.value.findIndex(item => item.key === key)
         if (index === -1) {
             barMenuData.value.push({

src/router/modules/base.js

@@ -1,6 +1,6 @@
 import Layout from "~src/layout/index.vue";
 
-//路由菜单系统内置页面配置
+//路由菜单系统内置页面配置, noMenuBar: true 不显示在菜单栏记录里
 export default [
     {
         path: '/',

src/views/home/components/TaskTable.vue

@@ -1,12 +1,17 @@
 <template>
     <HcCard>
         <template #header>
-            <div class="w-36">
+            <div class="w-36 mr-4" v-if="isTableKey !== 'to-do'">
                 <el-select v-model="searchForm.reportType" block clearable placeholder="选择审批状态" size="large">
                     <el-option v-for="item in reportTypes" :label="item.name" :value="item.key"/>
                 </el-select>
             </div>
-            <div class="w-36 ml-4">
+            <div class="w-36 mr-4">
+                <el-select v-model="searchForm.reporting" block clearable placeholder="选择上报类型" size="large">
+                    <el-option v-for="item in reportings" :label="item.name" :value="item.key"/>
+                </el-select>
+            </div>
+            <div class="w-36">
                 <el-date-picker class="block" v-model="searchForm.startTime" type="month" value-format="YYYY-MM" placeholder="开始日期" clearable size="large"/>
             </div>
             <div class="mx-2">~</div>
@@ -66,12 +71,19 @@ const props = defineProps({
 //变量
 const isTableKey = ref(props.tableKey);
 const reportTypes = ref([
-    {name: '所有', key: '0'},
-    {name: '已审批', key: '1'},
     {name: '待审批', key: '2'},
     {name: '已驳回', key: '3'},
 ])
 
+//选择上报类型
+const reportings = ref([
+    {name: '任务审批', key: '1'},
+    {name: '采购审批', key: '2'},
+    {name: '用车审批', key: '3'},
+    {name: '报销审批', key: '4'},
+    {name: '借款审批', key: '5'},
+])
+
 //监听
 watch(() => [
     props.tableKey,
@@ -81,7 +93,7 @@ watch(() => [
 
 //搜索表单
 const searchForm = ref({
-    reportType: null, startTime: null, endTime: null,
+    reportType: null, startTime: null, endTime: null, reporting: null,
     current: 1, size: 20, total: 0
 })
 

src/views/home/task-details.vue

@@ -3,7 +3,7 @@
         <HcCardItem>
             <div class="hac-task-name-box">
                 <div class="label">任务名称</div>
-                <div class="name">【任务描述】申请【任务转移】</div>
+                <div class="name">【上报人】向您发起【任务审批】审批</div>
             </div>
             <div class="hac-task-text-box">
                 <span>上报类型：废除任务</span>
@@ -23,31 +23,19 @@
                 <el-form-item label="变更类别：" prop="type" size="large">
                     <el-radio-group v-model="formModel.type" size="large">
                         <el-radio label="1">已完成</el-radio>
-                        <el-radio label="2">延期执行</el-radio>
-                        <el-radio label="3">任务转移</el-radio>
+                        <el-radio label="2" class="ml-4">任务转移</el-radio>
                     </el-radio-group>
                 </el-form-item>
                 <el-form-item label="完成时间：" prop="finish_time" class="w-72" v-if="formModel.type === '1'">
                     <el-date-picker class="block" v-model="formModel.finish_time" format="YYYY-MM-DD" type="date" value-format="YYYY-MM-DD"/>
                 </el-form-item>
-                <el-form-item label="延期时间：" prop="delay_time" class="w-72" v-if="formModel.type === '2'">
-                    <el-date-picker class="block" v-model="formModel.delay_time" format="YYYY-MM-DD" type="date" value-format="YYYY-MM-DD"/>
+                <el-form-item label="转移时间：" prop="transfer" class="w-72" v-if="formModel.type === '2'">
+                    <el-date-picker class="block" v-model="formModel.transfer" format="YYYY-MM-DD" type="date" value-format="YYYY-MM-DD"/>
                 </el-form-item>
-                <el-form-item label="延期原因：" prop="delay_cause" v-if="formModel.type === '2'">
-                    <el-input v-model="formModel.delay_cause" :autosize="{ minRows: 3, maxRows: 5 }" placeholder="请输入文字说明" type="textarea"/>
-                </el-form-item>
-                <div class="flex" v-if="formModel.type === '3'">
-                    <el-form-item label="转移时间：" prop="transfer" class="w-64 mr-4">
-                        <el-date-picker class="block" v-model="formModel.transfer" format="YYYY-MM-DD" type="date" value-format="YYYY-MM-DD"/>
-                    </el-form-item>
-                    <el-form-item label="转移后剩余工作任务完成日期：" prop="complete" class="w-96 ml-4">
-                        <el-date-picker class="block" v-model="formModel.complete" format="YYYY-MM-DD" type="date" value-format="YYYY-MM-DD"/>
-                    </el-form-item>
-                </div>
-                <el-form-item label="转移对象：" prop="type" size="large" v-if="formModel.type === '3'">
+                <el-form-item label="转移对象：" prop="type" size="large" v-if="formModel.type === '2'">
                     <div class="form-item-div">张三</div>
                 </el-form-item>
-                <el-form-item label="转移原因：" prop="textContent" v-if="formModel.type === '3'">
+                <el-form-item label="转移原因：" prop="textContent" v-if="formModel.type === '2'">
                     <el-input v-model="formModel.textContent" :autosize="{ minRows: 3, maxRows: 5 }" placeholder="请输入文字说明" type="textarea"/>
                 </el-form-item>
             </el-form>
@@ -98,16 +86,14 @@ onActivated(() => {
 
 //任务表格
 const tableColumn = [
-    {key: 'taskName', name: '任务名称'},
-    {key: 'description', name: '任务描述'},
-    {key: 'date', name: '完成日期', width: '160', align: 'center'},
-    {key: 'status', name: '状态', width: '100', align: 'center'},
+    {key: 'taskName', name: '所属项目'},
+    {key: 'description', name: '任务描述'}
 ]
 const tableData = ref([
-    {taskName: '【任务描述】申请【任务转移】', description: '任务描述。。。。。', date: '2022-02-01', status: '已完成'},
-    {taskName: '【任务描述】申请【任务转移】', description: '任务描述。。。。。', date: '2022-02-01', status: '已完成'},
-    {taskName: '【任务描述】申请【任务转移】', description: '任务描述。。。。。', date: '2022-02-01', status: '已完成'},
-    {taskName: '【任务描述】申请【任务转移】', description: '任务描述。。。。。', date: '2022-02-01', status: '已完成'},
+    {taskName: '所属项目', description: '任务描述。。。。。'},
+    {taskName: '所属项目', description: '任务描述。。。。。'},
+    {taskName: '所属项目', description: '任务描述。。。。。'},
+    {taskName: '所属项目', description: '任务描述。。。。。'}
 ])
 
 //任务操作数据