完善 项目管理1

server/config.yaml

@@ -196,7 +196,7 @@ system:
     db-type: mysql
     oss-type: local
     router-prefix: ""
-    addr: 8888
+    addr: 8220
     iplimit-count: 15000
     iplimit-time: 3600
     use-multipoint: false

server/service/admin/project.go

@@ -124,6 +124,7 @@ func (ps *ProjectService) CreateOrUpdateWorkingHours(workingHours dao.ProjectWor
 		// 新增工时+已有工时
 		zongHours := hours.Days + workingHours.Days
 		workingHours.Days = zongHours
+		workingHours.Price = hours.Price
 
 		err = workingHours.UpdateWorkingHours()
 		return err

web/.env.development

@@ -1,11 +1,14 @@
 ENV = 'development'
+
 VITE_CLI_PORT = 8080
-VITE_SERVER_PORT = 8888
+VITE_SERVER_PORT = 8220
 VITE_BASE_API = /api
 VITE_FILE_API = /api
-VITE_BASE_PATH = http://192.168.110.116
+VITE_BASE_PATH = http://127.0.0.1
 VITE_POSITION = close
-VITE_EDITOR = vscode
+VITE_EDITOR = webstorm
+
+
 // VITE_EDITOR = webstorm 如果使用webstorm开发且要使用dom定位到代码行功能 请先自定添加 webstorm到环境变量 再将VITE_EDITOR值修改为webstorm
 // 如果使用docker-compose开发模式，设置为下面的地址或本机主机IP
-//VITE_BASE_PATH = http://177.7.0.12
+//VITE_BASE_PATH = http://106.52.134.22

web/src/pinia/project/project.js

@@ -18,7 +18,6 @@ export const editorData = defineStore('counter', () => {
   const getTypeList = () => {
     getFileType().then(res => {
       if (res.code === 0) {
-        console.log(res.data)
         typeList.length = 0
         typeList.push(...res.data)
       }

web/src/utils/common.js

@@ -0,0 +1,31 @@
+export const numToChinese = (num) => {
+  const fraction = ['角', '分']
+  const digit = [
+    '零', '壹', '贰', '叁', '肆',
+    '伍', '陆', '柒', '捌', '玖'
+  ]
+  const unit = [
+    ['元', '万', '亿'],
+    ['', '拾', '佰', '仟']
+  ]
+  const head = num < 0 ? '欠' : ''
+  num = Math.abs(num)
+
+  let s = ''
+  for (let i = 0; i < fraction.length; i++) {
+    s += (digit[Math.floor(num * 10 * Math.pow(10, i)) % 10] + fraction[i]).replace(/零./, '')
+  }
+  s = s || '整'
+  num = Math.floor(num)
+
+  for (let i = 0; i < unit[0].length && num > 0; i++) {
+    let p = ''
+    for (let j = 0; j < unit[1].length && num > 0; j++) {
+      p = digit[num % 10] + unit[1][j] + p
+      num = Math.floor(num / 10)
+    }
+    s = p.replace(/(零.)*零$/, '').replace(/^$/, '零') + unit[0][i] + s
+  }
+
+  return head + s.replace(/(零.)*零元/, '元').replace(/(零.)+/g, '零').replace(/^整$/, '零元整')
+}

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

@@ -87,9 +87,18 @@
                 v-model="basicMessage.level"
                 @change="changeUrgency"
               >
-                <el-radio :value="1">正常</el-radio>
-                <el-radio :value="2">重要</el-radio>
-                <el-radio :value="3">紧急</el-radio>
+                <el-radio
+                  :value="1"
+                  :label="1"
+                >正常</el-radio>
+                <el-radio
+                  :value="2"
+                  :label="2"
+                >重要</el-radio>
+                <el-radio
+                  :value="3"
+                  :label="3"
+                >紧急</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>

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

@@ -389,9 +389,18 @@
             v-model="editData.level"
             @change="changeUrgency"
           >
-            <el-radio :value="1">正常</el-radio>
-            <el-radio :value="2">重要</el-radio>
-            <el-radio :value="3">紧急</el-radio>
+            <el-radio
+              :value="1"
+              :label="1"
+            >正常</el-radio>
+            <el-radio
+              :value="2"
+              :label="2"
+            >重要</el-radio>
+            <el-radio
+              :value="3"
+              :label="3"
+            >紧急</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="项目状态">
@@ -457,12 +466,15 @@
 import { getProjectMessage, editProject } from '@/api/project'
 import { onMounted, reactive, ref, computed } from 'vue'
 import { getAllUsers } from '@/api/user'
-import {queryFileList, createProjectFile, downloadProjectFile, deleteProjectFile, deleteProjectFiles} from '@/api/file'
+import { queryFileList, createProjectFile, downloadProjectFile, deleteProjectFile, deleteProjectFiles } from '@/api/file'
 import { Download, Upload, Delete, Search, RefreshLeft, Edit } from '@element-plus/icons-vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import OptionEdit from './components/optionEdit.vue'
 import { editorData } from '@/pinia/project/project'
-import { deleteDailyFile, fileDownload } from '@/api/dailyFile'
+import { fileDownload } from '@/api/dailyFile'
+import { useRoute, useRouter } from 'vue-router'
+const router = useRouter()
+const route = useRoute()
 
 defineOptions({
   name: 'ProjectDetails'
@@ -471,7 +483,7 @@ defineOptions({
 // 数据
 const editor = editorData()
 const fileCondition = reactive({
-  code: 'LCZM202407161229',
+  code: route.query.code,
   name: '',
   genre: 0,
   pageInfo: {
@@ -525,7 +537,7 @@ const projectState = computed(() => {
 // .............................................
 // 方法
 onMounted(() => {
-  projectMessage('LCZM202407161229')
+  projectMessage(route.query.code)
   queryFile()
   editor.getStateList()
   editor.getTypeList()
@@ -553,7 +565,7 @@ const projectMessage = (code) => {
 
 // 重置
 const resetData = () => {
-  fileCondition.code = 'LCZM202407161229'
+  fileCondition.code = route.query.code
   fileCondition.name = ''
   fileCondition.genre = 0
   fileCondition.pageInfo = {
@@ -590,7 +602,7 @@ const queryFile = () => {
 const editBasicMessage = () => {
   const data = {
     id: editData.ID,
-    code: 'LCZM202407161229',
+    code: route.query.code,
     name: editData.name,
     principal: editData.principal,
     price: parseInt(editData.price),
@@ -619,14 +631,15 @@ const editBasicMessage = () => {
         duration: 2000
       })
       messagePopupShow.value = false
-      projectMessage('LCZM202407161229')
+      projectMessage(route.query.code)
     }
   })
 }
 
 const messageEdit = () => {
-  messagePopupShow.value = true
   Object.assign(editData, information)
+  console.log(editData)
+  messagePopupShow.value = true
 }
 // 上传文件
 const fileDialogClose = () => {
@@ -662,7 +675,7 @@ const supplementFile = () => {
       formData.append('file', item.raw)
     })
     formData.append('genre', uploadFileType.value)
-    formData.append('code', 'LCZM202407161229')
+    formData.append('code', route.query.code)
     console.log(formData.get('genre'))
     createProjectFile(formData).then(res => {
       if (res.code === 0) {
@@ -690,7 +703,7 @@ const downloadTips = () => {
     .then(() => {
       const type = fileType.value === '' ? 0 : fileType.value
       const data = {
-        code: 'LCZM202407161229',
+        code: route.query.code,
         genre: type,
         name: fileCondition.name
       }
@@ -699,7 +712,7 @@ const downloadTips = () => {
         const link = document.createElement('a')
         const href = window.URL.createObjectURL(res) // 创建下载的链接
         link.href = href
-        link.download = 'LCZM202407161229.zip' // 下载后文件名
+        link.download = route.query.code + '.zip' // 下载后文件名
         document.body.appendChild(link)
         link.click() // 点击下载
         document.body.removeChild(link) // 下载完成移除元素
@@ -771,7 +784,7 @@ const projectDeletes = async() => {
     .then(async() => {
       const type = fileType.value === '' ? 0 : fileType.value
       const data = {
-        code: 'LCZM202407161229',
+        code: route.query.code,
         genre: type,
         name: fileCondition.name
       }
@@ -813,8 +826,8 @@ const headSelect = () => {
 }
 
 //
-const changeUrgency = () => {
-  console.log(editData.level)
+const changeUrgency = (v) => {
+  console.log(v)
 }
 
 const changeFilePage = (value) => {

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

@@ -55,7 +55,7 @@
           <el-button
             type="primary"
             :icon="DocumentCopy"
-            @click="queryProject"
+            @click="jumpProjectApproval"
           >立项
           </el-button>
           <el-button
@@ -224,7 +224,7 @@
             >
               <template #default="scope">
                 <el-button
-                  @click="projectEdit(scope.$index, scope.row)"
+                  @click="jumpProjectDetails(scope.row)"
                 >
                   详情
                 </el-button>
@@ -262,6 +262,9 @@ 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'
+import { useRoute, useRouter } from 'vue-router'
+const router = useRouter()
+const route = useRoute()
 
 defineOptions({
   name: 'ProjectList'
@@ -305,7 +308,14 @@ const changeState = (value) => {
     }
   })
 }
-const projectEdit = (index, row) => {
+const jumpProjectDetails = (row) => {
+  const { href } = router.resolve({
+    path: '/layout/projectManage/projectDetails', // 路径
+    query: {
+      code: row.code,
+    }// 传参
+  })
+  location.href = (href)
 }
 const projectDelete = (index, row) => {
   ElMessageBox.confirm(
@@ -398,6 +408,14 @@ const queryProject = () => {
 const changePage = (value) => {
   console.log(value)
 }
+
+const jumpProjectApproval = () => {
+  const { href } = router.resolve({
+    path: '/layout/projectManage/projectApproval', // 路径
+  })
+  location.href = (href)
+}
+
 </script>
 
 <style scoped lang="less">

web/vite.config.js

@@ -15,7 +15,7 @@ import { svgBuilder } from './vitePlugin/svgIcon/svgIcon.js'
 // @see https://cn.vitejs.dev/config/
 export default ({
   command,
-  mode
+  mode,
 }) => {
   const NODE_ENV = mode || 'development'
   const envFiles = [
@@ -56,7 +56,8 @@ export default ({
       alias,
     },
     define: {
-      'process.env': {}
+      'process.env': {},
+      __VUE_PROD_HYDRATION_MISMATCH_DETAILS__: false
     },
     server: {
       // 如果使用docker-compose开发模式，设置为false