Merge remote-tracking branch 'origin/dev' into dev

web/src/api/collection.js

@@ -0,0 +1,29 @@
+import service from '@/utils/request'
+// 查询收款记录
+export const queryCollection = () => {
+  return service({
+    url: '/project/queryCollection',
+    method: 'get'
+  })
+}
+// 新增收款记录
+export const createCollection = () => {
+  return service({
+    url: '/project/createCollection',
+    method: 'post'
+  })
+}
+// 修改收款记录
+export const updateCollection = () => {
+  return service({
+    url: '/project/updateCollection',
+    method: 'put'
+  })
+}
+// 删除收款记录
+export const deleteCollection = () => {
+  return service({
+    url: '/project/deleteCollection',
+    method: 'delete'
+  })
+}

web/src/api/hour.js

@@ -0,0 +1,13 @@
+import service from '@/utils/request'
+
+// 查询工时
+export const queryHour = () => {
+  return service({
+    url: '/project/queryCollection',
+    method: 'get'
+  })
+}
+// 新增工时
+// 修改工时
+// 删除工时
+

web/src/api/project.js

@@ -5,9 +5,6 @@ export const getProjectList = (data) => {
     url: '/project/queryProjectList',
     method: 'post',
     data: data
-    // headers: {
-    //   'Authorization': localStorage.getItem('token')
-    // }
   })
 }
 
@@ -39,3 +36,14 @@ export const getProjectMessage = (code) => {
   })
 }
 
+// 项目删除
+export const deleteProject = (code) => {
+  return service({
+    url: '/project/deleteProject',
+    method: 'DELETE',
+    params: {
+      code: code
+    }
+  })
+}
+

web/src/view/finance/financeAnalysis/financeAnalysis.vue

@@ -0,0 +1,160 @@
+<template>
+  <div>
+    <el-row
+      class="bg-white"
+      style="height: 60px"
+      align="middle"
+    >
+      <el-col :span="22" />
+      <el-col :span="2">
+        <el-button
+          text
+          :icon="Menu"
+          size="large"
+          @click="listShow = true"
+        >
+          项目列表
+        </el-button>
+      </el-col>
+    </el-row>
+    <el-row
+      class="bg-white mt-5"
+      style="height: 150px"
+    />
+    <el-row
+      class="bg-white mt-5"
+      style="height: 550px"
+    />
+    <el-drawer
+      v-model="listShow"
+      direction="ltr"
+      title="项目列表"
+      size="25%"
+    >
+      <el-form @submit.prevent>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item>
+              <el-input
+                v-model="condition.name"
+                :suffix-icon="Search"
+                placeholder="请输入项目名称"
+                size="large"
+                clearable
+                @keyup.enter="nameSearch"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row
+          v-for="item in listData"
+          :key="item.ID"
+          style="height: 80px"
+          align="middle"
+        >
+          <el-col :span="17">
+            <el-row style="height: 45px">
+              <el-text
+                size="large"
+                :line-clamp="1"
+                tag="b"
+              >{{ item.name }}</el-text>
+            </el-row>
+            <el-row style="height: 35px">
+              <el-text :line-clamp="1">
+                负责人：{{ item.principal }}
+              </el-text>
+            </el-row>
+          </el-col>
+          <el-col
+            :span="7"
+            class="flex justify-center"
+          >
+            <el-button
+              :type="buttonType(item.state)"
+              round
+              size="large"
+              @click="incomeExpenses(item.code)"
+            >收支信息</el-button>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-pagination
+        v-show="projectTotal > 8"
+        background
+        layout="prev, pager, next"
+        :total="projectTotal"
+        :page-size="8"
+        v-model:current-page="condition.pageInfo.page"
+        @change="changePage"
+      />
+    </el-drawer>
+  </div>
+</template>
+
+<script setup>
+import { Menu, Search } from '@element-plus/icons-vue'
+import { ref, onMounted, reactive, computed } from 'vue'
+import { getProjectList } from '@/api/project'
+defineOptions({
+  name: 'FinanceAnalysis'
+})
+// 数据
+const listShow = ref(false)
+const condition = reactive({
+  pageInfo: {
+    page: 1,
+    pageSize: 8
+  },
+  name: '',
+  time: '',
+  state: 0
+})
+const listData = reactive([])
+const projectTotal = ref(0)
+// 计算属性
+const buttonType = computed(() => (state) => {
+  const obj = {
+    1: 'info',
+    2: 'warning',
+    3: 'primary',
+    4: 'success',
+    5: 'danger',
+  }
+  return obj[state]
+})
+// 方法
+onMounted(() => {
+  projectList(condition)
+})
+const projectList = (condition) => {
+  listData.length = 0
+  getProjectList(condition).then(res => {
+    if (res.code === 0) {
+      // projectTotal.value = 10
+      projectTotal.value = res.data.total
+      listData.push(...res.data.list)
+      console.log(res.data.list)
+    }
+  })
+}
+const nameSearch = () => {
+  condition.pageInfo.page = 1
+  console.log(condition)
+  projectList(condition)
+}
+const changePage = (page) => {
+  const search = condition
+  search.pageInfo.page = page
+  console.log(search)
+  projectList(search)
+}
+
+const incomeExpenses = (code) => {
+
+}
+</script>
+
+<style lang="scss" scoped>
+
+</style>

web/src/view/projectManage/projectApproval/projectApproval.vue

@@ -138,7 +138,7 @@
               <el-input
                 v-model="basicMessage.illustrate"
                 type="textarea"
-                placeholder="项目说明"
+                placeholder="项目说明（选填）"
                 :rows="3"
                 size="large"
               />

web/src/view/projectManage/projectDetails/projectDetails.vue

@@ -1,21 +1,265 @@
 <template>
   <div>
-    <div class="w-20 h-20 bg-white">
-      项目详情
+    <div
+      style="height: 300px"
+      class="bg-white"
+    >
+      <div class="basicInformation">
+        <div class="basicTitle">
+          <el-image :src="sign" />
+          <el-text
+            style="margin-left: 10px"
+            size="large"
+            tag="b"
+            :line-clamp="1"
+          >{{ projectTitle }}</el-text>
+        </div>
+        <div class="basicEdit">
+          <el-button
+            type="primary"
+            :icon="Edit"
+          >信息编辑</el-button>
+        </div>
+      </div>
+      <el-row
+        style="margin:20px 0 0 40px;height: 50px"
+        align="middle"
+      >
+        <el-col :span="3">
+          <el-text
+            size="large"
+            :line-clamp="1"
+          >
+            项目负责人：{{ information.principal }}
+          </el-text>
+        </el-col>
+        <el-col
+          :span="4"
+          :offset="1"
+        >
+          <el-text
+            size="large"
+            :line-clamp="1"
+          >
+            相关客户：{{ information.customer }}
+          </el-text>
+        </el-col>
+        <el-col
+          :span="3"
+          :offset="1"
+        >
+          <el-text
+            size="large"
+            :line-clamp="1"
+          >
+            紧急程度：{{ information.level === 1 ? '正常' : information.level === 2 ? '重要' : '紧急' }}
+          </el-text>
+        </el-col>
+        <el-col
+          :span="3"
+          :offset="1"
+        >
+          <el-text
+            size="large"
+            :line-clamp="1"
+          >
+            项目金额：{{ information.price }}元
+          </el-text>
+        </el-col>
+      </el-row>
+      <el-form>
+        <el-row
+          style="margin:20px 0 0 40px;height: 100px"
+          align="middle"
+        >
+          <el-col :span="18">
+            <el-form-item
+              label="项目说明："
+              size="large"
+            >
+              <el-input
+                v-model="information.illustrate"
+                type="textarea"
+                placeholder="项目说明（选填）"
+                :rows="4"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+    <div
+      style="height: 480px;margin-top: 30px"
+      class="bg-white"
+    >
+      <div class="basicInformation">
+        <div style="padding-top: 15px;margin-left: 30px">
+          <el-image :src="sign" />
+        </div>
+        <div style="display: flex;align-items: center">
+          <el-text
+            style="margin-left: 10px"
+            size="large"
+            tag="b"
+          >项目文件列表</el-text>
+        </div>
+      </div>
+      <el-row style="margin:20px 0 0 30px">
+        <el-col :span="4">
+          <el-button
+            :icon="Upload"
+            type="primary"
+          >上传文件</el-button>
+        </el-col>
+      </el-row>
+      <el-row style="margin:20px 0 0 30px">
+        <el-col :span="23">
+          <el-table
+            :data="fileList"
+            :height="350"
+            size="large"
+            row-class-name="row-class"
+          >
+            <el-table-column
+              prop="ID"
+              align="center"
+              label="ID"
+              width="180"
+            />
+            <el-table-column
+              prop="name"
+              label="文件名称"
+              align="center"
+              width="300"
+            />
+            <el-table-column
+              prop="CreatedAt"
+              label="创建日期"
+              align="center"
+              width="300"
+            />
+            <el-table-column
+              label="项目操作"
+              align="center"
+            >
+              <template #default="scope">
+                <el-button
+                  text
+                  size="small"
+                  @click="projectEdit(scope.$index, scope.row)"
+                >
+                  下载
+                </el-button>
+                <el-button
+                  text
+                  type="danger"
+                  size="small"
+                  @click="projectDelete(scope.$index, scope.row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-col>
+      </el-row>
     </div>
   </div>
 </template>
 
 <script setup>
