Merge remote-tracking branch 'origin/master'

src/api/modules/home/task.js

@@ -0,0 +1,21 @@
+import {httpApi} from "../../request/httpApi";
+
+export default {
+    //分页获取列表
+    async getPage(form, msg = true) {
+        return httpApi({
+            url: '/api/blade-control/approve/task/page',
+            method: 'post',
+            data: form
+        }, msg);
+    },
+    //审批管理任务详情
+    async getDetail(form, msg = true) {
+        return httpApi({
+            url: '/api/blade-control/approve/task/detail',
+            method: 'get',
+            parmas: form
+        }, msg);
+    },
+
+}

src/api/modules/task/plan.js

@@ -9,5 +9,13 @@ export default {
             data: form
         }, msg);
     },
+    //计划任务变更状态
+    async submit(form, msg = false) {
+        return httpApi({
+            url: '/api/blade-control/approve/task/plan/submit',
+            method: 'post',
+            data: form
+        }, msg);
+    },
  
 }

src/views/home/components/TaskTable.vue

@@ -2,7 +2,7 @@
     <HcCard>
         <template #header>
             <div class="w-36 mr-4" v-if="isTableKey !== 'to-do'">
-                <el-select v-model="searchForm.reportType" block clearable placeholder="选择审批状态" size="large">
+                <el-select v-model="searchForm.selectStatus" block clearable placeholder="选择审批状态" size="large">
                     <el-option v-for="item in reportTypes" :label="item.name" :value="item.key"/>
                 </el-select>
             </div>
@@ -35,10 +35,11 @@
             <template #taskName="{row}">
                 <span class="text-blue text-hover" @click="rowNameClick(row)">{{row.taskName}}</span>
             </template>
-            <template #auditStatus="{row}">
-                <span class="text-green" v-if="row.auditStatus === '1'">已审核</span>
-                <span class="text-orange" v-if="row.auditStatus === '2'">待审批</span>
-                <template v-if="row.auditStatus === '3'">
+            <template #status="{row}">
+                <span class="text-orange" v-if="row.status === 0">未上报</span>
+                <span class="text-orange" v-if="row.status === 1">待审批</span>
+                <span class="text-green" v-if="row.status === 2">已审批</span>
+                <template v-if="row.status === 3">
                     <el-popover placement="top-start" title="驳回原因" :width="200" :hide-after="0" content="这里是驳回原因说明内容">
                         <template #reference>
                             <span class="text-red">已驳回</span>
@@ -54,9 +55,10 @@
 </template>
 
 <script setup>
-import {ref, nextTick, watch} from "vue";
+import {ref, nextTick, watch,onMounted} from "vue";
 import {useRouter} from 'vue-router'
 import {getArrValue} from "js-fast-way"
+import taskApi from '~api/home/task.js';
 
 const router = useRouter()
 
