字典

src/views/home/components/TaskTable.vue

@@ -8,7 +8,7 @@
             </div>
             <div class="w-36 mr-4">
                 <el-select v-model="searchForm.taskType" block clearable placeholder="选择上报类型" size="large">
-                    <el-option v-for="item in reportings" :label="item.name" :value="item.key"/>
+                    <el-option v-for="item in reportings" :label="item.dictName" :value="item.dictValue"/>
                 </el-select>
             </div>
             <div class="w-36">
@@ -59,6 +59,7 @@ 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';
+import {getDictInfo} from "~api/other";
 
 const router = useRouter()
 
@@ -73,20 +74,16 @@ 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},
-])
+
 onMounted(()=>{
     getTableData()
+    getReporting()
 })
 //监听
 watch(() => [
@@ -95,7 +92,27 @@ watch(() => [
     isTableKey.value = Key
     getTableData()
 })
-
+//选择上报类型
+const reportings = ref([
+    {name: '任务审批', key: 1},
+    {name: '采购审批', key: 2},
+    {name: '用车审批', key: 3},
+    {name: '报销审批', key: 4},
+    {name: '借款审批', key: 5},
+])
+//获取上报类型
+const getReporting=async()=>{
+    const { error, code, data,msg } = await getDictInfo(
+     'report_type'
+    )
+    if (!error && code === 200) {
+        reportings.value = getArrValue(data)
+    } 
+    else {
+        reportings.value =[]
+       
+    }
+}
 //搜索表单
 const searchForm = ref({
     selectStatus: null, startTime: null, endTime: null, reporting: null,selectType:parseInt(isTableKey.value),

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

@@ -53,28 +53,14 @@
                            :src="otherInfo?.frElectronicInvoiceUrl"
                            :srcs="['https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg']"
                     />
-                    <HcImg ui="img" :index="0"
-                           src="https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg"
-                           :srcs="['https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg']"
-                    />
+          
                 </HcListItem>
                 <HcListItem title="附件文件：" >
                     <HcImg ui="img" :index="0"
                             :src="otherInfo?.frAttachmentUrl"
                            :srcs="['https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg']"
                     />
-                    <HcImg ui="img" :index="0"
-                           src="https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg"
-                           :srcs="['https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg']"
-                    />
-                    <HcImg ui="img" :index="0"
-                           src="https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg"
-                           :srcs="['https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg']"
-                    />
-                    <HcImg ui="img" :index="0"
-                           src="https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg"
-                           :srcs="['https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg']"
-                    />
+        
                 </HcListItem>
                 <HcListItem title="归属人：" :content="otherInfo?.userNameVesting"/>
                 <HcListItem title="备注信息：" content="备注数据"/>

src/views/task/logs/index.vue

@@ -2,17 +2,13 @@
     <HcCard>
         <template #header>
             <div class="w-36">
-                <el-select v-model="searchForm.orgDept" block clearable placeholder="选择部门" size="large">
-                    <el-option label="暂无接口1" value="1"/>
-                    <el-option label="暂无接口2" value="2"/>
-                    <el-option label="暂无接口3" value="3"/>
+                <el-select v-model="searchForm.orgDept" block clearable placeholder="选择部门" size="large" @change="changeDpet">
+                    <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.userId" block clearable placeholder="选择人员" size="large">
-                    <el-option label="暂无接口1" value="1"/>
-                    <el-option label="暂无接口2" value="2"/>
-                    <el-option label="暂无接口3" value="3"/>
+                    <el-option v-for="item in departmentPeople" :label="item.name" :value="item.id"/>
                 </el-select>
             </div>
             <div class="w-36 ml-4">
@@ -77,10 +73,11 @@
 import {onActivated, ref} from "vue";
 import logsApi from "~api/task/logs";
 import {useAppStore} from "~src/store";
-import {getObjValue} from "js-fast-way";
+import {getObjValue,getArrValue} from "js-fast-way";
 import HcLogsContent from "./components/logs-content.vue";
 import avatarPng from '~src/assets/images/avatar.png';
 import dayjs from 'dayjs';
+import { getdepartmentList,getuserList} from "~api/other";
 
 const useAppState = useAppStore()
 const userInfo = ref(useAppState.getUserInfo);
@@ -89,8 +86,36 @@ const userInfo = ref(useAppState.getUserInfo);
 onActivated(() => {
     isEditState.value = false
     getLogList()
+    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 changeDpet=(val)=>{
+    getDepartmentuserDict(val)
+}
+const departmentPeople=ref([])
+//获取部门人员列表
+const getDepartmentuserDict=async(id)=>{
+    const {error, code, data} = await getuserList({deptId:id})
+    if (!error && code === 200) {
+        departmentPeople.value = getArrValue(data)
+
+    } else {
+        departmentPeople.value = []
 
+    }
+}
 //搜索表单
 const searchForm = ref({orgDept: null, userId: null, startTime: null, endTime: null})
 
@@ -145,16 +170,19 @@ const userItemClick = (item) => {
 const logDetail = ref({})
 const getLogDetail = async () => {
     const item = userItemId.value
-    const {error, code, data, msg} = await logsApi.getLogDetail({
+    if(item.id){
+        const {error, code, data, msg} = await logsApi.getLogDetail({
         id: item.id
-    })
-    //判断状态
-    if (!error && code === 200) {
-        logDetail.value = getObjValue(data)
-    } else {
-        logDetail.value = {}
-        window.$message?.error(msg)
+        })
+        //判断状态
+        if (!error && code === 200) {
+            logDetail.value = getObjValue(data)
+        } else {
+            logDetail.value = {}
+            window.$message?.error(msg)
+        }
     }
+
 }
 
 //日志填报表单