odjbin/mosr-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
zhangkaihuai
2024-06-29 18:27:19 +08:00
parent 0273e19156 5394e45ab8
commit da885d4965
10 changed files with 82 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/expense-management/share/add.vue
View File

@@ -14,7 +14,7 @@
v-model="formData.apportionmentMonth"
type="month"
format="YYYY-MM"
value-format="YYYY-MM-DD HH:mm:ss"
value-format="YYYY-MM"
placeholder="选择月"
>
</el-date-picker>

2
src/views/project-management/filing/index.vue
View File

@@ -94,7 +94,7 @@ const searchConfig = reactive([
component: 'el-date-picker',
props: {
clearable: true,
type: 'datetimerange',
type: 'daterange',
startPlaceholder: '开始日期',
endPlaceholder: '结束日期',
valueFormat: 'YYYY-MM-DD HH:mm:ss',

4
src/views/project-management/implementation/account.vue
View File

@@ -119,8 +119,10 @@ const searchConfig = reactive([
prop: 'time',
component: 'el-date-picker',
props: {
placeholder: '请选择时间',
type:'month',
placeholder: '请选择月份',
clearable: true,
format: 'YYYY-MM',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
},
colProps: {}

16
src/views/project-management/implementation/check.vue
View File

@@ -88,7 +88,13 @@ const getFileParam = (item) => {
const handleSubmit = (instance) => {
if (!instance) return
instance.validate(async (valid) => {
if (!valid) return
if (!valid) {
return ElNotification({
title: '提示',
message: '请完善数据,再提交!',
type: 'error'
})
}
let files = []
otherFileList.value.forEach(item => {
files.push(getFileParam(item))
@@ -132,7 +138,13 @@ const handleSubmit = (instance) => {
const handleResubmit = (instance) => {
if (!instance) return
instance.validate(async (valid) => {
if (!valid) return
if (!valid) {
return ElNotification({
title: '提示',
message: '请完善数据,再提交!',
type: 'error'
})
}
let otherFiles = []
if (name.value === 'Implementation/edit') {
attachment.value.allFileList?.forEach(item => {

5
src/views/project-management/implementation/phase.vue
View File

@@ -1,5 +1,5 @@
<template>
<div class="apply-block">
<div class="apply-block" v-loading="loading">
<baseTitle title="基础信息"></baseTitle>
<fvForm :schema="schema" @getInstance="(e)=>baseForm = e"></fvForm>
<el-form :model="formData" label-width="auto">
@@ -47,7 +47,7 @@ const route = useRoute()
const attachment = ref()
const userPicker = ref()
const name = ref(router.currentRoute.value.name)
const loading = ref(false)
const loading = ref(true)
const formData = ref({})
const file = ref({})
const deploymentId = ref()
@@ -269,6 +269,7 @@ const getDetailInfo = async () => {
type: res.code === 1000 ? 'success' : 'error'
})
if (res.code === 1000) {
userList.value=res.data.userInfoList
formData.value = res.data
loading.value = false
}

67
src/views/project-management/implementation/share.vue
View File

@@ -37,35 +37,23 @@ const schema = computed(() => {
const baseForm = ref()
const searchConfig = reactive([
{
label: '关键词',
prop: 'requirementName',
label: '项目人员',
prop: 'researchPersonnel',
component: 'el-input',
props: {
placeholder: '请输入关键词查询',
clearable: true,
filterable: true,
checkStrictly: true
}
},
{
label: '项目人员',
prop: 'projectCost',
component: shallowRef(fvSelect),
props: {
placeholder: '请选择项目人员查询',
clearable: true,
filterable: true,
checkStrictly: true,
cacheKey: ''
placeholder: '请输入项目人员查询'
}
},
{
label: '时间',
prop: 'datetime',
prop: 'time',
component: 'el-date-picker',
props: {
placeholder: '请选择时间',
type:'month',
placeholder: '请选择月份',
clearable: true,
format: 'YYYY-MM',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
}
}
])
@@ -87,10 +75,7 @@ const tableConfig = reactive({
{
prop: 'researchPersonnel',
label: '研发人员',
align: 'center',
currentRender:({row})=>{
return <span>{getResearchName(row.researchPersonnel)}</span>
}
align: 'center'
},
{
prop: 'wagesPayable',
@@ -138,21 +123,25 @@ const tableConfig = reactive({
projectId: route.query.id
}
})
const researchOptions = ref([])
const getResearchOptions = async () => {
const res = await getResearchUser()
researchOptions.value = res.data
}
const getResearchName=(id)=>{
if(!id)return;
let label=''
researchOptions.value.forEach(item=>{
if(item.value==id){
label=item.label
}
})
return label
const search = (val) => {
tableConfig.params = {...val, projectId: route.query.id}
tableIns.value.refresh()
}
// const researchOptions = ref([])
// const getResearchOptions = async () => {
// const res = await getResearchUser()
// researchOptions.value = res.data
// }
// const getResearchName=(id)=>{
// if(!id)return;
// let label=''
// researchOptions.value.forEach(item=>{
// if(item.value==id){
// label=item.label
// }
// })
// return label
// }
const getBaseInfo = async () => {
try {
const {code, data} = await getBaseInfoApi(route.query.id)
@@ -161,7 +150,7 @@ const getBaseInfo = async () => {
}
}
getResearchOptions()
// getResearchOptions()
getBaseInfo()
</script>

8
src/views/project-management/implementation/upload.vue
View File

@@ -168,7 +168,13 @@ const getFile = (val) => {
const handleSubmit = async (instance) => {
if (!instance) return
instance.validate(async (valid) => {
if (!valid) return
if (!valid) {
return ElNotification({
title: '提示',
message: '请完善数据,再提交!',
type: 'error'
})
}
let params = {
fileList: fileList.value,
projectId: route.query.id,

16
src/views/project-management/implementation/uploadFee.vue
View File

@@ -8,9 +8,9 @@
<el-form-item prop="time" :rules="scope.row.time?'1':rules.time">
<el-date-picker
v-model="scope.row.time"
type="date"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
type="month"
format="YYYY-MM"
value-format="YYYY-MM"
placeholder="选择时间"
>
</el-date-picker>
@@ -56,7 +56,7 @@
<el-table-column prop="afterTax" label="税后余额(元)" width="220">
<template #default="scope">
<el-form-item prop="afterTax" :rules="scope.row.afterTax?'1':rules.afterTax">
<el-input-number v-model="scope.row.afterTax" placeholder="请输入税后余额" :controls="false">
<el-input-number v-model="scope.row.afterTax" placeholder="请输入税后余额" :controls="false">
</el-input-number>
</el-form-item>
</template>
@@ -158,7 +158,13 @@ const handleDelete = (index) => {
const handleSubmit = (instance) => {
if (!instance) return
instance.validate(async (valid) => {
if (!valid) return
if (!valid) {
return ElNotification({
title: '提示',
message: '请完善数据,再提交!',
type: 'error'
})
}
instance.clearValidate()
tableForm.tableData.forEach(item=>{
item.projectName=projectName.value

8
src/views/project-management/initiation/apply.vue
View File

@@ -137,7 +137,13 @@ const getFileParam = (item) => {
const handleSubmit = (instance) => {
if (!instance) return
instance.validate(async (valid) => {
if (!valid) return
if (!valid) {
return ElNotification({
title: '提示',
message: '请完善数据,再提交!',
type: 'error'
})
}
let files = []
otherFileList.value.forEach(item => {
files.push(getFileParam(item))

8
src/views/special-fund/add.vue
View File

@@ -187,7 +187,13 @@ const submitParam = (item) => {
const handleSubmit = async (instance) => {
if (!instance) return
instance.validate(async (valid) => {
if (!valid) return
if (!valid) {
return ElNotification({
title: '提示',
message: '请完善数据,再提交!',
type: 'error'
})
}
const {msg, code} = await addFund(submitParam(formData.value))
ElNotification({
title: '提示',