Merge remote-tracking branch 'origin/master'

src/api/project/project.js

@@ -53,7 +53,7 @@ export function listDraft(query) {
 }
 // 新增草稿箱
 export function addDraft(data) {
-  data.darft = '0'
+  //data.darft = '0'
   return request({
     url: '/system/project/draft',
     method: 'post',

src/api/projectCostRequest/projectCostRequest.js

 import request from '@/utils/request'
 
 // 查询项目费用申请列表
-export function getCostRequestList() {
+export function getCostRequestList(query) {
     return request({
         url: '/projectCostRequest/list',
         method: 'get',
+        params:query
     })
 }
+
+// 查询项目费用申请详情
+export function getCostRequestDetail(id) {
+    return request({
+        url: '/projectCostRequest/' + id,
+        method: 'get'
+    })
+}
+

src/api/system/timesheet.js

+import request from '@/utils/request'
+
+// 查询工时记录列表
+export function listTimesheet(query) {
+  return request({
+    url: '/system/timesheet/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询工时记录详细
+export function getTimesheet(id) {
+  return request({
+    url: '/system/timesheet/' + id,
+    method: 'get'
+  })
+}
+
+// 新增工时记录
+export function addTimesheet(data) {
+  return request({
+    url: '/system/timesheet',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改工时记录
+export function updateTimesheet(data) {
+  return request({
+    url: '/system/timesheet',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除工时记录
+export function delTimesheet(id) {
+  return request({
+    url: '/system/timesheet/' + id,
+    method: 'delete'
+  })
+}

src/api/timesheet/project.js

+import request from '@/utils/request'

src/api/timesheet/timesheet.js

+import request from '@/utils/request'
+
+// 查询工时记录列表
+export function listTimesheet(query) {
+  return request({
+    url: '/timesheet/timesheet/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询工时记录详细
+export function getTimesheet(id) {
+  return request({
+    url: '/timesheet/timesheet/' + id,
+    method: 'get'
+  })
+}
+
+// 新增工时记录
+export function addTimesheet(data) {
+  return request({
+    url: '/timesheet/timesheet',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改工时记录
+export function updateTimesheet(data) {
+  return request({
+    url: '/timesheet/timesheet',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除工时记录
+export function delTimesheet(id) {
+  return request({
+    url: '/timesheet/timesheet/' + id,
+    method: 'delete'
+  })
+}

src/assets/font/fonts.css

+@font-face {
+    font-family: 'YouSheBiaoTiHei';
+    src: url('./YouSheBiaoTiHei.ttf');
+    font-weight: normal;
+    font-style: normal;
+}
+
+@font-face {
+    font-family: 'PingFangSC-Regular';
+    src: url('./PingFangSC-Regular3_0.ttf');
+    font-weight: normal;
+    font-style: normal;
+}
+
+@font-face {
+    font-family: 'PingFangSC-Medium';
+    src: url('./PingFang Medium_downcc.otf');
+    font-weight: normal;
+    font-style: normal;
+}

src/main.js

@@ -44,6 +44,9 @@ import ImagePreview from "@/components/ImagePreview"
 // 字典标签组件
 import DictTag from '@/components/DictTag'
 
+//字体样式
+import './assets/font/fonts.css'
+
 const app = createApp(App)
 
 // 全局方法挂载

src/views/costManage/projectCostRequest/detail.vue

@@ -10,13 +10,12 @@
 
       <!--  表单-->
       <div class="addform">
-        <el-form  :model="form" label-width="auto">
-
+        <el-form :disabled="type ==='详情'" :model="costRequestDetailList" label-width="auto">
           <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="流水号">
               <el-input
-                  v-model="form.liushuihao"
+                  v-model="costRequestDetailList.waterNumber"
                   disabled
                   placeholder="自动生成流水号"/>
             </el-form-item>
@@ -24,13 +23,14 @@
             <el-col :span="12">
               <el-form-item label="费用类型">
                 <el-select
-                    v-model="form.feiyongleixing"
-                    placeholder="请选择项目费用类型"
-                    clearable
-                >
-                  <el-option label="办公用品" value="shanghai" />
-                  <el-option label="云服务购买" value="beijing" />
-                  <el-option label="域名/服务器托管费" value="beijing" />
+                    v-model="costRequestDetailList.costType"
+                    disabled>
+                  <el-option
+                      v-for="dict in project_cost_type"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value"
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -40,7 +40,7 @@
             <el-col :span="12">
               <el-form-item label="项目名称">
                 <el-select
-                    v-model="form.xiangmumingcheng"
+                    v-model="costRequestDetailList.projectName"
                     placeholder="请选择项目名称" clearable>
                   <el-option label="项目一" value="shanghai" />
                   <el-option label="项目二" value="beijing" />
@@ -49,7 +49,7 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="物品描述">
-                <el-input v-model="form.wupinmiaoshu" placeholder="请输入物品名称" />
+                <el-input v-model="costRequestDetailList.description" placeholder="请输入物品名称" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -58,13 +58,13 @@
           <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="项目编号">
-                <el-input v-model="form.xiangmubianhao" disabled/>
+                <el-input v-model="costRequestDetailList.projectNumber" disabled/>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="费用发生时间">
                 <el-date-picker style="width: 500px;height: 40px"
-                    v-model="form.date"
+                    v-model="costRequestDetailList.createTime"
                     type="date"
                     placeholder="请选择费用发生时间"
                     clearable/>
@@ -76,7 +76,16 @@
 
             <el-col :span="12">
               <el-form-item label="项目类型">
-                <el-input v-model="form.xiangmuleixing" disabled />
+                <el-select
+                    v-model="costRequestDetailList.projectType"
+                    disabled>
+                  <el-option
+                      v-for="dict in project_type"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value"
+                  />
+                </el-select>
               </el-form-item>
             </el-col>
 
@@ -84,12 +93,12 @@
               <el-row >
               <el-col :span="7">
                 <el-form-item label="单价">
-                  <el-input class="danjia_shuliang" v-model="form.danjia" placeholder="请输入物品单价" />
+                  <el-input class="danjia_shuliang" v-model="costRequestDetailList.unitPrice" placeholder="请输入物品单价" />
                 </el-form-item>
               </el-col>
               <el-col :span="5">
                 <el-form-item label="数量">
-                  <el-input class="danjia_shuliang" v-model="form.num" placeholder="请输入物品数量" />
+                  <el-input class="danjia_shuliang" v-model="costRequestDetailList.amount" placeholder="请输入物品数量" />
                 </el-form-item>
               </el-col>
               </el-row>
@@ -99,12 +108,12 @@
           <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="事业部负责人">
-                <el-input v-model="form.fuzeren" disabled />
+                <el-input v-model="costRequestDetailList.userName" disabled />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="申请金额（元）">
-                <el-input v-model="form.jine" placeholder="请输入申请金额" />
+                <el-input v-model="costRequestDetailList.sumMoney" placeholder="请输入申请金额" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -112,13 +121,24 @@
           <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="项目状态">
-                <el-input v-model="form.xiangmustatus" disabled />
+                <el-select
+                    v-model="costRequestDetailList.projectStatus"
+                    disabled
+                >
+                  <el-option
+                      v-for="dict in project_status"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value"
+                  />
+                </el-select>
+
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="备注">
                 <el-input
-                    v-model="form.beizhu"
+                    v-model="costRequestDetailList.remark"
                     :autosize="{ minRows: 4 }"
                     type="textarea"
                     placeholder="请输入备注"
@@ -130,7 +150,7 @@
           <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="登记人">
-                <el-input v-model="form.dengjiren" placeholder="张三" disabled />
+                <el-input v-model="costRequestDetailList.dengjiren" placeholder="张三" disabled />
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -138,26 +158,13 @@
             </el-col>
           </el-row>
 
-
-
-
-
-
-
-
-
-
-
-
-
-
         </el-form>
       </div>
 
       <!--  取消、提交按钮-->
       <div class="button">
         <div><el-button @click="goBackIndex" class="button_size">取消</el-button></div>
-        <div><el-button class="button_size" type="primary">提交</el-button></div>
+        <div><el-button v-if="type !=='详情'" class="button_size" type="primary">提交</el-button></div>
       </div>
     </div>
 
@@ -168,26 +175,30 @@
 <script setup>
 import { reactive, ref } from 'vue'
 import { useRouter } from 'vue-router'
+import {getCostRequestDetail, getCostRequestList} from "../../../api/projectCostRequest/projectCostRequest.js";
+const { proxy } = getCurrentInstance();
+const { project_status, project_cost_type,project_cost_request_status,project_type} = proxy.useDict('project_status', 'project_cost_type','project_cost_request_status','project_type');
+
+//根据项目id获取表单详情数据
+const costRequestDetailList = ref([]);
+const getDetail=()=> {
+  let projectId = proxy.$route.query.id;
+  getCostRequestDetail(projectId).then(response => {
+    console.log(response.data)
+    costRequestDetailList.value = response.data
+  });
+}
 
+//根据跳转页面是否传参判断进详情页or新增页
+let type = proxy.$route.query.type
+if(type === "详情"){
+  //进详情页面
+  getDetail()
+}else{
+  //进新增页面
+}
 
-// 表单
-const form = reactive({
-    xiangmumingcheng: '',
-    xiangmubianhao: '',
-    xiangmuleixing: '',
-    fuzeren: '',
-    xiangmustatus: '',
-    dengjiren: '',
-    feiyongleixing: '',
-    date: '',
-    wupinmiaoshu: '',
-    danjia: '',
-    num: '',
-    jine: '',
-    beizhu: '',
-    liushuihao: '',
-    fujian: ''
-})
+//  取消按钮
 const router = useRouter()
 const goBackIndex = () => {
   router.push({ path: '/costManage/projectCostRequest/index' })