+import sign from '@/assets/sign.png'
 import { getProjectMessage } from '@/api/project'
+import { onMounted, reactive, computed } from 'vue'
+import { getAllUsers } from '@/api/user'
+import { Edit, Upload } from '@element-plus/icons-vue'
 defineOptions({
-  name: 'projectDetails'
+  name: 'ProjectDetails'
+})
+onMounted(() => {
+  projectMessage('LCZM202407161229')
+  getAllUsers().then(res => {
+    if (res.code === 0) {
+      userList.push(...res.data)
+    }
+  })
 })
-getProjectMessage().then(res => {
-  console.log(res)
+const information = reactive({})
+// 项目用户列表
+const userList = reactive([])
+// 项目文件列表
+const fileList = reactive([])
+// 组合项目标题
+const projectTitle = computed({
+  get() {
+    return `项目名称：${information.name}(${information.CreatedAt})`
+  },
+  set() {}
 })
+const projectMessage = (code) => {
+  getProjectMessage(code).then(res => {
+    console.log(res.data)
+    if (res.code === 0) {
+      const data = res.data
+      data.CreatedAt = formatDate(data.CreatedAt)
+      data.UpdatedAt = formatDate(data.UpdatedAt)
+      Object.keys(data).forEach(key => {
+        if (key === 'files') {
+          // data[key].CreatedAt = formatDate(data[key].CreatedAt)
+          // data[key].UpdatedAt = formatDate(data[key].UpdatedAt)
+          fileList.push(...data[key])
+          console.log(fileList)
+        }
+        information[key] = data[key]
+      })
+    }
+  })
+}
+// 选择负责人
+// const headSelect = (value) => {
+//   information.principal = value
+// }
+// 日期格式化
+const formatDate = (dateString, locale = 'en-US', timezone = 'Asia/Shanghai') => {
+  // 使用 Date 构造函数解析日期字符串
+  const date = new Date(dateString)
+
+  // 检查日期是否有效
+  if (isNaN(date.getTime())) {
+    throw new Error('Invalid date string')
+  }
+
+  // 使用 Date 对象的年份、月份和日期来构建新的日期字符串
+  // 注意：JavaScript 中的月份是从 0 开始的，所以我们需要加 1
+  const formattedDate = `${date.getFullYear()}-${('0' + (date.getMonth() + 1)).slice(-2)}-${('0' + date.getDate()).slice(-2)}`
+
+  return formattedDate
+}
 </script>
 
-<style scoped>
+<style scoped lang="scss">
+@mixin basic{
+  width: 50%;
+  display: flex;
+  align-items: center;
+}
+.basicInformation{
+  height: 50px;
+  background-color: #f8fafd;
+  display: flex;
+  .basicTitle{
+    @include basic;
+    padding-left: 40px;
+  }
+  .basicEdit{
+    @include basic;
+    justify-content: end;
+    padding-right: 40px;
+  }
+}
 
+.row-class{
+  line-height: 30px;
+}
 </style>

web/src/view/projectManage/projectList/projectList.vue

@@ -3,7 +3,10 @@
     <el-row>
       <el-col :span="4">
         <el-form-item label="项目名称">
-          <el-input placeholder="请输入项目名称" />
+          <el-input
+            v-model="filterProjects.name"
+            placeholder="请输入项目名称"
+          />
         </el-form-item>
       </el-col>
       <el-col
@@ -12,9 +15,11 @@
       >
         <el-form-item label="立项时间">
           <el-date-picker
-            v-model="approvalTime"
+            v-model="filterProjects.time"
             type="month"
             placeholder="请选择立项时间"
+            format="YYYY-MM"
+            value-format="YYYY-MM"
           />
         </el-form-item>
       </el-col>
@@ -23,34 +28,53 @@
         :offset="1"
       >
         <el-form-item label="项目状态">
-          <el-select />
+          <el-select
+            v-model="currentlyState"
+            @change="changeState"
+          >
+            <el-option
+              v-for="item in stateList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
         </el-form-item>
       </el-col>
       <el-col
-        :span="2"
-        :offset="1"
-      >
-        <el-button
-          type="primary"
-          :icon="Search"
-          @click="initializedData"
-        >查询</el-button>
-      </el-col>
-      <el-col
-        :span="2"
+        :span="5"
+        style="margin-left: 40px"
       >
-        <el-button
-          type="primary"
-          :icon="DocumentCopy"
-          @click="initializedData"
-        >立项</el-button>
+        <el-row justify="space-around">
+          <el-button
+            type="primary"
+            :icon="Search"
+            @click="queryProject"
+          >查询
+          </el-button>
+          <el-button
+            type="primary"
+            :icon="DocumentCopy"
+            @click="queryProject"
+          >立项
+          </el-button>
+          <el-button
+            type="primary"
+            :icon="RefreshLeft"
+            @click="listData(initialCondition)"
+          >重置
+          </el-button>
+        </el-row>
       </el-col>
     </el-row>
     <el-row>
       <el-col :span="23">
         <el-row justify="space-between">
           <el-col :span="5">
-            <div class="bg-white h-24">
+            <div
+              class="bg-white h-24"
+              style="box-shadow: -7px 0 7px #e5e5e5"
+            >
               <el-row
                 style="height: 40%"
                 align="middle"
@@ -58,7 +82,8 @@
                 <el-col :offset="2">
                   <el-text
                     style="font-family: 黑体;"
-                  >项目总数</el-text>
+                  >项目总数
+                  </el-text>
                 </el-col>
               </el-row>
               <el-row
@@ -72,20 +97,24 @@
             </div>
           </el-col>
           <el-col :span="5">
-            <div class="bg-white h-24">
+            <div
+              class="bg-white h-24"
+              style="box-shadow: -7px 0 7px #e5e5e5"
+            >
               <el-row
-                  style="height: 40%"
-                  align="middle"
+                style="height: 40%"
+                align="middle"
               >
                 <el-col :offset="2">
                   <el-text
-                      style="font-family: 黑体;"
-                  >执行中项目</el-text>
+                    style="font-family: 黑体;"
+                  >执行中项目
+                  </el-text>
                 </el-col>
               </el-row>
               <el-row
-                  style="height: 60%"
-                  align="middle"
+                style="height: 60%"
+                align="middle"
               >
                 <el-col :offset="2">
                   <span class="dataStyle">{{ screenData.unCompleteProject }}</span>
@@ -94,20 +123,24 @@
             </div>
           </el-col>
           <el-col :span="5">
-            <div class="bg-white h-24">
+            <div
+              class="bg-white h-24"
+              style="box-shadow: -7px 0 7px #e5e5e5"
+            >
               <el-row
-                  style="height: 40%"
-                  align="middle"
+                style="height: 40%"
+                align="middle"
               >
                 <el-col :offset="2">
                   <el-text
-                      style="font-family: 黑体;"
-                  >已完成项目</el-text>
+                    style="font-family: 黑体;"
+                  >已完成项目
+                  </el-text>
                 </el-col>
               </el-row>
               <el-row
-                  style="height: 60%"
-                  align="middle"
+                style="height: 60%"
+                align="middle"
               >
                 <el-col :offset="2">
                   <span class="dataStyle">{{ screenData.completeProject }}</span>
@@ -116,20 +149,24 @@
             </div>
           </el-col>
           <el-col :span="5">
-            <div class="bg-white h-24">
+            <div
+              class="bg-white h-24"
+              style="box-shadow: -7px 0 7px #e5e5e5"
+            >
               <el-row
-                  style="height: 40%"
-                  align="middle"
+                style="height: 40%"
+                align="middle"
               >
                 <el-col :offset="2">
                   <el-text
-                      style="font-family: 黑体;"
-                  >项目总金额</el-text>
+                    style="font-family: 黑体;"
+                  >项目总金额
+                  </el-text>
                 </el-col>
               </el-row>
               <el-row
-                  style="height: 60%"
-                  align="middle"
+                style="height: 60%"
+                align="middle"
               >
                 <el-col :offset="2">
                   <span class="dataStyle">{{ screenData.sum }}元</span>
@@ -148,6 +185,7 @@
           <el-table
             :data="projectListData"
             height="580"
+            stripe
           >
             <el-table-column
               prop="code"
@@ -185,13 +223,11 @@
             >
               <template #default="scope">
                 <el-button
-                  size="small"
                   @click="projectEdit(scope.$index, scope.row)"
                 >
                   详情
                 </el-button>
                 <el-button
-                  size="small"
                   type="danger"
                   @click="projectDelete(scope.$index, scope.row)"
                 >
@@ -221,18 +257,34 @@
 </template>
 
 <script setup>
-import { DocumentCopy, Search } from '@element-plus/icons-vue'
-import { getProjectList, projectDataScreen } from '@/api/project'
+import { DocumentCopy, RefreshLeft, Search } from '@element-plus/icons-vue'
+import { getProjectList, projectDataScreen, deleteProject } from '@/api/project'
 import { reactive, ref, onMounted } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
 
 defineOptions({
   name: 'ProjectList'
 })
 const screenData = reactive({})
-const approvalTime = ref('')
 const projectListData = reactive([])
 const listTotal = ref(0)
-const data = {
+const stateList = [
+  { label: '立项', value: 1 },
+  { label: '施工', value: 2 },
+  { label: '收款', value: 3 },
+  { label: '完成', value: 4 },
+  { label: '失效', value: 5 },
+]
+const initialCondition = {
+  pageInfo: {
+    page: 1,
+    pageSize: 10
+  },
+  name: '',
+  time: '',
+  state: 0
+}
+const filterProjects = reactive({
   pageInfo: {
     page: 1,
     pageSize: 10
@@ -241,21 +293,62 @@ const data = {
   time: '',
   state: 0
 }
+)
+
+const currentlyState = ref('')
+const changeState = (value) => {
+  filterProjects.state = value
+  stateList.forEach(item => {
+    if (value === item.value) {
+      currentlyState.value = item.label
+    }
+  })
+}
 const projectEdit = (index, row) => {
 }
 const projectDelete = (index, row) => {
+  ElMessageBox.confirm(
+    '确定要删除该项目吗?',
+    '项目删除',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    }
+  )
+    .then(() => {
+      deleteProject(row.code).then(res => {
+        if (res.code === 0) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          listData(initialCondition)
+          dataScreen()
+        } else {
+          ElMessage({
+            type: 'error',
+            message: res.msg,
+          })
+        }
+      })
+    })
+    .catch(() => {
+      ElMessage({
+        type: 'info',
+        message: '取消删除',
+      })
+    })
 }
-// 项目数据总览
 onMounted(() => {
-  projectDataScreen().then(res => {
-    console.log(res.data)
-    const obj = res.data
-    Object.keys(obj).forEach(key => {
-      screenData[key] = obj[key]
-    })
-  })
+  // 项目数据总览
+  dataScreen()
   // 获取项目列表
-  getProjectList(data).then(res => {
+  listData(initialCondition)
+})
+const listData = (condition) => {
+  projectListData.length = 0
+  getProjectList(condition).then(res => {
     if (res.code === 0 && res.data.total > 0) {
       const list = res.data.list
       list.forEach(item => {
@@ -266,8 +359,16 @@ onMounted(() => {
       listTotal.value = res.data.total
     }
   })
-})
-function formatDate(dateString, locale = 'en-US', timezone = 'Asia/Shanghai') {
+}
+const dataScreen = () => {
+  projectDataScreen().then(res => {
+    const obj = res.data
+    Object.keys(obj).forEach(key => {
+      screenData[key] = obj[key]
+    })
+  })
+}
+const formatDate = (dateString, locale = 'en-US', timezone = 'Asia/Shanghai') => {
   // 使用 Date 构造函数解析日期字符串
   const date = new Date(dateString)
 
@@ -292,8 +393,8 @@ const projectState = (state) => {
   }
   return obj[state]
 }
-const initializedData = () => {
-  console.log(screenData.totalProject)
+const queryProject = () => {
+  listData(filterProjects)
 }
 const changePage = (value) => {
   console.log(value)
@@ -301,8 +402,8 @@ const changePage = (value) => {
 </script>
 
 <style scoped lang="less">
-  .dataStyle{
-    font-size: 25px;
-    font-weight: 500;
-  }
+.dataStyle {
+  font-size: 25px;
+  font-weight: 500;
+}
 </style>