项目文件管理完成

src/api/project.js

@@ -69,3 +69,11 @@ export const queryProjectExpense = (code) => {
         params: { code: code }
     })
 }
+
+// 查询项目总金
+export const queryProjectSum = (code) => {
+    return service({
+        url: '/project/queryProjectSum?code=' + code,
+        method: 'GET'
+    })
+}

src/view/approve/components/applyList.vue

@@ -95,6 +95,7 @@ import { useUserStore } from "@/pinia/modules/user"
 import { getProjectFile } from "@/api/project";
 import { showConfirmDialog, showNotify } from "vant"
 const useUser = useUserStore()
+const router = useRouter()
 defineOptions({
   name: 'applyList',
 })
@@ -154,7 +155,6 @@ const approvalData = reactive({
   }
 })
 const openDetail = (data) => {
-  console.log(data)
   processId.value = data.ID
   queryProjectProcessId(data.ID)
   detailShow.value = true
@@ -162,10 +162,12 @@ const openDetail = (data) => {
 // 留言
 const tabActive = ref(0)
 const infoActive = ref(['1'])
+const currentCode = ref('')
 const queryProjectProcessId = (id) => {
   getProjectProcessId(id).then(res => {
     if (res.code === 0) {
       const data = res.data
+      currentCode.value = data.code
       infoList.length = 0
       if (data.descriptions.length !== 0) {
         infoList.push(...data.descriptions)

src/view/approve/components/approveList.vue

@@ -55,6 +55,7 @@
                 icon="plus"
                 type="primary"
                 size="small"
+                @click="supplyFile"
             >
               补充文件
             </van-button>
@@ -134,6 +135,7 @@ import { getProjectFile } from "@/api/project"
 import { useUserStore } from "@/pinia/modules/user"
 import { showNotify } from "vant";
 import moment from "moment";
+const router = useRouter()
 defineOptions({
   name: 'approveList',
 })
@@ -163,6 +165,7 @@ const detailShow = ref(false)
 const currentStep = ref(0)
 const nodeList = reactive([])
 const infoList = reactive([])
+const currentCode = ref('')
 // 查询项目文件条件
 const fileCondition = reactive({
   code: '',
@@ -183,6 +186,7 @@ const queryProjectProcessId = (id) => {
   getProjectProcessId(id).then(res => {
     if (res.code === 0) {
       const data = res.data
+      currentCode.value = data.code
       infoList.length = 0
       if (data.descriptions.length !== 0) {
         infoList.push(...data.descriptions)
@@ -262,6 +266,10 @@ const confirmAdopt = () => {
     }
   })
 }
+// 补充文件
+const supplyFile = () => {
+  router.push({path: '/navigation/project',query:{code: currentCode.value}})
+}
 //计算属性
 const applyPeople = computed(() => {
   return (name) => "申请人：" + name

src/view/dashboard/dashboard.vue

@@ -1,12 +1,74 @@
+<template>
+  <van-dropdown-menu>
+    <van-dropdown-item v-model="dataGraph" :options="dataGraphList" />
+  </van-dropdown-menu>
+  <van-cell-group>
+    <van-cell
+        title="当前项目："
+        :value="currentProject"
+        size="large"
+        @click="projectPickerShow = true"
+    />
+  </van-cell-group>
+  <van-popup v-model:show="projectPickerShow" position="bottom">
+    <van-picker
+        :columns-field-names="columnsField"
+        :columns="projectList"
+        @cancel="projectPickerShow = false"
+        @confirm="confirmProject"
+    />
+  </van-popup>
+</template>
+
 <script setup>
+import { getAllProject, queryProjectSum } from '@/api/project'
 defineOptions({
   name: 'Dashboard',
 })
-</script>
+const dataGraph = ref('projectSum')
+const dataGraphList = [
+  { text: '项目总表', value: 'projectSum' },
+  { text: '数据统计', value: 'dataStat' },
+]
+const columnsField = {
+  text: 'name',
+  value: 'code'
+}
+const currentProject = ref('')
+const projectPickerShow = ref(false)
+onMounted(() => {
+  queryAllProject()
+})
+// 查询项目列表
+const projectList = reactive([])
+const queryAllProject = () => {
+  getAllProject().then(res => {
+    if (res.code === 0) {
+      console.log(res.data)
+      projectList.length = 0
+      projectList.push(...res.data)
+    }
+  })
+}
 
-<template>
+const confirmProject = (val) => {
+  currentProject.value = val.selectedOptions[0].name
+  const code = val.selectedOptions[0].code
+  getProjectSum(code)
+  projectPickerShow.value = false
+}
 
-</template>
+const getProjectSum = (code) => {
+  queryProjectSum(code).then(res => {
+    if (res.code === 0) {
+      console.log(res.data)
+      console.log('应收', res.data.Receivables)
+      console.log('收款', res.data.TotalCollectionAmount)
+      console.log('总营业额', res.data.TotalProjectAmount)
+    }
+  })
+}
+</script>
 
 <style scoped>
 

src/view/navigation/navigation.vue

@@ -49,15 +49,18 @@ const navigatorJump = (mine) => {
   navigatorShow.value = false
 }
 
+const returnBack = () => {
+  router.back()
+}
 </script>
 
 <template>
-  <van-nav-bar left-text="返回" left-arrow class="mainInterface">
+  <van-nav-bar left-text="返回" left-arrow class="mainInterface" @click-left="returnBack">
     <template #title>
       <span style="font-weight: 500">{{pageTitle}}</span>
     </template>
     <template #right>
-      <van-icon name="bars" size="35px" @click="openNavigation" class="jumpIcon"/>
+      <van-icon name="bars" size="35px" @click="openNavigation"/>
     </template>
   </van-nav-bar>
   <router-view/>

src/view/project/project.vue

@@ -1,5 +1,5 @@
 <template>
-  <van-row style="margin-top: 20px;height: 50px;">
+  <van-row class="fileSearchBox">
     <van-col :span="18">
       <van-search
           v-model="fileName"
@@ -9,47 +9,46 @@
           @search="fileSearch"
       />
     </van-col>
-    <van-col :span="6" class="design">
+    <van-col :span="5" class="design">
       <van-button
           icon="replay"
           type="primary"
           plain
           @click="fileReset"
-          style="border: 0;font-size: 18px">
+          style="border: 0;padding: 0;font-size: 0.45rem">
         重置
       </van-button>
     </van-col>
   </van-row>
-  <van-row style="margin-top: 20px;height: 50px">
+  <van-row class="fileOperation">
     <van-col
         :span="11"
         :offset="1"
         style="display: flex;
         align-items: center">
-      <van-icon
-          name="arrow-down"
-          color="#1989fa"
-          size="18"
-      />
-      <van-text-ellipsis
-          content="文件检索"
+      <van-button
+          icon="arrow-down"
+          plain
+          style="padding: 0;border: 0;font-size: 0.45rem"
+          type="primary"
           @click="fileRetrievalShow = true"
-          style="color:#1989fa;font-size: 18px"
-      />
+      >
+        文件检索
+      </van-button>
     </van-col>
-    <van-col :span="10" class="design">
-      <van-icon
-          name="plus"
-          size="18"
-          color="#1989fa" />
-      <van-text-ellipsis
-          content="添加"
+    <van-col :span="11" class="design">
+      <van-button
+          icon="plus"
+          plain
+          style="padding: 0;border: 0;font-size: 0.45rem"
+          type="primary"
           @click="uploadFileShow = true"
-          style="color:#1989fa;font-size: 18px"
-      />
+      >
+        添加
+      </van-button>
     </van-col>
   </van-row>
-  <van-row style="margin-top: 20px;height: 560px;">
+  <van-row class="fileListBox">
     <van-col :span="24">
       <van-list
           finished-text="没有更多了"
@@ -57,16 +56,18 @@
           :finished="finished"
       >
         <van-cell-group>
-          <van-cell v-for="item in fileList" :key="item.ID" style="height: 70px">
+          <van-cell v-for="item in fileList" :key="item.ID" class="fileListCell">
             <template #title>
-              <el-text size="large" style="width: 45vw" :line-clamp="1">{{item.name}}</el-text>
+              <van-text-ellipsis
+                  style="width: 50vw"
+                  :content="item.name"/>
             </template>
             <template #value>
               <van-button
                   icon="search"
                   type="primary"
                   plain
-                  style="border: 0;font-size: 18px"
+                  style="border: 0;font-size: 0.45rem;padding: 0"
                   @click="filePreview(item.name, item.path)">
                 预览
               </van-button>
@@ -76,24 +77,27 @@
       </van-list>
     </van-col>
   </van-row>
-  <van-row style="margin-top: 30px">
+  <van-row class="filePageBox">
     <el-col :span="22" :offset="1">
       <van-pagination v-model="currentPage" :total-items="pageTotal" :items-per-page="8" @change="pageChange"/>
     </el-col>
   </van-row>
   <van-popup
       v-model:show="uploadFileShow"
-      style="width: 350px;height: 420px"
-      round
-      closeable
-      close-icon-position="top-right"
+      position="bottom"
+      class="filePlusBox"
   >
-    <van-row style="margin-top: 10px">
-      <van-col :span="16" :offset="1">
-        <span style="font-size: 18px;">上传文件</span>
+    <van-row
+        justify="center"
+        class="filePlusTitle"
+    >
+      <van-col>
+        <span style="font-size: 0.45rem">
+          上传文件
+        </span>
       </van-col>
     </van-row>
-    <van-row style="height: 46px;margin-top: 10px;">
+    <van-row class="filePlusType">
       <van-col :span="8" :offset="1">
         <van-button
             type="primary"
@@ -108,7 +112,7 @@
             v-model="fileTypeText"
             disabled
             placeholder="请选择文件类型"
-            style="border: 1px solid #dadadd;border-radius: 5px"/>
+            style="border: 1px solid #dadadd;border-radius: 5px;"/>
       </van-col>
     </van-row>
     <van-row>
@@ -122,9 +126,14 @@
         </div>
       </van-col>
     </van-row>
-    <van-row style="margin-top: 2vh">
-      <van-col :span="22" :offset="1" class="design">
-        <van-button type="primary" @click="uploadFile">确认</van-button>
+    <van-row class="confirmBox">
+      <van-col :span="22" :offset="1">
+        <van-button
+            type="primary"
+            size="large"
+            @click="uploadFile">
+          确认
+        </van-button>
       </van-col>
     </van-row>
   </van-popup>
@@ -165,6 +174,7 @@ import {
 } from '@/api/project.js'
 import { showNotify } from "vant";
 import { showImagePreview } from 'vant';
+const route = useRoute()
 defineOptions({
   name: 'Project',
 })
@@ -179,7 +189,13 @@ const queryProjectList = () => {
       const list = res.data
       projectList.length = 0
       projectList.push(...list)
-      fileCondition.code = list[0].code
+      // 获取路由code
+      const code = route.query.code
+      if (typeof code === 'undefined') {
+        fileCondition.code = list[0].code
+      } else {
+        fileCondition.code = code
+      }
       queryProjectFile()
     }
   })
@@ -329,16 +345,54 @@ const fileSearch = () => {
 }
 </script>
 
-<style scoped>
-.design{
+<style scoped lang="less">
+.flex {
   display: flex;
   align-items: center;
   justify-content: end;
 }
-.typeLayout{
-  display: flex;
-  align-items: center;
-  justify-content: center;
+.fileSearchBox{
+  margin-top: 15px;
+  height: 50px;
+  .design{
+    .flex;
+  }
+}
+.fileOperation {
+  margin-top: 10px;
+  height: 50px;
+  .design{
+    .flex
+  }
+}
+.fileListBox{
+  margin-top: 10px;
+  height: 480px;
+  .fileListCell{
+    height: 60px;
+  }
+}
+.filePageBox {
+  margin-top: 30px;
+  margin-bottom: 30px;
+}
+
+.filePlusBox{
+  height: 470px;
+  .filePlusTitle{
+    margin-top: 10px;
+  }
+  .filePlusType{
+    height: 46px;
+    margin-top: 20px;
+  }
+  .typeLayout{
+    display: flex;
+    justify-content: center;
+  }
+  .confirmBox{
+    margin-top: 30px;
+  }
 }
 
 .fileExhibition{