@@ -71,29 +73,32 @@ const props = defineProps({
 //变量
 const isTableKey = ref(props.tableKey);
 const reportTypes = ref([
-    {name: '待审批', key: '2'},
-    {name: '已驳回', key: '3'},
+    {name: '待审批', key: 2},
+    {name: '已驳回', key: 3},
 ])
 
 //选择上报类型
 const reportings = ref([
-    {name: '任务审批', key: '1'},
-    {name: '采购审批', key: '2'},
-    {name: '用车审批', key: '3'},
-    {name: '报销审批', key: '4'},
-    {name: '借款审批', key: '5'},
+    {name: '任务审批', key: 1},
+    {name: '采购审批', key: 2},
+    {name: '用车审批', key: 3},
+    {name: '报销审批', key: 4},
+    {name: '借款审批', key: 5},
 ])
-
+onMounted(()=>{
+    getTableData()
+})
 //监听
 watch(() => [
     props.tableKey,
 ], ([Key]) => {
     isTableKey.value = Key
+    getTableData()
 })
 
 //搜索表单
 const searchForm = ref({
-    reportType: null, startTime: null, endTime: null, reporting: null,
+    selectStatus: null, startTime: null, endTime: null, reporting: null,selectType:parseInt(isTableKey.value),
     current: 1, size: 20, total: 0
 })
 
@@ -107,9 +112,10 @@ const searchClick = () => {
 //重置
 const resetClick = () => {
     searchForm.value = {
-        reportType: null, startTime: null, endTime: null,
+        selectStatus: null, startTime: null, endTime: null,selectType:parseInt(isTableKey.value),
         current: 1, size: 20, total: 0
     }
+    getTableData()
 }
 
 //分页被点击
@@ -125,10 +131,10 @@ const tableColumn = ref([
     {key: 'taskName', name: '任务名称'},
     {key: 'reportDate', name: '上报日期', width: '160', align: 'center'},
     {key: 'auditDate', name: '审核日期', width: '160', align: 'center'},
-    {key: 'reportType', name: '上报类型', width: '120', align: 'center'},
-    {key: 'auditStatus', name: '审核状态', width: '100', align: 'center'},
-    {key: 'informant', name: '上报人', width: '120', align: 'center'},
-    {key: 'auditor', name: '审核人', width: '120', align: 'center'},
+    {key: 'reportTypeName', name: '上报类型', width: '120', align: 'center'},
+    {key: 'status', name: '审核状态', width: '100', align: 'center'},
+    {key: 'reportUserName', name: '上报人', width: '120', align: 'center'},
+    {key: 'auditUserNames', name: '审核人', width: '120', align: 'center'},
 ])
 const tableData = ref([
     {id: 1, taskName: '【上报人】向您发起【任务审批】审批', reportDate: '2022-02-01', auditDate: '2022-02-01', reportType: '任务审批', auditStatus: '1', informant: '张三', auditor: '李四'},
@@ -139,8 +145,19 @@ const tableData = ref([
     {id: 6, taskName: '【上报人】向您发起【任务审批】审批', reportDate: '2022-02-01', auditDate: '2022-02-01', reportType: '出差申请', auditStatus: '1', informant: '张三', auditor: '李四'},
     {id: 7, taskName: '【上报人】向您发起【任务审批】审批', reportDate: '2022-02-01', auditDate: '2022-02-01', reportType: '外包支付', auditStatus: '1', informant: '张三', auditor: '李四'},
 ])
-const getTableData = () => {
+const getTableData = async() => {
     //const key = isTableKey.value
+    tableLoading.value = true
+    const {error, code, data} = await taskApi.getPage(searchForm.value)
+    //判断状态
+    tableLoading.value = false
+    if (!error && code === 200) {
+        tableData.value = getArrValue(data['records'])
+        searchForm.value.total = data['total'] || 0
+    } else {
+        tableData.value = []
+        searchForm.value.total = 0
+    }
 }
 
 //任务名称被点击

src/views/home/task/task-details.vue

@@ -131,6 +131,7 @@
 <script setup>
 import {onActivated, ref} from "vue";
 import {useRouter, useRoute} from 'vue-router'
+import taskApi from '~api/home/task.js';
 
 //初始变量
 const router = useRouter()

src/views/home/task/task.vue

@@ -1,16 +1,16 @@
 <template>
     <HcTabsSimple :cur="tabsKey" :datas="tabsData" @tabClick="tabsClick">
-        <template #tab-to-do>
-            <TaskTable :tableKey="tabsKey" v-if="tabsKey === 'to-do'"/>
+        <template #tab-1>
+            <TaskTable :tableKey="tabsKey" v-if="tabsKey === '1'"/>
         </template>
-        <template #tab-done>
-            <TaskTable :tableKey="tabsKey" v-if="tabsKey === 'done'"/>
+        <template #tab-2>
+            <TaskTable :tableKey="tabsKey" v-if="tabsKey === '2'"/>
         </template>
-        <template #tab-initiated>
-            <TaskTable :tableKey="tabsKey" v-if="tabsKey === 'initiated'"/>
+        <template #tab-3>
+            <TaskTable :tableKey="tabsKey" v-if="tabsKey === '3'"/>
         </template>
-        <template #tab-copied>
-            <TaskTable :tableKey="tabsKey" v-if="tabsKey === 'copied'"/>
+        <template #tab-4>
+            <TaskTable :tableKey="tabsKey" v-if="tabsKey === '4'"/>
         </template>
     </HcTabsSimple>
 </template>
@@ -19,13 +19,14 @@
 import {ref, watch} from "vue";
 import TaskTable from "../components/TaskTable.vue";
 
+
 //选项卡
-const tabsKey = ref('to-do')
+const tabsKey = ref('1')
 const tabsData = ref([
-    {icon: 'time', label: '待办任务', key: 'to-do'},
-    {icon: 'calendar-check', label: '已办任务', key: 'done'},
-    {icon: 'user-shared', label: '我发起的任务', key: 'initiated'},
-    {icon: 'user-received', label: '抄送给我的', key: 'copied'},
+    {icon: 'time', label: '待办任务', key: '1'},
+    {icon: 'calendar-check', label: '已办任务', key: '2'},
+    {icon: 'user-shared', label: '我发起的任务', key: '3'},
+    {icon: 'user-received', label: '抄送给我的', key: '4'},
 ])
 
 const tabsClick = (key) => {

src/views/task/plan/components/TaskTable.vue

@@ -2,14 +2,12 @@
     <HcCard>
         <template #header>
             <div class="w-36">
-                <el-select v-model="searchForm.department" block clearable placeholder="选择部门" size="large">
-                    <el-option label="研发部门" value="1"/>
-                    <el-option label="业务部门" value="2"/>
-                    <el-option label="人事部门" value="3"/>
+                <el-select v-model="searchForm.deptId" block clearable placeholder="选择部门" size="large">
+                    <el-option v-for="item in department" :label="item.deptName" :value="item.id"/>
                 </el-select>
             </div>
             <div class="w-36 ml-2">
-                <el-select v-model="searchForm.state" block clearable placeholder="选择计划状态" size="large">
+                <el-select v-model="searchForm.taskStatus" block clearable placeholder="选择计划状态" size="large">
                     <el-option label="未完成" value="1"/>
                     <el-option label="已完成" value="2"/>
                     <el-option label="逾期完成" value="3"/>
@@ -57,21 +55,21 @@
                 <div class="hac-dialog-form">
                     <HcCardItem scrollbar>
                         <el-form ref="formRef" :model="formModel" :rules="formRules" label-width="">
-                            <el-form-item label="变更类别：" prop="type" size="large">
-                                <el-radio-group v-model="formModel.type" size="large">
+                            <el-form-item label="变更类别：" prop="updateType" size="large">
+                                <el-radio-group v-model="formModel.updateType" size="large">
                                     <el-radio label="1">已完成</el-radio>
                                     <el-radio label="2" class="ml-8">任务转移</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 label="完成时间：" prop="completionTime" class="w-72" v-if="formModel.updateType === '1'">
+                                <el-date-picker class="block" v-model="formModel.completionTime" format="YYYY-MM-DD HH:mm:ss" type="date" value-format="YYYY-MM-DD HH:mm:ss"/>
                             </el-form-item>
-                            <template v-if="formModel.type === '2'">
+                            <template v-if="formModel.updateType === '2'">
                                 <el-form-item label="转移时间：" prop="transfer" class="w-72">
-                                    <el-date-picker class="block" v-model="formModel.transfer" format="YYYY-MM-DD" type="date" value-format="YYYY-MM-DD"/>
+                                    <el-date-picker class="block" v-model="formModel.completionTime" format="YYYY-MM-DD HH:mm:ss" type="date" value-format="YYYY-MM-DD HH:mm:ss"/>
                                 </el-form-item>
                                 <el-form-item label="转移对象：" prop="type" size="large">
-                                    <el-select class="block" v-model="formModel.user" multiple filterable allow-create default-first-option :reserve-keyword="false">
+                                    <el-select class="block" v-model="formModel.transferObject" multiple filterable allow-create default-first-option :reserve-keyword="false">
                                         <el-option label="张三" value="1"/>
                                         <el-option label="李四" value="2"/>
                                         <el-option label="王五" value="3"/>
@@ -79,7 +77,7 @@
                                     </el-select>
                                 </el-form-item>
                                 <el-form-item label="转移原因：" prop="textContent">
-                                    <el-input v-model="formModel.textContent" :autosize="{ minRows: 3, maxRows: 5 }" placeholder="请输入文字说明" type="textarea"/>
+                                    <el-input v-model="formModel.transferReason" :autosize="{ minRows: 3, maxRows: 5 }" placeholder="请输入文字说明" type="textarea"/>
                                 </el-form-item>
                             </template>
                         </el-form>
@@ -94,15 +92,28 @@
 <script setup>
 import {ref, nextTick, watch,onMounted,onActivated} from "vue";
 import {useRouter} from 'vue-router'
-import {getArrValue} from "js-fast-way"
+import {getArrValue,getObjValue,formValidate,arrToId} from "js-fast-way"
 import planApi from '~api/task/plan.js';
+import { getdepartmentList} from "~api/other";
 
 const router = useRouter()
 onActivated(()=>{
     getTableData()
+    getDepartmentDict()
    
 })
+const department=ref([])
+//获取部门列表
+const getDepartmentDict=async()=>{
+    const {error, code, data} = await getdepartmentList({deptType:2})
+    if (!error && code === 200) {
+        department.value = getArrValue(data)
+
+    } else {
+        department.value = []
 
+    }
+}
 //参数
 const props = defineProps({
     tableKey: {
@@ -162,11 +173,7 @@ const tableColumn = ref([
     {key: 'startAndEndDate', name: '计划起止日期', width: '220', align: 'center'},
     {key: 'taskUserName', name: '任务人', width: '120', align: 'center'},
 ])
-const tableData = ref([
-    {id: 1, name: 'xxxxx', key: '未完成', key1: 'xxxxxxxxxx', key2: 'xxxxxxxx', key3: '2022-02-01', key4: '张三'},
-    {id: 2, name: 'xxxxx', key: '未完成', key1: 'xxxxxxxxxx', key2: 'xxxxxxxx', key3: '2022-02-01', key4: '张三'},
-    {id: 3, name: 'xxxxx', key: '未完成', key1: 'xxxxxxxxxx', key2: 'xxxxxxxx', key3: '2022-02-01', key4: '张三'},
-])
+const tableData = ref([])
 const getTableData = async() => {
     //const key = isTableKey.value
     tableLoading.value = true
@@ -195,15 +202,16 @@ const changeStateModal = ref(false)
 const showChangeState = () => {
     changeStateLoading.value = false
     changeStateModal.value = true
+    tableStateData.value=tableRows.value
 }
 
 
 //变更任务状态表格
 const tableStateLoading = ref(false)
 const tableStateColumn = [
-    {key: 'key1', name: '任务名称'},
-    {key: 'key2', name: '任务描述'},
-    {key: 'key3', name: '状态', width: '120', align: 'center'},
+    {key: 'planName', name: '任务名称'},
+    {key: 'taskDesc', name: '任务描述'},
+    {key: 'statusName', name: '状态', width: '120', align: 'center'},
 ]
 const tableStateData = ref([
     {id: 1, key1: 'xxxxxxxxx', key2: 'xxxxxxxxx',  key3: '未完成'},
@@ -217,13 +225,13 @@ const tableStateData = ref([
 //任务操作数据
 const formRef = ref(null)
 const formModel = ref({
-    type: '1',
+    updateType: '1',
 })
 const formRules = {
-    title: {
+    updateType: {
         required: true,
         trigger: 'blur',
-        message: "请输入节点名称"
+        message: "请选择变更类别"
     },
 }
 
@@ -235,7 +243,21 @@ const closeChangeStateClick = () => {
 }
 
 //提交变更状态弹窗
-const saveChangeStateClick = () => {
+
+const saveChangeStateClick = async() => {
+    console.log(formModel.value,'formModel');
+    const res = await formValidate(formRef.value)
+    const ids = arrToId(tableRows.value, 'id')
+    formModel.value.taskIds=ids
+    if(res){
+        changeStateLoading.value=true
+        const {error, code, data,msg} = await planApi.submit( formModel.value)
+        changeStateLoading.value=false
+        if (!error && code === 200) {
+            window.$message.success(msg)
+            getTableData()
+        } 
+    }
     changeStateLoading.value = false
     changeStateModal.value = false
 }