Skip to content

P
psa-web
Commit 80aa88de authored by qyx's avatar qyx
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 45858b41 fc4b946b
Show whitespace changes
Inline Side-by-side
Showing with 630 additions and 393 deletions
src/assets/styles/index.scss
View file @ 80aa88de
...@@ -123,6 +123,7 @@ aside { ...@@ -123,6 +123,7 @@ aside {
//main-container全局样式 //main-container全局样式
.app-container { .app-container {
display: flex; display: flex;
flex-direction: column; /* 垂直排列 */ flex-direction: column; /* 垂直排列 */
padding: 20px; padding: 20px;
......
src/views/myTodoList/index.vue
View file @ 80aa88de
<template> <template>
<div class="app-container"> <div class="app-container">
<div class="formSearch"> <div class="contentTab">
<el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick"> <el-tabs
v-model="activeName"
class="demo-tabs"
@tab-click="handleClick"
>
<el-tab-pane label="日常报销" name="daily"></el-tab-pane> <el-tab-pane label="日常报销" name="daily"></el-tab-pane>
<el-tab-pane label="项目费用" name="projectCost"></el-tab-pane> <el-tab-pane label="项目费用" name="projectCost"></el-tab-pane>
<el-tab-pane label="差旅报销" name="travel"></el-tab-pane> <el-tab-pane label="差旅报销" name="travel"></el-tab-pane>
<el-tab-pane label="工时审批" name="workHours"></el-tab-pane> <el-tab-pane label="工时审批" name="workHours"></el-tab-pane>
</el-tabs> </el-tabs>
<el-form :inline="true" :model="formQuery" class="demo-form-inline">
<el-form-item label="项目名称">
<el-input
v-model="formQuery.user"
placeholder="Approved by"
clearable
style="width: 220px"
/>
</el-form-item>
<el-form-item label="申请人">
<el-select
v-model="formQuery.region"
placeholder="Activity zone"
clearable
style="width: 220px"
>
<el-option label="Zone one" value="shanghai" />
<el-option label="Zone two" value="beijing" />
</el-select>
</el-form-item>
<el-form-item label="申请时间">
<el-date-picker
v-model="formQuery.date"
type="date"
placeholder="Pick a date"
clearable
style="width: 220px"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" class="el-button-primary" icon="search"
>搜索</el-button
>
<el-button type="defalut" class="el-button-defalut" icon="Refresh"
>重置</el-button
>
</el-form-item>
</el-form>
</div> </div>
<div class="contentTable"> <keep-alive>
<component <component
:is="dialogComponents[activeName]" :is="dialogComponents[activeName]"
:key="activeName" :key="activeName"
></component> ></component>
</div> </keep-alive>
</div> </div>
</template> </template>
<script setup> <script setup>
...@@ -63,10 +28,16 @@ const dialogComponents = ref({ ...@@ -63,10 +28,16 @@ const dialogComponents = ref({
travel: travel, travel: travel,
workHours: workHours workHours: workHours
}) })
const activeName = ref('daily') const activeName = ref('daily')
const formQuery = reactive({})
const handleClick = value => { const handleClick = value => {
console.log(activeName.value) console.log(activeName.value)
} }
</script> </script>
<style scoped lang="scss"></style> <style scoped lang="scss">
.contentTab {
padding: 20px;
background: #ffffff;
}
</style>
src/views/project/add.vue
View file @ 80aa88de
<template> <template>
<div class="app-container"> <div class="app-container">
<div class="formSearch"> <div class="content">
<div style="padding-left: 10px"> <div style="padding-left: 10px">
<span class="bold-text" style="border-bottom: 2px solid #0062FF;">项目立项</span> <span class="bold-text" style="border-bottom: 2px solid #0062ff"
>项目立项</span
>
</div> </div>
<div style="padding-top: 20px"> <div style="padding-top: 20px">
<el-form ref="formRef" :model="form" :rules="rules" label-width="auto" > <el-form
ref="formRef"
:model="form"
:rules="rules"
label-width="auto"
>
<el-row :gutter="150"> <el-row :gutter="150">
<el-col :span="10"> <el-col :span="10">
<el-form-item label="项目名称" prop="projectName"> <el-form-item label="项目名称" prop="projectName">
...@@ -43,16 +50,19 @@ ...@@ -43,16 +50,19 @@
</el-form-item> </el-form-item>
<el-form-item label="预计结束时间" prop="endDate"> <el-form-item label="预计结束时间" prop="endDate">
<el-date-picker <el-date-picker
v-model="form.endDate"
size="large" size="large"
format="YYYY/MM/DD" format="YYYY/MM/DD"
v-model="form.endDate"
type="date" type="date"
placeholder="选择日期" placeholder="选择日期"
style="width: 100%" style="width: 100%"
> >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="项目经理" prop="projectManagerId"> <el-form-item
label="项目经理"
prop="projectManagerId"
>
<el-select <el-select
v-model="form.projectManagerId" v-model="form.projectManagerId"
placeholder="请选择项目经理" placeholder="请选择项目经理"
...@@ -67,14 +77,17 @@ ...@@ -67,14 +77,17 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="项目成员" prop="projectMemberIds"> <el-form-item
label="项目成员"
prop="projectMemberIds"
>
<el-select <el-select
v-model="form.projectMemberIds" v-model="form.projectMemberIds"
placeholder="请选择项目成员" placeholder="请选择项目成员"
size="large" size="large"
multiple multiple
filterable filterable
style="width: 400px;" style="width: 400px"
> >
<el-option <el-option
v-for="dict in membersOptions" v-for="dict in membersOptions"
...@@ -84,37 +97,48 @@ ...@@ -84,37 +97,48 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="项目成本(元)" prop="projectCost"> <el-form-item
label="项目成本(元)"
prop="projectCost"
>
<el-input <el-input
size="large"
v-model="form.projectCost" v-model="form.projectCost"
size="large"
placeholder="请输入项目成本" placeholder="请输入项目成本"
style="width: 100%" style="width: 100%"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="项目描述" prop="projectDescribe"> <el-form-item
label="项目描述"
prop="projectDescribe"
>
<el-input <el-input
v-model="form.projectDescribe"
size="large" size="large"
type="textarea" type="textarea"
v-model="form.projectDescribe"
placeholder="请输入项目描述" placeholder="请输入项目描述"
:autosize="{ minRows: 5, maxRows: 10 }" :autosize="{ minRows: 5, maxRows: 10 }"
style="width: 100%" style="width: 100%"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="项目状态" prop="projectStatus"> <el-form-item label="项目状态" prop="projectStatus">
<el-select v-model="form.projectStatus" placeholder="请选择项目状态" size="large"> <el-select
v-model="form.projectStatus"
placeholder="请选择项目状态"
size="large"
>
<el-option <el-option
v-for="dict in project_status" v-for="dict in project_status"
:key="dict.value" :key="dict.value"
:label="dict.label" :label="dict.label"
:value="dict.value"/> :value="dict.value"
/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="项目附件" > <el-form-item label="项目附件">
<el-upload <el-upload
list-type="text"
v-model:file-list="form.fileList" v-model:file-list="form.fileList"
list-type="text"
action="https://jsonplaceholder.typicode.com/posts/" action="https://jsonplaceholder.typicode.com/posts/"
:on-preview="handlePreview" :on-preview="handlePreview"
:on-remove="handleRemove" :on-remove="handleRemove"
...@@ -124,7 +148,9 @@ ...@@ -124,7 +148,9 @@
:auto-upload="false" :auto-upload="false"
:on-success="handleSuccess" :on-success="handleSuccess"
> >
<el-button size="large" type="text">点击上传</el-button> <el-button size="large" type="text"
>点击上传</el-button
>
</el-upload> </el-upload>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -133,8 +159,8 @@ ...@@ -133,8 +159,8 @@
<el-select <el-select
v-model="form.repaymentCount" v-model="form.repaymentCount"
placeholder="请选择项目回款笔数" placeholder="请选择项目回款笔数"
@change="updateRepaymentInputs"
size="large" size="large"
@change="updateRepaymentInputs"
> >
<el-option <el-option
v-for="num in 10" v-for="num in 10"
...@@ -145,12 +171,27 @@ ...@@ -145,12 +171,27 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form :model="form" label-width="80px"> <el-form :model="form" label-width="80px">
<div v-for="(item, index) in form.repaymentDetails" :key="index"> <div
v-for="(
item, index
) in form.repaymentDetails"
:key="index"
>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<!-- 回款比例 --> <!-- 回款比例 -->
<el-form-item :label="'第 ' + (index + 1) + ' 笔'"> <el-form-item
<el-input v-model="item.repaymentPercentage" placeholder="请输入回款比例" width="100%"> :label="
'第 ' + (index + 1) + ' 笔'
"
>
<el-input
v-model="
item.repaymentPercentage
"
placeholder="请输入回款比例"
width="100%"
>
<template #suffix> <template #suffix>
% %
</template> </template>
...@@ -161,7 +202,9 @@ ...@@ -161,7 +202,9 @@
<!-- 回款条件 --> <!-- 回款条件 -->
<el-form-item label="回款前置条件"> <el-form-item label="回款前置条件">
<el-input <el-input
v-model="item.repaymentCondition" v-model="
item.repaymentCondition
"
placeholder="请输入前置条件" placeholder="请输入前置条件"
width="100%" width="100%"
></el-input> ></el-input>
...@@ -173,9 +216,23 @@ ...@@ -173,9 +216,23 @@
</el-col> </el-col>
</el-row> </el-row>
<el-form-item style="padding-left: 75%"> <el-form-item style="padding-left: 75%">
<el-button size="large" @click="reset" class="btn-B">返 回</el-button> <el-button size="large" class="btn-B" @click="reset"
<el-button size="large" type="primary" @click="saveDraft" class="btn-A">保存草稿</el-button> >返 回</el-button
<el-button size="large" type="primary" @click="handleSubmit" class="btn-A">提 交</el-button> >
<el-button
size="large"
type="primary"
class="btn-A"
@click="saveDraft"
>保存草稿</el-button
>
<el-button
size="large"
type="primary"
class="btn-A"
@click="handleSubmit"
>提 交</el-button
>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
...@@ -184,11 +241,14 @@ ...@@ -184,11 +241,14 @@
</template> </template>
<script setup name="add"> <script setup name="add">
import { listUser } from "../../api/system/user.js"; import { listUser } from '../../api/system/user.js'
import { addDraft,addProject } from "../../api/project/project.js"; import { addDraft, addProject } from '../../api/project/project.js'
const { proxy } = getCurrentInstance(); const { proxy } = getCurrentInstance()
const { project_status, project_type } = proxy.useDict('project_status', 'project_type'); const { project_status, project_type } = proxy.useDict(
'project_status',
'project_type'
)
const formRef = ref() const formRef = ref()
const headOptions = ref([]) const headOptions = ref([])
const managerOptions = ref([]) const managerOptions = ref([])
...@@ -262,41 +322,44 @@ const getUserList = () => { ...@@ -262,41 +322,44 @@ const getUserList = () => {
// 提交表单 // 提交表单
const handleSubmit = () => { const handleSubmit = () => {
proxy.$refs["formRef"].validate(valid => { proxy.$refs['formRef'].validate(valid => {
if (valid) { if (valid) {
form.draft = '1' form.draft = '1'
addProject(form).then(response => { addProject(form).then(response => {
if (response.code === 200){ if (response.code === 200) {
proxy.$modal.msgSuccess("新增成功"); proxy.$modal.msgSuccess('新增成功')
resetForm() resetForm()
proxy.$router.push({ path: '/project' }) proxy.$router.push({ path: '/project' })
}else { } else {
proxy.$modal.msgError(response.msg) proxy.$modal.msgError(response.msg)
} }
}); })
} }
}); })
} }
// 新增草稿 // 新增草稿
const saveDraft = () => { const saveDraft = () => {
proxy.$refs["formRef"].validate(valid => { proxy.$refs['formRef'].validate(valid => {
if (valid) { if (valid) {
proxy.$confirm('确认提交吗？', '提示', { proxy
.$confirm('确认提交吗？', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(() => { })
.then(() => {
addDraft(form).then(response => { addDraft(form).then(response => {
if (response.code === 200){ if (response.code === 200) {
proxy.$modal.msgSuccess("草稿保存成功"); proxy.$modal.msgSuccess('草稿保存成功')
}else { } else {
proxy.$modal.msgError(response.msg) proxy.$modal.msgError(response.msg)
} }
}); })
}).catch(()=> {}) })
.catch(() => {})
} }
}); })
} }
// 重置表单 // 重置表单
...@@ -326,12 +389,15 @@ const reset = () => { ...@@ -326,12 +389,15 @@ const reset = () => {
const updateRepaymentInputs = () => { const updateRepaymentInputs = () => {
// 根据用户输入的回款笔数更新百分比输入框的数量 // 根据用户输入的回款笔数更新百分比输入框的数量
if (form.repaymentCount > 0) { if (form.repaymentCount > 0) {
form.repaymentDetails = Array.from({ length: form.repaymentCount }, () => ({ form.repaymentDetails = Array.from(
{ length: form.repaymentCount },
() => ({
repaymentPercentage: null, // 回款百分比 repaymentPercentage: null, // 回款百分比
repaymentCondition: "" // 回款前置条件 repaymentCondition: '' // 回款前置条件
})); })
)
} else { } else {
form.repaymentDetails = []; form.repaymentDetails = []
} }
} }
...@@ -341,30 +407,32 @@ const handleRemove = (file, fileList) => { ...@@ -341,30 +407,32 @@ const handleRemove = (file, fileList) => {
} }
// 预览附件相关事件 // 预览附件相关事件
const handlePreview = (file) => { const handlePreview = file => {
console.log(file) console.log(file)
} }
// 上传附件数量限制 // 上传附件数量限制
const handleExceed = (files, fileList) => { const handleExceed = (files, fileList) => {
this.$message.warning(`当前限制选择 3 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`); this.$message.warning(
`当前限制选择 3 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`
)
} }
// 上传附件删除相关事件 // 上传附件删除相关事件
const beforeRemove = (file, fileList) => { const beforeRemove = (file, fileList) => {
return this.$confirm(`确定移除 ${file.name}？`); return this.$confirm(`确定移除 ${file.name}？`)
} }
// 上传附件成功相关事件 // 上传附件成功相关事件
// 在组件挂载时执行 // 在组件挂载时执行
onMounted(() => { onMounted(() => {
getUserList() getUserList()
}); })
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
.contentA{ .contentA {
height: auto; height: auto;
padding: 20px; padding: 20px;
margin-bottom: 10px; margin-bottom: 10px;
background: #FFFFFF; background: #ffffff;
box-shadow: 0 2px 2px 0 #b3b3b380; box-shadow: 0 2px 2px 0 #b3b3b380;
border-radius: 2px; border-radius: 2px;
overflow: hidden; overflow: hidden;
...@@ -375,9 +443,8 @@ onMounted(() => { ...@@ -375,9 +443,8 @@ onMounted(() => {
font-family: PingFangSC-Medium; font-family: PingFangSC-Medium;
font-weight: 900; font-weight: 900;
font-size: 18px; font-size: 18px;
color: #0D162A; color: #0d162a;
letter-spacing: 0; letter-spacing: 0;
line-height: 15px; line-height: 15px;
} }
</style> </style>
src/views/tab/daily.vue
View file @ 80aa88de
<script setup></script>
<template> <template>
<div>1</div> <div style="display: flex; flex-direction: column; flex: 1">
<div class="formSearch">
<el-form :inline="true" :model="formQuery" class="demo-form-inline">
<el-form-item label="项目名称">
<el-input
v-model="formQuery.user"
placeholder="Approved by"
clearable
style="width: 220px"
/>
</el-form-item>
<el-form-item label="申请人">
<el-select
v-model="formQuery.region"
placeholder="Activity zone"
clearable
style="width: 220px"
>
<el-option label="Zone one" value="shanghai" />
<el-option label="Zone two" value="beijing" />
</el-select>
</el-form-item>
<el-form-item label="申请时间">
<el-date-picker
v-model="formQuery.date"
type="date"
placeholder="Pick a date"
clearable
style="width: 220px"
/>
</el-form-item>
<el-form-item>
<el-button
type="primary"
class="el-button-primary"
icon="search"
>搜索</el-button
>
<el-button
type="defalut"
class="el-button-defalut"
icon="Refresh"
>重置</el-button
>
</el-form-item>
</el-form>
</div>
<div class="contentTable">1</div>
</div>
</template> </template>
<script setup>
const formQuery = reactive({})
</script>
<style scoped lang="scss"></style> <style scoped lang="scss"></style>
src/views/tab/projectCost.vue
View file @ 80aa88de
<script setup></script> <template>
<div style="display: flex; flex-direction: column; flex: 1">
<template><div>2</div></template> <div class="formSearch">
<el-form :inline="true" :model="formQuery" class="demo-form-inline">
<el-form-item label="项目名称">
<el-input
v-model="formQuery.user"
placeholder="Approved by"
clearable
style="width: 220px"
/>
</el-form-item>
<el-form-item label="申请人">
<el-select
v-model="formQuery.region"
placeholder="Activity zone"
clearable
style="width: 220px"
>
<el-option label="Zone one" value="shanghai" />
<el-option label="Zone two" value="beijing" />
</el-select>
</el-form-item>
<el-form-item label="申请时间">
<el-date-picker
v-model="formQuery.date"
type="date"
placeholder="Pick a date"
clearable
style="width: 220px"
/>
</el-form-item>
<el-form-item>
<el-button
type="primary"
class="el-button-primary"
icon="search"
>搜索</el-button
>
<el-button
type="defalut"
class="el-button-defalut"
icon="Refresh"
>重置</el-button
>
</el-form-item>
</el-form>
</div>
<div class="contentTable">2</div>
</div>
</template>
<script setup>
const formQuery = reactive({})
</script>
<style scoped lang="scss"></style> <style scoped lang="scss"></style>
src/views/tab/travel.vue
View file @ 80aa88de
<script setup></script> <template>
<div style="display: flex; flex-direction: column; flex: 1">
<template><div>3</div></template> <div class="formSearch">
<el-form :inline="true" :model="formQuery" class="demo-form-inline">
<el-form-item label="项目名称">
<el-input
v-model="formQuery.user"
placeholder="Approved by"
clearable
style="width: 220px"
/>
</el-form-item>
<el-form-item label="申请人">
<el-select
v-model="formQuery.region"
placeholder="Activity zone"
clearable
style="width: 220px"
>
<el-option label="Zone one" value="shanghai" />
<el-option label="Zone two" value="beijing" />
</el-select>
</el-form-item>
<el-form-item label="申请时间">
<el-date-picker
v-model="formQuery.date"
type="date"
placeholder="Pick a date"
clearable
style="width: 220px"
/>
</el-form-item>
<el-form-item>
<el-button
type="primary"
class="el-button-primary"
icon="search"
>搜索</el-button
>
<el-button
type="defalut"
class="el-button-defalut"
icon="Refresh"
>重置</el-button
>
</el-form-item>
</el-form>
</div>
<div class="contentTable">3</div>
</div>
</template>
<script setup>
const formQuery = reactive({})
</script>
<style scoped lang="scss"></style> <style scoped lang="scss"></style>
src/views/tab/workHours.vue
View file @ 80aa88de
<script setup></script> <template>
<div style="display: flex; flex-direction: column; flex: 1">
<template><div>4</div></template> <div class="formSearch">
<el-form :inline="true" :model="formQuery" class="demo-form-inline">
<el-form-item label="项目名称">
<el-input
v-model="formQuery.user"
placeholder="Approved by"
clearable
style="width: 220px"
/>
</el-form-item>
<el-form-item label="申请人">
<el-select
v-model="formQuery.region"
placeholder="Activity zone"
clearable
style="width: 220px"
>
<el-option label="Zone one" value="shanghai" />
<el-option label="Zone two" value="beijing" />
</el-select>
</el-form-item>
<el-form-item label="申请时间">
<el-date-picker
v-model="formQuery.date"
type="date"
placeholder="Pick a date"
clearable
style="width: 220px"
/>
</el-form-item>
<el-form-item>
<el-button
type="primary"
class="el-button-primary"
icon="search"
>搜索</el-button
>
<el-button
type="defalut"
class="el-button-defalut"
icon="Refresh"
>重置</el-button
>
</el-form-item>
</el-form>
</div>
<div class="contentTable">4</div>
</div>
</template>
<script setup>
const formQuery = reactive({})
</script>
<style scoped lang="scss"></style> <style scoped lang="scss"></style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment